diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e69abe3ead..2687eb5343 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5693,6 +5693,9 @@ local passivityList = { if not point then point=list[1] end + if point==nil then + return + end BattleUtil.FinalDamage(nil,role,point,dmg) if curNum>=maxNum then return diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua index 87e2ccb0f0..65ea02cc37 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua @@ -27,6 +27,9 @@ end -- 记录承受伤害 function NoDead:OnRoleBeHit(atkRole, damage, bCrit, finalDmg, damageType, skill,isDirect) if skill and (skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill ) and atkRole.camp~=self.target.camp then + if self.changePro==nil then + self.changePro=0.1 + end self.recordDamage=self.recordDamage+math.floor(damage*self.changePro) end end @@ -65,6 +68,9 @@ function NoDead:OnEnd() self.target.Event:RemoveEvent(BattleEventName.RoleBeHit,self.OnRoleBeHit,self) end --self.target.Event + if self.pro==nil then + self.pro=0 + end local isRand=BattleUtil.RandomAction(self.pro,function() RoleManager.RemoveDeadRole(self.target) self.target.isDead=false