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)