diff --git a/Server/Hotfix/Handler/G2C_PlayerInfoHandler.cs b/Server/Hotfix/Handler/G2C_PlayerInfoHandler.cs index 13c87e8b70247edff0fa8d50ae9cb4ee4ab46d14..8455afd5e3544b89f4ce7b189d170d0b2cb32d00 100644 --- a/Server/Hotfix/Handler/G2C_PlayerInfoHandler.cs +++ b/Server/Hotfix/Handler/G2C_PlayerInfoHandler.cs @@ -11,9 +11,16 @@ namespace ETHotfix { G2C_PlayerInfo g2CPlayerInfo = new G2C_PlayerInfo(); g2CPlayerInfo.PlayerInfo = new PlayerInfo(); - g2CPlayerInfo.PlayerInfos.Add(new PlayerInfo()); - g2CPlayerInfo.PlayerInfos.Add(new PlayerInfo()); - g2CPlayerInfo.PlayerInfos.Add(new PlayerInfo()); + g2CPlayerInfo.PlayerInfos.Add(new PlayerInfo() {RpcId = 1}); + g2CPlayerInfo.PlayerInfos.Add(new PlayerInfo() {RpcId = 2}); + g2CPlayerInfo.PlayerInfos.Add(new PlayerInfo() {RpcId = 3}); + g2CPlayerInfo.TestRepeatedInt32.Add(4); + g2CPlayerInfo.TestRepeatedInt32.Add(5); + g2CPlayerInfo.TestRepeatedInt32.Add(6); + g2CPlayerInfo.TestRepeatedInt64.Add(7); + g2CPlayerInfo.TestRepeatedInt64.Add(8); + g2CPlayerInfo.TestRepeatedString.Add("9"); + g2CPlayerInfo.TestRepeatedString.Add("10"); reply(g2CPlayerInfo); } } diff --git a/Server/Model/Base/Log.cs b/Server/Model/Base/Log.cs index d7eae8019feed1a99823769124dc93b1a6a120ce..756668121daee1d07e79787fdc2f18023515f406 100644 --- a/Server/Model/Base/Log.cs +++ b/Server/Model/Base/Log.cs @@ -45,10 +45,10 @@ namespace ETModel { globalLog.Fatal(message); } - - public static void Msg(object msg) + + public static void Msg(object message) { - Debug(MongoHelper.ToJson(msg)); + Debug(MongoHelper.ToJson(message)); } } } diff --git a/Unity/Assets/Hotfix/Base/Helper/Dumper.cs b/Unity/Assets/Hotfix/Base/Helper/Dumper.cs new file mode 100644 index 0000000000000000000000000000000000000000..f01b07f8b1adbba610a33dd5e08d00439390738e --- /dev/null +++ b/Unity/Assets/Hotfix/Base/Helper/Dumper.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections; +using System.Reflection; +using System.Text; +using ETModel; +using Google.Protobuf; +using UnityEngine; + +namespace ETHotfix +{ + public static class Dumper + { + private static readonly StringBuilder _text = new StringBuilder("", 1024); + + private static void AppendIndent(int num) + { + _text.Append(' ', num); + } + + private static void DoDump(object obj) + { + if (obj == null) + { + _text.Append("null"); + _text.Append(","); + return; + } + + Type t = obj.GetType(); + + //repeat field + if (obj is IList) + { + /* + _text.Append(t.FullName); + _text.Append(","); + AppendIndent(1); + */ + + _text.Append("["); + IList list = obj as IList; + foreach (object v in list) + { + DoDump(v); + } + + _text.Append("]"); + } + else if (t.IsValueType) + { + _text.Append(obj); + _text.Append(","); + AppendIndent(1); + } + else if (obj is string) + { + _text.Append("\""); + _text.Append(obj); + _text.Append("\""); + _text.Append(","); + AppendIndent(1); + } + else if (obj is ByteString) + { + _text.Append("\""); + _text.Append(((ByteString) obj).bytes.Utf8ToStr()); + _text.Append("\""); + _text.Append(","); + AppendIndent(1); + } + else if (t.IsArray) + { + Array a = (Array) obj; + _text.Append("["); + for (int i = 0; i < a.Length; i++) + { + _text.Append(i); + _text.Append(":"); + DoDump(a.GetValue(i)); + } + + _text.Append("]"); + } + else if (t.IsClass) + { + _text.Append($"<{t.Name}>"); + _text.Append("{"); + var fields = t.GetProperties(BindingFlags.Public | BindingFlags.Instance); + if (fields.Length > 0) + { + foreach (PropertyInfo info in fields) + { + _text.Append(info.Name); + _text.Append(":"); + object value = info.GetGetMethod().Invoke(obj, null); + DoDump(value); + } + } + + _text.Append("}"); + } + else + { + Debug.LogWarning("unsupport type: " + t.FullName); + _text.Append(obj); + _text.Append(","); + AppendIndent(1); + } + } + + public static string DumpAsString(object obj, string hint = "") + { + _text.Clear(); + _text.Append(hint); + DoDump(obj); + return _text.ToString(); + } + } +} \ No newline at end of file diff --git a/Unity/Assets/Model/Helper/Dumper.cs.meta b/Unity/Assets/Hotfix/Base/Helper/Dumper.cs.meta similarity index 83% rename from Unity/Assets/Model/Helper/Dumper.cs.meta rename to Unity/Assets/Hotfix/Base/Helper/Dumper.cs.meta index 9f56ecf12bcd596f4a648dbcadceea49628ab750..b8d32fbd81928849be0959a6c8f802b1d622f775 100644 --- a/Unity/Assets/Model/Helper/Dumper.cs.meta +++ b/Unity/Assets/Hotfix/Base/Helper/Dumper.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 441e3b5f0edc2824d81df4fb16a6864d +guid: 50f22dd0f513b7b479e6967e290bc092 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity/Assets/Hotfix/Base/Helper/Log.cs b/Unity/Assets/Hotfix/Base/Log.cs similarity index 83% rename from Unity/Assets/Hotfix/Base/Helper/Log.cs rename to Unity/Assets/Hotfix/Base/Log.cs index 8dab0469ded5fef98f24317300244a3af1263bfe..f83688c2330309d870da3f0f2d3c8e16533d98a8 100644 --- a/Unity/Assets/Hotfix/Base/Helper/Log.cs +++ b/Unity/Assets/Hotfix/Base/Log.cs @@ -28,5 +28,11 @@ namespace ETHotfix { ETModel.Log.Debug(msg); } + + public static void Msg(object msg) + { + + Debug(Dumper.DumpAsString(msg)); + } } } \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Base/Helper/Log.cs.meta b/Unity/Assets/Hotfix/Base/Log.cs.meta similarity index 83% rename from Unity/Assets/Hotfix/Base/Helper/Log.cs.meta rename to Unity/Assets/Hotfix/Base/Log.cs.meta index a6e7ba97911c7ef9ca2ae999fa265733e72a107f..26a9559077c99d68dab4cea74c90b6f4e90e448b 100644 --- a/Unity/Assets/Hotfix/Base/Helper/Log.cs.meta +++ b/Unity/Assets/Hotfix/Base/Log.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10f3df1a26afb3949bd7977673de9712 +guid: 8db24a729979f2741ac84b5caf0cdc38 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity/Assets/Hotfix/Module/Message/Session.cs b/Unity/Assets/Hotfix/Module/Message/Session.cs index dd4650de577580f4637605fa457a1ff0429b5526..424748a581d6db48162e61c393ba2b41b7b553ff 100644 --- a/Unity/Assets/Hotfix/Module/Message/Session.cs +++ b/Unity/Assets/Hotfix/Module/Message/Session.cs @@ -55,6 +55,11 @@ namespace ETHotfix object instance = opcodeTypeComponent.GetInstance(opcode); object message = this.session.Network.MessagePacker.DeserializeFrom(instance, memoryStream); + if (OpcodeHelper.IsNeedDebugLogMessage(opcode)) + { + Log.Msg(message); + } + if ((flag & 0x01) > 0) { IResponse response = message as IResponse; @@ -90,6 +95,10 @@ namespace ETHotfix public void Send(byte flag, ushort opcode, IMessage message) { + if (OpcodeHelper.IsNeedDebugLogMessage(opcode)) + { + Log.Msg(message); + } session.Send(flag, opcode, message); if (OpcodeHelper.IsNeedDebugLogMessage(opcode)) { diff --git a/Unity/Assets/Model/Helper/Dumper.cs b/Unity/Assets/Model/Base/Helper/Dumper.cs similarity index 100% rename from Unity/Assets/Model/Helper/Dumper.cs rename to Unity/Assets/Model/Base/Helper/Dumper.cs diff --git a/Unity/Assets/Model/Base/Helper/Dumper.cs.meta b/Unity/Assets/Model/Base/Helper/Dumper.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..557c3d25f6127f9eece2a8fa3c0d1696213d7ee8 --- /dev/null +++ b/Unity/Assets/Model/Base/Helper/Dumper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6a2cb7433d50e2a4b9c8d8f1d6c871fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Model/Base/Log.cs b/Unity/Assets/Model/Base/Log.cs index c3d47ee419b248a8b55a74a50c6c00be6327f588..64e0c2accb63cbf081657da406208db9a464704e 100644 --- a/Unity/Assets/Model/Base/Log.cs +++ b/Unity/Assets/Model/Base/Log.cs @@ -33,10 +33,10 @@ namespace ETModel { UnityEngine.Debug.Log(msg); } - + public static void Msg(object msg) { - UnityEngine.Debug.Log(Dumper.DumpAsString(msg)); + Debug(Dumper.DumpAsString(msg)); } } } \ No newline at end of file diff --git a/Unity/Assets/Model/Module/Message/OpcodeHelper.cs b/Unity/Assets/Model/Module/Message/OpcodeHelper.cs index fce750fe2dc89908560b0899e45bc8742abb196c..08cd658bb4c40f6262ce0112fe92723bdd656020 100644 --- a/Unity/Assets/Model/Module/Message/OpcodeHelper.cs +++ b/Unity/Assets/Model/Module/Message/OpcodeHelper.cs @@ -4,22 +4,20 @@ namespace ETModel { public static class OpcodeHelper { - private static readonly HashSet needDebugLogMessageSet = new HashSet { 1 }; + private static readonly HashSet ignoreDebugLogMessageSet = new HashSet + { + OuterOpcode.C2R_Ping, + OuterOpcode.R2C_Ping, + }; public static bool IsNeedDebugLogMessage(ushort opcode) { - return true; - if (opcode > 1000) - { - return true; - } - - if (needDebugLogMessageSet.Contains(opcode)) + if (ignoreDebugLogMessageSet.Contains(opcode)) { - return true; + return false; } - return false; + return true; } public static bool IsClientHotfixMessage(ushort opcode) diff --git a/Unity/Assets/Model/Module/Message/Session.cs b/Unity/Assets/Model/Module/Message/Session.cs index 9027bbbca8ab9af7775b4c062898bced62b077ce..f981bc01e95c0ad1a393d04b267b8c70c025c940 100644 --- a/Unity/Assets/Model/Module/Message/Session.cs +++ b/Unity/Assets/Model/Module/Message/Session.cs @@ -146,7 +146,6 @@ namespace ETModel OpcodeTypeComponent opcodeTypeComponent = this.Network.Entity.GetComponent(); object instance = opcodeTypeComponent.GetInstance(opcode); message = this.Network.MessagePacker.DeserializeFrom(instance, memoryStream); - //Log.Debug($"recv: {JsonHelper.ToJson(message)}"); if (OpcodeHelper.IsNeedDebugLogMessage(opcode)) { @@ -270,9 +269,17 @@ namespace ETModel throw new Exception("session已经被Dispose了"); } - if (OpcodeHelper.IsNeedDebugLogMessage(opcode)) + if (OpcodeHelper.IsNeedDebugLogMessage(opcode) ) { - ETModel.Log.Msg(message); +#if !SERVER + if (OpcodeHelper.IsClientHotfixMessage(opcode)) + { + } + else +#endif + { + Log.Msg(message); + } } MemoryStream stream = this.Stream; diff --git a/Unity/Unity.Editor.csproj b/Unity/Unity.Editor.csproj index 7597e421d69978ab88f42f8b7323142d1267d91e..f90336fff3fbfbfeed6ee198eaa3c8dd53bf5a1c 100644 --- a/Unity/Unity.Editor.csproj +++ b/Unity/Unity.Editor.csproj @@ -23,7 +23,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_11;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_13;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 prompt 4 0169 diff --git a/Unity/Unity.Hotfix.csproj b/Unity/Unity.Hotfix.csproj index 49b96883973ba40557d0a273b9acd03a9f243f5a..3ed541e8f5dc5b4d49d15d3d16bfbff88703768d 100644 --- a/Unity/Unity.Hotfix.csproj +++ b/Unity/Unity.Hotfix.csproj @@ -23,7 +23,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_11;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_13;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 prompt 4 0169 @@ -56,9 +56,10 @@ + - + diff --git a/Unity/Unity.Model.csproj b/Unity/Unity.Model.csproj index 111754f2ff436a644ff9e19b497f7a2d015b2b13..9c67e51b1eb93121f7561f87b84725f1f55c4c4a 100644 --- a/Unity/Unity.Model.csproj +++ b/Unity/Unity.Model.csproj @@ -23,7 +23,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_11;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_13;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 prompt 4 0169 @@ -59,6 +59,7 @@ + @@ -146,7 +147,6 @@ - diff --git a/Unity/Unity.ThirdParty.csproj b/Unity/Unity.ThirdParty.csproj index 5651852bd141546cc46f6582bd9c754b05662446..cadb419b62e5b664649c0dbddc849b39dd5fd9ce 100644 --- a/Unity/Unity.ThirdParty.csproj +++ b/Unity/Unity.ThirdParty.csproj @@ -23,7 +23,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_11;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_13;UNITY_2017_4;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45 prompt 4 0169