diff --git a/public/libs/actions.js b/public/libs/actions.js index 947a135..df4107c 100644 --- a/public/libs/actions.js +++ b/public/libs/actions.js @@ -253,12 +253,6 @@ actions.prototype._sys_onkeyUp_replay = function (e) { else if (e.keyCode == 78) // N core.stepReplay(); - else if (e.keyCode == 84) - // T - core.control._replay_toolbox(); - else if (e.keyCode == 81) - // Q_sys_onkeyUp - core.control._replay_equipbox(); else if (e.keyCode == 66) // B core.ui._drawStatistics(); diff --git a/src/core/main/custom/hotkey.ts b/src/core/main/custom/hotkey.ts index d8d0325..9c18653 100644 --- a/src/core/main/custom/hotkey.ts +++ b/src/core/main/custom/hotkey.ts @@ -228,9 +228,9 @@ export class Hotkey extends EventEmitter { // 检查全局启用情况 if (!this.enabled) return false; const when = this.conditionMap.get(this.scope)!; + if (!when()) return false; if (type === 'down') this.checkPress(key); else this.checkPressEnd(key); - if (!when()) return false; const toEmit = this.keyMap.get(key); if (!toEmit) return false; diff --git a/src/core/main/init/hotkey.ts b/src/core/main/init/hotkey.ts index 3165691..8266a2d 100644 --- a/src/core/main/init/hotkey.ts +++ b/src/core/main/init/hotkey.ts @@ -443,7 +443,10 @@ gameKey.use(mainScope); // ----- Realization gameKey - .when(() => !core.status.lockControl && !core.isMoving()) + .when( + () => + !core.status.lockControl && !core.isMoving() && !core.isReplaying() + ) .realize('book', () => { core.openBook(true); })