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