From 5bc1bec425356116ac03c1a1a42b9934c4cdb9d0 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 13 Jan 2022 18:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8Bloading=E5=92=8C=E9=80=80?= =?UTF-8?q?=E5=87=BA=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/Match/CountDownPanel.prefab | 4 ++-- .../Resources/UI/Prefab/Ride/CancelPanel.prefab | 2 +- .../UI/Prefab/Ride/Mobile/CancelPanel.prefab | 2 +- .../Ride/Competiton/CompetitionUIManager.cs | 1 + .../Scenes/Ride/Scripts/BaseUIManager.cs | 17 +++++++++-------- .../Scenes/Ride/Scripts/RouteController.cs | 8 ++++---- Assets/Scripts/UI/Control/PfUIButton.cs | 6 +++--- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab b/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab index f148eae9..14b0c113 100644 --- a/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab @@ -156,7 +156,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Riding Time + m_Text: 'Get Ready:' --- !u!114 &3886708269221531246 MonoBehaviour: m_ObjectHideFlags: 0 @@ -248,7 +248,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Get Ready + m_Text: Competition Time --- !u!114 &5952686733100152547 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab b/Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab index 445f462d..438304ee 100644 --- a/Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab @@ -5325,7 +5325,7 @@ GameObject: - component: {fileID: 8046915994613852834} - component: {fileID: 5739020646471174006} m_Layer: 5 - m_Name: CancelButton + m_Name: CloseButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab index bd66d75e..77c2cd19 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 2981122519614947927} - component: {fileID: 2993340167898118021} m_Layer: 5 - m_Name: CancelButton + m_Name: CloseButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs index 9f3cfec5..d4d17cad 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs @@ -149,6 +149,7 @@ namespace Assets.Scenes.Ride.Scripts mainController.SetQuit(); playerController.Upload(); quitPanel.SetActive(false); + transform.Find("modalPanel").gameObject.SetActive(false); } ShowResultList();//保存显示当前排名 } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs index 28ee2aa7..e0fb06e1 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs @@ -125,6 +125,7 @@ namespace Assets.Scenes.Ride.Scripts GameObject QuitButton; GameObject CancelButton; GameObject modalPanel; + GameObject CancelCloseQuitButton; private void InitGameObject() { #region 控件获取与事件绑定 @@ -177,25 +178,23 @@ namespace Assets.Scenes.Ride.Scripts selectPanel = uipanel.transform.Find("SelectPanel").gameObject; selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject; reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject; -#if UNITY_IOS || UNITY_ANDROID modalPanel = transform.Find("ModalPanel").gameObject; +#if UNITY_IOS || UNITY_ANDROID var cancelPanelPrefab = Resources.Load("UI/Prefab/Ride/Mobile/CancelPanel"); var quitPanelPrefab = Resources.Load("UI/Prefab/Ride/Mobile/QuitPanel"); quitPanel = Instantiate(quitPanelPrefab, modalPanel.transform); cancelPanel = Instantiate(cancelPanelPrefab, modalPanel.transform); - quitPanel.SetActive(false); - cancelPanel.SetActive(false); #else - var modalPanel = transform.Find("ModalPanel"); var cancelPanelPrefab = Resources.Load("UI/Prefab/Ride/CancelPanel"); var quitPanelPrefab = Resources.Load("UI/Prefab/Ride/QuitPanel"); - quitPanel = Instantiate(quitPanelPrefab, modalPanel); - cancelPanel = Instantiate(cancelPanelPrefab, modalPanel); + quitPanel = Instantiate(quitPanelPrefab, modalPanel.transform); + cancelPanel = Instantiate(cancelPanelPrefab, modalPanel.transform); +#endif quitPanel.SetActive(false); cancelPanel.SetActive(false); -#endif QuitButton = cancelPanel.transform.Find("QuitButton").gameObject; CancelButton = cancelPanel.transform.Find("CancelButton").gameObject; + CancelCloseQuitButton = cancelPanel.transform.Find("CloseButton").gameObject; pauseButton = uipanel.transform.Find("ToolBarPanel/StartOrPauseButton").GetComponent