From 093c6d1f4112d0bc230befa46737cdd730e72106 Mon Sep 17 00:00:00 2001
From: gaoxin <gaoxin@ljsd.com>
Date: Wed, 26 Aug 2020 18:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=BC=80=E5=90=AF=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab | 2 +-
 Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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 = "鏖战中"