From 88516ad0e2dd8d96719cc5dcded665b8f111bd88 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 26 Oct 2020 19:43:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E5=8A=A0?= =?UTF-8?q?=E8=A1=80=E6=99=AE=E6=94=BB=E4=BC=9A=E8=A7=A6=E5=8F=91=E9=99=8D?= =?UTF-8?q?=E6=80=92=E8=A2=AB=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A2=AB=E5=8A=A8=E6=8A=80=E8=83=BD195?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=85=8D=E7=96=AB=E6=94=B9=E4=B8=BA=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=85=8D=E7=96=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index fad0520be9..a93b816a30 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2947,7 +2947,8 @@ local passivityList = { [156] = function(role, args) local i1 = args[1] local onBeSkillCastEnd = function(skill) - if skill.type == BattleSkillType.Normal then + --同阵营给自己普攻加血不扣除怒气 + if skill.owner.camp~=role.camp and skill.type == BattleSkillType.Normal then skill.owner:AddRage(i1, CountTypeName.Sub) end end @@ -3775,9 +3776,20 @@ local passivityList = { -- a[控制状态] [195] = function(role, args) local ctrl = args[1] - + local ctr2 = args[2] + local ctr3 = args[3] + local ctrls={} + if ctrl then + table.insert(ctrls,ctrl) + end + if ctr2 then + table.insert(ctrls,ctr2) + end + if ctr3 then + table.insert(ctrls,ctr3) + end local immune = function(buff) - return buff.type == BuffName.Control and (ctrl == 0 or buff.ctrlType == ctrl) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)) end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, function(curRound)