From 686292c315e2dfabe242801d4dbff7426e0a8389 Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Mon, 26 Aug 2024 14:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E3=80=91=E5=AE=89?=
 =?UTF-8?q?=E5=8D=93=E5=85=B3=E9=97=AD=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Art/UI/Prefab/UISettingPanel.prefab |  8 ++++----
 .../Framework/Game/GameStartLoadingExecutor.cs | 18 ++++++++++++++++++
 .../UI/Other/UIUserAgreementController.cs      |  7 +++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab b/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
index c8bff26..912d5c3 100644
--- a/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
+++ b/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
@@ -282,7 +282,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6282136984140380436
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1501,7 +1501,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 9}
+  m_AnchoredPosition: {x: 0, y: -48}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3018677660354091625
@@ -2002,7 +2002,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 26.000004}
+  m_AnchoredPosition: {x: 0, y: -31}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2708558453118498379
@@ -2137,7 +2137,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 51}
+  m_AnchoredPosition: {x: 0, y: -6}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6110508866574398123
diff --git a/Forest/Assets/Scripts/Framework/Game/GameStartLoadingExecutor.cs b/Forest/Assets/Scripts/Framework/Game/GameStartLoadingExecutor.cs
index 6bdfc49..d945d48 100644
--- a/Forest/Assets/Scripts/Framework/Game/GameStartLoadingExecutor.cs
+++ b/Forest/Assets/Scripts/Framework/Game/GameStartLoadingExecutor.cs
@@ -85,25 +85,43 @@ namespace Gameplay.LoadingExecutor
         /// </summary>
         private async UniTask InitUI()
         {
+            var isExitUI = false;
             UIRoot.Instance.BgDestroy();
             await UIManager.Instance.OpenWindow(UIConstants.UIStartMain);
 
             //用户协议 -> 登录 -> 数据同步
             if (AppInfoManager.Instance.UpdateConfirm && !GuideMananger.Instance.IsGuiding)
+            {
+                isExitUI = true;
                 await UIManager.Instance.OpenWindow(UIConstants.UISyncTip);
+            }
+
 #if UNITY_IOS
             if (!AppInfoManager.Instance.CheckIfLogin() && !LoginManager.Instance.ShowLogin &&
                 !GuideMananger.Instance.IsGuiding)
+            {
+                isExitUI = true;
                 await UIManager.Instance.OpenWindow(UIConstants.UILogin);
+            }
+
 #endif
 
             if (SettingManager.Instance.CurSettingData.FirstLaunch)
             {
+                isExitUI = true;
                 await UIManager.Instance.OpenWindow(UIConstants.UIUserAgreement);
             }
 
             if (_stayTuned)
+            {
+                isExitUI = true;
                 await UIManager.Instance.OpenWindow(UIConstants.UIStayTuned);
+            }
+
+
+            if (!isExitUI && LevelSelectManager.Instance.CurPassLevelIndex < 1 &&
+                !AppInfoManager.Instance.UpdateConfirm)
+                GuideMananger.Instance.StartGroupGuide();
         }
 
         /// <summary>
diff --git a/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs b/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs
index de0b802..d7dd7fc 100644
--- a/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs
+++ b/Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs
@@ -37,8 +37,11 @@ public class UIUserAgreementController : UIWindow
     private void OnAgree()
     {
         CloseWindow(true);
-        /*if (LevelSelectManager.Instance.CurPassLevelIndex < 1 && !AppInfoManager.Instance.UpdateConfirm)
-            GuideMananger.Instance.StartGroupGuide();*/
+#if !UNITY_IOS
+        if (LevelSelectManager.Instance.CurPassLevelIndex < 1 && !AppInfoManager.Instance.UpdateConfirm)
+            GuideMananger.Instance.StartGroupGuide();
+#endif
+
         SettingManager.Instance.SetFirstLaunch();
         BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree);
     }