Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

.gitignore

@@ -45,6 +45,7 @@
 /GameClient/Assets/StreamingAssets/Bundles.meta
 /GameClient/Assets/StreamingAssets
 /StaticRes
+/GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar.meta
 /GameClient/Assets/Plugins/Android/libs/douyouTT-release.aar

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -295,7 +295,7 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.LoginOutBefore();
                     break;
                 default:

GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef

@@ -8,7 +8,8 @@
         "GUID:b0a84d582f6a6fa4185f67ce934d99c2",
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:d9a5d47c553a04a28a7d21a3f3fc8dc3",
-        "GUID:9b1c19877f4294a9cb33ff38fc9f1c83"
+        "GUID:9b1c19877f4294a9cb33ff38fc9f1c83",
+        "GUID:f22fac247a56d2d41b687bb0d900e54e"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

GameClient/Assets/Game/HotUpdate/HotUpdateDriver.cs

@@ -1,8 +1,5 @@
-using GFGGame.Launcher;
-using System.Collections;
-using UniFramework.Pooling;
+using UniFramework.Pooling;
 using UnityEngine;
-using YooAsset;
 
 namespace GFGGame
 {
@@ -21,8 +18,7 @@ namespace GFGGame
             OperationSystem.Initialize();
             GameController.Start();
             Reporter reporter = GameObject.Find("Reporter").GetComponent<Reporter>();
-            if ((LauncherConfig.ChannelId != (int)ChannelID.Test &&
-                 LauncherConfig.ChannelId != (int)ChannelID.DouYouTest) && reporter != null)
+            if ((LauncherConfig.ChannelId != (int)ChannelID.Test) && reporter != null)
             {
                 reporter.numOfCircleToShow = 5;
             }

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

@@ -32,28 +32,31 @@ namespace GFGGame
 
         public void OnCreateRole()
         {
-            var zoneScene = GameGlobal.zoneScene;
-            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
-            
-            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-
-            QDDouYouManagerInit.Instance.ReportRole((int)DouYouRoleLogReportType.CreateRole,
-                roleInfo.Id.ToString(), 1.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(),
-                serverName);
+            QDManager.PushRoleAction(DouYouRoleLogReportType.CreateRole);
         }
 
         public void OnEnterGame()
         {
-            Debug.Log($"DouYou OnEnterGame");
             var zoneScene = GameGlobal.zoneScene;
+            if (zoneScene == null) return;
+            
+            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+            
             var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+            if (roleInfo == null) return;
+            
+            if (GameGlobal.myNumericComponent == null) return;
             int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+ 
+            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+
             string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
 
             QDDouYouManagerInit.Instance.ReportRoleLogin(roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name,
                 roleInfo.ServerId.ToString(), serverName);
-            QDDouYouManagerInit.Instance.ReportRole((int)DouYouRoleLogReportType.EnterGame,
-                roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(), serverName);
+            QDManager.PushRoleAction(DouYouRoleLogReportType.EnterGame);
         }
 
         public void OnQuitToLoginView()
@@ -69,14 +72,7 @@ namespace GFGGame
 
         public void LoginOutBefore()
         {
-            var zoneScene = GameGlobal.zoneScene;
-            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
-            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-
-            QDDouYouManagerInit.Instance.ReportRole((int)DouYouRoleLogReportType.ExitGame,
-                roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(),
-                serverName);
+            QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
         }
 
         public void Pay(int buyID, int count, string orderID, long price)
@@ -96,8 +92,20 @@ namespace GFGGame
             }
 
             var zoneScene = GameGlobal.zoneScene;
-            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+            if (zoneScene == null) return;
+            
+            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+            
             var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+            if (roleInfo == null) return;
+            
+            if (GameGlobal.myNumericComponent == null) return;
+            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+ 
+            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+
             string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
 
             //自定义参数
@@ -109,18 +117,14 @@ namespace GFGGame
 
         public void Exit()
         {
-            var zoneScene = GameGlobal.zoneScene;
-            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
-            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-
-            QDDouYouManagerInit.Instance.ReportRole((int)DouYouRoleLogReportType.ExitGame,
-                roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(),
-                serverName);
+            QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
             QDDouYouManagerInit.Instance.ExitApp();
         }
     }
 
+    /// <summary>
+    /// SDK回调
+    /// </summary>
     public class DouYouSDKListener : IDouYouSDKListener
     {
         // /// <summary>
@@ -132,15 +136,14 @@ namespace GFGGame
         //     Debug.Log($"Game.HotUpdate ReceiveMessageAb:{message}");
         // }
 
-        // /// <summary>
-        // /// SDK实例化成功
-        // /// </summary>
-        // /// <param name="message">SDK 实例化成功</param>
-        // public void InitSuccessAb(string message)
-        // {
-        //     Debug.Log("Game.HotUpdate InitSuccessAb: " + message);
-        //     //UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
-        // }
+        /// <summary>
+        /// SDK实例化成功
+        /// </summary>
+        /// <param name="message">SDK 实例化成功</param>
+        public void InitSuccessAb(string message)
+        {
+            Debug.Log("Game.HotUpdate InitSuccessAb: " + message);
+        }
 
         /// <summary>
         /// 登录成功 
@@ -187,6 +190,7 @@ namespace GFGGame
         {
             Debug.Log("Game.HotUpdate PaySuccessAb" + message);
             //改变临时订单状态为支付成功
+            QDManager.PushRoleAction(DouYouRoleLogReportType.Pay);
         }
 
         #region SDK 生命周期函数
@@ -196,15 +200,15 @@ namespace GFGGame
             Debug.Log($"Game.HotUpdate SdkOnStartAb:{message}");
         }
 
-        // public void SdkOnPauseAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnPauseAb:{message}");
-        // }
+        public void SdkOnPauseAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnPauseAb:{message}");
+        }
 
-        // public void SdkOnResumeAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnResumeAb:{message}");
-        // }
+        public void SdkOnResumeAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnResumeAb:{message}");
+        }
 
         public void SdkOnStopAb(string message)
         {
@@ -246,15 +250,15 @@ namespace GFGGame
             Debug.Log($"Game.HotUpdate SdkOnActivityResultAb:{message}");
         }
 
-        // public void SdkOnRequestPermissionResultAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnRequestPermissionResultAb:{message}");
-        // }
+        public void SdkOnRequestPermissionResultAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnRequestPermissionResultAb:{message}");
+        }
 
-        // public void SdkOnWindowFocusChangedAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnWindowFocusChangedAb:{message}");
-        // }
+        public void SdkOnWindowFocusChangedAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnWindowFocusChangedAb:{message}");
+        }
 
         #endregion
     }

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

@@ -1,4 +1,5 @@
 using ET;
+using GFGGame.Launcher;
 using UnityEngine;
 
 namespace GFGGame
@@ -12,10 +13,15 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                default:
+                case (int)ChannelID.Test:
+                    QDShareManager.Instance.Init();
+                    break;
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Init();
                     QDShareManager.Instance.Init();
                     break;
+                default:
+                    break;
             }
         }
 
@@ -24,9 +30,6 @@ namespace GFGGame
             ViewManager.Show<ModalStatusView>("登录中...");
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
                     bool login = GameController.CheckLoginCache(true);
                     if (!login)
@@ -36,7 +39,7 @@ namespace GFGGame
                     }
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Login();
                     break;
                 default:
@@ -48,13 +51,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.OnCreateRole();
                     break;
                 default:
@@ -66,13 +66,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.OnEnterGame();
                     break;
                 default:
@@ -85,13 +82,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.OnQuitToLoginView();
                     break;
                 default:
@@ -103,13 +97,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
                     break;
                 default:
@@ -126,16 +117,13 @@ namespace GFGGame
             {
                 PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
             }
-            
+
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Logout();
                     break;
                 default:
@@ -150,7 +138,7 @@ namespace GFGGame
                 case (int)ChannelID.Test:
                     GameController.ShowExitAlert();
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Exit();
                     break;
                 default:
@@ -158,33 +146,49 @@ namespace GFGGame
             }
         }
 
+        //上报角色行为给sdk
+        public static void PushRoleAction(DouYouRoleLogReportType reportType)
+        {
+            //改名上报给sdk
+            var zoneScene = GameGlobal.zoneScene;
+            if (zoneScene == null) return;
+
+            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+
+            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+            if (roleInfo == null) return;
+
+            if (GameGlobal.myNumericComponent == null) return;
+            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+
+            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+
+            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
+            QDDouYouManagerInit.Instance.ReportRole((int)reportType,
+                roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(),
+                serverName);
+        }
+
         public static bool IsTaptap
         {
             get { return LauncherConfig.ChannelId == (int)ChannelID.TapTap; }
         }
-        
+
         public static bool IsHYKB
         {
-            get
-            {
-                return LauncherConfig.ChannelId == (int)ChannelID.HYKB;
-            }
+            get { return LauncherConfig.ChannelId == (int)ChannelID.HYKB; }
         }
 
         public static bool IsBiliBili
         {
-            get
-            {
-                return LauncherConfig.ChannelId == (int)ChannelID.BiliBili;
-            }
+            get { return LauncherConfig.ChannelId == (int)ChannelID.BiliBili; }
         }
 
         public static bool IsHuaWei
         {
-            get
-            {
-                return LauncherConfig.ChannelId == (int)ChannelID.HUAWEI;
-            }
+            get { return LauncherConfig.ChannelId == (int)ChannelID.HUAWEI; }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using ET;
+using GFGGame.Launcher;
 
 namespace GFGGame
 {
@@ -130,6 +131,7 @@ namespace GFGGame
                 {
                     GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().Name = response.Name;
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_NAME);
+                    QDManager.PushRoleAction(DouYouRoleLogReportType.LevelUp);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/LogUtil.cs

@@ -34,8 +34,7 @@ namespace GFGGame
 
         public static void LogDev(string content)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.Log($"dev log : {content}");
             }
@@ -43,8 +42,7 @@ namespace GFGGame
 
         public static void LogFormatDev(string content, params object[] args)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogFormat($"dev log : {content}", args);
             }
@@ -52,8 +50,7 @@ namespace GFGGame
 
         public static void LogWarningDev(string content)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogWarning($"dev warning {content}");
             }
@@ -61,8 +58,7 @@ namespace GFGGame
 
         public static void LogWarningFormatDev(string content, params object[] args)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogWarningFormat($"dev warning {content}", args);
             }

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -202,13 +202,10 @@ namespace GFGGame
 
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.LoginOutBefore();
                     break;
                 default:

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -149,8 +149,7 @@ namespace GFGGame
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
 
-            if ((LauncherConfig.ChannelId != (int)ChannelID.Test &&
-                 LauncherConfig.ChannelId != (int)ChannelID.DouYouTest) &&
+            if ((LauncherConfig.ChannelId != (int)ChannelID.Test) &&
                 !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 // 临时设置都可以跳过对话

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

@@ -7,6 +7,7 @@ using System.Linq;
 using Assets.Game.HotUpdate.Data;
 using System.Collections;
 using System;
+using GFGGame.Launcher;
 
 namespace GFGGame
 {
@@ -876,6 +877,7 @@ namespace GFGGame
             {
                 UpdateRoleLvl();
                 CheckFunOpen();
+                QDManager.PushRoleAction(DouYouRoleLogReportType.LevelUp);
             }
             if (numericType == NumericType.FirstRechargeBonusStatus || numericType == NumericType.FirstRechargeTotal)
             {

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -4,7 +4,15 @@ namespace GFGGame
 {
     public class LauncherConfig
     {
-        public enum EnumNetType { DEV, LOCAL, TEMP, TISHEN, PUBLIC }
+        public enum EnumNetType
+        {
+            DEV,
+            LOCAL,
+            TEMP,
+            TISHEN,
+            PUBLIC
+        }
+
         public static EnumNetType netType = EnumNetType.LOCAL;
         public static string cfgName;
 
@@ -16,47 +24,61 @@ namespace GFGGame
 
         public const string SQL_FILE_NAME = "excelConfig.sqlite.bytes";
 
-        public const string LAST_LOGIN_IS_AGREE_KEY = "LAST_LOGIN_IS_AGREE_KEY_6";//上次登录是否同意隐私政策
+        public const string LAST_LOGIN_IS_AGREE_KEY = "LAST_LOGIN_IS_AGREE_KEY_6"; //上次登录是否同意隐私政策
 
         public static string CDN_ROOT;
         public static string launcherRootUrl;
+
         public static string cfgUrl;
+
         //平台id
         public static int platformId = 1;
+
         //渠道id
         public static int ChannelId = 101;
-        public static string logApiRootUrl;//上报普通日志接口
-        public static string logApiReportLauncherUrl;//上报节点日志接口
+        public static string logApiRootUrl; //上报普通日志接口
+        public static string logApiReportLauncherUrl; //上报节点日志接口
+
         public static string apkVersion;
+
         //0 正常，1 维护中
         public static int serverStatus;
+
         public static string statusPrompt;
+
         //0 关闭所有log界面，1 开启后台log界面， 2 开启弹窗log界面
         public static int onDebug;
+
         //AB资源版本
         public static string manifest_v;
+
         //隐私政策文件地址模版
         public static string privacy_v;
         public static string updateAppPrompt;
         public static string updateResPrompt;
         public static int promptSizeMB;
+
         public static string updateUrl;
 
+        //新发行给的adId
+        public static string douYouAdId;
+
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "http://gfgclient.obs.cn-north-4.myhuaweicloud.com/";
+            launcherRootUrl = "http://gfg-client.obs.cn-north-4.myhuaweicloud.com/";
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_dev";
+            ChannelId = (int)ChannelID.Test;
 #elif PT_TAPTAP
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_taptap";
             ChannelId = (int)ChannelID.TapTap;
 #elif PT_DOUYOU
-            netType = EnumNetType.LOCAL;
-            cfgName = "cfg_sdkTest";
-            ChannelId = 22;
+            netType = EnumNetType.PUBLIC;
+            cfgName = "cfg_douyou";
+            ChannelId = (int)ChannelID.DouYou;
 #elif PT_IOS
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_ios";
@@ -68,7 +90,7 @@ namespace GFGGame
 #else
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_local";
-            //launcherRootUrl = "http://10.108.64.189:81/";
+            ChannelId = (int)ChannelID.Test;
 #endif
 
             cfgUrl = launcherRootUrl + "platform/{cfgName}.json";
@@ -78,26 +100,31 @@ namespace GFGGame
         {
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
-            // CDN_ROOT = "http://10.108.64.143/";
             LauncherConfig.logApiRootUrl = result.logApiUrl;
-            //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";
             LauncherConfig.apkVersion = result.apkVersion;
-            if(!string.IsNullOrEmpty(result.serverStatus))
+            if (!string.IsNullOrEmpty(result.serverStatus))
             {
                 LauncherConfig.serverStatus = int.Parse(result.serverStatus);
             }
-            if(!string.IsNullOrEmpty(result.onDebug))
+
+            if (!string.IsNullOrEmpty(result.onDebug))
             {
                 LauncherConfig.onDebug = int.Parse(result.onDebug);
             }
+
+            if (!string.IsNullOrEmpty(result.douYouAdId))
+            {
+                LauncherConfig.douYouAdId = result.douYouAdId;
+            }
+
             LauncherConfig.manifest_v = result.manifest_v;
             LauncherConfig.privacy_v = result.privacy_v;
             LauncherConfig.statusPrompt = result.statusPrompt;
             LauncherConfig.updateAppPrompt = result.updateAppPrompt;
             LauncherConfig.updateResPrompt = result.updateResPrompt;
             LauncherConfig.updateUrl = result.updateUrl;
-            if(!string.IsNullOrEmpty(result.promptSizeMB))
+            if (!string.IsNullOrEmpty(result.promptSizeMB))
             {
                 LauncherConfig.promptSizeMB = int.Parse(result.promptSizeMB);
             }
@@ -117,7 +144,7 @@ namespace GFGGame
             public string updateResPrompt;
             public string promptSizeMB;
             public string updateUrl;
+            public string douYouAdId;
         }
-
     }
 }

GameClient/Assets/Game/Launcher/Platform/IDouYouSDKListener.cs

@@ -4,7 +4,7 @@
     {
         //public void ReceiveMessageAb(string message);
 
-        //public void InitSuccessAb(string message);
+        public void InitSuccessAb(string message);
 
         public void LoginSuccessAb(string message);
 
@@ -16,9 +16,9 @@
 
         public void SdkOnStartAb(string message);
 
-        //public void SdkOnPauseAb(string message);
+        public void SdkOnPauseAb(string message);
 
-        //public void SdkOnResumeAb(string message);
+        public void SdkOnResumeAb(string message);
 
         public void SdkOnStopAb(string message);
 
@@ -36,8 +36,8 @@
 
         public void SdkOnActivityResultAb(string message);
 
-        //public void SdkOnRequestPermissionResultAb(string message);
+        public void SdkOnRequestPermissionResultAb(string message);
 
-        //public void SdkOnWindowFocusChangedAb(string message);
+        public void SdkOnWindowFocusChangedAb(string message);
     }
 }

GameClient/Assets/Game/Launcher/Platform/QDDouYouManagerInit.cs

@@ -41,12 +41,6 @@ namespace GFGGame.Launcher
             _douYouMainActivity.Call(functionName, args);
         }
 
-        //临时获取adId,之后需要配置到配置文件里面,已达到热更
-        public string GetAdId()
-        {
-            return "123";
-        }
-
         /// <summary>
         /// 显示登录界面
         /// </summary>
@@ -145,8 +139,9 @@ namespace GFGGame.Launcher
             /// <param name="message">SDK 实例化成功</param>
             public override void InitSuccessAb(string message)
             {
-                Debug.Log("InitSuccessAb: " + message);
                 UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
+                QDDouYouManagerInit.Instance.douYouSDKListener?.InitSuccessAb(message);
+                Debug.Log($"InitSuccess:{message}");
             }
 
             /// <summary>
@@ -156,7 +151,7 @@ namespace GFGGame.Launcher
             public override void LoginSuccessAb(string message)
             {
                 Debug.Log("LoginSuccessAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.LoginSuccessAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.LoginSuccessAb(message);
             }
 
             /// <summary>
@@ -166,7 +161,7 @@ namespace GFGGame.Launcher
             public override void OutLoginSuccessAb(string message)
             {
                 Debug.Log("OutLoginSuccessAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.OutLoginSuccessAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.OutLoginSuccessAb(message);
             }
 
             /// <summary>
@@ -176,7 +171,7 @@ namespace GFGGame.Launcher
             public override void PayFailAb(string message)
             {
                 Debug.Log("PayFailAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.PayFailAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.PayFailAb(message);
             }
 
             /// <summary>
@@ -186,7 +181,7 @@ namespace GFGGame.Launcher
             public override void PaySuccessAb(string message)
             {
                 Debug.Log("PaySuccessAb" + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.PaySuccessAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.PaySuccessAb(message);
             }
 
             #region SDK 生命周期函数
@@ -194,75 +189,79 @@ namespace GFGGame.Launcher
             public override void SdkOnStartAb(string message)
             {
                 Debug.Log($"SdkOnStartAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnStartAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStartAb(message);
             }
 
             public override void SdkOnPauseAb(string message)
             {
                 Debug.Log($"SdkOnPauseAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnPauseAb(message);
             }
 
             public override void SdkOnResumeAb(string message)
             {
                 Debug.Log($"SdkOnResumeAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnResumeAb(message);
             }
 
             public override void SdkOnStopAb(string message)
             {
                 Debug.Log($"SdkOnStopAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnStopAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStopAb(message);
             }
 
             public override void SdkOnDestroyAb(string message)
             {
                 Debug.Log($"SdkOnDestroyAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnDestroyAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnDestroyAb(message);
             }
 
             public override void SdkOnRestartAb(string message)
             {
                 Debug.Log($"SdkOnRestartAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnRestartAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRestartAb(message);
             }
 
             public override void SdkOnBackPressedAb(string message)
             {
                 Debug.Log($"SdkOnBackPressedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnBackPressedAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnBackPressedAb(message);
             }
 
             public override void SdkOnNewIntentAb(string message)
             {
                 Debug.Log($"SdkOnNewIntentAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnNewIntentAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnNewIntentAb(message);
             }
 
             public override void SdkOnConfigurationChangedAb(string message)
             {
                 Debug.Log($"SdkOnConfigurationChangedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnConfigurationChangedAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnConfigurationChangedAb(message);
             }
 
             public override void SdkOnSaveInstanceStateAb(string message)
             {
                 Debug.Log($"SdkOnSaveInstanceStateAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnSaveInstanceStateAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnSaveInstanceStateAb(message);
             }
 
             public override void SdkOnActivityResultAb(string message)
             {
                 Debug.Log($"SdkOnActivityResultAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnActivityResultAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnActivityResultAb(message);
             }
 
             public override void SdkOnRequestPermissionResultAb(string message)
             {
                 Debug.Log($"SdkOnRequestPermissionResultAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRequestPermissionResultAb(message);
             }
 
             public override void SdkOnWindowFocusChangedAb(string message)
             {
                 Debug.Log($"SdkOnWindowFocusChangedAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnWindowFocusChangedAb(message);
             }
 
             #endregion

GameClient/Assets/Game/Launcher/Platform/QDManagerInit.cs

@@ -9,8 +9,8 @@ namespace GFGGame.Launcher
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.DouYouTest:
-                    QDDouYouManagerInit.Instance.InitSDK(QDDouYouManagerInit.Instance.GetAdId());
+                case (int)ChannelID.DouYou:
+                    QDDouYouManagerInit.Instance.InitSDK(LauncherConfig.douYouAdId);
                     QDShareManagerInit.Instance.InitSDK();
                     break;
                 default: