From 44643920ae109065f49a8815b3e5f38423325caa Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 6 Dec 2021 16:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E8=A2=AB=E5=8A=A8395=20400=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 13 ++++--- .../Modules/Battle/Logic/Role/RoleLogic.lua | 38 +++++++++++-------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 47173bb648..c6523f8111 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -9892,7 +9892,7 @@ local passivityList = { if triggerNum==time then return end - BattleUtil.CalRage(role,role,num,CountTypeName.Add) + BattleUtil.CalRage(role,target,num,CountTypeName.Add) triggerNum=triggerNum+1 end BattleLogic.Event:AddEvent(BattleEventName.ImmuneDebuffSuccess,onBuffImmune,nil,nil,role) @@ -10067,9 +10067,10 @@ local passivityList = { return end local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff) - if buff.Type==BuffName.SigilSign then + -- if buff.Type==BuffName.SigilSign then + -- LogError("t1==="..t1) return true - end + -- end end) if ishave then if defRole.Rage>=n1 then @@ -10091,9 +10092,9 @@ local passivityList = { return end local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff) - if t1==BuffName.SigilSign then - return true - end + -- if t1==BuffName.SigilSign then + return true + -- end end) if ishave then if defRole.Ragei+i then - id=coverArgs[i+i] - end - local value=0 - if #coverArgs>=i+i+1 then - value=coverArgs[i+i+1] - end - if id~=0 and #args>=id and args[id] then - args[id]=value - end + local list=coverPass[passivityId] + for i = 1, #list do + local coverArgs=list[i] + local len=floor((#coverArgs-1)/2) + for i = 1, len do + local id=0 + if #coverArgs>i+i then + id=coverArgs[i+i] + end + local value=0 + if #coverArgs>=i+i+1 then + value=coverArgs[i+i+1] + end + if id~=0 and #args>=id and args[id] then + args[id]=value + end + end end end end