1.Entity增加非泛型方法，主要方便ILRuntime层调用，防止AOT问题

2.Config稍微修改，也需要加非泛型方法

Client-Server.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Plugins", "Unity\Unity.Plugins.csproj", "{D1FDB199-0FB7-099D-3771-C6A942E4E326}"
 EndProject

Server/Model/Server.Model.csproj

@@ -70,7 +70,6 @@
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\AConfig.cs" Link="Module\Config\AConfig.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ConfigAttribute.cs" Link="Module\Config\ConfigAttribute.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ConfigComponent.cs" Link="Module\Config\ConfigComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ICategory.cs" Link="Module\Config\ICategory.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\AMHandler.cs" Link="Module\Message\AMHandler.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\ErrorCode.cs" Link="Module\Message\ErrorCode.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IActorMessage.cs" Link="Module\Message\IActorMessage.cs" />

Unity/Assembly-CSharp-Editor-firstpass.csproj

@@ -13,7 +13,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp-Editor-firstpass</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <BaseDirectory>Assets</BaseDirectory>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;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_VR;ENABLE_MODULAR_UNITYENGINE_ASSEMBLIES;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45</DefineConstants>
+    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;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_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</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -44,93 +44,95 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UnityEngine">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Assets\Plugins\Editor\JetBrains\Unity3DRider.cs" />
+    <None Include="Assets\Res\Config\GlobalProto.txt" />
+    <None Include="Assets\link.xml" />
     <None Include="Assets\Res\Config\BuffConfig.txt" />
     <None Include="Assets\Res\Config\UnitConfig.txt" />
+    <Reference Include="UnityEditor.Advertisements">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.UI">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Networking">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Networking">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.TestRunner">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/Editor/UnityEditor.TestRunner.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/Editor/UnityEditor.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TestRunner">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Advertisements">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/Editor/UnityEditor.Timeline.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Timeline/Editor/UnityEditor.Timeline.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.TreeEditor">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.Analytics">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Analytics">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.HoloLens">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.HoloLens">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Purchasing">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityPurchasing/Editor/UnityEditor.Purchasing.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/Editor/UnityEditor.Purchasing.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.VR">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Graphs">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.Graphs.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Android.Extensions">
-      <HintPath>/Applications/Unity/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions">
-      <HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEditor.OSXStandalone.Extensions">
-      <HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
+    <Reference Include="UnityEditor.WindowsStandalone.Extensions">
+      <HintPath>C:/Apps/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OOXML">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.OOXML.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.OOXML.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXml4Net">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXml4Net.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXmlFormats">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXmlFormats.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Unity/Assembly-CSharp-Editor.csproj

@@ -13,7 +13,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp-Editor</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <BaseDirectory>Assets</BaseDirectory>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;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_VR;ENABLE_MODULAR_UNITYENGINE_ASSEMBLIES;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45</DefineConstants>
+    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;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_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</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -44,10 +44,10 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UnityEngine">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -85,100 +85,113 @@
     <Compile Include="Assets\Editor\BehaviorTreeEditor\NodeMeta.cs" />
     <Compile Include="Assets\Editor\BehaviorTreeEditor\NodeMetaHelper.cs" />
     <Compile Include="Assets\Editor\BehaviorTreeEditor\PropertyDesigner.cs" />
-    <Compile Include="Assets\Editor\BuildEditor\BuildABEditor.cs" />
     <Compile Include="Assets\Editor\BuildEditor\BuildEditor.cs" />
+    <Compile Include="Assets\Editor\BuildEditor\BuildHelper.cs" />
+    <Compile Include="Assets\Editor\BuildEditor\BuildIOSEditor.cs" />
     <Compile Include="Assets\Editor\ExcelExporterEditor\ExcelExporterEditor.cs" />
     <Compile Include="Assets\Editor\ExportNavmesh.cs" />
+    <Compile Include="Assets\Editor\GlobalConfigEditor\GlobalConfigEditor.cs" />
     <Compile Include="Assets\Editor\Helper\EditorResHelper.cs" />
+    <Compile Include="Assets\Editor\Helper\MongoHelper.cs" />
+    <Compile Include="Assets\Editor\Proto2CsEditor\Proto2CSEditor.cs" />
     <Compile Include="Assets\Editor\ReferenceCollectorEditor\ReferenceCollectorEditor.cs" />
     <Compile Include="Assets\Editor\RsyncEditor\RsyncConfig.cs" />
     <Compile Include="Assets\Editor\RsyncEditor\RsyncEditor.cs" />
     <Compile Include="Assets\Editor\ServerCommandLineEditor\ServerCommandLineEditor.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Editor\ILRuntimeCLRBinding.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\CodeGenerator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\CodeGenerator.OneOfStub.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\CSharpCodeGenerator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\CustomOptions.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\Descriptor.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\NameNormalizer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\Parsers.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\Peekable.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\Token.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\TokenExtensions.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\protobuf-net.Reflection\TokenType.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\Editor\Protogen.cs" />
+    <None Include="Assets\Res\Config\GlobalProto.txt" />
+    <None Include="Assets\link.xml" />
     <None Include="Assets\Res\Config\BuffConfig.txt" />
     <None Include="Assets\Res\Config\UnitConfig.txt" />
+    <Reference Include="UnityEditor.Advertisements">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.UI">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Networking">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Networking">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.TestRunner">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/Editor/UnityEditor.TestRunner.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/Editor/UnityEditor.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TestRunner">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Advertisements">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/Editor/UnityEditor.Timeline.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Timeline/Editor/UnityEditor.Timeline.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.TreeEditor">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.Analytics">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Analytics">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.HoloLens">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.HoloLens">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Purchasing">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityPurchasing/Editor/UnityEditor.Purchasing.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/Editor/UnityEditor.Purchasing.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.VR">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Graphs">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.Graphs.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Android.Extensions">
-      <HintPath>/Applications/Unity/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions">
-      <HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.OSXStandalone.Extensions">
-      <HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
+    <Reference Include="UnityEditor.WindowsStandalone.Extensions">
+      <HintPath>C:/Apps/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OOXML">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.OOXML.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.OOXML.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXml4Net">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXml4Net.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXmlFormats">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXmlFormats.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions.Xcode">
-      <HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions.Common">
-      <HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Editor/npoi/NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Unity/Assembly-CSharp-Mac.sln

@@ -1,14 +1,14 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{2662B409-6332-1E56-D797-C9025C53BDD6}"
+Project("{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{2662B409-6332-1E56-D797-C9025C53BDD6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}"
+Project("{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{6311E6C6-0A20-383B-320B-694068DE37A5}"
+Project("{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{6311E6C6-0A20-383B-320B-694068DE37A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{F534D6C4-3368-032B-289C-A943CC171719}"
+Project("{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{F534D6C4-3368-032B-289C-A943CC171719}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotfix\Assembly-CSharp-Hotfix", "Hotfix\Assembly-CSharp-Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
+Project("{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1}") = "Hotfix\Assembly-CSharp-Hotfix", "Hotfix\Assembly-CSharp-Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Unity/Assembly-CSharp-firstpass.csproj

@@ -13,7 +13,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp-firstpass</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <BaseDirectory>Assets</BaseDirectory>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;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_VR;ENABLE_MODULAR_UNITYENGINE_ASSEMBLIES;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45</DefineConstants>
+    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;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_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</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -44,10 +44,10 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UnityEngine">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -376,119 +376,36 @@
     <Compile Include="Assets\Plugins\MongoDB\MongoDB.Shared\CanonicalEquatableStruct.cs" />
     <Compile Include="Assets\Plugins\MongoDB\MongoDB.Shared\Hasher.cs" />
     <Compile Include="Assets\Plugins\MongoDB\MongoDB.Shared\IncrementalMD5.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\BclHelpers.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\BufferExtension.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\BufferPool.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\CallbackAttributes.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Compiler\CompilerContext.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Compiler\CompilerDelegates.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Compiler\Local.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\DataFormat.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Extensible.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ExtensibleUtil.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\GlobalSuppressions.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Helpers.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\IExtensible.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\IExtension.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ImplicitFields.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\KeyValuePairProxy.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\AttributeMap.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\BasicList.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\CallbackSet.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\MetaType.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\RuntimeTypeModel.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\SubType.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\TypeFormatEventArgs.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\TypeModel.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Meta\ValueMember.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\NetObjectCache.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\PrefixStyle.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Properties\AssemblyInfo.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoContractAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoConverterAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoEnumAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoException.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoIgnoreAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoIncludeAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoMemberAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoReader.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ProtoWriter.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\SerializationContext.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ArrayDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\BlobSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\BooleanSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ByteSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\CharSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\CompiledSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\DateTimeSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\DecimalSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\DefaultValueDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\DoubleSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\EnumSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\FieldDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\GuidSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ImmutableCollectionDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\Int16Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\Int32Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\Int64Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\IProtoSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\IProtoTypeSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ISerializerProxy.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\KeyValuePairDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ListDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\MemberSpecifiedDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\NetObjectSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\NullDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ParseableSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\PropertyDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\ProtoDecoratorBase.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\SByteSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\SingleSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\StringSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\SubItemSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\SurrogateSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\SystemTypeSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\TagDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\TimeSpanSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\TupleSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\TypeSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\UInt16Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\UInt32Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\UInt64Serializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\Serializers\UriDecorator.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ServiceModel\ProtoBehaviorAttribute.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ServiceModel\ProtoBehaviorExtensionElement.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ServiceModel\ProtoEndpointBehavior.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ServiceModel\ProtoOperationBehavior.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\ServiceModel\XmlProtoSerializer.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\SubItemToken.cs" />
-    <Compile Include="Assets\Plugins\protobuf-net\WireType.cs" />
+    <None Include="Assets\Res\Config\GlobalProto.txt" />
+    <None Include="Assets\link.xml" />
     <None Include="Assets\Res\Config\BuffConfig.txt" />
     <None Include="Assets\Res\Config\UnitConfig.txt" />
     <Reference Include="UnityEngine.UI">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Networking">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TestRunner">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.Analytics">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.HoloLens">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Unity/Assembly-CSharp.csproj

@@ -13,7 +13,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <BaseDirectory>Assets</BaseDirectory>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;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_VR;ENABLE_MODULAR_UNITYENGINE_ASSEMBLIES;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET45</DefineConstants>
+    <DefineConstants>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_1_1;UNITY_2017_1;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_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;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_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;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_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;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_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</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -44,70 +44,14 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UnityEngine">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorNodeConfig.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTree.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeArgsDict.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeConfig.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTArrayDoubleComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTArrayFloatComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTArrayInt64Component.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTArrayIntComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTArrayStringComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTBoolComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTDoubleComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTEnumComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTFloatComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTInt64Component.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTIntComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BaseType\BTStringComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BTTypeBaseComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\BTTypeManager.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayAudioClipComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayGameObjectComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayMaterialComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayShaderComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArraySpriteComponent..cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayTexture2DComponent..cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayTexture3DComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTArrayTextureComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTAudioClipComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTGameObjectComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTMaterialComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTShaderComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTSpriteComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTTexture2DComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTTexture3DComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BehaviorTreeType\UnityType\BTTextureComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BTEnv.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\BTEnvKey.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\Node.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeClassifyType.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeDeprecatedAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeDesignerProto.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeEngineObjectAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeFieldBaseAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeFieldConstraintAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeInputAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeOutputAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodePropAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\NodeProto.cs" />
-    <Compile Include="Assets\Scripts\Base\BehaviorTree\TypeHelper.cs" />
-    <Compile Include="Assets\Scripts\Base\Config\ACategory.cs" />
-    <Compile Include="Assets\Scripts\Base\Config\AConfig.cs" />
-    <Compile Include="Assets\Scripts\Base\Config\AConfigComponent.cs" />
-    <Compile Include="Assets\Scripts\Base\Config\ConfigAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\Config\ConfigHelper.cs" />
-    <Compile Include="Assets\Scripts\Base\Config\ICategory.cs" />
     <Compile Include="Assets\Scripts\Base\DoubleMap.cs" />
-    <Compile Include="Assets\Scripts\Base\EQueue.cs" />
     <Compile Include="Assets\Scripts\Base\Event\AEventAttribute.cs" />
     <Compile Include="Assets\Scripts\Base\Event\CrossEventAttribute.cs" />
     <Compile Include="Assets\Scripts\Base\Event\Env.cs" />
@@ -115,14 +59,15 @@
     <Compile Include="Assets\Scripts\Base\Event\EventAttribute.cs" />
     <Compile Include="Assets\Scripts\Base\Event\EventIdType.cs" />
     <Compile Include="Assets\Scripts\Base\Event\IEvent.cs" />
-    <Compile Include="Assets\Scripts\Base\Helper\ArrayHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\ByteHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\EnumHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\FileHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\IdGenerater.cs" />
+    <Compile Include="Assets\Scripts\Base\Helper\JsonHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\MD5Helper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\MethodInfoHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\NetHelper.cs" />
+    <Compile Include="Assets\Scripts\Base\Helper\ObjectHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\ProtobufHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\RandomHelper.cs" />
     <Compile Include="Assets\Scripts\Base\Helper\StringHelper.cs" />
@@ -132,7 +77,6 @@
     <Compile Include="Assets\Scripts\Base\IL\IDisposableAdaptor.cs" />
     <Compile Include="Assets\Scripts\Base\IL\ILAdapterAttribute.cs" />
     <Compile Include="Assets\Scripts\Base\IL\ILBindingAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\IL\ILRedirection.cs" />
     <Compile Include="Assets\Scripts\Base\Log.cs" />
     <Compile Include="Assets\Scripts\Base\LogType.cs" />
     <Compile Include="Assets\Scripts\Base\Math\AcosLookupTable.cs" />
@@ -145,63 +89,30 @@
     <Compile Include="Assets\Scripts\Base\Math\VInt3.cs" />
     <Compile Include="Assets\Scripts\Base\Math\VLine.cs" />
     <Compile Include="Assets\Scripts\Base\Math\VRect.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\AActorMessage.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\AMessage.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\AMHandler.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\AppType.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\ClientDispatcher.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\ErrorCode.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\IMessageDispatcher.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\IMessagePacker.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\IMHandler.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\MessageAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\MessageHandlerAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\MessageInfo.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\MongoPacker.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\NumericType.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\OpcodeHelper.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\ProtobufPacker.cs" />
-    <Compile Include="Assets\Scripts\Base\Message\RpcException.cs" />
     <Compile Include="Assets\Scripts\Base\MultiMap.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\AChannel.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\AService.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\TNet\PacketParser.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\TNet\TBuffer.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\TNet\TChannel.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\TNet\TService.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\Library.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\NativeMethods.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\NativeStructs.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\UAddress.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\UChannel.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\UPacket.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\UPoller.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\UService.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\USocket.cs" />
-    <Compile Include="Assets\Scripts\Base\Network\UNet\USocketManager.cs" />
     <Compile Include="Assets\Scripts\Base\Object\Component.cs" />
-    <Compile Include="Assets\Scripts\Base\Object\ComponentDB.cs" />
+    <Compile Include="Assets\Scripts\Base\Object\ComponentAttribute.cs" />
     <Compile Include="Assets\Scripts\Base\Object\ComponentFactory.cs" />
     <Compile Include="Assets\Scripts\Base\Object\Disposer.cs" />
     <Compile Include="Assets\Scripts\Base\Object\Entity.cs" />
-    <Compile Include="Assets\Scripts\Base\Object\EntityDB.cs" />
+    <Compile Include="Assets\Scripts\Base\Object\EntityAttribute.cs" />
     <Compile Include="Assets\Scripts\Base\Object\EntityEventAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\Object\EntityFactory.cs" />
     <Compile Include="Assets\Scripts\Base\Object\EntityType.cs" />
+    <Compile Include="Assets\Scripts\Base\Object\EventProxy.cs" />
+    <Compile Include="Assets\Scripts\Base\Object\EventSystem.cs" />
     <Compile Include="Assets\Scripts\Base\Object\IAwake.cs" />
     <Compile Include="Assets\Scripts\Base\Object\ILateUpdate.cs" />
     <Compile Include="Assets\Scripts\Base\Object\ILoad.cs" />
+    <Compile Include="Assets\Scripts\Base\Object\ISerializeToEntity.cs" />
     <Compile Include="Assets\Scripts\Base\Object\IStart.cs" />
     <Compile Include="Assets\Scripts\Base\Object\IUpdate.cs" />
     <Compile Include="Assets\Scripts\Base\Object\Object.cs" />
-    <Compile Include="Assets\Scripts\Base\Object\ObjectEventAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\Object\ObjectEvents.cs" />
     <Compile Include="Assets\Scripts\Base\Object\ObjectPool.cs" />
+    <Compile Include="Assets\Scripts\Base\Object\ObjectSystemAttribute.cs" />
+    <Compile Include="Assets\Scripts\Base\OneThreadSynchronizationContext.cs" />
     <Compile Include="Assets\Scripts\Base\QueueDictionary.cs" />
     <Compile Include="Assets\Scripts\Base\TryLocker.cs" />
-    <Compile Include="Assets\Scripts\Base\UI\LayerNames.cs" />
-    <Compile Include="Assets\Scripts\Base\UI\UIFactoryAttribute.cs" />
-    <Compile Include="Assets\Scripts\Base\UI\UIType.cs" />
+    <Compile Include="Assets\Scripts\Base\UnOrderMultiMap.cs" />
     <Compile Include="Assets\Scripts\BehaviorTreeNode\CreateUIEffect.cs" />
     <Compile Include="Assets\Scripts\BehaviorTreeNode\Root\Root.cs" />
     <Compile Include="Assets\Scripts\BehaviorTreeNode\Root\UICreateRoot.cs" />
@@ -210,69 +121,263 @@
     <Compile Include="Assets\Scripts\BehaviorTreeNode\True.cs" />
     <Compile Include="Assets\Scripts\BehaviorTreeNode\UIScale.cs" />
     <Compile Include="Assets\Scripts\Component\AnimatorComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\BehaviorTreeComponent.cs" />
+    <Compile Include="Assets\Scripts\Component\BundleDownloaderComponent.cs" />
     <Compile Include="Assets\Scripts\Component\CameraComponent.cs" />
     <Compile Include="Assets\Scripts\Component\ClientFrameComponent.cs" />
     <Compile Include="Assets\Scripts\Component\Config\ClientConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\DBConfig.cs" />
+    <Compile Include="Assets\Scripts\Component\Config\GlobalProto.cs" />
     <Compile Include="Assets\Scripts\Component\Config\HttpConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\InnerConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\OuterConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\RunServerConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\StartConfig.cs" />
     <Compile Include="Assets\Scripts\Component\Config\VersionConfig.cs" />
-    <Compile Include="Assets\Scripts\Component\ConfigComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\EventComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\MessageDispatherComponent.cs" />
+    <Compile Include="Assets\Scripts\Component\GlobalConfigComponent.cs" />
     <Compile Include="Assets\Scripts\Component\MoveComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\NetOuterComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\NetworkComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\NumericComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\NumericWatcherComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\OpcodeTypeComponent.cs" />
-    <Compile Include="Assets\Scripts\Component\OperaComponent.cs" />
     <Compile Include="Assets\Scripts\Component\PlayerComponent.cs" />
     <Compile Include="Assets\Scripts\Component\ResourcesComponent.cs" />
     <Compile Include="Assets\Scripts\Component\SceneChangeComponent.cs" />
     <Compile Include="Assets\Scripts\Component\SessionComponent.cs" />
     <Compile Include="Assets\Scripts\Component\TimerComponent.cs" />
     <Compile Include="Assets\Scripts\Component\UnitComponent.cs" />
-    <Compile Include="Assets\Scripts\Entity\AssetBundleLoaderAsync.cs" />
+    <Compile Include="Assets\Scripts\Entity\AssetsBundleLoaderAsync.cs" />
+    <Compile Include="Assets\Scripts\Entity\AssetsLoaderAsync.cs" />
     <Compile Include="Assets\Scripts\Entity\Config\BuffConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Config\UnitConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Game.cs" />
-    <Compile Include="Assets\Scripts\Entity\Message\Opcode.cs" />
-    <Compile Include="Assets\Scripts\Entity\Message\OuterMessage.cs" />
+    <Compile Include="Assets\Scripts\Entity\Hotfix.cs" />
     <Compile Include="Assets\Scripts\Entity\Player.cs" />
     <Compile Include="Assets\Scripts\Entity\Scene.cs" />
     <Compile Include="Assets\Scripts\Entity\Session.cs" />
+    <Compile Include="Assets\Scripts\Entity\UI.cs" />
     <Compile Include="Assets\Scripts\Entity\Unit.cs" />
+    <Compile Include="Assets\Scripts\Entity\UnityWebRequestAsync.cs" />
     <Compile Include="Assets\Scripts\Entity\WWWAsync.cs" />
-    <Compile Include="Assets\Scripts\Event\NumericChangeEvent_NotifyWatcher.cs" />
     <Compile Include="Assets\Scripts\Event\NumericWatcher_Hp_ShowUI.cs" />
     <Compile Include="Assets\Scripts\Factory\PlayerFactory.cs" />
     <Compile Include="Assets\Scripts\Factory\UnitFactory.cs" />
-    <Compile Include="Assets\Scripts\Handler\Actor_CreateUnitsHandler.cs" />
-    <Compile Include="Assets\Scripts\Handler\Actor_TestHandler.cs" />
-    <Compile Include="Assets\Scripts\Handler\Frame_ClickMapHandler.cs" />
     <Compile Include="Assets\Scripts\Helper\ActionHelper.cs" />
+    <Compile Include="Assets\Scripts\Helper\BundleHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\DllHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\GameObjectHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\ILHelper.cs" />
-    <Compile Include="Assets\Scripts\Helper\MongoHelper.cs" />
-    <Compile Include="Assets\Scripts\Helper\PathHelp.cs" />
+    <Compile Include="Assets\Scripts\Helper\MessageHelper.cs" />
+    <Compile Include="Assets\Scripts\Helper\PathHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\PositionHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\ResourceHelper.cs" />
+    <Compile Include="Assets\Scripts\Helper\ResourcesHelper.cs" />
     <Compile Include="Assets\Scripts\Init.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorNodeConfig.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTree.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeArgsDict.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeConfig.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTArrayDoubleComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTArrayFloatComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTArrayInt64Component.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTArrayIntComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTArrayStringComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTBoolComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTDoubleComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTEnumComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTFloatComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTInt64Component.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTIntComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BaseType\BTStringComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BTTypeBaseComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\BTTypeManager.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayAudioClipComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayGameObjectComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayMaterialComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayShaderComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArraySpriteComponent..cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayTexture2DComponent..cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayTexture3DComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTArrayTextureComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTAudioClipComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTGameObjectComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTMaterialComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTShaderComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTSpriteComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTTexture2DComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTTexture3DComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BehaviorTreeType\UnityType\BTTextureComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BTEnv.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\BTEnvKey.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\Node.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeClassifyType.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeDeprecatedAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeDesignerProto.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeEngineObjectAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeFieldBaseAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeFieldConstraintAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeInputAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeOutputAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodePropAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\NodeProto.cs" />
+    <Compile Include="Assets\Scripts\Module\BehaviorTree\TypeHelper.cs" />
+    <Compile Include="Assets\Scripts\Module\Config\ACategory.cs" />
+    <Compile Include="Assets\Scripts\Module\Config\AConfig.cs" />
+    <Compile Include="Assets\Scripts\Module\Config\AConfigComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Config\ConfigAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\Config\ConfigComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Config\ConfigHelper.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\AMHandler.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\ClientDispatcher.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\ErrorCode.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\IActorMessage.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\IMessage.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\IMessageDispatcher.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\IMessagePacker.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\IMHandler.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\MessageAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\MessageDispatherComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\MessageHandlerAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\MessageInfo.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\MessageProxy.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\NetOuterComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\AChannel.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\AService.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\Circularbuffer.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\KCP\KChannel.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\KCP\Kcp.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\KCP\KService.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\NetworkHelper.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\TCP\PacketParser.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\TCP\TChannel.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Network\TCP\TService.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\NetworkComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Opcode.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\OpcodeHelper.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\OpcodeTypeComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\OuterMessage.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\OuterOpcode.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\ProtobufPacker.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\RpcException.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\INumericWatcher.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\NumericComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\NumericType.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\NumericWatcherAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\NumericWatcherComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\IUIFactory.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\LayerNames.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\UIComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\UIFactoryAttribute.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\UIType.cs" />
     <Compile Include="Assets\Scripts\MonoConfig\CanvasConfig.cs" />
+    <Compile Include="Assets\Scripts\Other\AppType.cs" />
     <Compile Include="Assets\Scripts\Other\Define.cs" />
     <Compile Include="Assets\Scripts\Other\IInstanceMethod.cs" />
     <Compile Include="Assets\Scripts\Other\ILMethod.cs" />
-    <Compile Include="Assets\Scripts\Other\INumericWatcher.cs" />
     <Compile Include="Assets\Scripts\Other\MonoMethod.cs" />
     <Compile Include="Assets\Scripts\Other\MotionType.cs" />
-    <Compile Include="Assets\Scripts\Other\NumericWatcherAttribute.cs" />
     <Compile Include="Assets\Scripts\Other\ReferenceCollector.cs" />
+    <Compile Include="Assets\Scripts\UI\UILoading\Component\UILoadingComponent.cs" />
+    <Compile Include="Assets\Scripts\UI\UILoading\Event\LoadingBeginEvent_CreateLoadingUI.cs" />
+    <Compile Include="Assets\Scripts\UI\UILoading\Event\LoadingFinishEvent_RemoveLoadingUI.cs" />
+    <Compile Include="Assets\Scripts\UI\UILoading\Factory\UILoadingFactory.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\CLRBindings.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_ActionHelper_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Actor_CreateUnits_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Actor_Test_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Actor_TestRequest_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Actor_TransferRequest_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_AEventAttribute_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_C2G_EnterMap_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_CameraComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_CanvasConfig_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_ClientDispatcher_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Component_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_ComponentFactory_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Define_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Disposer_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_DoubleMap_2_UInt16_Type_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Entity_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_EventProxy_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_EventSystem_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Frame_ClickMap_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Game_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_GameObjectHelper_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_GlobalConfigComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_GlobalProto_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Hotfix_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_IdGenerater_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Log_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_MessageAttribute_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_MessageDispatherComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_MessageInfo_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_MessageProxy_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_MongoHelper_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_MoveComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_NetworkComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_NetworkHelper_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_OpcodeTypeComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_PacketInfo_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Player_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_PlayerComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_ProtobufHelper_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_ResourcesComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Scene_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Session_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_SessionComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_UIFactoryAttribute_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_Unit_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_UnitComponent_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_UnitFactory_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_UnitInfo_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\Model_UnOrderMultiMap_2_Type_ILTypeInstance_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\ProtoBuf_PType_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\ReferenceCollector_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Activator_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_Int32_List_1_ILTypeIns_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_String_ILTypeInstance__t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_String_ILTypeInstance__t_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_String_ILTypeInstance__t_t_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_Type_ILTypeInstance_Bi_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_Type_Queue_1_ILTypeIns_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_UInt16_List_1_ILTypeIn_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Dictionary_2_UIType_ILTypeInstance__t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_HashSet_1_ILTypeInstance_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_List_1_ILTypeInstance_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_List_1_ILTypeInstance_Binding_Enume_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_List_1_Object_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_List_1_UIType_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_List_1_UnitInfo_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_List_1_UnitInfo_Binding_Enumerator__t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_Generic_Queue_1_ILTypeInstance_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Collections_IDictionary_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Exception_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_IDisposable_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Linq_Enumerable_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_NotImplementedException_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Object_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Reflection_MemberInfo_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Runtime_CompilerServices_AsyncTaskMethodBuilder_1_ILTyp_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Runtime_CompilerServices_AsyncVoidMethodBuilder_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Runtime_CompilerServices_TaskAwaiter_1_ILTypeInstance_B_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Runtime_CompilerServices_TaskAwaiter_1_IResponse_Bindin_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Runtime_CompilerServices_TaskAwaiter_1_PacketInfo_Bindi_t.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_String_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Threading_Tasks_Task_1_ILTypeInstance_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Threading_Tasks_Task_1_IResponse_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Threading_Tasks_Task_1_PacketInfo_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\System_Type_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Camera_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Component_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_GameObject_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Input_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_LayerMask_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Object_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Physics_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_RaycastHit_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Transform_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_UI_Button_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_UI_InputField_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\UnityEngine_Vector3_Binding.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\Generated\VInt3_Binding.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\CLR\Method\CLRMethod.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\CLR\Method\ExceptionHandler.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\CLR\Method\ILMethod.cs" />
@@ -311,12 +416,15 @@
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\DebugSocket.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSBindBreakpoint.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSDeleteBreakpoint.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSEnumChildren.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSExecute.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSResolveIndexer.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSResolveVariable.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\CSStep.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCAttachResult.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCBindBreakpointResult.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCBreakpointHit.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCEnumChildrenResult.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCModuleLoaded.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCResolveVariableResult.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Debugger\Protocol\SCStepComplete.cs" />
@@ -339,6 +447,15 @@
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Stack\RuntimeStack.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Stack\StackFrame.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\ILRuntime\Runtime\Stack\StackObject.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\IJsonWrapper.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\JsonData.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\JsonException.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\JsonMapper.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\JsonMockWrapper.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\JsonReader.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\JsonWriter.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\Lexer.cs" />
+    <Compile Include="Assets\ThirdParty\ILRuntime\LitJson\ParserToken.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.20\MonoCecil\Mono.Cecil.Cil\Code.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.20\MonoCecil\Mono.Cecil.Cil\CodeReader.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.20\MonoCecil\Mono.Cecil.Cil\CodeWriter.cs" />
@@ -496,31 +613,130 @@
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Pdb\pdb\Mono.Cecil.Pdb\PdbWriter.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Pdb\pdb\Mono.Cecil.Pdb\SymDocumentWriter.cs" />
     <Compile Include="Assets\ThirdParty\ILRuntime\Mono.Cecil.Pdb\pdb\Mono.Cecil.Pdb\SymWriter.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\IExtensibleAdapter.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\BclHelpers.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\BufferExtension.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\BufferPool.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\CallbackAttributes.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Compiler\CompilerContext.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Compiler\CompilerDelegates.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Compiler\Local.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\DataFormat.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\DiscriminatedUnion.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Extensible.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ExtensibleUtil.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\GlobalSuppressions.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Helpers.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\IExtensible.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\IExtension.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ImplicitFields.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\KeyValuePairProxy.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\AttributeMap.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\BasicList.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\CallbackSet.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\MetaType.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\ProtoSyntax.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\RuntimeTypeModel.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\SubType.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\TypeFormatEventArgs.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\TypeModel.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Meta\ValueMember.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\NetObjectCache.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\PrefixStyle.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtobufPropertyHelper.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoContractAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoConverterAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoEnumAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoException.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoIgnoreAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoIncludeAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoMapAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoMemberAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoReader.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ProtoWriter.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\PType.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\SerializationContext.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ArrayDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\BlobSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\BooleanSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ByteSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\CharSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\CompiledSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\DateTimeSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\DecimalSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\DefaultValueDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\DoubleSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\EnumSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\FieldDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\GuidSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ImmutableCollectionDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\Int16Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\Int32Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\Int64Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\IProtoSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\IProtoTypeSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ISerializerProxy.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ListDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\MapDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\MemberSpecifiedDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\NetObjectSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\NullDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ParseableSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\PropertyDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ProtoDecoratorBase.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\ReflectedUriDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\SByteSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\SingleSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\StringSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\SubItemSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\SurrogateSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\SystemTypeSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\TagDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\TimeSpanSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\TupleSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\TypeSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\UInt16Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\UInt32Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\UInt64Serializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\Serializers\UriDecorator.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ServiceModel\ProtoBehaviorAttribute.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ServiceModel\ProtoBehaviorExtensionElement.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ServiceModel\ProtoEndpointBehavior.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ServiceModel\ProtoOperationBehavior.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\ServiceModel\XmlProtoSerializer.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\SubItemToken.cs" />
+    <Compile Include="Assets\ThirdParty\Protobuf\protobuf-net\WireType.cs" />
+    <None Include="Assets\Res\Config\GlobalProto.txt" />
+    <None Include="Assets\link.xml" />
     <None Include="Assets\Res\Config\BuffConfig.txt" />
     <None Include="Assets\Res\Config\UnitConfig.txt" />
     <Reference Include="UnityEngine.UI">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Networking">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TestRunner">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Analytics">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Timeline">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.Analytics">
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.HoloLens">
-      <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
+      <HintPath>C:/Apps/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>/Users/mac/Source/Egametang/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>D:/Source/ET/Unity/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Unity/Assets/Res/Config/GlobalProto.txt

@@ -1 +1 @@
-{ "AssetBundleServerUrl" : "http://127.0.0.1:8080/", "Address" : "127.0.0.1:10002" }
+{"AssetBundleServerUrl":"http://127.0.0.1:8080/","Address":"127.0.0.1:10002"}

Unity/Assets/Scripts/Base/Object/ComponentFactory.cs

@@ -1,7 +1,17 @@
-namespace Model
+using System;
+
+namespace Model
 {
 	public static class ComponentFactory
 	{
+		public static Component CreateWithParent(Type type, Component parent)
+		{
+			Component disposer = (Component)Game.ObjectPool.Fetch(type);
+			disposer.Parent = parent;
+			Game.EventSystem.Awake(disposer);
+			return disposer;
+		}
+
 		public static T CreateWithParent<T>(Component parent) where T : Component
 		{
 			T disposer = Game.ObjectPool.Fetch<T>();

Unity/Assets/Scripts/Base/Object/Entity.cs

@@ -54,6 +54,23 @@ namespace Model
 			this.componentDict.Clear();
 		}
 
+		public Component AddComponent(Type type)
+		{
+			Component component = ComponentFactory.CreateWithParent(type, this);
+
+			if (this.componentDict.ContainsKey(component.GetType()))
+			{
+				throw new Exception($"AddComponent, component already exist, id: {this.Id}, component: {type.Name}");
+			}
+
+			if (component is ISerializeToEntity)
+			{
+				this.components.Add(component);
+			}
+			this.componentDict.Add(component.GetType(), component);
+			return component;
+		}
+
 		public K AddComponent<K>() where K : Component, new()
 		{
 			K component = ComponentFactory.CreateWithParent<K>(this);
@@ -160,6 +177,16 @@ namespace Model
 			return (K)component;
 		}
 
+		public Component GetComponent(Type type)
+		{
+			Component component;
+			if (!this.componentDict.TryGetValue(type, out component))
+			{
+				return null;
+			}
+			return component;
+		}
+
 		public Component[] GetComponents()
 		{
 			return this.componentDict.Values.ToArray();

Unity/Assets/Scripts/Base/Object/Object.cs

@@ -11,5 +11,10 @@ namespace Model
 		public virtual void EndInit()
 		{
 		}
+
+		public override string ToString()
+		{
+			return JsonHelper.ToJson(this);
+		}
 	}
 }

Unity/Assets/Scripts/Base/Object/ObjectPool.cs

@@ -7,7 +7,7 @@ namespace Model
     {
         private readonly Dictionary<Type, Queue<Disposer>> dictionary = new Dictionary<Type, Queue<Disposer>>();
 
-        private Disposer Fetch(Type type)
+        public Disposer Fetch(Type type)
         {
 	        Queue<Disposer> queue;
             if (!this.dictionary.TryGetValue(type, out queue))

Unity/Assets/Scripts/Module/Config/ACategory.cs

@@ -4,15 +4,20 @@ using System.Linq;
 
 namespace Model
 {
+	public abstract class ACategory : Object
+	{
+		public abstract Type ConfigType { get; }
+	}
+
 	/// <summary>
 	/// 管理该所有的配置
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
-	public abstract class ACategory<T>: ICategory where T : AConfig
+	public abstract class ACategory<T>: ACategory where T : AConfig
 	{
 		protected Dictionary<long, T> dict;
 
-		public virtual void BeginInit()
+		public override void BeginInit()
 		{
 			this.dict = new Dictionary<long, T>();
 
@@ -37,7 +42,7 @@ namespace Model
 			}
 		}
 
-		public Type ConfigType
+		public override Type ConfigType
 		{
 			get
 			{
@@ -45,7 +50,7 @@ namespace Model
 			}
 		}
 
-		public virtual void EndInit()
+		public override void EndInit()
 		{
 		}
 

Unity/Assets/Scripts/Module/Config/ConfigComponent.cs

@@ -26,7 +26,7 @@ namespace Model
 	/// </summary>
 	public class ConfigComponent: Component
 	{
-		private Dictionary<Type, ICategory> allConfig;
+		private Dictionary<Type, ACategory> allConfig = new Dictionary<Type, ACategory>();
 
 		public void Awake()
 		{
@@ -35,7 +35,7 @@ namespace Model
 
 		public void Load()
 		{
-			this.allConfig = new Dictionary<Type, ICategory>();
+			this.allConfig.Clear();
 			Type[] types = DllHelper.GetMonoTypes();
 
 			foreach (Type type in types)
@@ -47,7 +47,7 @@ namespace Model
 				}
 				object obj = Activator.CreateInstance(type);
 
-				ICategory iCategory = obj as ICategory;
+				ACategory iCategory = obj as ACategory;
 				if (iCategory == null)
 				{
 					throw new Exception($"class: {type.Name} not inherit from ACategory");
@@ -62,7 +62,7 @@ namespace Model
 		public T GetOne<T>() where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				throw new Exception($"ConfigComponent not found key: {type.FullName}");
@@ -73,7 +73,7 @@ namespace Model
 		public T Get<T>(long id) where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				throw new Exception($"ConfigComponent not found key: {type.FullName}");
@@ -84,7 +84,7 @@ namespace Model
 		public T TryGet<T>(int id) where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				return default(T);
@@ -95,7 +95,7 @@ namespace Model
 		public T[] GetAll<T>() where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				throw new Exception($"ConfigComponent not found key: {type.FullName}");
@@ -103,11 +103,11 @@ namespace Model
 			return ((ACategory<T>) configCategory).GetAll();
 		}
 
-		public T GetCategory<T>() where T : class, ICategory, new()
+		public T GetCategory<T>() where T : ACategory, new()
 		{
 			T t = new T();
 			Type type = t.ConfigType;
-			ICategory configCategory;
+			ACategory configCategory;
 			bool ret = this.allConfig.TryGetValue(type, out configCategory);
 			return ret? (T)configCategory : null;
 		}

Unity/Assets/Scripts/Module/Config/ICategory.cs

@@ -1,10 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Model
-{
-	public interface ICategory: ISupportInitialize
-	{
-		Type ConfigType { get; }
-	}
-}

Unity/Assets/Scripts/Module/Config/ICategory.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: e1c7d45390174bd4f923a1584cf84029
-timeCreated: 1474944962
-licenseType: Pro
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Hotfix/Base/Object/ComponentFactory.cs

@@ -4,6 +4,14 @@ namespace Hotfix
 {
 	public static class ComponentFactory
 	{
+		public static Component CreateWithParent(Type type, Component parent)
+		{
+			Component disposer = (Component)Game.ObjectPool.Fetch(type);
+			disposer.Parent = parent;
+			Game.EventSystem.Awake(disposer);
+			return disposer;
+		}
+
 		public static T CreateWithParent<T>(Component parent) where T : Component
 		{
 			T disposer = Game.ObjectPool.Fetch<T>();

Unity/Hotfix/Base/Object/Entity.cs

@@ -7,14 +7,14 @@ using MongoDB.Bson.Serialization.Attributes;
 namespace Hotfix
 {
 	[BsonIgnoreExtraElements]
-	public class Entity : Component
+	public partial class Entity : Component
 	{
 		[BsonElement]
 		[BsonIgnoreIfNull]
-		private readonly HashSet<Component> components;
+		private HashSet<Component> components;
 
 		[BsonIgnore]
-		private readonly Dictionary<Type, Component> componentDict;
+		private Dictionary<Type, Component> componentDict;
 
 		protected Entity()
 		{
@@ -55,6 +55,23 @@ namespace Hotfix
 			this.componentDict.Clear();
 		}
 
+		public Component AddComponent(Type type)
+		{
+			Component component = ComponentFactory.CreateWithParent(type, this);
+
+			if (this.componentDict.ContainsKey(component.GetType()))
+			{
+				throw new Exception($"AddComponent, component already exist, id: {this.Id}, component: {type.Name}");
+			}
+
+			if (component is ISerializeToEntity)
+			{
+				this.components.Add(component);
+			}
+			this.componentDict.Add(component.GetType(), component);
+			return component;
+		}
+
 		public K AddComponent<K>() where K : Component, new()
 		{
 			K component = ComponentFactory.CreateWithParent<K>(this);
@@ -161,9 +178,46 @@ namespace Hotfix
 			return (K)component;
 		}
 
+		public Component GetComponent(Type type)
+		{
+			Component component;
+			if (!this.componentDict.TryGetValue(type, out component))
+			{
+				return null;
+			}
+			return component;
+		}
+
 		public Component[] GetComponents()
 		{
 			return this.componentDict.Values.ToArray();
 		}
+
+		public override void BeginInit()
+		{
+			this.components = new HashSet<Component>();
+			this.componentDict = new Dictionary<Type, Component>();
+		}
+
+		public override void EndInit()
+		{
+			try
+			{
+				this.componentDict.Clear();
+
+				if (this.components != null)
+				{
+					foreach (Component component in this.components)
+					{
+						component.Parent = this;
+						this.componentDict.Add(component.GetType(), component);
+					}
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Error(e.ToString());
+			}
+		}
 	}
 }

Unity/Hotfix/Base/Object/Object.cs

@@ -5,7 +5,25 @@
 		void Dispose();
 	}
 
-	public abstract class Object
+	public interface ISupportInitialize2
 	{
+		void BeginInit();
+		void EndInit();
+	}
+
+	public abstract class Object: ISupportInitialize2
+	{
+		public virtual void BeginInit()
+		{
+		}
+
+		public virtual void EndInit()
+		{
+		}
+
+		public override string ToString()
+		{
+			return JsonHelper.ToJson(this);
+		}
 	}
 }

Unity/Hotfix/Base/Object/ObjectPool.cs

@@ -7,7 +7,7 @@ namespace Hotfix
 	{
 		private readonly Dictionary<Type, Queue<Disposer>> dictionary = new Dictionary<Type, Queue<Disposer>>();
 
-		private Disposer Fetch(Type type)
+		public Disposer Fetch(Type type)
 		{
 			Queue<Disposer> queue;
 			if (!this.dictionary.TryGetValue(type, out queue))

Unity/Hotfix/Module/Config/ACategory.cs

@@ -5,15 +5,20 @@ using Model;
 
 namespace Hotfix
 {
+	public abstract class ACategory : Object
+	{
+		public abstract Type ConfigType { get; }
+	}
+
 	/// <summary>
 	/// 管理该所有的配置
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
-	public abstract class ACategory<T>: ICategory where T : AConfig
+	public abstract class ACategory<T>: ACategory where T : AConfig
 	{
 		protected Dictionary<long, T> dict;
 
-		public virtual void BeginInit()
+		public override void BeginInit()
 		{
 			this.dict = new Dictionary<long, T>();
 
@@ -38,7 +43,7 @@ namespace Hotfix
 			}
 		}
 
-		public Type ConfigType
+		public override Type ConfigType
 		{
 			get
 			{
@@ -46,7 +51,7 @@ namespace Hotfix
 			}
 		}
 
-		public virtual void EndInit()
+		public override void EndInit()
 		{
 		}
 

Unity/Hotfix/Module/Config/ConfigComponent.cs

@@ -27,7 +27,7 @@ namespace Hotfix
 	/// </summary>
 	public class ConfigComponent: Component
 	{
-		private Dictionary<Type, ICategory> allConfig;
+		private readonly Dictionary<Type, ACategory> allConfig = new Dictionary<Type, ACategory>();
 
 		public void Awake()
 		{
@@ -36,7 +36,7 @@ namespace Hotfix
 
 		public void Load()
 		{
-			this.allConfig = new Dictionary<Type, ICategory>();
+			this.allConfig.Clear();
 			Type[] types = Model.Game.Hotfix.GetHotfixTypes();
 
 			foreach (Type type in types)
@@ -48,7 +48,7 @@ namespace Hotfix
 				}
 				object obj = Activator.CreateInstance(type);
 
-				ICategory iCategory = obj as ICategory;
+				ACategory iCategory = obj as ACategory;
 				if (iCategory == null)
 				{
 					throw new Exception($"class: {type.Name} not inherit from ACategory");
@@ -63,7 +63,7 @@ namespace Hotfix
 		public T GetOne<T>() where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				throw new Exception($"ConfigComponent not found key: {type.FullName}");
@@ -74,7 +74,7 @@ namespace Hotfix
 		public T Get<T>(long id) where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				throw new Exception($"ConfigComponent not found key: {type.FullName}");
@@ -85,7 +85,7 @@ namespace Hotfix
 		public T TryGet<T>(int id) where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				return default(T);
@@ -96,7 +96,7 @@ namespace Hotfix
 		public T[] GetAll<T>() where T : AConfig
 		{
 			Type type = typeof (T);
-			ICategory configCategory;
+			ACategory configCategory;
 			if (!this.allConfig.TryGetValue(type, out configCategory))
 			{
 				throw new Exception($"ConfigComponent not found key: {type.FullName}");
@@ -104,11 +104,11 @@ namespace Hotfix
 			return ((ACategory<T>) configCategory).GetAll();
 		}
 
-		public T GetCategory<T>() where T : class, ICategory, new()
+		public T GetCategory<T>() where T : ACategory, new()
 		{
 			T t = new T();
 			Type type = t.ConfigType;
-			ICategory configCategory;
+			ACategory configCategory;
 			bool ret = this.allConfig.TryGetValue(type, out configCategory);
 			return ret? (T)configCategory : null;
 		}

Unity/Hotfix/Module/Config/ICategory.cs

@@ -1,15 +0,0 @@
-using System;
-
-namespace Hotfix
-{
-	public interface ISupportInitialize2
-	{
-		void BeginInit();
-		void EndInit();
-	}
-
-	public interface ICategory: ISupportInitialize2
-	{
-		Type ConfigType { get; }
-	}
-}

Unity/Hotfix/Unity.Hotfix.csproj

@@ -68,7 +68,6 @@
     <Compile Include="Module\Config\AConfig.cs" />
     <Compile Include="Module\Config\ConfigComponent.cs" />
     <Compile Include="Module\Config\ConfigHelper.cs" />
-    <Compile Include="Module\Config\ICategory.cs" />
     <Compile Include="Module\Message\IActorMessage.cs" />
     <Compile Include="Module\Message\HotfixMessageDispatcher.cs" />
     <Compile Include="Module\Message\IMessage.cs" />

Unity/Unity.Editor.Plugins.csproj

@@ -52,7 +52,7 @@
     <Reference Include="System">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.dll</HintPath>
     </Reference>
-    <Reference Include="System.XML">
+    <Reference Include="System.Xml">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.XML.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
@@ -181,4 +181,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>

Unity/Unity.Editor.csproj

@@ -12,15 +12,12 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>2017.1.1p4</UnityVersion>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace></RootNamespace>
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -55,7 +52,7 @@
     <Reference Include="System">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.dll</HintPath>
     </Reference>
-    <Reference Include="System.XML">
+    <Reference Include="System.Xml">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.XML.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">

Unity/Unity.Plugins.csproj

@@ -12,12 +12,15 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>GamePlugins:3</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>2017.1.1p4</UnityVersion>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -52,7 +55,7 @@
     <Reference Include="System">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.dll</HintPath>
     </Reference>
-    <Reference Include="System.XML">
+    <Reference Include="System.Xml">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.XML.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
@@ -442,4 +445,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>

Unity/Unity.csproj

@@ -12,15 +12,12 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>2017.1.1p4</UnityVersion>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace></RootNamespace>
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -55,7 +52,7 @@
     <Reference Include="System">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.dll</HintPath>
     </Reference>
-    <Reference Include="System.XML">
+    <Reference Include="System.Xml">
       <HintPath>C:\Apps\Unity\Editor\Data\MonoBleedingEdge\lib\mono\4.5\System.XML.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
@@ -290,7 +287,6 @@
     <Compile Include="Assets\Scripts\Module\Config\ConfigAttribute.cs" />
     <Compile Include="Assets\Scripts\Module\Config\ConfigComponent.cs" />
     <Compile Include="Assets\Scripts\Module\Config\ConfigHelper.cs" />
-    <Compile Include="Assets\Scripts\Module\Config\ICategory.cs" />
     <Compile Include="Assets\Scripts\Module\Message\AMHandler.cs" />
     <Compile Include="Assets\Scripts\Module\Message\ClientDispatcher.cs" />
     <Compile Include="Assets\Scripts\Module\Message\ErrorCode.cs" />

Unity/Unity.sln

@@ -1,15 +1,13 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2017
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Plugins", "Unity.Plugins.csproj", "{D1FDB199-0FB7-099D-3771-C6A942E4E326}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Assembly-CSharp-firstpass.csproj", "{2662B409-6332-1E56-D797-C9025C53BDD6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity.csproj", "{CF118143-7E37-744F-BE45-3F55345FEC40}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Assembly-CSharp.csproj", "{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity.Editor.csproj", "{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Assembly-CSharp-Editor.csproj", "{6311E6C6-0A20-383B-320B-694068DE37A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor.Plugins", "Unity.Editor.Plugins.csproj", "{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Hotfix\Unity.Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Assembly-CSharp-Editor-firstpass.csproj", "{F534D6C4-3368-032B-289C-A943CC171719}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,28 +15,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2662B409-6332-1E56-D797-C9025C53BDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2662B409-6332-1E56-D797-C9025C53BDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2662B409-6332-1E56-D797-C9025C53BDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2662B409-6332-1E56-D797-C9025C53BDD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD8C9303-404B-FB8D-6B9B-21988D5CAC0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6311E6C6-0A20-383B-320B-694068DE37A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6311E6C6-0A20-383B-320B-694068DE37A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6311E6C6-0A20-383B-320B-694068DE37A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6311E6C6-0A20-383B-320B-694068DE37A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F534D6C4-3368-032B-289C-A943CC171719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F534D6C4-3368-032B-289C-A943CC171719}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F534D6C4-3368-032B-289C-A943CC171719}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F534D6C4-3368-032B-289C-A943CC171719}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal