From 53e473c3257063779be727d2175004410b3aa674 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 20 Nov 2020 10:00:16 +0900 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91147?= =?UTF-8?q?=EF=BC=8C206=E8=A2=AB=E5=8A=A8=E4=BF=AE=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 9631229ea2..fbc10240b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2752,23 +2752,16 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd) end, - -- 受到[a]攻击有[b]%概率使攻击者[c](每回合造成被击者自身20%攻击力的伤害)持续[d]回合 - -- a[int 攻击类型] b[float]c[持续伤害状态]d[int] a:0 所有攻击 1:只限制技能伤害 + -- 受到攻击有[a]%概率使攻击者[b](每回合造成被击者自身20%攻击力的伤害)持续[c]回合 + -- a[float]b[持续伤害状态]c[int] [147] = function(role, args) - local type=args[1] - local f1 = args[2] - local dot = args[3] - local i1 = args[4] + local f1 = args[1] + local dot = args[2] + local i1 = args[3] + -- 技能后后 - local onRoleBeHit = function(caster,damage, bCrit, finalDmg, damageType, skill) - --屏蔽相同阵营 - if caster.camp==role.camp then - return - end - --检测技能 - if type==1 and (not skill or skill.type==BattleSkillType.Normal)then - return - end + local onRoleBeHit = function(caster) + local attack = role:GetRoleData(RoleDataName.Attack) local damage = floor(BattleUtil.ErrorCorrection(attack * 0.2)) BattleUtil.RandomDot(f1, dot, role, caster, i1, 1, damage) @@ -4065,21 +4058,17 @@ local passivityList = { - --技能治疗系数[a]改变[b]% ,技能目标改变[c] [d]名(作用于主动技能效果103) - --a[改变类型]b[float] c[改变类型] d[int] + --技能治疗系数[a]改变[b]%(作用于主动技能效果103) + --a[改变类型]b[float] [206] = function(role, args) local ct = args[1] local f1 = args[2] - local ct2 = args[3] - local f2 = args[4] + local onSkillEffectBefore = function(skill, e, func) if skill.type == BattleSkillType.Special then if e.type == 103 then -- 当前只对技能效果103生效 local factor = BattleUtil.ErrorCorrection(BattleUtil.CountValue(e.args[3], f1, ct)) e.args[3] = factor - if ct2 and f2 then - e.args[4] = BattleUtil.ErrorCorrection(BattleUtil.CountValue(e.args[4], f2, ct2)) - end if func then func(e) end end end