Răsfoiți Sursa

Entity应该加上IPool接口,优化下对象池的使用

tanghai 2 ani în urmă
părinte
comite
04eee365db
23 a modificat fișierele cu 277 adăugiri și 236 ștergeri
  1. 1 1
      Share/Tool/Proto2CS/Proto2CS.cs
  2. 8 2
      Unity/Assets/Plugins/CommandLine.dll.meta
  3. 37 4
      Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll.meta
  4. 2 2
      Unity/Assets/Plugins/NLog.dll.meta
  5. 3 16
      Unity/Assets/Scripts/Core/Entity/Entity.cs
  6. 4 2
      Unity/Assets/Scripts/Core/HashSetComponent.cs
  7. 4 0
      Unity/Assets/Scripts/Core/ListComponent.cs
  8. 6 1
      Unity/Assets/Scripts/Core/World/Module/ObjectPool/ObjectPool.cs
  9. 2 2
      Unity/Assets/Scripts/Model/Generate/Client/Message/ClientMessage_C_1000.cs
  10. 12 12
      Unity/Assets/Scripts/Model/Generate/Client/Message/LockStepOuter_C_11001.cs
  11. 34 34
      Unity/Assets/Scripts/Model/Generate/Client/Message/OuterMessage_C_10001.cs
  12. 2 2
      Unity/Assets/Scripts/Model/Generate/ClientServer/Message/ClientMessage_C_1000.cs
  13. 23 23
      Unity/Assets/Scripts/Model/Generate/ClientServer/Message/InnerMessage_S_20001.cs
  14. 8 8
      Unity/Assets/Scripts/Model/Generate/ClientServer/Message/LockStepInner_S_21001.cs
  15. 12 12
      Unity/Assets/Scripts/Model/Generate/ClientServer/Message/LockStepOuter_C_11001.cs
  16. 34 34
      Unity/Assets/Scripts/Model/Generate/ClientServer/Message/OuterMessage_C_10001.cs
  17. 2 2
      Unity/Assets/Scripts/Model/Generate/Server/Message/ClientMessage_C_1000.cs
  18. 23 23
      Unity/Assets/Scripts/Model/Generate/Server/Message/InnerMessage_S_20001.cs
  19. 8 8
      Unity/Assets/Scripts/Model/Generate/Server/Message/LockStepInner_S_21001.cs
  20. 12 12
      Unity/Assets/Scripts/Model/Generate/Server/Message/LockStepOuter_C_11001.cs
  21. 34 34
      Unity/Assets/Scripts/Model/Generate/Server/Message/OuterMessage_C_10001.cs
  22. 5 1
      Unity/Assets/Scripts/Model/Share/Entry.cs
  23. 1 1
      Unity/Assets/Scripts/Model/Share/LockStep/LSEntity.cs

+ 1 - 1
Share/Tool/Proto2CS/Proto2CS.cs

@@ -149,7 +149,7 @@ namespace ET
                         sbDispose.Clear();
                         sb.Append("\t{\n");
                         
-                        sb.Append($"\t\tpublic static {msgName} Create(bool isFromPool = true) \n\t\t{{ \n\t\t\treturn !isFromPool? new {msgName}() : ObjectPool.Instance.Fetch(typeof({msgName})) as {msgName}; \n\t\t}}\n\n");
+                        sb.Append($"\t\tpublic static {msgName} Create(bool isFromPool = true) \n\t\t{{ \n\t\t\treturn ObjectPool.Instance.Fetch(typeof({msgName}), isFromPool) as {msgName}; \n\t\t}}\n\n");
                         
                         continue;
                     }

+ 8 - 2
Unity/Assets/Plugins/CommandLine.dll.meta

@@ -20,6 +20,7 @@ PluginImporter:
         Exclude Editor: 0
         Exclude Linux64: 0
         Exclude OSXUniversal: 0
+        Exclude WebGL: 0
         Exclude Win: 0
         Exclude Win64: 0
         Exclude iOS: 0
@@ -47,13 +48,13 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        CPU: x86_64
+        CPU: AnyCPU
   - first:
       Standalone: OSXUniversal
     second:
       enabled: 1
       settings:
-        CPU: None
+        CPU: AnyCPU
   - first:
       Standalone: Win
     second:
@@ -66,6 +67,11 @@ PluginImporter:
       enabled: 1
       settings:
         CPU: x86_64
+  - first:
+      WebGL: WebGL
+    second:
+      enabled: 1
+      settings: {}
   - first:
       Windows Store Apps: WindowsStoreApps
     second:

+ 37 - 4
Unity/Assets/Plugins/ICSharpCode.SharpZipLib.dll.meta

@@ -11,6 +11,19 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 0
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude WebGL: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude iOS: 0
   - first:
       : Linux
     second:
@@ -35,6 +48,12 @@ PluginImporter:
       enabled: 0
       settings:
         CPU: AnyCPU
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -43,7 +62,7 @@ PluginImporter:
   - first:
       Editor: Editor
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
@@ -51,15 +70,15 @@ PluginImporter:
   - first:
       Standalone: Linux64
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: AnyCPU
   - first:
       Standalone: OSXUniversal
     second:
-      enabled: 0
+      enabled: 1
       settings:
-        CPU: None
+        CPU: AnyCPU
   - first:
       Standalone: Win
     second:
@@ -72,12 +91,26 @@ PluginImporter:
       enabled: 1
       settings:
         CPU: AnyCPU
+  - first:
+      WebGL: WebGL
+    second:
+      enabled: 1
+      settings: {}
   - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0
       settings:
         CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 2 - 2
Unity/Assets/Plugins/NLog.dll.meta

@@ -48,13 +48,13 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        CPU: x86_64
+        CPU: AnyCPU
   - first:
       Standalone: OSXUniversal
     second:
       enabled: 1
       settings:
-        CPU: None
+        CPU: AnyCPU
   - first:
       Standalone: Win
     second:

+ 3 - 16
Unity/Assets/Scripts/Core/Entity/Entity.cs

@@ -15,7 +15,7 @@ namespace ET
         IsNew = 1 << 4,
     }
 
-    public partial class Entity: DisposeObject
+    public abstract partial class Entity: DisposeObject, IPool
     {
 #if ENABLE_VIEW && UNITY_EDITOR
         [BsonIgnore]
@@ -524,10 +524,7 @@ namespace ET
             
             status = EntityStatus.None;
 
-            if (this.IsFromPool)
-            {
-                ObjectPool.Instance.Recycle(this);
-            }
+            ObjectPool.Instance.Recycle(this);
         }
 
         private void AddToComponents(Entity component)
@@ -693,17 +690,7 @@ namespace ET
 
         private static Entity Create(Type type, bool isFromPool)
         {
-            Entity component;
-            if (isFromPool)
-            {
-                component = (Entity) ObjectPool.Instance.Fetch(type);
-            }
-            else
-            {
-                component = Activator.CreateInstance(type) as Entity;
-            }
-
-            component.IsFromPool = isFromPool;
+            Entity component = (Entity) ObjectPool.Instance.Fetch(type, isFromPool);
             component.IsCreated = true;
             component.IsNew = true;
             component.Id = 0;

+ 4 - 2
Unity/Assets/Scripts/Core/HashSetComponent.cs

@@ -16,10 +16,12 @@ namespace ET
 
         public void Dispose()
         {
+            if (this.Count > 64) // 超过64,让gc回收
+            {
+                return;
+            }
             this.Clear();
             ObjectPool.Instance.Recycle(this);
         }
-
-        public bool IsFromPool { get; set; }
     }
 }

+ 4 - 0
Unity/Assets/Scripts/Core/ListComponent.cs

@@ -16,6 +16,10 @@ namespace ET
 
         public void Dispose()
         {
+            if (this.Count > 64) // 超过64,让gc回收
+            {
+                return;
+            }
             this.Clear();
             ObjectPool.Instance.Recycle(this);
         }

+ 6 - 1
Unity/Assets/Scripts/Core/World/Module/ObjectPool/ObjectPool.cs

@@ -24,8 +24,13 @@ namespace ET
             return this.Fetch(typeof (T)) as T;
         }
 
-        public object Fetch(Type type)
+        public object Fetch(Type type, bool isFromPool = true)
         {
+            if (!isFromPool)
+            {
+                return Activator.CreateInstance(type);
+            }
+            
             Pool pool = GetPool(type);
             object obj = pool.Get();
             if (obj is IPool p)

+ 2 - 2
Unity/Assets/Scripts/Model/Generate/Client/Message/ClientMessage_C_1000.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static Main2NetClient_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Main2NetClient_Login() : ObjectPool.Instance.Fetch(typeof(Main2NetClient_Login)) as Main2NetClient_Login; 
+			return ObjectPool.Instance.Fetch(typeof(Main2NetClient_Login), isFromPool) as Main2NetClient_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -45,7 +45,7 @@ namespace ET
 	{
 		public static NetClient2Main_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new NetClient2Main_Login() : ObjectPool.Instance.Fetch(typeof(NetClient2Main_Login)) as NetClient2Main_Login; 
+			return ObjectPool.Instance.Fetch(typeof(NetClient2Main_Login), isFromPool) as NetClient2Main_Login; 
 		}
 
 		[MemoryPackOrder(0)]

+ 12 - 12
Unity/Assets/Scripts/Model/Generate/Client/Message/LockStepOuter_C_11001.cs

@@ -10,7 +10,7 @@ namespace ET
 	{
 		public static C2G_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Match() : ObjectPool.Instance.Fetch(typeof(C2G_Match)) as C2G_Match; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Match), isFromPool) as C2G_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -32,7 +32,7 @@ namespace ET
 	{
 		public static G2C_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Match() : ObjectPool.Instance.Fetch(typeof(G2C_Match)) as G2C_Match; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Match), isFromPool) as G2C_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -63,7 +63,7 @@ namespace ET
 	{
 		public static Match2G_NotifyMatchSuccess Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2G_NotifyMatchSuccess() : ObjectPool.Instance.Fetch(typeof(Match2G_NotifyMatchSuccess)) as Match2G_NotifyMatchSuccess; 
+			return ObjectPool.Instance.Fetch(typeof(Match2G_NotifyMatchSuccess), isFromPool) as Match2G_NotifyMatchSuccess; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -91,7 +91,7 @@ namespace ET
 	{
 		public static C2Room_ChangeSceneFinish Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2Room_ChangeSceneFinish() : ObjectPool.Instance.Fetch(typeof(C2Room_ChangeSceneFinish)) as C2Room_ChangeSceneFinish; 
+			return ObjectPool.Instance.Fetch(typeof(C2Room_ChangeSceneFinish), isFromPool) as C2Room_ChangeSceneFinish; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -113,7 +113,7 @@ namespace ET
 	{
 		public static LockStepUnitInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new LockStepUnitInfo() : ObjectPool.Instance.Fetch(typeof(LockStepUnitInfo)) as LockStepUnitInfo; 
+			return ObjectPool.Instance.Fetch(typeof(LockStepUnitInfo), isFromPool) as LockStepUnitInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -144,7 +144,7 @@ namespace ET
 	{
 		public static Room2C_Start Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_Start() : ObjectPool.Instance.Fetch(typeof(Room2C_Start)) as Room2C_Start; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_Start), isFromPool) as Room2C_Start; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -170,7 +170,7 @@ namespace ET
 	{
 		public static FrameMessage Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new FrameMessage() : ObjectPool.Instance.Fetch(typeof(FrameMessage)) as FrameMessage; 
+			return ObjectPool.Instance.Fetch(typeof(FrameMessage), isFromPool) as FrameMessage; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -200,7 +200,7 @@ namespace ET
 	{
 		public static OneFrameInputs Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new OneFrameInputs() : ObjectPool.Instance.Fetch(typeof(OneFrameInputs)) as OneFrameInputs; 
+			return ObjectPool.Instance.Fetch(typeof(OneFrameInputs), isFromPool) as OneFrameInputs; 
 		}
 
 		[MongoDB.Bson.Serialization.Attributes.BsonDictionaryOptions(MongoDB.Bson.Serialization.Options.DictionaryRepresentation.ArrayOfArrays)]
@@ -222,7 +222,7 @@ namespace ET
 	{
 		public static Room2C_AdjustUpdateTime Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_AdjustUpdateTime() : ObjectPool.Instance.Fetch(typeof(Room2C_AdjustUpdateTime)) as Room2C_AdjustUpdateTime; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_AdjustUpdateTime), isFromPool) as Room2C_AdjustUpdateTime; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -244,7 +244,7 @@ namespace ET
 	{
 		public static C2Room_CheckHash Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2Room_CheckHash() : ObjectPool.Instance.Fetch(typeof(C2Room_CheckHash)) as C2Room_CheckHash; 
+			return ObjectPool.Instance.Fetch(typeof(C2Room_CheckHash), isFromPool) as C2Room_CheckHash; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -274,7 +274,7 @@ namespace ET
 	{
 		public static Room2C_CheckHashFail Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_CheckHashFail() : ObjectPool.Instance.Fetch(typeof(Room2C_CheckHashFail)) as Room2C_CheckHashFail; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_CheckHashFail), isFromPool) as Room2C_CheckHashFail; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -300,7 +300,7 @@ namespace ET
 	{
 		public static G2C_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Reconnect() : ObjectPool.Instance.Fetch(typeof(G2C_Reconnect)) as G2C_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Reconnect), isFromPool) as G2C_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]

+ 34 - 34
Unity/Assets/Scripts/Model/Generate/Client/Message/OuterMessage_C_10001.cs

@@ -9,7 +9,7 @@ namespace ET
 	{
 		public static HttpGetRouterResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new HttpGetRouterResponse() : ObjectPool.Instance.Fetch(typeof(HttpGetRouterResponse)) as HttpGetRouterResponse; 
+			return ObjectPool.Instance.Fetch(typeof(HttpGetRouterResponse), isFromPool) as HttpGetRouterResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -35,7 +35,7 @@ namespace ET
 	{
 		public static RouterSync Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new RouterSync() : ObjectPool.Instance.Fetch(typeof(RouterSync)) as RouterSync; 
+			return ObjectPool.Instance.Fetch(typeof(RouterSync), isFromPool) as RouterSync; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -62,7 +62,7 @@ namespace ET
 	{
 		public static C2M_TestRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRequest() : ObjectPool.Instance.Fetch(typeof(C2M_TestRequest)) as C2M_TestRequest; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRequest), isFromPool) as C2M_TestRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -88,7 +88,7 @@ namespace ET
 	{
 		public static M2C_TestResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestResponse() : ObjectPool.Instance.Fetch(typeof(M2C_TestResponse)) as M2C_TestResponse; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestResponse), isFromPool) as M2C_TestResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -123,7 +123,7 @@ namespace ET
 	{
 		public static C2G_EnterMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_EnterMap() : ObjectPool.Instance.Fetch(typeof(C2G_EnterMap)) as C2G_EnterMap; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_EnterMap), isFromPool) as C2G_EnterMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -145,7 +145,7 @@ namespace ET
 	{
 		public static G2C_EnterMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_EnterMap() : ObjectPool.Instance.Fetch(typeof(G2C_EnterMap)) as G2C_EnterMap; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_EnterMap), isFromPool) as G2C_EnterMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -180,7 +180,7 @@ namespace ET
 	{
 		public static MoveInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new MoveInfo() : ObjectPool.Instance.Fetch(typeof(MoveInfo)) as MoveInfo; 
+			return ObjectPool.Instance.Fetch(typeof(MoveInfo), isFromPool) as MoveInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -210,7 +210,7 @@ namespace ET
 	{
 		public static UnitInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new UnitInfo() : ObjectPool.Instance.Fetch(typeof(UnitInfo)) as UnitInfo; 
+			return ObjectPool.Instance.Fetch(typeof(UnitInfo), isFromPool) as UnitInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -256,7 +256,7 @@ namespace ET
 	{
 		public static M2C_CreateUnits Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_CreateUnits() : ObjectPool.Instance.Fetch(typeof(M2C_CreateUnits)) as M2C_CreateUnits; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_CreateUnits), isFromPool) as M2C_CreateUnits; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -278,7 +278,7 @@ namespace ET
 	{
 		public static M2C_CreateMyUnit Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_CreateMyUnit() : ObjectPool.Instance.Fetch(typeof(M2C_CreateMyUnit)) as M2C_CreateMyUnit; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_CreateMyUnit), isFromPool) as M2C_CreateMyUnit; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -300,7 +300,7 @@ namespace ET
 	{
 		public static M2C_StartSceneChange Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_StartSceneChange() : ObjectPool.Instance.Fetch(typeof(M2C_StartSceneChange)) as M2C_StartSceneChange; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_StartSceneChange), isFromPool) as M2C_StartSceneChange; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -326,7 +326,7 @@ namespace ET
 	{
 		public static M2C_RemoveUnits Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_RemoveUnits() : ObjectPool.Instance.Fetch(typeof(M2C_RemoveUnits)) as M2C_RemoveUnits; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_RemoveUnits), isFromPool) as M2C_RemoveUnits; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -348,7 +348,7 @@ namespace ET
 	{
 		public static C2M_PathfindingResult Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_PathfindingResult() : ObjectPool.Instance.Fetch(typeof(C2M_PathfindingResult)) as C2M_PathfindingResult; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_PathfindingResult), isFromPool) as C2M_PathfindingResult; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -374,7 +374,7 @@ namespace ET
 	{
 		public static C2M_Stop Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_Stop() : ObjectPool.Instance.Fetch(typeof(C2M_Stop)) as C2M_Stop; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_Stop), isFromPool) as C2M_Stop; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -396,7 +396,7 @@ namespace ET
 	{
 		public static M2C_PathfindingResult Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_PathfindingResult() : ObjectPool.Instance.Fetch(typeof(M2C_PathfindingResult)) as M2C_PathfindingResult; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_PathfindingResult), isFromPool) as M2C_PathfindingResult; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -426,7 +426,7 @@ namespace ET
 	{
 		public static M2C_Stop Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_Stop() : ObjectPool.Instance.Fetch(typeof(M2C_Stop)) as M2C_Stop; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_Stop), isFromPool) as M2C_Stop; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -461,7 +461,7 @@ namespace ET
 	{
 		public static C2G_Ping Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Ping() : ObjectPool.Instance.Fetch(typeof(C2G_Ping)) as C2G_Ping; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Ping), isFromPool) as C2G_Ping; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -483,7 +483,7 @@ namespace ET
 	{
 		public static G2C_Ping Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Ping() : ObjectPool.Instance.Fetch(typeof(G2C_Ping)) as G2C_Ping; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Ping), isFromPool) as G2C_Ping; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -517,7 +517,7 @@ namespace ET
 	{
 		public static G2C_Test Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Test() : ObjectPool.Instance.Fetch(typeof(G2C_Test)) as G2C_Test; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Test), isFromPool) as G2C_Test; 
 		}
 
 		public override void Dispose() 
@@ -536,7 +536,7 @@ namespace ET
 	{
 		public static C2M_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_Reload() : ObjectPool.Instance.Fetch(typeof(C2M_Reload)) as C2M_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_Reload), isFromPool) as C2M_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -566,7 +566,7 @@ namespace ET
 	{
 		public static M2C_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_Reload() : ObjectPool.Instance.Fetch(typeof(M2C_Reload)) as M2C_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_Reload), isFromPool) as M2C_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -597,7 +597,7 @@ namespace ET
 	{
 		public static C2R_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2R_Login() : ObjectPool.Instance.Fetch(typeof(C2R_Login)) as C2R_Login; 
+			return ObjectPool.Instance.Fetch(typeof(C2R_Login), isFromPool) as C2R_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -627,7 +627,7 @@ namespace ET
 	{
 		public static R2C_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new R2C_Login() : ObjectPool.Instance.Fetch(typeof(R2C_Login)) as R2C_Login; 
+			return ObjectPool.Instance.Fetch(typeof(R2C_Login), isFromPool) as R2C_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -670,7 +670,7 @@ namespace ET
 	{
 		public static C2G_LoginGate Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_LoginGate() : ObjectPool.Instance.Fetch(typeof(C2G_LoginGate)) as C2G_LoginGate; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_LoginGate), isFromPool) as C2G_LoginGate; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -700,7 +700,7 @@ namespace ET
 	{
 		public static G2C_LoginGate Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_LoginGate() : ObjectPool.Instance.Fetch(typeof(G2C_LoginGate)) as G2C_LoginGate; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_LoginGate), isFromPool) as G2C_LoginGate; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -734,7 +734,7 @@ namespace ET
 	{
 		public static G2C_TestHotfixMessage Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_TestHotfixMessage() : ObjectPool.Instance.Fetch(typeof(G2C_TestHotfixMessage)) as G2C_TestHotfixMessage; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_TestHotfixMessage), isFromPool) as G2C_TestHotfixMessage; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -757,7 +757,7 @@ namespace ET
 	{
 		public static C2M_TestRobotCase Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRobotCase() : ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase)) as C2M_TestRobotCase; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase), isFromPool) as C2M_TestRobotCase; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -783,7 +783,7 @@ namespace ET
 	{
 		public static M2C_TestRobotCase Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestRobotCase() : ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase)) as M2C_TestRobotCase; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase), isFromPool) as M2C_TestRobotCase; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -817,7 +817,7 @@ namespace ET
 	{
 		public static C2M_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRobotCase2() : ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase2)) as C2M_TestRobotCase2; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase2), isFromPool) as C2M_TestRobotCase2; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -843,7 +843,7 @@ namespace ET
 	{
 		public static M2C_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestRobotCase2() : ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase2)) as M2C_TestRobotCase2; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase2), isFromPool) as M2C_TestRobotCase2; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -870,7 +870,7 @@ namespace ET
 	{
 		public static C2M_TransferMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TransferMap() : ObjectPool.Instance.Fetch(typeof(C2M_TransferMap)) as C2M_TransferMap; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TransferMap), isFromPool) as C2M_TransferMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -892,7 +892,7 @@ namespace ET
 	{
 		public static M2C_TransferMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TransferMap() : ObjectPool.Instance.Fetch(typeof(M2C_TransferMap)) as M2C_TransferMap; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TransferMap), isFromPool) as M2C_TransferMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -923,7 +923,7 @@ namespace ET
 	{
 		public static C2G_Benchmark Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Benchmark() : ObjectPool.Instance.Fetch(typeof(C2G_Benchmark)) as C2G_Benchmark; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Benchmark), isFromPool) as C2G_Benchmark; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -945,7 +945,7 @@ namespace ET
 	{
 		public static G2C_Benchmark Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Benchmark() : ObjectPool.Instance.Fetch(typeof(G2C_Benchmark)) as G2C_Benchmark; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Benchmark), isFromPool) as G2C_Benchmark; 
 		}
 
 		[MemoryPackOrder(0)]

+ 2 - 2
Unity/Assets/Scripts/Model/Generate/ClientServer/Message/ClientMessage_C_1000.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static Main2NetClient_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Main2NetClient_Login() : ObjectPool.Instance.Fetch(typeof(Main2NetClient_Login)) as Main2NetClient_Login; 
+			return ObjectPool.Instance.Fetch(typeof(Main2NetClient_Login), isFromPool) as Main2NetClient_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -45,7 +45,7 @@ namespace ET
 	{
 		public static NetClient2Main_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new NetClient2Main_Login() : ObjectPool.Instance.Fetch(typeof(NetClient2Main_Login)) as NetClient2Main_Login; 
+			return ObjectPool.Instance.Fetch(typeof(NetClient2Main_Login), isFromPool) as NetClient2Main_Login; 
 		}
 
 		[MemoryPackOrder(0)]

+ 23 - 23
Unity/Assets/Scripts/Model/Generate/ClientServer/Message/InnerMessage_S_20001.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static ObjectQueryRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectQueryRequest() : ObjectPool.Instance.Fetch(typeof(ObjectQueryRequest)) as ObjectQueryRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectQueryRequest), isFromPool) as ObjectQueryRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -42,7 +42,7 @@ namespace ET
 	{
 		public static M2A_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2A_Reload() : ObjectPool.Instance.Fetch(typeof(M2A_Reload)) as M2A_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(M2A_Reload), isFromPool) as M2A_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -64,7 +64,7 @@ namespace ET
 	{
 		public static A2M_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new A2M_Reload() : ObjectPool.Instance.Fetch(typeof(A2M_Reload)) as A2M_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(A2M_Reload), isFromPool) as A2M_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -95,7 +95,7 @@ namespace ET
 	{
 		public static G2G_LockRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockRequest() : ObjectPool.Instance.Fetch(typeof(G2G_LockRequest)) as G2G_LockRequest; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockRequest), isFromPool) as G2G_LockRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -125,7 +125,7 @@ namespace ET
 	{
 		public static G2G_LockResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockResponse() : ObjectPool.Instance.Fetch(typeof(G2G_LockResponse)) as G2G_LockResponse; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockResponse), isFromPool) as G2G_LockResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -156,7 +156,7 @@ namespace ET
 	{
 		public static G2G_LockReleaseRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockReleaseRequest() : ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseRequest)) as G2G_LockReleaseRequest; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseRequest), isFromPool) as G2G_LockReleaseRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -186,7 +186,7 @@ namespace ET
 	{
 		public static G2G_LockReleaseResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockReleaseResponse() : ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseResponse)) as G2G_LockReleaseResponse; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseResponse), isFromPool) as G2G_LockReleaseResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -217,7 +217,7 @@ namespace ET
 	{
 		public static ObjectAddRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectAddRequest() : ObjectPool.Instance.Fetch(typeof(ObjectAddRequest)) as ObjectAddRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectAddRequest), isFromPool) as ObjectAddRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -251,7 +251,7 @@ namespace ET
 	{
 		public static ObjectAddResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectAddResponse() : ObjectPool.Instance.Fetch(typeof(ObjectAddResponse)) as ObjectAddResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectAddResponse), isFromPool) as ObjectAddResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -282,7 +282,7 @@ namespace ET
 	{
 		public static ObjectLockRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectLockRequest() : ObjectPool.Instance.Fetch(typeof(ObjectLockRequest)) as ObjectLockRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectLockRequest), isFromPool) as ObjectLockRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -320,7 +320,7 @@ namespace ET
 	{
 		public static ObjectLockResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectLockResponse() : ObjectPool.Instance.Fetch(typeof(ObjectLockResponse)) as ObjectLockResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectLockResponse), isFromPool) as ObjectLockResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -351,7 +351,7 @@ namespace ET
 	{
 		public static ObjectUnLockRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectUnLockRequest() : ObjectPool.Instance.Fetch(typeof(ObjectUnLockRequest)) as ObjectUnLockRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectUnLockRequest), isFromPool) as ObjectUnLockRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -389,7 +389,7 @@ namespace ET
 	{
 		public static ObjectUnLockResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectUnLockResponse() : ObjectPool.Instance.Fetch(typeof(ObjectUnLockResponse)) as ObjectUnLockResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectUnLockResponse), isFromPool) as ObjectUnLockResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -420,7 +420,7 @@ namespace ET
 	{
 		public static ObjectRemoveRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectRemoveRequest() : ObjectPool.Instance.Fetch(typeof(ObjectRemoveRequest)) as ObjectRemoveRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectRemoveRequest), isFromPool) as ObjectRemoveRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -450,7 +450,7 @@ namespace ET
 	{
 		public static ObjectRemoveResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectRemoveResponse() : ObjectPool.Instance.Fetch(typeof(ObjectRemoveResponse)) as ObjectRemoveResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectRemoveResponse), isFromPool) as ObjectRemoveResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -481,7 +481,7 @@ namespace ET
 	{
 		public static ObjectGetRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectGetRequest() : ObjectPool.Instance.Fetch(typeof(ObjectGetRequest)) as ObjectGetRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectGetRequest), isFromPool) as ObjectGetRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -511,7 +511,7 @@ namespace ET
 	{
 		public static ObjectGetResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectGetResponse() : ObjectPool.Instance.Fetch(typeof(ObjectGetResponse)) as ObjectGetResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectGetResponse), isFromPool) as ObjectGetResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -550,7 +550,7 @@ namespace ET
 	{
 		public static R2G_GetLoginKey Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new R2G_GetLoginKey() : ObjectPool.Instance.Fetch(typeof(R2G_GetLoginKey)) as R2G_GetLoginKey; 
+			return ObjectPool.Instance.Fetch(typeof(R2G_GetLoginKey), isFromPool) as R2G_GetLoginKey; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -576,7 +576,7 @@ namespace ET
 	{
 		public static G2R_GetLoginKey Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2R_GetLoginKey() : ObjectPool.Instance.Fetch(typeof(G2R_GetLoginKey)) as G2R_GetLoginKey; 
+			return ObjectPool.Instance.Fetch(typeof(G2R_GetLoginKey), isFromPool) as G2R_GetLoginKey; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -614,7 +614,7 @@ namespace ET
 	{
 		public static G2M_SessionDisconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2M_SessionDisconnect() : ObjectPool.Instance.Fetch(typeof(G2M_SessionDisconnect)) as G2M_SessionDisconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2M_SessionDisconnect), isFromPool) as G2M_SessionDisconnect; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -636,7 +636,7 @@ namespace ET
 	{
 		public static ObjectQueryResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectQueryResponse() : ObjectPool.Instance.Fetch(typeof(ObjectQueryResponse)) as ObjectQueryResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectQueryResponse), isFromPool) as ObjectQueryResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -671,7 +671,7 @@ namespace ET
 	{
 		public static M2M_UnitTransferRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2M_UnitTransferRequest() : ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferRequest)) as M2M_UnitTransferRequest; 
+			return ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferRequest), isFromPool) as M2M_UnitTransferRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -705,7 +705,7 @@ namespace ET
 	{
 		public static M2M_UnitTransferResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2M_UnitTransferResponse() : ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferResponse)) as M2M_UnitTransferResponse; 
+			return ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferResponse), isFromPool) as M2M_UnitTransferResponse; 
 		}
 
 		[MemoryPackOrder(0)]

+ 8 - 8
Unity/Assets/Scripts/Model/Generate/ClientServer/Message/LockStepInner_S_21001.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static G2Match_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2Match_Match() : ObjectPool.Instance.Fetch(typeof(G2Match_Match)) as G2Match_Match; 
+			return ObjectPool.Instance.Fetch(typeof(G2Match_Match), isFromPool) as G2Match_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -37,7 +37,7 @@ namespace ET
 	{
 		public static Match2G_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2G_Match() : ObjectPool.Instance.Fetch(typeof(Match2G_Match)) as Match2G_Match; 
+			return ObjectPool.Instance.Fetch(typeof(Match2G_Match), isFromPool) as Match2G_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -68,7 +68,7 @@ namespace ET
 	{
 		public static Match2Map_GetRoom Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2Map_GetRoom() : ObjectPool.Instance.Fetch(typeof(Match2Map_GetRoom)) as Match2Map_GetRoom; 
+			return ObjectPool.Instance.Fetch(typeof(Match2Map_GetRoom), isFromPool) as Match2Map_GetRoom; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -94,7 +94,7 @@ namespace ET
 	{
 		public static Map2Match_GetRoom Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Map2Match_GetRoom() : ObjectPool.Instance.Fetch(typeof(Map2Match_GetRoom)) as Map2Match_GetRoom; 
+			return ObjectPool.Instance.Fetch(typeof(Map2Match_GetRoom), isFromPool) as Map2Match_GetRoom; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -130,7 +130,7 @@ namespace ET
 	{
 		public static G2Room_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2Room_Reconnect() : ObjectPool.Instance.Fetch(typeof(G2Room_Reconnect)) as G2Room_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2Room_Reconnect), isFromPool) as G2Room_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -156,7 +156,7 @@ namespace ET
 	{
 		public static Room2G_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2G_Reconnect() : ObjectPool.Instance.Fetch(typeof(Room2G_Reconnect)) as Room2G_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(Room2G_Reconnect), isFromPool) as Room2G_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -199,7 +199,7 @@ namespace ET
 	{
 		public static RoomManager2Room_Init Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new RoomManager2Room_Init() : ObjectPool.Instance.Fetch(typeof(RoomManager2Room_Init)) as RoomManager2Room_Init; 
+			return ObjectPool.Instance.Fetch(typeof(RoomManager2Room_Init), isFromPool) as RoomManager2Room_Init; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -225,7 +225,7 @@ namespace ET
 	{
 		public static Room2RoomManager_Init Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2RoomManager_Init() : ObjectPool.Instance.Fetch(typeof(Room2RoomManager_Init)) as Room2RoomManager_Init; 
+			return ObjectPool.Instance.Fetch(typeof(Room2RoomManager_Init), isFromPool) as Room2RoomManager_Init; 
 		}
 
 		[MemoryPackOrder(0)]

+ 12 - 12
Unity/Assets/Scripts/Model/Generate/ClientServer/Message/LockStepOuter_C_11001.cs

@@ -10,7 +10,7 @@ namespace ET
 	{
 		public static C2G_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Match() : ObjectPool.Instance.Fetch(typeof(C2G_Match)) as C2G_Match; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Match), isFromPool) as C2G_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -32,7 +32,7 @@ namespace ET
 	{
 		public static G2C_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Match() : ObjectPool.Instance.Fetch(typeof(G2C_Match)) as G2C_Match; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Match), isFromPool) as G2C_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -63,7 +63,7 @@ namespace ET
 	{
 		public static Match2G_NotifyMatchSuccess Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2G_NotifyMatchSuccess() : ObjectPool.Instance.Fetch(typeof(Match2G_NotifyMatchSuccess)) as Match2G_NotifyMatchSuccess; 
+			return ObjectPool.Instance.Fetch(typeof(Match2G_NotifyMatchSuccess), isFromPool) as Match2G_NotifyMatchSuccess; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -91,7 +91,7 @@ namespace ET
 	{
 		public static C2Room_ChangeSceneFinish Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2Room_ChangeSceneFinish() : ObjectPool.Instance.Fetch(typeof(C2Room_ChangeSceneFinish)) as C2Room_ChangeSceneFinish; 
+			return ObjectPool.Instance.Fetch(typeof(C2Room_ChangeSceneFinish), isFromPool) as C2Room_ChangeSceneFinish; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -113,7 +113,7 @@ namespace ET
 	{
 		public static LockStepUnitInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new LockStepUnitInfo() : ObjectPool.Instance.Fetch(typeof(LockStepUnitInfo)) as LockStepUnitInfo; 
+			return ObjectPool.Instance.Fetch(typeof(LockStepUnitInfo), isFromPool) as LockStepUnitInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -144,7 +144,7 @@ namespace ET
 	{
 		public static Room2C_Start Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_Start() : ObjectPool.Instance.Fetch(typeof(Room2C_Start)) as Room2C_Start; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_Start), isFromPool) as Room2C_Start; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -170,7 +170,7 @@ namespace ET
 	{
 		public static FrameMessage Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new FrameMessage() : ObjectPool.Instance.Fetch(typeof(FrameMessage)) as FrameMessage; 
+			return ObjectPool.Instance.Fetch(typeof(FrameMessage), isFromPool) as FrameMessage; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -200,7 +200,7 @@ namespace ET
 	{
 		public static OneFrameInputs Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new OneFrameInputs() : ObjectPool.Instance.Fetch(typeof(OneFrameInputs)) as OneFrameInputs; 
+			return ObjectPool.Instance.Fetch(typeof(OneFrameInputs), isFromPool) as OneFrameInputs; 
 		}
 
 		[MongoDB.Bson.Serialization.Attributes.BsonDictionaryOptions(MongoDB.Bson.Serialization.Options.DictionaryRepresentation.ArrayOfArrays)]
@@ -222,7 +222,7 @@ namespace ET
 	{
 		public static Room2C_AdjustUpdateTime Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_AdjustUpdateTime() : ObjectPool.Instance.Fetch(typeof(Room2C_AdjustUpdateTime)) as Room2C_AdjustUpdateTime; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_AdjustUpdateTime), isFromPool) as Room2C_AdjustUpdateTime; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -244,7 +244,7 @@ namespace ET
 	{
 		public static C2Room_CheckHash Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2Room_CheckHash() : ObjectPool.Instance.Fetch(typeof(C2Room_CheckHash)) as C2Room_CheckHash; 
+			return ObjectPool.Instance.Fetch(typeof(C2Room_CheckHash), isFromPool) as C2Room_CheckHash; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -274,7 +274,7 @@ namespace ET
 	{
 		public static Room2C_CheckHashFail Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_CheckHashFail() : ObjectPool.Instance.Fetch(typeof(Room2C_CheckHashFail)) as Room2C_CheckHashFail; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_CheckHashFail), isFromPool) as Room2C_CheckHashFail; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -300,7 +300,7 @@ namespace ET
 	{
 		public static G2C_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Reconnect() : ObjectPool.Instance.Fetch(typeof(G2C_Reconnect)) as G2C_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Reconnect), isFromPool) as G2C_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]

+ 34 - 34
Unity/Assets/Scripts/Model/Generate/ClientServer/Message/OuterMessage_C_10001.cs

@@ -9,7 +9,7 @@ namespace ET
 	{
 		public static HttpGetRouterResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new HttpGetRouterResponse() : ObjectPool.Instance.Fetch(typeof(HttpGetRouterResponse)) as HttpGetRouterResponse; 
+			return ObjectPool.Instance.Fetch(typeof(HttpGetRouterResponse), isFromPool) as HttpGetRouterResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -35,7 +35,7 @@ namespace ET
 	{
 		public static RouterSync Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new RouterSync() : ObjectPool.Instance.Fetch(typeof(RouterSync)) as RouterSync; 
+			return ObjectPool.Instance.Fetch(typeof(RouterSync), isFromPool) as RouterSync; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -62,7 +62,7 @@ namespace ET
 	{
 		public static C2M_TestRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRequest() : ObjectPool.Instance.Fetch(typeof(C2M_TestRequest)) as C2M_TestRequest; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRequest), isFromPool) as C2M_TestRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -88,7 +88,7 @@ namespace ET
 	{
 		public static M2C_TestResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestResponse() : ObjectPool.Instance.Fetch(typeof(M2C_TestResponse)) as M2C_TestResponse; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestResponse), isFromPool) as M2C_TestResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -123,7 +123,7 @@ namespace ET
 	{
 		public static C2G_EnterMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_EnterMap() : ObjectPool.Instance.Fetch(typeof(C2G_EnterMap)) as C2G_EnterMap; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_EnterMap), isFromPool) as C2G_EnterMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -145,7 +145,7 @@ namespace ET
 	{
 		public static G2C_EnterMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_EnterMap() : ObjectPool.Instance.Fetch(typeof(G2C_EnterMap)) as G2C_EnterMap; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_EnterMap), isFromPool) as G2C_EnterMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -180,7 +180,7 @@ namespace ET
 	{
 		public static MoveInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new MoveInfo() : ObjectPool.Instance.Fetch(typeof(MoveInfo)) as MoveInfo; 
+			return ObjectPool.Instance.Fetch(typeof(MoveInfo), isFromPool) as MoveInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -210,7 +210,7 @@ namespace ET
 	{
 		public static UnitInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new UnitInfo() : ObjectPool.Instance.Fetch(typeof(UnitInfo)) as UnitInfo; 
+			return ObjectPool.Instance.Fetch(typeof(UnitInfo), isFromPool) as UnitInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -256,7 +256,7 @@ namespace ET
 	{
 		public static M2C_CreateUnits Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_CreateUnits() : ObjectPool.Instance.Fetch(typeof(M2C_CreateUnits)) as M2C_CreateUnits; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_CreateUnits), isFromPool) as M2C_CreateUnits; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -278,7 +278,7 @@ namespace ET
 	{
 		public static M2C_CreateMyUnit Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_CreateMyUnit() : ObjectPool.Instance.Fetch(typeof(M2C_CreateMyUnit)) as M2C_CreateMyUnit; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_CreateMyUnit), isFromPool) as M2C_CreateMyUnit; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -300,7 +300,7 @@ namespace ET
 	{
 		public static M2C_StartSceneChange Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_StartSceneChange() : ObjectPool.Instance.Fetch(typeof(M2C_StartSceneChange)) as M2C_StartSceneChange; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_StartSceneChange), isFromPool) as M2C_StartSceneChange; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -326,7 +326,7 @@ namespace ET
 	{
 		public static M2C_RemoveUnits Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_RemoveUnits() : ObjectPool.Instance.Fetch(typeof(M2C_RemoveUnits)) as M2C_RemoveUnits; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_RemoveUnits), isFromPool) as M2C_RemoveUnits; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -348,7 +348,7 @@ namespace ET
 	{
 		public static C2M_PathfindingResult Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_PathfindingResult() : ObjectPool.Instance.Fetch(typeof(C2M_PathfindingResult)) as C2M_PathfindingResult; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_PathfindingResult), isFromPool) as C2M_PathfindingResult; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -374,7 +374,7 @@ namespace ET
 	{
 		public static C2M_Stop Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_Stop() : ObjectPool.Instance.Fetch(typeof(C2M_Stop)) as C2M_Stop; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_Stop), isFromPool) as C2M_Stop; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -396,7 +396,7 @@ namespace ET
 	{
 		public static M2C_PathfindingResult Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_PathfindingResult() : ObjectPool.Instance.Fetch(typeof(M2C_PathfindingResult)) as M2C_PathfindingResult; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_PathfindingResult), isFromPool) as M2C_PathfindingResult; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -426,7 +426,7 @@ namespace ET
 	{
 		public static M2C_Stop Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_Stop() : ObjectPool.Instance.Fetch(typeof(M2C_Stop)) as M2C_Stop; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_Stop), isFromPool) as M2C_Stop; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -461,7 +461,7 @@ namespace ET
 	{
 		public static C2G_Ping Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Ping() : ObjectPool.Instance.Fetch(typeof(C2G_Ping)) as C2G_Ping; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Ping), isFromPool) as C2G_Ping; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -483,7 +483,7 @@ namespace ET
 	{
 		public static G2C_Ping Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Ping() : ObjectPool.Instance.Fetch(typeof(G2C_Ping)) as G2C_Ping; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Ping), isFromPool) as G2C_Ping; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -517,7 +517,7 @@ namespace ET
 	{
 		public static G2C_Test Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Test() : ObjectPool.Instance.Fetch(typeof(G2C_Test)) as G2C_Test; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Test), isFromPool) as G2C_Test; 
 		}
 
 		public override void Dispose() 
@@ -536,7 +536,7 @@ namespace ET
 	{
 		public static C2M_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_Reload() : ObjectPool.Instance.Fetch(typeof(C2M_Reload)) as C2M_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_Reload), isFromPool) as C2M_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -566,7 +566,7 @@ namespace ET
 	{
 		public static M2C_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_Reload() : ObjectPool.Instance.Fetch(typeof(M2C_Reload)) as M2C_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_Reload), isFromPool) as M2C_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -597,7 +597,7 @@ namespace ET
 	{
 		public static C2R_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2R_Login() : ObjectPool.Instance.Fetch(typeof(C2R_Login)) as C2R_Login; 
+			return ObjectPool.Instance.Fetch(typeof(C2R_Login), isFromPool) as C2R_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -627,7 +627,7 @@ namespace ET
 	{
 		public static R2C_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new R2C_Login() : ObjectPool.Instance.Fetch(typeof(R2C_Login)) as R2C_Login; 
+			return ObjectPool.Instance.Fetch(typeof(R2C_Login), isFromPool) as R2C_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -670,7 +670,7 @@ namespace ET
 	{
 		public static C2G_LoginGate Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_LoginGate() : ObjectPool.Instance.Fetch(typeof(C2G_LoginGate)) as C2G_LoginGate; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_LoginGate), isFromPool) as C2G_LoginGate; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -700,7 +700,7 @@ namespace ET
 	{
 		public static G2C_LoginGate Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_LoginGate() : ObjectPool.Instance.Fetch(typeof(G2C_LoginGate)) as G2C_LoginGate; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_LoginGate), isFromPool) as G2C_LoginGate; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -734,7 +734,7 @@ namespace ET
 	{
 		public static G2C_TestHotfixMessage Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_TestHotfixMessage() : ObjectPool.Instance.Fetch(typeof(G2C_TestHotfixMessage)) as G2C_TestHotfixMessage; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_TestHotfixMessage), isFromPool) as G2C_TestHotfixMessage; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -757,7 +757,7 @@ namespace ET
 	{
 		public static C2M_TestRobotCase Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRobotCase() : ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase)) as C2M_TestRobotCase; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase), isFromPool) as C2M_TestRobotCase; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -783,7 +783,7 @@ namespace ET
 	{
 		public static M2C_TestRobotCase Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestRobotCase() : ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase)) as M2C_TestRobotCase; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase), isFromPool) as M2C_TestRobotCase; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -817,7 +817,7 @@ namespace ET
 	{
 		public static C2M_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRobotCase2() : ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase2)) as C2M_TestRobotCase2; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase2), isFromPool) as C2M_TestRobotCase2; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -843,7 +843,7 @@ namespace ET
 	{
 		public static M2C_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestRobotCase2() : ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase2)) as M2C_TestRobotCase2; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase2), isFromPool) as M2C_TestRobotCase2; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -870,7 +870,7 @@ namespace ET
 	{
 		public static C2M_TransferMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TransferMap() : ObjectPool.Instance.Fetch(typeof(C2M_TransferMap)) as C2M_TransferMap; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TransferMap), isFromPool) as C2M_TransferMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -892,7 +892,7 @@ namespace ET
 	{
 		public static M2C_TransferMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TransferMap() : ObjectPool.Instance.Fetch(typeof(M2C_TransferMap)) as M2C_TransferMap; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TransferMap), isFromPool) as M2C_TransferMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -923,7 +923,7 @@ namespace ET
 	{
 		public static C2G_Benchmark Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Benchmark() : ObjectPool.Instance.Fetch(typeof(C2G_Benchmark)) as C2G_Benchmark; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Benchmark), isFromPool) as C2G_Benchmark; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -945,7 +945,7 @@ namespace ET
 	{
 		public static G2C_Benchmark Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Benchmark() : ObjectPool.Instance.Fetch(typeof(G2C_Benchmark)) as G2C_Benchmark; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Benchmark), isFromPool) as G2C_Benchmark; 
 		}
 
 		[MemoryPackOrder(0)]

+ 2 - 2
Unity/Assets/Scripts/Model/Generate/Server/Message/ClientMessage_C_1000.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static Main2NetClient_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Main2NetClient_Login() : ObjectPool.Instance.Fetch(typeof(Main2NetClient_Login)) as Main2NetClient_Login; 
+			return ObjectPool.Instance.Fetch(typeof(Main2NetClient_Login), isFromPool) as Main2NetClient_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -45,7 +45,7 @@ namespace ET
 	{
 		public static NetClient2Main_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new NetClient2Main_Login() : ObjectPool.Instance.Fetch(typeof(NetClient2Main_Login)) as NetClient2Main_Login; 
+			return ObjectPool.Instance.Fetch(typeof(NetClient2Main_Login), isFromPool) as NetClient2Main_Login; 
 		}
 
 		[MemoryPackOrder(0)]

+ 23 - 23
Unity/Assets/Scripts/Model/Generate/Server/Message/InnerMessage_S_20001.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static ObjectQueryRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectQueryRequest() : ObjectPool.Instance.Fetch(typeof(ObjectQueryRequest)) as ObjectQueryRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectQueryRequest), isFromPool) as ObjectQueryRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -42,7 +42,7 @@ namespace ET
 	{
 		public static M2A_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2A_Reload() : ObjectPool.Instance.Fetch(typeof(M2A_Reload)) as M2A_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(M2A_Reload), isFromPool) as M2A_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -64,7 +64,7 @@ namespace ET
 	{
 		public static A2M_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new A2M_Reload() : ObjectPool.Instance.Fetch(typeof(A2M_Reload)) as A2M_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(A2M_Reload), isFromPool) as A2M_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -95,7 +95,7 @@ namespace ET
 	{
 		public static G2G_LockRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockRequest() : ObjectPool.Instance.Fetch(typeof(G2G_LockRequest)) as G2G_LockRequest; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockRequest), isFromPool) as G2G_LockRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -125,7 +125,7 @@ namespace ET
 	{
 		public static G2G_LockResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockResponse() : ObjectPool.Instance.Fetch(typeof(G2G_LockResponse)) as G2G_LockResponse; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockResponse), isFromPool) as G2G_LockResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -156,7 +156,7 @@ namespace ET
 	{
 		public static G2G_LockReleaseRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockReleaseRequest() : ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseRequest)) as G2G_LockReleaseRequest; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseRequest), isFromPool) as G2G_LockReleaseRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -186,7 +186,7 @@ namespace ET
 	{
 		public static G2G_LockReleaseResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2G_LockReleaseResponse() : ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseResponse)) as G2G_LockReleaseResponse; 
+			return ObjectPool.Instance.Fetch(typeof(G2G_LockReleaseResponse), isFromPool) as G2G_LockReleaseResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -217,7 +217,7 @@ namespace ET
 	{
 		public static ObjectAddRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectAddRequest() : ObjectPool.Instance.Fetch(typeof(ObjectAddRequest)) as ObjectAddRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectAddRequest), isFromPool) as ObjectAddRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -251,7 +251,7 @@ namespace ET
 	{
 		public static ObjectAddResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectAddResponse() : ObjectPool.Instance.Fetch(typeof(ObjectAddResponse)) as ObjectAddResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectAddResponse), isFromPool) as ObjectAddResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -282,7 +282,7 @@ namespace ET
 	{
 		public static ObjectLockRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectLockRequest() : ObjectPool.Instance.Fetch(typeof(ObjectLockRequest)) as ObjectLockRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectLockRequest), isFromPool) as ObjectLockRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -320,7 +320,7 @@ namespace ET
 	{
 		public static ObjectLockResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectLockResponse() : ObjectPool.Instance.Fetch(typeof(ObjectLockResponse)) as ObjectLockResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectLockResponse), isFromPool) as ObjectLockResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -351,7 +351,7 @@ namespace ET
 	{
 		public static ObjectUnLockRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectUnLockRequest() : ObjectPool.Instance.Fetch(typeof(ObjectUnLockRequest)) as ObjectUnLockRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectUnLockRequest), isFromPool) as ObjectUnLockRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -389,7 +389,7 @@ namespace ET
 	{
 		public static ObjectUnLockResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectUnLockResponse() : ObjectPool.Instance.Fetch(typeof(ObjectUnLockResponse)) as ObjectUnLockResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectUnLockResponse), isFromPool) as ObjectUnLockResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -420,7 +420,7 @@ namespace ET
 	{
 		public static ObjectRemoveRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectRemoveRequest() : ObjectPool.Instance.Fetch(typeof(ObjectRemoveRequest)) as ObjectRemoveRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectRemoveRequest), isFromPool) as ObjectRemoveRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -450,7 +450,7 @@ namespace ET
 	{
 		public static ObjectRemoveResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectRemoveResponse() : ObjectPool.Instance.Fetch(typeof(ObjectRemoveResponse)) as ObjectRemoveResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectRemoveResponse), isFromPool) as ObjectRemoveResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -481,7 +481,7 @@ namespace ET
 	{
 		public static ObjectGetRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectGetRequest() : ObjectPool.Instance.Fetch(typeof(ObjectGetRequest)) as ObjectGetRequest; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectGetRequest), isFromPool) as ObjectGetRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -511,7 +511,7 @@ namespace ET
 	{
 		public static ObjectGetResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectGetResponse() : ObjectPool.Instance.Fetch(typeof(ObjectGetResponse)) as ObjectGetResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectGetResponse), isFromPool) as ObjectGetResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -550,7 +550,7 @@ namespace ET
 	{
 		public static R2G_GetLoginKey Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new R2G_GetLoginKey() : ObjectPool.Instance.Fetch(typeof(R2G_GetLoginKey)) as R2G_GetLoginKey; 
+			return ObjectPool.Instance.Fetch(typeof(R2G_GetLoginKey), isFromPool) as R2G_GetLoginKey; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -576,7 +576,7 @@ namespace ET
 	{
 		public static G2R_GetLoginKey Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2R_GetLoginKey() : ObjectPool.Instance.Fetch(typeof(G2R_GetLoginKey)) as G2R_GetLoginKey; 
+			return ObjectPool.Instance.Fetch(typeof(G2R_GetLoginKey), isFromPool) as G2R_GetLoginKey; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -614,7 +614,7 @@ namespace ET
 	{
 		public static G2M_SessionDisconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2M_SessionDisconnect() : ObjectPool.Instance.Fetch(typeof(G2M_SessionDisconnect)) as G2M_SessionDisconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2M_SessionDisconnect), isFromPool) as G2M_SessionDisconnect; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -636,7 +636,7 @@ namespace ET
 	{
 		public static ObjectQueryResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new ObjectQueryResponse() : ObjectPool.Instance.Fetch(typeof(ObjectQueryResponse)) as ObjectQueryResponse; 
+			return ObjectPool.Instance.Fetch(typeof(ObjectQueryResponse), isFromPool) as ObjectQueryResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -671,7 +671,7 @@ namespace ET
 	{
 		public static M2M_UnitTransferRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2M_UnitTransferRequest() : ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferRequest)) as M2M_UnitTransferRequest; 
+			return ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferRequest), isFromPool) as M2M_UnitTransferRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -705,7 +705,7 @@ namespace ET
 	{
 		public static M2M_UnitTransferResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2M_UnitTransferResponse() : ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferResponse)) as M2M_UnitTransferResponse; 
+			return ObjectPool.Instance.Fetch(typeof(M2M_UnitTransferResponse), isFromPool) as M2M_UnitTransferResponse; 
 		}
 
 		[MemoryPackOrder(0)]

+ 8 - 8
Unity/Assets/Scripts/Model/Generate/Server/Message/LockStepInner_S_21001.cs

@@ -11,7 +11,7 @@ namespace ET
 	{
 		public static G2Match_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2Match_Match() : ObjectPool.Instance.Fetch(typeof(G2Match_Match)) as G2Match_Match; 
+			return ObjectPool.Instance.Fetch(typeof(G2Match_Match), isFromPool) as G2Match_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -37,7 +37,7 @@ namespace ET
 	{
 		public static Match2G_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2G_Match() : ObjectPool.Instance.Fetch(typeof(Match2G_Match)) as Match2G_Match; 
+			return ObjectPool.Instance.Fetch(typeof(Match2G_Match), isFromPool) as Match2G_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -68,7 +68,7 @@ namespace ET
 	{
 		public static Match2Map_GetRoom Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2Map_GetRoom() : ObjectPool.Instance.Fetch(typeof(Match2Map_GetRoom)) as Match2Map_GetRoom; 
+			return ObjectPool.Instance.Fetch(typeof(Match2Map_GetRoom), isFromPool) as Match2Map_GetRoom; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -94,7 +94,7 @@ namespace ET
 	{
 		public static Map2Match_GetRoom Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Map2Match_GetRoom() : ObjectPool.Instance.Fetch(typeof(Map2Match_GetRoom)) as Map2Match_GetRoom; 
+			return ObjectPool.Instance.Fetch(typeof(Map2Match_GetRoom), isFromPool) as Map2Match_GetRoom; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -130,7 +130,7 @@ namespace ET
 	{
 		public static G2Room_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2Room_Reconnect() : ObjectPool.Instance.Fetch(typeof(G2Room_Reconnect)) as G2Room_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2Room_Reconnect), isFromPool) as G2Room_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -156,7 +156,7 @@ namespace ET
 	{
 		public static Room2G_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2G_Reconnect() : ObjectPool.Instance.Fetch(typeof(Room2G_Reconnect)) as Room2G_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(Room2G_Reconnect), isFromPool) as Room2G_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -199,7 +199,7 @@ namespace ET
 	{
 		public static RoomManager2Room_Init Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new RoomManager2Room_Init() : ObjectPool.Instance.Fetch(typeof(RoomManager2Room_Init)) as RoomManager2Room_Init; 
+			return ObjectPool.Instance.Fetch(typeof(RoomManager2Room_Init), isFromPool) as RoomManager2Room_Init; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -225,7 +225,7 @@ namespace ET
 	{
 		public static Room2RoomManager_Init Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2RoomManager_Init() : ObjectPool.Instance.Fetch(typeof(Room2RoomManager_Init)) as Room2RoomManager_Init; 
+			return ObjectPool.Instance.Fetch(typeof(Room2RoomManager_Init), isFromPool) as Room2RoomManager_Init; 
 		}
 
 		[MemoryPackOrder(0)]

+ 12 - 12
Unity/Assets/Scripts/Model/Generate/Server/Message/LockStepOuter_C_11001.cs

@@ -10,7 +10,7 @@ namespace ET
 	{
 		public static C2G_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Match() : ObjectPool.Instance.Fetch(typeof(C2G_Match)) as C2G_Match; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Match), isFromPool) as C2G_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -32,7 +32,7 @@ namespace ET
 	{
 		public static G2C_Match Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Match() : ObjectPool.Instance.Fetch(typeof(G2C_Match)) as G2C_Match; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Match), isFromPool) as G2C_Match; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -63,7 +63,7 @@ namespace ET
 	{
 		public static Match2G_NotifyMatchSuccess Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Match2G_NotifyMatchSuccess() : ObjectPool.Instance.Fetch(typeof(Match2G_NotifyMatchSuccess)) as Match2G_NotifyMatchSuccess; 
+			return ObjectPool.Instance.Fetch(typeof(Match2G_NotifyMatchSuccess), isFromPool) as Match2G_NotifyMatchSuccess; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -91,7 +91,7 @@ namespace ET
 	{
 		public static C2Room_ChangeSceneFinish Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2Room_ChangeSceneFinish() : ObjectPool.Instance.Fetch(typeof(C2Room_ChangeSceneFinish)) as C2Room_ChangeSceneFinish; 
+			return ObjectPool.Instance.Fetch(typeof(C2Room_ChangeSceneFinish), isFromPool) as C2Room_ChangeSceneFinish; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -113,7 +113,7 @@ namespace ET
 	{
 		public static LockStepUnitInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new LockStepUnitInfo() : ObjectPool.Instance.Fetch(typeof(LockStepUnitInfo)) as LockStepUnitInfo; 
+			return ObjectPool.Instance.Fetch(typeof(LockStepUnitInfo), isFromPool) as LockStepUnitInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -144,7 +144,7 @@ namespace ET
 	{
 		public static Room2C_Start Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_Start() : ObjectPool.Instance.Fetch(typeof(Room2C_Start)) as Room2C_Start; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_Start), isFromPool) as Room2C_Start; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -170,7 +170,7 @@ namespace ET
 	{
 		public static FrameMessage Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new FrameMessage() : ObjectPool.Instance.Fetch(typeof(FrameMessage)) as FrameMessage; 
+			return ObjectPool.Instance.Fetch(typeof(FrameMessage), isFromPool) as FrameMessage; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -200,7 +200,7 @@ namespace ET
 	{
 		public static OneFrameInputs Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new OneFrameInputs() : ObjectPool.Instance.Fetch(typeof(OneFrameInputs)) as OneFrameInputs; 
+			return ObjectPool.Instance.Fetch(typeof(OneFrameInputs), isFromPool) as OneFrameInputs; 
 		}
 
 		[MongoDB.Bson.Serialization.Attributes.BsonDictionaryOptions(MongoDB.Bson.Serialization.Options.DictionaryRepresentation.ArrayOfArrays)]
@@ -222,7 +222,7 @@ namespace ET
 	{
 		public static Room2C_AdjustUpdateTime Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_AdjustUpdateTime() : ObjectPool.Instance.Fetch(typeof(Room2C_AdjustUpdateTime)) as Room2C_AdjustUpdateTime; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_AdjustUpdateTime), isFromPool) as Room2C_AdjustUpdateTime; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -244,7 +244,7 @@ namespace ET
 	{
 		public static C2Room_CheckHash Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2Room_CheckHash() : ObjectPool.Instance.Fetch(typeof(C2Room_CheckHash)) as C2Room_CheckHash; 
+			return ObjectPool.Instance.Fetch(typeof(C2Room_CheckHash), isFromPool) as C2Room_CheckHash; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -274,7 +274,7 @@ namespace ET
 	{
 		public static Room2C_CheckHashFail Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new Room2C_CheckHashFail() : ObjectPool.Instance.Fetch(typeof(Room2C_CheckHashFail)) as Room2C_CheckHashFail; 
+			return ObjectPool.Instance.Fetch(typeof(Room2C_CheckHashFail), isFromPool) as Room2C_CheckHashFail; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -300,7 +300,7 @@ namespace ET
 	{
 		public static G2C_Reconnect Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Reconnect() : ObjectPool.Instance.Fetch(typeof(G2C_Reconnect)) as G2C_Reconnect; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Reconnect), isFromPool) as G2C_Reconnect; 
 		}
 
 		[MemoryPackOrder(0)]

+ 34 - 34
Unity/Assets/Scripts/Model/Generate/Server/Message/OuterMessage_C_10001.cs

@@ -9,7 +9,7 @@ namespace ET
 	{
 		public static HttpGetRouterResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new HttpGetRouterResponse() : ObjectPool.Instance.Fetch(typeof(HttpGetRouterResponse)) as HttpGetRouterResponse; 
+			return ObjectPool.Instance.Fetch(typeof(HttpGetRouterResponse), isFromPool) as HttpGetRouterResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -35,7 +35,7 @@ namespace ET
 	{
 		public static RouterSync Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new RouterSync() : ObjectPool.Instance.Fetch(typeof(RouterSync)) as RouterSync; 
+			return ObjectPool.Instance.Fetch(typeof(RouterSync), isFromPool) as RouterSync; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -62,7 +62,7 @@ namespace ET
 	{
 		public static C2M_TestRequest Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRequest() : ObjectPool.Instance.Fetch(typeof(C2M_TestRequest)) as C2M_TestRequest; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRequest), isFromPool) as C2M_TestRequest; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -88,7 +88,7 @@ namespace ET
 	{
 		public static M2C_TestResponse Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestResponse() : ObjectPool.Instance.Fetch(typeof(M2C_TestResponse)) as M2C_TestResponse; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestResponse), isFromPool) as M2C_TestResponse; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -123,7 +123,7 @@ namespace ET
 	{
 		public static C2G_EnterMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_EnterMap() : ObjectPool.Instance.Fetch(typeof(C2G_EnterMap)) as C2G_EnterMap; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_EnterMap), isFromPool) as C2G_EnterMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -145,7 +145,7 @@ namespace ET
 	{
 		public static G2C_EnterMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_EnterMap() : ObjectPool.Instance.Fetch(typeof(G2C_EnterMap)) as G2C_EnterMap; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_EnterMap), isFromPool) as G2C_EnterMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -180,7 +180,7 @@ namespace ET
 	{
 		public static MoveInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new MoveInfo() : ObjectPool.Instance.Fetch(typeof(MoveInfo)) as MoveInfo; 
+			return ObjectPool.Instance.Fetch(typeof(MoveInfo), isFromPool) as MoveInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -210,7 +210,7 @@ namespace ET
 	{
 		public static UnitInfo Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new UnitInfo() : ObjectPool.Instance.Fetch(typeof(UnitInfo)) as UnitInfo; 
+			return ObjectPool.Instance.Fetch(typeof(UnitInfo), isFromPool) as UnitInfo; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -256,7 +256,7 @@ namespace ET
 	{
 		public static M2C_CreateUnits Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_CreateUnits() : ObjectPool.Instance.Fetch(typeof(M2C_CreateUnits)) as M2C_CreateUnits; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_CreateUnits), isFromPool) as M2C_CreateUnits; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -278,7 +278,7 @@ namespace ET
 	{
 		public static M2C_CreateMyUnit Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_CreateMyUnit() : ObjectPool.Instance.Fetch(typeof(M2C_CreateMyUnit)) as M2C_CreateMyUnit; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_CreateMyUnit), isFromPool) as M2C_CreateMyUnit; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -300,7 +300,7 @@ namespace ET
 	{
 		public static M2C_StartSceneChange Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_StartSceneChange() : ObjectPool.Instance.Fetch(typeof(M2C_StartSceneChange)) as M2C_StartSceneChange; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_StartSceneChange), isFromPool) as M2C_StartSceneChange; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -326,7 +326,7 @@ namespace ET
 	{
 		public static M2C_RemoveUnits Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_RemoveUnits() : ObjectPool.Instance.Fetch(typeof(M2C_RemoveUnits)) as M2C_RemoveUnits; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_RemoveUnits), isFromPool) as M2C_RemoveUnits; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -348,7 +348,7 @@ namespace ET
 	{
 		public static C2M_PathfindingResult Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_PathfindingResult() : ObjectPool.Instance.Fetch(typeof(C2M_PathfindingResult)) as C2M_PathfindingResult; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_PathfindingResult), isFromPool) as C2M_PathfindingResult; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -374,7 +374,7 @@ namespace ET
 	{
 		public static C2M_Stop Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_Stop() : ObjectPool.Instance.Fetch(typeof(C2M_Stop)) as C2M_Stop; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_Stop), isFromPool) as C2M_Stop; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -396,7 +396,7 @@ namespace ET
 	{
 		public static M2C_PathfindingResult Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_PathfindingResult() : ObjectPool.Instance.Fetch(typeof(M2C_PathfindingResult)) as M2C_PathfindingResult; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_PathfindingResult), isFromPool) as M2C_PathfindingResult; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -426,7 +426,7 @@ namespace ET
 	{
 		public static M2C_Stop Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_Stop() : ObjectPool.Instance.Fetch(typeof(M2C_Stop)) as M2C_Stop; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_Stop), isFromPool) as M2C_Stop; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -461,7 +461,7 @@ namespace ET
 	{
 		public static C2G_Ping Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Ping() : ObjectPool.Instance.Fetch(typeof(C2G_Ping)) as C2G_Ping; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Ping), isFromPool) as C2G_Ping; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -483,7 +483,7 @@ namespace ET
 	{
 		public static G2C_Ping Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Ping() : ObjectPool.Instance.Fetch(typeof(G2C_Ping)) as G2C_Ping; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Ping), isFromPool) as G2C_Ping; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -517,7 +517,7 @@ namespace ET
 	{
 		public static G2C_Test Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Test() : ObjectPool.Instance.Fetch(typeof(G2C_Test)) as G2C_Test; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Test), isFromPool) as G2C_Test; 
 		}
 
 		public override void Dispose() 
@@ -536,7 +536,7 @@ namespace ET
 	{
 		public static C2M_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_Reload() : ObjectPool.Instance.Fetch(typeof(C2M_Reload)) as C2M_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_Reload), isFromPool) as C2M_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -566,7 +566,7 @@ namespace ET
 	{
 		public static M2C_Reload Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_Reload() : ObjectPool.Instance.Fetch(typeof(M2C_Reload)) as M2C_Reload; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_Reload), isFromPool) as M2C_Reload; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -597,7 +597,7 @@ namespace ET
 	{
 		public static C2R_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2R_Login() : ObjectPool.Instance.Fetch(typeof(C2R_Login)) as C2R_Login; 
+			return ObjectPool.Instance.Fetch(typeof(C2R_Login), isFromPool) as C2R_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -627,7 +627,7 @@ namespace ET
 	{
 		public static R2C_Login Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new R2C_Login() : ObjectPool.Instance.Fetch(typeof(R2C_Login)) as R2C_Login; 
+			return ObjectPool.Instance.Fetch(typeof(R2C_Login), isFromPool) as R2C_Login; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -670,7 +670,7 @@ namespace ET
 	{
 		public static C2G_LoginGate Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_LoginGate() : ObjectPool.Instance.Fetch(typeof(C2G_LoginGate)) as C2G_LoginGate; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_LoginGate), isFromPool) as C2G_LoginGate; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -700,7 +700,7 @@ namespace ET
 	{
 		public static G2C_LoginGate Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_LoginGate() : ObjectPool.Instance.Fetch(typeof(G2C_LoginGate)) as G2C_LoginGate; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_LoginGate), isFromPool) as G2C_LoginGate; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -734,7 +734,7 @@ namespace ET
 	{
 		public static G2C_TestHotfixMessage Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_TestHotfixMessage() : ObjectPool.Instance.Fetch(typeof(G2C_TestHotfixMessage)) as G2C_TestHotfixMessage; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_TestHotfixMessage), isFromPool) as G2C_TestHotfixMessage; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -757,7 +757,7 @@ namespace ET
 	{
 		public static C2M_TestRobotCase Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRobotCase() : ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase)) as C2M_TestRobotCase; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase), isFromPool) as C2M_TestRobotCase; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -783,7 +783,7 @@ namespace ET
 	{
 		public static M2C_TestRobotCase Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestRobotCase() : ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase)) as M2C_TestRobotCase; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase), isFromPool) as M2C_TestRobotCase; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -817,7 +817,7 @@ namespace ET
 	{
 		public static C2M_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TestRobotCase2() : ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase2)) as C2M_TestRobotCase2; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TestRobotCase2), isFromPool) as C2M_TestRobotCase2; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -843,7 +843,7 @@ namespace ET
 	{
 		public static M2C_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TestRobotCase2() : ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase2)) as M2C_TestRobotCase2; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TestRobotCase2), isFromPool) as M2C_TestRobotCase2; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -870,7 +870,7 @@ namespace ET
 	{
 		public static C2M_TransferMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2M_TransferMap() : ObjectPool.Instance.Fetch(typeof(C2M_TransferMap)) as C2M_TransferMap; 
+			return ObjectPool.Instance.Fetch(typeof(C2M_TransferMap), isFromPool) as C2M_TransferMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -892,7 +892,7 @@ namespace ET
 	{
 		public static M2C_TransferMap Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new M2C_TransferMap() : ObjectPool.Instance.Fetch(typeof(M2C_TransferMap)) as M2C_TransferMap; 
+			return ObjectPool.Instance.Fetch(typeof(M2C_TransferMap), isFromPool) as M2C_TransferMap; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -923,7 +923,7 @@ namespace ET
 	{
 		public static C2G_Benchmark Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new C2G_Benchmark() : ObjectPool.Instance.Fetch(typeof(C2G_Benchmark)) as C2G_Benchmark; 
+			return ObjectPool.Instance.Fetch(typeof(C2G_Benchmark), isFromPool) as C2G_Benchmark; 
 		}
 
 		[MemoryPackOrder(0)]
@@ -945,7 +945,7 @@ namespace ET
 	{
 		public static G2C_Benchmark Create(bool isFromPool = true) 
 		{ 
-			return !isFromPool? new G2C_Benchmark() : ObjectPool.Instance.Fetch(typeof(G2C_Benchmark)) as G2C_Benchmark; 
+			return ObjectPool.Instance.Fetch(typeof(G2C_Benchmark), isFromPool) as G2C_Benchmark; 
 		}
 
 		[MemoryPackOrder(0)]

+ 5 - 1
Unity/Assets/Scripts/Model/Share/Entry.cs

@@ -1,4 +1,8 @@
-namespace ET
+using MemoryPack;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Serializers;
+
+namespace ET
 {
     public struct EntryEvent1
     {

+ 1 - 1
Unity/Assets/Scripts/Model/Share/LockStep/LSEntity.cs

@@ -3,7 +3,7 @@ using System;
 namespace ET
 {
     [EnableMethod]
-    public class LSEntity: Entity
+    public abstract partial class LSEntity: Entity
     {
         public new K AddComponent<K>(bool isFromPool = false) where K : LSEntity, IAwake, new()
         {