diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 392183e688..4f252cd78f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -24159,7 +24159,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 00:00:00 --- !u!1 &2506448387144089739 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index bb3bbe72ce..309bd8ab07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1403,13 +1403,14 @@ function this.TimeFormat() this.topMatchBtn:SetActive(isActive) end end + local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) local baseInfo = ArenaTopMatchManager.GetBaseData() - if 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) elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then SetTopMatchActive(true) - local tempTime = this.baseInfo.endTime - PlayerManager.serverTime - this.topMatchTime.text = "距开始"..TimeToHMS(tempTime) + local tempTime = baseInfo.endTime - PlayerManager.serverTime + this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime) else SetTopMatchActive(true) this.topMatchTime.text = "鏖战中"