From 31f1354b190a3a693c2c6f5a10cc0b89a3397ec0 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 31 Mar 2021 16:59:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=89=E7=95=8C=E9=99=A4=E9=AD=94?= =?UTF-8?q?=E3=80=91=E5=85=A5=E5=8F=A3=E6=B6=88=E5=A4=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a4f0962c42..88f99e287b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1042,12 +1042,12 @@ function this.TimeFormat() local extraTime = 0 if ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Type",v.ActiveType).GapTime and ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Type",v.ActiveType).GapTime > 0 then extraTime = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Type",v.ActiveType).GapTime*86400 - end - local tempTime = info.endTime - GetTimeStamp() - extraTime - if tempTime > 86400 then - activityTabs[k].timeText.text = TimeToDH(tempTime) - elseif tempTime > 0 then - activityTabs[k].timeText.text = TimeToHMS(tempTime) + end + local tempTime = info.endTime - GetTimeStamp() + if tempTime - extraTime > 0 then + activityTabs[k].timeText.text = TimeToFelaxible(tempTime - extraTime) + elseif tempTime > 0 and tempTime < extraTime then + activityTabs[k].timeText.text = TimeToFelaxible(tempTime) else activityTabs[k].go.gameObject:SetActive(false) end