From 684fba14758338e6ff5af22d427e83a0f70c809d Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Fri, 3 May 2024 16:11:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8B=8D=E8=93=9D=E4=B9=8B=E6=AE=BF?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=E5=8C=BA=E5=9F=9F=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/main.js | 52 +------------------------ public/project/enemys.js | 2 +- public/project/floors/MT50.js | 3 +- public/project/floors/MT51.js | 20 ++++++---- public/project/floors/MT52.js | 10 ++--- public/project/floors/MT53.js | 4 +- public/project/floors/MT54.js | 10 ++--- public/project/floors/MT55.js | 10 ++--- public/project/floors/MT56.js | 4 +- public/project/floors/MT57.js | 8 ++-- public/project/floors/MT58.js | 10 ++--- public/project/floors/MT59.js | 20 +++++----- public/project/floors/MT65.js | 2 +- public/project/floors/MT66.js | 6 +-- public/project/floors/MT67.js | 6 +-- public/project/floors/MT68.js | 6 +-- public/project/floors/MT69.js | 12 +++--- public/project/floors/MT71.js | 69 +++++++++++++++++++++++++++++++++- public/project/items.js | 2 +- src/core/main/custom/hotkey.ts | 14 +++++-- src/core/main/init/hotkey.ts | 46 +++++++++++++++++++++++ src/plugin/game/skillTree.ts | 4 +- src/types/ui.d.ts | 2 +- 23 files changed, 199 insertions(+), 123 deletions(-) diff --git a/public/main.js b/public/main.js index c3ccfe1..33f4520 100644 --- a/public/main.js +++ b/public/main.js @@ -527,57 +527,7 @@ main.prototype.listen = function () { }; ////// 在界面上放开某按键时 ////// - main.dom.body.addEventListener('keyup', function (e) { - if (main.editorOpened) return; - try { - if ( - main.dom.startPanel.style.display == 'block' && - (main.dom.startButtons.style.display == 'block' || - main.dom.levelChooseButtons.style.display == 'block') - ) { - if (e.keyCode == 38 || e.keyCode == 33) - // up/pgup - main.selectButton((main.selectedButton || 0) - 1); - else if (e.keyCode == 40 || e.keyCode == 34) - // down/pgdn - main.selectButton((main.selectedButton || 0) + 1); - else if (e.keyCode == 67 || e.keyCode == 13 || e.keyCode == 32) - // C/Enter/Space - main.selectButton(main.selectedButton); - else if ( - e.keyCode == 27 && - main.dom.levelChooseButtons.style.display == 'block' - ) { - // ESC - core.showStartAnimate(true); - e.preventDefault(); - } - e.stopPropagation(); - return; - } - if (main.dom.inputDiv.style.display == 'block') { - if (e.keyCode == 13) { - setTimeout(function () { - main.dom.inputYes.click(); - }, 50); - } else if (e.keyCode == 27) { - setTimeout(function () { - main.dom.inputNo.click(); - }, 50); - } - return; - } - if ( - core && - core.isPlaying && - core.status && - (core.isPlaying() || core.status.lockControl) - ) - core.onkeyUp(e); - } catch (ee) { - console.error(ee); - } - }); + main.dom.body.addEventListener('keyup', function (e) {}); ////// 开始选择时 ////// main.dom.body.onselectstart = function () { diff --git a/public/project/enemys.js b/public/project/enemys.js index a9d284d..5d9a200 100644 --- a/public/project/enemys.js +++ b/public/project/enemys.js @@ -176,7 +176,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E657": {"name":"触手法师","hp":50000,"atk":2000,"def":3000,"money":5,"exp":300,"point":0,"special":[8,13],"crit":null,"together":25}, "E658": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E659": {"name":"圣殿莱姆","hp":50000,"atk":8000,"def":3000,"money":5,"exp":600,"point":0,"special":[8,30],"translation":[-2,-1],"together":20}, - "E666": {"name":"苍蓝之灵-视","hp":300000,"atk":10000,"def":3000,"money":10,"exp":2500,"point":0,"special":[29],"n":5,"specialHalo":[5],"haloRange":5}, + "E666": {"name":"苍蓝之灵-视","hp":150000,"atk":8000,"def":2000,"money":10,"exp":2500,"point":0,"special":[29],"n":5,"specialHalo":[4],"haloRange":5}, "E667": {"name":"苍之蓝","hp":50000,"atk":6000,"def":2000,"money":5,"exp":500,"point":0,"special":[29],"together":25,"specialHalo":[8],"haloRange":3}, "E668": {"name":"冰封护卫","hp":30000,"atk":7000,"def":2500,"money":5,"exp":550,"point":0,"special":[29],"specialHalo":[26],"iceCore":15,"haloRange":3}, "E669": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, diff --git a/public/project/floors/MT50.js b/public/project/floors/MT50.js index 5c479e6..d1716a4 100644 --- a/public/project/floors/MT50.js +++ b/public/project/floors/MT50.js @@ -37,7 +37,8 @@ main.floors.MT50= ], "5,13": [ "欢迎来到苍蓝之殿,这是本塔第二章里面最大的一个区,也是最复杂的一个区。整个苍蓝之殿分为无个部分:左下角、右下角、左上角、右上角和中心,每个部分都有不一样的玩法,多多动脑哦。", - "本区域极大,建议打开小地图游玩。如果打开小地图后打怪出现卡顿,可以尝试在 设置->ui设置 里面打开小地图懒更新设置" + "本区域极大,建议打开小地图游玩。如果打开小地图后打怪出现卡顿,可以尝试在 设置->ui设置 里面打开小地图懒更新设置", + "此区域建议多多使用定点查看功能,鼠标移动到怪物上按C或E即可打开(如果你没有设置自己的快捷键的话)。手机端暂时无法定点查看" ], "9,13": [ "在你刚进入苍蓝之殿时,你只能先前往左下角部分(本地图的左面),右下角暂时不能前往。注意往上走往左依然可以进入左下角,不要只盯着这个地图的左边不放。", diff --git a/public/project/floors/MT51.js b/public/project/floors/MT51.js index c3e746f..e8f2d36 100644 --- a/public/project/floors/MT51.js +++ b/public/project/floors/MT51.js @@ -59,7 +59,13 @@ main.floors.MT51= } ] }, - "afterGetItem": {}, + "afterGetItem": { + "12,10": [ + "\t[智人]\b[up,hero]一个奇怪的石头?", + "\t[智人]\b[up,hero]感觉拿在身上会有一种温暖感", + "\t[智人]\b[up,hero]尝试装备在身上吧" + ] + }, "afterOpenDoor": {}, "autoEvent": { "12,11": { @@ -88,18 +94,18 @@ main.floors.MT51= "map": [ [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648], [648, 0, 21, 0,596, 32, 0, 32,648, 27,648, 29, 0, 29,648], - [648,376, 33, 28,648, 0,381, 0,648, 0,596, 0,378, 0,648], + [648,376,484, 28,648, 0,381, 0,648, 0,596, 0,378, 0,648], [648,648,648,648,648, 0,648,648,648, 33,648,648,648,578,648], [648,594, 33,381,648,539, 34,492, 0,243,648,376,403,378,648], - [648, 33,648,492,648, 0,648,648,648, 0,648, 33, 21, 33,648], + [648, 33,648,492,648, 0,648,648,648, 0,648,484, 21,484,648], [648, 27,648, 0, 34, 0,219, 0,103, 0,648,648,494,648,648], [648,243,648,656,648,648, 0,648,484,648,648, 27, 0, 0, 94], - [ 92, 0, 34, 0, 27,492, 34,648, 0, 0,539, 0,381, 0,648], + [ 92, 0,482, 0, 27,492, 34,648, 0, 0,539, 0,381, 0,648], [648,648,648,648,648,648, 0,648,656,648,648,648,648,648,648], - [648, 0, 33, 0, 29, 0,219,648, 33, 0,648, 33,662, 33,648], + [648, 0,482, 0, 29, 0,219,648,482, 0,648,491,662,491,648], [648,648,601,648,492,648, 0,648,648,492,648,648, 85,648,648], - [648, 33, 0,648,482,648, 0,648,381, 0,648,596, 0,596,648], - [648, 0,378,648,482,648, 0,220, 0,378,492, 0, 33, 0,648], + [648,491, 0,648,482,648, 0,648,381, 0,648,596, 0,596,648], + [648, 0,378,648,482,648, 0,220,482,378,492, 0,482, 0,648], [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT52.js b/public/project/floors/MT52.js index 72beee9..614e3fa 100644 --- a/public/project/floors/MT52.js +++ b/public/project/floors/MT52.js @@ -117,18 +117,18 @@ main.floors.MT52= "map": [ [648,648,648,648, 91,648,648,648,648,648,648,648,648,648,648], [648, 27, 0,648, 0,648,376,491,648,249,376,648,578, 0,648], - [648, 0,482,648,243,497, 22,403, 85,403,491, 85, 0,484,648], + [648, 0,484,648,243,497, 22,403, 85,403,491, 85, 0,484,648], [648, 28, 0,220, 0,648,378,491,648,249,378,648,578, 0,648], [648,648,648,648, 0,648,648,648,648,648,648,648,648, 0,648], [648, 33, 0,648,482,648, 29, 0,648,381, 0,648,378, 0,648], - [648, 0,381,492, 0,648, 0, 27,539, 0, 34,596, 0,103,648], + [648, 0,381,492, 0,648, 0, 27,539, 0,482,596, 0,103,648], [648, 33, 0,648, 0,648,648,219,648,648,648,648,648,648,648], [648,596,648,648,656, 0, 0, 0, 0,482, 0, 0, 0, 0, 94], [648,376, 0,648,648,648,648,494,648,648,648,648,497,648,648], - [648, 33,381,492,482,539, 33, 0, 28,494,376,381, 22,396,648], + [648,482,381,492,482,539, 33, 0, 28,494,376,381, 22,396,648], [648,601,648,648,648,648,648,243,648,648,648,240,648,648,648], - [648, 34, 0,648, 34, 0,648, 0, 29, 27,648,484,396,484,648], - [648,103,376,596, 0, 33,220, 0, 33, 28,249,403, 21,390,648], + [648,491, 0,648,484, 0,648, 0, 29, 27,648,491,396,491,648], + [648,103,376,596, 0, 33,220, 0,484, 28,249,403, 21,390,648], [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT53.js b/public/project/floors/MT53.js index 7a4180c..43f7663 100644 --- a/public/project/floors/MT53.js +++ b/public/project/floors/MT53.js @@ -59,7 +59,7 @@ main.floors.MT53= [648,656, 34,219,648, 0,482, 0,243, 29, 33,492,482,482,648], [648, 0,648,381,648,648,648,578,648,648,656,648,648,648,648], [648, 0,648,482,648,376,484,378,648,381, 0,648,376,403,648], - [648, 0,648,563,492, 0,381, 0,648, 0, 34,240,484,378,648], + [648, 0,648,563,492, 0,381, 0,648, 0,482,240,484,378,648], [648,484,648,648,648,648,494,648,648,219,648,648,648,648,648], [648, 0,578, 0,648,403, 0,484,648, 0, 33,648, 33, 0,648], [ 92, 0,648,482,648, 0, 21, 0,648,103, 0,220, 0, 0, 94], @@ -68,7 +68,7 @@ main.floors.MT53= [648,482,648, 0, 0,596, 33, 0,492, 0, 0,539, 27, 0,648], [648, 0,243,378, 0,648, 0,103,648, 33, 0,648, 0, 28,648], [648,601,648,492,648,648,243,648,648,648,539,648, 29, 0,648], - [648,378, 0, 0,376,648, 0, 0, 34, 0, 0,656, 0,482,648], + [648,378, 0,491,376,648, 0, 0, 34, 0, 0,656, 0,484,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT54.js b/public/project/floors/MT54.js index 8266d06..6ae7ab9 100644 --- a/public/project/floors/MT54.js +++ b/public/project/floors/MT54.js @@ -68,18 +68,18 @@ main.floors.MT54= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648], - [648, 28, 33,648, 0, 27,648, 0, 0,656, 0,482, 0, 0,648], - [648, 33,376,601, 29, 0,563, 0, 0,648,648,648,648,539,648], + [648, 28,491,648, 0, 27,648, 0, 0,656, 0,482, 0, 0,648], + [648,491,376,601, 29, 0,563, 0, 0,648,648,648,648,539,648], [648,648,492,648,648,220,648,648,648,648,487,441,492, 0,648], - [648, 0,482, 0,219, 0,103,656, 0,648,594,648,648,578,648], + [648, 0,484, 0,219, 0,103,656, 0,648,594,648,648,578,648], [648, 29, 0, 29,648,378, 0,648,381,494,376,240,378,491,648], [648,648,648,539,648,648,648,648,376,648,648,648,648,648,648], - [ 92, 0,648, 0,657,403,482,648,482,492,482,484,648, 0, 94], + [ 92, 0,648, 0,657,403,482,648,482,492,484,484,648, 0, 94], [648, 0,648, 0,648,648,648,648,656,648,492,648,648, 0,648], [648, 0,656, 0, 27,381,648,660, 21,648, 0, 0, 0, 0,648], [648,648,648,648,103, 21,648,648,648,648,539,648,648,648,648], [648, 28,648, 0, 28,482,648, 0, 27, 0, 33, 0, 28, 0,648], - [648, 33,648,596,648,648,648,596,648,648,494,648,648,249,648], + [648,484,648,596,648,648,648,596,648,648,494,648,648,249,648], [648, 27,243, 0, 0,381, 0,482, 0,129,376,396,381,491,648], [648,648,648,648, 93,648,648,648,648,648,648,648,648,648,648] ], diff --git a/public/project/floors/MT55.js b/public/project/floors/MT55.js index 481ee4a..0a57b20 100644 --- a/public/project/floors/MT55.js +++ b/public/project/floors/MT55.js @@ -50,18 +50,18 @@ main.floors.MT55= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648], - [648,378,482,648, 28, 0,648, 0,578,376,482,648, 28, 33,648], - [648, 0,381,492,482, 27,219, 0,648,482,403,494, 33, 29,648], + [648,378,484,648, 28, 0,648, 0,578,376,482,648, 28,482,648], + [648, 0,381,492,482, 27,219, 0,648,482,403,494,482, 29,648], [648,601,648,648,648,648,648,563,648,648,648,648,657,648,648], - [648,103,482,594, 21, 0,492, 0, 29, 0,482,648, 33, 27,648], + [648,103,484,594, 21, 0,492, 0, 29, 0,482,648, 33, 27,648], [648,381, 0,648, 0,484,648,648,648,648,657,648, 29, 33,648], [648,657,648,648,648,648,648, 0, 27, 0,482,648,648,243,648], [648, 0, 0, 0,381, 0,660, 0,103,648,648,648, 0, 0, 94], [648,648,648,648,492,648,648, 0, 28,656, 0, 0,484, 0,648], [648, 27, 29,596, 0, 28,648,494,648,648,657,648,648,648,648], - [648,482, 28,648, 27, 0,492, 0,381,482, 0,492, 29, 28,648], + [648,487, 28,648, 27, 0,492, 0,381,482, 0,492, 29, 28,648], [648,240,648,648,648,492,648,243,648,648,648,648, 27, 33,648], - [648,484,378,648,390,491,648, 0,648, 0, 28,648,648,220,648], + [648,487,378,648,390,487,648, 0,648, 0, 28,648,648,220,648], [648,376,381,249,403,378,648, 33,657, 0, 27, 0,482, 0,648], [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648] ], diff --git a/public/project/floors/MT56.js b/public/project/floors/MT56.js index 8bad09b..433668e 100644 --- a/public/project/floors/MT56.js +++ b/public/project/floors/MT56.js @@ -57,7 +57,7 @@ main.floors.MT56= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], - [648, 0,482,648,390, 21,396,492,482,482,492,482,403,482,648], + [648, 0,482,648,390, 21,396,492,482,482,492,484,403,484,648], [648,381, 0,249, 0,484, 0,648,648,648,648,396, 22,376,648], [648,657,648,648,648,648,648,648, 27, 0,648,648,648,249,648], [648, 0, 33, 27, 0,563, 0,657,484, 28,648,378, 0,482,648], @@ -67,7 +67,7 @@ main.floors.MT56= [648, 0,648,660,484,648, 28, 0,648, 27,648,648,648,492,648], [648,578,648,648,648,648,648,648,648, 0,648, 28,243, 0,648], [648, 0,381,482, 28, 0,492,482,648, 33,648, 0,648,381,648], - [648,648,494,648,648, 0,648,482,648, 0,219, 34,648, 0,648], + [648,648,494,648,648, 0,648,482,648, 0,219,484,648, 0,648], [648, 0,381, 0,648,243,648,648,648,648,648,648,648,482,648], [648, 28,484,376,601, 0, 0, 0,482, 0, 0, 0,220, 0,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] diff --git a/public/project/floors/MT57.js b/public/project/floors/MT57.js index 37e8e2c..0b537d2 100644 --- a/public/project/floors/MT57.js +++ b/public/project/floors/MT57.js @@ -60,7 +60,7 @@ main.floors.MT57= { "type": "setValue", "name": "switch:A", - "value": "值" + "value": "true" } ] }, @@ -135,8 +135,8 @@ main.floors.MT57= "map": [ [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], [648, 0,648,378,403,648,396,661,390,648,403,376,648, 0,648], - [648,376,601,482,390,648, 0,468, 0,648,396,482,601,378,648], - [648, 0,648,494,648,648,491,103,491,648,648,494,648, 0,648], + [648,376,601,487,390,648, 0,468, 0,648,396,487,601,378,648], + [648, 0,648,494,648,648,487,103,487,648,648,494,648, 0,648], [648,482,648, 0,381,648,648, 85,648,648,381, 0,648,482,648], [648, 0,596, 33, 0,656, 0,491, 0,656, 0, 33,596, 0,648], [648,648,648,648,648,648,648,497,648,648,648,648,648,648,648], @@ -145,7 +145,7 @@ main.floors.MT57= [648, 27, 0,648, 0,403, 0,648, 0,403, 0,648, 0, 28,648], [648, 0,482,648,390,491,396,494,396,491,390,648,482, 0,648], [648,601,648,648,648,648,648,648,648,648,648,648,648,601,648], - [648,482,378,657,484,648, 0, 33, 0,648,484,657,376,482,648], + [648,491,378,657,484,648, 0,484, 0,648,484,657,376,491,648], [648,381, 0,648, 0,656, 29, 0, 29,656, 0,648, 0,381,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], diff --git a/public/project/floors/MT58.js b/public/project/floors/MT58.js index fc9e45c..60a6135 100644 --- a/public/project/floors/MT58.js +++ b/public/project/floors/MT58.js @@ -64,18 +64,18 @@ main.floors.MT58= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], - [648, 0,381, 0,482, 0,660,494,468, 0,578, 0, 0,594,648], - [648,596,648,648,648,648,648,648,376,484,648,648,648, 0,648], + [648, 0,381, 0,484, 0,660,494,468, 0,578, 0, 0,594,648], + [648,596,648,648,648,648,648,648,376,491,648,648,648, 0,648], [648, 21, 0, 33, 0,656, 0,648,648,492,648,660,648, 28,648], [648,648,648,648,648,648, 0,656, 33, 0,657, 0, 27,484,648], - [648, 0,648,381, 33,492, 21,648,648,494,648,648,648,648,648], - [648, 0,594, 33,376,648, 0,648,376, 0,657, 0, 0, 0,648], + [648, 0,648,381,482,492, 21,648,648,494,648,648,648,648,648], + [648, 0,594,482,376,648, 0,648,376, 0,657, 0, 0, 0,648], [ 92, 0,648,648,648,648,220,648, 0,648, 0,648, 0, 0, 94], [648,484,648, 0, 0,219, 0,648,601, 0,378,648,648,596,648], [648, 0,648,482,648,648, 0,648,648,648,219,648,381, 0,648], [648, 0,596, 0, 0,648, 33, 0, 28, 0, 0,492, 0,484,648], [648,492,648,648,381,648,648,492,648,648,240,648,578,648,648], - [648,378,484,648, 0,648, 0,482, 0,648,468,648,403,376,648], + [648,378,487,648, 0,648, 0,484, 0,648,468,648,403,376,648], [648,403,376,249, 0,494, 29, 0, 29,243,484,494,396,491,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], diff --git a/public/project/floors/MT59.js b/public/project/floors/MT59.js index e61dba2..b2b54c4 100644 --- a/public/project/floors/MT59.js +++ b/public/project/floors/MT59.js @@ -109,19 +109,19 @@ main.floors.MT59= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], - [648, 27,491, 27,648, 0,648,578, 0,484, 0,596,482, 0,648], - [648, 0, 28, 0,648, 0,648, 0,648,648,648,648, 0, 29,648], - [648, 27,468, 27,648,484,648, 21,648, 27, 0,648, 27, 0,648], - [648, 0, 28, 0, 85, 0,648,482,648, 0, 29,657, 0, 28,648], - [648,648,648,648,648,390,648,390,648, 33,648,648,648,648,648], + [648, 27, 0, 27,648, 0,648,578, 0,491, 0,596,482, 0,648], + [648,491, 28,491,648, 0,648, 0,648,648,648,648, 0, 29,648], + [648, 27,468, 27,648,487,648, 21,648, 27, 0,648, 27, 0,648], + [648, 0, 28, 0, 85, 0,648,487,648, 0, 29,657, 0, 28,648], + [648,648,648,648,648,390,648,390,648,484,648,648,648,648,648], [648,482, 0,482,648, 0,249, 0,648,539,648,482, 0,482,648], [648, 0,666, 0,492,403,648,648,648, 0,492, 0,381, 0, 94], [648,482, 0,482,648, 0,249, 0,648,539,648,482, 0,482,648], - [648,648,648,648,648,396,648,396,648, 33,648,648,648,648,648], - [648, 0, 27, 0, 85, 0,648,482,648, 0, 29,657, 0, 27,648], - [648, 28,468, 28,648,484,648, 21,648, 28, 0,648, 28, 0,648], - [648, 0, 27, 0,648, 0,648, 0,648,648,648,648, 0, 29,648], - [648, 28,491, 28,648, 0,648,578, 0,484, 0,596,482, 0,648], + [648,648,648,648,648,396,648,396,648,484,648,648,648,648,648], + [648, 0, 27, 0, 85, 0,648,487,648, 0, 29,657, 0, 27,648], + [648, 28,468, 28,648,487,648, 21,648, 28, 0,648, 28, 0,648], + [648,491, 27,491,648, 0,648, 0,648,648,648,648, 0, 29,648], + [648, 28, 0, 28,648, 0,648,578, 0,491, 0,596,482, 0,648], [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT65.js b/public/project/floors/MT65.js index a5d894f..10fd22c 100644 --- a/public/project/floors/MT65.js +++ b/public/project/floors/MT65.js @@ -68,7 +68,7 @@ main.floors.MT65= [648, 29,648,648,220,648,596,648,648,220,648,648,648,648,648], [648, 0,492,491, 0,578, 0,491,648,381, 0, 33, 0,381,648], [648,249,648,648,648,648,657,648,648,648,492,648,648,659,648], - [648,482, 27, 28,381,492, 0, 0,484,648,376,484, 0,403,648], + [648,484, 27, 28,381,492, 0, 0,484,648,376,491, 0,403,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT66.js b/public/project/floors/MT66.js index be162b4..50e8a14 100644 --- a/public/project/floors/MT66.js +++ b/public/project/floors/MT66.js @@ -171,9 +171,9 @@ main.floors.MT66= [648,129,648,648,648,605,648,605,648,648,648, 0,103, 0,648], [648, 27, 0,482, 0,381,648, 28, 0,482,648,378, 0,484,648], [648,648,497,648,648,648,648,648,494,648,648,648,648,563,648], - [648,484,390,648,232,376,648,240,376,648,671,482, 0,482,648], - [648,663,403, 85,403,484, 85,381,484, 85, 0, 0,103, 0,648], - [648,484,396,648,232,378,648,240,378,648,671,482, 0,482,648], + [648,487,390,648,232,376,648,240,376,648,671,484, 0,484,648], + [648,663,403, 85,403,487, 85,381,487, 85, 0, 0,103, 0,648], + [648,487,396,648,232,378,648,240,378,648,671,484, 0,484,648], [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT67.js b/public/project/floors/MT67.js index 1618b0a..6d7a2a7 100644 --- a/public/project/floors/MT67.js +++ b/public/project/floors/MT67.js @@ -57,11 +57,11 @@ main.floors.MT67= [648, 0, 0,220, 0,648,403, 0,484,492, 0, 0,484, 0,648], [ 92, 0,648,648,596,648,578,648,648,648,648,648, 0, 0, 94], [648,484, 0,648,381, 0,484,492,376,482, 29,648,657,648,648], - [648, 0, 0,648,648,648,240,648,648,648,243,648,376,482,648], + [648, 0, 0,648,648,648,240,648,648,648,243,648,376,491,648], [648,103, 0,657, 0, 28, 0,482, 0,381, 0,648,381, 28,648], [648,648,648,648,492,648,648,648,648,648,578,648,671,648,648], - [648,376, 0,605, 0,378,648, 0, 0,492,376,648,396,403,648], - [648, 0,491,648,381, 21,578, 0, 0,648,403,494,482,376,648], + [648,376, 0,605,491,378,648, 0, 0,492,376,648,396,403,648], + [648, 0,491,648,381, 21,578, 0, 0,648,403,494,487,376,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT68.js b/public/project/floors/MT68.js index b294953..3909af1 100644 --- a/public/project/floors/MT68.js +++ b/public/project/floors/MT68.js @@ -61,11 +61,11 @@ main.floors.MT68= [648,220,648,648,492,648, 0,381, 0,648, 0,648, 0, 0,648], [ 92, 0,578,484,403,668,376,103,378,220,482,578,482,376, 94], [648,648,648,648,648,648, 0,491, 0,648, 0,648,648,129,648], - [648,390,482,232,396,648,648,494,648,648, 0,249, 28, 0,648], - [648,482,468,648, 0,648,376,482,378,492,381,648, 0,484,648], + [648,390,491,232,396,648,648,494,648,648, 0,249, 28, 0,648], + [648,491,468,648, 0,648,376,482,378,492,381,648, 0,484,648], [648,494,648,648,482,659, 0, 21, 0,648, 0,648,648,494,648], [648,482,482,648,648,648,648,648,657,648,648,648,376,403,648], - [648,482,482,648,482,482,492, 0, 0, 0, 0,671,487,378,648], + [648,484,484,648,482,482,492, 0, 0, 0, 0,671,487,378,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT69.js b/public/project/floors/MT69.js index 9a32db7..3a282dc 100644 --- a/public/project/floors/MT69.js +++ b/public/project/floors/MT69.js @@ -59,19 +59,19 @@ main.floors.MT69= "cannotMoveIn": {}, "map": [ [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], - [648, 28,482,605, 0,648, 0,390, 0,648, 0,659,484,376,648], + [648, 28,484,605, 0,648, 0,390, 0,648, 0,659,491,376,648], [648, 29, 27,648, 0,494,396, 22,403,494, 0,648,378,381,648], [648,648,648,648,482,648, 0,491, 0,648,482,648,648,648,648], [648, 0,491,596, 0,648,648,671,648,648, 0,249,491, 0,648], [648,243,648,648, 0, 27, 0, 0, 0, 28, 0,648,648,601,648], - [648, 0,482,648,594,648,648,129,648,648,227,648,484, 0,648], - [ 92, 0,129,648, 28,381, 28,648, 0,484, 0,648, 0, 0, 94], - [648, 0,482,648, 0,484, 0,648,376,381,376,648,484, 0,648], + [648, 0,484,648,594,648,648,129,648,648,227,648,491, 0,648], + [ 92, 0,129,648, 28,381, 28,648, 0,491, 0,648, 0, 0, 94], + [648, 0,484,648, 0,484, 0,648,376,381,376,648,491, 0,648], [648,492,648,648,648,648,648,648,648,648,648,648,648,578,648], [648,378, 0,381,667, 0,657, 0,657, 0,564,381, 0,376,648], [648,648,578,648, 0,648,648,403,648,648, 0,648,232,648,648], - [648,482,376,648,484,648,482, 0,482,648,484,648,396,484,648], - [648,378,482,648, 0,648,129, 0, 0,648, 0,648,484,390,648], + [648,484,376,648,491,648,482, 0,482,648,491,648,396,491,648], + [648,378,484,648, 0,648,129, 0, 0,648, 0,648,491,390,648], [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ diff --git a/public/project/floors/MT71.js b/public/project/floors/MT71.js index 79346a3..bf2a17b 100644 --- a/public/project/floors/MT71.js +++ b/public/project/floors/MT71.js @@ -27,7 +27,74 @@ main.floors.MT71= } }, "beforeBattle": {}, - "afterBattle": {}, + "afterBattle": { + "12,7": [ + { + "type": "openDoor", + "loc": [ + 10, + 1 + ] + }, + { + "type": "openDoor", + "loc": [ + 10, + 13 + ] + }, + { + "type": "setValue", + "name": "flag:door_palaceSouth", + "operator": "+=", + "value": "1" + }, + { + "type": "if", + "condition": "(flag:door_palaceSouth===2)", + "true": [ + { + "type": "openDoor", + "loc": [ + 1, + 5 + ], + "floorId": "MT50" + }, + { + "type": "openDoor", + "loc": [ + 13, + 5 + ], + "floorId": "MT50" + }, + { + "type": "openDoor", + "loc": [ + 1, + 9 + ], + "floorId": "MT50" + }, + { + "type": "openDoor", + "loc": [ + 13, + 9 + ], + "floorId": "MT50" + }, + { + "type": "setValue", + "name": "flag:door_palaceSouth", + "value": "null" + }, + "入口处的机关门已开启" + ] + } + ] + }, "afterGetItem": {}, "afterOpenDoor": {}, "autoEvent": {}, diff --git a/public/project/items.js b/public/project/items.js index 10a3d85..da67db9 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -1241,7 +1241,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "name": "天蓝石", "canUseItemEffect": "true", "equip": { - "type": "饰品", + "type": "首饰", "value": {}, "percentage": { "hpmax": 10 diff --git a/src/core/main/custom/hotkey.ts b/src/core/main/custom/hotkey.ts index 6b1f1c5..2d1f26e 100644 --- a/src/core/main/custom/hotkey.ts +++ b/src/core/main/custom/hotkey.ts @@ -33,7 +33,11 @@ interface HotkeyData extends Required { /** * @param id 此处的id包含数字后缀 */ -type HotkeyFunc = (id: string, code: KeyCode, ev: KeyboardEvent) => void; +type HotkeyFunc = ( + id: string, + code: KeyCode, + ev: KeyboardEvent +) => void | '@void'; export interface HotkeyJSON { key: KeyCode; @@ -129,7 +133,7 @@ export class Hotkey extends EventEmitter { this.scope = symbol; this.conditionMap.set(symbol, () => true); for (const key of Object.values(this.data)) { - key.func.set(symbol, () => {}); + key.func.set(symbol, () => '@void'); } } @@ -184,6 +188,7 @@ export class Hotkey extends EventEmitter { const toEmit = this.keyMap.get(key); if (!toEmit) return false; const { ctrl, shift, alt } = unwarpBinary(assist); + let emitted = false; toEmit.forEach(v => { if (type !== v.type) return; if (ctrl === v.ctrl && shift === v.shift && alt === v.alt) { @@ -191,11 +196,12 @@ export class Hotkey extends EventEmitter { if (!func) { throw new Error(`Emit unknown scope keys.`); } - func(v.id, key, ev); + const res = func(v.id, key, ev); + if (res !== '@void') emitted = true; } }); this.emit('emit', key, assist, type); - return toEmit.length > 0; + return emitted; } /** diff --git a/src/core/main/init/hotkey.ts b/src/core/main/init/hotkey.ts index 520dd8b..584f2fe 100644 --- a/src/core/main/init/hotkey.ts +++ b/src/core/main/init/hotkey.ts @@ -584,6 +584,52 @@ document.addEventListener('keyup', e => { const code = keycode(e.keyCode); if (gameKey.emitKey(code, assist, 'up', e)) { e.preventDefault(); + } else { + // polyfill样板 + if ( + main.dom.startPanel.style.display == 'block' && + (main.dom.startButtons.style.display == 'block' || + main.dom.levelChooseButtons.style.display == 'block') + ) { + if (e.keyCode == 38 || e.keyCode == 33) + // up/pgup + main.selectButton((main.selectedButton || 0) - 1); + else if (e.keyCode == 40 || e.keyCode == 34) + // down/pgdn + main.selectButton((main.selectedButton || 0) + 1); + else if (e.keyCode == 67 || e.keyCode == 13 || e.keyCode == 32) + // C/Enter/Space + main.selectButton(main.selectedButton); + else if ( + e.keyCode == 27 && + main.dom.levelChooseButtons.style.display == 'block' + ) { + // ESC + core.showStartAnimate(true); + e.preventDefault(); + } + e.stopPropagation(); + return; + } + if (main.dom.inputDiv.style.display == 'block') { + if (e.keyCode == 13) { + setTimeout(function () { + main.dom.inputYes.click(); + }, 50); + } else if (e.keyCode == 27) { + setTimeout(function () { + main.dom.inputNo.click(); + }, 50); + } + return; + } + if ( + core && + core.isPlaying && + core.status && + (core.isPlaying() || core.status.lockControl) + ) + core.onkeyUp(e); } }); document.addEventListener('keydown', e => { diff --git a/src/plugin/game/skillTree.ts b/src/plugin/game/skillTree.ts index 675d18d..a619c00 100644 --- a/src/plugin/game/skillTree.ts +++ b/src/plugin/game/skillTree.ts @@ -151,7 +151,7 @@ export const skills: Record = { index: 12, title: '聪慧', desc: ['使主角变得更加聪明,每级使绿宝石增加的智慧点上升5%'], - consume: 'level > 5 ? 1000 * level ** 2 : 250 * level + 1250', + consume: 'level > 5 ? 100 * level ** 2 : 250 * level + 1250', front: [ [8, 10], [9, 10] @@ -164,7 +164,7 @@ export const skills: Record = { index: 13, title: '治愈', desc: ['使主角能够更好地回复生命,每级使血瓶的加血量增加2%'], - consume: 'level > 5 ? 1000 * level ** 2 : 250 * level + 1250', + consume: 'level > 5 ? 100 * level ** 2 : 250 * level + 1250', front: [[10, 3]], loc: [4, 5], max: 20, diff --git a/src/types/ui.d.ts b/src/types/ui.d.ts index 65d4ad3..03dd2d9 100644 --- a/src/types/ui.d.ts +++ b/src/types/ui.d.ts @@ -621,7 +621,7 @@ interface Ui { /** * 地图中间绘制一段文字 */ - drawText(contents: string, callback?: () => void): void; + drawText(contents?: string, callback?: () => void): void; /** * 自绘选择光标