巅峰战被淘汰还可自动进入战斗bug修复

zhangqiang 2020-08-19 00:09:35 +08:00
parent e61d1ae05d
commit b853030d8a
1 changed files with 4 additions and 3 deletions

View File

@ -79,8 +79,9 @@ end
-- 状态切换 -- 状态切换
local isJoin = nil local isJoin = nil
local isOver = nil local isOver = nil
local baseData
function this.StateChange(isOpen) function this.StateChange(isOpen)
local baseData = ArenaTopMatchManager.GetBaseData() baseData = ArenaTopMatchManager.GetBaseData()
-- 没开启或者开启没参赛都属于未参赛 -- 没开启或者开启没参赛都属于未参赛
isJoin = baseData.joinState == 1 isJoin = baseData.joinState == 1
isOver = baseData.progress == -2 isOver = baseData.progress == -2
@ -111,7 +112,7 @@ function this.StateChange(isOpen)
this.containPanel:SetActive(not isOpen or not isJoin or baseData.loser or isOver)-- or isOver this.containPanel:SetActive(not isOpen or not isJoin or baseData.loser or isOver)-- or isOver
this.btnRecord:SetActive(isOpen and isJoin) this.btnRecord:SetActive(isOpen and isJoin)
this.btnTeamRank:SetActive(isOpen and isJoin) this.btnTeamRank:SetActive(isOpen and isJoin)
this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END) this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END and not baseData.loser)
-- this.orggroup:SetActive(not isOpen and not isOver) -- this.orggroup:SetActive(not isOpen and not isOver)
-- this.Demons:SetActive(not isOpen and not isOver) --not isOpen or (isOpen and isOver) -- this.Demons:SetActive(not isOpen and not isOver) --not isOpen or (isOpen and isOver)
this.orggroup:SetActive(true) this.orggroup:SetActive(true)
@ -122,7 +123,7 @@ end
function this.battleDetailBtnClick() function this.battleDetailBtnClick()
local battleInfo = ArenaTopMatchManager.GetBattleInfo() local battleInfo = ArenaTopMatchManager.GetBattleInfo()
if not isJoin or (isJoin and isOver) then if not isJoin or (isJoin and isOver) or baseData.loser then
return return
end end
if battleInfo.result == -1 then if battleInfo.result == -1 then