From deb8603b987b150a71da0fd880fe7cf8b00b032d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 14 Nov 2020 15:11:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=88=98=E6=96=97]=E5=87=8F=E4=BC=A4?= =?UTF-8?q?=E7=9B=BE=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 计算吸血 From 6821324fb1757aedebf6f17e2d6ae814e77face7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 14 Nov 2020 15:43:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[=E6=88=98=E6=96=97]=E5=87=8F=E4=BC=A4?= =?UTF-8?q?=E7=9B=BE=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) From 5e0384b8475bc790b70a9b131402238ab8953a0d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 14 Nov 2020 17:13:37 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[=E6=88=98=E6=96=97]=E5=85=8D=E7=96=AB?= =?UTF-8?q?=E7=9B=BE=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/Buff/Immune.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua index 6e812f039a..fe826bb0ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua @@ -65,8 +65,8 @@ function Immune:OnEnd() immune = immune2 elseif self.immuneType == 3 then --免疫无敌盾 immune = immune3 - elseif self.immuneType == 3 then--自定义免疫 - mmune=immune4 + elseif self.immuneType == 4 then--自定义免疫 + immune=immune4 immune4=nil end for i = 1, self.target.buffFilter.size do