先去除Hotfix层，暂时跑不起来

Client-Server.sln

@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Core", "Serv
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS", "Server\ThirdParty\MongoDBDriver\MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj", "{2ACC29FB-55CD-4307-B1D1-CC3922BC2CE7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto2CS", "Tools\Proto2CS\Proto2CS.csproj", "{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -205,6 +207,18 @@ Global
 		{2ACC29FB-55CD-4307-B1D1-CC3922BC2CE7}.Release|x64.Build.0 = Release|Any CPU
 		{2ACC29FB-55CD-4307-B1D1-CC3922BC2CE7}.Release|x86.ActiveCfg = Release|Any CPU
 		{2ACC29FB-55CD-4307-B1D1-CC3922BC2CE7}.Release|x86.Build.0 = Release|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Release|x64.Build.0 = Release|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -225,6 +239,7 @@ Global
 		{B91E7D43-CCF1-49FC-ACF5-1C88A1C81FA7} = {14963D84-2A63-48CF-AE13-DCF71F1E13A0}
 		{AAF14EDB-BB72-42A9-80AA-3E0E113AC4CA} = {14963D84-2A63-48CF-AE13-DCF71F1E13A0}
 		{2ACC29FB-55CD-4307-B1D1-CC3922BC2CE7} = {14963D84-2A63-48CF-AE13-DCF71F1E13A0}
+		{B4CC4BDA-F753-4005-87D1-EA9DA6C59706} = {4BC66C3C-D55F-4FAA-A2F5-29E8EB1797AE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Client-Server.sln.DotSettings

@@ -377,6 +377,7 @@ II.2.12 <HandlesEvent />
 	<s:Int64 x:Key="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue">79</s:Int64>
 	<s:Boolean x:Key="/Default/Environment/Hierarchy/NuGetOptions/GlobalEnabled/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Hierarchy/NuGetOptions/IncludePrerelease/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/InlayHintsOptions/ShowInlayHints/@EntryValue">False</s:Boolean>
 	
 	
 	

Proto/HotfixMessage.proto

@@ -1,76 +0,0 @@
-syntax = "proto3";
-package ETHotfix;
-
-message C2R_Login // IRequest
-{
-	int32 RpcId = 90;
-	string	Account	 = 1;	// 帐号
-	string	Password = 2;	// 密码
-}
-
-message R2C_Login // IResponse
-{
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	string Address = 1;
-	int64 Key	    = 2;
-	int64 GateId = 3;
-}
-
-message C2G_LoginGate // IRequest
-{
-	int32 RpcId = 90;
-	int64 Key = 1;	// 帐号
-	int64 GateId = 2;
-}
-
-message G2C_LoginGate // IResponse
-{
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	int64 PlayerId = 1;
-}
-
-message G2C_TestHotfixMessage // IMessage
-{
-	string Info = 1;
-}
-
-message C2M_TestActorRequest // IActorLocationRequest
-{
-	int32 RpcId = 90;
-	int64 ActorId = 91;
-	string Info = 1;
-}
-
-message M2C_TestActorResponse // IActorLocationResponse
-{
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	string Info = 1;
-}
-
-message PlayerInfo // IMessage
-{
-	int32 RpcId = 90;
-}
-
-message C2G_PlayerInfo // IRequest
-{
-	int32 RpcId = 90;
-}
-
-message G2C_PlayerInfo // IResponse
-{
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	PlayerInfo PlayerInfo = 1;
-	repeated PlayerInfo PlayerInfos = 2;
-    repeated string TestRepeatedString = 3;
-    repeated int32 TestRepeatedInt32 = 4;
-    repeated int64 TestRepeatedInt64 = 5;
-}

Proto/InnerMessage.proto

@@ -11,7 +11,7 @@ message M2M_TrasferUnitRequest // IActorRequest
     Unit Unit = 1;
 }
 
-message M2M_TrasferUnitResponse // IActorResponseG2R_GetLoginKey
+message M2M_TrasferUnitResponse // IActorResponse
 {
     int32 RpcId = 90;
     int32 Error = 91;

Proto/OuterMessage.proto

@@ -117,4 +117,78 @@ message M2C_Reload // IResponse
 	int32 RpcId = 90;
 	int32 Error = 91;
 	string Message = 92;
+}
+
+message C2R_Login // IRequest
+{
+	int32 RpcId = 90;
+	string	Account	 = 1;	// 帐号
+	string	Password = 2;	// 密码
+}
+
+message R2C_Login // IResponse
+{
+	int32 RpcId = 90;
+	int32 Error = 91;
+	string Message = 92;
+	string Address = 1;
+	int64 Key	    = 2;
+	int64 GateId = 3;
+}
+
+message C2G_LoginGate // IRequest
+{
+	int32 RpcId = 90;
+	int64 Key = 1;	// 帐号
+	int64 GateId = 2;
+}
+
+message G2C_LoginGate // IResponse
+{
+	int32 RpcId = 90;
+	int32 Error = 91;
+	string Message = 92;
+	int64 PlayerId = 1;
+}
+
+message G2C_TestHotfixMessage // IMessage
+{
+	string Info = 1;
+}
+
+message C2M_TestActorRequest // IActorLocationRequest
+{
+	int32 RpcId = 90;
+	int64 ActorId = 91;
+	string Info = 1;
+}
+
+message M2C_TestActorResponse // IActorLocationResponse
+{
+	int32 RpcId = 90;
+	int32 Error = 91;
+	string Message = 92;
+	string Info = 1;
+}
+
+message PlayerInfo // IMessage
+{
+	int32 RpcId = 90;
+}
+
+message C2G_PlayerInfo // IRequest
+{
+	int32 RpcId = 90;
+}
+
+message G2C_PlayerInfo // IResponse
+{
+	int32 RpcId = 90;
+	int32 Error = 91;
+	string Message = 92;
+	PlayerInfo PlayerInfo = 1;
+	repeated PlayerInfo PlayerInfos = 2;
+    repeated string TestRepeatedString = 3;
+    repeated int32 TestRepeatedInt32 = 4;
+    repeated int64 TestRepeatedInt64 = 5;
 }

Proto/Proto2CS.deps.json

@@ -1,11 +1,11 @@
 {
   "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v3.0",
+    "name": ".NETCoreApp,Version=v3.1",
     "signature": ""
   },
   "compilationOptions": {},
   "targets": {
-    ".NETCoreApp,Version=v3.0": {
+    ".NETCoreApp,Version=v3.1": {
       "Proto2CS/1.0.0": {
         "runtime": {
           "Proto2CS.dll": {}

Proto/Proto2CS.runtimeconfig.dev.json

@@ -1,8 +1,8 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "/Users/tanghai/.dotnet/store/|arch|/|tfm|",
-      "/Users/tanghai/.nuget/packages"
+      "C:\\Users\\Administrator\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\Administrator\\.nuget\\packages"
     ]
   }
 }

Proto/Proto2CS.runtimeconfig.json

@@ -1,9 +1,9 @@
 {
   "runtimeOptions": {
-    "tfm": "netcoreapp3.0",
+    "tfm": "netcoreapp3.1",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "3.0.0"
+      "version": "3.1.0"
     }
   }
 }

Server/Hotfix/Server.Hotfix.csproj

@@ -18,7 +18,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Other\**" />
-    <Compile Include="..\..\Unity\Assets\Model\Module\Message\NetOuterComponentSystem.cs">
+    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\NetOuterComponentSystem.cs">
       <Link>Module\Message\NetOuterComponentSystem.cs</Link>
     </Compile>
     <EmbeddedResource Remove="Other\**" />

Server/Model/Module/Demo/Config/UnitConfig.cs → Server/Model/Demo/Config/UnitConfig.cs

@@ -1,6 +1,6 @@
 namespace ETModel
 {
-	[Config((int)(AppType.ClientH |  AppType.ClientM | AppType.Gate | AppType.Map))]
+	[Config]
 	public partial class UnitConfigCategory : ACategory<UnitConfig>
 	{
 	}

Server/Model/Server.Model.csproj

@@ -185,12 +185,12 @@
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\WebSocket\WService.cs">
       <Link>Module\Message\Network\WebSocket\WService.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\MessagePool.cs">
-      <Link>Module\Message\MessagePool\ETHotfix\MessagePool.cs</Link>
-    </Compile>
     <EmbeddedResource Remove="Libs\**" />
     <None Remove="Libs\**" />
     <None Remove="graph.bytes" />
+    <Compile Remove="Module\Scene\**" />
+    <EmbeddedResource Remove="Module\Scene\**" />
+    <None Remove="Module\Scene\**" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Unity\Assets\Model\Base\DoubleMap.cs" Link="Base\DoubleMap.cs" />
@@ -394,8 +394,6 @@
       <Link>Module\Pathfinding\Recast\WindowsStoreCompatibility.cs</Link>
     </Compile>
     <Compile Include="..\..\Unity\Assets\Model\Other\AppType.cs" Link="Other\AppType.cs" />
-    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\HotfixMessage.cs" Link="Module\Message\HotfixMessage.cs" />
-    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\HotfixOpcode.cs" Link="Module\Message\HotfixOpcode.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.2.1" />
@@ -417,7 +415,6 @@
     <Folder Include="Module\Message\Network\TCP\" />
     <Folder Include="Module\Message\MessagePool\" />
     <Folder Include="Module\Numeric\" />
-    <Folder Include="Module\Scene" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Pathfinding.Ionic.Zip.Reduced, Version=1.9.1.9000, Culture=neutral, PublicKeyToken=null">

Tools/Proto2CS/Program.cs

@@ -28,21 +28,17 @@ namespace ETTools
                 protoc = "protoc";
             }
             ProcessHelper.Run(protoc, "--csharp_out=\"../Unity/Assets/Model/Module/Message/\" --proto_path=\"./\" OuterMessage.proto", waitExit: true);
-            ProcessHelper.Run(protoc, "--csharp_out=\"../Unity/Assets/Hotfix/Module/Message/\" --proto_path=\"./\" HotfixMessage.proto", waitExit: true);
 
             // InnerMessage.proto生成cs代码
             InnerProto2CS.Proto2CS(); 
 
             Proto2CS("ETModel", "OuterMessage.proto", clientMessagePath, "OuterOpcode", 100);
-
-            Proto2CS("ETHotfix", "HotfixMessage.proto", hotfixMessagePath, "HotfixOpcode", 10000);
             
             Console.WriteLine("proto2cs succeed!");
         }
 
         private const string protoPath = ".";
         private const string clientMessagePath = "../Unity/Assets/Model/Module/Message/";
-        private const string hotfixMessagePath = "../Unity/Assets/Hotfix/Module/Message/";
         private static readonly char[] splitChars = { ' ', '\t' };
         private static readonly List<OpcodeInfo> msgOpcode = new List<OpcodeInfo>();
 

Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs

@@ -121,7 +121,7 @@ public class ExcelExporterEditor : EditorWindow
 			ISheet sheet = xssfWorkbook.GetSheetAt(0);
 			sb.Append(csHead);
 
-			sb.Append($"\t[Config((int)({GetCellString(sheet, 0, 0)}))]\n");
+			sb.Append($"\t[Config]\n");
 			sb.Append($"\tpublic partial class {protoName}Category : ACategory<{protoName}>\n");
 			sb.Append("\t{\n");
 			sb.Append("\t}\n\n");
@@ -291,14 +291,7 @@ public class ExcelExporterEditor : EditorWindow
 
 				if (fieldName == "Id" || fieldName == "_id")
 				{
-					if (this.isClient)
-					{
-						fieldName = "Id";
-					}
-					else
-					{
-						fieldName = "_id";
-					}
+					fieldName = "_id";
 				}
 
 				string fieldType = cellInfos[j].Type;

Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs

@@ -15,7 +15,7 @@ namespace ETEditor
 		[MenuItem("Tools/Proto2CS")]
 		public static void AllProto2CS()
 		{
-			Process process = ProcessHelper.Run("dotnet", "Proto2CS.dll", "../Proto/", true);
+			Process process = ProcessHelper.Run("dotnet", "Proto2CS.dll", "../Proto/", false);
 			Log.Info(process.StandardOutput.ReadToEnd());
 			AssetDatabase.Refresh();
 		}

Unity/Assets/Hotfix/Base.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b486b6f59b25fa642aee6aa32d28f5c4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Event.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e5753701719ff2449bc647ac7a31fe34
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Event/EventIdType.cs

@@ -1,9 +0,0 @@
-namespace ETHotfix
-{
-	public static class EventIdType
-	{
-		public const string InitSceneStart = "InitSceneStart";
-		public const string LoginFinish = "LoginFinish";
-		public const string EnterMapFinish = "EnterMapFinish";
-	}
-}

Unity/Assets/Hotfix/Base/Event/EventIdType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 471b16be87d827f4389d4f55212aa81a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Event/IEvent.cs

@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ETHotfix
-{
-#if ILRuntime
-	public interface IEvent
-	{
-		void Handle();
-		void Handle(object a);
-		void Handle(object a, object b);
-		void Handle(object a, object b, object c);
-	}
-
-	public abstract class AEvent : IEvent
-	{
-		public void Handle()
-		{
-			this.Run();
-		}
-
-		public void Handle(object a)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a, object b)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a, object b, object c)
-		{
-			throw new NotImplementedException();
-		}
-
-		public abstract void Run();
-	}
-
-	public abstract class AEvent<A>: IEvent
-	{
-		public void Handle()
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a)
-		{
-			this.Run((A)a);
-		}
-
-		public void Handle(object a, object b)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a, object b, object c)
-		{
-			throw new NotImplementedException();
-		}
-
-		public abstract void Run(A a);
-	}
-
-	public abstract class AEvent<A, B>: IEvent
-	{
-		public void Handle()
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a, object b)
-		{
-			this.Run((A)a, (B)b);
-		}
-
-		public void Handle(object a, object b, object c)
-		{
-			throw new NotImplementedException();
-		}
-
-		public abstract void Run(A a, B b);
-	}
-
-	public abstract class AEvent<A, B, C>: IEvent
-	{
-		public void Handle()
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a, object b)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Handle(object a, object b, object c)
-		{
-			this.Run((A)a, (B)b, (C)c);
-		}
-
-		public abstract void Run(A a, B b, C c);
-	}
-#else
-	public abstract class AEvent : ETModel.AEvent
-	{
-	}
-
-	public abstract class AEvent<A> : ETModel.AEvent<A>
-	{
-	}
-
-	public abstract class AEvent<A, B> : ETModel.AEvent<A, B>
-	{
-	}
-
-	public abstract class AEvent<A, B, C>: ETModel.AEvent<A, B, C>
-	{
-	}
-#endif
-}

Unity/Assets/Hotfix/Base/Event/IEvent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c32ba0eec527e664badf3a7a29d8b894
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Helper/ArrayHelper.cs

@@ -1,12 +0,0 @@
-namespace ETHotfix
-{
-	public static class ObjectHelper
-	{
-		public static void Swap<T>(ref T t1, ref T t2)
-		{
-			T t3 = t1;
-			t1 = t2;
-			t2 = t3;
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Helper/ArrayHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1f2a6005fcdb22f42be4ac21e53d6bee
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Helper/AssetBundleHelper.cs

@@ -1,25 +0,0 @@
-namespace ETHotfix
-{
-	public static class AssetBundleHelper
-	{
-		public static string GetBundleNameById(string id, EntityType entityType = EntityType.None)
-		{
-			string subString = id.Substring(0, 3);
-			switch (subString[0])
-			{
-				case '1':
-				case '2':
-				case '3':
-					return "3000";
-				case '4':
-				case '5':
-				case '6':
-				case '8':
-					return subString;
-				case '9':
-					return "900";
-			}
-			return subString;
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Helper/AssetBundleHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f7f36b13193378e4aa88091093cd8121
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Helper/Dumper.cs

@@ -1,119 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Text;
-using ETModel;
-using Google.Protobuf;
-using UnityEngine;
-
-namespace ETHotfix
-{
-    public static class Dumper
-    {
-        private static readonly StringBuilder _text = new StringBuilder("", 1024);
-
-        private static void AppendIndent(int num)
-        {
-            _text.Append(' ', num);
-        }
-
-        private static void DoDump(object obj)
-        {
-            if (obj == null)
-            {
-                _text.Append("null");
-                _text.Append(",");
-                return;
-            }
-
-            Type t = obj.GetType();
-
-            //repeat field
-            if (obj is IList)
-            {
-                /*
-                _text.Append(t.FullName);
-                _text.Append(",");
-                AppendIndent(1);
-                */
-
-                _text.Append("[");
-                IList list = obj as IList;
-                foreach (object v in list)
-                {
-                    DoDump(v);
-                }
-
-                _text.Append("]");
-            }
-            else if (t.IsValueType)
-            {
-                _text.Append(obj);
-                _text.Append(",");
-                AppendIndent(1);
-            }
-            else if (obj is string)
-            {
-                _text.Append("\"");
-                _text.Append(obj);
-                _text.Append("\"");
-                _text.Append(",");
-                AppendIndent(1);
-            }
-            else if (obj is ByteString)
-            {
-                _text.Append("\"");
-                _text.Append(((ByteString) obj).bytes.Utf8ToStr());
-                _text.Append("\"");
-                _text.Append(",");
-                AppendIndent(1);
-            }
-            else if (t.IsArray)
-            {
-                Array a = (Array) obj;
-                _text.Append("[");
-                for (int i = 0; i < a.Length; i++)
-                {
-                    _text.Append(i);
-                    _text.Append(":");
-                    DoDump(a.GetValue(i));
-                }
-
-                _text.Append("]");
-            }
-            else if (t.IsClass)
-            {
-                _text.Append($"<{t.Name}>");
-                _text.Append("{");
-                var fields = t.GetProperties(BindingFlags.Public | BindingFlags.Instance);
-                if (fields.Length > 0)
-                {
-                    foreach (PropertyInfo info in fields)
-                    {
-                        _text.Append(info.Name);
-                        _text.Append(":");
-                        object value = info.GetGetMethod().Invoke(obj, null);
-                        DoDump(value);
-                    }
-                }
-
-                _text.Append("}");
-            }
-            else
-            {
-                Debug.LogWarning("unsupport type: " + t.FullName);
-                _text.Append(obj);
-                _text.Append(",");
-                AppendIndent(1);
-            }
-        }
-
-        public static string DumpAsString(object obj, string hint = "")
-        {
-            _text.Clear();
-            _text.Append(hint);
-            DoDump(obj);
-            return _text.ToString();
-        }
-    }
-}

Unity/Assets/Hotfix/Base/Helper/Dumper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 50f22dd0f513b7b479e6967e290bc092
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Helper/ExceptionHelper.cs

@@ -1,17 +0,0 @@
-using System;
-using ETModel;
-
-namespace ETHotfix
-{
-	public static class ExceptionHelper
-	{
-		public static string ToStr(this Exception exception)
-		{
-#if ILRuntime
-			return $"{exception.Data["StackTrace"]} \n\n {exception}";
-#else
-			return exception.ToString();
-#endif
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Helper/ExceptionHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c7d82afb13a6ed042a9ec8a424b09637
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Helper/JsonHelper.cs

@@ -1,28 +0,0 @@
-using System;
-using ETModel;
-
-namespace ETHotfix
-{
-	public static class JsonHelper
-	{
-		public static string ToJson(object obj)
-		{
-			return MongoHelper.ToJson(obj);
-		}
-
-		public static T FromJson<T>(string str)
-		{
-			return MongoHelper.FromJson<T>(str);
-		}
-
-		public static object FromJson(Type type, string str)
-		{
-			return MongoHelper.FromJson(type, str);
-		}
-
-		public static T Clone<T>(T t)
-		{
-			return FromJson<T>(ToJson(t));
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Helper/JsonHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7cfdf084c7e13ca4f96a7a642fe59fd6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Log.cs

@@ -1,72 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public static class Log
-	{
-		public static void Trace(string msg)
-		{
-			ETModel.Log.Trace(msg);
-		}
-		
-		public static void Warning(string msg)
-		{
-			ETModel.Log.Warning(msg);
-		}
-
-		public static void Info(string msg)
-		{
-			ETModel.Log.Info(msg);
-		}
-
-		public static void Error(Exception e)
-		{
-			ETModel.Log.Error(e.ToStr());
-		}
-
-		public static void Error(string msg)
-		{
-			ETModel.Log.Error(msg);
-		}
-
-		public static void Debug(string msg)
-		{
-			ETModel.Log.Debug(msg);
-		}
-		
-		public static void Trace(string message, params object[] args)
-		{
-			ETModel.Log.Trace(message, args);
-		}
-
-		public static void Warning(string message, params object[] args)
-		{
-			ETModel.Log.Warning(message, args);
-		}
-
-		public static void Info(string message, params object[] args)
-		{
-			ETModel.Log.Info(message, args);
-		}
-
-		public static void Debug(string message, params object[] args)
-		{
-			ETModel.Log.Debug(message, args);
-		}
-
-		public static void Error(string message, params object[] args)
-		{
-			ETModel.Log.Error(message, args);
-		}
-
-		public static void Fatal(string message, params object[] args)
-		{
-			ETModel.Log.Fatal(message, args);
-		}
-		
-		public static void Msg(object msg)
-		{
-			Debug(Dumper.DumpAsString(msg));
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Log.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8db24a729979f2741ac84b5caf0cdc38
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 326628f9cad8d714e999eaf89d7f9041
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,781 +0,0 @@
-using System;
-using System.Collections.Generic;
-using ETModel;
-using MongoDB.Bson.Serialization.Attributes;
-#if !SERVER
-using UnityEngine;
-#endif
-
-namespace ETHotfix
-{
-	[Flags]
-	public enum EntityStatus: byte
-	{
-		None = 0,
-		IsFromPool = 0x01,
-		IsRegister = 0x02,
-		IsComponent = 0x04
-	}
-	
-	public partial class Entity : Object, IDisposable
-	{
-		private static readonly Pool<HashSet<Entity>> hashSetPool = new Pool<HashSet<Entity>>();
-		
-		private static readonly Pool<Dictionary<Type, Entity>> dictPool = new Pool<Dictionary<Type, Entity>>();
-		
-		private static readonly Pool<Dictionary<long, Entity>> childrenPool = new Pool<Dictionary<long, Entity>>();
-		
-		
-		[BsonIgnore]
-		public long InstanceId { get; set; }
-		
-#if !SERVER
-		public static GameObject Global { get; } = GameObject.Find("/Global");
-		
-		[BsonIgnore]
-		public GameObject ViewGO { get; set; }
-#endif
-
-		[BsonIgnore]
-		private EntityStatus status = EntityStatus.None;
-
-		[BsonIgnore]
-		public bool IsFromPool
-		{
-			get
-			{
-				return (this.status & EntityStatus.IsFromPool) == EntityStatus.IsFromPool;
-			}
-			set
-			{
-				if (value)
-				{
-					this.status |= EntityStatus.IsFromPool;
-				}
-				else
-				{
-					this.status &= ~EntityStatus.IsFromPool;
-				}
-
-				if (this.InstanceId == 0)
-				{
-					this.InstanceId = IdGenerater.GenerateId();
-				}
-
-				this.IsRegister = value;
-			}
-		}
-		
-		[BsonIgnore]
-		private bool IsRegister
-		{
-			get
-			{
-				return (this.status & EntityStatus.IsRegister) == EntityStatus.IsRegister;
-			}
-			set
-			{
-				if (this.IsRegister == value)
-				{
-					return;
-				}
-				if (value)
-				{
-					this.status |= EntityStatus.IsRegister;
-				}
-				else
-				{
-					this.status &= ~EntityStatus.IsRegister;
-				}
-				Game.EventSystem.RegisterSystem(this, value);
-			}
-		}
-		
-		[BsonIgnore]
-		private bool IsComponent
-		{
-			get
-			{
-				return (this.status & EntityStatus.IsComponent) == EntityStatus.IsComponent;
-			}
-			set
-			{
-				if (value)
-				{
-					this.status |= EntityStatus.IsComponent;
-				}
-				else
-				{
-					this.status &= ~EntityStatus.IsComponent;
-				}
-			}
-		}
-
-		[BsonIgnore]
-		public bool IsDisposed
-		{
-			get
-			{
-				return this.InstanceId == 0;
-			}
-		}
-
-		[BsonIgnore]
-		protected Entity parent;
-		
-		[BsonIgnore]
-		public Entity Parent
-		{
-			get
-			{
-				return this.parent;
-			}
-			set
-			{
-				if (value == null)
-				{
-					throw new Exception($"cant set parent null: {this.GetType().Name}");
-				}
-				
-				if (this.parent != null) // 之前有parent
-				{
-					// parent相同，不设置
-					if (this.parent.InstanceId == value.InstanceId)
-					{
-						Log.Error($"重复设置了Parent: {this.GetType().Name} parent: {this.parent.GetType().Name}");
-						return;
-					}
-					
-					this.parent.RemoveChild(this);
-					
-					this.parent = value;
-					this.parent.AddChild(this);
-					
-					this.Domain = this.parent.domain;
-				}
-				else
-				{
-					this.parent = value;
-					this.parent.AddChild(this);
-				
-					this.IsComponent = false;
-				
-					AfterSetParent();
-				}
-			}
-		}
-		
-		// 该方法只能在AddComponent中调用，其他人不允许调用
-		[BsonIgnore]
-		private Entity ComponentParent
-		{
-			set
-			{
-				if (this.parent != null)
-				{
-					throw new Exception($"Component parent is null: {this.GetType().Name}");
-				}
-
-				this.parent = value;
-				
-				this.IsComponent = true;
-
-				AfterSetParent();
-			}
-		}
-
-		private void AfterSetParent()
-		{
-			if (this.parent.domain != null)
-			{
-				this.Domain = this.parent.domain;
-			}
-
-			// 检测自己的domain是不是跟父亲一样
-			if (this.Domain != null && this.parent.Domain != null && this.Domain.InstanceId != this.parent.Domain.InstanceId && !(this is Scene))
-			{
-				Log.Error($"自己的domain跟parent不一样: {this.GetType().Name}");
-			}
-#if !SERVER
-			if (this.ViewGO != null && this.parent.ViewGO != null)
-			{
-				this.ViewGO.transform.SetParent(this.parent.ViewGO.transform, false);
-			}
-#endif
-		}
-
-		public T GetParent<T>() where T : Entity
-		{
-			return this.Parent as T;
-		}
-		
-		public override string ToString()
-		{
-			return MongoHelper.ToJson(this);
-		}
-		
-		
-		[BsonIgnoreIfDefault]
-		[BsonDefaultValue(0L)]
-		[BsonElement]
-		[BsonId]
-		public long Id { get; set; }
-
-		[BsonIgnore]
-		protected Entity domain;
-
-		[BsonIgnore]
-		public Entity Domain 
-		{
-			get
-			{
-				return this.domain;
-			}
-			set
-			{
-				if (value == null)
-				{
-					return;
-				}
-				
-				Entity preDomain = this.domain;
-				this.domain = value;
-				
-				if (!(this.domain is Scene))
-				{
-					throw new Exception($"domain is not scene: {this.GetType().Name}");
-				}
-				
-				this.domain = value;
-				
-				// 是否注册跟parent一致
-				if (this.parent != null)
-				{
-					this.IsRegister = this.Parent.IsRegister;
-				}
-
-				// 递归设置孩子的Domain
-				if (this.children != null)
-				{
-					foreach (Entity entity in this.children.Values)
-					{
-						entity.Domain = this.domain;
-					}
-				}
-				
-				if (this.components != null)
-				{
-					foreach (Entity component in this.components.Values)
-					{
-						component.Domain = this.domain;
-					}
-				}
-				
-				if (preDomain == null && !this.IsFromPool)
-				{
-					Game.EventSystem.Deserialize(this);
-				}
-			}
-		}
-
-		[BsonElement("Children")]
-		[BsonIgnoreIfNull]
-		private HashSet<Entity> childrenDB;
-
-		[BsonIgnore]
-		private Dictionary<long, Entity> children;
-		
-		[BsonIgnore]
-		public Dictionary<long, Entity> Children 
-		{
-			get
-			{
-				if (this.children == null)
-				{
-					this.children = childrenPool.Fetch();
-				}
-
-				return this.children;
-			}
-		}
-		
-		private void AddChild(Entity entity)
-		{
-			this.Children.Add(entity.Id, entity);
-			this.AddChildDB(entity);
-		}
-		
-		private void RemoveChild(Entity entity)
-		{
-			if (this.children == null)
-			{
-				return;
-			}
-
-			this.children.Remove(entity.Id);
-
-			if (this.children.Count == 0)
-			{
-				childrenPool.Recycle(this.children);
-				this.children = null;
-			}
-			this.RemoveChildDB(entity);
-		}
-		
-		private void AddChildDB(Entity entity)
-		{
-			if (!(entity is ISerializeToEntity))
-			{
-				return;
-			}
-			if (this.childrenDB == null)
-			{
-				this.childrenDB = hashSetPool.Fetch();
-			}
-			this.childrenDB.Add(entity);
-		}
-		
-		private void RemoveChildDB(Entity entity)
-		{
-			if (!(entity is ISerializeToEntity))
-			{
-				return;
-			}
-
-			if (this.childrenDB == null)
-			{
-				return;
-			}
-			
-			this.childrenDB.Remove(entity);
-			
-			if (this.childrenDB.Count == 0)
-			{
-				if (this.IsFromPool)
-				{
-					hashSetPool.Recycle(this.childrenDB);
-					this.childrenDB = null;
-				}
-			}
-		}
-
-		[BsonElement("C")]
-		[BsonIgnoreIfNull]
-		private HashSet<Entity> componentsDB;
-		
-		[BsonIgnore]
-		private Dictionary<Type, Entity> components;
-
-		[BsonIgnore]
-		public Dictionary<Type, Entity> Components
-		{
-			get
-			{
-				return this.components;
-			}
-		}
-		
-		protected Entity()
-		{
-			this.InstanceId = IdGenerater.GenerateId();
-
-#if !SERVER
-			if (!this.GetType().IsDefined(typeof (HideInHierarchy), true))
-			{
-				this.ViewGO = new GameObject();
-				this.ViewGO.name = this.GetType().Name;
-				this.ViewGO.layer = LayerNames.GetLayerInt(LayerNames.HIDDEN);
-				this.ViewGO.transform.SetParent(Global.transform, false);
-				this.ViewGO.AddComponent<ComponentView>().Component = this;
-			}
-#endif
-		}
-
-		public virtual void Dispose()
-		{
-			if (this.IsDisposed)
-			{
-				return;
-			}
-
-			long instanceId = this.InstanceId;
-			this.InstanceId = 0;
-			
-			Game.EventSystem.Remove(instanceId);
-
-			// 触发Destroy事件
-			Game.EventSystem.Destroy(this);
-
-			this.domain = null;
-		
-			// 清理Children
-			if (this.children != null)
-			{
-				var deletes = this.children;
-				this.children = null;
-
-				foreach (Entity child in deletes.Values)
-				{
-					child.Dispose();
-				}
-
-				deletes.Clear();
-				childrenPool.Recycle(deletes);
-				
-				if (this.childrenDB != null)
-				{
-					this.childrenDB.Clear();
-					// 从池中创建的才需要回到池中,从db中不需要回收
-					if (this.IsFromPool)
-					{
-						hashSetPool.Recycle(this.childrenDB);
-						this.childrenDB = null;
-					}
-				}
-			}
-
-			// 清理Component
-			if (this.components != null)
-			{
-				var deletes = this.components;
-				this.components = null;
-				foreach (var kv in deletes)
-				{
-					kv.Value.Dispose();
-				}
-				
-				deletes.Clear();
-				dictPool.Recycle(deletes);
-				
-				// 从池中创建的才需要回到池中,从db中不需要回收
-				if (this.componentsDB != null)
-				{
-					this.componentsDB.Clear();
-					
-					if (this.IsFromPool)
-					{
-						hashSetPool.Recycle(this.componentsDB);
-						this.componentsDB = null;
-					}
-				}
-			}
-
-			if (this.IsComponent)
-			{
-				this.parent?.RemoveComponent(this);
-			}
-			else
-			{
-				this.parent?.RemoveChild(this);	
-			}
-
-			this.parent = null;
-
-			if (this.IsFromPool)
-			{
-				Game.ObjectPool.Recycle(this);
-			}
-			else
-			{
-#if !SERVER
-				if (this.ViewGO != null)
-				{
-					UnityEngine.Object.Destroy(this.ViewGO);
-				}
-#endif
-			}
-
-			status = EntityStatus.None;
-		}
-		
-		public override void EndInit()
-		{
-			try
-			{
-				if (this.childrenDB != null)
-				{
-					foreach (Entity child in this.childrenDB)
-					{
-						child.IsComponent = false;
-						this.AddChild(child);
-						child.parent = this;
-					}
-				}
-				
-				if (this.componentsDB != null)
-				{
-					foreach (Entity component in this.componentsDB)
-					{
-						component.IsComponent = true;
-						this.AddToComponent(component.GetType(), component);
-						component.parent = this;
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				Log.Error(e);
-			}
-		}
-		
-		private void AddToComponentsDB(Entity component)
-		{
-			if (this.componentsDB == null)
-			{
-				this.componentsDB = hashSetPool.Fetch();
-			}
-
-			this.componentsDB.Add(component);
-		}
-		
-		private void RemoveFromComponentsDB(Entity component)
-		{
-			if (this.componentsDB == null)
-			{
-				return;
-			}
-			this.componentsDB.Remove(component);
-			if (this.componentsDB.Count == 0 && this.IsFromPool)
-			{
-				hashSetPool.Recycle(this.componentsDB);
-				this.componentsDB = null;
-			}
-		}
-		
-		private void AddToComponent(Type type, Entity component)
-		{
-			if (this.components == null)
-			{
-				this.components = dictPool.Fetch();
-			}
-
-			this.components.Add(type, component);
-			
-			if (component is ISerializeToEntity)
-			{
-				this.AddToComponentsDB(component);
-			}
-		}
-		
-		private void RemoveFromComponent(Type type, Entity component)
-		{
-			if (this.components == null)
-			{
-				return;
-			}
-			
-			this.components.Remove(type);
-			
-			if (this.components.Count == 0 && this.IsFromPool)
-			{
-				dictPool.Recycle(this.components);
-				this.components = null;
-			}
-			
-			this.RemoveFromComponentsDB(component);
-		}
-		
-		public Entity AddComponent(Entity component)
-		{
-			component.ComponentParent = this;
-			
-			Type type = component.GetType();
-			
-			this.AddToComponent(type, component);
-
-			return component;
-		}
-
-		public Entity AddComponent(Type type)
-		{
-			Entity component = CreateWithComponentParent(type);
-
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponent<K>() where K : Entity, new()
-		{
-			Type type = typeof (K);
-			
-			K component = CreateWithComponentParent<K>();
-
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponent<K, P1>(P1 p1) where K : Entity, new()
-		{
-			Type type = typeof (K);
-			
-			K component = CreateWithComponentParent<K, P1>(p1);
-			
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponent<K, P1, P2>(P1 p1, P2 p2) where K : Entity, new()
-		{
-			Type type = typeof (K);
-
-			K component = CreateWithComponentParent<K, P1, P2>(p1, p2);
-			
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponent<K, P1, P2, P3>(P1 p1, P2 p2, P3 p3) where K : Entity, new()
-		{
-			Type type = typeof (K);
-			
-			K component = CreateWithComponentParent<K, P1, P2, P3>(p1, p2, p3);
-			
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-		
-		public K AddComponentNoPool<K>() where K : Entity, new()
-		{
-			Type type = typeof (K);
-			
-			K component = CreateWithComponentParent<K>(false);
-
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponentNoPool<K, P1>(P1 p1) where K : Entity, new()
-		{
-			Type type = typeof (K);
-			
-			K component = CreateWithComponentParent<K, P1>(p1, false);
-			
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponentNoPool<K, P1, P2>(P1 p1, P2 p2) where K : Entity, new()
-		{
-			Type type = typeof (K);
-
-			K component = CreateWithComponentParent<K, P1, P2>(p1, p2, false);
-			
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public K AddComponentNoPool<K, P1, P2, P3>(P1 p1, P2 p2, P3 p3) where K : Entity, new()
-		{
-			Type type = typeof (K);
-			
-			K component = CreateWithComponentParent<K, P1, P2, P3>(p1, p2, p3, false);
-			
-			this.AddToComponent(type, component);
-			
-			return component;
-		}
-
-		public void RemoveComponent<K>() where K : Entity
-		{
-			if (this.IsDisposed)
-			{
-				return;
-			}
-
-			if (this.components == null)
-			{
-				return;
-			}
-			
-			Type type = typeof (K);
-			Entity c = this.GetComponent(type);
-			if (c == null)
-			{
-				return;
-			}
-
-			this.RemoveFromComponent(type, c);
-			c.Dispose();
-		}
-		
-		public void RemoveComponent(Entity component)
-		{
-			if (this.IsDisposed)
-			{
-				return;
-			}
-			
-			if (this.components == null)
-			{
-				return;
-			}
-
-			Type type = component.GetType();
-			Entity c = this.GetComponent(component.GetType());
-			if (c == null)
-			{
-				return;
-			}
-			if (c.InstanceId != component.InstanceId)
-			{
-				return;
-			}
-			
-			this.RemoveFromComponent(type, c);
-			c.Dispose();
-		}
-
-		public void RemoveComponent(Type type)
-		{
-			if (this.IsDisposed)
-			{
-				return;
-			}
-			
-			Entity c = this.GetComponent(type);
-			if (c == null)
-			{
-				return;
-			}
-
-			RemoveFromComponent(type, c);
-			c.Dispose();
-		}
-
-		public K GetComponent<K>() where K : Entity
-		{
-			if (this.components == null)
-			{
-				return null;
-			}
-			Entity component;
-			if (!this.components.TryGetValue(typeof(K), out component))
-			{
-				return default(K);
-			}
-			return (K)component;
-		}
-
-		public Entity GetComponent(Type type)
-		{
-			if (this.components == null)
-			{
-				return null;
-			}
-			Entity component;
-			if (!this.components.TryGetValue(type, out component))
-			{
-				return null;
-			}
-			return component;
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Object/Entity.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8b636cc8b4ed2884ab14e6fbb43cefd4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/EntityCreateComponet.cs

@@ -1,108 +0,0 @@
-using System;
- using ETModel;
-
- namespace ETHotfix
-{
-	public partial class Entity
-	{
-		private Entity CreateWithComponentParent(Type type)
-		{
-			Entity component;
-			if (type.IsDefined(typeof (NoObjectPool), false))
-			{
-				component = (Entity)Activator.CreateInstance(type);
-			}
-			else
-			{
-				component = Game.ObjectPool.Fetch(type);	
-			}
-			
-			this.Domain = parent.Domain;
-			component.Id = parent.Id;
-			component.ComponentParent = parent;
-			
-			Game.EventSystem.Awake(component);
-			return component;
-		}
-
-		private T CreateWithComponentParent<T>(bool isFromPool = true) where T : Entity
-		{
-			Type type = typeof (T);
-			Entity component;
-			if (!isFromPool)
-			{
-				component = (Entity)Activator.CreateInstance(type);
-			}
-			else
-			{
-				component = Game.ObjectPool.Fetch(type);	
-			}
-			component.Domain = this.Domain;
-			component.Id = this.Id;
-			component.ComponentParent = this;
-			
-			Game.EventSystem.Awake(component);
-			return (T)component;
-		}
-
-		private T CreateWithComponentParent<T, A>(A a, bool isFromPool = true) where T : Entity
-		{
-			Type type = typeof (T);
-			Entity component;
-			if (!isFromPool)
-			{
-				component = (Entity)Activator.CreateInstance(type);
-			}
-			else
-			{
-				component = Game.ObjectPool.Fetch(type);	
-			}
-			component.Domain = this.Domain;
-			component.Id = this.Id;
-			component.ComponentParent = this;
-			
-			Game.EventSystem.Awake(component, a);
-			return (T)component;
-		}
-
-		private T CreateWithComponentParent<T, A, B>(A a, B b, bool isFromPool = true) where T : Entity
-		{
-			Type type = typeof (T);
-			Entity component;
-			if (!isFromPool)
-			{
-				component = (Entity)Activator.CreateInstance(type);
-			}
-			else
-			{
-				component = Game.ObjectPool.Fetch(type);	
-			}
-			component.Domain = this.Domain;
-			component.Id = this.Id;
-			component.ComponentParent = this;
-			
-			Game.EventSystem.Awake(component, a, b);
-			return (T)component;
-		}
-
-		private T CreateWithComponentParent<T, A, B, C>(A a, B b, C c, bool isFromPool = true) where T : Entity
-		{
-			Type type = typeof (T);
-			Entity component;
-			if (!isFromPool)
-			{
-				component = (Entity)Activator.CreateInstance(type);
-			}
-			else
-			{
-				component = Game.ObjectPool.Fetch(type);	
-			}
-			component.Domain = this.Domain;
-			component.Id = this.Id;
-			component.ComponentParent = this;
-			
-			Game.EventSystem.Awake(component, a, b, c);
-			return (T)component;
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Object/EntityCreateComponet.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 11e6f3fc480dafb43ac51b2dfcaa2ab3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/EntityFactory.cs

@@ -1,198 +0,0 @@
-using System;
-using ETModel;
-
-namespace ETHotfix
-{
-	public static class EntityFactory
-	{
-		public static Entity CreateWithParent(Type type, Entity parent)
-		{
-			Entity component = Game.ObjectPool.Fetch(type);
-			component.Domain = parent.Domain;
-			component.Id = component.InstanceId;
-			component.Parent = parent;
-			
-			Game.EventSystem.Awake(component);
-			return component;
-		}
-
-		public static T CreateWithParent<T>(Entity parent) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = parent.Domain;
-			component.Id = component.InstanceId;
-			component.Parent = parent;
-			
-			Game.EventSystem.Awake(component);
-			return component;
-		}
-
-		public static T CreateWithParent<T, A>(Entity parent, A a) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = parent.Domain;
-			component.Id = component.InstanceId;
-			component.Parent = parent;
-			
-			Game.EventSystem.Awake(component, a);
-			return component;
-		}
-
-		public static T CreateWithParent<T, A, B>(Entity parent, A a, B b) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = parent.Domain;
-			component.Id = component.InstanceId;
-			component.Parent = parent;
-			
-			Game.EventSystem.Awake(component, a, b);
-			return component;
-		}
-
-		public static T CreateWithParent<T, A, B, C>(Entity parent, A a, B b, C c, bool fromPool = true) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = parent.Domain;
-			component.Id = component.InstanceId;
-			component.Parent = parent;
-			
-			Game.EventSystem.Awake(component, a, b, c);
-			return component;
-		}
-
-        public static T CreateWithParent<T, A, B, C, D>(Entity parent, A a, B b, C c, D d, bool fromPool = true) where T : Entity
-        {
-            Type type = typeof(T);
-
-            T component = (T)Game.ObjectPool.Fetch(type);
-            component.Domain = parent.Domain;
-            component.Id = component.InstanceId;
-            component.Parent = parent;
-            
-            Game.EventSystem.Awake(component, a, b, c, d);
-            return component;
-        }
-        
-        
-        public static Entity Create(Entity domain, Type type)
-        {
-	        Entity component = Game.ObjectPool.Fetch(type);
-	        component.Domain = domain ?? component;
-	        component.Id = component.InstanceId;
-	        
-	        Game.EventSystem.Awake(component);
-	        return component;
-        }
-
-
-        public static T Create<T>(Entity domain) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = component.InstanceId;
-			Game.EventSystem.Awake(component);
-			return component;
-		}
-
-		public static T Create<T, A>(Entity domain, A a) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = component.InstanceId;
-			Game.EventSystem.Awake(component, a);
-			return component;
-		}
-
-		public static T Create<T, A, B>(Entity domain, A a, B b) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = component.InstanceId;
-			Game.EventSystem.Awake(component, a, b);
-			return component;
-		}
-
-		public static T Create<T, A, B, C>(Entity domain, A a, B b, C c) where T : Entity
-		{
-			Type type = typeof (T);
-
-			T component = (T) Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = component.InstanceId;
-			Game.EventSystem.Awake(component, a, b, c);
-			return component;
-		}
-
-		public static T CreateWithId<T>(Entity domain, long id) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = id;
-			Game.EventSystem.Awake(component);
-			return component;
-		}
-
-		public static T CreateWithId<T, A>(Entity domain, long id, A a) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = id;
-			Game.EventSystem.Awake(component, a);
-			return component;
-		}
-
-		public static T CreateWithId<T, A, B>(Entity domain, long id, A a, B b) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = id;
-			Game.EventSystem.Awake(component, a, b);
-			return component;
-		}
-
-		public static T CreateWithId<T, A, B, C>(Entity domain, long id, A a, B b, C c) where T : Entity
-		{
-			Type type = typeof (T);
-			
-			T component = (T)Game.ObjectPool.Fetch(type);
-			component.Domain = domain ?? component;
-			component.Id = id;
-			Game.EventSystem.Awake(component, a, b, c);
-			return component;
-		}
-		
-		public static Scene CreateScene(SceneType sceneType, string name, Scene parent = null,long id = 0)
-		{
-			Scene scene = (Scene)Game.ObjectPool.Fetch(typeof(Scene));
-			scene.Id = id != 0 ? id : IdGenerater.GenerateId();
-			scene.Name = name;
-			scene.SceneType = sceneType;
-			if (parent != null)
-			{
-				scene.Parent = parent;
-			}
-			scene.Domain = scene;
-			return scene;
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Object/EntityFactory.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 161782d0a7b969047a885bd7ccce9d56
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/EntityType.cs

@@ -1,12 +0,0 @@
-namespace ETHotfix
-{
-	public enum EntityType
-	{
-		None,
-		Scene,
-		Session,
-		UI,
-		Config,
-		Unit
-	}
-}

Unity/Assets/Hotfix/Base/Object/EntityType.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ea832b9e31d126945a46cc3647845351
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/EventSystem.cs

@@ -1,741 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using ETModel;
-
-namespace ETHotfix
-{
-	public enum DLLType
-	{
-		Model,
-		Hotfix,
-		Editor,
-	}
-
-	public sealed class EventSystem
-	{
-		private readonly Dictionary<long, Entity> allComponents = new Dictionary<long, Entity>();
-		
-		private readonly List<Type> types = new List<Type>();
-
-		private readonly Dictionary<string, List<object>> allEvents = new Dictionary<string, List<object>>();
-
-		private readonly UnOrderMultiMap<Type, IAwakeSystem> awakeSystems = new UnOrderMultiMap<Type, IAwakeSystem>();
-
-		private readonly UnOrderMultiMap<Type, IStartSystem> startSystems = new UnOrderMultiMap<Type, IStartSystem>();
-
-		private readonly UnOrderMultiMap<Type, IDestroySystem> destroySystems = new UnOrderMultiMap<Type, IDestroySystem>();
-
-		private readonly UnOrderMultiMap<Type, ILoadSystem> loadSystems = new UnOrderMultiMap<Type, ILoadSystem>();
-
-		private readonly UnOrderMultiMap<Type, IUpdateSystem> updateSystems = new UnOrderMultiMap<Type, IUpdateSystem>();
-
-		private readonly UnOrderMultiMap<Type, ILateUpdateSystem> lateUpdateSystems = new UnOrderMultiMap<Type, ILateUpdateSystem>();
-
-		private readonly UnOrderMultiMap<Type, IChangeSystem> changeSystems = new UnOrderMultiMap<Type, IChangeSystem>();
-		
-		private readonly UnOrderMultiMap<Type, IDeserializeSystem> deserializeSystems = new UnOrderMultiMap<Type, IDeserializeSystem>();
-
-		private Queue<long> updates = new Queue<long>();
-		private Queue<long> updates2 = new Queue<long>();
-		
-		private readonly Queue<long> starts = new Queue<long>();
-
-		private Queue<long> loaders = new Queue<long>();
-		private Queue<long> loaders2 = new Queue<long>();
-
-		private Queue<long> lateUpdates = new Queue<long>();
-		private Queue<long> lateUpdates2 = new Queue<long>();
-
-		public EventSystem()
-		{
-			this.types.Clear();
-			
-			List<Type> ts = ETModel.Game.Hotfix.GetHotfixTypes();
-			
-			foreach (Type type in ts)
-			{
-				// ILRuntime无法判断是否有Attribute
-				//if (type.GetCustomAttributes(typeof (Attribute), false).Length == 0)
-				//{
-				//	continue;
-				//}
-				this.types.Add(type);	
-			}
-			
-			foreach (Type type in types)
-			{
-				object[] attrs = type.GetCustomAttributes(typeof(ObjectSystemAttribute), false);
-
-				if (attrs.Length == 0)
-				{
-					continue;
-				}
-
-				object obj = Activator.CreateInstance(type);
-
-				switch (obj)
-				{
-					case IAwakeSystem objectSystem:
-						this.awakeSystems.Add(objectSystem.Type(), objectSystem);
-						break;
-					case IUpdateSystem updateSystem:
-						this.updateSystems.Add(updateSystem.Type(), updateSystem);
-						break;
-					case ILateUpdateSystem lateUpdateSystem:
-						this.lateUpdateSystems.Add(lateUpdateSystem.Type(), lateUpdateSystem);
-						break;
-					case IStartSystem startSystem:
-						this.startSystems.Add(startSystem.Type(), startSystem);
-						break;
-					case IDestroySystem destroySystem:
-						this.destroySystems.Add(destroySystem.Type(), destroySystem);
-						break;
-					case ILoadSystem loadSystem:
-						this.loadSystems.Add(loadSystem.Type(), loadSystem);
-						break;
-					case IChangeSystem changeSystem:
-						this.changeSystems.Add(changeSystem.Type(), changeSystem);
-						break;
-					case IDeserializeSystem deserializeSystem:
-						this.deserializeSystems.Add(deserializeSystem.Type(), deserializeSystem);
-						break;
-				}
-			}
-
-			this.allEvents.Clear();
-			foreach (Type type in types)
-			{
-				object[] attrs = type.GetCustomAttributes(typeof(EventAttribute), false);
-
-				foreach (object attr in attrs)
-				{
-					EventAttribute aEventAttribute = (EventAttribute)attr;
-					object obj = Activator.CreateInstance(type);
-					IEvent iEvent = obj as IEvent;
-					if (iEvent == null)
-					{
-						Log.Error($"{obj.GetType().Name} 没有继承IEvent");
-					}
-					this.RegisterEvent(aEventAttribute.Type, iEvent);
-
-					// hotfix的事件也要注册到mono层，hotfix可以订阅mono层的事件
-					Action<List<object>> action = list => { Handle(iEvent, list); };
-					ETModel.Game.EventSystem.RegisterEvent(aEventAttribute.Type, new EventProxy(action));
-				}
-			}
-
-			this.Load();
-		}
-		
-		public static void Handle(IEvent iEvent, List<object> param)
-		{
-			switch (param.Count)
-			{
-				case 0:
-					iEvent.Handle();
-					break;
-				case 1:
-					iEvent.Handle(param[0]);
-					break;
-				case 2:
-					iEvent.Handle(param[0], param[1]);
-					break;
-				case 3:
-					iEvent.Handle(param[0], param[1], param[2]);
-					break;
-			}
-		}
-
-		public void RegisterEvent(string eventId, IEvent e)
-		{
-			if (!this.allEvents.ContainsKey(eventId))
-			{
-				this.allEvents.Add(eventId, new List<object>());
-			}
-			this.allEvents[eventId].Add(e);
-		}
-		
-		public List<Type> GetTypes()
-		{
-			return this.types;
-		}
-
-		public void RegisterSystem(Entity component, bool isRegister = true)
-		{
-			if (!isRegister)
-			{
-				this.Remove(component.InstanceId);
-				return;
-			}
-			this.allComponents.Add(component.InstanceId, component);
-			
-			Type type = component.GetType();
-
-			if (this.loadSystems.ContainsKey(type))
-			{ 
-				this.loaders.Enqueue(component.InstanceId);
-			}
-
-			if (this.updateSystems.ContainsKey(type))
-			{
-				this.updates.Enqueue(component.InstanceId);
-			}
-
-			if (this.startSystems.ContainsKey(type))
-			{
-				this.starts.Enqueue(component.InstanceId);
-			}
-
-			if (this.lateUpdateSystems.ContainsKey(type))
-			{
-				this.lateUpdates.Enqueue(component.InstanceId);
-			}
-		}
-
-		public void Remove(long instanceId)
-		{
-			this.allComponents.Remove(instanceId);
-		}
-
-		public Entity Get(long instanceId)
-		{
-			Entity component = null;
-			this.allComponents.TryGetValue(instanceId, out component);
-			return component;
-		}
-		
-		public bool IsRegister(long instanceId)
-		{
-			return this.allComponents.ContainsKey(instanceId);
-		}
-		
-		public void Deserialize(Entity component)
-		{
-			List<IDeserializeSystem> iDeserializeSystems = this.deserializeSystems[component.GetType()];
-			if (iDeserializeSystems == null)
-			{
-				return;
-			}
-
-			foreach (IDeserializeSystem deserializeSystem in iDeserializeSystems)
-			{
-				if (deserializeSystem == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					deserializeSystem.Run(component);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Awake(Entity component)
-		{
-			List<IAwakeSystem> iAwakeSystems = this.awakeSystems[component.GetType()];
-			if (iAwakeSystems == null)
-			{
-				return;
-			}
-
-			foreach (IAwakeSystem aAwakeSystem in iAwakeSystems)
-			{
-				if (aAwakeSystem == null)
-				{
-					continue;
-				}
-				
-				IAwake iAwake = aAwakeSystem as IAwake;
-				if (iAwake == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					iAwake.Run(component);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Awake<P1>(Entity component, P1 p1)
-		{
-			List<IAwakeSystem> iAwakeSystems = this.awakeSystems[component.GetType()];
-			if (iAwakeSystems == null)
-			{
-				return;
-			}
-
-			foreach (IAwakeSystem aAwakeSystem in iAwakeSystems)
-			{
-				if (aAwakeSystem == null)
-				{
-					continue;
-				}
-				
-				IAwake<P1> iAwake = aAwakeSystem as IAwake<P1>;
-				if (iAwake == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					iAwake.Run(component, p1);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Awake<P1, P2>(Entity component, P1 p1, P2 p2)
-		{
-			List<IAwakeSystem> iAwakeSystems = this.awakeSystems[component.GetType()];
-			if (iAwakeSystems == null)
-			{
-				return;
-			}
-
-			foreach (IAwakeSystem aAwakeSystem in iAwakeSystems)
-			{
-				if (aAwakeSystem == null)
-				{
-					continue;
-				}
-				
-				IAwake<P1, P2> iAwake = aAwakeSystem as IAwake<P1, P2>;
-				if (iAwake == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					iAwake.Run(component, p1, p2);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Awake<P1, P2, P3>(Entity component, P1 p1, P2 p2, P3 p3)
-		{
-			List<IAwakeSystem> iAwakeSystems = this.awakeSystems[component.GetType()];
-			if (iAwakeSystems == null)
-			{
-				return;
-			}
-
-			foreach (IAwakeSystem aAwakeSystem in iAwakeSystems)
-			{
-				if (aAwakeSystem == null)
-				{
-					continue;
-				}
-
-				IAwake<P1, P2, P3> iAwake = aAwakeSystem as IAwake<P1, P2, P3>;
-				if (iAwake == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					iAwake.Run(component, p1, p2, p3);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-        public void Awake<P1, P2, P3, P4>(Entity component, P1 p1, P2 p2, P3 p3, P4 p4)
-        {
-            List<IAwakeSystem> iAwakeSystems = this.awakeSystems[component.GetType()];
-            if (iAwakeSystems == null)
-            {
-                return;
-            }
-
-            foreach (IAwakeSystem aAwakeSystem in iAwakeSystems)
-            {
-                if (aAwakeSystem == null)
-                {
-                    continue;
-                }
-
-                IAwake<P1, P2, P3, P4> iAwake = aAwakeSystem as IAwake<P1, P2, P3, P4>;
-                if (iAwake == null)
-                {
-                    continue;
-                }
-
-                try
-                {
-                    iAwake.Run(component, p1, p2, p3, p4);
-                }
-                catch (Exception e)
-                {
-                    Log.Error(e);
-                }
-            }
-        }
-
-        public void Change(Entity component)
-		{
-			List<IChangeSystem> iChangeSystems = this.changeSystems[component.GetType()];
-			if (iChangeSystems == null)
-			{
-				return;
-			}
-
-			foreach (IChangeSystem iChangeSystem in iChangeSystems)
-			{
-				if (iChangeSystem == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					iChangeSystem.Run(component);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Load()
-		{
-			while (this.loaders.Count > 0)
-			{
-				long instanceId = this.loaders.Dequeue();
-				Entity component;
-				if (!this.allComponents.TryGetValue(instanceId, out component))
-				{
-					continue;
-				}
-				if (component.IsDisposed)
-				{
-					continue;
-				}
-				
-				List<ILoadSystem> iLoadSystems = this.loadSystems[component.GetType()];
-				if (iLoadSystems == null)
-				{
-					continue;
-				}
-				
-				this.loaders2.Enqueue(instanceId);
-
-				foreach (ILoadSystem iLoadSystem in iLoadSystems)
-				{
-					try
-					{
-						iLoadSystem.Run(component);
-					}
-					catch (Exception e)
-					{
-						Log.Error(e);
-					}
-				}
-			}
-
-			ObjectHelper.Swap(ref this.loaders, ref this.loaders2);
-		}
-
-		private void Start()
-		{
-			while (this.starts.Count > 0)
-			{
-				long instanceId = this.starts.Dequeue();
-				Entity component;
-				if (!this.allComponents.TryGetValue(instanceId, out component))
-				{
-					continue;
-				}
-
-				List<IStartSystem> iStartSystems = this.startSystems[component.GetType()];
-				if (iStartSystems == null)
-				{
-					continue;
-				}
-				
-				foreach (IStartSystem iStartSystem in iStartSystems)
-				{
-					try
-					{
-						iStartSystem.Run(component);
-					}
-					catch (Exception e)
-					{
-						Log.Error(e);
-					}
-				}
-			}
-		}
-
-		public void Destroy(Entity component)
-		{
-			List<IDestroySystem> iDestroySystems = this.destroySystems[component.GetType()];
-			if (iDestroySystems == null)
-			{
-				return;
-			}
-
-			foreach (IDestroySystem iDestroySystem in iDestroySystems)
-			{
-				if (iDestroySystem == null)
-				{
-					continue;
-				}
-
-				try
-				{
-					iDestroySystem.Run(component);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Update()
-		{
-			this.Start();
-			
-			while (this.updates.Count > 0)
-			{
-				long instanceId = this.updates.Dequeue();
-				Entity component;
-				if (!this.allComponents.TryGetValue(instanceId, out component))
-				{
-					continue;
-				}
-				if (component.IsDisposed)
-				{
-					continue;
-				}
-				
-				List<IUpdateSystem> iUpdateSystems = this.updateSystems[component.GetType()];
-				if (iUpdateSystems == null)
-				{
-					continue;
-				}
-
-				this.updates2.Enqueue(instanceId);
-
-				foreach (IUpdateSystem iUpdateSystem in iUpdateSystems)
-				{
-					try
-					{
-						iUpdateSystem.Run(component);
-					}
-					catch (Exception e)
-					{
-						Log.Error(e);
-					}
-				}
-			}
-
-			ObjectHelper.Swap(ref this.updates, ref this.updates2);
-		}
-
-		public void LateUpdate()
-		{
-			while (this.lateUpdates.Count > 0)
-			{
-				long instanceId = this.lateUpdates.Dequeue();
-				Entity component;
-				if (!this.allComponents.TryGetValue(instanceId, out component))
-				{
-					continue;
-				}
-				if (component.IsDisposed)
-				{
-					continue;
-				}
-
-				List<ILateUpdateSystem> iLateUpdateSystems = this.lateUpdateSystems[component.GetType()];
-				if (iLateUpdateSystems == null)
-				{
-					continue;
-				}
-
-				this.lateUpdates2.Enqueue(instanceId);
-
-				foreach (ILateUpdateSystem iLateUpdateSystem in iLateUpdateSystems)
-				{
-					try
-					{
-						iLateUpdateSystem.Run(component);
-					}
-					catch (Exception e)
-					{
-						Log.Error(e);
-					}
-				}
-			}
-
-			ObjectHelper.Swap(ref this.lateUpdates, ref this.lateUpdates2);
-		}
-
-		public void Run(string type)
-		{
-			List<object> iEvents;
-			if (!this.allEvents.TryGetValue(type, out iEvents))
-			{
-				return;
-			}
-			foreach (AEvent aEvent in iEvents)
-			{
-				try
-				{
-					aEvent.Run();
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Run<A>(string type, A a)
-		{
-			List<object> iEvents;
-			if (!this.allEvents.TryGetValue(type, out iEvents))
-			{
-				return;
-			}
-			foreach (AEvent<A> aEvent in iEvents)
-			{
-				try
-				{
-					aEvent?.Run(a);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Run<A, B>(string type, A a, B b)
-		{
-			List<object> iEvents;
-			if (!this.allEvents.TryGetValue(type, out iEvents))
-			{
-				return;
-			}
-			foreach (AEvent<A, B> aEvent in iEvents)
-			{
-				try
-				{
-					aEvent.Run(a, b);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public void Run<A, B, C>(string type, A a, B b, C c)
-		{
-			List<object> iEvents;
-			if (!this.allEvents.TryGetValue(type, out iEvents))
-			{
-				return;
-			}
-			foreach (AEvent<A, B, C> aEvent in iEvents)
-			{
-				try
-				{
-					aEvent.Run(a, b, c);
-				}
-				catch (Exception e)
-				{
-					Log.Error(e);
-				}
-			}
-		}
-
-		public override string ToString()
-		{
-			StringBuilder sb = new StringBuilder();
-			HashSet<Type> noParent = new HashSet<Type>();
-			Dictionary<Type, int> typeCount = new Dictionary<Type, int>();
-			
-			HashSet<Type> noDomain = new HashSet<Type>();
-			
-			foreach (var kv in this.allComponents)
-			{
-				Type type = kv.Value.GetType();
-				if (kv.Value.Parent == null)
-				{
-					noParent.Add(type);
-				}
-				
-				if (kv.Value.Domain == null)
-				{
-					noDomain.Add(type);
-				}
-				
-				if (typeCount.ContainsKey(type))
-				{
-					typeCount[type]++;
-				}
-				else
-				{
-					typeCount[type] = 1;
-				}
-			}
-
-			sb.AppendLine("not set parent type: ");
-			foreach (Type type in noParent)
-			{
-				sb.AppendLine($"\t{type.Name}");	
-			}
-			
-			sb.AppendLine("not set domain type: ");
-			foreach (Type type in noDomain)
-			{
-				sb.AppendLine($"\t{type.Name}");	
-			}
-
-			IOrderedEnumerable<KeyValuePair<Type, int>> orderByDescending = typeCount.OrderByDescending(s => s.Value);
-			
-			sb.AppendLine("Entity Count: ");
-			foreach (var kv in orderByDescending)
-			{
-				if (kv.Value == 1)
-				{
-					continue;
-				}
-				sb.AppendLine($"\t{kv.Key.Name}: {kv.Value}");
-			}
-
-			return sb.ToString();
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Object/EventSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c14736bcd1c414343ba1f641e8b49d24
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/IAwakeSystem.cs

@@ -1,89 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface IAwakeSystem
-	{
-		Type Type();
-	}
-
-	public interface IAwake
-	{
-		void Run(object o);
-	}
-	
-	public interface IAwake<A>
-	{
-		void Run(object o, A a);
-	}
-	
-	public interface IAwake<A, B>
-	{
-		void Run(object o, A a, B b);
-	}
-	
-	public interface IAwake<A, B, C>
-	{
-		void Run(object o, A a, B b, C c);
-	}
-
-	public abstract class AwakeSystem<T> : IAwakeSystem, IAwake
-	{
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public void Run(object o)
-		{
-			this.Awake((T)o);
-		}
-
-		public abstract void Awake(T self);
-	}
-
-	public abstract class AwakeSystem<T, A> : IAwakeSystem, IAwake<A>
-	{
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public void Run(object o, A a)
-		{
-			this.Awake((T)o, a);
-		}
-
-		public abstract void Awake(T self, A a);
-	}
-
-	public abstract class AwakeSystem<T, A, B> : IAwakeSystem, IAwake<A, B>
-	{
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public void Run(object o, A a, B b)
-		{
-			this.Awake((T)o, a, b);
-		}
-
-		public abstract void Awake(T self, A a, B b);
-	}
-
-	public abstract class AwakeSystem<T, A, B, C> : IAwakeSystem, IAwake<A, B, C>
-	{
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public void Run(object o, A a, B b, C c)
-		{
-			this.Awake((T)o, a, b, c);
-		}
-
-		public abstract void Awake(T self, A a, B b, C c);
-	}
-}

Unity/Assets/Hotfix/Base/Object/IAwakeSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e443784a49d795e419c961a06ca9d77f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/IChangeSystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface IChangeSystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class ChangeSystem<T> : IChangeSystem
-	{
-		public void Run(object o)
-		{
-			this.Change((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void Change(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/IChangeSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 42f42a84140bc6e40a4f15a8a776fd9f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/IDeserializeSystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface IDeserializeSystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class DeserializeSystem<T> : IDeserializeSystem
-	{
-		public void Run(object o)
-		{
-			this.Deserialize((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void Deserialize(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/IDeserializeSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f3e96494042eb2445b639892a5a761af
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/IDestroySystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface IDestroySystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class DestroySystem<T> : IDestroySystem
-	{
-		public void Run(object o)
-		{
-			this.Destroy((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void Destroy(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/IDestroySystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5f6f4fcc01146734980248904ec6b718
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/ILateUpdateSystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface ILateUpdateSystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class LateUpdateSystem<T> : ILateUpdateSystem
-	{
-		public void Run(object o)
-		{
-			this.LateUpdate((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void LateUpdate(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/ILateUpdateSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 28ee4e0e85f6ebe4cba7f2e9641b810e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/ILoadSystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface ILoadSystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class LoadSystem<T> : ILoadSystem
-	{
-		public void Run(object o)
-		{
-			this.Load((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void Load(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/ILoadSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 54f66da55f7fd6d4baddafe5a2aca486
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/ISerializeToEntity.cs

@@ -1,6 +0,0 @@
-namespace ETHotfix
-{
-	public interface ISerializeToEntity
-	{
-	}
-}

Unity/Assets/Hotfix/Base/Object/ISerializeToEntity.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2a8e85aac06cc0647b9c3bed19f63a98
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/IStartSystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface IStartSystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class StartSystem<T> : IStartSystem
-	{
-		public void Run(object o)
-		{
-			this.Start((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void Start(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/IStartSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 42bd58ac809b44d42b22c62ae42b7a1b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/IUpdateSystem.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace ETHotfix
-{
-	public interface IUpdateSystem
-	{
-		Type Type();
-		void Run(object o);
-	}
-
-	public abstract class UpdateSystem<T> : IUpdateSystem
-	{
-		public void Run(object o)
-		{
-			this.Update((T)o);
-		}
-
-		public Type Type()
-		{
-			return typeof(T);
-		}
-
-		public abstract void Update(T self);
-	}
-}

Unity/Assets/Hotfix/Base/Object/IUpdateSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7a73c3b31bae6f24292e7fedc5139461
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Base/Object/Object.cs

@@ -1,29 +0,0 @@
-namespace ETHotfix
-{
-	public interface IDisposable
-	{
-		void Dispose();
-	}
-
-	public interface ISupportInitialize
-	{
-		void BeginInit();
-		void EndInit();
-	}
-
-	public abstract class Object: ISupportInitialize
-	{
-		public virtual void BeginInit()
-		{
-		}
-
-		public virtual void EndInit()
-		{
-		}
-
-		public override string ToString()
-		{
-			return JsonHelper.ToJson(this);
-		}
-	}
-}

Unity/Assets/Hotfix/Base/Object/Object.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3dd57844f3c0abc419d98a2609816055
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,373 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using ETModel;
-using UnityEngine;
-
-namespace ETHotfix
-{
-	public class ComponentQueue: IDisposable
-	{
-		public long Id;
-#if !SERVER
-		public static GameObject Global { get; } = GameObject.Find("/Global");
-		
-		public GameObject ViewGO { get; set; }
-#endif
-		
-		public string TypeName { get; }
-		
-		private readonly Queue<Entity> queue = new Queue<Entity>();
-
-		public ComponentQueue(string typeName)
-		{
-			this.Id = IdGenerater.GenerateId();
-			this.TypeName = typeName;
-#if !SERVER
-			this.ViewGO = new GameObject();
-			this.ViewGO.name = this.GetType().Name;
-			this.ViewGO.layer = LayerNames.GetLayerInt(LayerNames.HIDDEN);
-			this.ViewGO.transform.SetParent(Global.transform, false);
-			this.ViewGO.AddComponent<ComponentView>().Component = this;
-#endif
-		}
-
-		public void Enqueue(Entity entity)
-		{
-			this.queue.Enqueue(entity);
-		}
-
-		public Entity Dequeue()
-		{
-			return this.queue.Dequeue();
-		}
-
-		public Entity Peek()
-		{
-			return this.queue.Peek();
-		}
-
-		public Queue<Entity> Queue
-		{
-			get
-			{
-				return this.queue;
-			}
-		}
-
-		public int Count
-		{
-			get
-			{
-				return this.queue.Count;
-			}
-		}
-
-		public void Dispose()
-		{
-			while (this.queue.Count > 0)
-			{
-				Entity component = this.queue.Dequeue();
-				component.Dispose();
-			}
-		}
-	}
-	
-    public class ObjectPool: IDisposable
-    {
-#if !SERVER
-		public static GameObject Global { get; } = GameObject.Find("/Global");
-		
-		public GameObject ViewGO { get; set; }
-#endif
-	    
-	    public string Name { get; set; }
-	    
-        private readonly Dictionary<Type, ComponentQueue> dictionary = new Dictionary<Type, ComponentQueue>();
-
-        public ObjectPool()
-        {
-#if !SERVER
-			this.ViewGO = new GameObject();
-			this.ViewGO.name = this.GetType().Name;
-			this.ViewGO.layer = LayerNames.GetLayerInt(LayerNames.HIDDEN);
-			this.ViewGO.transform.SetParent(Global.transform, false);
-			this.ViewGO.AddComponent<ComponentView>().Component = this;
-#endif
-        }
-
-        public Entity Fetch(Type type)
-        {
-	        Entity obj;
-            if (!this.dictionary.TryGetValue(type, out ComponentQueue queue))
-            {
-	            obj = (Entity)Activator.CreateInstance(type);
-            }
-	        else if (queue.Count == 0)
-            {
-	            obj = (Entity)Activator.CreateInstance(type);
-            }
-            else
-            {
-	            obj = queue.Dequeue();
-            }
-	        
-	        obj.IsFromPool = true;
-            return obj;
-        }
-
-        public T Fetch<T>() where T: Entity
-		{
-            T t = (T) this.Fetch(typeof(T));
-			return t;
-		}
-        
-        public void Recycle(Entity obj)
-        {
-            Type type = obj.GetType();
-	        ComponentQueue queue;
-            if (!this.dictionary.TryGetValue(type, out queue))
-            {
-                queue = new ComponentQueue(type.Name);
-	            
-#if !SERVER
-	            if (queue.ViewGO != null)
-	            {
-		            queue.ViewGO.transform.SetParent(this.ViewGO.transform);
-		            queue.ViewGO.name = $"{type.Name}s";
-	            }
-#endif
-				this.dictionary.Add(type, queue);
-            }
-            
-#if !SERVER
-	        if (obj.ViewGO != null)
-	        {
-		        obj.ViewGO.transform.SetParent(queue.ViewGO.transform);
-	        }
-#endif
-	        obj.Id = 0;
-            queue.Enqueue(obj);
-        }
-
-	    public void Dispose()
-	    {
-		    foreach (var kv in this.dictionary)
-		    {
-			    kv.Value.Dispose();
-		    }
-		    this.dictionary.Clear();
-	    }
-	    
-	    public override string ToString()
-	    {
-		    StringBuilder sb = new StringBuilder();
-		    Dictionary<Type, int> typeCount = new Dictionary<Type, int>();
-		    foreach (var kv in this.dictionary)
-		    { 
-			    typeCount[kv.Key] = kv.Value.Count;
-		    }
-
-		    IOrderedEnumerable<KeyValuePair<Type, int>> orderByDescending = typeCount.OrderByDescending(s => s.Value);
-			
-		    sb.AppendLine("ObjectPool Count: ");
-		    foreach (var kv in orderByDescending)
-		    {
-			    if (kv.Value == 1)
-			    {
-				    continue;
-			    }
-			    sb.AppendLine($"\t{kv.Key.Name}: {kv.Value}");
-		    }
-
-		    MultiMapSet<string, string> dict = Check();
-		    
-		    sb.Append("not reset field:\n");
-		    foreach (KeyValuePair<string,HashSet<string>> pair in dict.GetDictionary())
-		    {
-			    sb.Append(pair.Key + ": ");
-			    foreach (string value in pair.Value)
-			    {
-				    sb.Append(value + ", ");
-			    }
-			    sb.Append("\n");
-		    }
-
-		    return sb.ToString();
-	    }
-
-	    public void LogErrorCheckResult()
-	    {
-		    MultiMapSet<string, string> dict = Check();
-		    if (dict.Count == 0)
-		    {
-			    return;
-		    }
-		    StringBuilder sb = new StringBuilder();
-		    sb.Append("not reset field:\n");
-		    foreach (KeyValuePair<string,HashSet<string>> pair in dict.GetDictionary())
-		    {
-			    sb.Append(pair.Key + ": ");
-			    foreach (string value in pair.Value)
-			    {
-				    sb.Append(value + ", ");
-			    }
-			    sb.Append("\n");
-		    }
-		    Log.Error(sb.ToString());
-	    }
-
-	    public MultiMapSet<string, string> Check()
-	    {
-		    MultiMapSet<string, string> dict = new MultiMapSet<string, string>();
-		    foreach (ComponentQueue queue in this.dictionary.Values)
-		    {
-			    foreach (Entity entity in queue.Queue)
-			    {
-				    Type type = entity.GetType();
-				    
-#if SERVER
-				    if (type.IsSubclassOf(typeof (LogDefine)))
-				    {
-					    continue;
-				    }
-#endif
-				    
-				    FieldInfo[] fieldInfos = type.GetFields();
-				    foreach (FieldInfo fieldInfo in fieldInfos)
-				    {
-					    if (fieldInfo.IsLiteral)
-					    {
-						    continue;
-					    }
-
-					    if (fieldInfo.GetCustomAttributes(typeof (NoMemoryCheck)).Count() > 0)
-					    {
-						    continue;
-					    }
-					    
-					    Type fieldType = fieldInfo.FieldType;
-					    if (fieldType == typeof (int))
-					    {
-						    if ((int) fieldInfo.GetValue(entity) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (uint))
-					    {
-						    if ((uint) fieldInfo.GetValue(entity) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (long))
-					    {
-						    if ((long) fieldInfo.GetValue(entity) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (ulong))
-					    {
-						    if ((ulong) fieldInfo.GetValue(entity) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (short))
-					    {
-						    if ((short) fieldInfo.GetValue(entity) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (ushort))
-					    {
-						    if ((ushort) fieldInfo.GetValue(entity) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (float))
-					    {
-						    if (Math.Abs((float)fieldInfo.GetValue(entity)) > 0.0001)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (double))
-					    {
-						    if (Math.Abs((double)fieldInfo.GetValue(entity)) > 0.0001)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (fieldType == typeof (bool))
-					    {
-						    if ((bool) fieldInfo.GetValue(entity) != false)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-					    
-					    if (typeof(ICollection).IsAssignableFrom(fieldType))
-					    {
-						    object fieldValue = fieldInfo.GetValue(entity);
-						    if (fieldValue == null)
-						    {
-							    continue;
-						    }
-						    if (((ICollection)fieldValue).Count != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-
-					    PropertyInfo propertyInfo = fieldType.GetProperty("Count");
-					    if (propertyInfo != null)
-					    {
-						    if ((int) propertyInfo.GetValue(fieldInfo.GetValue(entity)) != 0)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-
-					    if (fieldType.IsClass)
-					    {
-						    if (fieldInfo.GetValue(entity) != null)
-						    {
-							    dict.Add(type.Name, fieldInfo.Name);
-						    }
-						    continue;
-					    }
-				    }
-			    }
-		    }
-
-		    return dict;
-	    }
-    }
-}

Unity/Assets/Hotfix/Base/Object/ObjectPool.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f9e092aa1d82fb145ba5bb4ab80220c0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Entity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ce148fd41ef597f448d8f59df8d6f581
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Entity/Game.cs

@@ -1,58 +0,0 @@
-using UnityEngine;
-
-namespace ETHotfix
-{
-	public static class Game
-	{
-		private static EventSystem eventSystem;
-
-		public static EventSystem EventSystem
-		{
-			get
-			{
-				return eventSystem ?? (eventSystem = new EventSystem());
-			}
-		}
-		
-		private static Scene scene;
-
-		public static Scene Scene
-		{
-			get
-			{
-				if (scene != null)
-				{
-					return scene;
-				}
-				scene = new Scene() { Name = "ClientH" };
-				return scene;
-			}
-		}
-
-		private static ObjectPool objectPool;
-
-		public static ObjectPool ObjectPool
-		{
-			get
-			{
-				if (objectPool != null)
-				{
-					return objectPool;
-				}
-				objectPool = new ObjectPool() { Name = "ClientH" };
-				return objectPool;
-			}
-		}
-
-		public static void Close()
-		{
-			scene?.Dispose();
-			scene = null;
-			
-			objectPool?.Dispose();
-			objectPool = null;
-			
-			eventSystem = null;
-		}
-	}
-}

Unity/Assets/Hotfix/Entity/Game.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6e09ac15182253a4b9ea9921731125a8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Entity/Scene.cs

@@ -1,41 +0,0 @@
-using ETModel;
-
-namespace ETHotfix
-{
-	public sealed class Scene: Entity
-	{
-		public SceneType SceneType { get; set; }
-		public string Name { get; set; }
-
-		public new Entity Domain
-		{
-			get
-			{
-				return this.domain;
-			}
-			set
-			{
-				this.domain = value;
-			}
-		}
-
-		public new Entity Parent
-		{
-			get
-			{
-				return this.parent;
-			}
-			set
-			{
-				this.parent = value;
-				this.parent.Children.Add(this.Id, this);
-#if !SERVER
-				if (this.ViewGO != null && this.parent.ViewGO != null)
-				{
-					this.ViewGO.transform.SetParent(this.parent.ViewGO.transform, false);
-				}
-#endif
-			}
-		}
-	}
-}

Unity/Assets/Hotfix/Entity/Scene.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: cc53bf1b1d3d3ba4c953ecadc273e3d0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Init.cs

@@ -1,78 +0,0 @@
-using System;
-using ETModel;
-
-namespace ETHotfix
-{
-	public static class Init
-	{
-		public static void Start()
-		{
-#if ILRuntime
-			if (!Define.IsILRuntime)
-			{
-				Log.Error("mono层是mono模式, 但是Hotfix层是ILRuntime模式");
-			}
-#else
-			if (Define.IsILRuntime)
-			{
-				Log.Error("mono层是ILRuntime模式, Hotfix层是mono模式");
-			}
-#endif
-			
-			try
-			{
-				// 注册热更层回调
-				ETModel.Game.Hotfix.Update = () => { Update(); };
-				ETModel.Game.Hotfix.LateUpdate = () => { LateUpdate(); };
-				ETModel.Game.Hotfix.OnApplicationQuit = () => { OnApplicationQuit(); };
-				
-				Game.Scene.AddComponent<UIComponent>();
-				Game.Scene.AddComponent<OpcodeTypeComponent>();
-				Game.Scene.AddComponent<MessageDispatcherComponent>();
-
-				// 加载热更配置
-				ETModel.Game.Scene.GetComponent<ResourcesComponent>().LoadBundle("config.unity3d");
-				Game.Scene.AddComponent<ConfigComponent>();
-				ETModel.Game.Scene.GetComponent<ResourcesComponent>().UnloadBundle("config.unity3d");
-
-				UnitConfig unitConfig = (UnitConfig)Game.Scene.GetComponent<ConfigComponent>().Get(typeof(UnitConfig), 1001);
-				Log.Debug($"config {JsonHelper.ToJson(unitConfig)}");
-
-				Game.EventSystem.Run(EventIdType.InitSceneStart);
-			}
-			catch (Exception e)
-			{
-				Log.Error(e);
-			}
-		}
-
-		public static void Update()
-		{
-			try
-			{
-				Game.EventSystem.Update();
-			}
-			catch (Exception e)
-			{
-				Log.Error(e);
-			}
-		}
-
-		public static void LateUpdate()
-		{
-			try
-			{
-				Game.EventSystem.LateUpdate();
-			}
-			catch (Exception e)
-			{
-				Log.Error(e);
-			}
-		}
-
-		public static void OnApplicationQuit()
-		{
-			Game.Close();
-		}
-	}
-}

Unity/Assets/Hotfix/Init.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3e3d9517be262a747aa77f82dd3d98f0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Hotfix/Module/Actor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 85ae3703f8c933a4290c3b7b7e023dfe
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: