From b6cc31125d5f4dd38bbbd9a49daabebd39012900 Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Mon, 5 Aug 2024 18:54:55 +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=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab         | 8 ++++----
 .../Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs  | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab b/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
index d2ea81d..c70fc26 100644
--- a/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
+++ b/Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
@@ -281,7 +281,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
@@ -1260,7 +1260,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: 33}
+  m_AnchoredPosition: {x: 0, y: -48}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3018677660354091625
@@ -1545,7 +1545,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: 50.000004}
+  m_AnchoredPosition: {x: 0, y: -30.999996}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2708558453118498379
@@ -1680,7 +1680,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: 75}
+  m_AnchoredPosition: {x: 0, y: -6}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6623162607416323668
diff --git a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs
index e2705a9..1e27226 100644
--- a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs
+++ b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs
@@ -105,9 +105,10 @@ namespace Gameplay.LoadingExecutor
             //用户协议 -> 登录 -> 数据同步
             if (AppInfoManager.Instance.UpdateConfirm && !GuideMananger.Instance.IsGuiding)
                 await UIManager.Instance.OpenWindow(UIConstants.UISyncTip);
-
+#if UNITY_IOS
             if (!AppInfoManager.Instance.CheckIfLogin() && !LoginManager.Instance.ShowLogin && !GuideMananger.Instance.IsGuiding)
                 await UIManager.Instance.OpenWindow(UIConstants.UILogin);
+#endif
 
             if (!PlayerPrefs.HasKey(LevelConstants.FirstLaunch))
             {