Przeglądaj źródła

先删掉帧同步模块,后面再添加

tanghai 1 rok temu
rodzic
commit
8be2ff5ac4

+ 35 - 35
Generate/Client/Proto/Core/OuterMessage_C_10001.cs → Generate/Client/Proto/Statesync/StateSyncOuter_C_10001.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace ET
 {
     [MemoryPackable]
-    [Message(OuterMessage.HttpGetRouterResponse)]
+    [Message(StateSyncOuter.HttpGetRouterResponse)]
     public partial class HttpGetRouterResponse : MessageObject
     {
         public static HttpGetRouterResponse Create(bool isFromPool = false)
@@ -33,7 +33,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.RouterSync)]
+    [Message(StateSyncOuter.RouterSync)]
     public partial class RouterSync : MessageObject
     {
         public static RouterSync Create(bool isFromPool = false)
@@ -62,7 +62,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRequest)]
+    [Message(StateSyncOuter.C2M_TestRequest)]
     [ResponseType(nameof(M2C_TestResponse))]
     public partial class C2M_TestRequest : MessageObject, ILocationRequest
     {
@@ -92,7 +92,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestResponse)]
+    [Message(StateSyncOuter.M2C_TestResponse)]
     public partial class M2C_TestResponse : MessageObject, IResponse
     {
         public static M2C_TestResponse Create(bool isFromPool = false)
@@ -129,7 +129,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_EnterMap)]
+    [Message(StateSyncOuter.C2G_EnterMap)]
     [ResponseType(nameof(G2C_EnterMap))]
     public partial class C2G_EnterMap : MessageObject, ISessionRequest
     {
@@ -155,7 +155,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_EnterMap)]
+    [Message(StateSyncOuter.G2C_EnterMap)]
     public partial class G2C_EnterMap : MessageObject, ISessionResponse
     {
         public static G2C_EnterMap Create(bool isFromPool = false)
@@ -195,7 +195,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.MoveInfo)]
+    [Message(StateSyncOuter.MoveInfo)]
     public partial class MoveInfo : MessageObject
     {
         public static MoveInfo Create(bool isFromPool = false)
@@ -228,7 +228,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.UnitInfo)]
+    [Message(StateSyncOuter.UnitInfo)]
     public partial class UnitInfo : MessageObject
     {
         public static UnitInfo Create(bool isFromPool = false)
@@ -277,7 +277,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_CreateUnits)]
+    [Message(StateSyncOuter.M2C_CreateUnits)]
     public partial class M2C_CreateUnits : MessageObject, IMessage
     {
         public static M2C_CreateUnits Create(bool isFromPool = false)
@@ -302,7 +302,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_CreateMyUnit)]
+    [Message(StateSyncOuter.M2C_CreateMyUnit)]
     public partial class M2C_CreateMyUnit : MessageObject, IMessage
     {
         public static M2C_CreateMyUnit Create(bool isFromPool = false)
@@ -327,7 +327,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_StartSceneChange)]
+    [Message(StateSyncOuter.M2C_StartSceneChange)]
     public partial class M2C_StartSceneChange : MessageObject, IMessage
     {
         public static M2C_StartSceneChange Create(bool isFromPool = false)
@@ -356,7 +356,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_RemoveUnits)]
+    [Message(StateSyncOuter.M2C_RemoveUnits)]
     public partial class M2C_RemoveUnits : MessageObject, IMessage
     {
         public static M2C_RemoveUnits Create(bool isFromPool = false)
@@ -381,7 +381,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_PathfindingResult)]
+    [Message(StateSyncOuter.C2M_PathfindingResult)]
     public partial class C2M_PathfindingResult : MessageObject, ILocationMessage
     {
         public static C2M_PathfindingResult Create(bool isFromPool = false)
@@ -410,7 +410,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_Stop)]
+    [Message(StateSyncOuter.C2M_Stop)]
     public partial class C2M_Stop : MessageObject, ILocationMessage
     {
         public static C2M_Stop Create(bool isFromPool = false)
@@ -435,7 +435,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_PathfindingResult)]
+    [Message(StateSyncOuter.M2C_PathfindingResult)]
     public partial class M2C_PathfindingResult : MessageObject, IMessage
     {
         public static M2C_PathfindingResult Create(bool isFromPool = false)
@@ -468,7 +468,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_Stop)]
+    [Message(StateSyncOuter.M2C_Stop)]
     public partial class M2C_Stop : MessageObject, IMessage
     {
         public static M2C_Stop Create(bool isFromPool = false)
@@ -505,7 +505,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_Ping)]
+    [Message(StateSyncOuter.C2G_Ping)]
     [ResponseType(nameof(G2C_Ping))]
     public partial class C2G_Ping : MessageObject, ISessionRequest
     {
@@ -531,7 +531,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Ping)]
+    [Message(StateSyncOuter.G2C_Ping)]
     public partial class G2C_Ping : MessageObject, ISessionResponse
     {
         public static G2C_Ping Create(bool isFromPool = false)
@@ -568,7 +568,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Test)]
+    [Message(StateSyncOuter.G2C_Test)]
     public partial class G2C_Test : MessageObject, ISessionMessage
     {
         public static G2C_Test Create(bool isFromPool = false)
@@ -589,7 +589,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_Reload)]
+    [Message(StateSyncOuter.C2M_Reload)]
     [ResponseType(nameof(M2C_Reload))]
     public partial class C2M_Reload : MessageObject, ISessionRequest
     {
@@ -623,7 +623,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_Reload)]
+    [Message(StateSyncOuter.M2C_Reload)]
     public partial class M2C_Reload : MessageObject, ISessionResponse
     {
         public static M2C_Reload Create(bool isFromPool = false)
@@ -656,7 +656,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2R_Login)]
+    [Message(StateSyncOuter.C2R_Login)]
     [ResponseType(nameof(R2C_Login))]
     public partial class C2R_Login : MessageObject, ISessionRequest
     {
@@ -696,7 +696,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.R2C_Login)]
+    [Message(StateSyncOuter.R2C_Login)]
     public partial class R2C_Login : MessageObject, ISessionResponse
     {
         public static R2C_Login Create(bool isFromPool = false)
@@ -741,7 +741,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_LoginGate)]
+    [Message(StateSyncOuter.C2G_LoginGate)]
     [ResponseType(nameof(G2C_LoginGate))]
     public partial class C2G_LoginGate : MessageObject, ISessionRequest
     {
@@ -778,7 +778,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_LoginGate)]
+    [Message(StateSyncOuter.G2C_LoginGate)]
     public partial class G2C_LoginGate : MessageObject, ISessionResponse
     {
         public static G2C_LoginGate Create(bool isFromPool = false)
@@ -815,7 +815,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_TestHotfixMessage)]
+    [Message(StateSyncOuter.G2C_TestHotfixMessage)]
     public partial class G2C_TestHotfixMessage : MessageObject, ISessionMessage
     {
         public static G2C_TestHotfixMessage Create(bool isFromPool = false)
@@ -840,7 +840,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRobotCase)]
+    [Message(StateSyncOuter.C2M_TestRobotCase)]
     [ResponseType(nameof(M2C_TestRobotCase))]
     public partial class C2M_TestRobotCase : MessageObject, ILocationRequest
     {
@@ -870,7 +870,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestRobotCase)]
+    [Message(StateSyncOuter.M2C_TestRobotCase)]
     public partial class M2C_TestRobotCase : MessageObject, ILocationResponse
     {
         public static M2C_TestRobotCase Create(bool isFromPool = false)
@@ -907,7 +907,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRobotCase2)]
+    [Message(StateSyncOuter.C2M_TestRobotCase2)]
     public partial class C2M_TestRobotCase2 : MessageObject, ILocationMessage
     {
         public static C2M_TestRobotCase2 Create(bool isFromPool = false)
@@ -936,7 +936,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestRobotCase2)]
+    [Message(StateSyncOuter.M2C_TestRobotCase2)]
     public partial class M2C_TestRobotCase2 : MessageObject, ILocationMessage
     {
         public static M2C_TestRobotCase2 Create(bool isFromPool = false)
@@ -965,7 +965,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TransferMap)]
+    [Message(StateSyncOuter.C2M_TransferMap)]
     [ResponseType(nameof(M2C_TransferMap))]
     public partial class C2M_TransferMap : MessageObject, ILocationRequest
     {
@@ -991,7 +991,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TransferMap)]
+    [Message(StateSyncOuter.M2C_TransferMap)]
     public partial class M2C_TransferMap : MessageObject, ILocationResponse
     {
         public static M2C_TransferMap Create(bool isFromPool = false)
@@ -1024,7 +1024,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_Benchmark)]
+    [Message(StateSyncOuter.C2G_Benchmark)]
     [ResponseType(nameof(G2C_Benchmark))]
     public partial class C2G_Benchmark : MessageObject, ISessionRequest
     {
@@ -1050,7 +1050,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Benchmark)]
+    [Message(StateSyncOuter.G2C_Benchmark)]
     public partial class G2C_Benchmark : MessageObject, ISessionResponse
     {
         public static G2C_Benchmark Create(bool isFromPool = false)
@@ -1082,7 +1082,7 @@ namespace ET
         }
     }
 
-    public static class OuterMessage
+    public static class StateSyncOuter
     {
         public const ushort HttpGetRouterResponse = 10002;
         public const ushort RouterSync = 10003;

+ 24 - 24
Generate/ClientServer/Proto/Core/InnerMessage_S_20001.cs → Generate/ClientServer/Proto/Statesync/StateSyncInner_S_20001.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace ET
 {
     [MemoryPackable]
-    [Message(InnerMessage.ObjectQueryRequest)]
+    [Message(StateSyncInner.ObjectQueryRequest)]
     [ResponseType(nameof(ObjectQueryResponse))]
     public partial class ObjectQueryRequest : MessageObject, IRequest
     {
@@ -38,7 +38,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.M2A_Reload)]
+    [Message(StateSyncInner.M2A_Reload)]
     [ResponseType(nameof(A2M_Reload))]
     public partial class M2A_Reload : MessageObject, IRequest
     {
@@ -64,7 +64,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.A2M_Reload)]
+    [Message(StateSyncInner.A2M_Reload)]
     public partial class A2M_Reload : MessageObject, IResponse
     {
         public static A2M_Reload Create(bool isFromPool = false)
@@ -97,7 +97,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockRequest)]
+    [Message(StateSyncInner.G2G_LockRequest)]
     [ResponseType(nameof(G2G_LockResponse))]
     public partial class G2G_LockRequest : MessageObject, IRequest
     {
@@ -131,7 +131,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockResponse)]
+    [Message(StateSyncInner.G2G_LockResponse)]
     public partial class G2G_LockResponse : MessageObject, IResponse
     {
         public static G2G_LockResponse Create(bool isFromPool = false)
@@ -164,7 +164,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockReleaseRequest)]
+    [Message(StateSyncInner.G2G_LockReleaseRequest)]
     [ResponseType(nameof(G2G_LockReleaseResponse))]
     public partial class G2G_LockReleaseRequest : MessageObject, IRequest
     {
@@ -198,7 +198,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockReleaseResponse)]
+    [Message(StateSyncInner.G2G_LockReleaseResponse)]
     public partial class G2G_LockReleaseResponse : MessageObject, IResponse
     {
         public static G2G_LockReleaseResponse Create(bool isFromPool = false)
@@ -231,7 +231,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectAddRequest)]
+    [Message(StateSyncInner.ObjectAddRequest)]
     [ResponseType(nameof(ObjectAddResponse))]
     public partial class ObjectAddRequest : MessageObject, IRequest
     {
@@ -269,7 +269,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectAddResponse)]
+    [Message(StateSyncInner.ObjectAddResponse)]
     public partial class ObjectAddResponse : MessageObject, IResponse
     {
         public static ObjectAddResponse Create(bool isFromPool = false)
@@ -302,7 +302,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectLockRequest)]
+    [Message(StateSyncInner.ObjectLockRequest)]
     [ResponseType(nameof(ObjectLockResponse))]
     public partial class ObjectLockRequest : MessageObject, IRequest
     {
@@ -344,7 +344,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectLockResponse)]
+    [Message(StateSyncInner.ObjectLockResponse)]
     public partial class ObjectLockResponse : MessageObject, IResponse
     {
         public static ObjectLockResponse Create(bool isFromPool = false)
@@ -377,7 +377,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectUnLockRequest)]
+    [Message(StateSyncInner.ObjectUnLockRequest)]
     [ResponseType(nameof(ObjectUnLockResponse))]
     public partial class ObjectUnLockRequest : MessageObject, IRequest
     {
@@ -419,7 +419,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectUnLockResponse)]
+    [Message(StateSyncInner.ObjectUnLockResponse)]
     public partial class ObjectUnLockResponse : MessageObject, IResponse
     {
         public static ObjectUnLockResponse Create(bool isFromPool = false)
@@ -452,7 +452,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectRemoveRequest)]
+    [Message(StateSyncInner.ObjectRemoveRequest)]
     [ResponseType(nameof(ObjectRemoveResponse))]
     public partial class ObjectRemoveRequest : MessageObject, IRequest
     {
@@ -486,7 +486,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectRemoveResponse)]
+    [Message(StateSyncInner.ObjectRemoveResponse)]
     public partial class ObjectRemoveResponse : MessageObject, IResponse
     {
         public static ObjectRemoveResponse Create(bool isFromPool = false)
@@ -519,7 +519,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectGetRequest)]
+    [Message(StateSyncInner.ObjectGetRequest)]
     [ResponseType(nameof(ObjectGetResponse))]
     public partial class ObjectGetRequest : MessageObject, IRequest
     {
@@ -553,7 +553,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectGetResponse)]
+    [Message(StateSyncInner.ObjectGetResponse)]
     public partial class ObjectGetResponse : MessageObject, IResponse
     {
         public static ObjectGetResponse Create(bool isFromPool = false)
@@ -594,7 +594,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.R2G_GetLoginKey)]
+    [Message(StateSyncInner.R2G_GetLoginKey)]
     [ResponseType(nameof(G2R_GetLoginKey))]
     public partial class R2G_GetLoginKey : MessageObject, IRequest
     {
@@ -624,7 +624,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2R_GetLoginKey)]
+    [Message(StateSyncInner.G2R_GetLoginKey)]
     public partial class G2R_GetLoginKey : MessageObject, IResponse
     {
         public static G2R_GetLoginKey Create(bool isFromPool = false)
@@ -665,7 +665,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2M_SessionDisconnect)]
+    [Message(StateSyncInner.G2M_SessionDisconnect)]
     public partial class G2M_SessionDisconnect : MessageObject, ILocationMessage
     {
         public static G2M_SessionDisconnect Create(bool isFromPool = false)
@@ -690,7 +690,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectQueryResponse)]
+    [Message(StateSyncInner.ObjectQueryResponse)]
     public partial class ObjectQueryResponse : MessageObject, IResponse
     {
         public static ObjectQueryResponse Create(bool isFromPool = false)
@@ -727,7 +727,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.M2M_UnitTransferRequest)]
+    [Message(StateSyncInner.M2M_UnitTransferRequest)]
     [ResponseType(nameof(M2M_UnitTransferResponse))]
     public partial class M2M_UnitTransferRequest : MessageObject, IRequest
     {
@@ -765,7 +765,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.M2M_UnitTransferResponse)]
+    [Message(StateSyncInner.M2M_UnitTransferResponse)]
     public partial class M2M_UnitTransferResponse : MessageObject, IResponse
     {
         public static M2M_UnitTransferResponse Create(bool isFromPool = false)
@@ -797,7 +797,7 @@ namespace ET
         }
     }
 
-    public static class InnerMessage
+    public static class StateSyncInner
     {
         public const ushort ObjectQueryRequest = 20002;
         public const ushort M2A_Reload = 20003;

+ 35 - 35
Generate/Server/Proto/Core/OuterMessage_C_10001.cs → Generate/ClientServer/Proto/Statesync/StateSyncOuter_C_10001.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace ET
 {
     [MemoryPackable]
-    [Message(OuterMessage.HttpGetRouterResponse)]
+    [Message(StateSyncOuter.HttpGetRouterResponse)]
     public partial class HttpGetRouterResponse : MessageObject
     {
         public static HttpGetRouterResponse Create(bool isFromPool = false)
@@ -33,7 +33,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.RouterSync)]
+    [Message(StateSyncOuter.RouterSync)]
     public partial class RouterSync : MessageObject
     {
         public static RouterSync Create(bool isFromPool = false)
@@ -62,7 +62,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRequest)]
+    [Message(StateSyncOuter.C2M_TestRequest)]
     [ResponseType(nameof(M2C_TestResponse))]
     public partial class C2M_TestRequest : MessageObject, ILocationRequest
     {
@@ -92,7 +92,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestResponse)]
+    [Message(StateSyncOuter.M2C_TestResponse)]
     public partial class M2C_TestResponse : MessageObject, IResponse
     {
         public static M2C_TestResponse Create(bool isFromPool = false)
@@ -129,7 +129,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_EnterMap)]
+    [Message(StateSyncOuter.C2G_EnterMap)]
     [ResponseType(nameof(G2C_EnterMap))]
     public partial class C2G_EnterMap : MessageObject, ISessionRequest
     {
@@ -155,7 +155,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_EnterMap)]
+    [Message(StateSyncOuter.G2C_EnterMap)]
     public partial class G2C_EnterMap : MessageObject, ISessionResponse
     {
         public static G2C_EnterMap Create(bool isFromPool = false)
@@ -195,7 +195,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.MoveInfo)]
+    [Message(StateSyncOuter.MoveInfo)]
     public partial class MoveInfo : MessageObject
     {
         public static MoveInfo Create(bool isFromPool = false)
@@ -228,7 +228,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.UnitInfo)]
+    [Message(StateSyncOuter.UnitInfo)]
     public partial class UnitInfo : MessageObject
     {
         public static UnitInfo Create(bool isFromPool = false)
@@ -277,7 +277,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_CreateUnits)]
+    [Message(StateSyncOuter.M2C_CreateUnits)]
     public partial class M2C_CreateUnits : MessageObject, IMessage
     {
         public static M2C_CreateUnits Create(bool isFromPool = false)
@@ -302,7 +302,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_CreateMyUnit)]
+    [Message(StateSyncOuter.M2C_CreateMyUnit)]
     public partial class M2C_CreateMyUnit : MessageObject, IMessage
     {
         public static M2C_CreateMyUnit Create(bool isFromPool = false)
@@ -327,7 +327,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_StartSceneChange)]
+    [Message(StateSyncOuter.M2C_StartSceneChange)]
     public partial class M2C_StartSceneChange : MessageObject, IMessage
     {
         public static M2C_StartSceneChange Create(bool isFromPool = false)
@@ -356,7 +356,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_RemoveUnits)]
+    [Message(StateSyncOuter.M2C_RemoveUnits)]
     public partial class M2C_RemoveUnits : MessageObject, IMessage
     {
         public static M2C_RemoveUnits Create(bool isFromPool = false)
@@ -381,7 +381,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_PathfindingResult)]
+    [Message(StateSyncOuter.C2M_PathfindingResult)]
     public partial class C2M_PathfindingResult : MessageObject, ILocationMessage
     {
         public static C2M_PathfindingResult Create(bool isFromPool = false)
@@ -410,7 +410,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_Stop)]
+    [Message(StateSyncOuter.C2M_Stop)]
     public partial class C2M_Stop : MessageObject, ILocationMessage
     {
         public static C2M_Stop Create(bool isFromPool = false)
@@ -435,7 +435,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_PathfindingResult)]
+    [Message(StateSyncOuter.M2C_PathfindingResult)]
     public partial class M2C_PathfindingResult : MessageObject, IMessage
     {
         public static M2C_PathfindingResult Create(bool isFromPool = false)
@@ -468,7 +468,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_Stop)]
+    [Message(StateSyncOuter.M2C_Stop)]
     public partial class M2C_Stop : MessageObject, IMessage
     {
         public static M2C_Stop Create(bool isFromPool = false)
@@ -505,7 +505,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_Ping)]
+    [Message(StateSyncOuter.C2G_Ping)]
     [ResponseType(nameof(G2C_Ping))]
     public partial class C2G_Ping : MessageObject, ISessionRequest
     {
@@ -531,7 +531,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Ping)]
+    [Message(StateSyncOuter.G2C_Ping)]
     public partial class G2C_Ping : MessageObject, ISessionResponse
     {
         public static G2C_Ping Create(bool isFromPool = false)
@@ -568,7 +568,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Test)]
+    [Message(StateSyncOuter.G2C_Test)]
     public partial class G2C_Test : MessageObject, ISessionMessage
     {
         public static G2C_Test Create(bool isFromPool = false)
@@ -589,7 +589,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_Reload)]
+    [Message(StateSyncOuter.C2M_Reload)]
     [ResponseType(nameof(M2C_Reload))]
     public partial class C2M_Reload : MessageObject, ISessionRequest
     {
@@ -623,7 +623,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_Reload)]
+    [Message(StateSyncOuter.M2C_Reload)]
     public partial class M2C_Reload : MessageObject, ISessionResponse
     {
         public static M2C_Reload Create(bool isFromPool = false)
@@ -656,7 +656,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2R_Login)]
+    [Message(StateSyncOuter.C2R_Login)]
     [ResponseType(nameof(R2C_Login))]
     public partial class C2R_Login : MessageObject, ISessionRequest
     {
@@ -696,7 +696,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.R2C_Login)]
+    [Message(StateSyncOuter.R2C_Login)]
     public partial class R2C_Login : MessageObject, ISessionResponse
     {
         public static R2C_Login Create(bool isFromPool = false)
@@ -741,7 +741,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_LoginGate)]
+    [Message(StateSyncOuter.C2G_LoginGate)]
     [ResponseType(nameof(G2C_LoginGate))]
     public partial class C2G_LoginGate : MessageObject, ISessionRequest
     {
@@ -778,7 +778,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_LoginGate)]
+    [Message(StateSyncOuter.G2C_LoginGate)]
     public partial class G2C_LoginGate : MessageObject, ISessionResponse
     {
         public static G2C_LoginGate Create(bool isFromPool = false)
@@ -815,7 +815,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_TestHotfixMessage)]
+    [Message(StateSyncOuter.G2C_TestHotfixMessage)]
     public partial class G2C_TestHotfixMessage : MessageObject, ISessionMessage
     {
         public static G2C_TestHotfixMessage Create(bool isFromPool = false)
@@ -840,7 +840,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRobotCase)]
+    [Message(StateSyncOuter.C2M_TestRobotCase)]
     [ResponseType(nameof(M2C_TestRobotCase))]
     public partial class C2M_TestRobotCase : MessageObject, ILocationRequest
     {
@@ -870,7 +870,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestRobotCase)]
+    [Message(StateSyncOuter.M2C_TestRobotCase)]
     public partial class M2C_TestRobotCase : MessageObject, ILocationResponse
     {
         public static M2C_TestRobotCase Create(bool isFromPool = false)
@@ -907,7 +907,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRobotCase2)]
+    [Message(StateSyncOuter.C2M_TestRobotCase2)]
     public partial class C2M_TestRobotCase2 : MessageObject, ILocationMessage
     {
         public static C2M_TestRobotCase2 Create(bool isFromPool = false)
@@ -936,7 +936,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestRobotCase2)]
+    [Message(StateSyncOuter.M2C_TestRobotCase2)]
     public partial class M2C_TestRobotCase2 : MessageObject, ILocationMessage
     {
         public static M2C_TestRobotCase2 Create(bool isFromPool = false)
@@ -965,7 +965,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TransferMap)]
+    [Message(StateSyncOuter.C2M_TransferMap)]
     [ResponseType(nameof(M2C_TransferMap))]
     public partial class C2M_TransferMap : MessageObject, ILocationRequest
     {
@@ -991,7 +991,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TransferMap)]
+    [Message(StateSyncOuter.M2C_TransferMap)]
     public partial class M2C_TransferMap : MessageObject, ILocationResponse
     {
         public static M2C_TransferMap Create(bool isFromPool = false)
@@ -1024,7 +1024,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_Benchmark)]
+    [Message(StateSyncOuter.C2G_Benchmark)]
     [ResponseType(nameof(G2C_Benchmark))]
     public partial class C2G_Benchmark : MessageObject, ISessionRequest
     {
@@ -1050,7 +1050,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Benchmark)]
+    [Message(StateSyncOuter.G2C_Benchmark)]
     public partial class G2C_Benchmark : MessageObject, ISessionResponse
     {
         public static G2C_Benchmark Create(bool isFromPool = false)
@@ -1082,7 +1082,7 @@ namespace ET
         }
     }
 
-    public static class OuterMessage
+    public static class StateSyncOuter
     {
         public const ushort HttpGetRouterResponse = 10002;
         public const ushort RouterSync = 10003;

+ 24 - 24
Generate/Server/Proto/Core/InnerMessage_S_20001.cs → Generate/Server/Proto/Statesync/StateSyncInner_S_20001.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace ET
 {
     [MemoryPackable]
-    [Message(InnerMessage.ObjectQueryRequest)]
+    [Message(StateSyncInner.ObjectQueryRequest)]
     [ResponseType(nameof(ObjectQueryResponse))]
     public partial class ObjectQueryRequest : MessageObject, IRequest
     {
@@ -38,7 +38,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.M2A_Reload)]
+    [Message(StateSyncInner.M2A_Reload)]
     [ResponseType(nameof(A2M_Reload))]
     public partial class M2A_Reload : MessageObject, IRequest
     {
@@ -64,7 +64,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.A2M_Reload)]
+    [Message(StateSyncInner.A2M_Reload)]
     public partial class A2M_Reload : MessageObject, IResponse
     {
         public static A2M_Reload Create(bool isFromPool = false)
@@ -97,7 +97,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockRequest)]
+    [Message(StateSyncInner.G2G_LockRequest)]
     [ResponseType(nameof(G2G_LockResponse))]
     public partial class G2G_LockRequest : MessageObject, IRequest
     {
@@ -131,7 +131,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockResponse)]
+    [Message(StateSyncInner.G2G_LockResponse)]
     public partial class G2G_LockResponse : MessageObject, IResponse
     {
         public static G2G_LockResponse Create(bool isFromPool = false)
@@ -164,7 +164,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockReleaseRequest)]
+    [Message(StateSyncInner.G2G_LockReleaseRequest)]
     [ResponseType(nameof(G2G_LockReleaseResponse))]
     public partial class G2G_LockReleaseRequest : MessageObject, IRequest
     {
@@ -198,7 +198,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2G_LockReleaseResponse)]
+    [Message(StateSyncInner.G2G_LockReleaseResponse)]
     public partial class G2G_LockReleaseResponse : MessageObject, IResponse
     {
         public static G2G_LockReleaseResponse Create(bool isFromPool = false)
@@ -231,7 +231,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectAddRequest)]
+    [Message(StateSyncInner.ObjectAddRequest)]
     [ResponseType(nameof(ObjectAddResponse))]
     public partial class ObjectAddRequest : MessageObject, IRequest
     {
@@ -269,7 +269,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectAddResponse)]
+    [Message(StateSyncInner.ObjectAddResponse)]
     public partial class ObjectAddResponse : MessageObject, IResponse
     {
         public static ObjectAddResponse Create(bool isFromPool = false)
@@ -302,7 +302,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectLockRequest)]
+    [Message(StateSyncInner.ObjectLockRequest)]
     [ResponseType(nameof(ObjectLockResponse))]
     public partial class ObjectLockRequest : MessageObject, IRequest
     {
@@ -344,7 +344,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectLockResponse)]
+    [Message(StateSyncInner.ObjectLockResponse)]
     public partial class ObjectLockResponse : MessageObject, IResponse
     {
         public static ObjectLockResponse Create(bool isFromPool = false)
@@ -377,7 +377,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectUnLockRequest)]
+    [Message(StateSyncInner.ObjectUnLockRequest)]
     [ResponseType(nameof(ObjectUnLockResponse))]
     public partial class ObjectUnLockRequest : MessageObject, IRequest
     {
@@ -419,7 +419,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectUnLockResponse)]
+    [Message(StateSyncInner.ObjectUnLockResponse)]
     public partial class ObjectUnLockResponse : MessageObject, IResponse
     {
         public static ObjectUnLockResponse Create(bool isFromPool = false)
@@ -452,7 +452,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectRemoveRequest)]
+    [Message(StateSyncInner.ObjectRemoveRequest)]
     [ResponseType(nameof(ObjectRemoveResponse))]
     public partial class ObjectRemoveRequest : MessageObject, IRequest
     {
@@ -486,7 +486,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectRemoveResponse)]
+    [Message(StateSyncInner.ObjectRemoveResponse)]
     public partial class ObjectRemoveResponse : MessageObject, IResponse
     {
         public static ObjectRemoveResponse Create(bool isFromPool = false)
@@ -519,7 +519,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectGetRequest)]
+    [Message(StateSyncInner.ObjectGetRequest)]
     [ResponseType(nameof(ObjectGetResponse))]
     public partial class ObjectGetRequest : MessageObject, IRequest
     {
@@ -553,7 +553,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectGetResponse)]
+    [Message(StateSyncInner.ObjectGetResponse)]
     public partial class ObjectGetResponse : MessageObject, IResponse
     {
         public static ObjectGetResponse Create(bool isFromPool = false)
@@ -594,7 +594,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.R2G_GetLoginKey)]
+    [Message(StateSyncInner.R2G_GetLoginKey)]
     [ResponseType(nameof(G2R_GetLoginKey))]
     public partial class R2G_GetLoginKey : MessageObject, IRequest
     {
@@ -624,7 +624,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2R_GetLoginKey)]
+    [Message(StateSyncInner.G2R_GetLoginKey)]
     public partial class G2R_GetLoginKey : MessageObject, IResponse
     {
         public static G2R_GetLoginKey Create(bool isFromPool = false)
@@ -665,7 +665,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.G2M_SessionDisconnect)]
+    [Message(StateSyncInner.G2M_SessionDisconnect)]
     public partial class G2M_SessionDisconnect : MessageObject, ILocationMessage
     {
         public static G2M_SessionDisconnect Create(bool isFromPool = false)
@@ -690,7 +690,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.ObjectQueryResponse)]
+    [Message(StateSyncInner.ObjectQueryResponse)]
     public partial class ObjectQueryResponse : MessageObject, IResponse
     {
         public static ObjectQueryResponse Create(bool isFromPool = false)
@@ -727,7 +727,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.M2M_UnitTransferRequest)]
+    [Message(StateSyncInner.M2M_UnitTransferRequest)]
     [ResponseType(nameof(M2M_UnitTransferResponse))]
     public partial class M2M_UnitTransferRequest : MessageObject, IRequest
     {
@@ -765,7 +765,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(InnerMessage.M2M_UnitTransferResponse)]
+    [Message(StateSyncInner.M2M_UnitTransferResponse)]
     public partial class M2M_UnitTransferResponse : MessageObject, IResponse
     {
         public static M2M_UnitTransferResponse Create(bool isFromPool = false)
@@ -797,7 +797,7 @@ namespace ET
         }
     }
 
-    public static class InnerMessage
+    public static class StateSyncInner
     {
         public const ushort ObjectQueryRequest = 20002;
         public const ushort M2A_Reload = 20003;

+ 35 - 35
Generate/ClientServer/Proto/Core/OuterMessage_C_10001.cs → Generate/Server/Proto/Statesync/StateSyncOuter_C_10001.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace ET
 {
     [MemoryPackable]
-    [Message(OuterMessage.HttpGetRouterResponse)]
+    [Message(StateSyncOuter.HttpGetRouterResponse)]
     public partial class HttpGetRouterResponse : MessageObject
     {
         public static HttpGetRouterResponse Create(bool isFromPool = false)
@@ -33,7 +33,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.RouterSync)]
+    [Message(StateSyncOuter.RouterSync)]
     public partial class RouterSync : MessageObject
     {
         public static RouterSync Create(bool isFromPool = false)
@@ -62,7 +62,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRequest)]
+    [Message(StateSyncOuter.C2M_TestRequest)]
     [ResponseType(nameof(M2C_TestResponse))]
     public partial class C2M_TestRequest : MessageObject, ILocationRequest
     {
@@ -92,7 +92,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestResponse)]
+    [Message(StateSyncOuter.M2C_TestResponse)]
     public partial class M2C_TestResponse : MessageObject, IResponse
     {
         public static M2C_TestResponse Create(bool isFromPool = false)
@@ -129,7 +129,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_EnterMap)]
+    [Message(StateSyncOuter.C2G_EnterMap)]
     [ResponseType(nameof(G2C_EnterMap))]
     public partial class C2G_EnterMap : MessageObject, ISessionRequest
     {
@@ -155,7 +155,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_EnterMap)]
+    [Message(StateSyncOuter.G2C_EnterMap)]
     public partial class G2C_EnterMap : MessageObject, ISessionResponse
     {
         public static G2C_EnterMap Create(bool isFromPool = false)
@@ -195,7 +195,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.MoveInfo)]
+    [Message(StateSyncOuter.MoveInfo)]
     public partial class MoveInfo : MessageObject
     {
         public static MoveInfo Create(bool isFromPool = false)
@@ -228,7 +228,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.UnitInfo)]
+    [Message(StateSyncOuter.UnitInfo)]
     public partial class UnitInfo : MessageObject
     {
         public static UnitInfo Create(bool isFromPool = false)
@@ -277,7 +277,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_CreateUnits)]
+    [Message(StateSyncOuter.M2C_CreateUnits)]
     public partial class M2C_CreateUnits : MessageObject, IMessage
     {
         public static M2C_CreateUnits Create(bool isFromPool = false)
@@ -302,7 +302,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_CreateMyUnit)]
+    [Message(StateSyncOuter.M2C_CreateMyUnit)]
     public partial class M2C_CreateMyUnit : MessageObject, IMessage
     {
         public static M2C_CreateMyUnit Create(bool isFromPool = false)
@@ -327,7 +327,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_StartSceneChange)]
+    [Message(StateSyncOuter.M2C_StartSceneChange)]
     public partial class M2C_StartSceneChange : MessageObject, IMessage
     {
         public static M2C_StartSceneChange Create(bool isFromPool = false)
@@ -356,7 +356,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_RemoveUnits)]
+    [Message(StateSyncOuter.M2C_RemoveUnits)]
     public partial class M2C_RemoveUnits : MessageObject, IMessage
     {
         public static M2C_RemoveUnits Create(bool isFromPool = false)
@@ -381,7 +381,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_PathfindingResult)]
+    [Message(StateSyncOuter.C2M_PathfindingResult)]
     public partial class C2M_PathfindingResult : MessageObject, ILocationMessage
     {
         public static C2M_PathfindingResult Create(bool isFromPool = false)
@@ -410,7 +410,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_Stop)]
+    [Message(StateSyncOuter.C2M_Stop)]
     public partial class C2M_Stop : MessageObject, ILocationMessage
     {
         public static C2M_Stop Create(bool isFromPool = false)
@@ -435,7 +435,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_PathfindingResult)]
+    [Message(StateSyncOuter.M2C_PathfindingResult)]
     public partial class M2C_PathfindingResult : MessageObject, IMessage
     {
         public static M2C_PathfindingResult Create(bool isFromPool = false)
@@ -468,7 +468,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_Stop)]
+    [Message(StateSyncOuter.M2C_Stop)]
     public partial class M2C_Stop : MessageObject, IMessage
     {
         public static M2C_Stop Create(bool isFromPool = false)
@@ -505,7 +505,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_Ping)]
+    [Message(StateSyncOuter.C2G_Ping)]
     [ResponseType(nameof(G2C_Ping))]
     public partial class C2G_Ping : MessageObject, ISessionRequest
     {
@@ -531,7 +531,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Ping)]
+    [Message(StateSyncOuter.G2C_Ping)]
     public partial class G2C_Ping : MessageObject, ISessionResponse
     {
         public static G2C_Ping Create(bool isFromPool = false)
@@ -568,7 +568,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Test)]
+    [Message(StateSyncOuter.G2C_Test)]
     public partial class G2C_Test : MessageObject, ISessionMessage
     {
         public static G2C_Test Create(bool isFromPool = false)
@@ -589,7 +589,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_Reload)]
+    [Message(StateSyncOuter.C2M_Reload)]
     [ResponseType(nameof(M2C_Reload))]
     public partial class C2M_Reload : MessageObject, ISessionRequest
     {
@@ -623,7 +623,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_Reload)]
+    [Message(StateSyncOuter.M2C_Reload)]
     public partial class M2C_Reload : MessageObject, ISessionResponse
     {
         public static M2C_Reload Create(bool isFromPool = false)
@@ -656,7 +656,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2R_Login)]
+    [Message(StateSyncOuter.C2R_Login)]
     [ResponseType(nameof(R2C_Login))]
     public partial class C2R_Login : MessageObject, ISessionRequest
     {
@@ -696,7 +696,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.R2C_Login)]
+    [Message(StateSyncOuter.R2C_Login)]
     public partial class R2C_Login : MessageObject, ISessionResponse
     {
         public static R2C_Login Create(bool isFromPool = false)
@@ -741,7 +741,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_LoginGate)]
+    [Message(StateSyncOuter.C2G_LoginGate)]
     [ResponseType(nameof(G2C_LoginGate))]
     public partial class C2G_LoginGate : MessageObject, ISessionRequest
     {
@@ -778,7 +778,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_LoginGate)]
+    [Message(StateSyncOuter.G2C_LoginGate)]
     public partial class G2C_LoginGate : MessageObject, ISessionResponse
     {
         public static G2C_LoginGate Create(bool isFromPool = false)
@@ -815,7 +815,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_TestHotfixMessage)]
+    [Message(StateSyncOuter.G2C_TestHotfixMessage)]
     public partial class G2C_TestHotfixMessage : MessageObject, ISessionMessage
     {
         public static G2C_TestHotfixMessage Create(bool isFromPool = false)
@@ -840,7 +840,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRobotCase)]
+    [Message(StateSyncOuter.C2M_TestRobotCase)]
     [ResponseType(nameof(M2C_TestRobotCase))]
     public partial class C2M_TestRobotCase : MessageObject, ILocationRequest
     {
@@ -870,7 +870,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestRobotCase)]
+    [Message(StateSyncOuter.M2C_TestRobotCase)]
     public partial class M2C_TestRobotCase : MessageObject, ILocationResponse
     {
         public static M2C_TestRobotCase Create(bool isFromPool = false)
@@ -907,7 +907,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TestRobotCase2)]
+    [Message(StateSyncOuter.C2M_TestRobotCase2)]
     public partial class C2M_TestRobotCase2 : MessageObject, ILocationMessage
     {
         public static C2M_TestRobotCase2 Create(bool isFromPool = false)
@@ -936,7 +936,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TestRobotCase2)]
+    [Message(StateSyncOuter.M2C_TestRobotCase2)]
     public partial class M2C_TestRobotCase2 : MessageObject, ILocationMessage
     {
         public static M2C_TestRobotCase2 Create(bool isFromPool = false)
@@ -965,7 +965,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2M_TransferMap)]
+    [Message(StateSyncOuter.C2M_TransferMap)]
     [ResponseType(nameof(M2C_TransferMap))]
     public partial class C2M_TransferMap : MessageObject, ILocationRequest
     {
@@ -991,7 +991,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.M2C_TransferMap)]
+    [Message(StateSyncOuter.M2C_TransferMap)]
     public partial class M2C_TransferMap : MessageObject, ILocationResponse
     {
         public static M2C_TransferMap Create(bool isFromPool = false)
@@ -1024,7 +1024,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.C2G_Benchmark)]
+    [Message(StateSyncOuter.C2G_Benchmark)]
     [ResponseType(nameof(G2C_Benchmark))]
     public partial class C2G_Benchmark : MessageObject, ISessionRequest
     {
@@ -1050,7 +1050,7 @@ namespace ET
     }
 
     [MemoryPackable]
-    [Message(OuterMessage.G2C_Benchmark)]
+    [Message(StateSyncOuter.G2C_Benchmark)]
     public partial class G2C_Benchmark : MessageObject, ISessionResponse
     {
         public static G2C_Benchmark Create(bool isFromPool = false)
@@ -1082,7 +1082,7 @@ namespace ET
         }
     }
 
-    public static class OuterMessage
+    public static class StateSyncOuter
     {
         public const ushort HttpGetRouterResponse = 10002;
         public const ushort RouterSync = 10003;

+ 1 - 1
Unity/Packages/com.et.core/Scripts/CodeMode~/ClientServer/StartProcessConfig.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace ET.Core
+namespace ET
 {
     public partial class StartProcessConfig
     {

+ 1 - 1
Unity/Packages/com.et.core/Scripts/CodeMode~/Server/StartProcessConfig.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace ET.Core
+namespace ET
 {
     public partial class StartProcessConfig
     {

+ 2 - 2
Unity/Packages/com.et.core/Scripts/Model~/Server/Message/ProcessOuterSender.cs

@@ -134,7 +134,7 @@ namespace ET.Server
                 return session;
             }
 
-            IPEndPoint ipEndPoint = ET.Core.StartProcessConfigCategory.Instance.Get((int) channelId).IPEndPoint;
+            IPEndPoint ipEndPoint = StartProcessConfigCategory.Instance.Get((int) channelId).IPEndPoint;
             session = self.CreateInner(channelId, ipEndPoint);
             return session;
         }
@@ -184,7 +184,7 @@ namespace ET.Server
                 throw new Exception($"actor is the same process: {fiber.Process} {actorId.Process}");
             }
             
-            ET.Core.StartProcessConfig startProcessConfig = ET.Core.StartProcessConfigCategory.Instance.Get(actorId.Process);
+            StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(actorId.Process);
             Session session = self.Get(startProcessConfig.Id);
             actorId.Process = fiber.Process;
             session.Send(actorId, message);

+ 0 - 8
Unity/Packages/com.et.lockstep/Proto.meta

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

+ 0 - 67
Unity/Packages/com.et.lockstep/Proto/LockStepInner_S_21001.proto

@@ -1,67 +0,0 @@
-syntax = "proto3";
-package ET;
-
-/// 请求匹配
-// ResponseType Match2G_Match
-message G2Match_Match // IRequest
-{
-	int32 RpcId = 1;
-	
-	int64 Id = 2;
-}
-
-message Match2G_Match // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-// ResponseType Map2Match_GetRoom
-message Match2Map_GetRoom // IRequest
-{
-	int32 RpcId = 1;
-	repeated int64 PlayerIds = 2;
-}
-
-message Map2Match_GetRoom // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-
-	/// 房间的ActorId
-	ActorId ActorId = 4;
-}
-
-// ResponseType Room2G_Reconnect
-message G2Room_Reconnect // IRequest
-{
-	int32 RpcId = 1;
-	int64 PlayerId = 2;
-}
-
-message Room2G_Reconnect // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-
-	int64 StartTime = 4;
-	repeated LockStepUnitInfo UnitInfos = 5;
-	int32 Frame = 6;
-}
-
-// ResponseType Room2RoomManager_Init
-message RoomManager2Room_Init // IRequest
-{
-	int32 RpcId = 1;
-	repeated int64 PlayerIds = 2;
-}
-
-message Room2RoomManager_Init // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}

+ 0 - 7
Unity/Packages/com.et.lockstep/Proto/LockStepInner_S_21001.proto.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2adafb641a45a4d548b1cc826aca1d6f
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 81
Unity/Packages/com.et.lockstep/Proto/LockStepOuter_C_11001.proto

@@ -1,81 +0,0 @@
-syntax = "proto3";
-package ET;
-
-// ResponseType G2C_Match
-message C2G_Match // ISessionRequest
-{
-	int32 RpcId = 1;
-}
-
-message G2C_Match // ISessionResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-/// 匹配成功,通知客户端切换场景
-message Match2G_NotifyMatchSuccess // IMessage
-{
-	int32 RpcId = 1;
-	/// 房间的ActorId
-	ActorId ActorId = 2;
-}
-
-/// 客户端通知房间切换场景完成
-message C2Room_ChangeSceneFinish // IRoomMessage
-{
-	int64 PlayerId = 1;
-}
-
-message LockStepUnitInfo
-{
-	int64 PlayerId = 1;
-	TrueSync.TSVector Position = 2;
-	TrueSync.TSQuaternion Rotation = 3;
-}
-
-/// 房间通知客户端进入战斗
-message Room2C_Start // IMessage
-{
-	int64 StartTime = 1;
-	repeated LockStepUnitInfo UnitInfo = 2;
-}
-
-message FrameMessage // IMessage
-{
-	int32 Frame = 1;
-	int64 PlayerId = 2;
-	LSInput Input = 3;
-}
-
-message OneFrameInputs // IMessage
-{
-	int32 Frame = 1;
-	map<int64, LSInput> Inputs = 2;
-}
-
-message Room2C_AdjustUpdateTime // IMessage
-{
-	int32 DiffTime = 1;
-}
-
-message C2Room_CheckHash // IRoomMessage
-{
-	int64 PlayerId = 1;
-	int32 Frame = 2;
-	int64 Hash = 3;
-}
-
-message Room2C_CheckHashFail // IMessage
-{
-	int32 Frame = 1;
-	bytes LSWorldBytes = 2;
-}
-
-message G2C_Reconnect // IMessage
-{
-	int64 StartTime = 1;
-	repeated LockStepUnitInfo UnitInfos = 2;
-	int32 Frame = 3;
-}

+ 0 - 7
Unity/Packages/com.et.lockstep/Proto/LockStepOuter_C_11001.proto.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 32e6c63b0256f45a19583fba46f5cfab
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Packages/com.et.lockstep/Scripts.meta

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

+ 0 - 8
Unity/Packages/com.et.lockstep/Scripts/LockStep.meta

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

+ 0 - 22
Unity/Packages/com.et.lockstep/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "com.et.lockstep",
-  "displayName": "ET.LockStep",
-  "version": "0.0.1",
-  "unity": "2022.3",
-  "description": "et lockstep",
-  "author": {
-    "name": "tanghai",
-    "url": "https://github.com/egametang/ET"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/egametang/ET"
-  },
-  "relatedPackages": {},
-  "dependencies": {
-    "com.et.core": "",
-    "com.et.yooassets": "",
-    "com.et.loader": "",
-    "com.et.mapscenes": ""
-  }
-}

+ 0 - 7
Unity/Packages/com.et.lockstep/package.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 73f1c1e8be500d845a49eb88d2bf37e7
-PackageManifestImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 1
Unity/Packages/com.et.yooassets/package.json

@@ -15,6 +15,7 @@
   "relatedPackages": {},
   "dependencies": {
     "com.tuyoogame.yooasset": "2.1.1",
-    "com.et.core": ""
+    "com.et.core": "",
+    "com.unity.mathematics": "1.2.6"
   }
 }

+ 2 - 12
Unity/Packages/packages-lock.json

@@ -31,17 +31,6 @@
         "com.et.yooassets": ""
       }
     },
-    "com.et.lockstep": {
-      "version": "file:com.et.lockstep",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {
-        "com.et.core": "",
-        "com.et.yooassets": "",
-        "com.et.loader": "",
-        "com.et.mapscenes": ""
-      }
-    },
     "com.et.mapscenes": {
       "version": "file:com.et.mapscenes",
       "depth": 0,
@@ -65,7 +54,8 @@
       "source": "embedded",
       "dependencies": {
         "com.tuyoogame.yooasset": "2.1.1",
-        "com.et.core": ""
+        "com.et.core": "",
+        "com.unity.mathematics": "1.2.6"
       }
     },
     "com.tuyoogame.yooasset": {