Merge remote-tracking branch 'remotes/origin/master' into GFG

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_QieHuanUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Login
+{
+    public partial class UI_QieHuanUI
+    {
+        public GComponent target;
+        public GComponent m_bg;
+        public GButton m_btnSubmit;
+        public GButton m_btnDow;
+        public const string URL = "ui://myoktu7po9bl5w";
+        public const string PACKAGE_NAME = "Login";
+        public const string RES_NAME = "QieHuanUI";
+        private static UI_QieHuanUI _proxy;
+
+        public static UI_QieHuanUI Create(GObject gObject = null)
+        {
+            var ui = new UI_QieHuanUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_QieHuanUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_QieHuanUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GComponent)comp.GetChild("bg");
+            m_btnSubmit = (GButton)comp.GetChild("btnSubmit");
+            m_btnDow = (GButton)comp.GetChild("btnDow");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_btnSubmit = null;
+            m_btnDow = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_QieHuanUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 648510d995698fb499ee51ddb9a038da
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -14,13 +14,27 @@ namespace GFGGame
             switch (LauncherConfig.ChannelId)
             {
                 case (int)ChannelID.Test:
-                    AliManagerr.Instance.Init();
-                    QDShareManager.Instance.Init();
+                    // AliManagerr.Instance.Init();
+                    // QDShareManager.Instance.Init();
                     break;
                 case (int)ChannelID.DouYou:
                     //QDDouYouManager.Instance.Init();
-                    AliManagerr.Instance.Init();
-                    QDShareManager.Instance.Init();
+                #if GFGZSB
+                AliManagerr.Instance.Init();
+                QDShareManager.Instance.Init();
+                #else                 
+                    if (LauncherConfig.platformId == 2)
+                    {
+                #if !UNITY_EDITOR && UNITY_IOS
+                QDDouYouManagerIos.Instance.Init();
+                #endif
+                    }
+                    else
+                    {
+                       QDDouYouManager.Instance.Init();
+                    }
+                #endif
+
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Init();
@@ -51,12 +65,25 @@ namespace GFGGame
 
                     break;
                 case (int)ChannelID.DouYou:
+                    #if GFGZSB
                     bool loginDouYou = GameController.CheckLoginCache(true);
                     if (!loginDouYou)
                     {
                         ViewManager.Hide<ModalStatusView>();
                         ViewManager.Show<LoginInputView>();
                     }
+                    #else
+                    if (LauncherConfig.platformId == 2)
+                    {
+                    #if !UNITY_EDITOR && UNITY_IOS
+                     QDDouYouManagerIos.Instance.Login();
+                    #endif
+                    }
+                    else
+                    {
+                        QDDouYouManager.Instance.Login();
+                    }       
+                    #endif
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Login();
@@ -77,7 +104,12 @@ namespace GFGGame
 
                     break;
                 case (int)ChannelID.DouYou:
-                 
+#if !GFGZSB
+                    if (LauncherConfig.platformId == 1)
+                    {
+                        QDDouYouManager.Instance.OnCreateRole();
+                    }
+#endif
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.OnCreateRole();
@@ -95,7 +127,18 @@ namespace GFGGame
 
                     break;
                 case (int)ChannelID.DouYou:
-               
+#if !GFGZSB
+                    if (LauncherConfig.platformId == 2)
+                    {
+#if !UNITY_EDITOR && UNITY_IOS
+                     QDDouYouManagerIos.Instance.OnEnterGame();
+#endif
+                    }
+                    else
+                    {
+                        QDDouYouManager.Instance.OnEnterGame();
+                    }
+#endif
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.OnEnterGame();
@@ -117,7 +160,18 @@ namespace GFGGame
 
                     break;
                 case (int)ChannelID.DouYou:
-                
+#if !GFGZSB
+                    if (LauncherConfig.platformId == 2)
+                    {
+#if !UNITY_EDITOR && UNITY_IOS
+          QDDouYouManagerIos.Instance.OnQuitToLoginView();      
+#endif
+                    }
+                    else
+                    {
+                        QDDouYouManager.Instance.OnQuitToLoginView();
+                    }
+#endif
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.OnQuitToLoginView();
@@ -138,8 +192,22 @@ namespace GFGGame
 
                     break;
                 case (int)ChannelID.DouYou:
-                    //TODO gfg支付跳转
+#if GFGZSB
+         //TODO gfg支付跳转
                     ViewManager.Show<StorePayPropView>(new object[] { buyID, orderID, price });
+#else
+                    if (LauncherConfig.platformId == 2)
+                    {
+#if !UNITY_EDITOR && UNITY_IOS
+                        QDDouYouManagerIos.Instance.Pay(buyID, count, orderID, price);
+#endif
+                    }
+                    else
+                    {
+                        QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
+                    }              
+#endif
+                    
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
@@ -168,6 +236,18 @@ namespace GFGGame
 
                     break;
                 case (int)ChannelID.DouYou:
+                    #if !GFGZSB
+                    if (LauncherConfig.platformId == 2)
+                    {
+#if !UNITY_EDITOR && UNITY_IOS
+                        QDDouYouManagerIos.Instance.Logout();
+#endif
+                    }
+                    else
+                    {
+                        QDDouYouManager.Instance.Logout();
+                    }
+                    #endif
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Logout();
@@ -188,7 +268,20 @@ namespace GFGGame
                     GameController.ShowExitAlert();
                     break;
                 case (int)ChannelID.DouYou:
-                    GameController.ShowExitAlert();
+#if GFGZSB
+              GameController.ShowExitAlert();     
+#else
+                    if (LauncherConfig.platformId == 2)
+                    {
+#if !UNITY_EDITOR && UNITY_IOS
+                        QDDouYouManagerIos.Instance.Exit();
+#endif
+                    }
+                    else
+                    {
+                        QDDouYouManager.Instance.Exit();
+                    }
+#endif
                     break;
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Exit();

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1626,13 +1626,21 @@ namespace GFGGame
             if (GameGlobal.AutoShowCompleted) return;
             if (!GameGlobal.AfterDataInited) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            #if !GFGZSB
             int isRegisterRoleInfo = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsRegisterRoleInfo);
             if (isRegisterRoleInfo == 0)
             {
                 ViewManager.Show<RoleInfoRegisterView>();
                 return;
             }
-
+            
+            if (LauncherConfig.platformId == 1 && LauncherConfig.ChannelId == (int)ChannelID.DouYou)
+            {
+                ViewManager.Show<QieHuanView>();
+                return; 
+            }
+            #endif
+            
             if (RoleDataManager.lvl < 5) return;
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
             if (GameGlobal.AutoNewPlayersTips)

GameClient/Assets/Game/HotUpdate/Views/RoleInfoRegister/QieHuanView.cs

@@ -0,0 +1,55 @@
+using UI.Login;
+using UnityEngine;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class QieHuanView : BaseWindow
+    {
+        private UI_QieHuanUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_QieHuanUI.PACKAGE_NAME;
+            _ui = UI_QieHuanUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_btnSubmit.onClick.Add(OnClickBtnSubmit);
+            _ui.m_btnDow.onClick.Add(OnClickBtnDow);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnDow()
+        {
+            Application.OpenURL("http://cdn.goufuguiwxw.com/Apk/万世镜官包.apk");
+        }
+
+        private void OnClickBtnSubmit()
+        {
+            ViewManager.Show<RoleInfoRegisterView>();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/RoleInfoRegister/QieHuanView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0528f326a201448f87b0cef328cc93ad
+timeCreated: 1735124181