Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
919740cdae
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue