Преглед изворни кода

优化proto序列化,直接序列化float3 float4等等struct

tanghai пре 3 година
родитељ
комит
6ac4b9efd6
29 измењених фајлова са 700 додато и 934 уклоњено
  1. 2 2
      Share/Tool/Proto2CS/Proto2CS.cs
  2. 64 65
      Unity/Assets/Config/Proto/InnerMessage_S_20001.proto
  3. 67 94
      Unity/Assets/Config/Proto/OuterMessage_C_10001.proto
  4. 1 6
      Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Move/M2C_PathfindingResultHandler.cs
  5. 2 5
      Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Move/M2C_StopHandler.cs
  6. 1 1
      Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Move/MoveHelper.cs
  7. 9 15
      Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Unit/UnitFactory.cs
  8. 2 6
      Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Move/C2M_PathfindingResultHandler.cs
  9. 7 17
      Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Move/MoveHelper.cs
  10. 3 2
      Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Transfer/TransferHelper.cs
  11. 6 11
      Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Unit/UnitHelper.cs
  12. 0 7
      Unity/Assets/Scripts/Codes/Hotfix/Server/Module/Actor/ActorHelper.cs
  13. 1 3
      Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Opera/OperaComponentSystem.cs
  14. 103 163
      Unity/Assets/Scripts/Codes/Model/Generate/Client/Message/OuterMessage_C_10001.cs
  15. 88 87
      Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/InnerMessage_S_20001.cs
  16. 103 163
      Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/OuterMessage_C_10001.cs
  17. 88 87
      Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/InnerMessage_S_20001.cs
  18. 103 163
      Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/OuterMessage_C_10001.cs
  19. 1 0
      Unity/Assets/Scripts/Codes/Model/Share/Entry.cs
  20. 20 0
      Unity/Assets/Scripts/Core/Helper/ProtobufRegister.cs
  21. 1 1
      Unity/Assets/Scripts/Core/Helper/ProtobufRegister.cs.meta
  22. 5 6
      Unity/Assets/Scripts/Core/Helper/SerializerHelper.cs
  23. 11 0
      Unity/Assets/Scripts/Core/Helper/SerializerHelper.cs.meta
  24. 2 2
      Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs
  25. 2 2
      Unity/Assets/Scripts/Core/Module/Network/KChannel.cs
  26. 2 20
      Unity/Assets/Scripts/Core/Module/Network/MessageSerializeHelper.cs
  27. 2 2
      Unity/Assets/Scripts/Core/Module/Network/TChannel.cs
  28. 2 2
      Unity/Assets/Scripts/Core/Module/Network/WChannel.cs
  29. 2 2
      Unity/Assets/Scripts/Core/Object/ProtoObject.cs

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

@@ -119,7 +119,7 @@ namespace ET
 
                     sb.Append($"\t[Message({protoName}.{msgName})]\n");
                     sb.Append($"\t[ProtoContract]\n");
-                    sb.Append($"\tpublic partial class {msgName}: Object");
+                    sb.Append($"\tpublic partial class {msgName}: ProtoObject");
                     if (parentClass == "IActorMessage" || parentClass == "IActorRequest" || parentClass == "IActorResponse")
                     {
                         sb.Append($", {parentClass}\n");
@@ -223,7 +223,7 @@ namespace ET
                 int n = int.Parse(ss[4]);
 
                 sb.Append($"\t\t[ProtoMember({n})]\n");
-                sb.Append($"\t\tpublic List<{type}> {name} = new List<{type}>();\n\n");
+                sb.Append($"\t\tpublic List<{type}> {name};\n\n");
             }
             catch (Exception e)
             {

+ 64 - 65
Unity/Assets/Config/Proto/InnerMessage_S_20001.proto

@@ -1,159 +1,158 @@
 syntax = "proto3";
+// using 
+
 package ET;
 
 //ResponseType ObjectQueryResponse
 message ObjectQueryRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;
-	int64 InstanceId = 2;
+	int32 RpcId = 1;
+	int64 Key = 2;
+	int64 InstanceId = 3;
 }
 
 //ResponseType A2M_Reload
 message M2A_Reload // IActorRequest
 {
-	int32 RpcId = 90;
+	int32 RpcId = 1;
 }
 
 message A2M_Reload // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType G2G_LockResponse
 message G2G_LockRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Id = 1;
-	string Address = 2;
+	int32 RpcId = 1;
+	int64 Id = 2;
+	string Address = 3;
 }
 
 message G2G_LockResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType G2G_LockReleaseResponse
 message G2G_LockReleaseRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Id = 1;
-	string Address = 2;
+	int32 RpcId = 1;
+	int64 Id = 2;
+	string Address = 3;
 }
 
 message G2G_LockReleaseResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType ObjectAddResponse
 message ObjectAddRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;
-	int64 InstanceId = 2;
+	int32 RpcId = 1;
+	int64 Key = 2;
+	int64 InstanceId = 3;
 }
 
 message ObjectAddResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType ObjectLockResponse
 message ObjectLockRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;
-	int64 InstanceId = 2;
-	int32 Time = 3;
+	int32 RpcId = 1;
+	int64 Key = 2;
+	int64 InstanceId = 3;
+	int32 Time = 4;
 }
 message ObjectLockResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType ObjectUnLockResponse
 message ObjectUnLockRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;
-	int64 OldInstanceId = 2;
-	int64 InstanceId = 3;
+	int32 RpcId = 1;
+	int64 Key = 2;
+	int64 OldInstanceId = 3;
+	int64 InstanceId = 4;
 }
 message ObjectUnLockResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType ObjectRemoveResponse
 message ObjectRemoveRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;
+	int32 RpcId = 1;
+	int64 Key = 2;
 }
 message ObjectRemoveResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType ObjectGetResponse
 message ObjectGetRequest // IActorRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;
+	int32 RpcId = 1;
+	int64 Key = 2;
 }
 message ObjectGetResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-
-	int64 InstanceId = 1;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	int64 InstanceId = 4;
 }
 
 //ResponseType G2R_GetLoginKey
 message R2G_GetLoginKey // IActorRequest
 {
-	int32 RpcId = 90;
-	string Account = 1;
+	int32 RpcId = 1;
+	string Account = 2;
 }
 
 message G2R_GetLoginKey // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-
-	int64 Key = 1;
-	int64 GateId = 2;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	int64 Key = 4;
+	int64 GateId = 5;
 }
 
 message G2M_SessionDisconnect // IActorLocationMessage
 {
-	int32 RpcId = 90;
+	int32 RpcId = 1;
 }
 
 message ObjectQueryResponse // IActorResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-
-	bytes entity = 1;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	bytes Entity = 4;
 }
 
 //ResponseType M2M_UnitTransferResponse

+ 67 - 94
Unity/Assets/Config/Proto/OuterMessage_C_10001.proto

@@ -16,30 +16,30 @@ message RouterSync
 //ResponseType M2C_TestResponse
 message C2M_TestRequest // IActorLocationRequest
 {
-	int32 RpcId = 90;
-	string request = 1;
+	int32 RpcId = 1;
+	string request = 2;
 }
 
 message M2C_TestResponse // IActorLocationResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	string response = 1;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	string response = 4;
 }
 
 //ResponseType Actor_TransferResponse
 message Actor_TransferRequest // IActorLocationRequest
 {
-	int32 RpcId = 90;
-	int32 MapIndex = 1;
+	int32 RpcId = 1;
+	int32 MapIndex = 2;
 }
 
 message Actor_TransferResponse // IActorLocationResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType G2C_EnterMap
@@ -59,15 +59,9 @@ message G2C_EnterMap // IResponse
 
 message MoveInfo
 {
-	repeated float X = 1;
-	repeated float Y = 2;
-	repeated float Z = 3;
-
-	float A = 4;
-	float B = 5;
-	float C = 6;
-	float W = 7;
-	int32 TurnSpeed = 8;
+	repeated Unity.Mathematics.float3 Position = 1;
+	Unity.Mathematics.quaternion Rotation = 2;
+	int32 TurnSpeed = 3;
 }
 
 message UnitInfo
@@ -75,20 +69,16 @@ message UnitInfo
 	int64 UnitId = 1;
 	int32 ConfigId = 2;
 	int32 Type = 3;
-	float X = 4;
-	float Y = 5;
-	float Z = 6;
-	float ForwardX = 7;
-	float ForwardY = 8;
-	float ForwardZ = 9;
-	repeated int32 Ks = 10;
-	repeated int64 Vs = 11;
-	MoveInfo MoveInfo = 12;
+	Unity.Mathematics.float3 Position = 4;
+	Unity.Mathematics.float3 Forward = 5;
+	repeated int32 Ks = 6;
+	repeated int64 Vs = 7;
+	MoveInfo MoveInfo = 8;
 }
 
 message M2C_CreateUnits // IActorMessage
 {
-	repeated UnitInfo Units = 2;
+	repeated UnitInfo Units = 1;
 }
 
 message M2C_CreateMyUnit // IActorMessage
@@ -109,59 +99,42 @@ message M2C_RemoveUnits // IActorMessage
 
 message C2M_PathfindingResult // IActorLocationMessage
 {
-	int32 RpcId = 90;
-
-	float X = 1;
-	float Y = 2;
-	float Z = 3;
+	int32 RpcId = 1;
+	Unity.Mathematics.float3 Position = 2;
 }
 
 message C2M_Stop // IActorLocationMessage
 {
-	int32 RpcId = 90;
+	int32 RpcId = 1;
 }
 
 message M2C_PathfindingResult // IActorMessage
 {
 	int64 Id = 1;
-
-	float X = 2;
-	float Y = 3;
-	float Z = 4;
-
-	repeated float Xs = 5;
-	repeated float Ys = 6;
-	repeated float Zs = 7;
+	Unity.Mathematics.float3 Position = 2;
+	repeated Unity.Mathematics.float3 Points = 3;
 }
 
 message M2C_Stop // IActorMessage
 {
 	int32 Error = 1;
-
 	int64 Id = 2;
-	float X = 3;
-	float Y = 4;
-	float Z = 5;
-
-	float A = 6;
-	float B = 7;
-	float C = 8;
-	float W = 9;
+	Unity.Mathematics.float3 Position = 3;
+	Unity.Mathematics.quaternion Rotation = 4;
 }
 
 //ResponseType G2C_Ping
 message C2G_Ping // IRequest
 {
-	int32 RpcId = 90;
+	int32 RpcId = 1;
 }
 
 message G2C_Ping // IResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-
-	int64 Time = 1;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	int64 Time = 4;
 }
 
 
@@ -172,50 +145,50 @@ message G2C_Test // IMessage
 //ResponseType M2C_Reload
 message C2M_Reload // IRequest
 {
-	int32 RpcId = 90;
-	string Account = 1;
-	string Password = 2;
+	int32 RpcId = 1;
+	string Account = 2;
+	string Password = 3;
 }
 
 message M2C_Reload // IResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType R2C_Login
 message C2R_Login // IRequest
 {
-	int32 RpcId = 90;
-	string  Account = 1;  // 帐号
-	string  Password = 2;  // 密码
+	int32 RpcId = 1;
+	string  Account = 2;  // 帐号
+	string  Password = 3;  // 密码
 }
 
 message R2C_Login // IResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	string Address = 1;
-	int64 Key = 2;
-	int64 GateId = 3;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	string Address = 4;
+	int64 Key = 5;
+	int64 GateId = 6;
 }
 
 //ResponseType G2C_LoginGate
 message C2G_LoginGate // IRequest
 {
-	int32 RpcId = 90;
-	int64 Key = 1;  // 帐号
-	int64 GateId = 2;
+	int32 RpcId = 1;
+	int64 Key = 2;  // 帐号
+	int64 GateId = 3;
 }
 
 message G2C_LoginGate // IResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	int64 PlayerId = 1;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	int64 PlayerId = 4;
 }
 
 message G2C_TestHotfixMessage // IMessage
@@ -226,16 +199,16 @@ message G2C_TestHotfixMessage // IMessage
 //ResponseType M2C_TestRobotCase
 message C2M_TestRobotCase // IActorLocationRequest
 {
-	int32 RpcId = 90;
-	int32 N = 1;
+	int32 RpcId = 1;
+	int32 N = 2;
 }
 
 message M2C_TestRobotCase // IActorLocationResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
-	int32 N = 1;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	int32 N = 4;
 }
 
 //ResponseType M2C_TransferMap
@@ -246,20 +219,20 @@ message C2M_TransferMap // IActorLocationRequest
 
 message M2C_TransferMap // IActorLocationResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }
 
 //ResponseType G2C_Benchmark
 message C2G_Benchmark // IRequest
 {
-	int32 RpcId = 90;
+	int32 RpcId = 1;
 }
 
 message G2C_Benchmark // IResponse
 {
-	int32 RpcId = 90;
-	int32 Error = 91;
-	string Message = 92;
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
 }

+ 1 - 6
Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Move/M2C_PathfindingResultHandler.cs

@@ -14,12 +14,7 @@ namespace ET.Client
 
 			using (ListComponent<float3> list = ListComponent<float3>.Create())
 			{
-				for (int i = 0; i < message.Xs.Count; ++i)
-				{
-					list.Add(new float3(message.Xs[i], message.Ys[i], message.Zs[i]));
-				}
-
-				await unit.GetComponent<MoveComponent>().MoveToAsync(list, speed);
+				await unit.GetComponent<MoveComponent>().MoveToAsync(message.Points, speed);
 			}
 		}
 	}

+ 2 - 5
Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Move/M2C_StopHandler.cs

@@ -13,13 +13,10 @@ namespace ET.Client
 				return;
 			}
 
-			float3 pos = new float3(message.X, message.Y, message.Z);
-			quaternion rotation = new quaternion(message.A, message.B, message.C, message.W);
-
 			MoveComponent moveComponent = unit.GetComponent<MoveComponent>();
 			moveComponent.Stop();
-			unit.Position = pos;
-			unit.Rotation = rotation;
+			unit.Position = message.Position;
+			unit.Rotation = message.Rotation;
 			unit.GetComponent<ObjectWait>()?.Notify(new Wait_UnitStop() {Error = message.Error});
 			await ETTask.CompletedTask;
 		}

+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Move/MoveHelper.cs

@@ -9,7 +9,7 @@ namespace ET.Client
         // 可以多次调用,多次调用的话会取消上一次的协程
         public static async ETTask<int> MoveToAsync(this Unit unit, float3 targetPos, ETCancellationToken cancellationToken = null)
         {
-            C2M_PathfindingResult msg = new C2M_PathfindingResult() {X = targetPos.x, Y = targetPos.y, Z = targetPos.z};
+            C2M_PathfindingResult msg = new C2M_PathfindingResult() { Position = targetPos };
             unit.ClientScene().GetComponent<SessionComponent>().Session.Send(msg);
 
             ObjectWait objectWait = unit.GetComponent<ObjectWait>();

+ 9 - 15
Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Unit/UnitFactory.cs

@@ -10,8 +10,8 @@ namespace ET.Client
 	        Unit unit = unitComponent.AddChildWithId<Unit, int>(unitInfo.UnitId, unitInfo.ConfigId);
 	        unitComponent.Add(unit);
 	        
-	        unit.Position = new float3(unitInfo.X, unitInfo.Y, unitInfo.Z);
-	        unit.Forward = new float3(unitInfo.ForwardX, unitInfo.ForwardY, unitInfo.ForwardZ);
+	        unit.Position = unitInfo.Position;
+	        unit.Forward = unitInfo.Forward;
 	        
 	        NumericComponent numericComponent = unit.AddComponent<NumericComponent>();
 	        for (int i = 0; i < unitInfo.Ks.Count; ++i)
@@ -22,19 +22,13 @@ namespace ET.Client
 	        unit.AddComponent<MoveComponent>();
 	        if (unitInfo.MoveInfo != null)
 	        {
-		        if (unitInfo.MoveInfo.X.Count > 0)
-		        {
-			        using (ListComponent<float3> list = ListComponent<float3>.Create())
-			        {
-				        list.Add(unit.Position);
-				        for (int i = 0; i < unitInfo.MoveInfo.X.Count; ++i)
-				        {
-					        list.Add(new float3(unitInfo.MoveInfo.X[i], unitInfo.MoveInfo.Y[i], unitInfo.MoveInfo.Z[i]));
-				        }
-
-				        unit.MoveToAsync(list).Coroutine();
-			        }
-		        }
+		        if (unitInfo.MoveInfo.Position.Count > 0)
+				{
+					using ListComponent<float3> list = ListComponent<float3>.Create();
+					list.Add(unit.Position);
+					list.AddRange(unitInfo.MoveInfo.Position);
+					unit.MoveToAsync(list).Coroutine();
+				}
 	        }
 
 	        unit.AddComponent<ObjectWait>();

+ 2 - 6
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Move/C2M_PathfindingResultHandler.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using Unity.Mathematics;
-
+
 namespace ET.Server
 {
 	[ActorMessageHandler(SceneType.Map)]
@@ -8,9 +6,7 @@ namespace ET.Server
 	{
 		protected override async ETTask Run(Unit unit, C2M_PathfindingResult message)
 		{
-			float3 target = new float3(message.X, message.Y, message.Z);
-
-			unit.FindPathMoveToAsync(target).Coroutine();
+			unit.FindPathMoveToAsync(message.Position).Coroutine();
 			
 			await ETTask.CompletedTask;
 		}

+ 7 - 17
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Move/MoveHelper.cs

@@ -16,30 +16,26 @@ namespace ET.Server
                 return;
             }
 
-            using var list = ListComponent<float3>.Create();
+            List<float3> list = new List<float3>();
             
             unit.GetComponent<PathfindingComponent>().Find(unit.Position, target, list);
 
-            List<float3> path = list;
-            if (path.Count < 2)
+            if (list.Count < 2)
             {
                 unit.SendStop(0);
                 return;
             }
                 
             // 广播寻路路径
-            M2C_PathfindingResult m2CPathfindingResult = new M2C_PathfindingResult();
+            M2C_PathfindingResult m2CPathfindingResult = new M2C_PathfindingResult() {Points = new List<float3>()};
             m2CPathfindingResult.Id = unit.Id;
             for (int i = 0; i < list.Count; ++i)
             {
-                float3 vector3 = list[i];
-                m2CPathfindingResult.Xs.Add(vector3.x);
-                m2CPathfindingResult.Ys.Add(vector3.y);
-                m2CPathfindingResult.Zs.Add(vector3.z);
+                m2CPathfindingResult.Points = list;
             }
             MessageHelper.Broadcast(unit, m2CPathfindingResult);
 
-            bool ret = await unit.GetComponent<MoveComponent>().MoveToAsync(path, speed);
+            bool ret = await unit.GetComponent<MoveComponent>().MoveToAsync(list, speed);
             if (ret) // 如果返回false,说明被其它移动取消了,这时候不需要通知客户端stop
             {
                 unit.SendStop(0);
@@ -58,14 +54,8 @@ namespace ET.Server
             {
                 Error = error,
                 Id = unit.Id, 
-                X = unit.Position.x,
-                Y = unit.Position.y,
-                Z = unit.Position.z,
-						
-                A = unit.Rotation.value.x,
-                B = unit.Rotation.value.y,
-                C = unit.Rotation.value.z,
-                W = unit.Rotation.value.w,
+                Position = unit.Position,
+                Rotation = unit.Rotation,
             });
         }
     }

+ 3 - 2
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Transfer/TransferHelper.cs

@@ -1,4 +1,5 @@
-using MongoDB.Bson;
+using System.Collections.Generic;
+using MongoDB.Bson;
 
 namespace ET.Server
 {
@@ -10,7 +11,7 @@ namespace ET.Server
             long unitId = unit.Id;
             long unitInstanceId = unit.InstanceId;
             
-            M2M_UnitTransferRequest request = new M2M_UnitTransferRequest();
+            M2M_UnitTransferRequest request = new M2M_UnitTransferRequest() {Entitys = new List<byte[]>()};
             request.OldInstanceId = unitInstanceId;
             request.Unit = unit.ToBson();
             foreach (Entity entity in unit.Components.Values)

+ 6 - 11
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Unit/UnitHelper.cs

@@ -14,14 +14,8 @@ namespace ET.Server
             unitInfo.UnitId = unit.Id;
             unitInfo.ConfigId = unit.ConfigId;
             unitInfo.Type = (int)unit.Type;
-            float3 position = unit.Position;
-            unitInfo.X = position.x;
-            unitInfo.Y = position.y;
-            unitInfo.Z = position.z;
-            float3 forward = unit.Forward;
-            unitInfo.ForwardX = forward.x;
-            unitInfo.ForwardY = forward.y;
-            unitInfo.ForwardZ = forward.z;
+            unitInfo.Position = unit.Position;
+            unitInfo.Forward = unit.Forward;
 
             MoveComponent moveComponent = unit.GetComponent<MoveComponent>();
             if (moveComponent != null)
@@ -32,13 +26,14 @@ namespace ET.Server
                     for (int i = moveComponent.N; i < moveComponent.Targets.Count; ++i)
                     {
                         float3 pos = moveComponent.Targets[i];
-                        unitInfo.MoveInfo.X.Add(pos.x);
-                        unitInfo.MoveInfo.Y.Add(pos.y);
-                        unitInfo.MoveInfo.Z.Add(pos.z);
+                        unitInfo.MoveInfo.Position.Add(pos);
                     }
                 }
             }
 
+            unitInfo.Ks = new List<int>();
+            unitInfo.Vs = new List<long>();
+
             foreach ((int key, long value) in nc.NumericDic)
             {
                 unitInfo.Ks.Add(key);

+ 0 - 7
Unity/Assets/Scripts/Codes/Hotfix/Server/Module/Actor/ActorHelper.cs

@@ -13,12 +13,5 @@ namespace ET.Server
             response.RpcId = iActorRequest.RpcId;
             return response;
         }
-
-        public static object ToActorMessage(this MemoryStream memoryStream)
-        {
-            ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), 8);
-            Type type = NetServices.Instance.GetType(opcode);
-            return ProtobufHelper.FromBytes(type, memoryStream.GetBuffer(), 10, (int)memoryStream.Length - 10);
-        }
     }
 }

+ 1 - 3
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Opera/OperaComponentSystem.cs

@@ -34,9 +34,7 @@ namespace ET.Client
                 {
                     self.ClickPoint = hit.point;
                     C2M_PathfindingResult c2MPathfindingResult = new C2M_PathfindingResult();
-                    c2MPathfindingResult.X = self.ClickPoint.x;
-                    c2MPathfindingResult.Y = self.ClickPoint.y;
-                    c2MPathfindingResult.Z = self.ClickPoint.z;
+                    c2MPathfindingResult.Position = self.ClickPoint;
                     self.ClientScene().GetComponent<SessionComponent>().Session.Send(c2MPathfindingResult);
                 }
             }

+ 103 - 163
Unity/Assets/Scripts/Codes/Model/Generate/Client/Message/OuterMessage_C_10001.cs

@@ -5,19 +5,19 @@ namespace ET
 {
 	[Message(OuterMessage.HttpGetRouterResponse)]
 	[ProtoContract]
-	public partial class HttpGetRouterResponse: Object
+	public partial class HttpGetRouterResponse: ProtoObject
 	{
 		[ProtoMember(1)]
-		public List<string> Realms = new List<string>();
+		public List<string> Realms;
 
 		[ProtoMember(2)]
-		public List<string> Routers = new List<string>();
+		public List<string> Routers;
 
 	}
 
 	[Message(OuterMessage.RouterSync)]
 	[ProtoContract]
-	public partial class RouterSync: Object
+	public partial class RouterSync: ProtoObject
 	{
 		[ProtoMember(1)]
 		public uint ConnectId { get; set; }
@@ -30,30 +30,30 @@ namespace ET
 	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterMessage.C2M_TestRequest)]
 	[ProtoContract]
-	public partial class C2M_TestRequest: Object, IActorLocationRequest
+	public partial class C2M_TestRequest: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string request { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_TestResponse)]
 	[ProtoContract]
-	public partial class M2C_TestResponse: Object, IActorLocationResponse
+	public partial class M2C_TestResponse: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public string response { get; set; }
 
 	}
@@ -61,27 +61,27 @@ namespace ET
 	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterMessage.Actor_TransferRequest)]
 	[ProtoContract]
-	public partial class Actor_TransferRequest: Object, IActorLocationRequest
+	public partial class Actor_TransferRequest: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public int MapIndex { get; set; }
 
 	}
 
 	[Message(OuterMessage.Actor_TransferResponse)]
 	[ProtoContract]
-	public partial class Actor_TransferResponse: Object, IActorLocationResponse
+	public partial class Actor_TransferResponse: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -89,7 +89,7 @@ namespace ET
 	[ResponseType(nameof(G2C_EnterMap))]
 	[Message(OuterMessage.C2G_EnterMap)]
 	[ProtoContract]
-	public partial class C2G_EnterMap: Object, IRequest
+	public partial class C2G_EnterMap: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -98,7 +98,7 @@ namespace ET
 
 	[Message(OuterMessage.G2C_EnterMap)]
 	[ProtoContract]
-	public partial class G2C_EnterMap: Object, IResponse
+	public partial class G2C_EnterMap: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -117,37 +117,22 @@ namespace ET
 
 	[Message(OuterMessage.MoveInfo)]
 	[ProtoContract]
-	public partial class MoveInfo: Object
+	public partial class MoveInfo: ProtoObject
 	{
 		[ProtoMember(1)]
-		public List<float> X = new List<float>();
+		public List<Unity.Mathematics.float3> Position;
 
 		[ProtoMember(2)]
-		public List<float> Y = new List<float>();
+		public Unity.Mathematics.quaternion Rotation { get; set; }
 
 		[ProtoMember(3)]
-		public List<float> Z = new List<float>();
-
-		[ProtoMember(4)]
-		public float A { get; set; }
-
-		[ProtoMember(5)]
-		public float B { get; set; }
-
-		[ProtoMember(6)]
-		public float C { get; set; }
-
-		[ProtoMember(7)]
-		public float W { get; set; }
-
-		[ProtoMember(8)]
 		public int TurnSpeed { get; set; }
 
 	}
 
 	[Message(OuterMessage.UnitInfo)]
 	[ProtoContract]
-	public partial class UnitInfo: Object
+	public partial class UnitInfo: ProtoObject
 	{
 		[ProtoMember(1)]
 		public long UnitId { get; set; }
@@ -159,46 +144,34 @@ namespace ET
 		public int Type { get; set; }
 
 		[ProtoMember(4)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(5)]
-		public float Y { get; set; }
+		public Unity.Mathematics.float3 Forward { get; set; }
 
 		[ProtoMember(6)]
-		public float Z { get; set; }
+		public List<int> Ks;
 
 		[ProtoMember(7)]
-		public float ForwardX { get; set; }
+		public List<long> Vs;
 
 		[ProtoMember(8)]
-		public float ForwardY { get; set; }
-
-		[ProtoMember(9)]
-		public float ForwardZ { get; set; }
-
-		[ProtoMember(10)]
-		public List<int> Ks = new List<int>();
-
-		[ProtoMember(11)]
-		public List<long> Vs = new List<long>();
-
-		[ProtoMember(12)]
 		public MoveInfo MoveInfo { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_CreateUnits)]
 	[ProtoContract]
-	public partial class M2C_CreateUnits: Object, IActorMessage
+	public partial class M2C_CreateUnits: ProtoObject, IActorMessage
 	{
-		[ProtoMember(2)]
-		public List<UnitInfo> Units = new List<UnitInfo>();
+		[ProtoMember(1)]
+		public List<UnitInfo> Units;
 
 	}
 
 	[Message(OuterMessage.M2C_CreateMyUnit)]
 	[ProtoContract]
-	public partial class M2C_CreateMyUnit: Object, IActorMessage
+	public partial class M2C_CreateMyUnit: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public UnitInfo Unit { get; set; }
@@ -207,7 +180,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_StartSceneChange)]
 	[ProtoContract]
-	public partial class M2C_StartSceneChange: Object, IActorMessage
+	public partial class M2C_StartSceneChange: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public long SceneInstanceId { get; set; }
@@ -219,70 +192,52 @@ namespace ET
 
 	[Message(OuterMessage.M2C_RemoveUnits)]
 	[ProtoContract]
-	public partial class M2C_RemoveUnits: Object, IActorMessage
+	public partial class M2C_RemoveUnits: ProtoObject, IActorMessage
 	{
 		[ProtoMember(2)]
-		public List<long> Units = new List<long>();
+		public List<long> Units;
 
 	}
 
 	[Message(OuterMessage.C2M_PathfindingResult)]
 	[ProtoContract]
-	public partial class C2M_PathfindingResult: Object, IActorLocationMessage
+	public partial class C2M_PathfindingResult: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
-		public int RpcId { get; set; }
-
 		[ProtoMember(1)]
-		public float X { get; set; }
+		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public float Y { get; set; }
-
-		[ProtoMember(3)]
-		public float Z { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 	}
 
 	[Message(OuterMessage.C2M_Stop)]
 	[ProtoContract]
-	public partial class C2M_Stop: Object, IActorLocationMessage
+	public partial class C2M_Stop: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_PathfindingResult)]
 	[ProtoContract]
-	public partial class M2C_PathfindingResult: Object, IActorMessage
+	public partial class M2C_PathfindingResult: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
 		[ProtoMember(2)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(3)]
-		public float Y { get; set; }
-
-		[ProtoMember(4)]
-		public float Z { get; set; }
-
-		[ProtoMember(5)]
-		public List<float> Xs = new List<float>();
-
-		[ProtoMember(6)]
-		public List<float> Ys = new List<float>();
-
-		[ProtoMember(7)]
-		public List<float> Zs = new List<float>();
+		public List<Unity.Mathematics.float3> Points;
 
 	}
 
 	[Message(OuterMessage.M2C_Stop)]
 	[ProtoContract]
-	public partial class M2C_Stop: Object, IActorMessage
+	public partial class M2C_Stop: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public int Error { get; set; }
@@ -291,89 +246,74 @@ namespace ET
 		public long Id { get; set; }
 
 		[ProtoMember(3)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(4)]
-		public float Y { get; set; }
-
-		[ProtoMember(5)]
-		public float Z { get; set; }
-
-		[ProtoMember(6)]
-		public float A { get; set; }
-
-		[ProtoMember(7)]
-		public float B { get; set; }
-
-		[ProtoMember(8)]
-		public float C { get; set; }
-
-		[ProtoMember(9)]
-		public float W { get; set; }
+		public Unity.Mathematics.quaternion Rotation { get; set; }
 
 	}
 
 	[ResponseType(nameof(G2C_Ping))]
 	[Message(OuterMessage.C2G_Ping)]
 	[ProtoContract]
-	public partial class C2G_Ping: Object, IRequest
+	public partial class C2G_Ping: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Ping)]
 	[ProtoContract]
-	public partial class G2C_Ping: Object, IResponse
+	public partial class G2C_Ping: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long Time { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Test)]
 	[ProtoContract]
-	public partial class G2C_Test: Object, IMessage
+	public partial class G2C_Test: ProtoObject, IMessage
 	{
 	}
 
 	[ResponseType(nameof(M2C_Reload))]
 	[Message(OuterMessage.C2M_Reload)]
 	[ProtoContract]
-	public partial class C2M_Reload: Object, IRequest
+	public partial class C2M_Reload: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Password { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_Reload)]
 	[ProtoContract]
-	public partial class M2C_Reload: Object, IResponse
+	public partial class M2C_Reload: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -381,39 +321,39 @@ namespace ET
 	[ResponseType(nameof(R2C_Login))]
 	[Message(OuterMessage.C2R_Login)]
 	[ProtoContract]
-	public partial class C2R_Login: Object, IRequest
+	public partial class C2R_Login: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Password { get; set; }
 
 	}
 
 	[Message(OuterMessage.R2C_Login)]
 	[ProtoContract]
-	public partial class R2C_Login: Object, IResponse
+	public partial class R2C_Login: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public string Address { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(5)]
 		public long Key { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(6)]
 		public long GateId { get; set; }
 
 	}
@@ -421,40 +361,40 @@ namespace ET
 	[ResponseType(nameof(G2C_LoginGate))]
 	[Message(OuterMessage.C2G_LoginGate)]
 	[ProtoContract]
-	public partial class C2G_LoginGate: Object, IRequest
+	public partial class C2G_LoginGate: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long GateId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_LoginGate)]
 	[ProtoContract]
-	public partial class G2C_LoginGate: Object, IResponse
+	public partial class G2C_LoginGate: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long PlayerId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
 	[ProtoContract]
-	public partial class G2C_TestHotfixMessage: Object, IMessage
+	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
 	{
 		[ProtoMember(1)]
 		public string Info { get; set; }
@@ -464,30 +404,30 @@ namespace ET
 	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterMessage.C2M_TestRobotCase)]
 	[ProtoContract]
-	public partial class C2M_TestRobotCase: Object, IActorLocationRequest
+	public partial class C2M_TestRobotCase: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public int N { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_TestRobotCase)]
 	[ProtoContract]
-	public partial class M2C_TestRobotCase: Object, IActorLocationResponse
+	public partial class M2C_TestRobotCase: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public int N { get; set; }
 
 	}
@@ -495,7 +435,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TransferMap))]
 	[Message(OuterMessage.C2M_TransferMap)]
 	[ProtoContract]
-	public partial class C2M_TransferMap: Object, IActorLocationRequest
+	public partial class C2M_TransferMap: ProtoObject, IActorLocationRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -504,15 +444,15 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TransferMap)]
 	[ProtoContract]
-	public partial class M2C_TransferMap: Object, IActorLocationResponse
+	public partial class M2C_TransferMap: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -520,24 +460,24 @@ namespace ET
 	[ResponseType(nameof(G2C_Benchmark))]
 	[Message(OuterMessage.C2G_Benchmark)]
 	[ProtoContract]
-	public partial class C2G_Benchmark: Object, IRequest
+	public partial class C2G_Benchmark: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Benchmark)]
 	[ProtoContract]
-	public partial class G2C_Benchmark: Object, IResponse
+	public partial class G2C_Benchmark: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}

+ 88 - 87
Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/InnerMessage_S_20001.cs

@@ -3,18 +3,19 @@ using ProtoBuf;
 using System.Collections.Generic;
 namespace ET
 {
+// using
 	[ResponseType(nameof(ObjectQueryResponse))]
 	[Message(InnerMessage.ObjectQueryRequest)]
 	[ProtoContract]
-	public partial class ObjectQueryRequest: Object, IActorRequest
+	public partial class ObjectQueryRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long InstanceId { get; set; }
 
 	}
@@ -22,24 +23,24 @@ namespace ET
 	[ResponseType(nameof(A2M_Reload))]
 	[Message(InnerMessage.M2A_Reload)]
 	[ProtoContract]
-	public partial class M2A_Reload: Object, IActorRequest
+	public partial class M2A_Reload: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(InnerMessage.A2M_Reload)]
 	[ProtoContract]
-	public partial class A2M_Reload: Object, IActorResponse
+	public partial class A2M_Reload: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -47,30 +48,30 @@ namespace ET
 	[ResponseType(nameof(G2G_LockResponse))]
 	[Message(InnerMessage.G2G_LockRequest)]
 	[ProtoContract]
-	public partial class G2G_LockRequest: Object, IActorRequest
+	public partial class G2G_LockRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Id { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Address { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2G_LockResponse)]
 	[ProtoContract]
-	public partial class G2G_LockResponse: Object, IActorResponse
+	public partial class G2G_LockResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -78,30 +79,30 @@ namespace ET
 	[ResponseType(nameof(G2G_LockReleaseResponse))]
 	[Message(InnerMessage.G2G_LockReleaseRequest)]
 	[ProtoContract]
-	public partial class G2G_LockReleaseRequest: Object, IActorRequest
+	public partial class G2G_LockReleaseRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Id { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Address { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2G_LockReleaseResponse)]
 	[ProtoContract]
-	public partial class G2G_LockReleaseResponse: Object, IActorResponse
+	public partial class G2G_LockReleaseResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -109,30 +110,30 @@ namespace ET
 	[ResponseType(nameof(ObjectAddResponse))]
 	[Message(InnerMessage.ObjectAddRequest)]
 	[ProtoContract]
-	public partial class ObjectAddRequest: Object, IActorRequest
+	public partial class ObjectAddRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long InstanceId { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectAddResponse)]
 	[ProtoContract]
-	public partial class ObjectAddResponse: Object, IActorResponse
+	public partial class ObjectAddResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -140,33 +141,33 @@ namespace ET
 	[ResponseType(nameof(ObjectLockResponse))]
 	[Message(InnerMessage.ObjectLockRequest)]
 	[ProtoContract]
-	public partial class ObjectLockRequest: Object, IActorRequest
+	public partial class ObjectLockRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long InstanceId { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(4)]
 		public int Time { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectLockResponse)]
 	[ProtoContract]
-	public partial class ObjectLockResponse: Object, IActorResponse
+	public partial class ObjectLockResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -174,33 +175,33 @@ namespace ET
 	[ResponseType(nameof(ObjectUnLockResponse))]
 	[Message(InnerMessage.ObjectUnLockRequest)]
 	[ProtoContract]
-	public partial class ObjectUnLockRequest: Object, IActorRequest
+	public partial class ObjectUnLockRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long OldInstanceId { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(4)]
 		public long InstanceId { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectUnLockResponse)]
 	[ProtoContract]
-	public partial class ObjectUnLockResponse: Object, IActorResponse
+	public partial class ObjectUnLockResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -208,27 +209,27 @@ namespace ET
 	[ResponseType(nameof(ObjectRemoveResponse))]
 	[Message(InnerMessage.ObjectRemoveRequest)]
 	[ProtoContract]
-	public partial class ObjectRemoveRequest: Object, IActorRequest
+	public partial class ObjectRemoveRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectRemoveResponse)]
 	[ProtoContract]
-	public partial class ObjectRemoveResponse: Object, IActorResponse
+	public partial class ObjectRemoveResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -236,30 +237,30 @@ namespace ET
 	[ResponseType(nameof(ObjectGetResponse))]
 	[Message(InnerMessage.ObjectGetRequest)]
 	[ProtoContract]
-	public partial class ObjectGetRequest: Object, IActorRequest
+	public partial class ObjectGetRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectGetResponse)]
 	[ProtoContract]
-	public partial class ObjectGetResponse: Object, IActorResponse
+	public partial class ObjectGetResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long InstanceId { get; set; }
 
 	}
@@ -267,68 +268,68 @@ namespace ET
 	[ResponseType(nameof(G2R_GetLoginKey))]
 	[Message(InnerMessage.R2G_GetLoginKey)]
 	[ProtoContract]
-	public partial class R2G_GetLoginKey: Object, IActorRequest
+	public partial class R2G_GetLoginKey: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2R_GetLoginKey)]
 	[ProtoContract]
-	public partial class G2R_GetLoginKey: Object, IActorResponse
+	public partial class G2R_GetLoginKey: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(5)]
 		public long GateId { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2M_SessionDisconnect)]
 	[ProtoContract]
-	public partial class G2M_SessionDisconnect: Object, IActorLocationMessage
+	public partial class G2M_SessionDisconnect: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectQueryResponse)]
 	[ProtoContract]
-	public partial class ObjectQueryResponse: Object, IActorResponse
+	public partial class ObjectQueryResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
-		public byte[] entity { get; set; }
+		[ProtoMember(4)]
+		public byte[] Entity { get; set; }
 
 	}
 
 	[ResponseType(nameof(M2M_UnitTransferResponse))]
 	[Message(InnerMessage.M2M_UnitTransferRequest)]
 	[ProtoContract]
-	public partial class M2M_UnitTransferRequest: Object, IActorRequest
+	public partial class M2M_UnitTransferRequest: ProtoObject, IActorRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -340,13 +341,13 @@ namespace ET
 		public byte[] Unit { get; set; }
 
 		[ProtoMember(4)]
-		public List<byte[]> Entitys = new List<byte[]>();
+		public List<byte[]> Entitys;
 
 	}
 
 	[Message(InnerMessage.M2M_UnitTransferResponse)]
 	[ProtoContract]
-	public partial class M2M_UnitTransferResponse: Object, IActorResponse
+	public partial class M2M_UnitTransferResponse: ProtoObject, IActorResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }

+ 103 - 163
Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/OuterMessage_C_10001.cs

@@ -5,19 +5,19 @@ namespace ET
 {
 	[Message(OuterMessage.HttpGetRouterResponse)]
 	[ProtoContract]
-	public partial class HttpGetRouterResponse: Object
+	public partial class HttpGetRouterResponse: ProtoObject
 	{
 		[ProtoMember(1)]
-		public List<string> Realms = new List<string>();
+		public List<string> Realms;
 
 		[ProtoMember(2)]
-		public List<string> Routers = new List<string>();
+		public List<string> Routers;
 
 	}
 
 	[Message(OuterMessage.RouterSync)]
 	[ProtoContract]
-	public partial class RouterSync: Object
+	public partial class RouterSync: ProtoObject
 	{
 		[ProtoMember(1)]
 		public uint ConnectId { get; set; }
@@ -30,30 +30,30 @@ namespace ET
 	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterMessage.C2M_TestRequest)]
 	[ProtoContract]
-	public partial class C2M_TestRequest: Object, IActorLocationRequest
+	public partial class C2M_TestRequest: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string request { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_TestResponse)]
 	[ProtoContract]
-	public partial class M2C_TestResponse: Object, IActorLocationResponse
+	public partial class M2C_TestResponse: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public string response { get; set; }
 
 	}
@@ -61,27 +61,27 @@ namespace ET
 	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterMessage.Actor_TransferRequest)]
 	[ProtoContract]
-	public partial class Actor_TransferRequest: Object, IActorLocationRequest
+	public partial class Actor_TransferRequest: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public int MapIndex { get; set; }
 
 	}
 
 	[Message(OuterMessage.Actor_TransferResponse)]
 	[ProtoContract]
-	public partial class Actor_TransferResponse: Object, IActorLocationResponse
+	public partial class Actor_TransferResponse: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -89,7 +89,7 @@ namespace ET
 	[ResponseType(nameof(G2C_EnterMap))]
 	[Message(OuterMessage.C2G_EnterMap)]
 	[ProtoContract]
-	public partial class C2G_EnterMap: Object, IRequest
+	public partial class C2G_EnterMap: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -98,7 +98,7 @@ namespace ET
 
 	[Message(OuterMessage.G2C_EnterMap)]
 	[ProtoContract]
-	public partial class G2C_EnterMap: Object, IResponse
+	public partial class G2C_EnterMap: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -117,37 +117,22 @@ namespace ET
 
 	[Message(OuterMessage.MoveInfo)]
 	[ProtoContract]
-	public partial class MoveInfo: Object
+	public partial class MoveInfo: ProtoObject
 	{
 		[ProtoMember(1)]
-		public List<float> X = new List<float>();
+		public List<Unity.Mathematics.float3> Position;
 
 		[ProtoMember(2)]
-		public List<float> Y = new List<float>();
+		public Unity.Mathematics.quaternion Rotation { get; set; }
 
 		[ProtoMember(3)]
-		public List<float> Z = new List<float>();
-
-		[ProtoMember(4)]
-		public float A { get; set; }
-
-		[ProtoMember(5)]
-		public float B { get; set; }
-
-		[ProtoMember(6)]
-		public float C { get; set; }
-
-		[ProtoMember(7)]
-		public float W { get; set; }
-
-		[ProtoMember(8)]
 		public int TurnSpeed { get; set; }
 
 	}
 
 	[Message(OuterMessage.UnitInfo)]
 	[ProtoContract]
-	public partial class UnitInfo: Object
+	public partial class UnitInfo: ProtoObject
 	{
 		[ProtoMember(1)]
 		public long UnitId { get; set; }
@@ -159,46 +144,34 @@ namespace ET
 		public int Type { get; set; }
 
 		[ProtoMember(4)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(5)]
-		public float Y { get; set; }
+		public Unity.Mathematics.float3 Forward { get; set; }
 
 		[ProtoMember(6)]
-		public float Z { get; set; }
+		public List<int> Ks;
 
 		[ProtoMember(7)]
-		public float ForwardX { get; set; }
+		public List<long> Vs;
 
 		[ProtoMember(8)]
-		public float ForwardY { get; set; }
-
-		[ProtoMember(9)]
-		public float ForwardZ { get; set; }
-
-		[ProtoMember(10)]
-		public List<int> Ks = new List<int>();
-
-		[ProtoMember(11)]
-		public List<long> Vs = new List<long>();
-
-		[ProtoMember(12)]
 		public MoveInfo MoveInfo { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_CreateUnits)]
 	[ProtoContract]
-	public partial class M2C_CreateUnits: Object, IActorMessage
+	public partial class M2C_CreateUnits: ProtoObject, IActorMessage
 	{
-		[ProtoMember(2)]
-		public List<UnitInfo> Units = new List<UnitInfo>();
+		[ProtoMember(1)]
+		public List<UnitInfo> Units;
 
 	}
 
 	[Message(OuterMessage.M2C_CreateMyUnit)]
 	[ProtoContract]
-	public partial class M2C_CreateMyUnit: Object, IActorMessage
+	public partial class M2C_CreateMyUnit: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public UnitInfo Unit { get; set; }
@@ -207,7 +180,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_StartSceneChange)]
 	[ProtoContract]
-	public partial class M2C_StartSceneChange: Object, IActorMessage
+	public partial class M2C_StartSceneChange: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public long SceneInstanceId { get; set; }
@@ -219,70 +192,52 @@ namespace ET
 
 	[Message(OuterMessage.M2C_RemoveUnits)]
 	[ProtoContract]
-	public partial class M2C_RemoveUnits: Object, IActorMessage
+	public partial class M2C_RemoveUnits: ProtoObject, IActorMessage
 	{
 		[ProtoMember(2)]
-		public List<long> Units = new List<long>();
+		public List<long> Units;
 
 	}
 
 	[Message(OuterMessage.C2M_PathfindingResult)]
 	[ProtoContract]
-	public partial class C2M_PathfindingResult: Object, IActorLocationMessage
+	public partial class C2M_PathfindingResult: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
-		public int RpcId { get; set; }
-
 		[ProtoMember(1)]
-		public float X { get; set; }
+		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public float Y { get; set; }
-
-		[ProtoMember(3)]
-		public float Z { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 	}
 
 	[Message(OuterMessage.C2M_Stop)]
 	[ProtoContract]
-	public partial class C2M_Stop: Object, IActorLocationMessage
+	public partial class C2M_Stop: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_PathfindingResult)]
 	[ProtoContract]
-	public partial class M2C_PathfindingResult: Object, IActorMessage
+	public partial class M2C_PathfindingResult: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
 		[ProtoMember(2)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(3)]
-		public float Y { get; set; }
-
-		[ProtoMember(4)]
-		public float Z { get; set; }
-
-		[ProtoMember(5)]
-		public List<float> Xs = new List<float>();
-
-		[ProtoMember(6)]
-		public List<float> Ys = new List<float>();
-
-		[ProtoMember(7)]
-		public List<float> Zs = new List<float>();
+		public List<Unity.Mathematics.float3> Points;
 
 	}
 
 	[Message(OuterMessage.M2C_Stop)]
 	[ProtoContract]
-	public partial class M2C_Stop: Object, IActorMessage
+	public partial class M2C_Stop: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public int Error { get; set; }
@@ -291,89 +246,74 @@ namespace ET
 		public long Id { get; set; }
 
 		[ProtoMember(3)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(4)]
-		public float Y { get; set; }
-
-		[ProtoMember(5)]
-		public float Z { get; set; }
-
-		[ProtoMember(6)]
-		public float A { get; set; }
-
-		[ProtoMember(7)]
-		public float B { get; set; }
-
-		[ProtoMember(8)]
-		public float C { get; set; }
-
-		[ProtoMember(9)]
-		public float W { get; set; }
+		public Unity.Mathematics.quaternion Rotation { get; set; }
 
 	}
 
 	[ResponseType(nameof(G2C_Ping))]
 	[Message(OuterMessage.C2G_Ping)]
 	[ProtoContract]
-	public partial class C2G_Ping: Object, IRequest
+	public partial class C2G_Ping: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Ping)]
 	[ProtoContract]
-	public partial class G2C_Ping: Object, IResponse
+	public partial class G2C_Ping: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long Time { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Test)]
 	[ProtoContract]
-	public partial class G2C_Test: Object, IMessage
+	public partial class G2C_Test: ProtoObject, IMessage
 	{
 	}
 
 	[ResponseType(nameof(M2C_Reload))]
 	[Message(OuterMessage.C2M_Reload)]
 	[ProtoContract]
-	public partial class C2M_Reload: Object, IRequest
+	public partial class C2M_Reload: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Password { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_Reload)]
 	[ProtoContract]
-	public partial class M2C_Reload: Object, IResponse
+	public partial class M2C_Reload: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -381,39 +321,39 @@ namespace ET
 	[ResponseType(nameof(R2C_Login))]
 	[Message(OuterMessage.C2R_Login)]
 	[ProtoContract]
-	public partial class C2R_Login: Object, IRequest
+	public partial class C2R_Login: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Password { get; set; }
 
 	}
 
 	[Message(OuterMessage.R2C_Login)]
 	[ProtoContract]
-	public partial class R2C_Login: Object, IResponse
+	public partial class R2C_Login: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public string Address { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(5)]
 		public long Key { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(6)]
 		public long GateId { get; set; }
 
 	}
@@ -421,40 +361,40 @@ namespace ET
 	[ResponseType(nameof(G2C_LoginGate))]
 	[Message(OuterMessage.C2G_LoginGate)]
 	[ProtoContract]
-	public partial class C2G_LoginGate: Object, IRequest
+	public partial class C2G_LoginGate: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long GateId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_LoginGate)]
 	[ProtoContract]
-	public partial class G2C_LoginGate: Object, IResponse
+	public partial class G2C_LoginGate: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long PlayerId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
 	[ProtoContract]
-	public partial class G2C_TestHotfixMessage: Object, IMessage
+	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
 	{
 		[ProtoMember(1)]
 		public string Info { get; set; }
@@ -464,30 +404,30 @@ namespace ET
 	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterMessage.C2M_TestRobotCase)]
 	[ProtoContract]
-	public partial class C2M_TestRobotCase: Object, IActorLocationRequest
+	public partial class C2M_TestRobotCase: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public int N { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_TestRobotCase)]
 	[ProtoContract]
-	public partial class M2C_TestRobotCase: Object, IActorLocationResponse
+	public partial class M2C_TestRobotCase: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public int N { get; set; }
 
 	}
@@ -495,7 +435,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TransferMap))]
 	[Message(OuterMessage.C2M_TransferMap)]
 	[ProtoContract]
-	public partial class C2M_TransferMap: Object, IActorLocationRequest
+	public partial class C2M_TransferMap: ProtoObject, IActorLocationRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -504,15 +444,15 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TransferMap)]
 	[ProtoContract]
-	public partial class M2C_TransferMap: Object, IActorLocationResponse
+	public partial class M2C_TransferMap: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -520,24 +460,24 @@ namespace ET
 	[ResponseType(nameof(G2C_Benchmark))]
 	[Message(OuterMessage.C2G_Benchmark)]
 	[ProtoContract]
-	public partial class C2G_Benchmark: Object, IRequest
+	public partial class C2G_Benchmark: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Benchmark)]
 	[ProtoContract]
-	public partial class G2C_Benchmark: Object, IResponse
+	public partial class G2C_Benchmark: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}

+ 88 - 87
Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/InnerMessage_S_20001.cs

@@ -3,18 +3,19 @@ using ProtoBuf;
 using System.Collections.Generic;
 namespace ET
 {
+// using
 	[ResponseType(nameof(ObjectQueryResponse))]
 	[Message(InnerMessage.ObjectQueryRequest)]
 	[ProtoContract]
-	public partial class ObjectQueryRequest: Object, IActorRequest
+	public partial class ObjectQueryRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long InstanceId { get; set; }
 
 	}
@@ -22,24 +23,24 @@ namespace ET
 	[ResponseType(nameof(A2M_Reload))]
 	[Message(InnerMessage.M2A_Reload)]
 	[ProtoContract]
-	public partial class M2A_Reload: Object, IActorRequest
+	public partial class M2A_Reload: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(InnerMessage.A2M_Reload)]
 	[ProtoContract]
-	public partial class A2M_Reload: Object, IActorResponse
+	public partial class A2M_Reload: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -47,30 +48,30 @@ namespace ET
 	[ResponseType(nameof(G2G_LockResponse))]
 	[Message(InnerMessage.G2G_LockRequest)]
 	[ProtoContract]
-	public partial class G2G_LockRequest: Object, IActorRequest
+	public partial class G2G_LockRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Id { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Address { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2G_LockResponse)]
 	[ProtoContract]
-	public partial class G2G_LockResponse: Object, IActorResponse
+	public partial class G2G_LockResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -78,30 +79,30 @@ namespace ET
 	[ResponseType(nameof(G2G_LockReleaseResponse))]
 	[Message(InnerMessage.G2G_LockReleaseRequest)]
 	[ProtoContract]
-	public partial class G2G_LockReleaseRequest: Object, IActorRequest
+	public partial class G2G_LockReleaseRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Id { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Address { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2G_LockReleaseResponse)]
 	[ProtoContract]
-	public partial class G2G_LockReleaseResponse: Object, IActorResponse
+	public partial class G2G_LockReleaseResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -109,30 +110,30 @@ namespace ET
 	[ResponseType(nameof(ObjectAddResponse))]
 	[Message(InnerMessage.ObjectAddRequest)]
 	[ProtoContract]
-	public partial class ObjectAddRequest: Object, IActorRequest
+	public partial class ObjectAddRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long InstanceId { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectAddResponse)]
 	[ProtoContract]
-	public partial class ObjectAddResponse: Object, IActorResponse
+	public partial class ObjectAddResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -140,33 +141,33 @@ namespace ET
 	[ResponseType(nameof(ObjectLockResponse))]
 	[Message(InnerMessage.ObjectLockRequest)]
 	[ProtoContract]
-	public partial class ObjectLockRequest: Object, IActorRequest
+	public partial class ObjectLockRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long InstanceId { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(4)]
 		public int Time { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectLockResponse)]
 	[ProtoContract]
-	public partial class ObjectLockResponse: Object, IActorResponse
+	public partial class ObjectLockResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -174,33 +175,33 @@ namespace ET
 	[ResponseType(nameof(ObjectUnLockResponse))]
 	[Message(InnerMessage.ObjectUnLockRequest)]
 	[ProtoContract]
-	public partial class ObjectUnLockRequest: Object, IActorRequest
+	public partial class ObjectUnLockRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long OldInstanceId { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(4)]
 		public long InstanceId { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectUnLockResponse)]
 	[ProtoContract]
-	public partial class ObjectUnLockResponse: Object, IActorResponse
+	public partial class ObjectUnLockResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -208,27 +209,27 @@ namespace ET
 	[ResponseType(nameof(ObjectRemoveResponse))]
 	[Message(InnerMessage.ObjectRemoveRequest)]
 	[ProtoContract]
-	public partial class ObjectRemoveRequest: Object, IActorRequest
+	public partial class ObjectRemoveRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectRemoveResponse)]
 	[ProtoContract]
-	public partial class ObjectRemoveResponse: Object, IActorResponse
+	public partial class ObjectRemoveResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -236,30 +237,30 @@ namespace ET
 	[ResponseType(nameof(ObjectGetResponse))]
 	[Message(InnerMessage.ObjectGetRequest)]
 	[ProtoContract]
-	public partial class ObjectGetRequest: Object, IActorRequest
+	public partial class ObjectGetRequest: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectGetResponse)]
 	[ProtoContract]
-	public partial class ObjectGetResponse: Object, IActorResponse
+	public partial class ObjectGetResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long InstanceId { get; set; }
 
 	}
@@ -267,68 +268,68 @@ namespace ET
 	[ResponseType(nameof(G2R_GetLoginKey))]
 	[Message(InnerMessage.R2G_GetLoginKey)]
 	[ProtoContract]
-	public partial class R2G_GetLoginKey: Object, IActorRequest
+	public partial class R2G_GetLoginKey: ProtoObject, IActorRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2R_GetLoginKey)]
 	[ProtoContract]
-	public partial class G2R_GetLoginKey: Object, IActorResponse
+	public partial class G2R_GetLoginKey: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(5)]
 		public long GateId { get; set; }
 
 	}
 
 	[Message(InnerMessage.G2M_SessionDisconnect)]
 	[ProtoContract]
-	public partial class G2M_SessionDisconnect: Object, IActorLocationMessage
+	public partial class G2M_SessionDisconnect: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(InnerMessage.ObjectQueryResponse)]
 	[ProtoContract]
-	public partial class ObjectQueryResponse: Object, IActorResponse
+	public partial class ObjectQueryResponse: ProtoObject, IActorResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
-		public byte[] entity { get; set; }
+		[ProtoMember(4)]
+		public byte[] Entity { get; set; }
 
 	}
 
 	[ResponseType(nameof(M2M_UnitTransferResponse))]
 	[Message(InnerMessage.M2M_UnitTransferRequest)]
 	[ProtoContract]
-	public partial class M2M_UnitTransferRequest: Object, IActorRequest
+	public partial class M2M_UnitTransferRequest: ProtoObject, IActorRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -340,13 +341,13 @@ namespace ET
 		public byte[] Unit { get; set; }
 
 		[ProtoMember(4)]
-		public List<byte[]> Entitys = new List<byte[]>();
+		public List<byte[]> Entitys;
 
 	}
 
 	[Message(InnerMessage.M2M_UnitTransferResponse)]
 	[ProtoContract]
-	public partial class M2M_UnitTransferResponse: Object, IActorResponse
+	public partial class M2M_UnitTransferResponse: ProtoObject, IActorResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }

+ 103 - 163
Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/OuterMessage_C_10001.cs

@@ -5,19 +5,19 @@ namespace ET
 {
 	[Message(OuterMessage.HttpGetRouterResponse)]
 	[ProtoContract]
-	public partial class HttpGetRouterResponse: Object
+	public partial class HttpGetRouterResponse: ProtoObject
 	{
 		[ProtoMember(1)]
-		public List<string> Realms = new List<string>();
+		public List<string> Realms;
 
 		[ProtoMember(2)]
-		public List<string> Routers = new List<string>();
+		public List<string> Routers;
 
 	}
 
 	[Message(OuterMessage.RouterSync)]
 	[ProtoContract]
-	public partial class RouterSync: Object
+	public partial class RouterSync: ProtoObject
 	{
 		[ProtoMember(1)]
 		public uint ConnectId { get; set; }
@@ -30,30 +30,30 @@ namespace ET
 	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterMessage.C2M_TestRequest)]
 	[ProtoContract]
-	public partial class C2M_TestRequest: Object, IActorLocationRequest
+	public partial class C2M_TestRequest: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string request { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_TestResponse)]
 	[ProtoContract]
-	public partial class M2C_TestResponse: Object, IActorLocationResponse
+	public partial class M2C_TestResponse: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public string response { get; set; }
 
 	}
@@ -61,27 +61,27 @@ namespace ET
 	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterMessage.Actor_TransferRequest)]
 	[ProtoContract]
-	public partial class Actor_TransferRequest: Object, IActorLocationRequest
+	public partial class Actor_TransferRequest: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public int MapIndex { get; set; }
 
 	}
 
 	[Message(OuterMessage.Actor_TransferResponse)]
 	[ProtoContract]
-	public partial class Actor_TransferResponse: Object, IActorLocationResponse
+	public partial class Actor_TransferResponse: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -89,7 +89,7 @@ namespace ET
 	[ResponseType(nameof(G2C_EnterMap))]
 	[Message(OuterMessage.C2G_EnterMap)]
 	[ProtoContract]
-	public partial class C2G_EnterMap: Object, IRequest
+	public partial class C2G_EnterMap: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -98,7 +98,7 @@ namespace ET
 
 	[Message(OuterMessage.G2C_EnterMap)]
 	[ProtoContract]
-	public partial class G2C_EnterMap: Object, IResponse
+	public partial class G2C_EnterMap: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -117,37 +117,22 @@ namespace ET
 
 	[Message(OuterMessage.MoveInfo)]
 	[ProtoContract]
-	public partial class MoveInfo: Object
+	public partial class MoveInfo: ProtoObject
 	{
 		[ProtoMember(1)]
-		public List<float> X = new List<float>();
+		public List<Unity.Mathematics.float3> Position;
 
 		[ProtoMember(2)]
-		public List<float> Y = new List<float>();
+		public Unity.Mathematics.quaternion Rotation { get; set; }
 
 		[ProtoMember(3)]
-		public List<float> Z = new List<float>();
-
-		[ProtoMember(4)]
-		public float A { get; set; }
-
-		[ProtoMember(5)]
-		public float B { get; set; }
-
-		[ProtoMember(6)]
-		public float C { get; set; }
-
-		[ProtoMember(7)]
-		public float W { get; set; }
-
-		[ProtoMember(8)]
 		public int TurnSpeed { get; set; }
 
 	}
 
 	[Message(OuterMessage.UnitInfo)]
 	[ProtoContract]
-	public partial class UnitInfo: Object
+	public partial class UnitInfo: ProtoObject
 	{
 		[ProtoMember(1)]
 		public long UnitId { get; set; }
@@ -159,46 +144,34 @@ namespace ET
 		public int Type { get; set; }
 
 		[ProtoMember(4)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(5)]
-		public float Y { get; set; }
+		public Unity.Mathematics.float3 Forward { get; set; }
 
 		[ProtoMember(6)]
-		public float Z { get; set; }
+		public List<int> Ks;
 
 		[ProtoMember(7)]
-		public float ForwardX { get; set; }
+		public List<long> Vs;
 
 		[ProtoMember(8)]
-		public float ForwardY { get; set; }
-
-		[ProtoMember(9)]
-		public float ForwardZ { get; set; }
-
-		[ProtoMember(10)]
-		public List<int> Ks = new List<int>();
-
-		[ProtoMember(11)]
-		public List<long> Vs = new List<long>();
-
-		[ProtoMember(12)]
 		public MoveInfo MoveInfo { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_CreateUnits)]
 	[ProtoContract]
-	public partial class M2C_CreateUnits: Object, IActorMessage
+	public partial class M2C_CreateUnits: ProtoObject, IActorMessage
 	{
-		[ProtoMember(2)]
-		public List<UnitInfo> Units = new List<UnitInfo>();
+		[ProtoMember(1)]
+		public List<UnitInfo> Units;
 
 	}
 
 	[Message(OuterMessage.M2C_CreateMyUnit)]
 	[ProtoContract]
-	public partial class M2C_CreateMyUnit: Object, IActorMessage
+	public partial class M2C_CreateMyUnit: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public UnitInfo Unit { get; set; }
@@ -207,7 +180,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_StartSceneChange)]
 	[ProtoContract]
-	public partial class M2C_StartSceneChange: Object, IActorMessage
+	public partial class M2C_StartSceneChange: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public long SceneInstanceId { get; set; }
@@ -219,70 +192,52 @@ namespace ET
 
 	[Message(OuterMessage.M2C_RemoveUnits)]
 	[ProtoContract]
-	public partial class M2C_RemoveUnits: Object, IActorMessage
+	public partial class M2C_RemoveUnits: ProtoObject, IActorMessage
 	{
 		[ProtoMember(2)]
-		public List<long> Units = new List<long>();
+		public List<long> Units;
 
 	}
 
 	[Message(OuterMessage.C2M_PathfindingResult)]
 	[ProtoContract]
-	public partial class C2M_PathfindingResult: Object, IActorLocationMessage
+	public partial class C2M_PathfindingResult: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
-		public int RpcId { get; set; }
-
 		[ProtoMember(1)]
-		public float X { get; set; }
+		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public float Y { get; set; }
-
-		[ProtoMember(3)]
-		public float Z { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 	}
 
 	[Message(OuterMessage.C2M_Stop)]
 	[ProtoContract]
-	public partial class C2M_Stop: Object, IActorLocationMessage
+	public partial class C2M_Stop: ProtoObject, IActorLocationMessage
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_PathfindingResult)]
 	[ProtoContract]
-	public partial class M2C_PathfindingResult: Object, IActorMessage
+	public partial class M2C_PathfindingResult: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
 		[ProtoMember(2)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(3)]
-		public float Y { get; set; }
-
-		[ProtoMember(4)]
-		public float Z { get; set; }
-
-		[ProtoMember(5)]
-		public List<float> Xs = new List<float>();
-
-		[ProtoMember(6)]
-		public List<float> Ys = new List<float>();
-
-		[ProtoMember(7)]
-		public List<float> Zs = new List<float>();
+		public List<Unity.Mathematics.float3> Points;
 
 	}
 
 	[Message(OuterMessage.M2C_Stop)]
 	[ProtoContract]
-	public partial class M2C_Stop: Object, IActorMessage
+	public partial class M2C_Stop: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public int Error { get; set; }
@@ -291,89 +246,74 @@ namespace ET
 		public long Id { get; set; }
 
 		[ProtoMember(3)]
-		public float X { get; set; }
+		public Unity.Mathematics.float3 Position { get; set; }
 
 		[ProtoMember(4)]
-		public float Y { get; set; }
-
-		[ProtoMember(5)]
-		public float Z { get; set; }
-
-		[ProtoMember(6)]
-		public float A { get; set; }
-
-		[ProtoMember(7)]
-		public float B { get; set; }
-
-		[ProtoMember(8)]
-		public float C { get; set; }
-
-		[ProtoMember(9)]
-		public float W { get; set; }
+		public Unity.Mathematics.quaternion Rotation { get; set; }
 
 	}
 
 	[ResponseType(nameof(G2C_Ping))]
 	[Message(OuterMessage.C2G_Ping)]
 	[ProtoContract]
-	public partial class C2G_Ping: Object, IRequest
+	public partial class C2G_Ping: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Ping)]
 	[ProtoContract]
-	public partial class G2C_Ping: Object, IResponse
+	public partial class G2C_Ping: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long Time { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Test)]
 	[ProtoContract]
-	public partial class G2C_Test: Object, IMessage
+	public partial class G2C_Test: ProtoObject, IMessage
 	{
 	}
 
 	[ResponseType(nameof(M2C_Reload))]
 	[Message(OuterMessage.C2M_Reload)]
 	[ProtoContract]
-	public partial class C2M_Reload: Object, IRequest
+	public partial class C2M_Reload: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Password { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_Reload)]
 	[ProtoContract]
-	public partial class M2C_Reload: Object, IResponse
+	public partial class M2C_Reload: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -381,39 +321,39 @@ namespace ET
 	[ResponseType(nameof(R2C_Login))]
 	[Message(OuterMessage.C2R_Login)]
 	[ProtoContract]
-	public partial class C2R_Login: Object, IRequest
+	public partial class C2R_Login: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public string Account { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public string Password { get; set; }
 
 	}
 
 	[Message(OuterMessage.R2C_Login)]
 	[ProtoContract]
-	public partial class R2C_Login: Object, IResponse
+	public partial class R2C_Login: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public string Address { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(5)]
 		public long Key { get; set; }
 
-		[ProtoMember(3)]
+		[ProtoMember(6)]
 		public long GateId { get; set; }
 
 	}
@@ -421,40 +361,40 @@ namespace ET
 	[ResponseType(nameof(G2C_LoginGate))]
 	[Message(OuterMessage.C2G_LoginGate)]
 	[ProtoContract]
-	public partial class C2G_LoginGate: Object, IRequest
+	public partial class C2G_LoginGate: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public long Key { get; set; }
 
-		[ProtoMember(2)]
+		[ProtoMember(3)]
 		public long GateId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_LoginGate)]
 	[ProtoContract]
-	public partial class G2C_LoginGate: Object, IResponse
+	public partial class G2C_LoginGate: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public long PlayerId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
 	[ProtoContract]
-	public partial class G2C_TestHotfixMessage: Object, IMessage
+	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
 	{
 		[ProtoMember(1)]
 		public string Info { get; set; }
@@ -464,30 +404,30 @@ namespace ET
 	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterMessage.C2M_TestRobotCase)]
 	[ProtoContract]
-	public partial class C2M_TestRobotCase: Object, IActorLocationRequest
+	public partial class C2M_TestRobotCase: ProtoObject, IActorLocationRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(2)]
 		public int N { get; set; }
 
 	}
 
 	[Message(OuterMessage.M2C_TestRobotCase)]
 	[ProtoContract]
-	public partial class M2C_TestRobotCase: Object, IActorLocationResponse
+	public partial class M2C_TestRobotCase: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(1)]
+		[ProtoMember(4)]
 		public int N { get; set; }
 
 	}
@@ -495,7 +435,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TransferMap))]
 	[Message(OuterMessage.C2M_TransferMap)]
 	[ProtoContract]
-	public partial class C2M_TransferMap: Object, IActorLocationRequest
+	public partial class C2M_TransferMap: ProtoObject, IActorLocationRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -504,15 +444,15 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TransferMap)]
 	[ProtoContract]
-	public partial class M2C_TransferMap: Object, IActorLocationResponse
+	public partial class M2C_TransferMap: ProtoObject, IActorLocationResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}
@@ -520,24 +460,24 @@ namespace ET
 	[ResponseType(nameof(G2C_Benchmark))]
 	[Message(OuterMessage.C2G_Benchmark)]
 	[ProtoContract]
-	public partial class C2G_Benchmark: Object, IRequest
+	public partial class C2G_Benchmark: ProtoObject, IRequest
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
 	[Message(OuterMessage.G2C_Benchmark)]
 	[ProtoContract]
-	public partial class G2C_Benchmark: Object, IResponse
+	public partial class G2C_Benchmark: ProtoObject, IResponse
 	{
-		[ProtoMember(90)]
+		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
+		[ProtoMember(2)]
 		public int Error { get; set; }
 
-		[ProtoMember(92)]
+		[ProtoMember(3)]
 		public string Message { get; set; }
 
 	}

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

@@ -27,6 +27,7 @@
             WinPeriod.Init();
             
             MongoRegister.Init();
+            ProtobufRegister.Init();
             
             Game.AddSingleton<NetServices>();
             Game.AddSingleton<Root>();

+ 20 - 0
Unity/Assets/Scripts/Core/Helper/ProtobufRegister.cs

@@ -0,0 +1,20 @@
+using ProtoBuf.Meta;
+using Unity.Mathematics;
+
+namespace ET
+{
+    public static class ProtobufRegister
+    {
+        public static void Init()
+        {
+        }
+        
+        static ProtobufRegister()
+        {
+            RuntimeTypeModel.Default.Add(typeof(float2), false).Add("x", "y");
+            RuntimeTypeModel.Default.Add(typeof(float3), false).Add("x", "y", "z");
+            RuntimeTypeModel.Default.Add(typeof(float4), false).Add("x", "y", "z", "w");
+            RuntimeTypeModel.Default.Add(typeof(quaternion), false).Add("value");
+        }
+    }
+}

+ 1 - 1
Unity/Assets/Scripts/Core/Helper/ProtobufHelper.cs.meta → Unity/Assets/Scripts/Core/Helper/ProtobufRegister.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cb8ca0c5f68c6eb41bdd905d9139678b
+guid: 691f568543138f947958d41bc561df39
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 5 - 6
Unity/Assets/Scripts/Core/Helper/ProtobufHelper.cs → Unity/Assets/Scripts/Core/Helper/SerializerHelper.cs

@@ -1,16 +1,15 @@
 using System;
 using System.ComponentModel;
 using System.IO;
-using ProtoBuf.Meta;
 
 namespace ET
 {
-    public static class ProtobufHelper
+    public static class SerializerHelper
     {
 		public static object FromBytes(Type type, byte[] bytes, int index, int count)
 		{
 			using MemoryStream stream = new MemoryStream(bytes, index, count);
-			object o = RuntimeTypeModel.Default.Deserialize(stream, null, type);
+			object o = ProtoBuf.Serializer.Deserialize(type, stream);
 			if (o is ISupportInitialize supportInitialize)
 			{
 				supportInitialize.EndInit();
@@ -25,14 +24,14 @@ namespace ET
 			return stream.ToArray();
 		}
 
-        public static void ToStream(object message, MemoryStream stream)
+        public static void ToStream(object message, Stream stream)
         {
             ProtoBuf.Serializer.Serialize(stream, message);
         }
 
-        public static object FromStream(Type type, MemoryStream stream)
+        public static object FromStream(Type type, Stream stream)
         {
-	        object o = RuntimeTypeModel.Default.Deserialize(stream, null, type);
+	        object o = ProtoBuf.Serializer.Deserialize(type, stream);
 	        if (o is ISupportInitialize supportInitialize)
 	        {
 		        supportInitialize.EndInit();

+ 11 - 0
Unity/Assets/Scripts/Core/Helper/SerializerHelper.cs.meta

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

+ 2 - 2
Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs

@@ -38,7 +38,7 @@ namespace ET
 			
 			byte[] oneConfigBytes = EventSystem.Instance.Invoke<GetOneConfigBytes, byte[]>(0, new GetOneConfigBytes() {ConfigName = configType.FullName});
 
-			object category = ProtobufHelper.FromBytes(configType, oneConfigBytes, 0, oneConfigBytes.Length);
+			object category = SerializerHelper.FromBytes(configType, oneConfigBytes, 0, oneConfigBytes.Length);
 			ISingleton singleton = category as ISingleton;
 			singleton.Register();
 			
@@ -90,7 +90,7 @@ namespace ET
 		{
 			byte[] oneConfigBytes = configBytes[configType.Name];
 
-			object category = ProtobufHelper.FromBytes(configType, oneConfigBytes, 0, oneConfigBytes.Length);
+			object category = SerializerHelper.FromBytes(configType, oneConfigBytes, 0, oneConfigBytes.Length);
 			
 			lock (this)
 			{

+ 2 - 2
Unity/Assets/Scripts/Core/Module/Network/KChannel.cs

@@ -485,7 +485,7 @@ namespace ET
 					{
 						ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), Packet.KcpOpcodeIndex);
 						Type type = NetServices.Instance.GetType(opcode);
-						message = MessageSerializeHelper.DeserializeFrom(type, memoryStream);
+						message = SerializerHelper.FromStream(type, memoryStream);
 						break;
 					}
 					case ServiceType.Inner:
@@ -493,7 +493,7 @@ namespace ET
 						actorId = BitConverter.ToInt64(memoryStream.GetBuffer(), Packet.ActorIdIndex);
 						ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), Packet.OpcodeIndex);
 						Type type = NetServices.Instance.GetType(opcode);
-						message = MessageSerializeHelper.DeserializeFrom(type, memoryStream);
+						message = SerializerHelper.FromStream(type, memoryStream);
 						break;
 					}
 				}

+ 2 - 20
Unity/Assets/Scripts/Core/Module/Network/MessageSerializeHelper.cs

@@ -5,25 +5,7 @@ namespace ET
 {
     public static class MessageSerializeHelper
     {
-        public static object DeserializeFrom(Type type, MemoryStream memoryStream)
-        {
-            return ProtobufHelper.FromStream(type, memoryStream);
-        }
-
-        public static void SerializeTo(object obj, MemoryStream memoryStream)
-        {
-            try
-            {
-                ProtobufHelper.ToStream(obj, memoryStream);
-            }
-            catch (Exception e)
-            {
-                throw new Exception($"SerializeTo error: {obj}", e);
-            }
-
-        }
-
-        public static MemoryStream GetStream(int count = 0)
+        private static MemoryStream GetStream(int count = 0)
         {
             MemoryStream stream;
             if (count > 0)
@@ -50,7 +32,7 @@ namespace ET
             
             stream.GetBuffer().WriteTo(headOffset, opcode);
             
-            MessageSerializeHelper.SerializeTo(message, stream);
+            SerializerHelper.ToStream(message, stream);
             
             stream.Seek(0, SeekOrigin.Begin);
             return (opcode, stream);

+ 2 - 2
Unity/Assets/Scripts/Core/Module/Network/TChannel.cs

@@ -365,7 +365,7 @@ namespace ET
 					{
 						ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), Packet.KcpOpcodeIndex);
 						Type type = NetServices.Instance.GetType(opcode);
-						message = MessageSerializeHelper.DeserializeFrom(type, memoryStream);
+						message = SerializerHelper.FromStream(type, memoryStream);
 						break;
 					}
 					case ServiceType.Inner:
@@ -373,7 +373,7 @@ namespace ET
 						actorId = BitConverter.ToInt64(memoryStream.GetBuffer(), Packet.ActorIdIndex);
 						ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), Packet.OpcodeIndex);
 						Type type = NetServices.Instance.GetType(opcode);
-						message = MessageSerializeHelper.DeserializeFrom(type, memoryStream);
+						message = SerializerHelper.FromStream(type, memoryStream);
 						break;
 					}
 				}

+ 2 - 2
Unity/Assets/Scripts/Core/Module/Network/WChannel.cs

@@ -221,7 +221,7 @@ namespace ET
                     {
                         ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), Packet.KcpOpcodeIndex);
                         Type type = NetServices.Instance.GetType(opcode);
-                        message = MessageSerializeHelper.DeserializeFrom(type, memoryStream);
+                        message = SerializerHelper.FromStream(type, memoryStream);
                         break;
                     }
                     case ServiceType.Inner:
@@ -229,7 +229,7 @@ namespace ET
                         actorId = BitConverter.ToInt64(memoryStream.GetBuffer(), Packet.ActorIdIndex);
                         ushort opcode = BitConverter.ToUInt16(memoryStream.GetBuffer(), Packet.OpcodeIndex);
                         Type type = NetServices.Instance.GetType(opcode);
-                        message = MessageSerializeHelper.DeserializeFrom(type, memoryStream);
+                        message = SerializerHelper.FromStream(type, memoryStream);
                         break;
                     }
                 }

+ 2 - 2
Unity/Assets/Scripts/Core/Object/ProtoObject.cs

@@ -7,8 +7,8 @@ namespace ET
     {
         public object Clone()
         {
-            byte[] bytes = ProtobufHelper.ToBytes(this);
-            return ProtobufHelper.FromBytes(this.GetType(), bytes, 0, bytes.Length);
+            byte[] bytes = SerializerHelper.ToBytes(this);
+            return SerializerHelper.FromBytes(this.GetType(), bytes, 0, bytes.Length);
         }
         
         public virtual void BeginInit()