Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -19,9 +19,8 @@ namespace GFGGame
             logData.ServerId = zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId;
             logData.Account = SystemInfo.deviceUniqueIdentifier;
             logData.EventType = node;
-            //var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
-            //var body = $"_{logStr}";
-            //HttpTool.Instance.Post(LauncherConfig.logApiUrl, body);
+            var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
+            HttpTool.Instance.Post(LauncherConfig.logApiUrl, logStr);
         }
         /// <summary>
         /// 发送玩法参与度
@@ -40,9 +39,7 @@ namespace GFGGame
             logData.EventType = eventType;
             logData.Type = type;
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
-            //LogSProxy.SendLog(logStr);
-            var body = $"_{logStr}";
-            //HttpTool.Instance.Post(LauncherConfig.logApiUrl, body);
+            HttpTool.Instance.Post(LauncherConfig.logApiUrl, logStr);
         }
     }
 }

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

@@ -261,7 +261,7 @@ namespace GFGGame
             int errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
             {
-                Log.Error("Reconnect fail!");
+                Log.Error($"Reconnect fail, errorCode {errorCode}!");
                 AlertSystem.Show("重新连接失败，游戏或已更新，请重新进入游戏获得最佳体验。")
                         .SetRightButton(true, "好的", (object data) =>
                         {

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

@@ -1,18 +0,0 @@
-using ET;
-
-namespace GFGGame
-{
-    public class LogSProxy
-    {
-
-        public static void SendLog(string message)
-        {
-            Session session = GameGlobal.zoneScene.GetComponent<SessionComponent>().GateSession;
-            if (session == null || session.IsDisposed)
-            {
-                return;
-            }
-            session.Send(new C2Log_AddLog() { Content = message});
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/ServerProxy/LogSProxy.cs.meta

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

GameClient/Assets/ThirdParty/Xasset/Runtime/Loadables/Asset.cs

@@ -71,7 +71,7 @@ namespace VEngine
         {
             if (!Versions.Contains(path))
             {
-                Logger.E("FileNotFoundException {0}", path);
+                Logger.E("请添加资源 {0}", path);
                 return null;
             }