From ec3636c842b4dba4b707de378a9a9129163ac62a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 11 Dec 2020 18:10:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E4=B8=8D=E7=81=AD=E7=9A=84=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 2 +- .../~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua | 2 +- .../~Lua/Modules/Battle/Logic/Role/RoleLogic.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 21d6281c90..6fb42189e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2305,7 +2305,7 @@ local passivityList = { local i1 = args[1] local f1 = args[2] local ct = args[3] - + role.isHaveNoDead = true -- 角色死亡时 local onRoleDead = function() -- -- 暂时不能死 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index f2898f0f5d..8dfebb7362 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -411,7 +411,7 @@ end --检测是否有是金翅大鹏有不灭效果 function BattleUtil.CheckIsNoDead(target) if target then - return target:IsAssignHeroAndHeroStar(10086,10) or BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead) + return target.isHaveNoDead or BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead) end return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 0a355613f4..6906ebff57 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -39,7 +39,7 @@ function RoleLogic:Init(uid, data, position) self.exCalDmgList:Clear() --额外计算伤害列表 self.buffFilter:Clear() --buff屏蔽列表 self.proTranList:Clear() --属性转换列表 - + self.isHaveNoDead = false -- 是否有不灭 self.Event:ClearEvent() self.skill = data.skill