From 8f1d56cf8f3b92281e394e5304d2b1ec9bcf30c1 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 25 Mar 2021 09:57:51 +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=3D=E7=81=B5=E5=85=BD=E6=AF=8F=E5=9B=9E=E5=90=88?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E6=8A=80=E8=83=BD=E6=AC=A1=E6=95=B0=20?= =?UTF-8?q?=E5=88=B7=E6=96=B0=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/Misc/BattleUtil.lua | 12 ++++++++---- .../Battle/Logic/Monster/MonsterSkill/MSkill.lua | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index b81c442d10..b81eb6e7be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -376,14 +376,18 @@ function BattleUtil.ChooseTarget(role, chooseId) -- end) elseif chooseWeight ==9 then --攻击最高且没被放逐过 local list=role.exileTargets + local tempArr = {} + local team = RoleManager.Query(function (r) return r.camp ~= role.camp end) if list then - BattleUtil.SortByProp(arr,RoleDataName.Attack,sort) - for i = 1, #arr do - if not arr[i].isExile and not arr[i]:IsDead() and not BattleUtil:ChecklistIsContainValue(list,arr[i]) then - return arr[i] + for key, value in pairs(team) do + if not value:IsDead() and not BattleUtil.ChecklistIsContainValue(role.exileTargets,value) then + --return arr[i] + table.insert(tempArr,value) end end end + BattleUtil.SortByProp(tempArr,RoleDataName.Attack,sort) + arr=tempArr elseif chooseWeight ==10 then --剩余血量百分比低于25%且生命绝对值最小 return BattleUtil.GetHpPctLessThanPctHero(arr,0.25) elseif chooseWeight ==11 then --剩余血量百分比低于32%且生命绝对值最小 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua index c7d839ce23..59d60513a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua @@ -38,7 +38,7 @@ function MSkill:Init(owner, group, index, skillData) self.effectCaster = EffectCaster:New() self.effectCaster:Init(self, effects, targets) --监听回合开始消息 - BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart,function (round) + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,function (round) self.curRoundCount = 0 end) end