From 6ace7b50ab96f39210d15ae55b689f72be25e161 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 5 Nov 2021 13:17:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8154=20=20200=20=20=20360=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e3a694229c..5b47222daf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -3224,6 +3224,7 @@ local passivityList = { counter = counter + 1 if counter <= i1 then deadRole:SetRelive(f1,role) + f1 = args[2] end end end) @@ -4336,7 +4337,7 @@ local passivityList = { damagingFunc(shareDamage) end -- 分担伤害 - BattleUtil.ApplyDamage(skill, atkRole, role, shareDamage,false,3,dotType,true) + BattleUtil.ApplyDamageNoPassive(skill, atkRole, role, shareDamage,false,3,dotType,true) end end BattleLogic.Event:AddEvent(BattleEventName.FinalDamage, onFinalDamage,nil,nil,role) @@ -8647,7 +8648,7 @@ local passivityList = { if skill.owner.job==job then return end - if skill.type == BattleSkillType.Special then + if (skill.type == BattleSkillType.Special or skill.type == BattleSkillType.Extra ) and not skill.isAdd then BattleUtil.RandomAction(v1, function () role:AddSkill(BattleSkillType.Normal, false, true, nil) time=time+1