Merge branch 'master_develop' into master_tishen_hw
commit
0a1f0ab643
|
@ -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
|
if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then
|
||||||
SetTopMatchActive(false)
|
SetTopMatchActive(false)
|
||||||
elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then
|
elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then
|
||||||
SetTopMatchActive(true)
|
|
||||||
local startTime = ArenaTopMatchManager.GetTopMatchTime()
|
local startTime = ArenaTopMatchManager.GetTopMatchTime()
|
||||||
local tempTime = startTime - PlayerManager.serverTime
|
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
|
else
|
||||||
SetTopMatchActive(true)
|
SetTopMatchActive(true)
|
||||||
this.topMatchTime.text = "鏖战中"
|
this.topMatchTime.text = "鏖战中"
|
||||||
|
|
Loading…
Reference in New Issue