diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1e71e61659..f453fe0a8b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1008,7 +1008,7 @@ local passivityList = { if skill and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill ) then local ar1 = floor(BattleUtil.FP_Mul(defRole:GetRoleData(RoleDataName.MaxHp), f1)) --local ar2 = BattleUtil.FP_Mul(role:GetRoleData(RoleDataName.Attack), 2.5) - BattleUtil.FinalDamage(nil, role, defRole, ar1) + BattleUtil.FinalDamageCountShield(nil, role, defRole, ar1) --lastTrigger = 0 end end @@ -9012,7 +9012,7 @@ local passivityList = { return end role.Event:RemoveEvent(BattleEventName.RoleTreat,onRoleTreat,nil,nil,role) - local list = skill:GetDirectTargetsNoNoDead() + local list = RoleManager.Query(function(v) return v.camp == role.camp end) if list and #list>0 then BattleUtil.SortByHpFactor(list,type) BattleUtil.FinalTreat(role,list[1],floor(addHp))