Просмотр исходного кода

删除多余的ActorId,ActorId已经集成到协议底层,不需要在消息中定义了

tanghai 4 лет назад
Родитель
Сommit
dc41b88aa5

+ 0 - 12
Proto/InnerMessage.proto

@@ -5,7 +5,6 @@ package ET;
 message ObjectQueryRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Key = 1;
 	int64 InstanceId = 2;
 }
@@ -23,7 +22,6 @@ message M2M_TrasferUnitResponse // IActorResponse
 message M2A_Reload // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 }
 
 message A2M_Reload // IActorResponse
@@ -37,7 +35,6 @@ message A2M_Reload // IActorResponse
 message G2G_LockRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Id = 1;
 	string Address = 2;
 }
@@ -53,7 +50,6 @@ message G2G_LockResponse // IActorResponse
 message G2G_LockReleaseRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Id = 1;
 	string Address = 2;
 }
@@ -69,7 +65,6 @@ message G2G_LockReleaseResponse // IActorResponse
 message ObjectAddRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Key = 1;
 	int64 InstanceId = 2;
 }
@@ -85,7 +80,6 @@ message ObjectAddResponse // IActorResponse
 message ObjectLockRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Key = 1;
 	int64 InstanceId = 2;
 	int32 Time = 3;
@@ -101,7 +95,6 @@ message ObjectLockResponse // IActorResponse
 message ObjectUnLockRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Key = 1;
 	int64 OldInstanceId = 2;
 	int64 InstanceId = 3;
@@ -117,7 +110,6 @@ message ObjectUnLockResponse // IActorResponse
 message ObjectRemoveRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Key = 1;
 }
 message ObjectRemoveResponse // IActorResponse
@@ -131,7 +123,6 @@ message ObjectRemoveResponse // IActorResponse
 message ObjectGetRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 Key = 1;
 }
 message ObjectGetResponse // IActorResponse
@@ -147,7 +138,6 @@ message ObjectGetResponse // IActorResponse
 message R2G_GetLoginKey // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	string Account = 1;
 }
 
@@ -165,7 +155,6 @@ message G2R_GetLoginKey // IActorResponse
 message G2M_CreateUnit // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int64 PlayerId = 1;
 	int64 GateSessionId = 2;
 }
@@ -185,5 +174,4 @@ message M2G_CreateUnit // IActorResponse
 message G2M_SessionDisconnect // IActorLocationMessage
 {
 	int32 RpcId = 90;
-	int64 ActorId = 94;
 }

+ 0 - 1
Proto/MongoMessage.proto

@@ -18,6 +18,5 @@ message ObjectQueryResponse // IActorResponse
 message M2M_TrasferUnitRequest // IActorRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	Unit Unit = 1;
 }

+ 0 - 8
Proto/OuterMessage.proto

@@ -5,7 +5,6 @@ package ET;
 message C2M_TestRequest // IActorLocationRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	string request = 1;
 }
 
@@ -21,7 +20,6 @@ message M2C_TestResponse // IActorLocationResponse
 message Actor_TransferRequest // IActorLocationRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int32 MapIndex = 1;
 }
 
@@ -63,14 +61,12 @@ message UnitInfo
 message M2C_CreateUnits // IActorMessage
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	repeated UnitInfo Units = 2;
 }
 
 message C2M_PathfindingResult // IActorLocationMessage
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 
 	float X = 1;
 	float Y = 2;
@@ -80,13 +76,10 @@ message C2M_PathfindingResult // IActorLocationMessage
 message C2M_Stop // IActorLocationMessage
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 }
 
 message M2C_PathfindingResult // IActorMessage
 {
-	int64 ActorId = 93;
-
 	int64 Id = 1;
 
 	float X = 2;
@@ -191,7 +184,6 @@ message G2C_TestHotfixMessage // IMessage
 message C2M_TestRobotCase // IActorLocationRequest
 {
 	int32 RpcId = 90;
-	int64 ActorId = 93;
 	int32 N = 1;
 }
 

+ 0 - 36
Server/Model/Generate/Message/InnerMessage.cs

@@ -11,9 +11,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Key { get; set; }
 
@@ -48,9 +45,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 	}
 
 	[Message(InnerOpcode.A2M_Reload)]
@@ -76,9 +70,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
@@ -110,9 +101,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
@@ -144,9 +132,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Key { get; set; }
 
@@ -178,9 +163,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Key { get; set; }
 
@@ -215,9 +197,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Key { get; set; }
 
@@ -252,9 +231,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Key { get; set; }
 
@@ -283,9 +259,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Key { get; set; }
 
@@ -317,9 +290,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public string Account { get; set; }
 
@@ -354,9 +324,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long PlayerId { get; set; }
 
@@ -395,9 +362,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(94)]
-		public long ActorId { get; set; }
-
 	}
 
 }

+ 0 - 3
Server/Model/Generate/Message/MongoMessage.cs

@@ -32,9 +32,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public Unit Unit { get; set; }
 

+ 0 - 21
Server/Model/Generate/Message/OuterMessage.cs

@@ -11,9 +11,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public string request { get; set; }
 
@@ -45,9 +42,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public int MapIndex { get; set; }
 
@@ -135,9 +129,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(2)]
 		public List<UnitInfo> Units = new List<UnitInfo>();
 
@@ -150,9 +141,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public float X { get; set; }
 
@@ -171,18 +159,12 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 	}
 
 	[Message(OuterOpcode.M2C_PathfindingResult)]
 	[ProtoContract]
 	public partial class M2C_PathfindingResult: Object, IActorMessage
 	{
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
@@ -395,9 +377,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public int N { get; set; }
 

+ 0 - 21
Unity/Codes/Model/Generate/Message/OuterMessage.cs

@@ -11,9 +11,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public string request { get; set; }
 
@@ -45,9 +42,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public int MapIndex { get; set; }
 
@@ -135,9 +129,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(2)]
 		public List<UnitInfo> Units = new List<UnitInfo>();
 
@@ -150,9 +141,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public float X { get; set; }
 
@@ -171,18 +159,12 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 	}
 
 	[Message(OuterOpcode.M2C_PathfindingResult)]
 	[ProtoContract]
 	public partial class M2C_PathfindingResult: Object, IActorMessage
 	{
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public long Id { get; set; }
 
@@ -395,9 +377,6 @@ namespace ET
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
-
 		[ProtoMember(1)]
 		public int N { get; set; }