diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index f006849fb5..c258d9b96c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4026,7 +4026,6 @@ local passivityList = { local deltaRage = allRage - num if deltaRage > 0 then local dd = BattleUtil.CountValue(damage, f1 * deltaRage, 2) - damage - LogError(" add damage=="..dd.."dddelta rage=="..deltaRage) damagingFunc(-floor(BattleUtil.ErrorCorrection(dd))) end end @@ -7578,7 +7577,6 @@ local passivityList = { end end end - LogError("list len=="..#list.." len=="..#burnList ) BattleUtil.RandomAction(p1*#burnList,function() BattleUtil.CalRage(role,role,num,ct) end) @@ -7591,7 +7589,6 @@ local passivityList = { if not skill then return end - LogError("111111111111") if not BattleUtil.ChecklistIsContainValue(burnList,defRole.position) then table.insert(burnList,defRole.position) end @@ -7654,7 +7651,6 @@ local passivityList = { local list=skill:GetDirectTargets() local target=RoleManager.GetAggroHero(role,list) if target and BattleUtil.LengthOfTable(target)>0 then - LogError("target=="..target[1].position) role.curMainTarget=target[1] end end @@ -7691,6 +7687,7 @@ local passivityList = { BattleUtil.RandomAction(p1*num,function() BattleUtil.CalRage(role, role,v1, CountTypeName.Add) end) + num=0 end role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role) role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua index 3a9f864594..4e27a1996b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua @@ -126,11 +126,22 @@ local _ConditionConfig = { [13]=function(condition) local v1 = condition[1] local v2 = condition[2] + local list=HardStageEventManager.GetCtrlNumList() - if list and list[v1] then - if list[v1]>=v2 then - return 1 - end + if list then + if v1==0 then + local num=0 + for key, value in pairs(list) do + num=num+value + end + if num>=v2 then + return 1 + end + else + if list[v1] and list[v1]>=v2 then + return 1 + end + end end return 0 end,