diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index ee6cafb15c..c58cbb7462 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -3210,7 +3210,9 @@ local passivityList = { local onSkillEnd = function(skill) if skill.type == BattleSkillType.Special then local list = RoleManager.Query(function(v) return v.camp == role.camp end) - BattleUtil.SortByProp(list, RoleDataName.Hp, 1) + --生命最少改成生命百分比最少 2020/09/29 by:王振兴 + --BattleUtil.SortByProp(list, RoleDataName.Hp, 1) + BattleUtil.SortByHpFactor(list, 1) local index = 0 for i = 1, #list do if not list[i]:IsRealDead() and index < 2 then @@ -3637,7 +3639,7 @@ local passivityList = { end end end - role.Event:AddEvent(BattleEventName.FinalBeDamage, onFinalBeDamage) + role.Event:AddEvent(BattleEventName.FinalBeDamageEnd, onFinalBeDamage) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 83a6a962c5..046a1cf310 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -49,7 +49,7 @@ BattleEventName = { RoleRelive = indexAdd(), -- 角色复活了 FinalDamage = indexAdd(), FinalBeDamage = indexAdd(), - + FinalBeDamageEnd = indexAdd(), --最后被攻击结束 HitMiss = indexAdd(), BeHitMiss = indexAdd(), diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index ab23fad49f..c9d410f262 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -354,6 +354,7 @@ function BattleUtil.ApplyDamage(skill, atkRole, defRole, damage, bCrit, damageTy end atkRole.Event:DispatchEvent(BattleEventName.FinalDamage, damagingFunc, defRole, damage, skill, dotType, bCrit, damageType) defRole.Event:DispatchEvent(BattleEventName.FinalBeDamage, damagingFunc, atkRole, damage, skill, dotType, bCrit, damageType) + defRole.Event:DispatchEvent(BattleEventName.FinalBeDamageEnd, damagingFunc, atkRole, damage, skill, dotType, bCrit, damageType) BattleLogic.Event:DispatchEvent(BattleEventName.FinalDamage, damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType) --