Эх сурвалжийг харах

M2M_TrasferUnitRequest中有Unit,也要放到MongoProto中

tanghai 4 жил өмнө
parent
commit
4498509979

+ 4 - 6
Proto/InnerMessage.proto

@@ -1,15 +1,13 @@
 syntax = "proto3";
 package ET;
 
-/// <summary>
-/// 传送unit
-/// </summary>
-//ResponseType M2M_TrasferUnitResponse
-message M2M_TrasferUnitRequest // IActorRequest
+//ResponseType ObjectQueryResponse
+message ObjectQueryRequest // IActorRequest
 {
     int32 RpcId = 90;
     int64 ActorId = 93;
-    Unit Unit = 1;
+    int64 Key = 1;
+    int64 InstanceId = 2;
 }
 
 message M2M_TrasferUnitResponse // IActorResponse

+ 12 - 9
Proto/MongoMessage.proto

@@ -1,14 +1,6 @@
 syntax = "proto3";
 package ET;
 
-//ResponseType ObjectQueryResponse
-message ObjectQueryRequest // IActorRequest
-{
-    int32 RpcId = 90;
-    int64 ActorId = 93;
-    int64 Key = 1;
-    int64 InstanceId = 2;
-}
 
 message ObjectQueryResponse // IActorResponse
 {
@@ -17,4 +9,15 @@ message ObjectQueryResponse // IActorResponse
     string Message = 92;
     
     Entity entity = 1;
-}
+}
+
+/// <summary>
+/// 传送unit
+/// </summary>
+//ResponseType M2M_TrasferUnitResponse
+message M2M_TrasferUnitRequest // IActorRequest
+{
+    int32 RpcId = 90;
+    int64 ActorId = 93;
+    Unit Unit = 1;
+}

+ 7 - 7
Server/Model/Generate/Message/InnerMessage.cs

@@ -3,13 +3,10 @@ using ProtoBuf;
 using System.Collections.Generic;
 namespace ET
 {
-/// <summary>
-/// 传送unit
-/// </summary>
-	[ResponseType(nameof(M2M_TrasferUnitResponse))]
-	[Message(InnerOpcode.M2M_TrasferUnitRequest)]
+	[ResponseType(nameof(ObjectQueryResponse))]
+	[Message(InnerOpcode.ObjectQueryRequest)]
 	[ProtoContract]
-	public partial class M2M_TrasferUnitRequest: Object, IActorRequest
+	public partial class ObjectQueryRequest: Object, IActorRequest
 	{
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
@@ -18,7 +15,10 @@ namespace ET
 		public long ActorId { get; set; }
 
 		[ProtoMember(1)]
-		public Unit Unit { get; set; }
+		public long Key { get; set; }
+
+		[ProtoMember(2)]
+		public long InstanceId { get; set; }
 
 	}
 

+ 1 - 1
Server/Model/Generate/Message/InnerOpcode.cs

@@ -2,7 +2,7 @@ namespace ET
 {
 	public static partial class InnerOpcode
 	{
-		 public const ushort M2M_TrasferUnitRequest = 10001;
+		 public const ushort ObjectQueryRequest = 10001;
 		 public const ushort M2M_TrasferUnitResponse = 10002;
 		 public const ushort M2A_Reload = 10003;
 		 public const ushort A2M_Reload = 10004;

+ 17 - 17
Server/Model/Generate/Message/MongoMessage.cs

@@ -3,40 +3,40 @@ using ProtoBuf;
 using System.Collections.Generic;
 namespace ET
 {
-	[ResponseType(nameof(ObjectQueryResponse))]
-	[Message(MongoOpcode.ObjectQueryRequest)]
+	[Message(MongoOpcode.ObjectQueryResponse)]
 	[ProtoContract]
-	public partial class ObjectQueryRequest: Object, IActorRequest
+	public partial class ObjectQueryResponse: Object, IActorResponse
 	{
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(93)]
-		public long ActorId { get; set; }
+		[ProtoMember(91)]
+		public int Error { get; set; }
 
-		[ProtoMember(1)]
-		public long Key { get; set; }
+		[ProtoMember(92)]
+		public string Message { get; set; }
 
-		[ProtoMember(2)]
-		public long InstanceId { get; set; }
+		[ProtoMember(1)]
+		public Entity entity { get; set; }
 
 	}
 
-	[Message(MongoOpcode.ObjectQueryResponse)]
+/// <summary>
+/// 传送unit
+/// </summary>
+	[ResponseType(nameof(M2M_TrasferUnitResponse))]
+	[Message(MongoOpcode.M2M_TrasferUnitRequest)]
 	[ProtoContract]
-	public partial class ObjectQueryResponse: Object, IActorResponse
+	public partial class M2M_TrasferUnitRequest: Object, IActorRequest
 	{
 		[ProtoMember(90)]
 		public int RpcId { get; set; }
 
-		[ProtoMember(91)]
-		public int Error { get; set; }
-
-		[ProtoMember(92)]
-		public string Message { get; set; }
+		[ProtoMember(93)]
+		public long ActorId { get; set; }
 
 		[ProtoMember(1)]
-		public Entity entity { get; set; }
+		public Unit Unit { get; set; }
 
 	}
 

+ 2 - 2
Server/Model/Generate/Message/MongoOpcode.cs

@@ -2,7 +2,7 @@ namespace ET
 {
 	public static partial class MongoOpcode
 	{
-		 public const ushort ObjectQueryRequest = 40001;
-		 public const ushort ObjectQueryResponse = 40002;
+		 public const ushort ObjectQueryResponse = 40001;
+		 public const ushort M2M_TrasferUnitRequest = 40002;
 	}
 }