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-14 00:15:17 +08:00
commit 3ab73eb5bc
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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

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;
} }