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

ResponseType使用nameof,加强编译约束

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

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

@@ -6,7 +6,7 @@ namespace ET
 /// <summary>
 /// 传送unit
 /// </summary>
-	[ResponseType("M2M_TrasferUnitResponse")]
+	[ResponseType(nameof(M2M_TrasferUnitResponse))]
 	[Message(InnerOpcode.M2M_TrasferUnitRequest)]
 	[ProtoContract]
 	public partial class M2M_TrasferUnitRequest: Object, IActorRequest
@@ -40,7 +40,7 @@ namespace ET
 
 	}
 
-	[ResponseType("A2M_Reload")]
+	[ResponseType(nameof(A2M_Reload))]
 	[Message(InnerOpcode.M2A_Reload)]
 	[ProtoContract]
 	public partial class M2A_Reload: Object, IActorRequest
@@ -68,7 +68,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2G_LockResponse")]
+	[ResponseType(nameof(G2G_LockResponse))]
 	[Message(InnerOpcode.G2G_LockRequest)]
 	[ProtoContract]
 	public partial class G2G_LockRequest: Object, IActorRequest
@@ -102,7 +102,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2G_LockReleaseResponse")]
+	[ResponseType(nameof(G2G_LockReleaseResponse))]
 	[Message(InnerOpcode.G2G_LockReleaseRequest)]
 	[ProtoContract]
 	public partial class G2G_LockReleaseRequest: Object, IActorRequest
@@ -136,7 +136,7 @@ namespace ET
 
 	}
 
-	[ResponseType("ObjectAddResponse")]
+	[ResponseType(nameof(ObjectAddResponse))]
 	[Message(InnerOpcode.ObjectAddRequest)]
 	[ProtoContract]
 	public partial class ObjectAddRequest: Object, IActorRequest
@@ -170,7 +170,7 @@ namespace ET
 
 	}
 
-	[ResponseType("ObjectLockResponse")]
+	[ResponseType(nameof(ObjectLockResponse))]
 	[Message(InnerOpcode.ObjectLockRequest)]
 	[ProtoContract]
 	public partial class ObjectLockRequest: Object, IActorRequest
@@ -207,7 +207,7 @@ namespace ET
 
 	}
 
-	[ResponseType("ObjectUnLockResponse")]
+	[ResponseType(nameof(ObjectUnLockResponse))]
 	[Message(InnerOpcode.ObjectUnLockRequest)]
 	[ProtoContract]
 	public partial class ObjectUnLockRequest: Object, IActorRequest
@@ -244,7 +244,7 @@ namespace ET
 
 	}
 
-	[ResponseType("ObjectRemoveResponse")]
+	[ResponseType(nameof(ObjectRemoveResponse))]
 	[Message(InnerOpcode.ObjectRemoveRequest)]
 	[ProtoContract]
 	public partial class ObjectRemoveRequest: Object, IActorRequest
@@ -275,7 +275,7 @@ namespace ET
 
 	}
 
-	[ResponseType("ObjectGetResponse")]
+	[ResponseType(nameof(ObjectGetResponse))]
 	[Message(InnerOpcode.ObjectGetRequest)]
 	[ProtoContract]
 	public partial class ObjectGetRequest: Object, IActorRequest
@@ -309,7 +309,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2R_GetLoginKey")]
+	[ResponseType(nameof(G2R_GetLoginKey))]
 	[Message(InnerOpcode.R2G_GetLoginKey)]
 	[ProtoContract]
 	public partial class R2G_GetLoginKey: Object, IActorRequest
@@ -346,7 +346,7 @@ namespace ET
 
 	}
 
-	[ResponseType("M2G_CreateUnit")]
+	[ResponseType(nameof(M2G_CreateUnit))]
 	[Message(InnerOpcode.G2M_CreateUnit)]
 	[ProtoContract]
 	public partial class G2M_CreateUnit: Object, IActorRequest

+ 8 - 8
Server/Model/Generate/Message/OuterMessage.cs

@@ -3,7 +3,7 @@ using ProtoBuf;
 using System.Collections.Generic;
 namespace ET
 {
-	[ResponseType("M2C_TestResponse")]
+	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterOpcode.C2M_TestRequest)]
 	[ProtoContract]
 	public partial class C2M_TestRequest: Object, IActorLocationRequest
@@ -37,7 +37,7 @@ namespace ET
 
 	}
 
-	[ResponseType("Actor_TransferResponse")]
+	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterOpcode.Actor_TransferRequest)]
 	[ProtoContract]
 	public partial class Actor_TransferRequest: Object, IActorLocationRequest
@@ -68,7 +68,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2C_EnterMap")]
+	[ResponseType(nameof(G2C_EnterMap))]
 	[Message(OuterOpcode.C2G_EnterMap)]
 	[ProtoContract]
 	public partial class C2G_EnterMap: Object, IRequest
@@ -241,7 +241,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2C_Ping")]
+	[ResponseType(nameof(G2C_Ping))]
 	[Message(OuterOpcode.C2G_Ping)]
 	[ProtoContract]
 	public partial class C2G_Ping: Object, IRequest
@@ -275,7 +275,7 @@ namespace ET
 	{
 	}
 
-	[ResponseType("M2C_Reload")]
+	[ResponseType(nameof(M2C_Reload))]
 	[Message(OuterOpcode.C2M_Reload)]
 	[ProtoContract]
 	public partial class C2M_Reload: Object, IRequest
@@ -306,7 +306,7 @@ namespace ET
 
 	}
 
-	[ResponseType("R2C_Login")]
+	[ResponseType(nameof(R2C_Login))]
 	[Message(OuterOpcode.C2R_Login)]
 	[ProtoContract]
 	public partial class C2R_Login: Object, IRequest
@@ -346,7 +346,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2C_LoginGate")]
+	[ResponseType(nameof(G2C_LoginGate))]
 	[Message(OuterOpcode.C2G_LoginGate)]
 	[ProtoContract]
 	public partial class C2G_LoginGate: Object, IRequest
@@ -389,7 +389,7 @@ namespace ET
 
 	}
 
-	[ResponseType("M2C_TestRobotCase")]
+	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterOpcode.C2M_TestRobotCase)]
 	[ProtoContract]
 	public partial class C2M_TestRobotCase: Object, IActorLocationRequest

+ 2 - 2
Server/Model/Proto2CS/Program.cs

@@ -24,7 +24,7 @@ namespace ET
     public static class InnerProto2CS
     {
         private const string protoPath = ".";
-        private const string clientMessagePath = "../Unity/Assets/Model/Generate/Message/";
+        private const string clientMessagePath = "../Unity/Codes/Model/Generate/Message/";
         private const string serverMessagePath = "../Server/Model/Generate/Message/";
         private static readonly char[] splitChars = { ' ', '\t' };
         private static readonly List<OpcodeInfo> msgOpcode = new List<OpcodeInfo>();
@@ -75,7 +75,7 @@ namespace ET
                 if (newline.StartsWith("//ResponseType"))
                 {
                     string responseType = line.Split(" ")[1].TrimEnd('\r', '\n');
-                    sb.AppendLine($"\t[ResponseType(\"{responseType}\")]");
+                    sb.AppendLine($"\t[ResponseType(nameof({responseType}))]");
                     continue;
                 }
 

+ 8 - 8
Unity/Codes/Model/Generate/Message/OuterMessage.cs

@@ -3,7 +3,7 @@ using ProtoBuf;
 using System.Collections.Generic;
 namespace ET
 {
-	[ResponseType("M2C_TestResponse")]
+	[ResponseType(nameof(M2C_TestResponse))]
 	[Message(OuterOpcode.C2M_TestRequest)]
 	[ProtoContract]
 	public partial class C2M_TestRequest: Object, IActorLocationRequest
@@ -37,7 +37,7 @@ namespace ET
 
 	}
 
-	[ResponseType("Actor_TransferResponse")]
+	[ResponseType(nameof(Actor_TransferResponse))]
 	[Message(OuterOpcode.Actor_TransferRequest)]
 	[ProtoContract]
 	public partial class Actor_TransferRequest: Object, IActorLocationRequest
@@ -68,7 +68,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2C_EnterMap")]
+	[ResponseType(nameof(G2C_EnterMap))]
 	[Message(OuterOpcode.C2G_EnterMap)]
 	[ProtoContract]
 	public partial class C2G_EnterMap: Object, IRequest
@@ -241,7 +241,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2C_Ping")]
+	[ResponseType(nameof(G2C_Ping))]
 	[Message(OuterOpcode.C2G_Ping)]
 	[ProtoContract]
 	public partial class C2G_Ping: Object, IRequest
@@ -275,7 +275,7 @@ namespace ET
 	{
 	}
 
-	[ResponseType("M2C_Reload")]
+	[ResponseType(nameof(M2C_Reload))]
 	[Message(OuterOpcode.C2M_Reload)]
 	[ProtoContract]
 	public partial class C2M_Reload: Object, IRequest
@@ -306,7 +306,7 @@ namespace ET
 
 	}
 
-	[ResponseType("R2C_Login")]
+	[ResponseType(nameof(R2C_Login))]
 	[Message(OuterOpcode.C2R_Login)]
 	[ProtoContract]
 	public partial class C2R_Login: Object, IRequest
@@ -346,7 +346,7 @@ namespace ET
 
 	}
 
-	[ResponseType("G2C_LoginGate")]
+	[ResponseType(nameof(G2C_LoginGate))]
 	[Message(OuterOpcode.C2G_LoginGate)]
 	[ProtoContract]
 	public partial class C2G_LoginGate: Object, IRequest
@@ -389,7 +389,7 @@ namespace ET
 
 	}
 
-	[ResponseType("M2C_TestRobotCase")]
+	[ResponseType(nameof(M2C_TestRobotCase))]
 	[Message(OuterOpcode.C2M_TestRobotCase)]
 	[ProtoContract]
 	public partial class C2M_TestRobotCase: Object, IActorLocationRequest