diff --git a/libs/actions.js b/libs/actions.js index 7dd8c71c..7d8ba631 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -1979,7 +1979,7 @@ actions.prototype.clickSyncSave = function (x,y) { core.download(core.firstData.name+"_"+core.formatDate2(new Date())+".h5route", JSON.stringify({ 'name': core.firstData.name, 'hard': core.status.hard, - 'seed': core.getFlag('seed'), + 'seed': core.getFlag('__seed__'), 'route': core.encodeRoute(core.status.route) })); break; @@ -2244,7 +2244,7 @@ actions.prototype.clickReplay = function (x, y) { case 0: { core.ui.closePanel(); - var hard=core.status.hard, seed = core.getFlag('seed'); + var hard=core.status.hard, seed = core.getFlag('__seed__'); core.startGame(hard, seed, core.clone(core.status.route)); break; } @@ -2268,7 +2268,7 @@ actions.prototype.clickReplay = function (x, y) { core.download(core.firstData.name+"_"+core.formatDate2(new Date())+".h5route", JSON.stringify({ 'name': core.firstData.name, 'hard': core.status.hard, - 'seed': core.getFlag('seed'), + 'seed': core.getFlag('__seed__'), 'route': core.encodeRoute(core.status.route) })); break; diff --git a/libs/control.js b/libs/control.js index 6b111b4e..9b660230 100644 --- a/libs/control.js +++ b/libs/control.js @@ -2256,7 +2256,7 @@ control.prototype.doSL = function (id, type) { if (data.version != core.firstData.version) { // core.drawTip("存档版本不匹配"); if (confirm("存档版本不匹配!\n你想回放此存档的录像吗?\n可以随时停止录像播放以继续游戏。")) { - core.startGame(data.hard, data.hero.flags.seed, core.decodeRoute(data.route)); + core.startGame(data.hard, data.hero.flags.__seed__, core.decodeRoute(data.route)); } return; } @@ -2295,7 +2295,7 @@ control.prototype.doSL = function (id, type) { return; } var route = core.subarray(core.status.route, core.decodeRoute(data.route)); - if (!core.isset(route) || data.hero.flags.seed!=core.getFlag('seed')) { + if (!core.isset(route) || data.hero.flags.__seed__!=core.getFlag('__seed__')) { core.drawTip("无法从此存档回放录像"); return; } diff --git a/libs/events.js b/libs/events.js index d01d6c8b..ea82e767 100644 --- a/libs/events.js +++ b/libs/events.js @@ -88,8 +88,8 @@ events.prototype.startGame = function (hard, seed, route, callback) { core.status.isStarting = true; if (core.isset(seed)) { - core.setFlag('seed', seed); - core.setFlag('rand', seed); + core.setFlag('__seed__', seed); + core.setFlag('__rand__', seed); } else core.utils.__init_seed(); @@ -195,7 +195,7 @@ events.prototype.gameOver = function (ending, fromReplay, norank) { 'name': core.firstData.name, 'version': core.firstData.version, 'hard': core.status.hard, - 'seed': core.getFlag('seed'), + 'seed': core.getFlag('__seed__'), 'route': core.encodeRoute(core.status.route) } core.download(core.firstData.name+"_"+core.formatDate2(new Date())+".h5route", JSON.stringify(obj)); @@ -238,7 +238,7 @@ events.prototype.gameOver = function (ending, fromReplay, norank) { formData.append('experience', core.status.hero.experience); formData.append('steps', core.status.hero.steps); formData.append('norank', norank||0); - formData.append('seed', core.getFlag('seed')); + formData.append('seed', core.getFlag('__seed__')); formData.append('totalTime', Math.floor(core.status.hero.statistics.totalTime/1000)); formData.append('route', core.encodeRoute(core.status.route)); formData.append('base64', 1); @@ -702,12 +702,12 @@ events.prototype.doAction = function() { case "setFg": // 颜色渐变 if (data.async) { core.setFg(data.color, data.time); - core.setFlag('color', data.color||null); + core.setFlag('__color__', data.color||null); this.doAction(); } else { core.setFg(data.color, data.time, function() { - core.setFlag('color', data.color||null); + core.setFlag('__color__', data.color||null); core.events.doAction(); }); } @@ -715,8 +715,8 @@ events.prototype.doAction = function() { case "setWeather": // 更改天气 core.setWeather(data.name, data.level); if (core.isset(data.name)) - core.setFlag('weather', [data.name, data.level]); - else core.setFlag('weather', null); + core.setFlag('__weather__', [data.name, data.level]); + else core.setFlag('__weather__', null); this.doAction(); break; case "openDoor": // 开一个门,包括暗墙 @@ -1336,7 +1336,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback } // 不存在事件时,更改画面色调 - var color = core.getFlag('color', null); + var color = core.getFlag('__color__', null); if (!core.isset(color) && core.isset(core.status.maps[floorId].color)) { color = core.status.maps[floorId].color; } @@ -1356,7 +1356,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback } // 更改天气 - var weather = core.getFlag('weather', null); + var weather = core.getFlag('__weather__', null); if (!core.isset(weather) && core.isset(core.status.maps[floorId].weather)) { weather = core.status.maps[floorId].weather; } @@ -1912,7 +1912,7 @@ events.prototype.uploadCurrent = function (username) { formData.append('money', core.status.hero.money); formData.append('experience', core.status.hero.experience); formData.append('steps', core.status.hero.steps); - formData.append('seed', core.getFlag('seed')); + formData.append('seed', core.getFlag('__seed__')); formData.append('totalTime', Math.floor(core.status.hero.statistics.totalTime/1000)); formData.append('route', core.encodeRoute(core.status.route)); formData.append('deler', 'current'); diff --git a/libs/utils.js b/libs/utils.js index 24c1eaf9..72ce81f5 100644 --- a/libs/utils.js +++ b/libs/utils.js @@ -486,8 +486,8 @@ utils.prototype.__init_seed = function () { rand = this.__next_rand(rand); rand = this.__next_rand(rand); rand = this.__next_rand(rand); - core.setFlag('seed', rand); - core.setFlag('rand', rand); + core.setFlag('__seed__', rand); + core.setFlag('__rand__', rand); } utils.prototype.__next_rand = function (_rand) { @@ -497,9 +497,9 @@ utils.prototype.__next_rand = function (_rand) { } utils.prototype.rand = function (num) { - var rand = core.getFlag('rand'); + var rand = core.getFlag('__rand__'); rand = this.__next_rand(rand); - core.setFlag('rand', rand); + core.setFlag('__rand__', rand); var ans = rand/2147483647; if (core.isset(num) && num>0) return Math.floor(ans*num);