From deb8603b987b150a71da0fd880fe7cf8b00b032d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 14 Nov 2020 15:11:32 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Buff/Shield.lua | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua index 2308c764da..1e65a206ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua @@ -38,7 +38,7 @@ function Shield:OnTrigger() end -- 计算护盾 -function Shield:CountShield(damage, atkRole) +function Shield:CountShield(damage, atkRole,skill) self.atk = atkRole local finalDamage = 0 if self.shieldType == ShieldTypeName.NormalReduce then @@ -54,10 +54,14 @@ function Shield:CountShield(damage, atkRole) end elseif self.shieldType == ShieldTypeName.RateReduce then - local reduceDamage = math.floor(BattleUtil.ErrorCorrection(damage * self.shieldValue)) - finalDamage = damage - reduceDamage - self.damageSum = self.damageSum + reduceDamage - + --减伤盾只减伤直接伤害,和史弘毅对接的 2020/11/14 by王振兴 + if skill then + local reduceDamage = math.floor(BattleUtil.ErrorCorrection(damage * self.shieldValue)) + finalDamage = damage - reduceDamage + self.damageSum = self.damageSum + reduceDamage + else + finalDamage=damage + end elseif self.shieldType == ShieldTypeName.AllReduce then finalDamage = 0 --TODO 计算吸血