diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index afe3fb78..c3af3d4b 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -901,7 +901,7 @@ function BattleController:generateInstructions(skillEntity, elementType, lineCou ---- 技能 if skillEntity then - if elementType == skillEntity:getMatchType() then + if elementType == skillEntity:getPosition() then table.insert(self.instructions, { name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL, skillMatch = elementType, diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index 23f21a55..d9cc9121 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -155,6 +155,9 @@ function BattleControllerStage:controllBattleEnd() } } } + if not self.victory then + self.combatReport.wave = self.combatReport.wave - 1 + end ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport) end