Skip to content

Commit

Permalink
feat: 引入 inject.js,捕获游戏事件
Browse files Browse the repository at this point in the history
  • Loading branch information
hellohejinyu committed Dec 13, 2020
1 parent ce136b1 commit bbeb8a1
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 42 deletions.
4 changes: 2 additions & 2 deletions dev-server.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import express from 'express';
const express = require('express');

const app = express();
const PORT = 8080;

const app = express();
app.use(express.static('.'));

app.listen(PORT, () => console.log(`Listening on port ${PORT}`));
9 changes: 4 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
<meta itemprop="name" property="og:title" content="A Dark Room" />
<link rel="shortcut icon" href="favicon.ico" />
<link rel="image_src" href="img/adr.png" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<script src="https://www.dropbox.com/static/api/dropbox-datastores-1.1-latest.js" type="text/javascript"></script>
<script src="//cdn.jsdelivr.net/npm/jquery@1.11.0/dist/jquery.min.js"></script>
<script>
if(!window.jQuery) {
document.write('<script src="lib/jquery.min.js"><\/script>')
Expand All @@ -27,8 +26,9 @@
<script src="lib/jquery.event.move.js"></script>
<script src="lib/jquery.event.swipe.js"></script>
<script src="lib/base64.js"></script>
<script src="lib/translate.js"></script>

<script src="lib/translate.js"></script>
<script src="lib/inject.js"></script>

<script src="lang/langs.js"></script>

<script>
Expand All @@ -55,7 +55,6 @@
<script src="script/header.js"></script>
<script src="script/notifications.js"></script>
<script src="script/events.js"></script>
<script src="script/dropbox.js"></script>
<script src="script/room.js"></script>
<script src="script/outside.js"></script>
<script src="script/world.js"></script>
Expand Down
52 changes: 52 additions & 0 deletions index2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>寂静屋</title>
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/normalize.css@8.0.1/normalize.min.css">
</head>
<body>
Hello World


<script src="//cdn.jsdelivr.net/npm/jquery@1.11.0/dist/jquery.min.js"></script>

<script src="lib/jquery.color-2.1.2.min.js"></script>
<script src="lib/jquery.event.move.js"></script>
<script src="lib/jquery.event.swipe.js"></script>
<script src="lib/base64.js"></script>
<script src="lib/translate.js"></script>
<script src="lib/inject.js"></script>

<script src="lang/langs.js"></script>
<script src="lang/zh_cn/strings.js"></script>

<script>
var lang = "zh_cn"
</script>

<script src="script/Button.js"></script>
<script src="script/audioLibrary.js"></script>
<script src="script/audio.js"></script>
<script src="script/engine.js"></script>
<script src="script/state_manager.js"></script>
<script src="script/header.js"></script>
<script src="script/notifications.js"></script>
<script src="script/events.js"></script>
<script src="script/room.js"></script>
<script src="script/outside.js"></script>
<script src="script/world.js"></script>
<script src="script/path.js"></script>
<script src="script/ship.js"></script>
<script src="script/space.js"></script>
<script src="script/prestige.js"></script>
<script src="script/scoring.js"></script>

<script src="script/events/global.js"></script>
<script src="script/events/room.js"></script>
<script src="script/events/outside.js"></script>
<script src="script/events/encounters.js"></script>
<script src="script/events/setpieces.js"></script>
</body>
</html>
23 changes: 0 additions & 23 deletions lang/langs.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
var langs = {
'de':'deutsch',
'el':'ελληνικά',
'en':'english',
'eo':'esperanto',
'es':'español',
'fr':'français',
'gl':'galego',
'id':'bahasa indonesia',
'it':'italiano',
'lv':'latviešu valoda',
'ja':'日本語',
'ko':'한국어',
'nb':'norsk',
'pl':'polski',
'lt_LT':'lietuvių',
'pt':'português',
'pt_br':'português (brasil)',
'ru':'русский',
'sv':'svenska',
'th':'ไทย',
'tr':'türkçe',
'uk':'українська',
'vi':'tiếng việt',
'zh_cn':'简体中文',
'zh_tw':'繁體中文'
};
24 changes: 24 additions & 0 deletions lib/inject.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* 移动端版本事件注入
*/

var makeFunc = function (cb) {
return function () {
if (location.href.includes('index2.html') === false) return
return cb(...arguments)
}
}

var M = {
notifications: {
init: makeFunc(function(options) {
console.log('notifications init', options)
}),
notify: makeFunc(function (module, text, noQueue) {
console.log(module, text, noQueue)
}),
printMessage: makeFunc(function(t) {
console.log(t)
})
}
}
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "adarkroom",
"type": "module",
"version": "1.0.0",
"private": true,
"repository": "git@github.com:doublespeakgames/adarkroom.git",
Expand Down
7 changes: 4 additions & 3 deletions script/audio.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,10 @@ var AudioEngine = {
});
},
loadAudioFile: function (src) {
if (src.indexOf('http') === -1) {
src = window.location + src;
}
src = '/' + src
// if (src.indexOf('http') === -1) {
// src = window.location + src;
// }
if (AudioEngine.AUDIO_BUFFER_CACHE[src]) {
return new Promise(function (resolve, reject) {
resolve(AudioEngine.AUDIO_BUFFER_CACHE[src]);
Expand Down
14 changes: 7 additions & 7 deletions script/engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@
this._log = this.options.log;

// Check for HTML5 support
if(!Engine.browserValid()) {
window.location = 'browserWarning.html';
}
// if(!Engine.browserValid()) {
// window.location = 'browserWarning.html';
// }

// Check for mobile
if(Engine.isMobile()) {
window.location = 'mobileWarning.html';
}
// if(Engine.isMobile()) {
// window.location = 'mobileWarning.html';
// }

Engine.disableSelection();

Expand All @@ -117,7 +117,7 @@

var menu = $('<div>')
.addClass('menu')
.appendTo('body');
// .appendTo('body');

if(typeof langs != 'undefined'){
var customSelect = $('<span>')
Expand Down
1 change: 1 addition & 0 deletions script/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
var Header = {

init: function(options) {
console.log(options)
this.options = $.extend(
this.options,
options
Expand Down
5 changes: 4 additions & 1 deletion script/notifications.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
var Notifications = {

init: function(options) {
console.log(options)
this.options = $.extend(
this.options,
options
);

M.notifications.init();
// Create the notifications box
elem = $('<div>').attr({
id: 'notifications',
Expand All @@ -28,6 +29,7 @@ var Notifications = {

// Allow notification to the player
notify: function(module, text, noQueue) {
console.log(text, noQueue)
if(typeof text == 'undefined') return;
if(text.slice(-1) != ".") text += ".";
if(module != null && Engine.activeModule != module) {
Expand Down Expand Up @@ -61,6 +63,7 @@ var Notifications = {
},

printMessage: function(t) {
M.notifications.printMessage(t)
var text = $('<div>').addClass('notification').css('opacity', '0').text(t).prependTo('div#notifications');
text.animate({opacity: 1}, 500, 'linear', function() {
// Do this every time we add a new message, this way we never have a large backlog to iterate through. Keeps things faster.
Expand Down

0 comments on commit bbeb8a1

Please sign in to comment.