From 8c6c57d916c21a261f2b985359568d98b03fed89 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 31 Aug 2021 14:25:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8263=20=20269=20=20274=20=20=20332?= =?UTF-8?q?=20=20112=20=20145=20=20=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 --- .../Modules/Battle/Logic/Base/Passivity.lua | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 9df3dadf45..140a296b26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2052,6 +2052,9 @@ local passivityList = { role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter) end local function onRoleDamageBefore(target, factorFunc, damageType, skill) + if not skill then + return + end if skill and not skill.isTriggerJudge and judge==1 then return end @@ -2905,6 +2908,9 @@ local passivityList = { local index, tran local OnRoleDamageBefore = function(target, factorFunc, damageType, skill) + if not skill then + return + end if skill and not skill.isTriggerJudge and judge==1 then return end @@ -2914,6 +2920,9 @@ local passivityList = { end end local OnRoleDamageAfter = function(defRole,damageFunc,fixDamage,skill) + if not skill then + return + end if skill and not skill.isTriggerJudge and judge==1 then return end @@ -5742,6 +5751,9 @@ local passivityList = { local round=args[1] local pro=args[2] local onRoleDamageBefore=function(defRole, factorFunc, damageType, skill) + if not skill then + return + end if skill and not skill.isTriggerJudge and judge==1 then return end @@ -5913,6 +5925,9 @@ local passivityList = { local curBuff=nil local onRoleDamageBefore=function(atkRole, factorFunc, damageType, skill) + if not skill then + return + end if atkRole.camp~= role.camp and BattleLogic.BuffMgr:HasBuff(skill.owner, BuffName.DOT, function (buff) return buff.damageType == sta1 end,role,sta1) then --curBuff=Buff.Create(role, BuffName.Immune, 1,4,immune) -- role:AddBuff(curBuff) @@ -6056,6 +6071,9 @@ local passivityList = { local curBuff=nil local immuneState=false local onRoleDamageBefore=function(atkRole, factorFunc, damageType, skill) + if not skill then + return + end if atkRole.camp~= role.camp and BattleLogic.BuffMgr:HasBuff(skill.owner, BuffName.DOT, function (buff) return buff.damageType == sta1 end,role,sta1) then --curBuff=Buff.Create(role, BuffName.Immune, 1,4,immune) -- role:AddBuff(curBuff) @@ -7830,6 +7848,9 @@ local passivityList = { end end local function onRoleDamageBefore(skill) + if not skill then + return + end if skill and not skill.isTriggerJudge and judge==1 then return end