zhangqiang 2020-08-04 23:43:14 +08:00
parent eff314bf31
commit 02f92f749f
2 changed files with 3 additions and 3 deletions

View File

@ -279,7 +279,7 @@ function this.InitOption()
this.Option:SetActive(true) this.Option:SetActive(true)
Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed()) 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) Util.GetGameObject(this.BtnExit, "lock"):SetActive(not IsUnLockBattlePass)
if AppConst.isOpenGM then if AppConst.isOpenGM then
Util.GetGameObject(this.BtnGM, "lock"):SetActive(false) Util.GetGameObject(this.BtnGM, "lock"):SetActive(false)

View File

@ -861,10 +861,10 @@ function this.SetOneKeyGo()
-- else -- else
-- return aWarPower>bWarPower -- return aWarPower>bWarPower
-- end -- end
if a.warPower == b.bWarPower then if a.warPower == b.warPower then
return a.id>b.id return a.id>b.id
else else
return a.aWarPower > b.bWarPower return a.warPower > b.warPower
end end
end) end)
--遍历英雄 去除已上阵英雄 --遍历英雄 去除已上阵英雄