From 189d421c2bdc57b601b749e18f518dbafa40f8a6 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 8 Aug 2023 17:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E4=BC=A4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/component/battle_unit_comp.lua | 5 +++-- lua/app/module/battle/team/battle_team.lua | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index da811716..7015b257 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1743,8 +1743,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_WITH_BLEED) end - if self.actionOverCallback then -- 被反击时死亡 - self:onAttackOver() + if self.actionOverCallback then -- 被反伤时死亡 + self.actionOverCallback = nil + self.battleController:enterNextTeamAction() end self.battleController:resetTimeSpeed(true) diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index e84a217b..f75f0a95 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -597,6 +597,10 @@ function BattleTeam:setIsFinalBlock(isFinalBlock) end function BattleTeam:getIsFinalBlock() + if self.isFinalBlock == nil then + return true + end + return self.isFinalBlock end