PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【登录】安卓关闭登录

Android_Dev
zhangaotian 2024-08-26 14:10:12 +08:00
parent d23ada4807
commit 686292c315
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
View File

@ -282,7 +282,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &6282136984140380436 --- !u!224 &6282136984140380436
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1501,7 +1501,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3018677660354091625 --- !u!222 &3018677660354091625
@ -2002,7 +2002,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2708558453118498379 --- !u!222 &2708558453118498379
@ -2137,7 +2137,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6110508866574398123 --- !u!1 &6110508866574398123

18
Forest/Assets/Scripts/Framework/Game/GameStartLoadingExecutor.cs
View File

@ -85,27 +85,45 @@ namespace Gameplay.LoadingExecutor
/// </summary> /// </summary>
private async UniTask InitUI() private async UniTask InitUI()
{ {
var isExitUI = false;
UIRoot.Instance.BgDestroy(); UIRoot.Instance.BgDestroy();
await UIManager.Instance.OpenWindow(UIConstants.UIStartMain); await UIManager.Instance.OpenWindow(UIConstants.UIStartMain);
//用户协议 -> 登录 -> 数据同步 //用户协议 -> 登录 -> 数据同步
if (AppInfoManager.Instance.UpdateConfirm && !GuideMananger.Instance.IsGuiding) if (AppInfoManager.Instance.UpdateConfirm && !GuideMananger.Instance.IsGuiding)
{
isExitUI = true;
await UIManager.Instance.OpenWindow(UIConstants.UISyncTip); await UIManager.Instance.OpenWindow(UIConstants.UISyncTip);
}
#if UNITY_IOS #if UNITY_IOS
if (!AppInfoManager.Instance.CheckIfLogin() && !LoginManager.Instance.ShowLogin && if (!AppInfoManager.Instance.CheckIfLogin() && !LoginManager.Instance.ShowLogin &&
!GuideMananger.Instance.IsGuiding) !GuideMananger.Instance.IsGuiding)
{
isExitUI = true;
await UIManager.Instance.OpenWindow(UIConstants.UILogin); await UIManager.Instance.OpenWindow(UIConstants.UILogin);
}
#endif #endif
if (SettingManager.Instance.CurSettingData.FirstLaunch) if (SettingManager.Instance.CurSettingData.FirstLaunch)
{ {
isExitUI = true;
await UIManager.Instance.OpenWindow(UIConstants.UIUserAgreement); await UIManager.Instance.OpenWindow(UIConstants.UIUserAgreement);
} }
if (_stayTuned) if (_stayTuned)
{
isExitUI = true;
await UIManager.Instance.OpenWindow(UIConstants.UIStayTuned); await UIManager.Instance.OpenWindow(UIConstants.UIStayTuned);
} }
if (!isExitUI && LevelSelectManager.Instance.CurPassLevelIndex < 1 &&
!AppInfoManager.Instance.UpdateConfirm)
GuideMananger.Instance.StartGroupGuide();
}
/// <summary> /// <summary>
/// 预加载选择关卡 /// 预加载选择关卡
/// </summary> /// </summary>

7
Forest/Assets/Scripts/Framework/UI/Other/UIUserAgreementController.cs
View File

@ -37,8 +37,11 @@ public class UIUserAgreementController : UIWindow
private void OnAgree() private void OnAgree()
{ {
CloseWindow(true); CloseWindow(true);
/*if (LevelSelectManager.Instance.CurPassLevelIndex < 1 && !AppInfoManager.Instance.UpdateConfirm) #if !UNITY_IOS
GuideMananger.Instance.StartGroupGuide();*/ if (LevelSelectManager.Instance.CurPassLevelIndex < 1 && !AppInfoManager.Instance.UpdateConfirm)
GuideMananger.Instance.StartGroupGuide();
#endif
SettingManager.Instance.SetFirstLaunch(); SettingManager.Instance.SetFirstLaunch();
BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree); BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_privacy_agree);
} }