From 6eaedb249dbff19538fc890044e527c189a3dac6 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 25 Aug 2020 17:09:46 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E3=80=90ID1008832?= =?UTF-8?q?=E3=80=91=20=E3=80=90=E6=8A=80=E8=83=BD=E3=80=91=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E4=B8=A4=E4=B8=AA=E9=87=91=E7=BF=85=E5=A4=A7=E9=B9=8F?= =?UTF-8?q?=EF=BC=8C=E9=83=BD=E8=A7=A6=E5=8F=91=E4=BA=86=E4=B8=8D=E7=81=AD?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E5=85=88=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E4=B8=8D=E7=81=AD=E7=9A=84=E4=B8=80=E6=96=B9=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/RoleLogic.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua index f8f6abdd3a..63e40bf45c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua @@ -488,7 +488,7 @@ end -- 真的去死 function RoleLogic:GoDead() if self:IsCanDead() then - self.isRealDead = true + self.isRealDead = true self.Rage = 0 BattleLogic.BuffMgr:ClearBuff(self) self.Event:DispatchEvent(BattleEventName.RoleRealDead, self) @@ -504,8 +504,14 @@ function RoleLogic:SetDeadFilter(filter) end -- 要死了 function RoleLogic:SetDead() - self.isDead = true - RoleManager.AddDeadRole(self) + --如果身上有不灭效果不算英雄死亡,为解决只剩两个不灭英雄先后触发不灭,后触发不灭的可能先死问题 by:王振兴 + if BattleUtil.CheckIsNoDead(self) then + self.isDead = false + else + self.isDead = true + RoleManager.AddDeadRole(self) + end + end -- 判断是否死亡 function RoleLogic:IsDead()