diff --git a/public/project/floors/MT41.js b/public/project/floors/MT41.js index 599656c..9ad0014 100644 --- a/public/project/floors/MT41.js +++ b/public/project/floors/MT41.js @@ -18,7 +18,8 @@ main.floors.MT41= "parallelDo": "", "events": { "2,13": [ - "怪物身后的水可以对话,对话后获得50000点生命值" + "怪物身后的水可以对话,对话后获得50000点生命值", + "本层可以使用跳跃技能" ], "5,11": [ "\t[初级智人]\b[up,hero]竟然有水!", diff --git a/public/project/floors/MT44.js b/public/project/floors/MT44.js index 8d97b5d..e67cd03 100644 --- a/public/project/floors/MT44.js +++ b/public/project/floors/MT44.js @@ -38,6 +38,13 @@ main.floors.MT44= 7, 0 ] + }, + "14,5": { + "floorId": "MT45", + "loc": [ + 0, + 5 + ] } }, "beforeBattle": {}, @@ -51,17 +58,17 @@ main.floors.MT44= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0,617, 34,403, 34,600, 0, 0], [ 92, 0,584,584,584, 0,543, 0, 34,604,604,604, 34, 0, 0], - [584, 0,584, 0, 0, 0, 0, 0,378, 0,492, 0,378, 0, 0], - [584, 0,643, 0, 0,381, 0,595, 0,602,604,610,70176,70177,70177], + [584, 0,584,390, 33, 0, 0, 0,378, 0,492, 0,378, 0, 0], + [584, 0,643, 33,441,381, 32,595, 0,602,604,610,70176,70177,70177], [584,584,584,584,584, 0,584,584,494, 0, 34, 0,608, 0, 94], - [ 0, 0, 0, 0, 0,274,376, 0,584,614,584,584,70208,70209,70209], - [586, 0, 0, 0, 0,588, 0,381,584, 21, 0,584,584, 0, 0], + [ 0, 0, 0, 0, 0,274,376, 32,584,614,584,584,70208,70209,70209], + [586, 0, 33,403, 0,492, 0,381,584, 21, 0,584,584, 0, 0], [586,617,588,588,588,588,602,584,584,584, 0,584,584, 0, 0], - [586, 0, 0, 0,274, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0], + [586, 0, 33, 0,274, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0], [586,586,586,610,587,587,595, 0,376, 0, 0,585,585, 0, 0], - [586, 0,600, 0, 0,587, 33,617,585,585,492, 33, 33, 0, 0], - [586, 0,586,614,587,587,587, 0,584,584,584,584,584, 0, 0], - [ 92, 0,586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [586, 0,600, 0,378,587, 33,617,585,585,492, 33, 33, 0, 0], + [586, 33,586,614,587,587,492, 0,584,584,584,584,584, 0, 0], + [ 92, 0,492, 0,376,381, 0, 0, 0, 0, 0, 0, 0, 0, 0], [584,584,584,584,584,584,584, 93, 0, 0, 0, 0, 0, 0, 0] ], "bgmap": [ diff --git a/public/project/floors/MT45.js b/public/project/floors/MT45.js index 1951f02..7973163 100644 --- a/public/project/floors/MT45.js +++ b/public/project/floors/MT45.js @@ -17,7 +17,22 @@ main.floors.MT45= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "0,5": { + "floorId": "MT44", + "loc": [ + 14, + 5 + ] + }, + "3,14": { + "floorId": "snowTown", + "loc": [ + 18, + 0 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, @@ -30,26 +45,68 @@ main.floors.MT45= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [70177,70178, 34, 0, 34,70176,70177,70177,70177,70178,390, 0, 22, 0, 0], + [ 92, 0, 0,441, 0,608, 0, 0, 0,643, 0,441, 0, 0, 0], + [70209,70210,70179, 0,70181,70208,70209,70209,70209,70210,482, 0,396, 0, 0], + [ 0, 0,70187,608,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187, 33,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187, 21,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187,403,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187, 33,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187,608,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187, 0,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,70187, 93,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "bgmap": [ + [70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067], + [70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067], + [70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067,70067], + [70067,70067,70049,70049,70049,70067,70067,70067,70067,70067,70049,70049,70049,70067,70067], + [70067,70056, 0, 0, 0,70058,70067,70067,70067,70056, 0, 0, 0,70058,70067], + [70067, 0, 0, 0, 0, 0,70067,70067,70067, 0, 0, 0, 0,70058,70067], + [70067,70056, 0, 0, 0,70058,70067,70067,70067,70056, 0, 0, 0,70058,70067], + [70067,70064,70065, 0,70065,70066,70067,70067,70067,70064,70065,70065,70065,70066,70067], + [70067,70069,70070,70070,70070,70071,70067,70067,70067,70069,70070,70070,70070,70071,70067], + [70067,70077,70078,70078,70078,70079,70067,70067,70067,70077,70078,70078,70078,70079,70067], + [70067,70085,70086,70086,70086,70087,70067,70067,70067,70085,70086,70086,70086,70087,70067], + [70067,70093,70094,70094,70094,70095,70067,70067,70067,70093,70094,70094,70094,70095,70067], + [70067,70101,70102,70102,70102,70103,70067,70067,70067,70101,70102,70102,70102,70103,70067], + [70067,70109,70110,70110,70110,70111,70067,70067,70067,70109,70110,70110,70110,70111,70067], + [70067,70117,70118,70118,70118,70119,70067,70067,70067,70117,70118,70118,70118,70119,70067] +], + "fgmap": [ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [70201,70202, 0, 0, 0,70200,70201,70201,70201,70202, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] -], - "bgmap": [ - -], - "fgmap": [ - ], "bg2map": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0,70048, 0, 0, 0,70050, 0, 0, 0,70048, 0, 0, 0,70050, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [70185,70186, 0, 0, 0,70184,70185,70185,70185,70186, 0, 0, 0, 0, 0], + [70193,70194, 0, 0, 0,70192,70193,70193,70193,70194, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0,70188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ diff --git a/public/project/floors/snowTown.js b/public/project/floors/snowTown.js index 4ed1d85..0bb5ade 100644 --- a/public/project/floors/snowTown.js +++ b/public/project/floors/snowTown.js @@ -123,6 +123,13 @@ main.floors.snowTown= 7, 14 ] + }, + "18,0": { + "floorId": "MT45", + "loc": [ + 3, + 14 + ] } }, "beforeBattle": {}, diff --git a/public/project/plugin/skills.js b/public/project/plugin/skills.js index 77af030..a55cbf2 100644 --- a/public/project/plugin/skills.js +++ b/public/project/plugin/skills.js @@ -28,7 +28,6 @@ const jumpIgnoreFloor = [ 'MT38', 'MT39', 'MT40', - 'MT41', 'MT42', 'MT43', 'MT44', diff --git a/src/ui/fixed.vue b/src/ui/fixed.vue index 4bfff06..ccfa9a6 100644 --- a/src/ui/fixed.vue +++ b/src/ui/fixed.vue @@ -87,7 +87,7 @@ async function calHeight() { if (core.plugin.fixedDetailOpened.value) { showFixed.value = false; } - main = document.getElementById('enemy-fixed') as HTMLDivElement; + updateMain(); if (!main) return; const style = getComputedStyle(main); const h = parseFloat(style.height); @@ -106,10 +106,19 @@ function getLabel(attr: keyof DetailedEnemy) { return core.getStatusLabel(attr); } +function updateMain() { + main = document.getElementById('enemy-fixed') as HTMLDivElement; + if (main) { + main.addEventListener('mouseleave', () => { + showFixed.value = false; + }); + } +} + onUpdated(calHeight); onMounted(() => { - main = document.getElementById('enemy-fixed') as HTMLDivElement; + updateMain(); calHeight(); });