jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001

Browse Source
This commit is contained in:
YouWei Zhao 2018-02-12 17:00:07 +08:00
commit e1e9ee2f58
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/core.js
View File

@ -2220,17 +2220,16 @@ core.prototype.openDoor = function (id, x, y, needKey, callback) {
var speed=30; var speed=30;
if (needKey) { if (needKey) {
var key = id.replace("Door", "Key"); var key = id.replace("Door", "Key");
if (!core.removeItem(key)) { if (!core.hasItem(key)) {
if (key != "specialKey") if (key != "specialKey")
core.drawTip("你没有" + core.material.items[key].name); core.drawTip("你没有" + core.material.items[key].name);
else core.drawTip("无法开启此门"); else core.drawTip("无法开启此门");
core.clearContinueAutomaticRoute(); core.clearContinueAutomaticRoute();
return; return;
} }
}
if (!core.isset(core.status.event.id)) // 自动存档
core.autosave(true); core.autosave(true);
core.removeItem(key);
}
// open // open
core.playSound("door.ogg"); core.playSound("door.ogg");
@ -4391,11 +4390,11 @@ core.prototype.openSettings = function (need) {
////// 自动存档 ////// ////// 自动存档 //////
core.prototype.autosave = function (removeLast) { core.prototype.autosave = function (removeLast) {
var x; var x=null;
if (removeLast) if (removeLast)
x=core.status.route.pop(); x=core.status.route.pop();
core.saveData("autoSave"); core.saveData("autoSave");
if (removeLast) if (removeLast && core.isset(x))
core.status.route.push(x); core.status.route.push(x);
} }