From 02f92f749fc6a8bc143ee59fe414a5a0edaba1d7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 4 Aug 2020 23:43:14 +0800 Subject: [PATCH] bug --- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 2 +- .../~Lua/Modules/Formation/FormationPanelV2.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 82dc79956c..7fdfd88e53 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -279,7 +279,7 @@ function this.InitOption() this.Option:SetActive(true) Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed()) - local IsUnLockBattlePass = BattleManager.IsUnlockBattlePass() --or AppConst.isOpenGM + local IsUnLockBattlePass = BattleManager.IsUnlockBattlePass() or (fightType == BATTLE_TYPE.BACK)--or AppConst.isOpenGM Util.GetGameObject(this.BtnExit, "lock"):SetActive(not IsUnLockBattlePass) if AppConst.isOpenGM then Util.GetGameObject(this.BtnGM, "lock"):SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index dbe91fd7e1..5a4a4d0a1d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -861,10 +861,10 @@ function this.SetOneKeyGo() -- else -- return aWarPower>bWarPower -- end - if a.warPower == b.bWarPower then + if a.warPower == b.warPower then return a.id>b.id else - return a.aWarPower > b.bWarPower + return a.warPower > b.warPower end end) --遍历英雄 去除已上阵英雄