From 433ae2559094eb0c62b988cd7c7db0710dc2c6bc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 27 Sep 2021 13:47:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8351=20=20353=20=E4=BF=AE=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 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 3195df26f1..adf1f5e4ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8385,7 +8385,7 @@ local passivityList = { end if allDamage > 0 then local list = RoleManager.Query(function(v) return v.camp ~= role.camp end) - list = BattleUtil.SortByHpFactor(list,type) + list = BattleUtil.SortByProp(list, RoleDataName.Hp,type) if list and list[1] then BattleUtil.ApplyDamage(nil, role, list[1], allDamage) allDamage = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 8200bac6b6..18f8772611 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -726,8 +726,9 @@ function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageTy --血量防护只会防直接伤害 if defRole.bloodShield and skill then realDamage=math.abs(defRole.bloodShield:CountBloodValue(damage)) - damage=realDamage + -- damage=realDamage end + --御甲过滤后的伤害只会处理扣血 by: wangzhenxing shihongyi 2021/09/27 local finalDmg = defRole.data:SubValue(RoleDataName.Hp,realDamage) if finalDmg >= 0 then if defRole:GetRoleData(RoleDataName.Hp) <= 0 and not defRole:IsDead() then