From 3dfc48d652f161b0014e87cac8a6c086e09270f8 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 26 Jan 2021 17:38:48 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A27=E5=8F=B7=E7=89=88=E6=9C=AC=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E5=86=85=E5=AE=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5dcf4d80402b67f8a0610b565ef9182cb3354db1. --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 36 ++- .../Modules/Battle/Logic/Base/Passivity.lua | 241 +++++++++++++----- .../Battle/Logic/Misc/BattleDefine.lua | 1 + .../Modules/Battle/Logic/Misc/BattleUtil.lua | 99 ++++++- .../Modules/Battle/Logic/Role/RoleLogic.lua | 9 + 5 files changed, 318 insertions(+), 68 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 6e4131cddb..ddfc6fb97c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2353,7 +2353,41 @@ local effectList = { target:AddBuff(Buff.Create(caster, BuffName.PropertyChange, i1, BattlePropList[pro], f1, ct)) end) end, - + --造成[a]%的[b]伤害,目标数量大于等于[c],伤害[d]改变[e]%;目标数量小于[f],对其额外造成[g]属性[h]%的伤害(e,h填0 为魂印修改数值3) + --a[float],b[伤害类型],c[int],d[int],e[float] f[int] g[int] h[float] + [126] = function(caster, target, args, interval, skill) + local f1 = args[1] + local dt = args[2] + local num = args[3] + local ct = args[4] + local f2 = args[5] + local num2 =args[6] + local p1 = args[7] + local f3 = args[8] + -- 改变值 = 技能最大目标数 - 当前目标数 + local maxNum = skill:GetMaxTargetNum() + local curNum = #skill:GetDirectTargets() + if curNum>=num and f2>0 then + f1=BattleUtil.CountValue(f1,f2,ct) + end + BattleLogic.WaitForTrigger(interval, function () + BattleUtil.CalDamage(skill, caster, target, dt, f1) + --伤害命中才会给目标上buff + if skill and skill:CheckTargetIsHit(target) then + if curNum0 and releaseNum%num==0 and addNum