tanghai пре 3 година
родитељ
комит
3b1a00c847

+ 0 - 0
Unity/Assets/Plugins/MacOS/libRecastDll.dylib → Unity/Assets/Plugins/MacOS/x86_64/libRecastDll.dylib


+ 0 - 0
Unity/Assets/Plugins/MacOS/libRecastDll.dylib.meta → Unity/Assets/Plugins/MacOS/x86_64/libRecastDll.dylib.meta


+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Server/Module/Actor/ActorMessageSenderComponentSystem.cs

@@ -162,7 +162,7 @@ namespace ET.Server
             long costTime = endTime - beginTime;
             if (costTime > 200)
             {
-                Log.Warning("actor rpc time > 200: {0} {1}", costTime, iActorRequest);
+                Log.Warning($"actor rpc time > 200: {costTime} {iActorRequest}");
             }
             
             return response;

+ 12 - 5
Unity/Assets/Scripts/Codes/Model/Server/Module/RobotCase/RobotLog.cs

@@ -2,19 +2,26 @@ namespace ET.Server
 {
 	public static class RobotLog
 	{
-		public static void Debug(string msg)
+#if DOTNET
+		public static void Debug(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
 		{
-			Log.Info(msg);
+			Logger.Instance.Debug(message.ToStringAndClear());
 		}
 		
-		public static void Debug(string msg, params object[] args)
+		public static void Console(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+		{
+			Logger.Instance.Console(message.ToStringAndClear());
+		}
+#endif
+		
+		public static void Debug(string msg)
 		{
-			Log.Info(msg, args);
+			Logger.Instance.Debug(msg);
 		}
 
 		public static void Console(string msg)
 		{
-			Log.Console(msg);
+			Logger.Instance.Console(msg);
 		}
 	}
 }

+ 10 - 36
Unity/Assets/Scripts/Core/Module/Log/Log.cs

@@ -39,66 +39,40 @@ namespace ET
             Logger.Instance.Error(e);
         }
 
-        public static void Trace(string message, params object[] args)
-        {
-            Logger.Instance.Trace(message, args);
-        }
-
-        public static void Warning(string message, params object[] args)
-        {
-            Logger.Instance.Warning(string.Format(message, args));
-        }
-
-        public static void Info(string message, params object[] args)
-        {
-            Logger.Instance.Info(string.Format(message, args));
-        }
-
-        public static void Debug(string message, params object[] args)
-        {
-            Logger.Instance.Debug(string.Format(message, args));
-
-        }
-
-        public static void Error(string message, params object[] args)
-        {
-            Logger.Instance.Error(message, args);
-        }
-        
         public static void Console(string message)
         {
             Logger.Instance.Console(message);
         }
         
-        public static void Console(string message, params object[] args)
-        {
-            Logger.Instance.Console(message, args);
-        }
-        
 #if DOTNET
         public static void Trace(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Trace(message.ToStringAndClear());
+            Logger.Instance.Trace(message.ToStringAndClear());
         }
 
         public static void Warning(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Warning(message.ToStringAndClear());
+            Logger.Instance.Warning(message.ToStringAndClear());
         }
 
         public static void Info(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Info(message.ToStringAndClear());
+            Logger.Instance.Info(message.ToStringAndClear());
         }
 
         public static void Debug(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Debug(message.ToStringAndClear());
+            Logger.Instance.Debug(message.ToStringAndClear());
         }
 
         public static void Error(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Error(message.ToStringAndClear());
+            Logger.Instance.Error(message.ToStringAndClear());
+        }
+        
+        public static void Console(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        {
+            Logger.Instance.Console(message.ToStringAndClear());
         }
 #endif
     }