From d33e130eca64bc94a58e0d1bffa357a47395ba35 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Thu, 13 Jan 2022 17:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=AA=97=E5=8F=A3=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
index 6f5a0b12..28ee2aa7 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
@@ -124,6 +124,7 @@ namespace Assets.Scenes.Ride.Scripts
 
         GameObject QuitButton;
         GameObject CancelButton;
+        GameObject modalPanel;
         private void InitGameObject()
         {
             #region 控件获取与事件绑定
@@ -177,11 +178,11 @@ namespace Assets.Scenes.Ride.Scripts
             selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject;
             reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject;
 #if UNITY_IOS || UNITY_ANDROID
-            var modalPanel = transform.Find("ModalPanel");
+            modalPanel = transform.Find("ModalPanel").gameObject;
             var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/CancelPanel");
             var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/QuitPanel");
-            quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel);
-            cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel);
+            quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel.transform);
+            cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel.transform);
             quitPanel.SetActive(false);
             cancelPanel.SetActive(false);
 #else
@@ -512,6 +513,7 @@ namespace Assets.Scenes.Ride.Scripts
                 mainController.SetQuit();
                 playerController?.Upload();
                 quitPanel.SetActive(false);
+                modalPanel.SetActive(false);
             }
             else
             {
@@ -521,6 +523,7 @@ namespace Assets.Scenes.Ride.Scripts
         //不保存退出
         public virtual void CancelQuit(BaseEventData baseEventData)
         {
+            modalPanel.SetActive(false);
             quitPanel.SetActive(false);
             mainController.ClearTempFile();
             SceneManager.LoadScene("MainScene");
@@ -529,6 +532,7 @@ namespace Assets.Scenes.Ride.Scripts
         public void CloseQuit(BaseEventData baseEventData)
         {
             quitPanel.SetActive(false);
+            modalPanel.SetActive(false);
         }
         //切换视角
         public void ChangeView(BaseEventData baseEventData)
@@ -545,17 +549,20 @@ namespace Assets.Scenes.Ride.Scripts
         protected virtual void CancelStopShortRide(BaseEventData baseEventData)
         {
             cancelPanel.SetActive(false);
+            modalPanel.SetActive(false);
         }
         //结束游戏
         protected virtual void StopRide(BaseEventData baseEventData)
         {
             if (playerController?.TotalTicks > 0 && playerController ?.TotalDistance > 0.1f)
             {
+                modalPanel.SetActive(true);
                 quitPanel.SetActive(true);
                 quitPanel.transform.SetAsLastSibling();
             }
             else
             {
+                modalPanel.SetActive(true);
                 cancelPanel.SetActive(true);
                 cancelPanel.transform.SetAsLastSibling();
             }