diff --git a/libs/actions.js b/libs/actions.js index 46640f2f..7dd56cad 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -977,7 +977,7 @@ actions.prototype.clickFly = function(x,y) { ////// 楼层传送器界面时,按下某个键的操作 ////// actions.prototype.keyDownFly = function (keycode) { if (keycode==37) core.ui.drawFly(core.status.event.data-10); - else if ( keycode==38) core.ui.drawFly(core.status.event.data+1); + else if (keycode==38) core.ui.drawFly(core.status.event.data+1); else if (keycode==39) core.ui.drawFly(core.status.event.data+10); else if (keycode==40) core.ui.drawFly(core.status.event.data-1); return; @@ -1222,7 +1222,7 @@ actions.prototype.keyUpQuickShop = function (keycode) { ////// 工具栏界面时的点击操作 ////// actions.prototype.clickToolbox = function(x,y) { // 装备栏 - if (x>=10 && x<=12 && y==0 && core.flags.equipment) { + if (x>=10 && x<=12 && y==0) { core.ui.closePanel(); core.openEquipbox(); return; diff --git a/libs/ui.js b/libs/ui.js index 67608838..f7984067 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -1747,8 +1747,8 @@ ui.prototype.drawToolbox = function(index) { core.canvas.ui.textAlign = 'center'; // 装备栏 - if (core.flags.equipment) - core.fillText('ui', '[装备栏]', 370, 25,'#DDDDDD', 'bold 15px Verdana'); + // if (core.flags.equipment) + core.fillText('ui', '[装备栏]', 370, 25,'#DDDDDD', 'bold 15px Verdana'); // core.fillText('ui', '删除道具', 370, 32,'#DDDDDD', 'bold 15px Verdana'); // 退出 core.fillText('ui', '返回游戏', 370, 403,'#DDDDDD', 'bold 15px Verdana'); diff --git a/main.js b/main.js index 130a77b3..f966596c 100644 --- a/main.js +++ b/main.js @@ -413,8 +413,22 @@ main.statusBar.image.toolbox.onclick = function () { return; } + if (main.core.isPlaying()) { + main.core.openToolbox(core.status.event.id != 'equipbox'); + } +} + +////// 双击状态栏中的工具箱时 ////// +main.statusBar.image.toolbox.ondblclick = function () { + + if (core.isset(core.status.replay) && core.status.replay.replaying) { + core.rewindReplay(); + return; + } + if (main.core.isPlaying()) - main.core.openToolbox(true); + main.core.openEquipbox(true); + } ////// 点击状态栏中的快捷商店时 ////// diff --git a/project/functions.js b/project/functions.js index 30d29e48..f128df95 100644 --- a/project/functions.js +++ b/project/functions.js @@ -677,7 +677,7 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = } // Step2: 更新领域、阻击伤害 - core.status.checkBlock.damage = []; // 记录(x,y)点的伤害;(x,y)对应的值是 x+y*core.bigmap + core.status.checkBlock.damage = []; // 记录(x,y)点的伤害;(x,y)对应的值是 x+core.bigmap.width*y for (var x=0;x