0.0.2.32 release tag

liangxiegame · Feb 26, 2018 · 9a13bf8 · 9a13bf8
1 parent b3d03fb
commit 9a13bf8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 33 deletions.
diff --git a/Assets/QFramework/0.Extension/Example/Scene.unity b/Assets/QFramework/0.Extension/Example/Scene.unity
diff --git a/Assets/QFramework/2.Singleton/readme.txt b/Assets/QFramework/2.Singleton/readme.txt
diff --git a/Assets/QFramework/Libs/Log.cs b/Assets/QFramework/Libs/Log.cs
@@ -27,10 +27,7 @@
 namespace QFramework
 {
     using System;
-
-#if UNITY_5_5_OR_NEWER
     using UnityEngine;
-#endif
 
     public enum LogLevel
     {
@@ -79,11 +76,8 @@ public static void I(object msg)
             {
                 return;
             }
-#if UNITY_5_5_OR_NEWER
+
             Debug.Log(msg);
-#else
-            Console.WriteLine(msg);
-#endif
         }
 
         public static void I(string msg, params object[] args)
@@ -92,11 +86,8 @@ public static void I(string msg, params object[] args)
             {
                 return;
             }
-#if UNITY_5_5_OR_NEWER
+
             Debug.Log(string.Format(msg, args));
-#else
-            Console.WriteLine(msg, args);
-#endif
         }
 
         public static void E(object msg)
@@ -105,11 +96,8 @@ public static void E(object msg)
             {
                 return;
             }
-#if UNITY_5_5_OR_NEWER
+
             Debug.LogError(msg);
-#else
-            Console.WriteLine("[Error] {0}", msg);
-#endif
         }
 
         public static void E(Exception e)
@@ -118,11 +106,8 @@ public static void E(Exception e)
             {
                 return;
             }
-#if UNITY_5_5_OR_NEWER
+
             Debug.LogException(e);
-#else
-            Console.WriteLine("[Exception] {0}", e);
-#endif
         }
 
         public static void E(string msg, params object[] args)
@@ -131,11 +116,8 @@ public static void E(string msg, params object[] args)
             {
                 return;
             }
-#if UNITY_5_5_OR_NEWER
+
             Debug.LogError(string.Format(msg, args));
-#else
-            Console.WriteLine(string.Format("[Error] {0}", msg), args);
-#endif
         }
 
         public static void W(object msg)
@@ -144,12 +126,8 @@ public static void W(object msg)
             {
                 return;
             }
-
-#if UNITY_5_5_OR_NEWER
+
             Debug.LogWarning(msg);
-#else
-            Console.WriteLine("[Warning] {0}", msg);
-#endif
         }
 
         public static void W(string msg, params object[] args)
@@ -159,11 +137,7 @@ public static void W(string msg, params object[] args)
                 return;
             }
 
-#if UNITY_5_5_OR_NEWER
             Debug.LogWarning(string.Format(msg, args));
-#else
-            Console.WriteLine(string.Format("[Warning] {0}", msg), args);
-#endif
         }
     }
 }
diff --git a/Assets/QFramework/readme.txt b/Assets/QFramework/readme.txt
@@ -0,0 +1,2 @@
+run QFramework/0.Extension/Example’s scenes
+run QFramework/2.Singleton/Example’s scenes
diff --git a/...ts/QFramework/2.Singleton/readme.txt.meta → Assets/QFramework/readme.txt.meta b/...ts/QFramework/2.Singleton/readme.txt.meta → Assets/QFramework/readme.txt.meta
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		run QFramework/0.Extension/Example’s scenes
		run QFramework/2.Singleton/Example’s scenes