From eb27e5fd31f73b998a4bbd85511a31e40b8c61b7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 十一月 2025 17:03:47 +0800
Subject: [PATCH] 0312 关闭游戏内日志

---
 Main/System/Login/LoginManager.cs |  151 +++++++++++++++++++++++++++----------------------
 1 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/Main/System/Login/LoginManager.cs b/Main/System/Login/LoginManager.cs
index 0d8724a..2aded75 100644
--- a/Main/System/Login/LoginManager.cs
+++ b/Main/System/Login/LoginManager.cs
@@ -66,6 +66,9 @@
         SDKUtils.Instance.onFreePlatformBindOk += OnSDKAccountBindOk;
 
         LaunchInHot.Instance.OnApplicationOut += OnApplicationOut;
+        // #if UNITY_EDITOR
+        // GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
+        // #endif
     }
 
     public override void Release()
@@ -82,10 +85,6 @@
         sdkLogined = true;
         sdkLoginResult = _result;
 
-        if (!DebugUtility.Instance.isWhiteListAccount)
-        {
-            DebugUtility.Instance.RequestWhiteListAuthority(sdkLoginResult.account);
-        }
 
         ServerListCenter.Instance.RequestServerListPlayer(sdkLoginResult.account);
         SDKUtils.Instance.MakeKeyAndVisible();
@@ -247,9 +246,12 @@
     {
         if (ok)
         {
+            GameNetSystem.Instance.SetIsWaitLogin(false);
+            GameNetSystem.Instance.SetIsWaitLoginMap(true);
             var sendInfo = new C0123_tagCClientPackVersion();
             sendInfo.Version = DwVersionNo;
             GameNetSystem.Instance.SendInfo(sendInfo);
+            GameNetSystem.Instance.SetIsWaitLogin(true);
         }
         else
         {
@@ -257,6 +259,13 @@
         }
     }
 
+    // void OnMSEvent()
+    // {
+    //     //娴嬭瘯鐢� 娴嬭瘯鐧诲綍娴佺▼涓竴鐩村彂鏃犵敤鐨勫寘鏄惁褰卞搷鐧诲綍
+    //     var pack = new CA504_tagCMPlayerGetReward();
+    //     GameNetSystem.Instance.SendInfo(pack);
+
+    // }
 
     public void AccessLogin(H0101_tagServerPrepared _serverInfo)
     {
@@ -294,72 +303,78 @@
     }
 
     public C0101_tagCPlayerLogin Get0101SendPackage(H0101_tagServerPrepared _serverInfo)
+    {
+        GameNetSystem.Instance.SetIsWaitLogin(false);
+        var send = new C0101_tagCPlayerLogin();
+        switch (VersionConfig.Get().versionAuthority)
         {
-            var send = new C0101_tagCPlayerLogin();
-            switch (VersionConfig.Get().versionAuthority)
-            {
-                case VersionAuthority.InterTest:
-                    send.IDType = 1;
-                    send.AccID = accountBuf;
-                    if (sdkLoginResult == null)
-                        send.Password = "111";
-                    else
-                        send.Password = sdkLoginResult.token;
-                    send.MAC = DeviceUtility.GetMac();
-                    send.Version = _serverInfo.Version;
-                    send.LineNO = 255;
-                    send.AppID = VersionConfig.Get().appId;
-                    send.AccountID = 1000;// 鍐呴儴鐧婚檰鐨勬椂鍊欑殑id
-                    send.TokenExpire = "1519750743000";// 鍐呴儴鐧婚檰鐨勬椂闀�,鏃犳墍璋撶殑
-                    send.Phone = 0;
-                    send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag;
-                    send.Adult = 1;
-                    send.ExtraLen = 0;
-                    send.Extra = "";
-                    break;
-                case VersionAuthority.Release:
-                {
-                    var deviceInfo = DeviceUtility.GetDeviceModel();
-                    deviceInfo.Replace(" ", "").Replace("=", "").Replace("%", "").Replace("-", "").Replace("|", "");
-                    var versionStr = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", deviceInfo);
-
-                    send.Extra = StringUtility.Contact(VersionConfig.Get().SpID, "|",
-                                                        SDKUtils.Instance.Device.uniqueID, "|",
-                                                        sdkLoginResult.token, "|",
-                                                        sdkLoginResult.qkUserName, "|",
-                                                        versionStr.Substring(0, Math.Min(24, versionStr.Length)));
-
-
-                    Debug.Log("=====> extra: " + send.Extra);
-                    send.ExtraLen = (ushort)send.Extra.Length;
-
-                    send.IDType = (byte)SDKUtils.Instance.ChannelPlatform;
+            case VersionAuthority.InterTest:
+                send.IDType = 1;
+                send.AccID = accountBuf;
+                if (sdkLoginResult == null)
+                    send.Password = "111";
+                else
                     send.Password = sdkLoginResult.token;
-                    send.AccID = sdkLoginResult.account;
-                    send.MAC = DeviceUtility.GetMac();
-                    send.Version = _serverInfo.Version;
-                    send.LineNO = 255;
-                    send.AppID = VersionConfig.Get().appId;
-                    send.AccountID = (uint)sdkLoginResult.accountID;
-                    send.TokenExpire = sdkLoginResult.tokenExpire;
-                    send.Phone = (byte)sdkLoginResult.phone;
-                    send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag;
-                    if (sdkIDCheckIDAuthentication.type == "1")
-                    {
-                        send.Adult = 1;
-                    }
-                    else if (sdkIDCheckIDAuthentication.type == "2")
-                    {
-                        send.Adult = MathUtility.CheckAdult(sdkIDCheckIDAuthentication.card_id) ? (byte)1 : (byte)0;
-                    }
-                    else
-                    {
-                        send.Adult = 0;
-                    }
-                    break;
-                }
-            }
+                send.MAC = DeviceUtility.GetMac();
+                send.Version = _serverInfo.Version;
+                send.LineNO = 255;
+                send.AppID = VersionConfig.Get().appId;
+                send.AccountID = 1000;// 鍐呴儴鐧婚檰鐨勬椂鍊欑殑id
+                send.TokenExpire = "1519750743000";// 鍐呴儴鐧婚檰鐨勬椂闀�,鏃犳墍璋撶殑
+                send.Phone = 0;
+                send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag;
+                send.Adult = 1;
+                send.ExtraLen = 0;
+                send.Extra = "";
+                break;
+            case VersionAuthority.Release:
+            {
+                var deviceInfo = DeviceUtility.GetDeviceModel();
+                deviceInfo.Replace(" ", "").Replace("=", "").Replace("%", "").Replace("-", "").Replace("|", "");
+                var versionStr = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", deviceInfo);
 
-            return send;
+                send.Extra = StringUtility.Contact(VersionConfig.Get().SpID, "|",
+                                                    SDKUtils.Instance.Device.uniqueID, "|",
+                                                    sdkLoginResult.token, "|",
+                                                    sdkLoginResult.qkUserName, "|",
+                                                    versionStr.Substring(0, Math.Min(24, versionStr.Length)));
+
+
+                Debug.Log("=====> extra: " + send.Extra);
+                send.ExtraLen = (ushort)send.Extra.Length;
+
+                send.IDType = (byte)SDKUtils.Instance.ChannelPlatform;
+                send.Password = sdkLoginResult.token;
+                send.AccID = sdkLoginResult.account;
+                send.MAC = DeviceUtility.GetMac();
+                send.Version = _serverInfo.Version;
+                send.LineNO = 255;
+                send.AppID = VersionConfig.Get().appId;
+                send.AccountID = (uint)sdkLoginResult.accountID;
+                send.TokenExpire = sdkLoginResult.tokenExpire;
+                send.Phone = (byte)sdkLoginResult.phone;
+                send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag;
+                if (sdkIDCheckIDAuthentication.type == "1")
+                {
+                    send.Adult = 1;
+                }
+                else if (sdkIDCheckIDAuthentication.type == "2")
+                {
+                    send.Adult = MathUtility.CheckAdult(sdkIDCheckIDAuthentication.card_id) ? (byte)1 : (byte)0;
+                }
+                else
+                {
+                    send.Adult = 0;
+                }
+                break;
+            }
         }
+
+        return send;
+    }
+
+    public string GetVersionStr()
+    {
+        return StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", InitialFunctionConfig.Get("version").Numerical1);
+    }
 }

--
Gitblit v1.8.0