Merge branch 'master_develop' into master_tishen_hw

dev_chengFeng
JieLing 2020-08-28 01:40:05 +08:00
commit 0a1f0ab643
1 changed files with 7 additions and 2 deletions

View File

@ -1408,10 +1408,15 @@ function this.TimeFormat()
if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then
SetTopMatchActive(false)
elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then
SetTopMatchActive(true)
local startTime = ArenaTopMatchManager.GetTopMatchTime()
local tempTime = startTime - PlayerManager.serverTime
this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime)
-- 当日五点开始显示
if tempTime < 16 * 60 * 60 then
SetTopMatchActive(true)
this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime)
else
SetTopMatchActive(false)
end
else
SetTopMatchActive(true)
this.topMatchTime.text = "鏖战中"