diff --git a/fc/index.html b/fc/index.html index a25d9dd..b630c26 100644 --- a/fc/index.html +++ b/fc/index.html @@ -6,59 +6,57 @@ --> - - - - - - - - - - + + + + + + + + - - + + - - - -
-
-
- - - -
- -
-
-
-
-
-
-
-
-
A
-
B
- -
AB
-
选择
-
开始
-
-
+ + +
+
+
+ + + +
+ +
+
+
+
+
+
+
+ +
+
A
+
B
+ +
AB
+
选择
+
开始
+
+
diff --git a/fc/js/nes-embed.js b/fc/js/nes-embed.js index e9592b1..0925788 100644 --- a/fc/js/nes-embed.js +++ b/fc/js/nes-embed.js @@ -22,7 +22,7 @@ function getParameter (t) { return e.match(i) ? e.match(i)[0].substr(t.length + 1) : null } var netmode = getParameter("roomId")?true:false; -var worker = new Worker('jsnes.min.js'); +var worker = new Worker('./js/jsnes.min.js'); worker.postMessage({ f:"netmode", data:netmode @@ -151,8 +151,8 @@ window.vm = { window.onload = function(){ var gameId = getParameter("id") - // var path = "../roms/" + gameId + ".nes" - var path = "http://192.168.100.84/fc/roms/7002595.nes" + var path = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".nes" + // var path = "http://192.168.100.228:7000/emu/roms/" + gameId + ".nes" nes_load_url("screen", path) vm.initCtrl() diff --git a/fc/js/network.js b/fc/js/network.js index 3db88e7..31547bf 100644 --- a/fc/js/network.js +++ b/fc/js/network.js @@ -84,7 +84,7 @@ nwm = function(){ console.log('createRoom成功'); console.log(res.roomID); self.roomID = res.roomID; - wx.miniProgram.postMessage({ roomID: self.roomID }) + wx.miniProgram.postMessage({ data: self.roomID }) } if(self.cbOnCreateRoom){ self.cbOnCreateRoom(res); diff --git a/gba/dist/gbajs.min.js b/gba/dist/gbajs.min.js index 552236e..2a9e9c0 100755 --- a/gba/dist/gbajs.min.js +++ b/gba/dist/gbajs.min.js @@ -7525,7 +7525,7 @@ function initAudioEvent() { function loadRomByZipUrl(i, r) { // var s = (/192.168./.test(location.href) ? "http://192.168.42.80:8088/gba/" : "https://pub.hoh8.cn/files/game/gba/") + gameId + "/" + gameId + ".zip", //var s = "http://192.168.100.84/gba/roms/" + gameId + ".zip", - var s = "../roms/" + gameId + ".zip", + var s = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".zip", n = "GBA_ROM_" + s; localforage.getItem(n, function(t, e) { e ? i(e) : zip.createReader(new zip.HttpReader(s, r), function(e) { @@ -7655,4 +7655,4 @@ window.vm = { var i = $.Event(e); i.keyCode = t, i.which = i.keyCode, $(window).trigger(i) } -}; \ No newline at end of file +}; diff --git a/gba2/user_scripts/IodineGBACoreGlueCode.js b/gba2/user_scripts/IodineGBACoreGlueCode.js index ceee459..fa2e43c 100755 --- a/gba2/user_scripts/IodineGBACoreGlueCode.js +++ b/gba2/user_scripts/IodineGBACoreGlueCode.js @@ -165,7 +165,7 @@ function downloadROM() { Iodine.pause(); showTempString("Downloading"); var gameId = getParameter("id") - var path = "../roms/" + gameId + ".zip" + var path = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".zip" downloadFileRemote(path,registerROM2); // downloadFile("Binaries/" + gamename + ".gba", registerROM); } @@ -180,7 +180,7 @@ function attachROM2(ROM) { break; } }) - + } function registerROM2() { clearTempString(); @@ -241,7 +241,7 @@ function clearTempString() { } //Some wrappers and extensions for non-DOM3 browsers: function addEvent(sEvent, oElement, fListener) { - try { + try { oElement.addEventListener(sEvent, fListener, false); } catch (error) { @@ -249,7 +249,7 @@ function addEvent(sEvent, oElement, fListener) { } } function removeEvent(sEvent, oElement, fListener) { - try { + try { oElement.removeEventListener(sEvent, fListener, false); } catch (error) {