From 46ec8ef4b406bde9bdc8ad8d0996b006a27fdff8 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 17 Aug 2020 19:15:04 +0900 Subject: [PATCH] =?UTF-8?q?=E5=90=B8=E8=A1=80=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E7=94=B1finalDamage=20=E6=94=B9=E4=B8=BA=20damage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 2 +- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index cc27a84fd8..75e3204700 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -1980,7 +1980,7 @@ local effectList = { -- 检测技能伤害治疗加成 f2 = BattleUtil.CheckSkillDamageHeal(f2, caster, arr[1]) -- 治疗血量最低队友实际伤害的f2% - BattleUtil.ApplyTreat(caster, arr[1], floor(finalDmg*f2)) + BattleUtil.ApplyTreat(caster, arr[1], floor(damage*f2)) end target.Event:AddEvent(BattleEventName.RoleBeHit, OnBeHit) BattleUtil.CalDamage(skill, caster, target, dt, f1) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1b95a9bef0..83f3e2a909 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1687,7 +1687,8 @@ local passivityList = { local allDamage = 0 local OnHit = function(atkRole, damage, bCrit, finalDmg, damageType, skill) if skill and skill.type == BattleSkillType.Special then - allDamage = allDamage + finalDmg + --吸血修改,finaldag 改成 damage by:王振兴 2020/08/17 + allDamage = allDamage + damage end end local function onSkillCast(skill) @@ -2615,7 +2616,8 @@ local passivityList = { local f1 = args[2] local onHit = function(target, damage, bCrit, finalDmg) if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function(buff) return buff.damageType == dot end) then - BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(finalDmg * f1))) + --吸血修改 finaldamage 改为 damage by:往王振兴 2020/08/17 + BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(damage * f1))) end end local onSkillCast = function(skill) @@ -3133,7 +3135,8 @@ local passivityList = { local f1 = args[2] local onHit = function(target, damage, bCrit, finalDmg) if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function(buff) return buff.damageType == dot end) then - BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(finalDmg * f1))) + --吸血修改 finaldamage 改为 damage by:往王振兴 2020/08/17 + BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(damage * f1))) end end local onSkillCast = function(skill)