Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
wangzhenxing 2021-04-27 15:50:59 +08:00
commit 06e61b64e8
1 changed files with 3 additions and 3 deletions

View File

@ -294,11 +294,11 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str)
this.timer = nil
end
this.timer = Timer.New(function()
if _timeTextExpert then
if _timeTextExpert and tostring(_timeTextExpert) ~= "null" then
if str then
_timeTextExpert.text = str..this.TimeStampToDateString(timeDown)
_timeTextExpert.text = str..this.TimeStampToDateString(timeDown)
else
_timeTextExpert.text = Language[10023]..this.TimeStampToDateString(timeDown)
_timeTextExpert.text = Language[10023]..this.TimeStampToDateString(timeDown)
end
end
if timeDown < 0 then