diff --git a/public/project/floors/MT5.js b/public/project/floors/MT5.js index 9be435c..37b2f6a 100644 --- a/public/project/floors/MT5.js +++ b/public/project/floors/MT5.js @@ -18,17 +18,6 @@ main.floors.MT5= "parallelDo": "", "events": { "14,7": [ - { - "type": "confirm", - "text": "是否提交序章成绩?", - "yes": [ - { - "type": "win", - "reason": "踏上旅途" - } - ], - "no": [] - }, { "type": "if", "condition": "(flag:cave==1)", @@ -49,6 +38,20 @@ main.floors.MT5= } ], "false": [ + { + "type": "confirm", + "text": "是否提交序章成绩?", + "yes": [ + { + "type": "win", + "reason": "踏上旅途" + }, + { + "type": "exit" + } + ], + "no": [] + }, { "type": "setCurtain", "color": [ diff --git a/src/plugin/game/skillTree.ts b/src/plugin/game/skillTree.ts index 0b78e65..321e642 100644 --- a/src/plugin/game/skillTree.ts +++ b/src/plugin/game/skillTree.ts @@ -221,7 +221,8 @@ export function getSkillFromIndex(index: number) { * 获取技能等级 */ export function getSkillLevel(skill: number) { - return levels[skill] ?? 0; + levels[skill] ??= 0; + return levels[skill]; } export function getSkillConsume(skill: number) { diff --git a/src/plugin/ui/equipbox.tsx b/src/plugin/ui/equipbox.tsx index 627e30b..af1e77e 100644 --- a/src/plugin/ui/equipbox.tsx +++ b/src/plugin/ui/equipbox.tsx @@ -23,7 +23,9 @@ export function getAddStatus(equip: Equip) { {keys.map(v => { const value = Math.floor( (equip.value[v] ?? 0) * core.getBuff(v) + - (core.status.hero[v] * (equip.percentage[v] ?? 0)) / 100 + (core.status.hero[v as keyof HeroStatus] * + (equip.percentage[v] ?? 0)) / + 100 ); return (