From 6829e60d435fa97b12bcd52ea705008c5b6a713e Mon Sep 17 00:00:00 2001 From: oc Date: Mon, 12 Feb 2018 16:41:39 +0800 Subject: [PATCH 1/4] Update Autosave Bug --- libs/core.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/core.js b/libs/core.js index 8176977a..b84dccd9 100644 --- a/libs/core.js +++ b/libs/core.js @@ -2220,17 +2220,16 @@ core.prototype.openDoor = function (id, x, y, needKey, callback) { var speed=30; if (needKey) { var key = id.replace("Door", "Key"); - if (!core.removeItem(key)) { + if (!core.hasItem(key)) { if (key != "specialKey") core.drawTip("你没有" + core.material.items[key].name); else core.drawTip("无法开启此门"); core.clearContinueAutomaticRoute(); return; } - } - - if (!core.isset(core.status.event.id)) // 自动存档 core.autosave(true); + core.removeItem(key); + } // open core.playSound("door.ogg"); @@ -4363,11 +4362,11 @@ core.prototype.openSettings = function (need) { ////// 自动存档 ////// core.prototype.autosave = function (removeLast) { - var x; + var x=null; if (removeLast) x=core.status.route.pop(); core.saveData("autoSave"); - if (removeLast) + if (removeLast && core.isset(x)) core.status.route.push(x); } From 903725efded1c4f8c3db16d581ab967735075571 Mon Sep 17 00:00:00 2001 From: oc Date: Tue, 13 Feb 2018 16:31:48 +0800 Subject: [PATCH 2/4] Small bug --- libs/core.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/core.js b/libs/core.js index b84dccd9..65e0fd7a 100644 --- a/libs/core.js +++ b/libs/core.js @@ -150,6 +150,9 @@ core.prototype.init = function (coreData) { core[key] = coreData[key]; } core.flags = core.clone(core.data.flags); + core.values = core.clone(core.data.values); + core.firstData = core.data.getFirstData(); + if (!core.flags.enableExperience) core.flags.enableLevelUp = false; if (!core.flags.canOpenBattleAnimate) { @@ -157,9 +160,7 @@ core.prototype.init = function (coreData) { core.flags.battleAnimate = false; core.setLocalStorage('battleAnimate', false); } - core.values = core.clone(core.data.values); - core.firstData = core.data.getFirstData(); - + // core.initStatus.shops = core.firstData.shops; core.firstData.shops.forEach(function (t) { core.initStatus.shops[t.id] = t; From 5b751aea8a4cdd8bcee8c6b627a625cb9d6de854 Mon Sep 17 00:00:00 2001 From: oc Date: Tue, 13 Feb 2018 21:00:38 +0800 Subject: [PATCH 3/4] View maps --- libs/core.js | 12 ++++++++++++ libs/events.js | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/core.js b/libs/core.js index 65e0fd7a..2bb28115 100644 --- a/libs/core.js +++ b/libs/core.js @@ -1158,6 +1158,18 @@ core.prototype.keyUp = function(keyCode) { }); } break; + case 33: case 34: // PAGEUP/PAGEDOWN + if (core.status.heroStop) { + if (core.flags.enableViewMaps) { + core.drawText("\t[系统提示]即将进入浏览地图模式。\n\n点击地图上半部分，或按[↑]键可查看前一张地图\n点击地图下半部分，或按[↓]键可查看后一张地图\n点击地图中间，或按[ESC]键可离开浏览地图模式\n此模式下可以打开怪物手册以查看某层楼的怪物属性", function () { + core.ui.drawMaps(core.floorIds.indexOf(core.status.floorId)); + }) + } + else { + core.drawTip("本塔不允许浏览地图！"); + } + } + break; case 37: // UP break; case 38: // DOWN diff --git a/libs/events.js b/libs/events.js index 457cedea..1163b45e 100644 --- a/libs/events.js +++ b/libs/events.js @@ -1167,8 +1167,8 @@ events.prototype.clickViewMaps = function (x,y) { ////// 查看地图界面时，按下某个键的操作 ////// events.prototype.keyDownViewMaps = function (keycode) { - if (keycode==37 || keycode==38) core.ui.drawMaps(core.status.event.data+1); - else if (keycode==39 || keycode==40) core.ui.drawMaps(core.status.event.data-1); + if (keycode==37 || keycode==38 || keycode==33) core.ui.drawMaps(core.status.event.data+1); + else if (keycode==39 || keycode==40 || keycode==34) core.ui.drawMaps(core.status.event.data-1); return; } From e44ff57f263ec9cb313262d578738c33fb8fc80f Mon Sep 17 00:00:00 2001 From: oc Date: Tue, 13 Feb 2018 21:03:01 +0800 Subject: [PATCH 4/4] View maps --- libs/core.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/core.js b/libs/core.js index 2bb28115..1811f38c 100644 --- a/libs/core.js +++ b/libs/core.js @@ -1161,9 +1161,7 @@ core.prototype.keyUp = function(keyCode) { case 33: case 34: // PAGEUP/PAGEDOWN if (core.status.heroStop) { if (core.flags.enableViewMaps) { - core.drawText("\t[系统提示]即将进入浏览地图模式。\n\n点击地图上半部分，或按[↑]键可查看前一张地图\n点击地图下半部分，或按[↓]键可查看后一张地图\n点击地图中间，或按[ESC]键可离开浏览地图模式\n此模式下可以打开怪物手册以查看某层楼的怪物属性", function () { - core.ui.drawMaps(core.floorIds.indexOf(core.status.floorId)); - }) + core.ui.drawMaps(core.floorIds.indexOf(core.status.floorId)); } else { core.drawTip("本塔不允许浏览地图！");