diff --git a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll index 268dfa1..68234a3 100644 Binary files a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll and b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll differ diff --git a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb index e52274a..c6c17e9 100644 Binary files a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb and b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb differ diff --git a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb.meta b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb.meta index fb932ec..ca57e69 100644 --- a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb.meta +++ b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.dll.mdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 333b2361ac9786941af0c03fbe8c8c80 -timeCreated: 1460301605 +timeCreated: 1460380039 licenseType: Pro DefaultImporter: userData: diff --git a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.pdb b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.pdb index 90d6f98..8bb0044 100644 Binary files a/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.pdb and b/TTConsole.Unity/Assets/Dlls/Editor/TinyTeam.Debuger.Editor.pdb differ diff --git a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll index 75dbe17..cca6f0b 100644 Binary files a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll and b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll differ diff --git a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb index 79f983c..62bbb5d 100644 Binary files a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb and b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb differ diff --git a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb.meta b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb.meta index 1bd6394..48a88bc 100644 --- a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb.meta +++ b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.dll.mdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b6ea46d6bbf144e4aa6956f62d588723 -timeCreated: 1460301605 +timeCreated: 1467707213 licenseType: Pro DefaultImporter: userData: diff --git a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.pdb b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.pdb index 4bd7d25..ec5a111 100644 Binary files a/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.pdb and b/TTConsole.Unity/Assets/Dlls/TinyTeam.Debuger.pdb differ diff --git a/TTConsole.Unity/Assets/NewBehaviourScript.cs b/TTConsole.Unity/Assets/NewBehaviourScript.cs index b757d34..7dffb8b 100644 --- a/TTConsole.Unity/Assets/NewBehaviourScript.cs +++ b/TTConsole.Unity/Assets/NewBehaviourScript.cs @@ -12,7 +12,9 @@ public class NewBehaviourScript : MonoBehaviour { // Use this for initialization void Start () { TTDebuger.Log("Hello Chiuan"); - TTDebuger.Log("Hello Chiuan","",new Color(1,0.3f,1)); + TTDebuger.Log("socket...", "NET"); + TTDebuger.Log("load xxxx.ab", "Loader"); + TTDebuger.Log("success mission", "mission"); //EventTrigger tr = go.AddComponent(); //EventTrigger.Entry en = new EventTrigger.Entry(); @@ -23,7 +25,7 @@ void Start () { //tr.delegates.Add(en); //TTDebuger.RegisterCommand("load", LoadLevel, ""); - //StartCoroutine(IEDebug()); + StartCoroutine(IEDebug()); //TTDebuger.Log("hello man"); } diff --git a/TTConsole.Unity/Assets/test.unity b/TTConsole.Unity/Assets/test.unity index 9a72427..b0ea7d7 100644 Binary files a/TTConsole.Unity/Assets/test.unity and b/TTConsole.Unity/Assets/test.unity differ diff --git a/TTConsole.Unity/ProjectSettings/GraphicsSettings.asset b/TTConsole.Unity/ProjectSettings/GraphicsSettings.asset index 4ab962d..96548d5 100644 Binary files a/TTConsole.Unity/ProjectSettings/GraphicsSettings.asset and b/TTConsole.Unity/ProjectSettings/GraphicsSettings.asset differ diff --git a/TTConsole.Unity/ProjectSettings/ProjectSettings.asset b/TTConsole.Unity/ProjectSettings/ProjectSettings.asset index 6701f95..6de6287 100644 Binary files a/TTConsole.Unity/ProjectSettings/ProjectSettings.asset and b/TTConsole.Unity/ProjectSettings/ProjectSettings.asset differ diff --git a/TTConsole.Unity/ProjectSettings/ProjectVersion.txt b/TTConsole.Unity/ProjectSettings/ProjectVersion.txt index c4684cd..558807b 100644 --- a/TTConsole.Unity/ProjectSettings/ProjectVersion.txt +++ b/TTConsole.Unity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.4f1 +m_EditorVersion: 5.3.5f1 m_StandardAssetsVersion: 0 diff --git a/TTConsole.VS/.vs/TTConsole/v14/.suo b/TTConsole.VS/.vs/TTConsole/v14/.suo index d96ed29..9db8a18 100644 Binary files a/TTConsole.VS/.vs/TTConsole/v14/.suo and b/TTConsole.VS/.vs/TTConsole/v14/.suo differ diff --git a/TTConsole.VS/Build/Debug/TinyTeam.Debuger.dll b/TTConsole.VS/Build/Debug/TinyTeam.Debuger.dll index 75dbe17..cca6f0b 100644 Binary files a/TTConsole.VS/Build/Debug/TinyTeam.Debuger.dll and b/TTConsole.VS/Build/Debug/TinyTeam.Debuger.dll differ diff --git a/TTConsole.VS/Build/Debug/TinyTeam.Debuger.pdb b/TTConsole.VS/Build/Debug/TinyTeam.Debuger.pdb index 4bd7d25..ec5a111 100644 Binary files a/TTConsole.VS/Build/Debug/TinyTeam.Debuger.pdb and b/TTConsole.VS/Build/Debug/TinyTeam.Debuger.pdb differ diff --git a/TTConsole.VS/Build/Release/TinyTeam.Debuger.dll b/TTConsole.VS/Build/Release/TinyTeam.Debuger.dll new file mode 100644 index 0000000..cb0b44a Binary files /dev/null and b/TTConsole.VS/Build/Release/TinyTeam.Debuger.dll differ diff --git a/TTConsole.VS/Build/Server/TinyTeam.Debuger.dll b/TTConsole.VS/Build/Server/TinyTeam.Debuger.dll new file mode 100644 index 0000000..2efe7be Binary files /dev/null and b/TTConsole.VS/Build/Server/TinyTeam.Debuger.dll differ diff --git a/TTConsole.VS/TTConsole.sln b/TTConsole.VS/TTConsole.sln index e5bc0fa..12f8625 100644 --- a/TTConsole.VS/TTConsole.sln +++ b/TTConsole.VS/TTConsole.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyTeam.Debuger", "TinyTeam.Debuger\TinyTeam.Debuger.csproj", "{BAF4A347-CB17-4D56-A763-32D9F66A1FB4}" EndProject @@ -13,8 +13,8 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BAF4A347-CB17-4D56-A763-32D9F66A1FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAF4A347-CB17-4D56-A763-32D9F66A1FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BAF4A347-CB17-4D56-A763-32D9F66A1FB4}.Debug|Any CPU.ActiveCfg = Server|Any CPU + {BAF4A347-CB17-4D56-A763-32D9F66A1FB4}.Debug|Any CPU.Build.0 = Server|Any CPU {BAF4A347-CB17-4D56-A763-32D9F66A1FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {BAF4A347-CB17-4D56-A763-32D9F66A1FB4}.Release|Any CPU.Build.0 = Release|Any CPU {0CD9AD06-2985-40CA-8AAC-D4C0E96B7702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.dll b/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.dll index 268dfa1..68234a3 100644 Binary files a/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.dll and b/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.dll differ diff --git a/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.pdb b/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.pdb index 90d6f98..8bb0044 100644 Binary files a/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.pdb and b/TTConsole.VS/TinyTeam.Debuger.Editor/bin/Debug/TinyTeam.Debuger.Editor.pdb differ diff --git a/TTConsole.VS/TinyTeam.Debuger/Console/TTDebuger.cs b/TTConsole.VS/TinyTeam.Debuger/Console/TTDebuger.cs index fa7a7ee..dc443ce 100644 --- a/TTConsole.VS/TinyTeam.Debuger/Console/TTDebuger.cs +++ b/TTConsole.VS/TinyTeam.Debuger/Console/TTDebuger.cs @@ -1,8 +1,4 @@ -using UnityEngine; -using System.Collections; -using System; - -namespace TinyTeam.Debuger +namespace TinyTeam.Debuger { /// /// Description： custom debuger,can control debug or record in memory writing in thread. @@ -10,7 +6,14 @@ namespace TinyTeam.Debuger /// CreateTime: 2015-2-12 /// - + + using System.Collections; + using System; + +#if UNITY_ENGINE + using UnityEngine; +#endif + public class TTDebuger { static public bool EnableLog = true; @@ -23,27 +26,40 @@ static public void Log(object message, string customType) { if (EnableLog) { +#if UNITY_ENGINE Console.Log(message,customType); +#else + System.Console.WriteLine("Log>" + customType + " : " + message); +#endif } } - static public void Log(object message, string customType,Color col) - { - if (EnableLog) - { - Console.Log(message, customType, col); - } - } +#if UNITY_ENGINE + // Dont use Color.. + + //static public void Log(object message, string customType,Color col) + //{ + // if (EnableLog) + // { + // Console.Log(message, customType, col); + // } + //} +#endif static public void LogError(object message) { LogError(message, null); } + static public void LogError(object message, string customType) { if (EnableLog) { - Console.LogError(message, customType); +#if UNITY_ENGINE + Console.LogError(message, customType); +#else + System.Console.WriteLine("LogError>" + customType + " : " + message); +#endif } } static public void LogWarning(object message) @@ -54,20 +70,32 @@ static public void LogWarning(object message, string customType) { if (EnableLog) { +#if UNITY_ENGINE Console.LogWarning(message, customType); +#else + System.Console.WriteLine("LogWarning>" + customType + " : " + message); +#endif } } public static void RegisterCommand(string commandString, Func commandCallback, string CMD_Discribes) { - if(EnableLog) + if (EnableLog) + { +#if UNITY_ENGINE Console.RegisterCommand(commandString, commandCallback, CMD_Discribes); +#endif + } } public static void UnRegisterCommand(string commandString) { - if(EnableLog) + if (EnableLog) + { +#if UNITY_ENGINE Console.UnRegisterCommand(commandString); +#endif + } } } diff --git a/TTConsole.VS/TinyTeam.Debuger/TinyTeam.Debuger.csproj b/TTConsole.VS/TinyTeam.Debuger/TinyTeam.Debuger.csproj index 255216c..70beece 100644 Binary files a/TTConsole.VS/TinyTeam.Debuger/TinyTeam.Debuger.csproj and b/TTConsole.VS/TinyTeam.Debuger/TinyTeam.Debuger.csproj differ