Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
commit
fe7af8dc80
|
@ -256,6 +256,7 @@ function LingMaiMiJingPanel:SetTime()
|
||||||
text = TEXTLIST[3]
|
text = TEXTLIST[3]
|
||||||
else
|
else
|
||||||
end
|
end
|
||||||
|
local allStayTime=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,158).Value)
|
||||||
self.leftTime.text = string.format(text,TimeToHMS(time))
|
self.leftTime.text = string.format(text,TimeToHMS(time))
|
||||||
self.timer = Timer.New(function ()
|
self.timer = Timer.New(function ()
|
||||||
time = time - 1
|
time = time - 1
|
||||||
|
@ -263,7 +264,7 @@ function LingMaiMiJingPanel:SetTime()
|
||||||
self.leftTime.text = string.format(text,TimeToHMS(time))
|
self.leftTime.text = string.format(text,TimeToHMS(time))
|
||||||
self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 ))
|
self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 ))
|
||||||
self.recordRed:SetActive(LingMaiMiJingManager.CheckRecord())
|
self.recordRed:SetActive(LingMaiMiJingManager.CheckRecord())
|
||||||
if time <= 0 then
|
if time <= 0 or timeStayAtHere>allStayTime then
|
||||||
self:OnShow()
|
self:OnShow()
|
||||||
end
|
end
|
||||||
end, 1, -1, true)
|
end, 1, -1, true)
|
||||||
|
|
Loading…
Reference in New Issue