既然所有消息都是Actor消息了，那么Actor这个名字也不需要加了

Unity/Assets/Config/Proto/ClientMessage_C_1000.proto

@@ -4,14 +4,14 @@ syntax = "proto3";
 package ET;
 
 //ResponseType NetClient2Main_Login
-message Main2NetClient_Login // IActorRequest
+message Main2NetClient_Login // IRequest
 {
 	int32 RpcId = 1;
 	string Account = 2;
 	string Password = 3;
 }
 
-message NetClient2Main_Login // IActorResponse
+message NetClient2Main_Login // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;

Unity/Assets/Config/Proto/InnerMessage_S_20001.proto

@@ -4,7 +4,7 @@ syntax = "proto3";
 package ET;
 
 //ResponseType ObjectQueryResponse
-message ObjectQueryRequest // IActorRequest
+message ObjectQueryRequest // IRequest
 {
 	int32 RpcId = 1;
 	int64 Key = 2;
@@ -12,12 +12,12 @@ message ObjectQueryRequest // IActorRequest
 }
 
 //ResponseType A2M_Reload
-message M2A_Reload // IActorRequest
+message M2A_Reload // IRequest
 {
 	int32 RpcId = 1;
 }
 
-message A2M_Reload // IActorResponse
+message A2M_Reload // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -25,14 +25,14 @@ message A2M_Reload // IActorResponse
 }
 
 //ResponseType G2G_LockResponse
-message G2G_LockRequest // IActorRequest
+message G2G_LockRequest // IRequest
 {
 	int32 RpcId = 1;
 	int64 Id = 2;
 	string Address = 3;
 }
 
-message G2G_LockResponse // IActorResponse
+message G2G_LockResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -40,14 +40,14 @@ message G2G_LockResponse // IActorResponse
 }
 
 //ResponseType G2G_LockReleaseResponse
-message G2G_LockReleaseRequest // IActorRequest
+message G2G_LockReleaseRequest // IRequest
 {
 	int32 RpcId = 1;
 	int64 Id = 2;
 	string Address = 3;
 }
 
-message G2G_LockReleaseResponse // IActorResponse
+message G2G_LockReleaseResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -55,7 +55,7 @@ message G2G_LockReleaseResponse // IActorResponse
 }
 
 //ResponseType ObjectAddResponse
-message ObjectAddRequest // IActorRequest
+message ObjectAddRequest // IRequest
 {
 	int32 RpcId = 1;
 	int32 Type = 2;
@@ -63,7 +63,7 @@ message ObjectAddRequest // IActorRequest
 	ActorId ActorId = 4;
 }
 
-message ObjectAddResponse // IActorResponse
+message ObjectAddResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -71,7 +71,7 @@ message ObjectAddResponse // IActorResponse
 }
 
 //ResponseType ObjectLockResponse
-message ObjectLockRequest // IActorRequest
+message ObjectLockRequest // IRequest
 {
 	int32 RpcId = 1;
 	int32 Type = 2;
@@ -79,7 +79,7 @@ message ObjectLockRequest // IActorRequest
 	ActorId ActorId = 4;
 	int32 Time = 5;
 }
-message ObjectLockResponse // IActorResponse
+message ObjectLockResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -87,7 +87,7 @@ message ObjectLockResponse // IActorResponse
 }
 
 //ResponseType ObjectUnLockResponse
-message ObjectUnLockRequest // IActorRequest
+message ObjectUnLockRequest // IRequest
 {
 	int32 RpcId = 1;
 	int32 Type = 2;
@@ -95,7 +95,7 @@ message ObjectUnLockRequest // IActorRequest
 	ActorId OldActorId = 4;
 	ActorId NewActorId = 5;
 }
-message ObjectUnLockResponse // IActorResponse
+message ObjectUnLockResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -103,13 +103,13 @@ message ObjectUnLockResponse // IActorResponse
 }
 
 //ResponseType ObjectRemoveResponse
-message ObjectRemoveRequest // IActorRequest
+message ObjectRemoveRequest // IRequest
 {
 	int32 RpcId = 1;
 	int32 Type = 2;
 	int64 Key = 3;
 }
-message ObjectRemoveResponse // IActorResponse
+message ObjectRemoveResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -117,13 +117,13 @@ message ObjectRemoveResponse // IActorResponse
 }
 
 //ResponseType ObjectGetResponse
-message ObjectGetRequest // IActorRequest
+message ObjectGetRequest // IRequest
 {
 	int32 RpcId = 1;
 	int32 Type = 2;
 	int64 Key = 3;
 }
-message ObjectGetResponse // IActorResponse
+message ObjectGetResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -133,13 +133,13 @@ message ObjectGetResponse // IActorResponse
 }
 
 //ResponseType G2R_GetLoginKey
-message R2G_GetLoginKey // IActorRequest
+message R2G_GetLoginKey // IRequest
 {
 	int32 RpcId = 1;
 	string Account = 2;
 }
 
-message G2R_GetLoginKey // IActorResponse
+message G2R_GetLoginKey // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -148,12 +148,12 @@ message G2R_GetLoginKey // IActorResponse
 	int64 GateId = 5;
 }
 
-message G2M_SessionDisconnect // IActorLocationMessage
+message G2M_SessionDisconnect // ILocationMessage
 {
 	int32 RpcId = 1;
 }
 
-message ObjectQueryResponse // IActorResponse
+message ObjectQueryResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -162,7 +162,7 @@ message ObjectQueryResponse // IActorResponse
 }
 
 //ResponseType M2M_UnitTransferResponse
-message M2M_UnitTransferRequest // IActorRequest
+message M2M_UnitTransferRequest // IRequest
 {
 	int32 RpcId = 1;
 	ActorId OldActorId = 2;
@@ -170,7 +170,7 @@ message M2M_UnitTransferRequest // IActorRequest
 	repeated bytes Entitys = 4;
 }
 
-message M2M_UnitTransferResponse // IActorResponse
+message M2M_UnitTransferResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;

Unity/Assets/Config/Proto/LockStepInner_S_21001.proto

@@ -3,14 +3,14 @@ package ET;
 
 // 请求匹配
 //ResponseType Match2G_Match
-message G2Match_Match // IActorRequest
+message G2Match_Match // IRequest
 {
 	int32 RpcId = 1;
 	
 	int64 Id = 2;
 }
 
-message Match2G_Match // IActorResponse
+message Match2G_Match // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -18,13 +18,13 @@ message Match2G_Match // IActorResponse
 }
 
 //ResponseType Map2Match_GetRoom
-message Match2Map_GetRoom // IActorRequest
+message Match2Map_GetRoom // IRequest
 {
 	int32 RpcId = 1;
 	repeated int64 PlayerIds = 2;
 }
 
-message Map2Match_GetRoom // IActorResponse
+message Map2Match_GetRoom // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -35,13 +35,13 @@ message Map2Match_GetRoom // IActorResponse
 }
 
 //ResponseType Room2G_Reconnect
-message G2Room_Reconnect // IActorRequest
+message G2Room_Reconnect // IRequest
 {
 	int32 RpcId = 1;
 	int64 PlayerId = 2;
 }
 
-message Room2G_Reconnect // IActorResponse
+message Room2G_Reconnect // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -53,13 +53,13 @@ message Room2G_Reconnect // IActorResponse
 }
 
 //ResponseType Room2RoomManager_Init
-message RoomManager2Room_Init // IActorRequest
+message RoomManager2Room_Init // IRequest
 {
 	int32 RpcId = 1;
 	repeated int64 PlayerIds = 2;
 }
 
-message Room2RoomManager_Init // IActorResponse
+message Room2RoomManager_Init // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;

Unity/Assets/Config/Proto/LockStepOuter_C_11001.proto

@@ -15,7 +15,7 @@ message G2C_Match // ISessionResponse
 }
 
 // 匹配成功，通知客户端切换场景
-message Match2G_NotifyMatchSuccess // IActorMessage
+message Match2G_NotifyMatchSuccess // IMessage
 {
 	int32 RpcId = 1;
 	// 房间的ActorId
@@ -23,7 +23,7 @@ message Match2G_NotifyMatchSuccess // IActorMessage
 }
 
 // 客户端通知房间切换场景完成
-message C2Room_ChangeSceneFinish // IActorRoom
+message C2Room_ChangeSceneFinish // IRoom
 {
 	int64 PlayerId = 1;
 }
@@ -36,43 +36,43 @@ message LockStepUnitInfo
 }
 
 // 房间通知客户端进入战斗
-message Room2C_Start // IActorMessage
+message Room2C_Start // IMessage
 {
 	int64 StartTime = 1;
 	repeated LockStepUnitInfo UnitInfo = 2;
 }
 
-message FrameMessage // IActorMessage
+message FrameMessage // IMessage
 {
 	int32 Frame = 1;
 	int64 PlayerId = 2;
 	LSInput Input = 3;
 }
 
-message OneFrameInputs // IActorMessage
+message OneFrameInputs // IMessage
 {
 	map<int64, LSInput> Inputs = 2;
 }
 
-message Room2C_AdjustUpdateTime // IActorMessage
+message Room2C_AdjustUpdateTime // IMessage
 {
 	int32 DiffTime = 1;
 }
 
-message C2Room_CheckHash // IActorRoom
+message C2Room_CheckHash // IRoom
 {
 	int64 PlayerId = 1;
 	int32 Frame = 2;
 	int64 Hash = 3;
 }
 
-message Room2C_CheckHashFail // IActorMessage
+message Room2C_CheckHashFail // IMessage
 {
 	int32 Frame = 1;
 	bytes LSWorldBytes = 2;
 }
 
-message G2C_Reconnect // IActorMessage
+message G2C_Reconnect // IMessage
 {
 	int64 StartTime = 1;
 	repeated LockStepUnitInfo UnitInfos = 2;

Unity/Assets/Config/Proto/OuterMessage_C_10001.proto

@@ -14,13 +14,13 @@ message RouterSync
 }
 
 //ResponseType M2C_TestResponse
-message C2M_TestRequest // IActorLocationRequest
+message C2M_TestRequest // ILocationRequest
 {
 	int32 RpcId = 1;
 	string request = 2;
 }
 
-message M2C_TestResponse // IActorResponse
+message M2C_TestResponse // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -29,13 +29,13 @@ message M2C_TestResponse // IActorResponse
 }
 
 //ResponseType Actor_TransferResponse
-message Actor_TransferRequest // IActorLocationRequest
+message Actor_TransferRequest // ILocationRequest
 {
 	int32 RpcId = 1;
 	int32 MapIndex = 2;
 }
 
-message Actor_TransferResponse // IActorLocationResponse
+message Actor_TransferResponse // ILocationResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -75,46 +75,46 @@ message UnitInfo
 	MoveInfo MoveInfo = 7;
 }
 
-message M2C_CreateUnits // IActorMessage
+message M2C_CreateUnits // IMessage
 {
 	repeated UnitInfo Units = 1;
 }
 
-message M2C_CreateMyUnit // IActorMessage
+message M2C_CreateMyUnit // IMessage
 {
 	UnitInfo Unit = 1;
 }
 
-message M2C_StartSceneChange // IActorMessage
+message M2C_StartSceneChange // IMessage
 {
 	int64 SceneInstanceId = 1;
 	string SceneName = 2;	
 }
 
-message M2C_RemoveUnits // IActorMessage
+message M2C_RemoveUnits // IMessage
 {
 	repeated int64 Units = 1;
 }
 
-message C2M_PathfindingResult // IActorLocationMessage
+message C2M_PathfindingResult // ILocationMessage
 {
 	int32 RpcId = 1;
 	Unity.Mathematics.float3 Position = 2;
 }
 
-message C2M_Stop // IActorLocationMessage
+message C2M_Stop // ILocationMessage
 {
 	int32 RpcId = 1;
 }
 
-message M2C_PathfindingResult // IActorMessage
+message M2C_PathfindingResult // IMessage
 {
 	int64 Id = 1;
 	Unity.Mathematics.float3 Position = 2;
 	repeated Unity.Mathematics.float3 Points = 3;
 }
 
-message M2C_Stop // IActorMessage
+message M2C_Stop // IMessage
 {
 	int32 Error = 1;
 	int64 Id = 2;
@@ -196,13 +196,13 @@ message G2C_TestHotfixMessage // ISessionMessage
 }
 
 //ResponseType M2C_TestRobotCase
-message C2M_TestRobotCase // IActorLocationRequest
+message C2M_TestRobotCase // ILocationRequest
 {
 	int32 RpcId = 1;
 	int32 N = 2;
 }
 
-message M2C_TestRobotCase // IActorLocationResponse
+message M2C_TestRobotCase // ILocationResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
@@ -210,25 +210,25 @@ message M2C_TestRobotCase // IActorLocationResponse
 	int32 N = 4;
 }
 
-message C2M_TestRobotCase2 // IActorLocationMessage
+message C2M_TestRobotCase2 // ILocationMessage
 {
 	int32 RpcId = 1;
 	int32 N = 2;
 }
 
-message M2C_TestRobotCase2 // IActorLocationMessage
+message M2C_TestRobotCase2 // ILocationMessage
 {
 	int32 RpcId = 1;
 	int32 N = 2;
 }
 
 //ResponseType M2C_TransferMap
-message C2M_TransferMap // IActorLocationRequest
+message C2M_TransferMap // ILocationRequest
 {
 	int32 RpcId = 1;
 }
 
-message M2C_TransferMap // IActorLocationResponse
+message M2C_TransferMap // ILocationResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;

Unity/Assets/Scripts/Core/Fiber/MailBoxComponent.cs

@@ -20,7 +20,7 @@
         }
 
         // 加到mailbox
-        public static void Add(this MailBoxComponent self, Address fromAddress, IActorMessage messageObject)
+        public static void Add(this MailBoxComponent self, Address fromAddress, IMessage messageObject)
         {
             // 根据mailboxType进行分发处理
             EventSystem.Instance.Invoke((long)self.MailBoxType, new MailBoxInvoker() {MailBoxComponent = self, MessageObject = messageObject, FromAddress = fromAddress});
@@ -30,7 +30,7 @@
     public struct MailBoxInvoker
     {
         public Address FromAddress;
-        public IActorMessage MessageObject;
+        public IMessage MessageObject;
         public MailBoxComponent MailBoxComponent;
     }
     

Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorHelper.cs

@@ -4,12 +4,12 @@ namespace ET
 {
     public static class ActorHelper
     {
-        public static IActorResponse CreateResponse(IActorRequest iActorRequest, int error)
+        public static IResponse CreateResponse(IRequest iRequest, int error)
         {
-            Type responseType = OpcodeType.Instance.GetResponseType(iActorRequest.GetType());
-            IActorResponse response = (IActorResponse)ObjectPool.Instance.Fetch(responseType);
+            Type responseType = OpcodeType.Instance.GetResponseType(iRequest.GetType());
+            IResponse response = (IResponse)ObjectPool.Instance.Fetch(responseType);
             response.Error = error;
-            response.RpcId = iActorRequest.RpcId;
+            response.RpcId = iRequest.RpcId;
             return response;
         }
     }

Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorInnerComponentSystem.cs

@@ -38,22 +38,22 @@ namespace ET
 
         private static void HandleMessage(this ActorInnerComponent self, Fiber fiber, in ActorMessageInfo actorMessageInfo)
         {
-            if (actorMessageInfo.MessageObject is IActorResponse response)
+            if (actorMessageInfo.MessageObject is IResponse response)
             {
                 self.HandleIActorResponse(response);
                 return;
             }
 
             ActorId actorId = actorMessageInfo.ActorId;
-            IActorMessage message = actorMessageInfo.MessageObject;
+            IMessage message = actorMessageInfo.MessageObject;
 
             MailBoxComponent mailBoxComponent = self.Fiber().Mailboxes.Get(actorId.InstanceId);
             if (mailBoxComponent == null)
             {
                 Log.Warning($"actor not found mailbox, from: {actorId} current: {fiber.Address} {message}");
-                if (message is IActorRequest request)
+                if (message is IRequest request)
                 {
-                    IActorResponse resp = ActorHelper.CreateResponse(request, ErrorCore.ERR_NotFoundActor);
+                    IResponse resp = ActorHelper.CreateResponse(request, ErrorCore.ERR_NotFoundActor);
                     self.Reply(actorId.Address, resp);
                 }
                 return;
@@ -61,7 +61,7 @@ namespace ET
             mailBoxComponent.Add(actorId.Address, message);
         }
 
-        private static void HandleIActorResponse(this ActorInnerComponent self, IActorResponse response)
+        private static void HandleIActorResponse(this ActorInnerComponent self, IResponse response)
         {
             if (!self.requestCallback.Remove(response.RpcId, out ActorMessageSender actorMessageSender))
             {
@@ -70,7 +70,7 @@ namespace ET
             Run(actorMessageSender, response);
         }
         
-        private static void Run(ActorMessageSender self, IActorResponse response)
+        private static void Run(ActorMessageSender self, IResponse response)
         {
             if (response.Error == ErrorCore.ERR_ActorTimeout)
             {
@@ -87,17 +87,17 @@ namespace ET
             self.Tcs.SetResult(response);
         }
         
-        public static void Reply(this ActorInnerComponent self, Address fromAddress, IActorResponse message)
+        public static void Reply(this ActorInnerComponent self, Address fromAddress, IResponse message)
         {
             self.SendInner(new ActorId(fromAddress, 0), message);
         }
 
-        public static void Send(this ActorInnerComponent self, ActorId actorId, IActorMessage message)
+        public static void Send(this ActorInnerComponent self, ActorId actorId, IMessage message)
         {
             self.SendInner(actorId, message);
         }
 
-        private static void SendInner(this ActorInnerComponent self, ActorId actorId, IActorMessage message)
+        private static void SendInner(this ActorInnerComponent self, ActorId actorId, IMessage message)
         {
             Fiber fiber = self.Fiber();
             
@@ -121,10 +121,10 @@ namespace ET
             return ++self.RpcId;
         }
 
-        public static async ETTask<IActorResponse> Call(
+        public static async ETTask<IResponse> Call(
                 this ActorInnerComponent self,
                 ActorId actorId,
-                IActorRequest request,
+                IRequest request,
                 bool needException = true
         )
         {
@@ -138,17 +138,17 @@ namespace ET
             return await self.Call(actorId, request.RpcId, request, needException);
         }
         
-        public static async ETTask<IActorResponse> Call(
+        public static async ETTask<IResponse> Call(
                 this ActorInnerComponent self,
                 ActorId actorId,
                 int rpcId,
-                IActorRequest iActorRequest,
+                IRequest iRequest,
                 bool needException = true
         )
         {
             if (actorId == default)
             {
-                throw new Exception($"actor id is 0: {iActorRequest}");
+                throw new Exception($"actor id is 0: {iRequest}");
             }
             Fiber fiber = self.Fiber();
             if (fiber.Process != actorId.Process)
@@ -156,11 +156,11 @@ namespace ET
                 throw new Exception($"actor inner process diff: {actorId.Process} {fiber.Process}");
             }
             
-            var tcs = ETTask<IActorResponse>.Create(true);
+            var tcs = ETTask<IResponse>.Create(true);
 
-            self.requestCallback.Add(rpcId, new ActorMessageSender(actorId, iActorRequest, tcs, needException));
+            self.requestCallback.Add(rpcId, new ActorMessageSender(actorId, iRequest, tcs, needException));
             
-            self.SendInner(actorId, iActorRequest);
+            self.SendInner(actorId, iRequest);
 
             
             async ETTask Timeout()
@@ -174,11 +174,11 @@ namespace ET
                 
                 if (needException)
                 {
-                    action.Tcs.SetException(new Exception($"actor sender timeout: {iActorRequest}"));
+                    action.Tcs.SetException(new Exception($"actor sender timeout: {iRequest}"));
                 }
                 else
                 {
-                    IActorResponse response = ActorHelper.CreateResponse(iActorRequest, ErrorCore.ERR_Timeout);
+                    IResponse response = ActorHelper.CreateResponse(iRequest, ErrorCore.ERR_Timeout);
                     action.Tcs.SetResult(response);
                 }
             }
@@ -187,14 +187,14 @@ namespace ET
             
             long beginTime = TimeInfo.Instance.ServerFrameTime();
 
-            IActorResponse response = await tcs;
+            IResponse response = await tcs;
             
             long endTime = TimeInfo.Instance.ServerFrameTime();
 
             long costTime = endTime - beginTime;
             if (costTime > 200)
             {
-                Log.Warning($"actor rpc time > 200: {costTime} {iActorRequest}");
+                Log.Warning($"actor rpc time > 200: {costTime} {iRequest}");
             }
             
             return response;

Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSender.cs

@@ -7,16 +7,16 @@ namespace ET
     {
         public ActorId ActorId { get; }
         
-        public IActorRequest Request { get; }
+        public IRequest Request { get; }
 
         public bool NeedException { get; }
 
-        public ETTask<IActorResponse> Tcs { get; }
+        public ETTask<IResponse> Tcs { get; }
 
-        public ActorMessageSender(ActorId actorId, IActorRequest iActorRequest, ETTask<IActorResponse> tcs, bool needException)
+        public ActorMessageSender(ActorId actorId, IRequest iRequest, ETTask<IResponse> tcs, bool needException)
         {
             this.ActorId = actorId;
-            this.Request = iActorRequest;
+            this.Request = iRequest;
             this.Tcs = tcs;
             this.NeedException = needException;
         }

Unity/Assets/Scripts/Core/Network/IActorLocationMessage.cs

@@ -1,14 +0,0 @@
-namespace ET
-{
-    public interface IActorLocationMessage: IActorLocationRequest
-    {
-    }
-
-    public interface IActorLocationRequest: IActorRequest
-    {
-    }
-
-    public interface IActorLocationResponse: IActorResponse
-    {
-    }
-}

Unity/Assets/Scripts/Core/Network/ILocationMessage.cs

@@ -0,0 +1,14 @@
+namespace ET
+{
+    public interface ILocationMessage: ILocationRequest
+    {
+    }
+
+    public interface ILocationRequest: IRequest
+    {
+    }
+
+    public interface ILocationResponse: IResponse
+    {
+    }
+}

Unity/Assets/Scripts/Core/Network/IActorMessage.cs.meta → Unity/Assets/Scripts/Core/Network/ILocationMessage.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 76f16794a16d10c4e926f472af29d69d
+guid: 399866f6c652f764e92674252d7d2935
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Network/IActorMessage.cs → Unity/Assets/Scripts/Core/Network/IMessage.cs

@@ -1,11 +1,11 @@
 namespace ET
 {
     // 不需要返回消息
-    public interface IActorMessage
+    public interface IMessage
     {
     }
 
-    public interface IActorRequest: IActorMessage
+    public interface IRequest: IMessage
     {
         int RpcId
         {
@@ -14,7 +14,7 @@
         }
     }
 
-    public interface IActorResponse: IActorMessage
+    public interface IResponse: IMessage
     {
         int Error
         {

Unity/Assets/Scripts/Core/Network/ActorResponse.cs.meta → Unity/Assets/Scripts/Core/Network/IMessage.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 82646c1ccd21692429cf45e8d8ba7cd9
+guid: 6e7a4d0a421c9f14eb2114a01c350902
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Network/OpcodeType.cs

@@ -34,11 +34,11 @@ namespace ET
                 }
 
                 // 检查request response
-                if (typeof (IActorRequest).IsAssignableFrom(type))
+                if (typeof (IRequest).IsAssignableFrom(type))
                 {
-                    if (typeof (IActorLocationMessage).IsAssignableFrom(type))
+                    if (typeof (ILocationMessage).IsAssignableFrom(type))
                     {
-                        this.requestResponse.Add(type, typeof (ActorResponse));
+                        this.requestResponse.Add(type, typeof (MessageResponse));
                         continue;
                     }
 

Unity/Assets/Scripts/Core/Network/ActorResponse.cs → Unity/Assets/Scripts/Core/Network/Response.cs

@@ -4,7 +4,7 @@ namespace ET
 {
     [Message(ushort.MaxValue)]
     [MemoryPackable]
-    public partial class ActorResponse: MessageObject, IActorResponse
+    public partial class MessageResponse: MessageObject, IResponse
     {
         [MemoryPackOrder(1)]
         public int RpcId { get; set; }

Unity/Assets/Scripts/Model/Share/LockStep/IActorRoom.cs.meta → Unity/Assets/Scripts/Core/Network/Response.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 88154111be2b445c295e7208376f428b
+guid: bbb9bd89ed8b04340a58149be0334472
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Object/MessageObject.cs

@@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes;
 
 namespace ET
 {
-    public abstract class MessageObject: ProtoObject, IActorMessage, IDisposable
+    public abstract class MessageObject: ProtoObject, IMessage, IDisposable
     {
         public virtual void Dispose()
         {

Unity/Assets/Scripts/Core/World/Module/Actor/ActorMessageQueue.cs

@@ -6,7 +6,7 @@ namespace ET
     public struct ActorMessageInfo
     {
         public ActorId ActorId;
-        public IActorMessage MessageObject;
+        public IMessage MessageObject;
     }
     
     public class ActorMessageQueue: Singleton<ActorMessageQueue>, ISingletonAwake
@@ -17,17 +17,17 @@ namespace ET
         {
         }
 
-        public void Send(ActorId actorId, IActorMessage messageObject)
+        public void Send(ActorId actorId, IMessage messageObject)
         {
             this.Send(actorId.Address, actorId, messageObject);
         }
         
-        public void Reply(ActorId actorId, IActorMessage messageObject)
+        public void Reply(ActorId actorId, IMessage messageObject)
         {
             this.Send(actorId.Address, actorId, messageObject);
         }
         
-        public void Send(Address fromAddress, ActorId actorId, IActorMessage messageObject)
+        public void Send(Address fromAddress, ActorId actorId, IMessage messageObject)
         {
             if (!this.messages.TryGetValue(actorId.Address.Fiber, out var queue))
             {

Unity/Assets/Scripts/Hotfix/Client/Demo/Main/ClientSenderCompnentSystem.cs

@@ -29,14 +29,14 @@
             return response.PlayerId;
         }
 
-        public static void Send(this ClientSenderCompnent self, IActorMessage message)
+        public static void Send(this ClientSenderCompnent self, IMessage message)
         {
             A2NetClient_Message a2NetClientMessage = A2NetClient_Message.Create();
             a2NetClientMessage.MessageObject = message;
             self.Fiber().ActorInnerComponent.Send(self.netClientActorId, a2NetClientMessage);
         }
 
-        public static async ETTask<IActorResponse> Call(this ClientSenderCompnent self, IActorRequest request, bool needException = true)
+        public static async ETTask<IResponse> Call(this ClientSenderCompnent self, IRequest request, bool needException = true)
         {
             A2NetClient_Request a2NetClientRequest = A2NetClient_Request.Create();
             a2NetClientRequest.MessageObject = request;

Unity/Assets/Scripts/Hotfix/Client/Module/Message/NetClientComponentSystem.cs

@@ -41,7 +41,7 @@ namespace ET.Client
             
             switch (message)
             {
-                case IActorResponse response:
+                case IResponse response:
                 {
                     session.OnResponse(response);
                     break;
@@ -51,7 +51,7 @@ namespace ET.Client
                     MessageDispatcherComponent.Instance.Handle(session, message);
                     break;
                 }
-                case IActorMessage iActorMessage:
+                case IMessage iActorMessage:
                 {
                     // 扔到Main纤程队列中
                     self.Fiber().ActorInnerComponent.Send(new ActorId(self.Fiber().Process, ConstFiberId.Main), iActorMessage);

Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/MailBoxType_GateSessionHandler.cs

@@ -8,7 +8,7 @@
             MailBoxComponent mailBoxComponent = args.MailBoxComponent;
             
             // 这里messageObject要发送出去，不能回收
-            IActorMessage messageObject = args.MessageObject;
+            IMessage messageObject = args.MessageObject;
             
             if (mailBoxComponent.Parent is PlayerSessionComponent playerSessionComponent)
             {

Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/NetServerComponentOnReadEvent.cs

@@ -10,7 +10,7 @@ namespace ET.Server
             Session session = args.Session;
             object message = args.Message;
             Scene root = scene.Root();
-            if (message is IActorResponse response)
+            if (message is IResponse response)
             {
                 session.OnResponse(response);
                 return;
@@ -31,7 +31,7 @@ namespace ET.Server
                     root.GetComponent<ActorSenderComponent>().Send(roomActorId, frameMessage);
                     break;
                 }
-                case IActorRoom actorRoom:
+                case IRoom actorRoom:
                 {
                     Player player = session.GetComponent<SessionPlayerComponent>().Player;
                     ActorId roomActorId = player.GetComponent<PlayerRoomComponent>().RoomActorId;
@@ -39,18 +39,18 @@ namespace ET.Server
                     root.GetComponent<ActorSenderComponent>().Send(roomActorId, actorRoom);
                     break;
                 }
-                case IActorLocationMessage actorLocationMessage:
+                case ILocationMessage actorLocationMessage:
                 {
                     long unitId = session.GetComponent<SessionPlayerComponent>().Player.Id;
                     root.GetComponent<ActorLocationSenderComponent>().Get(LocationType.Unit).Send(unitId, actorLocationMessage);
                     break;
                 }
-                case IActorLocationRequest actorLocationRequest: // gate session收到actor rpc消息，先向actor 发送rpc请求，再将请求结果返回客户端
+                case ILocationRequest actorLocationRequest: // gate session收到actor rpc消息，先向actor 发送rpc请求，再将请求结果返回客户端
                 {
                     long unitId = session.GetComponent<SessionPlayerComponent>().Player.Id;
                     int rpcId = actorLocationRequest.RpcId; // 这里要保存客户端的rpcId
                     long instanceId = session.InstanceId;
-                    IActorResponse iResponse = await root.GetComponent<ActorLocationSenderComponent>().Get(LocationType.Unit).Call(unitId, actorLocationRequest);
+                    IResponse iResponse = await root.GetComponent<ActorLocationSenderComponent>().Get(LocationType.Unit).Call(unitId, actorLocationRequest);
                     iResponse.RpcId = rpcId;
                     // session可能已经断开了，所以这里需要判断
                     if (session.InstanceId == instanceId)
@@ -59,11 +59,11 @@ namespace ET.Server
                     }
                     break;
                 }
-                case IActorRequest actorRequest:  // 分发IActorRequest消息，目前没有用到，需要的自己添加
+                case IRequest actorRequest:  // 分发IActorRequest消息，目前没有用到，需要的自己添加
                 {
                     break;
                 }
-                case IActorMessage actorMessage:  // 分发IActorMessage消息，目前没有用到，需要的自己添加
+                case IMessage actorMessage:  // 分发IActorMessage消息，目前没有用到，需要的自己添加
                 {
                     break;
                 }

Unity/Assets/Scripts/Hotfix/Server/Demo/MessageHelper.cs

@@ -21,7 +21,7 @@ namespace ET.Server
             MessageHelper.SendToClient(unit, removeUnits);
         }
         
-        public static void Broadcast(Unit unit, IActorMessage message)
+        public static void Broadcast(Unit unit, IMessage message)
         {
             (message as MessageObject).IsFromPool = false;
             Dictionary<long, AOIEntity> dict = unit.GetBeSeePlayers();
@@ -33,7 +33,7 @@ namespace ET.Server
             }
         }
         
-        public static void SendToClient(Unit unit, IActorMessage message)
+        public static void SendToClient(Unit unit, IMessage message)
         {
             unit.Root().GetComponent<ActorLocationSenderComponent>().Get(LocationType.GateSession).Send(unit.Id, message);
         }
@@ -41,7 +41,7 @@ namespace ET.Server
         /// <summary>
         /// 发送协议给Actor
         /// </summary>
-        public static void SendActor(Scene root, ActorId actorId, IActorMessage message)
+        public static void SendActor(Scene root, ActorId actorId, IMessage message)
         {
             root.GetComponent<ActorSenderComponent>().Send(actorId, message);
         }

Unity/Assets/Scripts/Hotfix/Server/LockStep/Map/RoomMessageHelper.cs

@@ -3,7 +3,7 @@ namespace ET.Server
 
     public static partial class RoomMessageHelper
     {
-        public static void BroadCast(Room room, IActorMessage message)
+        public static void BroadCast(Room room, IMessage message)
         {
             // 广播的消息不能被池回收
             (message as MessageObject).IsFromPool = false;

Unity/Assets/Scripts/Hotfix/Server/Module/ActorLocation/ActorLocationSenderComponentSystem.cs

@@ -92,12 +92,12 @@ namespace ET.Server
         
         // 发给不会改变位置的actorlocation用这个，这种actor消息不会阻塞发送队列，性能更高
         // 发送过去找不到actor不会重试,用此方法，你得保证actor提前注册好了location
-        public static void Send(this ActorLocationSenderOneType self, long entityId, IActorMessage message)
+        public static void Send(this ActorLocationSenderOneType self, long entityId, IMessage message)
         {
             self.SendInner(entityId, message).Coroutine();
         }
         
-        private static async ETTask SendInner(this ActorLocationSenderOneType self, long entityId, IActorMessage message)
+        private static async ETTask SendInner(this ActorLocationSenderOneType self, long entityId, IMessage message)
         {
             ActorLocationSender actorLocationSender = self.GetOrCreate(entityId);
 
@@ -136,7 +136,7 @@ namespace ET.Server
 
         // 发给不会改变位置的actorlocation用这个，这种actor消息不会阻塞发送队列，性能更高，发送过去找不到actor不会重试
         // 发送过去找不到actor不会重试,用此方法，你得保证actor提前注册好了location
-        public static async ETTask<IActorResponse> Call(this ActorLocationSenderOneType self, long entityId, IActorRequest request)
+        public static async ETTask<IResponse> Call(this ActorLocationSenderOneType self, long entityId, IRequest request)
         {
             ActorLocationSender actorLocationSender = self.GetOrCreate(entityId);
 
@@ -172,19 +172,19 @@ namespace ET.Server
             return await root.GetComponent<ActorSenderComponent>().Call(actorLocationSender.ActorId, request);
         }
 
-        public static void Send(this ActorLocationSenderOneType self, long entityId, IActorLocationMessage message)
+        public static void Send(this ActorLocationSenderOneType self, long entityId, ILocationMessage message)
         {
             self.Call(entityId, message).Coroutine();
         }
 
-        public static async ETTask<IActorResponse> Call(this ActorLocationSenderOneType self, long entityId, IActorLocationRequest iActorRequest)
+        public static async ETTask<IResponse> Call(this ActorLocationSenderOneType self, long entityId, ILocationRequest iRequest)
         {
             ActorLocationSender actorLocationSender = self.GetOrCreate(entityId);
 
             Scene root = self.Root();
             
             int rpcId = root.GetComponent<ActorSenderComponent>().GetRpcId();
-            iActorRequest.RpcId = rpcId;
+            iRequest.RpcId = rpcId;
             
             long actorLocationSenderInstanceId = actorLocationSender.InstanceId;
             int coroutineLockType = (self.LocationType << 16) | CoroutineLockType.ActorLocationSender;
@@ -192,18 +192,18 @@ namespace ET.Server
             {
                 if (actorLocationSender.InstanceId != actorLocationSenderInstanceId)
                 {
-                    throw new RpcException(ErrorCore.ERR_ActorTimeout, $"{iActorRequest}");
+                    throw new RpcException(ErrorCore.ERR_ActorTimeout, $"{iRequest}");
                 }
 
                 // 队列中没处理的消息返回跟上个消息一样的报错
                 if (actorLocationSender.Error == ErrorCore.ERR_NotFoundActor)
                 {
-                    return ActorHelper.CreateResponse(iActorRequest, actorLocationSender.Error);
+                    return ActorHelper.CreateResponse(iRequest, actorLocationSender.Error);
                 }
                 
                 try
                 {
-                    return await self.CallInner(actorLocationSender, rpcId, iActorRequest);
+                    return await self.CallInner(actorLocationSender, rpcId, iRequest);
                 }
                 catch (RpcException)
                 {
@@ -213,12 +213,12 @@ namespace ET.Server
                 catch (Exception e)
                 {
                     self.Remove(actorLocationSender.Id);
-                    throw new Exception($"{iActorRequest}", e);
+                    throw new Exception($"{iRequest}", e);
                 }
             }
         }
 
-        private static async ETTask<IActorResponse> CallInner(this ActorLocationSenderOneType self, ActorLocationSender actorLocationSender, int rpcId, IActorRequest iActorRequest)
+        private static async ETTask<IResponse> CallInner(this ActorLocationSenderOneType self, ActorLocationSender actorLocationSender, int rpcId, IRequest iRequest)
         {
             int failTimes = 0;
             long instanceId = actorLocationSender.InstanceId;
@@ -233,20 +233,20 @@ namespace ET.Server
                     actorLocationSender.ActorId = await root.GetComponent<LocationProxyComponent>().Get(self.LocationType, actorLocationSender.Id);
                     if (actorLocationSender.InstanceId != instanceId)
                     {
-                        throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout2, $"{iActorRequest}");
+                        throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout2, $"{iRequest}");
                     }
                 }
 
                 if (actorLocationSender.ActorId == default)
                 {
                     actorLocationSender.Error = ErrorCore.ERR_NotFoundActor;
-                    return ActorHelper.CreateResponse(iActorRequest, ErrorCore.ERR_NotFoundActor);
+                    return ActorHelper.CreateResponse(iRequest, ErrorCore.ERR_NotFoundActor);
                 }
-                IActorResponse response = await root.GetComponent<ActorSenderComponent>().Call(actorLocationSender.ActorId, rpcId, iActorRequest, needException: false);
+                IResponse response = await root.GetComponent<ActorSenderComponent>().Call(actorLocationSender.ActorId, rpcId, iRequest, needException: false);
                 
                 if (actorLocationSender.InstanceId != instanceId)
                 {
-                    throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout3, $"{iActorRequest}");
+                    throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout3, $"{iRequest}");
                 }
                 
                 switch (response.Error)
@@ -257,7 +257,7 @@ namespace ET.Server
                         ++failTimes;
                         if (failTimes > 20)
                         {
-                            Log.Debug($"actor send message fail, actorid: {actorLocationSender.Id} {iActorRequest}");
+                            Log.Debug($"actor send message fail, actorid: {actorLocationSender.Id} {iRequest}");
                             actorLocationSender.Error = ErrorCore.ERR_NotFoundActor;
                             // 这里不能删除actor，要让后面等待发送的消息也返回ERR_NotFoundActor，直到超时删除
                             return response;
@@ -267,7 +267,7 @@ namespace ET.Server
                         await root.Fiber.TimerComponent.WaitAsync(500);
                         if (actorLocationSender.InstanceId != instanceId)
                         {
-                            throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout4, $"{iActorRequest}");
+                            throw new RpcException(ErrorCore.ERR_ActorLocationSenderTimeout4, $"{iRequest}");
                         }
 
                         actorLocationSender.ActorId = default;
@@ -275,13 +275,13 @@ namespace ET.Server
                     }
                     case ErrorCore.ERR_ActorTimeout:
                     {
-                        throw new RpcException(response.Error, $"{iActorRequest}");
+                        throw new RpcException(response.Error, $"{iRequest}");
                     }
                 }
 
                 if (ErrorCore.IsRpcNeedThrowException(response.Error))
                 {
-                    throw new RpcException(response.Error, $"Message: {response.Message} Request: {iActorRequest}");
+                    throw new RpcException(response.Error, $"Message: {response.Message} Request: {iRequest}");
                 }
 
                 return response;

Unity/Assets/Scripts/Hotfix/Server/Module/ActorLocation/ActorMessageLocationHandler.cs

@@ -3,7 +3,7 @@
 namespace ET.Server
 {
     [EnableClass]
-    public abstract class ActorMessageLocationHandler<E, Message>: IMActorHandler where E : Entity where Message : class, IActorLocationMessage
+    public abstract class ActorMessageLocationHandler<E, Message>: IMActorHandler where E : Entity where Message : class, ILocationMessage
     {
         protected abstract ETTask Run(E entity, Message message);
 
@@ -22,7 +22,7 @@ namespace ET.Server
                 return;
             }
             
-            ActorResponse response = new() {RpcId = message.RpcId};
+            MessageResponse response = new() {RpcId = message.RpcId};
             entity.Root().GetComponent<ActorInnerComponent>().Reply(fromAddress, response);
 
             await this.Run(e, message);
@@ -35,14 +35,14 @@ namespace ET.Server
 
         public Type GetResponseType()
         {
-            return typeof (ActorResponse);
+            return typeof (MessageResponse);
         }
     }
     
     
     
     [EnableClass]
-    public abstract class ActorMessageLocationHandler<E, Request, Response>: IMActorHandler where E : Entity where Request : MessageObject, IActorLocationRequest where Response : MessageObject, IActorLocationResponse
+    public abstract class ActorMessageLocationHandler<E, Request, Response>: IMActorHandler where E : Entity where Request : MessageObject, ILocationRequest where Response : MessageObject, ILocationResponse
     {
         protected abstract ETTask Run(E unit, Request request, Response response);
 

Unity/Assets/Scripts/Hotfix/Server/Module/Message/ActorOuterComponentSystem.cs

@@ -62,28 +62,28 @@ namespace ET.Server
 
             switch (message)
             {
-                case IActorResponse iActorResponse:
+                case IResponse iActorResponse:
                 {
                     self.HandleIActorResponse(iActorResponse);
                     return;
                 }
-                case IActorLocationRequest iActorRequest:
+                case ILocationRequest iActorRequest:
                 {
-                    IActorResponse response = await fiber.ActorInnerComponent.Call(actorId, iActorRequest, false);
+                    IResponse response = await fiber.ActorInnerComponent.Call(actorId, iActorRequest, false);
                     actorId.Process = fromProcess;
                     self.Send(actorId, response);
                     break;
                 }
-                case IActorRequest iActorRequest:
+                case IRequest iActorRequest:
                 {
-                    IActorResponse response = await fiber.ActorInnerComponent.Call(actorId, iActorRequest);
+                    IResponse response = await fiber.ActorInnerComponent.Call(actorId, iActorRequest);
                     actorId.Process = fromProcess;
                     self.Send(actorId, response);
                     break;
                 }
                 default:
                 {
-                    fiber.ActorInnerComponent.Send(actorId, (IActorMessage)message);
+                    fiber.ActorInnerComponent.Send(actorId, (IMessage)message);
                     break;
                 }
             }
@@ -135,7 +135,7 @@ namespace ET.Server
             return session;
         }
 
-        public static void HandleIActorResponse(this ActorOuterComponent self, IActorResponse response)
+        public static void HandleIActorResponse(this ActorOuterComponent self, IResponse response)
         {
             if (!self.requestCallback.Remove(response.RpcId, out ActorMessageSender actorMessageSender))
             {
@@ -144,7 +144,7 @@ namespace ET.Server
             Run(actorMessageSender, response);
         }
 
-        private static void Run(ActorMessageSender self, IActorResponse response)
+        private static void Run(ActorMessageSender self, IResponse response)
         {
             if (response.Error == ErrorCore.ERR_ActorTimeout)
             {
@@ -161,7 +161,7 @@ namespace ET.Server
             self.Tcs.SetResult(response);
         }
 
-        public static void Send(this ActorOuterComponent self, ActorId actorId, IActorMessage message)
+        public static void Send(this ActorOuterComponent self, ActorId actorId, IMessage message)
         {
             self.SendInner(actorId, message as MessageObject);
         }
@@ -191,21 +191,21 @@ namespace ET.Server
             return ++self.RpcId;
         }
 
-        public static async ETTask<IActorResponse> Call(this ActorOuterComponent self, ActorId actorId, IActorRequest iActorRequest, bool needException = true)
+        public static async ETTask<IResponse> Call(this ActorOuterComponent self, ActorId actorId, IRequest iRequest, bool needException = true)
         {
             if (actorId == default)
             {
-                throw new Exception($"actor id is 0: {iActorRequest}");
+                throw new Exception($"actor id is 0: {iRequest}");
             }
             Fiber fiber = self.Fiber();
             
             int rpcId = self.GetRpcId();
 
-            var tcs = ETTask<IActorResponse>.Create(true);
+            var tcs = ETTask<IResponse>.Create(true);
 
-            self.requestCallback.Add(self.RpcId, new ActorMessageSender(actorId, iActorRequest, tcs, needException));
+            self.requestCallback.Add(self.RpcId, new ActorMessageSender(actorId, iRequest, tcs, needException));
 
-            self.SendInner(actorId, iActorRequest as MessageObject);
+            self.SendInner(actorId, iRequest as MessageObject);
 
             async ETTask Timeout()
             {
@@ -217,11 +217,11 @@ namespace ET.Server
                 
                 if (needException)
                 {
-                    action.Tcs.SetException(new Exception($"actor sender timeout: {iActorRequest}"));
+                    action.Tcs.SetException(new Exception($"actor sender timeout: {iRequest}"));
                 }
                 else
                 {
-                    IActorResponse response = ActorHelper.CreateResponse(iActorRequest, ErrorCore.ERR_Timeout);
+                    IResponse response = ActorHelper.CreateResponse(iRequest, ErrorCore.ERR_Timeout);
                     action.Tcs.SetResult(response);
                 }
             }
@@ -230,14 +230,14 @@ namespace ET.Server
 
             long beginTime = TimeInfo.Instance.ServerFrameTime();
 
-            IActorResponse response = await tcs;
+            IResponse response = await tcs;
 
             long endTime = TimeInfo.Instance.ServerFrameTime();
 
             long costTime = endTime - beginTime;
             if (costTime > 200)
             {
-                Log.Warning($"actor rpc time > 200: {costTime} {iActorRequest}");
+                Log.Warning($"actor rpc time > 200: {costTime} {iRequest}");
             }
 
             return response;

Unity/Assets/Scripts/Hotfix/Server/Module/Message/ActorSenderComponentSystem.cs

@@ -7,7 +7,7 @@ namespace ET
     [FriendOf(typeof(ActorSenderComponent))]
     public static partial class ActorSenderComponentSystem
     {
-        public static void Send(this ActorSenderComponent self, ActorId actorId, IActorMessage message)
+        public static void Send(this ActorSenderComponent self, ActorId actorId, IMessage message)
         {
             Fiber fiber = self.Fiber();
             // 如果发向同一个进程，则扔到消息队列中
@@ -32,10 +32,10 @@ namespace ET
             return ++self.RpcId;
         }
 
-        public static async ETTask<IActorResponse> Call(
+        public static async ETTask<IResponse> Call(
                 this ActorSenderComponent self,
                 ActorId actorId,
-                IActorRequest request,
+                IRequest request,
                 bool needException = true
         )
         {
@@ -49,28 +49,28 @@ namespace ET
             return await self.Call(actorId, request.RpcId, request, needException);
         }
         
-        public static async ETTask<IActorResponse> Call(
+        public static async ETTask<IResponse> Call(
                 this ActorSenderComponent self,
                 ActorId actorId,
                 int rpcId,
-                IActorRequest iActorRequest,
+                IRequest iRequest,
                 bool needException = true
         )
         {
             if (actorId == default)
             {
-                throw new Exception($"actor id is 0: {iActorRequest}");
+                throw new Exception($"actor id is 0: {iRequest}");
             }
             Fiber fiber = self.Fiber();
             if (fiber.Process == actorId.Process)
             {
-                return await fiber.Root.GetComponent<ActorInnerComponent>().Call(actorId, rpcId, iActorRequest, needException);
+                return await fiber.Root.GetComponent<ActorInnerComponent>().Call(actorId, rpcId, iRequest, needException);
             }
             
             // 发给NetInner纤程
             A2NetInner_Request a2NetInner_Request = A2NetInner_Request.Create();
             a2NetInner_Request.ActorId = actorId;
-            a2NetInner_Request.MessageObject = iActorRequest;
+            a2NetInner_Request.MessageObject = iRequest;
             a2NetInner_Request.NeedException = needException;
             StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.NetInners[fiber.Process];
             A2NetInner_Response response = await fiber.Root.GetComponent<ActorSenderComponent>().Call(

Unity/Assets/Scripts/Hotfix/Share/Module/Actor/ActorMessageHandler.cs

@@ -3,7 +3,7 @@
 namespace ET
 {
     [EnableClass]
-    public abstract class ActorMessageHandler<E, Message>: IMActorHandler where E : Entity where Message : class, IActorMessage
+    public abstract class ActorMessageHandler<E, Message>: IMActorHandler where E : Entity where Message : class, IMessage
     {
         protected abstract ETTask Run(E entity, Message message);
 
@@ -27,7 +27,7 @@ namespace ET
 
         public Type GetRequestType()
         {
-            if (typeof (IActorLocationMessage).IsAssignableFrom(typeof (Message)))
+            if (typeof (ILocationMessage).IsAssignableFrom(typeof (Message)))
             {
                 Log.Error($"message is IActorLocationMessage but handler is AMActorHandler: {typeof (Message)}");
             }
@@ -44,7 +44,7 @@ namespace ET
     
     
     [EnableClass]
-    public abstract class ActorMessageHandler<E, Request, Response>: IMActorHandler where E : Entity where Request : MessageObject, IActorRequest where Response : MessageObject, IActorResponse
+    public abstract class ActorMessageHandler<E, Request, Response>: IMActorHandler where E : Entity where Request : MessageObject, IRequest where Response : MessageObject, IResponse
     {
         protected abstract ETTask Run(E unit, Request request, Response response);
 
@@ -91,7 +91,7 @@ namespace ET
 
         public Type GetRequestType()
         {
-            if (typeof (IActorLocationRequest).IsAssignableFrom(typeof (Request)))
+            if (typeof (ILocationRequest).IsAssignableFrom(typeof (Request)))
             {
                 Log.Error($"message is IActorLocationMessage but handler is AMActorRpcHandler: {typeof (Request)}");
             }

Unity/Assets/Scripts/Hotfix/Share/Module/Actor/MailBoxType_OrderedMessageHandler.cs

@@ -26,9 +26,9 @@
             {
                 if (mailBoxComponent.InstanceId != instanceId)
                 {
-                    if (messageObject is IActorRequest request)
+                    if (messageObject is IRequest request)
                     {
-                        IActorResponse resp = ActorHelper.CreateResponse(request, ErrorCore.ERR_NotFoundActor);
+                        IResponse resp = ActorHelper.CreateResponse(request, ErrorCore.ERR_NotFoundActor);
                         mailBoxComponent.Root().GetComponent<ActorInnerComponent>().Reply(args.FromAddress, resp);
                     }
                     return;

Unity/Assets/Scripts/Model/Client/Demo/NetClient/A2NetClient_Message.cs

@@ -1,7 +1,7 @@
 namespace ET
 {
     [Message]
-    public class A2NetClient_Message: MessageObject, IActorMessage
+    public class A2NetClient_Message: MessageObject, IMessage
     {
         public static A2NetClient_Message Create()
         {
@@ -14,12 +14,12 @@
             ObjectPool.Instance.Recycle(this);
         }
         
-        public IActorMessage MessageObject;
+        public IMessage MessageObject;
     }
     
     [Message]
     [ResponseType(nameof(A2NetClient_Response))]
-    public class A2NetClient_Request: MessageObject, IActorRequest
+    public class A2NetClient_Request: MessageObject, IRequest
     {
         public static A2NetClient_Request Create()
         {
@@ -34,11 +34,11 @@
         }
      
         public int RpcId { get; set; }
-        public IActorRequest MessageObject;
+        public IRequest MessageObject;
     }
     
     [Message]
-    public class A2NetClient_Response: MessageObject, IActorResponse
+    public class A2NetClient_Response: MessageObject, IResponse
     {
         public static A2NetClient_Response Create()
         {
@@ -58,11 +58,11 @@
         public int Error { get; set; }
         public string Message { get; set; }
         
-        public IActorResponse MessageObject;
+        public IResponse MessageObject;
     }
     
     [Message]
-    public class NetClient2Main_SessionDispose: MessageObject, IActorMessage
+    public class NetClient2Main_SessionDispose: MessageObject, IMessage
     {
         public static NetClient2Main_SessionDispose Create()
         {

Unity/Assets/Scripts/Model/Generate/Client/Message/ClientMessage_C_1000.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(NetClient2Main_Login))]
 	[Message(ClientMessage.Main2NetClient_Login)]
 	[MemoryPackable]
-	public partial class Main2NetClient_Login: MessageObject, IActorRequest
+	public partial class Main2NetClient_Login: MessageObject, IRequest
 	{
 		public static Main2NetClient_Login Create(bool isFromPool = true) 
 		{ 
@@ -37,7 +37,7 @@ namespace ET
 
 	[Message(ClientMessage.NetClient2Main_Login)]
 	[MemoryPackable]
-	public partial class NetClient2Main_Login: MessageObject, IActorResponse
+	public partial class NetClient2Main_Login: MessageObject, IResponse
 	{
 		public static NetClient2Main_Login Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Client/Message/LockStepOuter_C_11001.cs

@@ -59,7 +59,7 @@ namespace ET
 // 匹配成功，通知客户端切换场景
 	[Message(LockStepOuter.Match2G_NotifyMatchSuccess)]
 	[MemoryPackable]
-	public partial class Match2G_NotifyMatchSuccess: MessageObject, IActorMessage
+	public partial class Match2G_NotifyMatchSuccess: MessageObject, IMessage
 	{
 		public static Match2G_NotifyMatchSuccess Create(bool isFromPool = true) 
 		{ 
@@ -87,7 +87,7 @@ namespace ET
 // 客户端通知房间切换场景完成
 	[Message(LockStepOuter.C2Room_ChangeSceneFinish)]
 	[MemoryPackable]
-	public partial class C2Room_ChangeSceneFinish: MessageObject, IActorRoom
+	public partial class C2Room_ChangeSceneFinish: MessageObject, IRoom
 	{
 		public static C2Room_ChangeSceneFinish Create(bool isFromPool = true) 
 		{ 
@@ -140,7 +140,7 @@ namespace ET
 // 房间通知客户端进入战斗
 	[Message(LockStepOuter.Room2C_Start)]
 	[MemoryPackable]
-	public partial class Room2C_Start: MessageObject, IActorMessage
+	public partial class Room2C_Start: MessageObject, IMessage
 	{
 		public static Room2C_Start Create(bool isFromPool = true) 
 		{ 
@@ -166,7 +166,7 @@ namespace ET
 
 	[Message(LockStepOuter.FrameMessage)]
 	[MemoryPackable]
-	public partial class FrameMessage: MessageObject, IActorMessage
+	public partial class FrameMessage: MessageObject, IMessage
 	{
 		public static FrameMessage Create(bool isFromPool = true) 
 		{ 
@@ -196,7 +196,7 @@ namespace ET
 
 	[Message(LockStepOuter.OneFrameInputs)]
 	[MemoryPackable]
-	public partial class OneFrameInputs: MessageObject, IActorMessage
+	public partial class OneFrameInputs: MessageObject, IMessage
 	{
 		public static OneFrameInputs Create(bool isFromPool = true) 
 		{ 
@@ -218,7 +218,7 @@ namespace ET
 
 	[Message(LockStepOuter.Room2C_AdjustUpdateTime)]
 	[MemoryPackable]
-	public partial class Room2C_AdjustUpdateTime: MessageObject, IActorMessage
+	public partial class Room2C_AdjustUpdateTime: MessageObject, IMessage
 	{
 		public static Room2C_AdjustUpdateTime Create(bool isFromPool = true) 
 		{ 
@@ -240,7 +240,7 @@ namespace ET
 
 	[Message(LockStepOuter.C2Room_CheckHash)]
 	[MemoryPackable]
-	public partial class C2Room_CheckHash: MessageObject, IActorRoom
+	public partial class C2Room_CheckHash: MessageObject, IRoom
 	{
 		public static C2Room_CheckHash Create(bool isFromPool = true) 
 		{ 
@@ -270,7 +270,7 @@ namespace ET
 
 	[Message(LockStepOuter.Room2C_CheckHashFail)]
 	[MemoryPackable]
-	public partial class Room2C_CheckHashFail: MessageObject, IActorMessage
+	public partial class Room2C_CheckHashFail: MessageObject, IMessage
 	{
 		public static Room2C_CheckHashFail Create(bool isFromPool = true) 
 		{ 
@@ -296,7 +296,7 @@ namespace ET
 
 	[Message(LockStepOuter.G2C_Reconnect)]
 	[MemoryPackable]
-	public partial class G2C_Reconnect: MessageObject, IActorMessage
+	public partial class G2C_Reconnect: MessageObject, IMessage
 	{
 		public static G2C_Reconnect Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Client/Message/OuterMessage_C_10001.cs

@@ -58,7 +58,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterMessage.C2M_TestRequest)]
 	[MemoryPackable]
-	public partial class C2M_TestRequest: MessageObject, IActorLocationRequest
+	public partial class C2M_TestRequest: MessageObject, ILocationRequest
 	{
 		public static C2M_TestRequest Create(bool isFromPool = true) 
 		{ 
@@ -84,7 +84,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestResponse)]
 	[MemoryPackable]
-	public partial class M2C_TestResponse: MessageObject, IActorResponse
+	public partial class M2C_TestResponse: MessageObject, IResponse
 	{
 		public static M2C_TestResponse Create(bool isFromPool = true) 
 		{ 
@@ -119,7 +119,7 @@ namespace ET
 	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterMessage.Actor_TransferRequest)]
 	[MemoryPackable]
-	public partial class Actor_TransferRequest: MessageObject, IActorLocationRequest
+	public partial class Actor_TransferRequest: MessageObject, ILocationRequest
 	{
 		public static Actor_TransferRequest Create(bool isFromPool = true) 
 		{ 
@@ -145,7 +145,7 @@ namespace ET
 
 	[Message(OuterMessage.Actor_TransferResponse)]
 	[MemoryPackable]
-	public partial class Actor_TransferResponse: MessageObject, IActorLocationResponse
+	public partial class Actor_TransferResponse: MessageObject, ILocationResponse
 	{
 		public static Actor_TransferResponse Create(bool isFromPool = true) 
 		{ 
@@ -309,7 +309,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_CreateUnits)]
 	[MemoryPackable]
-	public partial class M2C_CreateUnits: MessageObject, IActorMessage
+	public partial class M2C_CreateUnits: MessageObject, IMessage
 	{
 		public static M2C_CreateUnits Create(bool isFromPool = true) 
 		{ 
@@ -331,7 +331,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_CreateMyUnit)]
 	[MemoryPackable]
-	public partial class M2C_CreateMyUnit: MessageObject, IActorMessage
+	public partial class M2C_CreateMyUnit: MessageObject, IMessage
 	{
 		public static M2C_CreateMyUnit Create(bool isFromPool = true) 
 		{ 
@@ -353,7 +353,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_StartSceneChange)]
 	[MemoryPackable]
-	public partial class M2C_StartSceneChange: MessageObject, IActorMessage
+	public partial class M2C_StartSceneChange: MessageObject, IMessage
 	{
 		public static M2C_StartSceneChange Create(bool isFromPool = true) 
 		{ 
@@ -379,7 +379,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_RemoveUnits)]
 	[MemoryPackable]
-	public partial class M2C_RemoveUnits: MessageObject, IActorMessage
+	public partial class M2C_RemoveUnits: MessageObject, IMessage
 	{
 		public static M2C_RemoveUnits Create(bool isFromPool = true) 
 		{ 
@@ -401,7 +401,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_PathfindingResult)]
 	[MemoryPackable]
-	public partial class C2M_PathfindingResult: MessageObject, IActorLocationMessage
+	public partial class C2M_PathfindingResult: MessageObject, ILocationMessage
 	{
 		public static C2M_PathfindingResult Create(bool isFromPool = true) 
 		{ 
@@ -427,7 +427,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_Stop)]
 	[MemoryPackable]
-	public partial class C2M_Stop: MessageObject, IActorLocationMessage
+	public partial class C2M_Stop: MessageObject, ILocationMessage
 	{
 		public static C2M_Stop Create(bool isFromPool = true) 
 		{ 
@@ -449,7 +449,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_PathfindingResult)]
 	[MemoryPackable]
-	public partial class M2C_PathfindingResult: MessageObject, IActorMessage
+	public partial class M2C_PathfindingResult: MessageObject, IMessage
 	{
 		public static M2C_PathfindingResult Create(bool isFromPool = true) 
 		{ 
@@ -479,7 +479,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_Stop)]
 	[MemoryPackable]
-	public partial class M2C_Stop: MessageObject, IActorMessage
+	public partial class M2C_Stop: MessageObject, IMessage
 	{
 		public static M2C_Stop Create(bool isFromPool = true) 
 		{ 
@@ -810,7 +810,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterMessage.C2M_TestRobotCase)]
 	[MemoryPackable]
-	public partial class C2M_TestRobotCase: MessageObject, IActorLocationRequest
+	public partial class C2M_TestRobotCase: MessageObject, ILocationRequest
 	{
 		public static C2M_TestRobotCase Create(bool isFromPool = true) 
 		{ 
@@ -836,7 +836,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestRobotCase)]
 	[MemoryPackable]
-	public partial class M2C_TestRobotCase: MessageObject, IActorLocationResponse
+	public partial class M2C_TestRobotCase: MessageObject, ILocationResponse
 	{
 		public static M2C_TestRobotCase Create(bool isFromPool = true) 
 		{ 
@@ -870,7 +870,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_TestRobotCase2)]
 	[MemoryPackable]
-	public partial class C2M_TestRobotCase2: MessageObject, IActorLocationMessage
+	public partial class C2M_TestRobotCase2: MessageObject, ILocationMessage
 	{
 		public static C2M_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
@@ -896,7 +896,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestRobotCase2)]
 	[MemoryPackable]
-	public partial class M2C_TestRobotCase2: MessageObject, IActorLocationMessage
+	public partial class M2C_TestRobotCase2: MessageObject, ILocationMessage
 	{
 		public static M2C_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
@@ -923,7 +923,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TransferMap))]
 	[Message(OuterMessage.C2M_TransferMap)]
 	[MemoryPackable]
-	public partial class C2M_TransferMap: MessageObject, IActorLocationRequest
+	public partial class C2M_TransferMap: MessageObject, ILocationRequest
 	{
 		public static C2M_TransferMap Create(bool isFromPool = true) 
 		{ 
@@ -945,7 +945,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TransferMap)]
 	[MemoryPackable]
-	public partial class M2C_TransferMap: MessageObject, IActorLocationResponse
+	public partial class M2C_TransferMap: MessageObject, ILocationResponse
 	{
 		public static M2C_TransferMap Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/ClientServer/Message/ClientMessage_C_1000.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(NetClient2Main_Login))]
 	[Message(ClientMessage.Main2NetClient_Login)]
 	[MemoryPackable]
-	public partial class Main2NetClient_Login: MessageObject, IActorRequest
+	public partial class Main2NetClient_Login: MessageObject, IRequest
 	{
 		public static Main2NetClient_Login Create(bool isFromPool = true) 
 		{ 
@@ -37,7 +37,7 @@ namespace ET
 
 	[Message(ClientMessage.NetClient2Main_Login)]
 	[MemoryPackable]
-	public partial class NetClient2Main_Login: MessageObject, IActorResponse
+	public partial class NetClient2Main_Login: MessageObject, IResponse
 	{
 		public static NetClient2Main_Login Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/ClientServer/Message/InnerMessage_S_20001.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(ObjectQueryResponse))]
 	[Message(InnerMessage.ObjectQueryRequest)]
 	[MemoryPackable]
-	public partial class ObjectQueryRequest: MessageObject, IActorRequest
+	public partial class ObjectQueryRequest: MessageObject, IRequest
 	{
 		public static ObjectQueryRequest Create(bool isFromPool = true) 
 		{ 
@@ -38,7 +38,7 @@ namespace ET
 	[ResponseType(nameof(A2M_Reload))]
 	[Message(InnerMessage.M2A_Reload)]
 	[MemoryPackable]
-	public partial class M2A_Reload: MessageObject, IActorRequest
+	public partial class M2A_Reload: MessageObject, IRequest
 	{
 		public static M2A_Reload Create(bool isFromPool = true) 
 		{ 
@@ -60,7 +60,7 @@ namespace ET
 
 	[Message(InnerMessage.A2M_Reload)]
 	[MemoryPackable]
-	public partial class A2M_Reload: MessageObject, IActorResponse
+	public partial class A2M_Reload: MessageObject, IResponse
 	{
 		public static A2M_Reload Create(bool isFromPool = true) 
 		{ 
@@ -91,7 +91,7 @@ namespace ET
 	[ResponseType(nameof(G2G_LockResponse))]
 	[Message(InnerMessage.G2G_LockRequest)]
 	[MemoryPackable]
-	public partial class G2G_LockRequest: MessageObject, IActorRequest
+	public partial class G2G_LockRequest: MessageObject, IRequest
 	{
 		public static G2G_LockRequest Create(bool isFromPool = true) 
 		{ 
@@ -121,7 +121,7 @@ namespace ET
 
 	[Message(InnerMessage.G2G_LockResponse)]
 	[MemoryPackable]
-	public partial class G2G_LockResponse: MessageObject, IActorResponse
+	public partial class G2G_LockResponse: MessageObject, IResponse
 	{
 		public static G2G_LockResponse Create(bool isFromPool = true) 
 		{ 
@@ -152,7 +152,7 @@ namespace ET
 	[ResponseType(nameof(G2G_LockReleaseResponse))]
 	[Message(InnerMessage.G2G_LockReleaseRequest)]
 	[MemoryPackable]
-	public partial class G2G_LockReleaseRequest: MessageObject, IActorRequest
+	public partial class G2G_LockReleaseRequest: MessageObject, IRequest
 	{
 		public static G2G_LockReleaseRequest Create(bool isFromPool = true) 
 		{ 
@@ -182,7 +182,7 @@ namespace ET
 
 	[Message(InnerMessage.G2G_LockReleaseResponse)]
 	[MemoryPackable]
-	public partial class G2G_LockReleaseResponse: MessageObject, IActorResponse
+	public partial class G2G_LockReleaseResponse: MessageObject, IResponse
 	{
 		public static G2G_LockReleaseResponse Create(bool isFromPool = true) 
 		{ 
@@ -213,7 +213,7 @@ namespace ET
 	[ResponseType(nameof(ObjectAddResponse))]
 	[Message(InnerMessage.ObjectAddRequest)]
 	[MemoryPackable]
-	public partial class ObjectAddRequest: MessageObject, IActorRequest
+	public partial class ObjectAddRequest: MessageObject, IRequest
 	{
 		public static ObjectAddRequest Create(bool isFromPool = true) 
 		{ 
@@ -247,7 +247,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectAddResponse)]
 	[MemoryPackable]
-	public partial class ObjectAddResponse: MessageObject, IActorResponse
+	public partial class ObjectAddResponse: MessageObject, IResponse
 	{
 		public static ObjectAddResponse Create(bool isFromPool = true) 
 		{ 
@@ -278,7 +278,7 @@ namespace ET
 	[ResponseType(nameof(ObjectLockResponse))]
 	[Message(InnerMessage.ObjectLockRequest)]
 	[MemoryPackable]
-	public partial class ObjectLockRequest: MessageObject, IActorRequest
+	public partial class ObjectLockRequest: MessageObject, IRequest
 	{
 		public static ObjectLockRequest Create(bool isFromPool = true) 
 		{ 
@@ -316,7 +316,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectLockResponse)]
 	[MemoryPackable]
-	public partial class ObjectLockResponse: MessageObject, IActorResponse
+	public partial class ObjectLockResponse: MessageObject, IResponse
 	{
 		public static ObjectLockResponse Create(bool isFromPool = true) 
 		{ 
@@ -347,7 +347,7 @@ namespace ET
 	[ResponseType(nameof(ObjectUnLockResponse))]
 	[Message(InnerMessage.ObjectUnLockRequest)]
 	[MemoryPackable]
-	public partial class ObjectUnLockRequest: MessageObject, IActorRequest
+	public partial class ObjectUnLockRequest: MessageObject, IRequest
 	{
 		public static ObjectUnLockRequest Create(bool isFromPool = true) 
 		{ 
@@ -385,7 +385,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectUnLockResponse)]
 	[MemoryPackable]
-	public partial class ObjectUnLockResponse: MessageObject, IActorResponse
+	public partial class ObjectUnLockResponse: MessageObject, IResponse
 	{
 		public static ObjectUnLockResponse Create(bool isFromPool = true) 
 		{ 
@@ -416,7 +416,7 @@ namespace ET
 	[ResponseType(nameof(ObjectRemoveResponse))]
 	[Message(InnerMessage.ObjectRemoveRequest)]
 	[MemoryPackable]
-	public partial class ObjectRemoveRequest: MessageObject, IActorRequest
+	public partial class ObjectRemoveRequest: MessageObject, IRequest
 	{
 		public static ObjectRemoveRequest Create(bool isFromPool = true) 
 		{ 
@@ -446,7 +446,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectRemoveResponse)]
 	[MemoryPackable]
-	public partial class ObjectRemoveResponse: MessageObject, IActorResponse
+	public partial class ObjectRemoveResponse: MessageObject, IResponse
 	{
 		public static ObjectRemoveResponse Create(bool isFromPool = true) 
 		{ 
@@ -477,7 +477,7 @@ namespace ET
 	[ResponseType(nameof(ObjectGetResponse))]
 	[Message(InnerMessage.ObjectGetRequest)]
 	[MemoryPackable]
-	public partial class ObjectGetRequest: MessageObject, IActorRequest
+	public partial class ObjectGetRequest: MessageObject, IRequest
 	{
 		public static ObjectGetRequest Create(bool isFromPool = true) 
 		{ 
@@ -507,7 +507,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectGetResponse)]
 	[MemoryPackable]
-	public partial class ObjectGetResponse: MessageObject, IActorResponse
+	public partial class ObjectGetResponse: MessageObject, IResponse
 	{
 		public static ObjectGetResponse Create(bool isFromPool = true) 
 		{ 
@@ -546,7 +546,7 @@ namespace ET
 	[ResponseType(nameof(G2R_GetLoginKey))]
 	[Message(InnerMessage.R2G_GetLoginKey)]
 	[MemoryPackable]
-	public partial class R2G_GetLoginKey: MessageObject, IActorRequest
+	public partial class R2G_GetLoginKey: MessageObject, IRequest
 	{
 		public static R2G_GetLoginKey Create(bool isFromPool = true) 
 		{ 
@@ -572,7 +572,7 @@ namespace ET
 
 	[Message(InnerMessage.G2R_GetLoginKey)]
 	[MemoryPackable]
-	public partial class G2R_GetLoginKey: MessageObject, IActorResponse
+	public partial class G2R_GetLoginKey: MessageObject, IResponse
 	{
 		public static G2R_GetLoginKey Create(bool isFromPool = true) 
 		{ 
@@ -610,7 +610,7 @@ namespace ET
 
 	[Message(InnerMessage.G2M_SessionDisconnect)]
 	[MemoryPackable]
-	public partial class G2M_SessionDisconnect: MessageObject, IActorLocationMessage
+	public partial class G2M_SessionDisconnect: MessageObject, ILocationMessage
 	{
 		public static G2M_SessionDisconnect Create(bool isFromPool = true) 
 		{ 
@@ -632,7 +632,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectQueryResponse)]
 	[MemoryPackable]
-	public partial class ObjectQueryResponse: MessageObject, IActorResponse
+	public partial class ObjectQueryResponse: MessageObject, IResponse
 	{
 		public static ObjectQueryResponse Create(bool isFromPool = true) 
 		{ 
@@ -667,7 +667,7 @@ namespace ET
 	[ResponseType(nameof(M2M_UnitTransferResponse))]
 	[Message(InnerMessage.M2M_UnitTransferRequest)]
 	[MemoryPackable]
-	public partial class M2M_UnitTransferRequest: MessageObject, IActorRequest
+	public partial class M2M_UnitTransferRequest: MessageObject, IRequest
 	{
 		public static M2M_UnitTransferRequest Create(bool isFromPool = true) 
 		{ 
@@ -701,7 +701,7 @@ namespace ET
 
 	[Message(InnerMessage.M2M_UnitTransferResponse)]
 	[MemoryPackable]
-	public partial class M2M_UnitTransferResponse: MessageObject, IActorResponse
+	public partial class M2M_UnitTransferResponse: MessageObject, IResponse
 	{
 		public static M2M_UnitTransferResponse Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/ClientServer/Message/LockStepInner_S_21001.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(Match2G_Match))]
 	[Message(LockStepInner.G2Match_Match)]
 	[MemoryPackable]
-	public partial class G2Match_Match: MessageObject, IActorRequest
+	public partial class G2Match_Match: MessageObject, IRequest
 	{
 		public static G2Match_Match Create(bool isFromPool = true) 
 		{ 
@@ -33,7 +33,7 @@ namespace ET
 
 	[Message(LockStepInner.Match2G_Match)]
 	[MemoryPackable]
-	public partial class Match2G_Match: MessageObject, IActorResponse
+	public partial class Match2G_Match: MessageObject, IResponse
 	{
 		public static Match2G_Match Create(bool isFromPool = true) 
 		{ 
@@ -64,7 +64,7 @@ namespace ET
 	[ResponseType(nameof(Map2Match_GetRoom))]
 	[Message(LockStepInner.Match2Map_GetRoom)]
 	[MemoryPackable]
-	public partial class Match2Map_GetRoom: MessageObject, IActorRequest
+	public partial class Match2Map_GetRoom: MessageObject, IRequest
 	{
 		public static Match2Map_GetRoom Create(bool isFromPool = true) 
 		{ 
@@ -90,7 +90,7 @@ namespace ET
 
 	[Message(LockStepInner.Map2Match_GetRoom)]
 	[MemoryPackable]
-	public partial class Map2Match_GetRoom: MessageObject, IActorResponse
+	public partial class Map2Match_GetRoom: MessageObject, IResponse
 	{
 		public static Map2Match_GetRoom Create(bool isFromPool = true) 
 		{ 
@@ -126,7 +126,7 @@ namespace ET
 	[ResponseType(nameof(Room2G_Reconnect))]
 	[Message(LockStepInner.G2Room_Reconnect)]
 	[MemoryPackable]
-	public partial class G2Room_Reconnect: MessageObject, IActorRequest
+	public partial class G2Room_Reconnect: MessageObject, IRequest
 	{
 		public static G2Room_Reconnect Create(bool isFromPool = true) 
 		{ 
@@ -152,7 +152,7 @@ namespace ET
 
 	[Message(LockStepInner.Room2G_Reconnect)]
 	[MemoryPackable]
-	public partial class Room2G_Reconnect: MessageObject, IActorResponse
+	public partial class Room2G_Reconnect: MessageObject, IResponse
 	{
 		public static Room2G_Reconnect Create(bool isFromPool = true) 
 		{ 
@@ -195,7 +195,7 @@ namespace ET
 	[ResponseType(nameof(Room2RoomManager_Init))]
 	[Message(LockStepInner.RoomManager2Room_Init)]
 	[MemoryPackable]
-	public partial class RoomManager2Room_Init: MessageObject, IActorRequest
+	public partial class RoomManager2Room_Init: MessageObject, IRequest
 	{
 		public static RoomManager2Room_Init Create(bool isFromPool = true) 
 		{ 
@@ -221,7 +221,7 @@ namespace ET
 
 	[Message(LockStepInner.Room2RoomManager_Init)]
 	[MemoryPackable]
-	public partial class Room2RoomManager_Init: MessageObject, IActorResponse
+	public partial class Room2RoomManager_Init: MessageObject, IResponse
 	{
 		public static Room2RoomManager_Init Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/ClientServer/Message/LockStepOuter_C_11001.cs

@@ -59,7 +59,7 @@ namespace ET
 // 匹配成功，通知客户端切换场景
 	[Message(LockStepOuter.Match2G_NotifyMatchSuccess)]
 	[MemoryPackable]
-	public partial class Match2G_NotifyMatchSuccess: MessageObject, IActorMessage
+	public partial class Match2G_NotifyMatchSuccess: MessageObject, IMessage
 	{
 		public static Match2G_NotifyMatchSuccess Create(bool isFromPool = true) 
 		{ 
@@ -87,7 +87,7 @@ namespace ET
 // 客户端通知房间切换场景完成
 	[Message(LockStepOuter.C2Room_ChangeSceneFinish)]
 	[MemoryPackable]
-	public partial class C2Room_ChangeSceneFinish: MessageObject, IActorRoom
+	public partial class C2Room_ChangeSceneFinish: MessageObject, IRoom
 	{
 		public static C2Room_ChangeSceneFinish Create(bool isFromPool = true) 
 		{ 
@@ -140,7 +140,7 @@ namespace ET
 // 房间通知客户端进入战斗
 	[Message(LockStepOuter.Room2C_Start)]
 	[MemoryPackable]
-	public partial class Room2C_Start: MessageObject, IActorMessage
+	public partial class Room2C_Start: MessageObject, IMessage
 	{
 		public static Room2C_Start Create(bool isFromPool = true) 
 		{ 
@@ -166,7 +166,7 @@ namespace ET
 
 	[Message(LockStepOuter.FrameMessage)]
 	[MemoryPackable]
-	public partial class FrameMessage: MessageObject, IActorMessage
+	public partial class FrameMessage: MessageObject, IMessage
 	{
 		public static FrameMessage Create(bool isFromPool = true) 
 		{ 
@@ -196,7 +196,7 @@ namespace ET
 
 	[Message(LockStepOuter.OneFrameInputs)]
 	[MemoryPackable]
-	public partial class OneFrameInputs: MessageObject, IActorMessage
+	public partial class OneFrameInputs: MessageObject, IMessage
 	{
 		public static OneFrameInputs Create(bool isFromPool = true) 
 		{ 
@@ -218,7 +218,7 @@ namespace ET
 
 	[Message(LockStepOuter.Room2C_AdjustUpdateTime)]
 	[MemoryPackable]
-	public partial class Room2C_AdjustUpdateTime: MessageObject, IActorMessage
+	public partial class Room2C_AdjustUpdateTime: MessageObject, IMessage
 	{
 		public static Room2C_AdjustUpdateTime Create(bool isFromPool = true) 
 		{ 
@@ -240,7 +240,7 @@ namespace ET
 
 	[Message(LockStepOuter.C2Room_CheckHash)]
 	[MemoryPackable]
-	public partial class C2Room_CheckHash: MessageObject, IActorRoom
+	public partial class C2Room_CheckHash: MessageObject, IRoom
 	{
 		public static C2Room_CheckHash Create(bool isFromPool = true) 
 		{ 
@@ -270,7 +270,7 @@ namespace ET
 
 	[Message(LockStepOuter.Room2C_CheckHashFail)]
 	[MemoryPackable]
-	public partial class Room2C_CheckHashFail: MessageObject, IActorMessage
+	public partial class Room2C_CheckHashFail: MessageObject, IMessage
 	{
 		public static Room2C_CheckHashFail Create(bool isFromPool = true) 
 		{ 
@@ -296,7 +296,7 @@ namespace ET
 
 	[Message(LockStepOuter.G2C_Reconnect)]
 	[MemoryPackable]
-	public partial class G2C_Reconnect: MessageObject, IActorMessage
+	public partial class G2C_Reconnect: MessageObject, IMessage
 	{
 		public static G2C_Reconnect Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/ClientServer/Message/OuterMessage_C_10001.cs

@@ -58,7 +58,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterMessage.C2M_TestRequest)]
 	[MemoryPackable]
-	public partial class C2M_TestRequest: MessageObject, IActorLocationRequest
+	public partial class C2M_TestRequest: MessageObject, ILocationRequest
 	{
 		public static C2M_TestRequest Create(bool isFromPool = true) 
 		{ 
@@ -84,7 +84,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestResponse)]
 	[MemoryPackable]
-	public partial class M2C_TestResponse: MessageObject, IActorResponse
+	public partial class M2C_TestResponse: MessageObject, IResponse
 	{
 		public static M2C_TestResponse Create(bool isFromPool = true) 
 		{ 
@@ -119,7 +119,7 @@ namespace ET
 	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterMessage.Actor_TransferRequest)]
 	[MemoryPackable]
-	public partial class Actor_TransferRequest: MessageObject, IActorLocationRequest
+	public partial class Actor_TransferRequest: MessageObject, ILocationRequest
 	{
 		public static Actor_TransferRequest Create(bool isFromPool = true) 
 		{ 
@@ -145,7 +145,7 @@ namespace ET
 
 	[Message(OuterMessage.Actor_TransferResponse)]
 	[MemoryPackable]
-	public partial class Actor_TransferResponse: MessageObject, IActorLocationResponse
+	public partial class Actor_TransferResponse: MessageObject, ILocationResponse
 	{
 		public static Actor_TransferResponse Create(bool isFromPool = true) 
 		{ 
@@ -309,7 +309,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_CreateUnits)]
 	[MemoryPackable]
-	public partial class M2C_CreateUnits: MessageObject, IActorMessage
+	public partial class M2C_CreateUnits: MessageObject, IMessage
 	{
 		public static M2C_CreateUnits Create(bool isFromPool = true) 
 		{ 
@@ -331,7 +331,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_CreateMyUnit)]
 	[MemoryPackable]
-	public partial class M2C_CreateMyUnit: MessageObject, IActorMessage
+	public partial class M2C_CreateMyUnit: MessageObject, IMessage
 	{
 		public static M2C_CreateMyUnit Create(bool isFromPool = true) 
 		{ 
@@ -353,7 +353,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_StartSceneChange)]
 	[MemoryPackable]
-	public partial class M2C_StartSceneChange: MessageObject, IActorMessage
+	public partial class M2C_StartSceneChange: MessageObject, IMessage
 	{
 		public static M2C_StartSceneChange Create(bool isFromPool = true) 
 		{ 
@@ -379,7 +379,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_RemoveUnits)]
 	[MemoryPackable]
-	public partial class M2C_RemoveUnits: MessageObject, IActorMessage
+	public partial class M2C_RemoveUnits: MessageObject, IMessage
 	{
 		public static M2C_RemoveUnits Create(bool isFromPool = true) 
 		{ 
@@ -401,7 +401,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_PathfindingResult)]
 	[MemoryPackable]
-	public partial class C2M_PathfindingResult: MessageObject, IActorLocationMessage
+	public partial class C2M_PathfindingResult: MessageObject, ILocationMessage
 	{
 		public static C2M_PathfindingResult Create(bool isFromPool = true) 
 		{ 
@@ -427,7 +427,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_Stop)]
 	[MemoryPackable]
-	public partial class C2M_Stop: MessageObject, IActorLocationMessage
+	public partial class C2M_Stop: MessageObject, ILocationMessage
 	{
 		public static C2M_Stop Create(bool isFromPool = true) 
 		{ 
@@ -449,7 +449,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_PathfindingResult)]
 	[MemoryPackable]
-	public partial class M2C_PathfindingResult: MessageObject, IActorMessage
+	public partial class M2C_PathfindingResult: MessageObject, IMessage
 	{
 		public static M2C_PathfindingResult Create(bool isFromPool = true) 
 		{ 
@@ -479,7 +479,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_Stop)]
 	[MemoryPackable]
-	public partial class M2C_Stop: MessageObject, IActorMessage
+	public partial class M2C_Stop: MessageObject, IMessage
 	{
 		public static M2C_Stop Create(bool isFromPool = true) 
 		{ 
@@ -810,7 +810,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterMessage.C2M_TestRobotCase)]
 	[MemoryPackable]
-	public partial class C2M_TestRobotCase: MessageObject, IActorLocationRequest
+	public partial class C2M_TestRobotCase: MessageObject, ILocationRequest
 	{
 		public static C2M_TestRobotCase Create(bool isFromPool = true) 
 		{ 
@@ -836,7 +836,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestRobotCase)]
 	[MemoryPackable]
-	public partial class M2C_TestRobotCase: MessageObject, IActorLocationResponse
+	public partial class M2C_TestRobotCase: MessageObject, ILocationResponse
 	{
 		public static M2C_TestRobotCase Create(bool isFromPool = true) 
 		{ 
@@ -870,7 +870,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_TestRobotCase2)]
 	[MemoryPackable]
-	public partial class C2M_TestRobotCase2: MessageObject, IActorLocationMessage
+	public partial class C2M_TestRobotCase2: MessageObject, ILocationMessage
 	{
 		public static C2M_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
@@ -896,7 +896,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestRobotCase2)]
 	[MemoryPackable]
-	public partial class M2C_TestRobotCase2: MessageObject, IActorLocationMessage
+	public partial class M2C_TestRobotCase2: MessageObject, ILocationMessage
 	{
 		public static M2C_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
@@ -923,7 +923,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TransferMap))]
 	[Message(OuterMessage.C2M_TransferMap)]
 	[MemoryPackable]
-	public partial class C2M_TransferMap: MessageObject, IActorLocationRequest
+	public partial class C2M_TransferMap: MessageObject, ILocationRequest
 	{
 		public static C2M_TransferMap Create(bool isFromPool = true) 
 		{ 
@@ -945,7 +945,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TransferMap)]
 	[MemoryPackable]
-	public partial class M2C_TransferMap: MessageObject, IActorLocationResponse
+	public partial class M2C_TransferMap: MessageObject, ILocationResponse
 	{
 		public static M2C_TransferMap Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Server/Message/ClientMessage_C_1000.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(NetClient2Main_Login))]
 	[Message(ClientMessage.Main2NetClient_Login)]
 	[MemoryPackable]
-	public partial class Main2NetClient_Login: MessageObject, IActorRequest
+	public partial class Main2NetClient_Login: MessageObject, IRequest
 	{
 		public static Main2NetClient_Login Create(bool isFromPool = true) 
 		{ 
@@ -37,7 +37,7 @@ namespace ET
 
 	[Message(ClientMessage.NetClient2Main_Login)]
 	[MemoryPackable]
-	public partial class NetClient2Main_Login: MessageObject, IActorResponse
+	public partial class NetClient2Main_Login: MessageObject, IResponse
 	{
 		public static NetClient2Main_Login Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Server/Message/InnerMessage_S_20001.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(ObjectQueryResponse))]
 	[Message(InnerMessage.ObjectQueryRequest)]
 	[MemoryPackable]
-	public partial class ObjectQueryRequest: MessageObject, IActorRequest
+	public partial class ObjectQueryRequest: MessageObject, IRequest
 	{
 		public static ObjectQueryRequest Create(bool isFromPool = true) 
 		{ 
@@ -38,7 +38,7 @@ namespace ET
 	[ResponseType(nameof(A2M_Reload))]
 	[Message(InnerMessage.M2A_Reload)]
 	[MemoryPackable]
-	public partial class M2A_Reload: MessageObject, IActorRequest
+	public partial class M2A_Reload: MessageObject, IRequest
 	{
 		public static M2A_Reload Create(bool isFromPool = true) 
 		{ 
@@ -60,7 +60,7 @@ namespace ET
 
 	[Message(InnerMessage.A2M_Reload)]
 	[MemoryPackable]
-	public partial class A2M_Reload: MessageObject, IActorResponse
+	public partial class A2M_Reload: MessageObject, IResponse
 	{
 		public static A2M_Reload Create(bool isFromPool = true) 
 		{ 
@@ -91,7 +91,7 @@ namespace ET
 	[ResponseType(nameof(G2G_LockResponse))]
 	[Message(InnerMessage.G2G_LockRequest)]
 	[MemoryPackable]
-	public partial class G2G_LockRequest: MessageObject, IActorRequest
+	public partial class G2G_LockRequest: MessageObject, IRequest
 	{
 		public static G2G_LockRequest Create(bool isFromPool = true) 
 		{ 
@@ -121,7 +121,7 @@ namespace ET
 
 	[Message(InnerMessage.G2G_LockResponse)]
 	[MemoryPackable]
-	public partial class G2G_LockResponse: MessageObject, IActorResponse
+	public partial class G2G_LockResponse: MessageObject, IResponse
 	{
 		public static G2G_LockResponse Create(bool isFromPool = true) 
 		{ 
@@ -152,7 +152,7 @@ namespace ET
 	[ResponseType(nameof(G2G_LockReleaseResponse))]
 	[Message(InnerMessage.G2G_LockReleaseRequest)]
 	[MemoryPackable]
-	public partial class G2G_LockReleaseRequest: MessageObject, IActorRequest
+	public partial class G2G_LockReleaseRequest: MessageObject, IRequest
 	{
 		public static G2G_LockReleaseRequest Create(bool isFromPool = true) 
 		{ 
@@ -182,7 +182,7 @@ namespace ET
 
 	[Message(InnerMessage.G2G_LockReleaseResponse)]
 	[MemoryPackable]
-	public partial class G2G_LockReleaseResponse: MessageObject, IActorResponse
+	public partial class G2G_LockReleaseResponse: MessageObject, IResponse
 	{
 		public static G2G_LockReleaseResponse Create(bool isFromPool = true) 
 		{ 
@@ -213,7 +213,7 @@ namespace ET
 	[ResponseType(nameof(ObjectAddResponse))]
 	[Message(InnerMessage.ObjectAddRequest)]
 	[MemoryPackable]
-	public partial class ObjectAddRequest: MessageObject, IActorRequest
+	public partial class ObjectAddRequest: MessageObject, IRequest
 	{
 		public static ObjectAddRequest Create(bool isFromPool = true) 
 		{ 
@@ -247,7 +247,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectAddResponse)]
 	[MemoryPackable]
-	public partial class ObjectAddResponse: MessageObject, IActorResponse
+	public partial class ObjectAddResponse: MessageObject, IResponse
 	{
 		public static ObjectAddResponse Create(bool isFromPool = true) 
 		{ 
@@ -278,7 +278,7 @@ namespace ET
 	[ResponseType(nameof(ObjectLockResponse))]
 	[Message(InnerMessage.ObjectLockRequest)]
 	[MemoryPackable]
-	public partial class ObjectLockRequest: MessageObject, IActorRequest
+	public partial class ObjectLockRequest: MessageObject, IRequest
 	{
 		public static ObjectLockRequest Create(bool isFromPool = true) 
 		{ 
@@ -316,7 +316,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectLockResponse)]
 	[MemoryPackable]
-	public partial class ObjectLockResponse: MessageObject, IActorResponse
+	public partial class ObjectLockResponse: MessageObject, IResponse
 	{
 		public static ObjectLockResponse Create(bool isFromPool = true) 
 		{ 
@@ -347,7 +347,7 @@ namespace ET
 	[ResponseType(nameof(ObjectUnLockResponse))]
 	[Message(InnerMessage.ObjectUnLockRequest)]
 	[MemoryPackable]
-	public partial class ObjectUnLockRequest: MessageObject, IActorRequest
+	public partial class ObjectUnLockRequest: MessageObject, IRequest
 	{
 		public static ObjectUnLockRequest Create(bool isFromPool = true) 
 		{ 
@@ -385,7 +385,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectUnLockResponse)]
 	[MemoryPackable]
-	public partial class ObjectUnLockResponse: MessageObject, IActorResponse
+	public partial class ObjectUnLockResponse: MessageObject, IResponse
 	{
 		public static ObjectUnLockResponse Create(bool isFromPool = true) 
 		{ 
@@ -416,7 +416,7 @@ namespace ET
 	[ResponseType(nameof(ObjectRemoveResponse))]
 	[Message(InnerMessage.ObjectRemoveRequest)]
 	[MemoryPackable]
-	public partial class ObjectRemoveRequest: MessageObject, IActorRequest
+	public partial class ObjectRemoveRequest: MessageObject, IRequest
 	{
 		public static ObjectRemoveRequest Create(bool isFromPool = true) 
 		{ 
@@ -446,7 +446,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectRemoveResponse)]
 	[MemoryPackable]
-	public partial class ObjectRemoveResponse: MessageObject, IActorResponse
+	public partial class ObjectRemoveResponse: MessageObject, IResponse
 	{
 		public static ObjectRemoveResponse Create(bool isFromPool = true) 
 		{ 
@@ -477,7 +477,7 @@ namespace ET
 	[ResponseType(nameof(ObjectGetResponse))]
 	[Message(InnerMessage.ObjectGetRequest)]
 	[MemoryPackable]
-	public partial class ObjectGetRequest: MessageObject, IActorRequest
+	public partial class ObjectGetRequest: MessageObject, IRequest
 	{
 		public static ObjectGetRequest Create(bool isFromPool = true) 
 		{ 
@@ -507,7 +507,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectGetResponse)]
 	[MemoryPackable]
-	public partial class ObjectGetResponse: MessageObject, IActorResponse
+	public partial class ObjectGetResponse: MessageObject, IResponse
 	{
 		public static ObjectGetResponse Create(bool isFromPool = true) 
 		{ 
@@ -546,7 +546,7 @@ namespace ET
 	[ResponseType(nameof(G2R_GetLoginKey))]
 	[Message(InnerMessage.R2G_GetLoginKey)]
 	[MemoryPackable]
-	public partial class R2G_GetLoginKey: MessageObject, IActorRequest
+	public partial class R2G_GetLoginKey: MessageObject, IRequest
 	{
 		public static R2G_GetLoginKey Create(bool isFromPool = true) 
 		{ 
@@ -572,7 +572,7 @@ namespace ET
 
 	[Message(InnerMessage.G2R_GetLoginKey)]
 	[MemoryPackable]
-	public partial class G2R_GetLoginKey: MessageObject, IActorResponse
+	public partial class G2R_GetLoginKey: MessageObject, IResponse
 	{
 		public static G2R_GetLoginKey Create(bool isFromPool = true) 
 		{ 
@@ -610,7 +610,7 @@ namespace ET
 
 	[Message(InnerMessage.G2M_SessionDisconnect)]
 	[MemoryPackable]
-	public partial class G2M_SessionDisconnect: MessageObject, IActorLocationMessage
+	public partial class G2M_SessionDisconnect: MessageObject, ILocationMessage
 	{
 		public static G2M_SessionDisconnect Create(bool isFromPool = true) 
 		{ 
@@ -632,7 +632,7 @@ namespace ET
 
 	[Message(InnerMessage.ObjectQueryResponse)]
 	[MemoryPackable]
-	public partial class ObjectQueryResponse: MessageObject, IActorResponse
+	public partial class ObjectQueryResponse: MessageObject, IResponse
 	{
 		public static ObjectQueryResponse Create(bool isFromPool = true) 
 		{ 
@@ -667,7 +667,7 @@ namespace ET
 	[ResponseType(nameof(M2M_UnitTransferResponse))]
 	[Message(InnerMessage.M2M_UnitTransferRequest)]
 	[MemoryPackable]
-	public partial class M2M_UnitTransferRequest: MessageObject, IActorRequest
+	public partial class M2M_UnitTransferRequest: MessageObject, IRequest
 	{
 		public static M2M_UnitTransferRequest Create(bool isFromPool = true) 
 		{ 
@@ -701,7 +701,7 @@ namespace ET
 
 	[Message(InnerMessage.M2M_UnitTransferResponse)]
 	[MemoryPackable]
-	public partial class M2M_UnitTransferResponse: MessageObject, IActorResponse
+	public partial class M2M_UnitTransferResponse: MessageObject, IResponse
 	{
 		public static M2M_UnitTransferResponse Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Server/Message/LockStepInner_S_21001.cs

@@ -7,7 +7,7 @@ namespace ET
 	[ResponseType(nameof(Match2G_Match))]
 	[Message(LockStepInner.G2Match_Match)]
 	[MemoryPackable]
-	public partial class G2Match_Match: MessageObject, IActorRequest
+	public partial class G2Match_Match: MessageObject, IRequest
 	{
 		public static G2Match_Match Create(bool isFromPool = true) 
 		{ 
@@ -33,7 +33,7 @@ namespace ET
 
 	[Message(LockStepInner.Match2G_Match)]
 	[MemoryPackable]
-	public partial class Match2G_Match: MessageObject, IActorResponse
+	public partial class Match2G_Match: MessageObject, IResponse
 	{
 		public static Match2G_Match Create(bool isFromPool = true) 
 		{ 
@@ -64,7 +64,7 @@ namespace ET
 	[ResponseType(nameof(Map2Match_GetRoom))]
 	[Message(LockStepInner.Match2Map_GetRoom)]
 	[MemoryPackable]
-	public partial class Match2Map_GetRoom: MessageObject, IActorRequest
+	public partial class Match2Map_GetRoom: MessageObject, IRequest
 	{
 		public static Match2Map_GetRoom Create(bool isFromPool = true) 
 		{ 
@@ -90,7 +90,7 @@ namespace ET
 
 	[Message(LockStepInner.Map2Match_GetRoom)]
 	[MemoryPackable]
-	public partial class Map2Match_GetRoom: MessageObject, IActorResponse
+	public partial class Map2Match_GetRoom: MessageObject, IResponse
 	{
 		public static Map2Match_GetRoom Create(bool isFromPool = true) 
 		{ 
@@ -126,7 +126,7 @@ namespace ET
 	[ResponseType(nameof(Room2G_Reconnect))]
 	[Message(LockStepInner.G2Room_Reconnect)]
 	[MemoryPackable]
-	public partial class G2Room_Reconnect: MessageObject, IActorRequest
+	public partial class G2Room_Reconnect: MessageObject, IRequest
 	{
 		public static G2Room_Reconnect Create(bool isFromPool = true) 
 		{ 
@@ -152,7 +152,7 @@ namespace ET
 
 	[Message(LockStepInner.Room2G_Reconnect)]
 	[MemoryPackable]
-	public partial class Room2G_Reconnect: MessageObject, IActorResponse
+	public partial class Room2G_Reconnect: MessageObject, IResponse
 	{
 		public static Room2G_Reconnect Create(bool isFromPool = true) 
 		{ 
@@ -195,7 +195,7 @@ namespace ET
 	[ResponseType(nameof(Room2RoomManager_Init))]
 	[Message(LockStepInner.RoomManager2Room_Init)]
 	[MemoryPackable]
-	public partial class RoomManager2Room_Init: MessageObject, IActorRequest
+	public partial class RoomManager2Room_Init: MessageObject, IRequest
 	{
 		public static RoomManager2Room_Init Create(bool isFromPool = true) 
 		{ 
@@ -221,7 +221,7 @@ namespace ET
 
 	[Message(LockStepInner.Room2RoomManager_Init)]
 	[MemoryPackable]
-	public partial class Room2RoomManager_Init: MessageObject, IActorResponse
+	public partial class Room2RoomManager_Init: MessageObject, IResponse
 	{
 		public static Room2RoomManager_Init Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Server/Message/LockStepOuter_C_11001.cs

@@ -59,7 +59,7 @@ namespace ET
 // 匹配成功，通知客户端切换场景
 	[Message(LockStepOuter.Match2G_NotifyMatchSuccess)]
 	[MemoryPackable]
-	public partial class Match2G_NotifyMatchSuccess: MessageObject, IActorMessage
+	public partial class Match2G_NotifyMatchSuccess: MessageObject, IMessage
 	{
 		public static Match2G_NotifyMatchSuccess Create(bool isFromPool = true) 
 		{ 
@@ -87,7 +87,7 @@ namespace ET
 // 客户端通知房间切换场景完成
 	[Message(LockStepOuter.C2Room_ChangeSceneFinish)]
 	[MemoryPackable]
-	public partial class C2Room_ChangeSceneFinish: MessageObject, IActorRoom
+	public partial class C2Room_ChangeSceneFinish: MessageObject, IRoom
 	{
 		public static C2Room_ChangeSceneFinish Create(bool isFromPool = true) 
 		{ 
@@ -140,7 +140,7 @@ namespace ET
 // 房间通知客户端进入战斗
 	[Message(LockStepOuter.Room2C_Start)]
 	[MemoryPackable]
-	public partial class Room2C_Start: MessageObject, IActorMessage
+	public partial class Room2C_Start: MessageObject, IMessage
 	{
 		public static Room2C_Start Create(bool isFromPool = true) 
 		{ 
@@ -166,7 +166,7 @@ namespace ET
 
 	[Message(LockStepOuter.FrameMessage)]
 	[MemoryPackable]
-	public partial class FrameMessage: MessageObject, IActorMessage
+	public partial class FrameMessage: MessageObject, IMessage
 	{
 		public static FrameMessage Create(bool isFromPool = true) 
 		{ 
@@ -196,7 +196,7 @@ namespace ET
 
 	[Message(LockStepOuter.OneFrameInputs)]
 	[MemoryPackable]
-	public partial class OneFrameInputs: MessageObject, IActorMessage
+	public partial class OneFrameInputs: MessageObject, IMessage
 	{
 		public static OneFrameInputs Create(bool isFromPool = true) 
 		{ 
@@ -218,7 +218,7 @@ namespace ET
 
 	[Message(LockStepOuter.Room2C_AdjustUpdateTime)]
 	[MemoryPackable]
-	public partial class Room2C_AdjustUpdateTime: MessageObject, IActorMessage
+	public partial class Room2C_AdjustUpdateTime: MessageObject, IMessage
 	{
 		public static Room2C_AdjustUpdateTime Create(bool isFromPool = true) 
 		{ 
@@ -240,7 +240,7 @@ namespace ET
 
 	[Message(LockStepOuter.C2Room_CheckHash)]
 	[MemoryPackable]
-	public partial class C2Room_CheckHash: MessageObject, IActorRoom
+	public partial class C2Room_CheckHash: MessageObject, IRoom
 	{
 		public static C2Room_CheckHash Create(bool isFromPool = true) 
 		{ 
@@ -270,7 +270,7 @@ namespace ET
 
 	[Message(LockStepOuter.Room2C_CheckHashFail)]
 	[MemoryPackable]
-	public partial class Room2C_CheckHashFail: MessageObject, IActorMessage
+	public partial class Room2C_CheckHashFail: MessageObject, IMessage
 	{
 		public static Room2C_CheckHashFail Create(bool isFromPool = true) 
 		{ 
@@ -296,7 +296,7 @@ namespace ET
 
 	[Message(LockStepOuter.G2C_Reconnect)]
 	[MemoryPackable]
-	public partial class G2C_Reconnect: MessageObject, IActorMessage
+	public partial class G2C_Reconnect: MessageObject, IMessage
 	{
 		public static G2C_Reconnect Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Generate/Server/Message/OuterMessage_C_10001.cs

@@ -58,7 +58,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterMessage.C2M_TestRequest)]
 	[MemoryPackable]
-	public partial class C2M_TestRequest: MessageObject, IActorLocationRequest
+	public partial class C2M_TestRequest: MessageObject, ILocationRequest
 	{
 		public static C2M_TestRequest Create(bool isFromPool = true) 
 		{ 
@@ -84,7 +84,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestResponse)]
 	[MemoryPackable]
-	public partial class M2C_TestResponse: MessageObject, IActorResponse
+	public partial class M2C_TestResponse: MessageObject, IResponse
 	{
 		public static M2C_TestResponse Create(bool isFromPool = true) 
 		{ 
@@ -119,7 +119,7 @@ namespace ET
 	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterMessage.Actor_TransferRequest)]
 	[MemoryPackable]
-	public partial class Actor_TransferRequest: MessageObject, IActorLocationRequest
+	public partial class Actor_TransferRequest: MessageObject, ILocationRequest
 	{
 		public static Actor_TransferRequest Create(bool isFromPool = true) 
 		{ 
@@ -145,7 +145,7 @@ namespace ET
 
 	[Message(OuterMessage.Actor_TransferResponse)]
 	[MemoryPackable]
-	public partial class Actor_TransferResponse: MessageObject, IActorLocationResponse
+	public partial class Actor_TransferResponse: MessageObject, ILocationResponse
 	{
 		public static Actor_TransferResponse Create(bool isFromPool = true) 
 		{ 
@@ -309,7 +309,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_CreateUnits)]
 	[MemoryPackable]
-	public partial class M2C_CreateUnits: MessageObject, IActorMessage
+	public partial class M2C_CreateUnits: MessageObject, IMessage
 	{
 		public static M2C_CreateUnits Create(bool isFromPool = true) 
 		{ 
@@ -331,7 +331,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_CreateMyUnit)]
 	[MemoryPackable]
-	public partial class M2C_CreateMyUnit: MessageObject, IActorMessage
+	public partial class M2C_CreateMyUnit: MessageObject, IMessage
 	{
 		public static M2C_CreateMyUnit Create(bool isFromPool = true) 
 		{ 
@@ -353,7 +353,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_StartSceneChange)]
 	[MemoryPackable]
-	public partial class M2C_StartSceneChange: MessageObject, IActorMessage
+	public partial class M2C_StartSceneChange: MessageObject, IMessage
 	{
 		public static M2C_StartSceneChange Create(bool isFromPool = true) 
 		{ 
@@ -379,7 +379,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_RemoveUnits)]
 	[MemoryPackable]
-	public partial class M2C_RemoveUnits: MessageObject, IActorMessage
+	public partial class M2C_RemoveUnits: MessageObject, IMessage
 	{
 		public static M2C_RemoveUnits Create(bool isFromPool = true) 
 		{ 
@@ -401,7 +401,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_PathfindingResult)]
 	[MemoryPackable]
-	public partial class C2M_PathfindingResult: MessageObject, IActorLocationMessage
+	public partial class C2M_PathfindingResult: MessageObject, ILocationMessage
 	{
 		public static C2M_PathfindingResult Create(bool isFromPool = true) 
 		{ 
@@ -427,7 +427,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_Stop)]
 	[MemoryPackable]
-	public partial class C2M_Stop: MessageObject, IActorLocationMessage
+	public partial class C2M_Stop: MessageObject, ILocationMessage
 	{
 		public static C2M_Stop Create(bool isFromPool = true) 
 		{ 
@@ -449,7 +449,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_PathfindingResult)]
 	[MemoryPackable]
-	public partial class M2C_PathfindingResult: MessageObject, IActorMessage
+	public partial class M2C_PathfindingResult: MessageObject, IMessage
 	{
 		public static M2C_PathfindingResult Create(bool isFromPool = true) 
 		{ 
@@ -479,7 +479,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_Stop)]
 	[MemoryPackable]
-	public partial class M2C_Stop: MessageObject, IActorMessage
+	public partial class M2C_Stop: MessageObject, IMessage
 	{
 		public static M2C_Stop Create(bool isFromPool = true) 
 		{ 
@@ -810,7 +810,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterMessage.C2M_TestRobotCase)]
 	[MemoryPackable]
-	public partial class C2M_TestRobotCase: MessageObject, IActorLocationRequest
+	public partial class C2M_TestRobotCase: MessageObject, ILocationRequest
 	{
 		public static C2M_TestRobotCase Create(bool isFromPool = true) 
 		{ 
@@ -836,7 +836,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestRobotCase)]
 	[MemoryPackable]
-	public partial class M2C_TestRobotCase: MessageObject, IActorLocationResponse
+	public partial class M2C_TestRobotCase: MessageObject, ILocationResponse
 	{
 		public static M2C_TestRobotCase Create(bool isFromPool = true) 
 		{ 
@@ -870,7 +870,7 @@ namespace ET
 
 	[Message(OuterMessage.C2M_TestRobotCase2)]
 	[MemoryPackable]
-	public partial class C2M_TestRobotCase2: MessageObject, IActorLocationMessage
+	public partial class C2M_TestRobotCase2: MessageObject, ILocationMessage
 	{
 		public static C2M_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
@@ -896,7 +896,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TestRobotCase2)]
 	[MemoryPackable]
-	public partial class M2C_TestRobotCase2: MessageObject, IActorLocationMessage
+	public partial class M2C_TestRobotCase2: MessageObject, ILocationMessage
 	{
 		public static M2C_TestRobotCase2 Create(bool isFromPool = true) 
 		{ 
@@ -923,7 +923,7 @@ namespace ET
 	[ResponseType(nameof(M2C_TransferMap))]
 	[Message(OuterMessage.C2M_TransferMap)]
 	[MemoryPackable]
-	public partial class C2M_TransferMap: MessageObject, IActorLocationRequest
+	public partial class C2M_TransferMap: MessageObject, ILocationRequest
 	{
 		public static C2M_TransferMap Create(bool isFromPool = true) 
 		{ 
@@ -945,7 +945,7 @@ namespace ET
 
 	[Message(OuterMessage.M2C_TransferMap)]
 	[MemoryPackable]
-	public partial class M2C_TransferMap: MessageObject, IActorLocationResponse
+	public partial class M2C_TransferMap: MessageObject, ILocationResponse
 	{
 		public static M2C_TransferMap Create(bool isFromPool = true) 
 		{ 

Unity/Assets/Scripts/Model/Server/Module/Message/MessageHandler.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace ET.Server
 {
-    public abstract class MessageHandler<Request, Response>: IMHandler where Request : MessageObject, IActorRequest where Response : MessageObject, IActorResponse
+    public abstract class MessageHandler<Request, Response>: IMHandler where Request : MessageObject, IRequest where Response : MessageObject, IResponse
     {
         protected abstract ETTask Run(Session session, Request request, Response response);
 

Unity/Assets/Scripts/Model/Server/Module/NetInner/A2NetInner_Message.cs

@@ -3,7 +3,7 @@
 namespace ET
 {
     [Message(1)]
-    public class A2NetInner_Message: MessageObject, IActorMessage
+    public class A2NetInner_Message: MessageObject, IMessage
     {
         public static A2NetInner_Message Create()
         {
@@ -20,12 +20,12 @@ namespace ET
         
         public Address FromAddress;
         public ActorId ActorId;
-        public IActorMessage MessageObject;
+        public IMessage MessageObject;
     }
     
     [Message(2)]
     [ResponseType(nameof(A2NetInner_Response))]
-    public class A2NetInner_Request: MessageObject, IActorRequest
+    public class A2NetInner_Request: MessageObject, IRequest
     {
         public static A2NetInner_Request Create()
         {
@@ -45,11 +45,11 @@ namespace ET
         public int RpcId { get; set; }
         public ActorId ActorId;
         public bool NeedException;
-        public IActorRequest MessageObject;
+        public IRequest MessageObject;
     }
     
     [Message(3)]
-    public class A2NetInner_Response: MessageObject, IActorResponse
+    public class A2NetInner_Response: MessageObject, IResponse
     {
         public static A2NetInner_Response Create()
         {
@@ -69,7 +69,7 @@ namespace ET
         public string Message { get; set; }
         public int RpcId { get; set; }
         
-        public IActorResponse MessageObject;
+        public IResponse MessageObject;
 
     }
 }

Unity/Assets/Scripts/Model/Share/LockStep/IActorRoom.cs → Unity/Assets/Scripts/Model/Share/LockStep/IRoom.cs

@@ -1,6 +1,6 @@
 namespace ET
 {
-    public interface IActorRoom: IActorMessage
+    public interface IRoom: IMessage
     {
         long PlayerId { get; set; }
     }

Unity/Assets/Scripts/Core/Network/IActorLocationMessage.cs.meta → Unity/Assets/Scripts/Model/Share/LockStep/IRoom.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 572c6f5a92280bb4da6c210e2a1c4fef
+guid: e476157fc98b7834fbd2afb23ea0c231
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Model/Share/Module/Message/ISessionMessage.cs

@@ -1,15 +1,15 @@
 namespace ET
 {
 
-    public interface ISessionMessage: IActorMessage
+    public interface ISessionMessage: IMessage
     {
     }
     
-    public interface ISessionRequest: ISessionMessage, IActorRequest
+    public interface ISessionRequest: ISessionMessage, IRequest
     {
     }
     
-    public interface ISessionResponse: ISessionMessage, IActorResponse
+    public interface ISessionResponse: ISessionMessage, IResponse
     {
 
     }

Unity/Assets/Scripts/Model/Share/Module/Message/Session.cs

@@ -7,13 +7,13 @@ namespace ET
 {
     public readonly struct RpcInfo
     {
-        public readonly IActorRequest Request;
-        public readonly ETTask<IActorResponse> Tcs;
+        public readonly IRequest Request;
+        public readonly ETTask<IResponse> Tcs;
 
-        public RpcInfo(IActorRequest request)
+        public RpcInfo(IRequest request)
         {
             this.Request = request;
-            this.Tcs = ETTask<IActorResponse>.Create(true);
+            this.Tcs = ETTask<IResponse>.Create(true);
         }
     }
     
@@ -49,7 +49,7 @@ namespace ET
             self.requestCallbacks.Clear();
         }
         
-        public static void OnResponse(this Session self, IActorResponse response)
+        public static void OnResponse(this Session self, IResponse response)
         {
             if (!self.requestCallbacks.Remove(response.RpcId, out var action))
             {
@@ -64,7 +64,7 @@ namespace ET
             action.Tcs.SetResult(response);
         }
         
-        public static async ETTask<IActorResponse> Call(this Session self, IActorRequest request, ETCancellationToken cancellationToken)
+        public static async ETTask<IResponse> Call(this Session self, IRequest request, ETCancellationToken cancellationToken)
         {
             int rpcId = ++self.RpcId;
             RpcInfo rpcInfo = new RpcInfo(request);
@@ -82,12 +82,12 @@ namespace ET
 
                 self.requestCallbacks.Remove(rpcId);
                 Type responseType = OpcodeType.Instance.GetResponseType(action.Request.GetType());
-                IActorResponse response = (IActorResponse) Activator.CreateInstance(responseType);
+                IResponse response = (IResponse) Activator.CreateInstance(responseType);
                 response.Error = ErrorCore.ERR_Cancel;
                 action.Tcs.SetResult(response);
             }
 
-            IActorResponse ret;
+            IResponse ret;
             try
             {
                 cancellationToken?.Add(CancelAction);
@@ -100,7 +100,7 @@ namespace ET
             return ret;
         }
 
-        public static async ETTask<IActorResponse> Call(this Session self, IActorRequest request, int time = 0)
+        public static async ETTask<IResponse> Call(this Session self, IRequest request, int time = 0)
         {
             int rpcId = ++self.RpcId;
             RpcInfo rpcInfo = new(request);
@@ -132,12 +132,12 @@ namespace ET
             return await rpcInfo.Tcs;
         }
 
-        public static void Send(this Session self, IActorMessage message)
+        public static void Send(this Session self, IMessage message)
         {
             self.Send(default, message);
         }
         
-        public static void Send(this Session self, ActorId actorId, IActorMessage message)
+        public static void Send(this Session self, ActorId actorId, IMessage message)
         {
             self.LastSendTime = TimeInfo.Instance.ClientNow();
             LogMsg.Instance.Debug(message);