From eb40e833e3dfe767eb0272708fd93a7107d08937 Mon Sep 17 00:00:00 2001 From: tanghai Date: Sun, 16 Oct 2016 01:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=8D=E5=B0=84=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E5=AF=B9=E8=B1=A1=E6=94=BE=E5=9C=A8Plugin?= =?UTF-8?q?=E4=B8=8B=E5=A5=BD=E5=83=8F=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=A5=BD=E6=8A=8AComponent=E5=85=A8=E9=83=A8=E6=94=BE?= =?UTF-8?q?=E5=88=B0Model=E9=87=8C=E9=9D=A2=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Base/Server.Base.csproj | 21 --- Server/Model/Server.Model.csproj | 18 +++ Unity/Assets/Plugins/Base.meta | 2 +- .../Plugins/Base/Component/LogComponent.cs | 128 ------------------ .../Base/Component/LogComponent.cs.meta | 12 -- Unity/Assets/Plugins/Base/Log.cs | 92 +++++++++++-- Unity/Assets/Plugins/Base/Log.cs.meta | 2 +- Unity/Assets/Plugins/Base/Message/AMEvent.cs | 19 ++- Unity/Assets/Resources/Code.prefab | Bin 4740 -> 4620 bytes .../Component/EventComponent.cs | 4 +- .../Component/EventComponent.cs.meta | 4 +- .../{Scene => }/GlobalConfigComponent.cs | 0 .../{Scene => }/GlobalConfigComponent.cs.meta | 4 +- .../Base => Scripts}/Component/KVComponent.cs | 2 +- .../Component/KVComponent.cs.meta | 4 +- .../Component/MessageComponent.cs | 13 +- .../Component/MessageComponent.cs.meta | 4 +- .../Component/MessageHandlerComponent.cs | 11 +- .../Component/MessageHandlerComponent.cs.meta | 4 +- .../Component/NetworkComponent.cs | 3 +- .../Component/NetworkComponent.cs.meta | 4 +- .../Scripts/Component/{Scene => }/Scene.cs | 0 .../Component/{Scene => }/Scene.cs.meta | 4 +- Unity/Assets/Scripts/Component/Scene.meta | 9 -- Unity/Assets/Scripts/Component/Share.cs | 36 ----- Unity/Assets/Scripts/Component/Share.cs.meta | 12 -- .../Component/TimeComponent.cs | 4 +- .../Component/TimeComponent.cs.meta | 4 +- .../Component/TimerComponent.cs | 3 +- .../Component/TimerComponent.cs.meta | 4 +- Unity/Assets/Scripts/Component/{UI => }/UI.cs | 0 .../Scripts/Component/{UI => }/UI.cs.meta | 0 Unity/Assets/Scripts/Component/UI.meta | 9 -- Unity/Assets/Scripts/Init.cs | 1 + .../Event/InitSceneStartEvent_InitGame.cs | 9 +- Unity/ProjectSettings/GraphicsSettings.asset | Bin 4256 -> 4380 bytes Unity/ProjectSettings/ProjectSettings.asset | Bin 36593 -> 43633 bytes Unity/ProjectSettings/ProjectVersion.txt | 2 +- Unity/Unity.CSharp.Editor.csproj | 30 +--- Unity/Unity.CSharp.Plugins.csproj | 27 ++-- Unity/Unity.CSharp.csproj | 33 +++-- 41 files changed, 196 insertions(+), 342 deletions(-) delete mode 100644 Unity/Assets/Plugins/Base/Component/LogComponent.cs delete mode 100644 Unity/Assets/Plugins/Base/Component/LogComponent.cs.meta rename Unity/Assets/{Plugins/Base => Scripts}/Component/EventComponent.cs (98%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/EventComponent.cs.meta (75%) rename Unity/Assets/Scripts/Component/{Scene => }/GlobalConfigComponent.cs (100%) rename Unity/Assets/Scripts/Component/{Scene => }/GlobalConfigComponent.cs.meta (75%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/KVComponent.cs (97%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/KVComponent.cs.meta (75%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/MessageComponent.cs (95%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/MessageComponent.cs.meta (75%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/MessageHandlerComponent.cs (92%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/MessageHandlerComponent.cs.meta (75%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/NetworkComponent.cs (99%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/NetworkComponent.cs.meta (75%) rename Unity/Assets/Scripts/Component/{Scene => }/Scene.cs (100%) rename Unity/Assets/Scripts/Component/{Scene => }/Scene.cs.meta (75%) delete mode 100644 Unity/Assets/Scripts/Component/Scene.meta delete mode 100644 Unity/Assets/Scripts/Component/Share.cs delete mode 100644 Unity/Assets/Scripts/Component/Share.cs.meta rename Unity/Assets/{Plugins/Base => Scripts}/Component/TimeComponent.cs (93%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/TimeComponent.cs.meta (75%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/TimerComponent.cs (99%) rename Unity/Assets/{Plugins/Base => Scripts}/Component/TimerComponent.cs.meta (75%) rename Unity/Assets/Scripts/Component/{UI => }/UI.cs (100%) rename Unity/Assets/Scripts/Component/{UI => }/UI.cs.meta (100%) delete mode 100644 Unity/Assets/Scripts/Component/UI.meta diff --git a/Server/Base/Server.Base.csproj b/Server/Base/Server.Base.csproj index 4996c020..3ec8307c 100644 --- a/Server/Base/Server.Base.csproj +++ b/Server/Base/Server.Base.csproj @@ -47,27 +47,6 @@ - - Component\EventComponent.cs - - - Component\KVComponent.cs - - - Component\MessageComponent.cs - - - Component\MessageHandlerComponent.cs - - - Component\NetworkComponent.cs - - - Component\TimeComponent.cs - - - Component\TimerComponent.cs - Config\ACategory.cs diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index 3c4cc5da..459d6e90 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -41,6 +41,24 @@ + + Component\EventComponent.cs + + + Component\KVComponent.cs + + + Component\MessageComponent.cs + + + Component\MessageHandlerComponent.cs + + + Component\NetworkComponent.cs + + + Component\TimerComponent.cs + Message\AppType.cs diff --git a/Unity/Assets/Plugins/Base.meta b/Unity/Assets/Plugins/Base.meta index 4f706af3..0267995b 100644 --- a/Unity/Assets/Plugins/Base.meta +++ b/Unity/Assets/Plugins/Base.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 14541eab3adc63f4e99ba2fd13b7e488 folderAsset: yes -timeCreated: 1463828880 +timeCreated: 1476550922 licenseType: Pro DefaultImporter: userData: diff --git a/Unity/Assets/Plugins/Base/Component/LogComponent.cs b/Unity/Assets/Plugins/Base/Component/LogComponent.cs deleted file mode 100644 index 08180ccd..00000000 --- a/Unity/Assets/Plugins/Base/Component/LogComponent.cs +++ /dev/null @@ -1,128 +0,0 @@ -using System; -using System.IO; -using System.Text; -using Base; - -namespace Base -{ - [ObjectEvent] - public class LogComponentEvent : ObjectEvent, IAwake - { - public void Awake() - { - this.GetValue().Awake(); - } - } - - public class LogComponent : Component - { - private StreamWriter info; - - private StreamWriter error; - - // 每多少秒发一次 - public long SendToServerFrequency = 20 * 1000; - - public long SendToServerTime; - -#if UNITY_EDITOR - private static bool IsNeedFlush = true; -#else - private static bool IsNeedFlush = false; -#endif - - public void Awake() - { - if (!Directory.Exists("../Log")) - { - Directory.CreateDirectory("../Log"); - } - string s = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss"); - info = new StreamWriter($"../Log/log-{s}.info.log", false, Encoding.Unicode, 1024); - error = new StreamWriter($"../Log/log-{s}.error.log", false, Encoding.Unicode, 1024); - } - - public void Warning(string msg) - { - DateTime dateTime = DateTime.Now; - string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}"; - - info.WriteLine(s); - if (IsNeedFlush) - { - info.Flush(); - } - -#if UNITY_EDITOR - UnityEngine.Debug.LogWarning(s); -#endif - } - - public void Info(string msg) - { - DateTime dateTime = DateTime.Now; - string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}"; - - info.WriteLine(s); - if (IsNeedFlush) - { - info.Flush(); - } - -#if UNITY_EDITOR - UnityEngine.Debug.Log(s); -#endif - } - - public void Error(string msg) - { - DateTime dateTime = DateTime.Now; - string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}"; - - error.WriteLine(s); - if (IsNeedFlush) - { - error.Flush(); - } - -#if UNITY_EDITOR - UnityEngine.Debug.LogError(s); -#endif - - long timeNow = TimeHelper.ClientNow(); - if (timeNow - SendToServerTime > SendToServerFrequency) - { - SendToServerTime = timeNow; - Game.Scene.GetComponent().Run(EventBaseType.LogError, s); - } - } - - public void Debug(string msg) - { -#if UNITY_EDITOR - DateTime dateTime = DateTime.Now; - string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}"; - UnityEngine.Debug.Log(s); -#endif - } - - public void Flush() - { - info.Flush(); - error.Flush(); - } - - public override void Dispose() - { - if (this.Id == 0) - { - return; - } - - base.Dispose(); - - this.info.Close(); - this.error.Close(); - } - } -} \ No newline at end of file diff --git a/Unity/Assets/Plugins/Base/Component/LogComponent.cs.meta b/Unity/Assets/Plugins/Base/Component/LogComponent.cs.meta deleted file mode 100644 index ddb08b0a..00000000 --- a/Unity/Assets/Plugins/Base/Component/LogComponent.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 1551ca8574c888743a5b3e614de8123f -timeCreated: 1476427963 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Plugins/Base/Log.cs b/Unity/Assets/Plugins/Base/Log.cs index bce10f1a..c63132e8 100644 --- a/Unity/Assets/Plugins/Base/Log.cs +++ b/Unity/Assets/Plugins/Base/Log.cs @@ -1,30 +1,104 @@ -namespace Base +using System; +using System.IO; +using System.Text; + +namespace Base { public static class Log { - public static void Warning(string msg) + private static StreamWriter info; + + private static StreamWriter error; + + // 每多少秒发一次 + public static long SendToServerFrequency = 20 * 1000; + + public static long SendToServerTime; + +#if UNITY_EDITOR + private static bool IsNeedFlush = true; +#else + private static bool IsNeedFlush = false; +#endif + + static Log() { - Game.Scene.GetComponent().Info(msg); + if (!Directory.Exists("../Log")) + { + Directory.CreateDirectory("../Log"); + } + string s = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss"); + info = new StreamWriter($"../Log/log-{s}.info.log", false, Encoding.Unicode, 1024); + error = new StreamWriter($"../Log/log-{s}.error.log", false, Encoding.Unicode, 1024); } - public static void Info(string msg) + public static void Warning(string msg) { - Game.Scene.GetComponent().Info(msg); + DateTime dateTime = DateTime.Now; + string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}"; + + info.WriteLine(s); + if (IsNeedFlush) + { + info.Flush(); + } + +#if UNITY_EDITOR + UnityEngine.Debug.LogWarning(s); +#endif } - public static void Debug(string msg) + public static void Info(string msg) { - Game.Scene.GetComponent().Info(msg); + DateTime dateTime = DateTime.Now; + string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}"; + + info.WriteLine(s); + if (IsNeedFlush) + { + info.Flush(); + } + +#if UNITY_EDITOR + UnityEngine.Debug.Log(s); +#endif } public static void Error(string msg) { - Game.Scene.GetComponent().Error(msg); + DateTime dateTime = DateTime.Now; + string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}"; + + error.WriteLine(s); + if (IsNeedFlush) + { + error.Flush(); + } + +#if UNITY_EDITOR + UnityEngine.Debug.LogError(s); +#endif + + long timeNow = TimeHelper.ClientNow(); + if (timeNow - SendToServerTime > SendToServerFrequency) + { + SendToServerTime = timeNow; + } + } + + public static void Debug(string msg) + { +#if UNITY_EDITOR + DateTime dateTime = DateTime.Now; + string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}"; + UnityEngine.Debug.Log(s); +#endif } public static void Flush() { - Game.Scene.GetComponent().Flush(); + info.Flush(); + error.Flush(); } } } \ No newline at end of file diff --git a/Unity/Assets/Plugins/Base/Log.cs.meta b/Unity/Assets/Plugins/Base/Log.cs.meta index f43d67d1..830eed0a 100644 --- a/Unity/Assets/Plugins/Base/Log.cs.meta +++ b/Unity/Assets/Plugins/Base/Log.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fc246493a8b0d404ba5453ac0dd404d6 -timeCreated: 1476430040 +timeCreated: 1476552159 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Plugins/Base/Message/AMEvent.cs b/Unity/Assets/Plugins/Base/Message/AMEvent.cs index b56aacf4..0360e9b6 100644 --- a/Unity/Assets/Plugins/Base/Message/AMEvent.cs +++ b/Unity/Assets/Plugins/Base/Message/AMEvent.cs @@ -1,15 +1,22 @@ -using Base; +using System; +using Base; namespace Base { - public abstract class AMEvent: IMRegister + public interface IMessageHandler { - public void Register(MessageHandlerComponent component, ushort opcode) + void Register(ushort opcode, Action action); + void RegisterOpcode(Type type, ushort opcode); + } + + public abstract class AMEvent: IMRegister + { + public abstract void Run(Entity scene, T message); + + public void Register(IMessageHandler component, ushort opcode) { - component.MessageOpcode[typeof(T)] = opcode; + component.RegisterOpcode(typeof(T), opcode); component.Register(opcode, Run); } - - public abstract void Run(Entity scene, T message); } } \ No newline at end of file diff --git a/Unity/Assets/Resources/Code.prefab b/Unity/Assets/Resources/Code.prefab index 652b3403c7c41070e80d02ee1d556864cda71501..2f8c382ac3ad9da2fa013aaa48fdbd037d294a47 100644 GIT binary patch delta 359 zcmZos?NO0rU=RpqU=ZSAU|`?}vI~GTgQ=dep2%BHQJ_4d z1H6D20=bBVJ94P$U*V4Qq_Npx}&mx!b^gby^0h2b91bTJ^G1&C!P z_j8F$%EDzC8O|{=G-LqzATP*G-p?-1C_h=ALtI_~$Y+E?kO_rAKF9<`usFkHUhag= zE!-1WCJPE^Gp0U>8(l#kGhk0_KkkaHY0!Jnv5Ih0^13OWE delta 489 zcmeBCX;GDAU=TRYz#!DZz`(!{WIq7X45oUNWuEbFP?$9zgb4JbKf zb2Ym=Q|?n{hK5)mmj{R?zjVR9qS^&d6{T zXnqNh4|1{0o?bBN2U0Qn%(K@enq2apdkK@}|CFnKLkf{0Ik za$=5aX-;a9V_terYOzOVUdd)I?#V2Z7w~IH7C?2d09_4aGMrkp4n#3LnEa4mnz3N= zUw%8ayZiK~toS(1W4G<34NavCn#^Do_u?yOES%iq*;;n^6aVkZ>yr}&, ILoader, IAwake diff --git a/Unity/Assets/Plugins/Base/Component/EventComponent.cs.meta b/Unity/Assets/Scripts/Component/EventComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/EventComponent.cs.meta rename to Unity/Assets/Scripts/Component/EventComponent.cs.meta index ae467b7a..9670d001 100644 --- a/Unity/Assets/Plugins/Base/Component/EventComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/EventComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: cfb3b30793a2f664487948e085514abe -timeCreated: 1476427109 +guid: 2fda74f39a3e29e449d5891c8b62033b +timeCreated: 1476550922 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Scripts/Component/Scene/GlobalConfigComponent.cs b/Unity/Assets/Scripts/Component/GlobalConfigComponent.cs similarity index 100% rename from Unity/Assets/Scripts/Component/Scene/GlobalConfigComponent.cs rename to Unity/Assets/Scripts/Component/GlobalConfigComponent.cs diff --git a/Unity/Assets/Scripts/Component/Scene/GlobalConfigComponent.cs.meta b/Unity/Assets/Scripts/Component/GlobalConfigComponent.cs.meta similarity index 75% rename from Unity/Assets/Scripts/Component/Scene/GlobalConfigComponent.cs.meta rename to Unity/Assets/Scripts/Component/GlobalConfigComponent.cs.meta index 99414819..67959472 100644 --- a/Unity/Assets/Scripts/Component/Scene/GlobalConfigComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/GlobalConfigComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 12489c91591fe244fa8f81457cb494b9 -timeCreated: 1474944344 +guid: db89fa931c9a7594abb4142f40283554 +timeCreated: 1476550923 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Plugins/Base/Component/KVComponent.cs b/Unity/Assets/Scripts/Component/KVComponent.cs similarity index 97% rename from Unity/Assets/Plugins/Base/Component/KVComponent.cs rename to Unity/Assets/Scripts/Component/KVComponent.cs index 9decc19c..d3f7ad06 100644 --- a/Unity/Assets/Plugins/Base/Component/KVComponent.cs +++ b/Unity/Assets/Scripts/Component/KVComponent.cs @@ -2,7 +2,7 @@ using Base; using MongoDB.Bson.Serialization.Attributes; -namespace Base +namespace Model { /// /// Key Value组件用于保存一些数据 diff --git a/Unity/Assets/Plugins/Base/Component/KVComponent.cs.meta b/Unity/Assets/Scripts/Component/KVComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/KVComponent.cs.meta rename to Unity/Assets/Scripts/Component/KVComponent.cs.meta index 84fef690..fb530f29 100644 --- a/Unity/Assets/Plugins/Base/Component/KVComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/KVComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: e72548f682c0f584f82c92748e6bc7ec -timeCreated: 1476427964 +guid: df17a81a4db312744a45e5756fe92bce +timeCreated: 1476550924 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Plugins/Base/Component/MessageComponent.cs b/Unity/Assets/Scripts/Component/MessageComponent.cs similarity index 95% rename from Unity/Assets/Plugins/Base/Component/MessageComponent.cs rename to Unity/Assets/Scripts/Component/MessageComponent.cs index 03106ac0..d9af2323 100644 --- a/Unity/Assets/Plugins/Base/Component/MessageComponent.cs +++ b/Unity/Assets/Scripts/Component/MessageComponent.cs @@ -2,15 +2,16 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Base; -namespace Base +namespace Model { [ObjectEvent] - public class MessageComponentEvent : ObjectEvent, IAwake + public class MessageComponentEvent : ObjectEvent, IAwake { - public void Awake(MessageHandlerComponent messageHandler, AChannel aChannel) + public void Awake(AChannel aChannel) { - this.GetValue().Awake(messageHandler, aChannel); + this.GetValue().Awake(aChannel); } } @@ -25,9 +26,9 @@ namespace Base private AChannel channel; private MessageHandlerComponent messageHandler; - public void Awake(MessageHandlerComponent handler, AChannel aChannel) + public void Awake(AChannel aChannel) { - this.messageHandler = handler; + this.messageHandler = Game.Scene.GetComponent(); this.channel = aChannel; this.StartRecv(); } diff --git a/Unity/Assets/Plugins/Base/Component/MessageComponent.cs.meta b/Unity/Assets/Scripts/Component/MessageComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/MessageComponent.cs.meta rename to Unity/Assets/Scripts/Component/MessageComponent.cs.meta index f8d6e858..5c0612d0 100644 --- a/Unity/Assets/Plugins/Base/Component/MessageComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/MessageComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 036da353bafc88746b4c6dc2d3a9c6ae -timeCreated: 1476427109 +guid: 3ad2d94454456394ab8af33f059f9254 +timeCreated: 1476550923 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs b/Unity/Assets/Scripts/Component/MessageHandlerComponent.cs similarity index 92% rename from Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs rename to Unity/Assets/Scripts/Component/MessageHandlerComponent.cs index 99ad2761..74002698 100644 --- a/Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs +++ b/Unity/Assets/Scripts/Component/MessageHandlerComponent.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; using System.Reflection; +using Base; +using Object = Base.Object; -namespace Base +namespace Model { [ObjectEvent] public class MessageHandlerComponentEvent : ObjectEvent, ILoader, IAwake @@ -21,7 +23,7 @@ namespace Base /// /// 消息分发组件 /// - public class MessageHandlerComponent: Component + public class MessageHandlerComponent: Component, IMessageHandler { private string AppType; private Dictionary>> events; @@ -68,6 +70,11 @@ namespace Base } } + public void RegisterOpcode(Type type, ushort opcode) + { + this.MessageOpcode[type] = opcode; + } + public void Register(ushort opcode, Action action) { if (!this.events.ContainsKey(opcode)) diff --git a/Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs.meta b/Unity/Assets/Scripts/Component/MessageHandlerComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs.meta rename to Unity/Assets/Scripts/Component/MessageHandlerComponent.cs.meta index 41375efb..f1f0f369 100644 --- a/Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/MessageHandlerComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: bd40986789dd57549adb51bc5c2413fa -timeCreated: 1476427109 +guid: 8e97599ee372f6f40aaa5e743851a74c +timeCreated: 1476550923 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Plugins/Base/Component/NetworkComponent.cs b/Unity/Assets/Scripts/Component/NetworkComponent.cs similarity index 99% rename from Unity/Assets/Plugins/Base/Component/NetworkComponent.cs rename to Unity/Assets/Scripts/Component/NetworkComponent.cs index 10056994..9733ee5f 100644 --- a/Unity/Assets/Plugins/Base/Component/NetworkComponent.cs +++ b/Unity/Assets/Scripts/Component/NetworkComponent.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; +using Base; -namespace Base +namespace Model { [ObjectEvent] public class NetworkComponentEvent : ObjectEvent, IUpdate, IAwake, IAwake diff --git a/Unity/Assets/Plugins/Base/Component/NetworkComponent.cs.meta b/Unity/Assets/Scripts/Component/NetworkComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/NetworkComponent.cs.meta rename to Unity/Assets/Scripts/Component/NetworkComponent.cs.meta index c00bf70b..9f844319 100644 --- a/Unity/Assets/Plugins/Base/Component/NetworkComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/NetworkComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 18e8dac8edb032f4da7021896febf6b4 -timeCreated: 1476427963 +guid: 151d2db7aab5bc8438bc039443ba0e3b +timeCreated: 1476550922 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Scripts/Component/Scene/Scene.cs b/Unity/Assets/Scripts/Component/Scene.cs similarity index 100% rename from Unity/Assets/Scripts/Component/Scene/Scene.cs rename to Unity/Assets/Scripts/Component/Scene.cs diff --git a/Unity/Assets/Scripts/Component/Scene/Scene.cs.meta b/Unity/Assets/Scripts/Component/Scene.cs.meta similarity index 75% rename from Unity/Assets/Scripts/Component/Scene/Scene.cs.meta rename to Unity/Assets/Scripts/Component/Scene.cs.meta index e95b0ce8..c83dfb2c 100644 --- a/Unity/Assets/Scripts/Component/Scene/Scene.cs.meta +++ b/Unity/Assets/Scripts/Component/Scene.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 73186e6a1c3318e4a95cc253c860e0af -timeCreated: 1475915396 +guid: 6a74878a3e383af45bac4995de1e0f53 +timeCreated: 1476550923 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Scripts/Component/Scene.meta b/Unity/Assets/Scripts/Component/Scene.meta deleted file mode 100644 index c3e607cc..00000000 --- a/Unity/Assets/Scripts/Component/Scene.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1dc39317a0f5e0e469e618f7ec70921a -folderAsset: yes -timeCreated: 1474944344 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Scripts/Component/Share.cs b/Unity/Assets/Scripts/Component/Share.cs deleted file mode 100644 index 0ba088ae..00000000 --- a/Unity/Assets/Scripts/Component/Share.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Base; - -namespace Model -{ - /// - /// 游戏和扩展编辑器都需要用到的数据放在这个Scene上面 - /// - public sealed class Share - { - private static Entity share; - - public static Entity Scene - { - get - { - if (share == null) - { - share = new Entity(); - share.AddComponent(); - share.AddComponent(); - share.AddComponent(); - GlobalConfigComponent globalConfigComponent = share.AddComponent(); - share.AddComponent(globalConfigComponent.GlobalProto.Protocol); - } - return share; - } - } - - public static void Close() - { - Entity scene = share; - share = null; - scene?.Dispose(); - } - } -} \ No newline at end of file diff --git a/Unity/Assets/Scripts/Component/Share.cs.meta b/Unity/Assets/Scripts/Component/Share.cs.meta deleted file mode 100644 index 2c8b21b1..00000000 --- a/Unity/Assets/Scripts/Component/Share.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 25b1f211f8fdbe64aa3b3fdb425b30c7 -timeCreated: 1474943388 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Plugins/Base/Component/TimeComponent.cs b/Unity/Assets/Scripts/Component/TimeComponent.cs similarity index 93% rename from Unity/Assets/Plugins/Base/Component/TimeComponent.cs rename to Unity/Assets/Scripts/Component/TimeComponent.cs index 754dc88d..4a4c96b2 100644 --- a/Unity/Assets/Plugins/Base/Component/TimeComponent.cs +++ b/Unity/Assets/Scripts/Component/TimeComponent.cs @@ -1,4 +1,6 @@ -namespace Base +using Base; + +namespace Model { /// /// 用于同步服务端和客户端时间 diff --git a/Unity/Assets/Plugins/Base/Component/TimeComponent.cs.meta b/Unity/Assets/Scripts/Component/TimeComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/TimeComponent.cs.meta rename to Unity/Assets/Scripts/Component/TimeComponent.cs.meta index 4513e2c8..37855ed2 100644 --- a/Unity/Assets/Plugins/Base/Component/TimeComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/TimeComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f149185a7df54774383b4883e3bcc6ef -timeCreated: 1476427964 +guid: ef493cd670f2eab428b7aa9d0e368212 +timeCreated: 1476550924 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Plugins/Base/Component/TimerComponent.cs b/Unity/Assets/Scripts/Component/TimerComponent.cs similarity index 99% rename from Unity/Assets/Plugins/Base/Component/TimerComponent.cs rename to Unity/Assets/Scripts/Component/TimerComponent.cs index 5660110f..06185579 100644 --- a/Unity/Assets/Plugins/Base/Component/TimerComponent.cs +++ b/Unity/Assets/Scripts/Component/TimerComponent.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Base; using MongoDB.Bson; -namespace Base +namespace Model { public class Timer { diff --git a/Unity/Assets/Plugins/Base/Component/TimerComponent.cs.meta b/Unity/Assets/Scripts/Component/TimerComponent.cs.meta similarity index 75% rename from Unity/Assets/Plugins/Base/Component/TimerComponent.cs.meta rename to Unity/Assets/Scripts/Component/TimerComponent.cs.meta index 1f3882ef..da77b0c0 100644 --- a/Unity/Assets/Plugins/Base/Component/TimerComponent.cs.meta +++ b/Unity/Assets/Scripts/Component/TimerComponent.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d5ba602e9f553ff44b1baef3f68a563b -timeCreated: 1476427964 +guid: 2f4a73ac996f1404aa1866a86140fe38 +timeCreated: 1476550922 licenseType: Pro MonoImporter: serializedVersion: 2 diff --git a/Unity/Assets/Scripts/Component/UI/UI.cs b/Unity/Assets/Scripts/Component/UI.cs similarity index 100% rename from Unity/Assets/Scripts/Component/UI/UI.cs rename to Unity/Assets/Scripts/Component/UI.cs diff --git a/Unity/Assets/Scripts/Component/UI/UI.cs.meta b/Unity/Assets/Scripts/Component/UI.cs.meta similarity index 100% rename from Unity/Assets/Scripts/Component/UI/UI.cs.meta rename to Unity/Assets/Scripts/Component/UI.cs.meta diff --git a/Unity/Assets/Scripts/Component/UI.meta b/Unity/Assets/Scripts/Component/UI.meta deleted file mode 100644 index c5b010cd..00000000 --- a/Unity/Assets/Scripts/Component/UI.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: e86307745c67e5447bce24ec9c64397b -folderAsset: yes -timeCreated: 1475915395 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Scripts/Init.cs b/Unity/Assets/Scripts/Init.cs index 4f57c048..016a4715 100644 --- a/Unity/Assets/Scripts/Init.cs +++ b/Unity/Assets/Scripts/Init.cs @@ -10,6 +10,7 @@ namespace Model private void Start() { Object.ObjectManager.Register("Base", typeof(Game).Assembly); + Object.ObjectManager.Register("Model", typeof(Init).Assembly); GameObject code = (GameObject)Resources.Load("Code"); byte[] assBytes = code.Get("Controller.dll").bytes; diff --git a/Unity/Controller/Event/InitSceneStartEvent_InitGame.cs b/Unity/Controller/Event/InitSceneStartEvent_InitGame.cs index 76ad5294..80c1a87d 100644 --- a/Unity/Controller/Event/InitSceneStartEvent_InitGame.cs +++ b/Unity/Controller/Event/InitSceneStartEvent_InitGame.cs @@ -12,14 +12,13 @@ namespace Controller { public async void Run() { - MessageHandlerComponent messageHandlerComponent = Game.Scene.AddComponent("Client"); - Game.Scene.AddComponent(NetworkProtocol.UDP); - //Game.Scene.AddComponent(); - Game.Scene.AddComponent(); + Game.Scene.AddComponent("Client"); + NetworkComponent networkComponent = Game.Scene.AddComponent(NetworkProtocol.UDP); + Entity session = networkComponent.Get("127.0.0.1:8888"); try { - S2C_Login s2CLogin = await Game.Scene.GetComponent().CallAsync(new C2S_Login {Account = "tanghai", Password = "1111111"}); + S2C_Login s2CLogin = await session.GetComponent().CallAsync(new C2S_Login {Account = "tanghai", Password = "1111111"}); Log.Info(MongoHelper.ToJson(s2CLogin)); } catch (RpcException e) diff --git a/Unity/ProjectSettings/GraphicsSettings.asset b/Unity/ProjectSettings/GraphicsSettings.asset index 96548d5ef7218d34a18c32ab9fc5ee6908d02ebe..c55ed1ce493e542edf75733c5db6c8f6d2c252ea 100644 GIT binary patch literal 4380 zcmeI0yK@^w9LM+M2jLMQf$&OV!W##$V<$0$JdkbKv56Iw*fDR!T3XweIq5W~)7WMx zR8Ue-(xeO(1(O9JE|lj{@WpWWSE&jT1ix%umjW4FJX89njo)E{TVKmS?-TNx1I zE_~8n6`~9OUESyk;o;}20nxqXiS8gEH#F#{#{s^s&{0wUI zDEFbTkLJOH{%@g9Hl&&1W6*sE?R_Z2jvHNxHg)a1^ST^E%j@24aF6ai+P7EtUdN5@ z7TVP18fbZ4oPxHz?){Eu*Nf9aj9y)8r1$xAw8^;Vw7l*?gEdd@^FxkjbsyF-dUX#u zZq|DPZR$RPLd)wuYH*M4V~%HaAJ;K@b)RtD=zfhhbq}M^^194)T7I988VsJ*W$yRe z=O-OEy5FKr-D4=UyzWy5Yo6ZcrybAgKBHqW&VWeg^Rtc{-S5$+?sF)#yzcV`_vrHe z(emqkQL|p%QO7;;6YkfKX!E`w$0rTC-URL=3;9b1yZDDOhWGU46z4u%hd=McD~=Cl z?)4bB+5f@JK8!nV=JPw+)IH(iWaoo4$+Po0rF{)gpUY{- zJuz1h-J_T^*EQwhnCF{)Ug3F}tgDb&*K3Y@VhS*Phl z`8@mtko$a=9A^E$Nc_(k?D#hcKTlqyztQ~xoVpjtyL)l0?i=LAUR@wg@}lAC{8=W4S$~^9D+W7m_wyQg(daTiuR)jd zTXo#i>yqG{=iB5k?mu-q3Fr4Vjht~lOX9q1u;X7Q{Jk8%mGJj-{C2`W$noD2{$Y;q z!wU%K|51*QCcK*CXA=H#j?X7tk{5-z7|GVAUu!R`IQE+xZ86jF1Jsr`WnD#%HmW7H zuA)fQMWb2{>q=BAadggjT>vvRRObCaEtXKJ$aqs%?8vKXJy5mS51VZcs6|ROms_%? zI5ylOTv8jdwqpkXlvFF;yc|Xi8L+<`a`-Bugpv05H#Xx18H9RlvppZkNTEI*Y{{MW zVzU->>Z)$$M*m8rf)ERHD7A`J8Tqmq&xS!VOTDaC(vg85@6dN|pDIzfre?xzd|o#@ z*RMZN%{q<_%j=^)*&m+-=1JFAWVE5;>_D9Z{d+Q_5Q7WsQ2?0k#9>3mehu{{9#TWL zmgC58waiTC!;N&)x?EDKg}wEgsbOR#Kbj32YkpJbU)mcz%c>p!A8hg5LPnR8jfEF>45wCA>4nZ~5Pr?_3buGWsAF@nYj9=e*PJNc)Mvq-hWPE=Fv z@lF#7QC&0lv8uM?NMBm#d8cw`2mX&cz^lQs_X=g&d#^U8T}&2l{q-wgGM4N@u3x_b zrTYC`|9aB4f1>j>g~nL+{Z(rv@3O2HQuTw!>1g~%lDcgdQhoS_7yLhl9^a?VG1fe5 G0RI9`Athh{ literal 4256 zcmeH~-HsGR6vt2R&Mtx|g5Vdrh=Qo#^5upY2rja_^0CH&F@|t6DSB#W+RSuMYI?G} zF(DJKd;+gGG4X~QqAy{*yj6Vewc!Zx;Bk(DQoU z^1NKnLGb6*^S0-KJcRzYv){oiqpTiTh4zo*y!U01+}6JbL0SJH^3izx?|NSD=V5XP z`+OWRSU=;uM>ry{$rbcx*~Nd~^O@51IszUn(tkGVe}27=l4oO9ZXhD#)BeEoTIsy} z{@J`UrSpDBzG&-V9~ub4I3IZ)WOh|D?hn zI6hzDzdL@i!k;*Ps={aSfWeaBe$Rw;vYum(^Lazb`8mhWTI~6f#4b5y)J@T4a!Q?)mN9G)K%Ka zlzit+z1G!X8YS@n%d5Jr!p(dQ;8J&8Z4R!+VRzWlEgO%Hb)&lpit(tB`CDZo6{nYz zu8Vw8>RpwtC8jrafC?B6bR#rc$Bn)UH5Ze0rsMfr-zd}8X=TTMuatK2D8n@AsWb|q zuSV@o+Ee{TYNCE0Ee2aj+C?*Wxvq5|A<7|z61PO!LjT}ZeOd| npF2B$rGEAbjfL}eG22_vrwaN$_pU&nx%|BWI_;taxd1)|e}a2l diff --git a/Unity/ProjectSettings/ProjectSettings.asset b/Unity/ProjectSettings/ProjectSettings.asset index 264e461631fb508343bae0196c190eca3e20e599..1a1794de742ec1ed609532b7fad33f59c8ec7deb 100644 GIT binary patch literal 43633 zcmdU&d7Kid2^zdwEjo$31CQ_nqj zJ9p{MBnU2hJqT_%F$jV!g5c9z;%6{>zghduST#NP*PCy?+0g-T3SKu~z2n`_@4os2 zcf7X#m8rK~lznDW5M21qAlQgc;CfFGv|#_HyJ-bM2mbrq#GrLsN6>;P?!s3`@FZ-J zTfp2V;Ki#0?`Xdx-qU^}A+C_`j`!qz@e27qcu%$gA+C_m#C!4$331V%g+b6d*u4*e z$%Gltp9f!nTiS=^p*?wC_{R9jE7W0)u}qr~X2x|+$1Qc+27L%A-;E$e4f@)qqU zbWF!PzQ{KN?#Pf&bouUxXQ;C|xqD3vj)3h6c=4X~=Xpm!{p)d09oK>_rdj>1XrCds z`dgE`m(|}!c}H;HgrIc??&$dL=Ur-V`_Ep=ZU5Oj#@RnvKOC35!uoj?`sD9+ zbewN9!Sj7%{2<}`#rUA`{Ue;^ErGMV(_;J-;TUJ`3j4|B!e_+z1Hu_Uc!l;a37_S$ z@(m~Yd}qh__QDT{af}V;C*q~nKmA`Q{J@y~@xl*^@sosi#`syn8RvL~{$C;d5RaAL zCj7lI{;2Tx#W=>W^Z(Eo|CR7ejK3kgE5^4%XJC8HiSb>9cgJ|A@SYf-Cwy*<4+x(Z z<3-`~WBerHhsF5W!h2)$4u724{JXB*zuj&&$G(@>uzs!jFz{7yq#k*c9v-<#zr$ z7M%6Oc_BJ~9jDy4%kI#jKP&O#75a0i@Z%lzob}uXPTeedX59W5u^%GG73z!%&w1=P zbxszYe2iZpyb$9z3ttuE4+|fT@fU=T#Q5KY7s)f@er`G0*8}3cyXgN^u<3ZA34+z6 zE!t0T>#kmK)k9w^92;t=zUoN~7iQIj@~a-g5bxbyp3z zBSUWIwK}zDvxnFlRM8651q`!vtnRflP8UW%mCMD4%53ZzqF$e7&Q-pumW974je*WoxsL${%Ks|-q8Q(3W1rtAVtfbT7svQs!aqr# z;r_29z?!7h4bFD|6ge)&2hMB93%|s%jPr-}IV}8AXYKtbUnl&s7(Y+=r(^tb;g?4^ z&m^( z(W3J}iq3;-Z*{(*+|Qd8=rDeMb6m&Fn-3|s^ZvsT&hd2u#yso!TgvUc`E76?Z|%JK zh;r}GY2weLs$=8%W6G^Rk4JdapC^=Cf1U(S^5;9sy+5B6f4-|a)}N=8TYtV6;Zc8{ zR&M=y20Y21?<@E7>CNzm@$Cny{2D!1|NN8n!H_JYo>P0P zgE__NbDmm;zVMp(`9eg8^VBwQlK%fh>=~c0hW+-!f2#JL?=Sqt2@8s# ze-qJ(*3T=daD)-}J zqs_ejpTLv!UsGaUZcWG#EGN=j((m@=5NTcCP6EMfnEC|G$EJ|2K5?AD#pM zjoiI9H0Qv7S3b$@7Y0TDAK*S;tN%~sR{srhTpc(uM_swNNB{pt*dm{7{CrdSM#fL) zB+@!?`n!w7PwKc25}eM)t{$*HbM-TUg>rloqdyVc*TY+k{v>jz{}xjZ8z}eso1m{S z-wkP;pg)=R8ERSmja0|#Z>-$+la*4>o2b4Wr*Bbi`^l!{xY$qFpTmB#nc7b>^{_d( z_j3bN4_lBsoefMqY^mJuPe;Yit!UihGuF?oX`dmte)7DWkB}dMC+R2e->TfllT)ET z34B{7;$l2O%xqmOe7gwed~q{4hH&sUwjPLcTUmYB}IRV>RA0-1plDz^LYiwfAxUM$tb&xsAi`0r&mW#^D3WoxY9p z2PyY){%+Clq_MNN`Ufkw`iBUgfH?nv_|JBKui8&``^qPg#&&$4av$fzc03fENsRN+ zdd?`H?Bc-pp~H6XQXS7<5I#q_Z=VrYcr?N@tS-XoOT@-6{SD(?U}T;h5l8vh5C`+hhq{x7Amv$y)ol-qvD&qckx z=k%ZbWQB5HZ)K^sBgr%L$H(WBB;TXRTjaLhjt2MTvh{WhIUb46YsV_@aO%SrTA4t(ZIYs}2s$=y(q}=Oox}}d}trY!JQuI$%9jkwu za^GINLVpsf{=?LF_38O6;U9@`u8R&6e@-WFwYS$9%58gnRCVn7{7kjC>+`d~eY@NB z`Pt;oPrE)pN4fX^Xz~AC>f>VnXFse9KQG456@Gq%bKP|nIOpq+Iqu5qbRGa>y^F;siDf-u? z=wGioR{sX&UjKU0|3ZrX7gO|aR2{2-lX90(|^}i|lUrN!x zJw^Wx)v@|tR_^=fccIVzc_;O8h2#B2;a`bxj_ZGdb6kH_x!v#FrTTU}-mTpC|IM~$ zUO{jV|HzEzyE8cbxtAPQI9?7B`}<=27~x-w=x|(&fpc7}CvQ>5j*I)jlltw~$z8s- z-X2iy+vOb5e~`ur`rn{^hFUgmd{cF-{zJ;W{^g?oaEku7QuM#AI#&M?~uNVC%Q}n-+qW@jhvHDLb_x<)U=(C@EkNUX6c>b*9`!sor+_w8O z)XB8B%lB2^=KBNXzFe<}{tr|1f0UyCW7V+R>NZ}WXgxzD#x^8E$%afRdhIB=qu`A5cc z&LgYE{+BWPQ^o#QF@A;cU&r_@!haLv-w^%^c_iQGz*#@Pjo34uyaLX6@;mYt{j~k+ z_uxtO^9OP~5}#*ZRqosU4blH2jT7|$MEi`_iO#dHsgAAxKP&h3zZDKuSgzNpk1K5V z-N0F{zmT`cZMptRolJYae^Y&%@86aCeD{}p|3Q6RVZH}TzW*d|wdeZ=bu#Vw{!8_3 zzHch`^|?^=g9*v{9pFj&6UgyMyuBtW_vJcD$~B4l&fe!+kbE~FZ&AnA=Z4hDc>QQQ zPF8(eu8oxYe4CQ*#?;5f`lQY|!Z(TW&kBD_gtI@d7e6;8Z?*fm8F-SPo0GeIt)E*c z_x11t(cdyff2$PztyRbB^LyDoU$6fM(SK`-{8x6#YF? z^!HR9tN%{rUjJ~>e^-kBUMc!}tB%#*N4eKOTJ+zYqQ7s7{(h=s_4ilq^&6r;Ek%EN zivA4MvHCNWd;N1oe^!eA>=gY2RLAPSN4bwDS3-Xh#`%HN#}&ryyCh%!eTbyE(Mg>Q z?d`hvVAZ$z9-`dm`?TcyUh3lt1ZXpHYHJQL$Hg?GjHVZ!Ic__4yf zWBf$nJrT~hdKx(A)4Aj=`fua^Jn*FYnNRM@YwPDQ<$m9EKJ;nVOMP6dAD$;%EBx>n z|B~!NsKQQK0u!F<>h== z0%!l^-@oA%_LDP&FOBhQg)fV6w%48DY_H|yE$Z0zS^=KaUPqF>-zIMFc|OK>6kdq& zX~I{Wo;k^1ZTjPe%*bDEH^3*Fc}=GfnE_ zg1$L-U8DB)d}gh3@8@me=Q`@N+Wo|L_!Gy)NvdQ0e7|zvuO5Ov>+1v5&+xsE|IdMQ zT%Syii=6H9Tk+?EYu6H>+d1@XQk+$ouYq^>RA1Am3#ezMgP1M{qs}wKc+fX{{rP+ z|8UX&c#8goDf$u zdgWe!z3AVNqW^^y{V%GH)xS}>*Z+a&-;|<%bBg{gs$=zURqpj)75&>%^uLs%f4k~f z{X3L<{S9{T@$Jhg`gf-2e?@hy{#TXzxV;_p8Mp7EKCUpH? z{67Yq@%cXTR(t&a8hBFtUr+A*vHst$+}BT8^uL~>|3HfVgQ{cozoFdgw?zM&Df$nk z=s&DFR{vYdz5a!w|Lqk0M^f}3RUNDUm~yXwwdg;dqW?sS{*$U>^}nOs>)$5&-%Zhf zDnZ^uM2?{{z*r`ae|e`~Qp3XaD~Z^>Ky$|25%1j&Szp4R`eY z`C0N-dw+h8`WbS&4t$>6>05tZQ0~jSt?2(GMgONM`Y)=E)&H4tU*6rJ&+`79`nbY% z+BC`cCGr-zU8ntmIvH|Xu9sEc=KD+KzFc!e|5qvczfRHrjp|taSCsp59UKWOjrwe9{-)v@jJ zhI0S?x7niqFQ?yX(|=RB)kimT4za)Og7Sv@yAJXeb^P~=FT)-C^8~fG-&>og_V#;g zlfXMN)Un@N+khMu5&yp8hRS`tEtGOicKUqA*4su-pWK#fW2fW!5%8VmVmsk`cCh8k z>mMunZ%NVLG(~?i)v@iexpJ?6qUdjtqQ7N|{#L4E^|w~;^-mZ5ZBq2#nxen0>RA2l zlzaUvMgMIn`tJ9pWZLWh?W$w-cTn#2?-YG}-ybbR9oxR|pnZb=PO4+|cUIovzUTZn z^zm1rgI&Pc1;TcJS@NAi-fGWxSL$TQZNJ)$9FLGk`_=Bs{dk!ISj&P;T}2 zB*zsWkMC4_J09Pq_I5n(rS^6_?hW3Np}rlD`;fbQ?e|FEt=zZQW>T(w!IR2`@0KUl z+y1I!>us8HuRlffr>E%8NYS6EI#z#{azB3^1pP^HeKz%Ru|II0S^&=S9}wd?;qQs@ zlY}2gp7A<7cm0^?9~7}CzgBo>gf9cX7aU)K3l4UC3VfIlTn+w=*dGGk5sdR62!C&k z|48`zV*FX*hbs4fFYWzBKl#zU25UbXk*g7X*W-@}#Laj^irBSU>VF2djQ z6rZR1XpfvZKhpp3``e3B^cO3)`u*fiXG1gp9-;P=&ELOUqI@Is_g@CUJ2LcVV|Shz z{{5*za;LwsiC0UNd;QS=W#GP^t^RV_C+M$G9jkw&azCyQl=eLeJSlD*O?#(r+xHmN zvE%w!<^Jzw%oY9Pz?1Y>D!2N_ljCClSq_bG{gYLD-+x9#e@MCQKRNJ@40UY#=ESV}mz9*975%TCfTT|}Kb-(D>!IShGv`^4)s*crP zqulF%NA%Z%C+V-FeS-d&>RA2o_rQho&aa@)a=xGXxI+Gh@DGq@JbxY@Y`=@I=aVCx z^ViEB8F1pTk5j@AFFa<6}Z=-&mNq<=T< z6ZG#<9jkw@a<6}t=-&sPr2jSAC+M$N9jkx8aMllKum?GyALRUNDUm~ubvChY3R-Q(cAIPN%K z?SxI9c>FH8)3^RSrQGkc7D1nO-vbZlN3IiA34c1m zxqmqooc=sRzMjuof4)!NYWL>{Yjw?78&$WX_wpPwan`gVQ$ zobpM*1@L_n)G7Uc9^Cu6fs1?idrgkNpnOBKZ~6&!T)zJAx$g*_Ns#y{xyyI5S%1E$ z-0NR2_4YGxpRd*bIqehlUs4^b{|n{*`!lydpZ>fI&Wpc?0d3d1Tk`#-a+~k3l-qLs zI>x!*q5f}_`*J-f`md0;n6K6UEqF(U-0J_19FLGk*X_So?#uO*l`p>Fw&+}gg_x{`S{J$vo`^`;u^W){O)M@b< zJ6`^#+>YPBljGueVH^neoBvRI`+cf^f_G$SZ@*9V2D#I*->3SQa{v4McZZ*B-#5W| zF)nR|eCLY)F0n;!{qNvIj$8jHkmHK`KT++i|C7Lz{NI4w=~(|aRPN*FGVy;h^)r0N z`(GFTHzIG5TmLs!ZvEec99P``x2V1Ke^c-z|2HFdI@bTqmHRmS5%@{FEvS!+{xc3= zB7Dmj|AKJ-zU`>}J;Jw+@kfPk6XVYce`}1tB7EBze?$0oF}}_2-v777_};>|kMTo< zzdgnm3Ev^c^TKzG@uu*1#Q2%QcZ%`Lh3_2WHwxc{Jmc%1{r^62&KFb2TjaL??5f=M zpWVoD#rx0hYH$0`RPc@r?d|y8gWT!Z{4$^{tmNJS z>(2xa67*-$K0$vrd4m1{%Dw)1Q@#Fsz=H(+18JY2e-L?se)xOw83!2upP1_P4~Bh^ zpnnK;67=6oo}m9eb#`{zB!p|M!vOipPOPYH#Df zVsKv%HV*WYI~^Mbj!^E`8<&ZnOH|+11ONSmpymB>`wsLiqCx(FEAHn~wYPpQ15fgE zIl0rZey&jN{k&8BJW}x<=)Tlh@Z!+ zzV$P!-1<30?)0snIkmTb=E0NvERZ`L>*p%v-p^l)pTnwe{Txwl{p7!!!7JYGC#b#k zb2WI9pCxjqWBnXe?){vwr;h_=)wh0Dlv_Wm{j7l}`B^7-I@ZsIa_{F3 z;%8I!t)FX@TR+#5JALctI<>ccj)5onc@nwPv3|Z^x%YF1`1t|Vw|<_i-1_-Ja;I*pEZNq&Bm-04_9 z&s6UHEQ+6JslN5|Y~|L^bI6^(_48b{w|<@np5*8G`7!0*&yR|q7pT7V^W(~` zpBIulee35%YH$7g1bC947n3_3>*ptxdq1xcKR>1V*3V0nTR$%)cly@P%hcZb`DySZ zKQAYDI@ZrClzTt#5kId~ee35{%B`PQlRJIu=QV0?{rn7glAoU?cRJS3Yn6LHe zPW7#ypI2`EypG)ITR*Q?d+X;7;7NXdf!yg>KfkEl`}rsF^G4OTe%_?q`gt?C)3<)! zqW0F$Tfvk3yp7!HSUMq?)~f*Kfg}>^?b(q z`2cx~-1_+-Ij;CR_KOa#YyB~Q} zxz}GU`j4gPKc1rhgz8xRCzX5swW9x>6#eg}=s%@8R{wj-{khZW&}Th9O?_PbrR-Rt zHc)6Zisj*YP_0$+&0J&t(%zmRpKWB1o_4JNIbD9vke@S;4Z6ztTBVrpuT@qRONCmH zFRaQoOO1hCtxza0t`!UAMz&F`l!HdLHe6`*6xI}Tg`in4EH3vHMziJol0v=GtmO*z zAe+k-AW<1DGzztOwZe(bLOC}UY8G_~!$CFD$1EFYWOJ(rYcL-itD>rll{$;Wr z4)*s{)|N}iFvyY=@?A~%P(g<&3|9IpwMH#lZ2Y^lrPX>dU!Y2o)k2h^p37DXOI&Lt zFuxNr}Q=J z#az%|D^#;Jpv41I=2dD_mK1W8nrpavb7-{K=qhJRV~t|2&NBGny%3c@lwHlPQ!3U` zyuLzx1btyu1*6Yr*juhQvSswCTA^M%iG^HVEaxk0DbknCp{WPZK!s%(5r_+{q2X$C zV0E!vW|tYRWve5|^6<(~Jy~gta&&H)!d+_+SZWclpja;CFi!ED zxA1`N!H$beh9imdij8uiUJurwBv3PT=o*@}Uw1)hU~RFH!+6T(##vt_UkLIu^9Qw~ z>CeOsezQ=I76jEWkR7d-Sc3A*d>y@sHGqCoD^%*a zO0}3aX}CLXRq2dwlJMk}>3^tWY&TBEQo z?DExmbw)qNZ_QOJ@49j)HjA~wocVph+G26(;Ic@UCzy|5-k;6)4Rm!mgMntXit%1w z)GX&lnyU@#M#x5&@2->^HFRAJKq`b!%*mG6W9L+|wY*8_tFVLimzs5hF;T^oTr~1S zE$pVuVBD%3ajg+_)vM^AOW5t}h_aGDVpf#T>YN$O?wl1&KcI8^H2!%|u(&Z&sMUiZ z#76YfJm$mVsv-*E0VuBK;>bYL`eQkV}zzp9&Y39p__3awY<#U{?;#oIG3Zfh*gT7*U zAip|vSs)@2f+D)B3m&D?!U|>*=ANyv_u?I9_G+=4vv{M384dG|?{@V@tyrB~Mn6PM zLN3MrkxCiE0<@}qQ(z9T(T$N!$x*~6mxWK9(=3+qi<+ZDs8#gM9HIe+R=LpVFVseh z=sR%6@qwOh^pXhet`#uXEQf3r(?l)k>R&K-9TppWgv$vogrWrV{# zqbCamm&<4{KO(wEvgLB2M2-;Zf^4?F8r=nh6|=4{;CK~!Fz8lBiwDArZLC>55UFS0 zCYdb30tsVm?mEmr=r|lw<9#-0_M%~GZbgBn$)O6Gz4AmIHBd)vf#1uE^NNuKMn0Kz zn!Q*vG@A7}+1g>nJUSoD=B_I?7MBN_=<($|?$yFCrKEU~C6<)%<;Q&*oDe%;v?7)bw;oc{14`TdkG~gUgH`u7O9<>)0*} zx%93FWDD65Vr;Nd9T+K;R`rf%hYMm`q$wk%Z!0e8f*1>n5$Eb;JYjqV=a!a1ZFndf zx51Do^<$2X`5!4rYhl_Qc)#@CSjVOBN2~Mhc_c=CDUV z5P=0TXRweR#b!l^Z_AFUhn@5L+7%wP{q2g-==fXI{f-PH*vcY90 zAcy()))_{^4E+2vhars{ERpl~_3#l%Uh8&2BYxvEt4zPEu}-i&`PFE&P8Lwkrczc(9QDH}5L=$tH;gif-c7S!|^%WgJ9Q z8jA{zrDaUsSfl0VuFGLv%~eCeZB_hoB3lX{53r40Jaj_$(sC}_#6Dl`>+(Q%4TlU% z3RSFV(cswAjTUOzrF8`GoGRgx{a?EQk#wGB5F zQRSq4Q9QlBQg>2mD14I+;Xns4g{+8S++iK>neSqfcj&Nw{Q0)Zq>K)iCyge2)l$^>(;=1;9Chy>pX25}=tK z9a!bNEACxQEN(XXi|Yy{lnybGf+6n3sT}If2k{8U(5h8V!2Sh|hgN2@&BEX;V@XtW zExMv_p%x>`2YTm+e7py_F%)76C6=MVdvID|VSaUZF2n4x(^Uy>-nn})fW|luGaCK1 z;+kx3YIWTbhxpRuQl{3}#i!1AbQ}ci7_8arow*sFvsPv^g(H9HD*! zWu^heqj%qYw$c0W77p;cZBGqqn*!6IqR8j zq00Rc{2i#EL&}cI4{wj%91z{f>L3#hIeSI`#(`Z;8!g*_V?*85rt^t8pnv2>`d5dc z)88+|n5Z}6lzY?RLb1H65_T&0a8Gs&XFt^P>Zp@iU$%_k7j`huZKx6BnLUvz@OJL( zs*Pff#7PX!K9?cj^LQtQ>PS~iEH z9;XtY(5o}zGkSH#ctF;IM(1=qVrTIX*qNH;b;TP0TxncR;`k9we8eDCVCOiLWdw^h z*EgI&bk3{Jh)jBHR6Fb8&@(#i!M$Z%HE4~c1zZ}+yghfc>2mGjry+wlwnm7SPfggb zmR51Xp6AiAvqI=BHAa?aYwqyf8Pp4ilzIS1#IArN9Gu$tHL`nBpx@}rgYD6FG&OhM|cBcqeGRFoLovHxE-fE$`lYT3moglAu`TFu?X|S zpdCujj3*2$BTle$36krhZx9bbz zMPPWq24Nw}+Ep8_bB6bdV!L+Slp~-y+RohpPdml}r_fGOt^6d_C2+&#ip4uDlnVaC zHh#J?&c{cP9N`4`z$eIh1K*f_?-Vz5%25N%0dX5{PFG=t#&PWqaf^)3tm%1!UE?Lk z4J(GRpdR!|a!Bw|u3JL7NU=)Hya<+WjY_Uk8dpMfSBuCLYrJrwg;O$AL>adHcskm8 zQI4Y)Z-;oyp#gK|<&>S>{QiOQGhor|(>+&0QhEGrmY?6Cc5vv*HNIO~5YbsI8|qxJ z7jp=j{zIE_D>p6k2C^{{8S7$0WrCIB>iQX;AbvvF}1 z)<;Rn5~i?ss*U+003%xPWx%0Mxmm(-AEq}+k9I~uz33ILyNhUO>KB6Z`&6S-y0sw2qMjT1F|<;a%Kj+Rt>s2n`i>w^ zgqgU-mz=5yb2CtZ-|FB<>&2p462?C|;51W`so(X`Vz~i(9BDS(cQyE72^tum`Iifw zosh=|IA|2c6|RnlDit26M9jPVsb**AvL&6J{^Z3+5JMJW$!S3Uz|7eFtk`{D?7n}7 z0r+gT-YgFfF0(Y^e8iza1|VaI?{3Ur7$+Fd*lt*g^C|;aqcabf*2XY)48!TMx#uSZ z25`6H!knp0`TQT z)WlJx$!()cQ`$yZG^KsCji<&&ohBrVK9d$3g_;%{jmqPrQWJ8eN|S+e7>knZj@PO%Rhq@Dmb&tSY%+!I$cSU;{AMRmCpp2YoRYg(u=0pm?o722o%6enY%M z7XQh=Zpn*!F0I2|0sbW6AA0eI{<{>VkvGQL+eK3KZDa zW2rSxQs239x<67){?`f2K6$SD~ut0%K978LEB8hZ6RBkTkIWP*Slg? zc1C{5+@Ya?6PJ%2FgCKFx2HRQ_+l3bxN76|c|#R$~eb$FkM(x>~ibyK6~z zZPrQo`MCq9H|F##sP~n!M-8s%{%^I^?p?lKP_+RLK&If!-LBnwm$7yB?V8iwGkwO) zS+iZcxpxP==fH!A=gy->w5_7=nZ}r$Ug`hcoI(le{=2z{?b_b9twZ_j_!YnRDece6 z6G&j4Ok3v)jdv4*36q0~9M@b|x}cBu-e%ssne$wAfc)PtS6~0dP#f8d<^q8q}< zp30S{ZRrPlmZfds2gZEB+n0UdEa&prqK|czu-)&j^g1zxv(tayt7Z$u5_KAD0l&u(JaLT5uvoj?jgJ=H3eyg+dKN#!@jrRRl zXJzWz__}9SN#(bE}HE(R}he>Wd+&^GqKrGF~0!?Fn@t6=M;x|4g$A-`V>G*A@ zDKTQ)h-Gez730bL7s}dWMkJknB*u=24a*UaAz?DxBq5fB$*#>3Vv44--ea*v)0l5O o#)OHS8@R7poNMwc?dD<{*SQRc?gYA0#>cGo`ghM;%Y?iC0Vt`bS^xk5 literal 36593 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 diff --git a/Unity/ProjectSettings/ProjectVersion.txt b/Unity/ProjectSettings/ProjectVersion.txt index c4684cd5..727b74db 100644 --- a/Unity/ProjectSettings/ProjectVersion.txt +++ b/Unity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.4f1 +m_EditorVersion: 5.4.2f1 m_StandardAssetsVersion: 0 diff --git a/Unity/Unity.CSharp.Editor.csproj b/Unity/Unity.CSharp.Editor.csproj index 9784cd46..f7c105fd 100644 --- a/Unity/Unity.CSharp.Editor.csproj +++ b/Unity/Unity.CSharp.Editor.csproj @@ -16,7 +16,7 @@ Editor:5 StandaloneWindows:5 - 5.3.4f1 + 5.4.2f1 @@ -26,7 +26,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE false @@ -36,7 +36,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE false @@ -87,30 +87,6 @@ Library\UnityAssemblies\SyntaxTree.VisualStudio.Unity.Bridge.dll - - Library\UnityAssemblies\UnityEditor.EditorTestsRunner.dll - - - Library\UnityAssemblies\UnityEditor.Networking.dll - - - Library\UnityAssemblies\nunit.framework.dll - - - Library\UnityAssemblies\UnityEditor.UI.dll - - - Library\UnityAssemblies\UnityEngine.Networking.dll - - - Library\UnityAssemblies\UnityEditor.Advertisements.dll - - - Library\UnityAssemblies\UnityEditor.TreeEditor.dll - - - Library\UnityAssemblies\UnityEngine.UI.dll - Assets\CSharp 6.0 Support\AsyncTools\Plugins\AsyncBridge.Net35.dll diff --git a/Unity/Unity.CSharp.Plugins.csproj b/Unity/Unity.CSharp.Plugins.csproj index 2ce46a83..6b846603 100644 --- a/Unity/Unity.CSharp.Plugins.csproj +++ b/Unity/Unity.CSharp.Plugins.csproj @@ -13,11 +13,13 @@ .NETFramework v3.5 Unity Full v3.5 - + + GamePlugins:3 StandaloneWindows:5 - 5.3.4f1 - + 5.4.2f1 + + pdbonly @@ -26,7 +28,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE false @@ -36,7 +38,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE false @@ -57,12 +59,6 @@ Library\UnityAssemblies\UnityEngine.Networking.dll - - Library\UnityAssemblies\UnityEngine.Networking.dll - - - Library\UnityAssemblies\UnityEngine.UI.dll - Library\UnityAssemblies\UnityEditor.dll @@ -77,14 +73,6 @@ - - - - - - - - @@ -520,5 +508,6 @@ + diff --git a/Unity/Unity.CSharp.csproj b/Unity/Unity.CSharp.csproj index 405d96f5..69f092d7 100644 --- a/Unity/Unity.CSharp.csproj +++ b/Unity/Unity.CSharp.csproj @@ -13,11 +13,13 @@ .NETFramework v3.5 Unity Full v3.5 - + + Game:1 StandaloneWindows:5 - 5.3.4f1 - + 5.4.2f1 + + pdbonly @@ -26,7 +28,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE false @@ -36,7 +38,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE false @@ -57,12 +59,6 @@ Library\UnityAssemblies\UnityEngine.Networking.dll - - Library\UnityAssemblies\UnityEngine.Networking.dll - - - Library\UnityAssemblies\UnityEngine.UI.dll - Library\UnityAssemblies\UnityEditor.dll @@ -85,10 +81,16 @@ - - - - + + + + + + + + + + @@ -109,5 +111,6 @@ + -- GitLab