修改模拟器地址

This commit is contained in:
zhl 2019-03-05 20:53:03 +08:00
parent fc510bcc5e
commit 7df1ea5516
5 changed files with 56 additions and 58 deletions

View File

@ -6,59 +6,57 @@
<meta name="viewport" content="width=750,minimum-scale=0.4,maximum-scale=1,user-scalable=no"> --> <meta name="viewport" content="width=750,minimum-scale=0.4,maximum-scale=1,user-scalable=no"> -->
<title></title> <title></title>
<link href="dist/gbajs.min.css?v=1" rel="stylesheet" type="text/css"/> <link href="dist/gbajs.min.css?v=1" rel="stylesheet" type="text/css"/>
<!-- <script src="js/index.js"></script> --> <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<!-- <script type="text/javascript" src="jsnes.min.js"></script> --> <script type="text/javascript" src="js/long.js"></script>
<!-- <script type="text/javascript" src="rq.js?v=6"></script> --> <script type="text/javascript" src="js/bytebuffer.js"></script>
<script type="text/javascript" src="long.js"></script> <script type="text/javascript" src="js/protobuf.js?v=6"></script>
<script type="text/javascript" src="bytebuffer.js"></script> <script type="text/javascript" src="js/jcmatchvs.js?v=6"></script>
<script type="text/javascript" src="protobuf.js?v=6"></script> <script type="text/javascript" src="js/netWorkHandle.js?v=6"></script>
<script type="text/javascript" src="jcmatchvs.js?v=6"></script> <script type="text/javascript" src="js/network.js?v=6"></script>
<script type="text/javascript" src="networkHandle.js?v=6"></script> <script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="network.js?v=6"></script>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="nes-embed.js?v=6"></script> <script type="text/javascript" src="js/nes-embed.js?v=6"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> --> <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> -->
<style> <style>
.background-div{ .background-div{
position: absolute; position: absolute;
background-color: #000; background-color: #000;
top: 0; top: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;
right: 0; right: 0;
} }
</style> </style>
</head> </head>
<body> <body>
<div> <div>
<div id="emulator"></div> <div id="emulator"></div>
</div> </div>
<!-- <script src="js/rq.js" data-main="js/index.js"></script> --> <!-- <script src="js/rq.js" data-main="js/index.js"></script> -->
<div class='background-div'></div> <div class='background-div'></div>
<canvas id="screen" width="256" height="240"></canvas> <canvas id="screen" width="256" height="240"></canvas>
<div class="ctrl-wrap"> <div class="ctrl-wrap">
<div class="dire-wrap"> <div class="dire-wrap">
<div class="dire-ctrl"> <div class="dire-ctrl">
<div class="dc-centre"></div> <div class="dc-centre"></div>
</div> </div>
<div class="dc-dire"></div> <div class="dc-dire"></div>
</div> </div>
<div class="key-wrap"> <div class="key-wrap">
<div class="key-btn kay-A" data-key="A">A</div> <div class="key-btn kay-A" data-key="A">A</div>
<div class="key-btn kay-B" data-key="B">B</div> <div class="key-btn kay-B" data-key="B">B</div>
<!-- <div class="key-btn kay-Y" data-key="Y">L</div> <!-- <div class="key-btn kay-Y" data-key="Y">L</div>
<div class="key-btn kay-X" data-key="X">R</div> --> <div class="key-btn kay-X" data-key="X">R</div> -->
<div class="key-btn kay-AB" data-key="AB">AB</div> <div class="key-btn kay-AB" data-key="AB">AB</div>
<div class="key-btn kay-SE flat-btn" data-key="SE">选择</div> <div class="key-btn kay-SE flat-btn" data-key="SE">选择</div>
<div class="key-btn kay-ST flat-btn" data-key="ST">开始</div> <div class="key-btn kay-ST flat-btn" data-key="ST">开始</div>
</div> </div>
</div> </div>
</body> </body>

View File

@ -22,7 +22,7 @@ function getParameter (t) {
return e.match(i) ? e.match(i)[0].substr(t.length + 1) : null return e.match(i) ? e.match(i)[0].substr(t.length + 1) : null
} }
var netmode = getParameter("roomId")?true:false; var netmode = getParameter("roomId")?true:false;
var worker = new Worker('jsnes.min.js'); var worker = new Worker('./js/jsnes.min.js');
worker.postMessage({ worker.postMessage({
f:"netmode", f:"netmode",
data:netmode data:netmode
@ -151,8 +151,8 @@ window.vm = {
window.onload = function(){ window.onload = function(){
var gameId = getParameter("id") var gameId = getParameter("id")
// var path = "../roms/" + gameId + ".nes" var path = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".nes"
var path = "http://192.168.100.84/fc/roms/7002595.nes" // var path = "http://192.168.100.228:7000/emu/roms/" + gameId + ".nes"
nes_load_url("screen", path) nes_load_url("screen", path)
vm.initCtrl() vm.initCtrl()

View File

@ -84,7 +84,7 @@ nwm = function(){
console.log('createRoom成功'); console.log('createRoom成功');
console.log(res.roomID); console.log(res.roomID);
self.roomID = res.roomID; self.roomID = res.roomID;
wx.miniProgram.postMessage({ roomID: self.roomID }) wx.miniProgram.postMessage({ data: self.roomID })
} }
if(self.cbOnCreateRoom){ if(self.cbOnCreateRoom){
self.cbOnCreateRoom(res); self.cbOnCreateRoom(res);

View File

@ -7525,7 +7525,7 @@ function initAudioEvent() {
function loadRomByZipUrl(i, r) { 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 = (/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 = "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; n = "GBA_ROM_" + s;
localforage.getItem(n, function(t, e) { localforage.getItem(n, function(t, e) {
e ? i(e) : zip.createReader(new zip.HttpReader(s, r), function(e) { e ? i(e) : zip.createReader(new zip.HttpReader(s, r), function(e) {

View File

@ -165,7 +165,7 @@ function downloadROM() {
Iodine.pause(); Iodine.pause();
showTempString("Downloading"); showTempString("Downloading");
var gameId = getParameter("id") var gameId = getParameter("id")
var path = "../roms/" + gameId + ".zip" var path = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".zip"
downloadFileRemote(path,registerROM2); downloadFileRemote(path,registerROM2);
// downloadFile("Binaries/" + gamename + ".gba", registerROM); // downloadFile("Binaries/" + gamename + ".gba", registerROM);
} }