From 6821324fb1757aedebf6f17e2d6ae814e77face7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 14 Nov 2020 15:43:40 +0900 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=E5=87=8F=E4=BC=A4=E7=9B=BE?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index fd213ded25..2e7b02e066 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -282,10 +282,10 @@ function BattleUtil.CalHit(atkRole, defRole) end -- 计算护盾 -function BattleUtil.CalShield(atkRole, defRole, damage) +function BattleUtil.CalShield(atkRole, defRole, damage,skill) for i=1, defRole.shield.size do local buff = defRole.shield.buffer[i] - damage = buff:CountShield(damage, atkRole) + damage = buff:CountShield(damage, atkRole,skill) end return damage end @@ -370,7 +370,8 @@ function BattleUtil.ApplyDamage(skill, atkRole, defRole, damage, bCrit, damageTy BattleLogic.Event:DispatchEvent(BattleEventName.PassiveDamaging, damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit) -- 计算护盾减伤 - damage = BattleUtil.CalShield(atkRole, defRole, damage) + + damage = BattleUtil.CalShield(atkRole, defRole, damage,skill) -- 造成的最终伤害 local damagingFunc = function(dmgDeduction)