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'

Browse Source
This commit is contained in:
YouWei Zhao 2018-02-14 00:13:27 +08:00
commit c71f7930d7
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/core.js
View File

@ -150,6 +150,9 @@ core.prototype.init = function (coreData) {
core[key] = coreData[key]; core[key] = coreData[key];
} }
core.flags = core.clone(core.data.flags); core.flags = core.clone(core.data.flags);
core.values = core.clone(core.data.values);
core.firstData = core.data.getFirstData();
if (!core.flags.enableExperience) if (!core.flags.enableExperience)
core.flags.enableLevelUp = false; core.flags.enableLevelUp = false;
if (!core.flags.canOpenBattleAnimate) { if (!core.flags.canOpenBattleAnimate) {
@ -157,8 +160,6 @@ core.prototype.init = function (coreData) {
core.flags.battleAnimate = false; core.flags.battleAnimate = false;
core.setLocalStorage('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.initStatus.shops = core.firstData.shops;
core.firstData.shops.forEach(function (t) { core.firstData.shops.forEach(function (t) {
@ -1157,6 +1158,16 @@ core.prototype.keyUp = function(keyCode) {
}); });
} }
break; break;
case 33: case 34: // PAGEUP/PAGEDOWN
if (core.status.heroStop) {
if (core.flags.enableViewMaps) {
core.ui.drawMaps(core.floorIds.indexOf(core.status.floorId));
}
else {
core.drawTip("本塔不允许浏览地图！");
}
}
break;
case 37: // UP case 37: // UP
break; break;
case 38: // DOWN case 38: // DOWN
@ -2220,17 +2231,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");
@ -4363,11 +4373,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);
} }

4
libs/events.js
View File

@ -1167,8 +1167,8 @@ events.prototype.clickViewMaps = function (x,y) {
////// 查看地图界面时，按下某个键的操作 ////// ////// 查看地图界面时，按下某个键的操作 //////
events.prototype.keyDownViewMaps = function (keycode) { events.prototype.keyDownViewMaps = function (keycode) {
if (keycode==37 || keycode==38) 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) 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; return;
} }