diff --git a/libs/core.js b/libs/core.js index 2dbc5322..9f6c5ccc 100644 --- a/libs/core.js +++ b/libs/core.js @@ -499,11 +499,8 @@ core.prototype.keyUp = function(keyCode) { if (core.status.lockControl) { core.status.holdingKeys = []; - - - // 全键盘操作部分 - if (core.status.event.id == 'text' && (keyCode==13 || keyCode==32)) { + if (core.status.event.id == 'text' && (keyCode==13 || keyCode==32 || keyCode==67)) { core.drawText(); return; } @@ -515,7 +512,7 @@ core.prototype.keyUp = function(keyCode) { core.events.keyUpAction(keyCode); return; } - if (core.status.event.id=='about' && (keyCode==13 || keyCode==32)) { + if (core.status.event.id=='about' && (keyCode==13 || keyCode==32 || keyCode==67)) { core.events.clickAbout(); return; } @@ -598,6 +595,10 @@ core.prototype.keyUp = function(keyCode) { if (!core.status.lockControl && core.status.heroStop) core.getNextItem(); break; + case 72: // H + if (!core.status.lockControl && core.status.heroStop) + core.ui.drawHelp(); + break; case 37: // UP break; case 38: // DOWN diff --git a/libs/events.js b/libs/events.js index bfd97a79..d0df4009 100644 --- a/libs/events.js +++ b/libs/events.js @@ -645,7 +645,7 @@ events.prototype.keyUpConfirmBox = function (keycode) { core.ui.drawConfirmBox(core.status.event.ui, core.status.event.data.yes, core.status.event.data.no); } - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { if (core.status.event.selection==0 && core.isset(core.status.event.data.yes)) { core.status.event.selection=null; core.status.event.data.yes(); @@ -706,7 +706,7 @@ events.prototype.keyDownAction = function (keycode) { } events.prototype.keyUpAction = function (keycode) { - if (core.status.event.data.type=='text' && (keycode==13 || keycode==32)) { + if (core.status.event.data.type=='text' && (keycode==13 || keycode==32 || keycode==67)) { this.doAction(); return; } @@ -714,7 +714,7 @@ events.prototype.keyUpAction = function (keycode) { var data = core.status.event.data.current; var choices = data.choices; if (choices.length>0) { - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { this.insertAction(choices[core.status.event.selection].action); this.doAction(); } @@ -745,6 +745,13 @@ events.prototype.keyDownBook = function (keycode) { return; } +events.prototype.keyUpBook = function (keycode) { + if (keycode==27 || keycode==88) { + core.ui.closePanel(true); + return; + } +} + // 飞行器 events.prototype.clickFly = function(x,y) { if ((x==10 || x==11) && y==9) core.ui.drawFly(core.status.event.data-1); @@ -767,20 +774,13 @@ events.prototype.keyDownFly = function (keycode) { } events.prototype.keyUpFly = function (keycode) { - if (keycode==71 || keycode==27) + if (keycode==71 || keycode==27 || keycode==88) core.ui.closePanel(); - if (keycode==13 || keycode==32) + if (keycode==13 || keycode==32 || keycode==67) this.clickFly(5,5); return; } -events.prototype.keyUpBook = function (keycode) { - if (keycode==27 || keycode==88) { - core.ui.closePanel(true); - return; - } -} - // 商店 events.prototype.clickShop = function(x,y) { var shop = core.status.event.data.shop; @@ -849,7 +849,7 @@ events.prototype.keyDownShop = function (keycode) { } events.prototype.keyUpShop = function (keycode) { - if (keycode==27) { + if (keycode==27 || keycode==88) { if (core.status.event.data.fromList) { core.status.boxAnimateObjs = []; core.setBoxAnimate(); @@ -861,7 +861,7 @@ events.prototype.keyUpShop = function (keycode) { } var shop = core.status.event.data.shop; var choices = shop.choices; - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { var topIndex = 6 - parseInt(choices.length / 2); this.clickShop(6, topIndex+core.status.event.selection); } @@ -904,12 +904,12 @@ events.prototype.keyDownQuickShop = function (keycode) { } events.prototype.keyUpQuickShop = function (keycode) { - if (keycode==27 || keycode==75) { + if (keycode==27 || keycode==75 || keycode==88) { core.ui.closePanel(); return; } var shopList = core.status.shops, keys = Object.keys(shopList); - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { var topIndex = 6 - parseInt(keys.length / 2); this.clickQuickShop(6, topIndex+core.status.event.selection); } @@ -1014,13 +1014,13 @@ events.prototype.keyDownToolbox = function (keycode) { } events.prototype.keyUpToolbox = function (keycode) { - if (keycode==84 || keycode==27) { + if (keycode==84 || keycode==27 || keycode==88) { core.ui.closePanel(); return; } if (!core.isset(core.status.event.data)) return; - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { this.clickToolboxIndex(core.status.event.selection); return; } @@ -1065,8 +1065,7 @@ events.prototype.keyDownSL = function(keycode) { return; } if (keycode==38) { // up - if ((core.status.event.data-1)%6>=3) - core.ui.drawSLPanel(core.status.event.data - 3); + core.ui.drawSLPanel(core.status.event.data - 3); return; } if (keycode==39) { // right @@ -1074,8 +1073,7 @@ events.prototype.keyDownSL = function(keycode) { return; } if (keycode==40) { // down - if ((core.status.event.data-1)%6<3) - core.ui.drawSLPanel(core.status.event.data + 3); + core.ui.drawSLPanel(core.status.event.data + 3); return; } if (keycode==33) { // PAGEUP @@ -1089,14 +1087,14 @@ events.prototype.keyDownSL = function(keycode) { } events.prototype.keyUpSL = function (keycode) { - if (keycode==27 || (core.status.event.id == 'save' && keycode==83) || (core.status.event.id == 'load' && keycode==68)) { + if (keycode==27 || keycode==88 || (core.status.event.id == 'save' && keycode==83) || (core.status.event.id == 'load' && keycode==68)) { core.ui.closePanel(); if (!core.isPlaying()) { core.showStartAnimate(); } return; } - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { core.doSL(core.status.event.data, core.status.event.id); return; } @@ -1159,7 +1157,7 @@ events.prototype.keyDownSwitchs = function (keycode) { } events.prototype.keyUpSwitchs = function (keycode) { - if (keycode==27) { + if (keycode==27 || keycode==88) { core.status.event.selection=0; core.ui.drawSettings(false); return; @@ -1167,7 +1165,7 @@ events.prototype.keyUpSwitchs = function (keycode) { var choices = [ "背景音乐", "战斗动画", "怪物显伤", "领域显伤", "返回主菜单" ]; - if (keycode==13 || keycode==32) { + if (keycode==13 || keycode==32 || keycode==67) { var topIndex = 6 - parseInt((choices.length - 1) / 2); this.clickSwitchs(6, topIndex+core.status.event.selection); } @@ -1178,7 +1176,7 @@ events.prototype.keyUpSwitchs = function (keycode) { events.prototype.clickSettings = function (x,y) { if (x<5 || x>7) return; var choices = [ - "系统设置", "快捷商店", "同步存档", "重新开始", "关于本塔", "返回游戏" + "系统设置", "快捷商店", "同步存档", "重新开始", "操作帮助", "关于本塔", "返回游戏" ]; var topIndex = 6 - parseInt((choices.length - 1) / 2); if (y>=topIndex && y