【增加】移除场景单位接口

Config/Proto/OuterMessage_C_10001.proto

@@ -257,6 +257,20 @@ message G2C_AddUnitsToMap // IActorLocationResponse
 	string Message = 3;
 }
 
+//ResponseType G2C_RemoveUnit
+message C2G_RemoveUnit // IActorLocationRequest
+{
+	int32 RpcId = 1;
+	int32 UnitId = 2;	// 单位模板ID
+}
+
+message G2C_RemoveUnit // IActorLocationResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}
+
 message G2C_TestHotfixMessage // IMessage
 {
 	string Info = 1;

DotNet/Hotfix/Scenes/Game/Handler/C2G_RemoveUnitHandler.cs

@@ -0,0 +1,44 @@
+using System;
+
+namespace ET.Server
+{
+    /// <summary>
+    /// 移除场景单位
+    /// </summary>
+    [MessageHandler(SceneType.Game)]
+    public class C2G_RemoveUnitHandler: AMRpcHandler<C2G_RemoveUnit, G2C_RemoveUnit>
+    {
+        protected override async ETTask Run(Session session, C2G_RemoveUnit request, G2C_RemoveUnit response, Action reply)
+        {
+            WNPlayer player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
+            if (player == null)
+            {
+                Log.Debug($"操作错误, player is null");
+                response.Error = ErrorCode.ERR_OperationError;
+                reply();
+                return;
+            }
+            // 参数判断
+            if (request.UnitId <= 0)
+            {
+                Log.Debug($"参数错误...unitId={request.UnitId}");
+                response.Error = ErrorCode.ERR_ParameterError;
+                reply();
+                return;
+            }
+            // 配置是否能找到
+            Monster prop = MonsterCategory.Instance.Get(request.UnitId);
+            if (prop == null)
+            {
+                Log.Debug($"添加单位出错, 未找到配置...unitId={request.UnitId}, playerId={player.GetId()}");
+                response.Error = ErrorCode.ERR_ConfigError;
+                reply();
+                return;
+            }
+
+            await player.Map.RemoveUnit(request.UnitId);
+
+            reply();
+        }
+    }
+}

DotNet/Hotfix/Scenes/Game/Map/MapSystem.cs

@@ -153,6 +153,7 @@ namespace ET.Server
             self.BattleServerId = serverId;
         }
 
+        /** 创建单位 **/
         public static async ETTask<int> AddUnits(this Map self, string instanceId, string data)
         {
             await ETTask.CompletedTask;
@@ -179,5 +180,12 @@ namespace ET.Server
 
             return addUnitsResult;
         }
+
+        /** 移除单位 **/
+        public static async ETTask RemoveUnit(this Map self, int unitId)
+        {
+            self.GetXmdsManager().removeUnit(self.Id.ToString().Trim(), unitId);
+            await ETTask.CompletedTask;
+        }
     }
 }

DotNet/Model/Generate/Message/OuterMessage_C_10001.cs

@@ -531,6 +531,34 @@ namespace ET
 
 	}
 
+	[ResponseType(nameof(G2C_RemoveUnit))]
+	[Message(OuterMessage.C2G_RemoveUnit)]
+	[ProtoContract]
+	public partial class C2G_RemoveUnit: ProtoObject, IActorLocationRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int UnitId { get; set; }
+
+	}
+
+	[Message(OuterMessage.G2C_RemoveUnit)]
+	[ProtoContract]
+	public partial class G2C_RemoveUnit: ProtoObject, IActorLocationResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
 	[ProtoContract]
 	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
@@ -648,11 +676,13 @@ namespace ET
 		 public const ushort G2C_BindPlayer = 10034;
 		 public const ushort C2G_AddUnitsToMap = 10035;
 		 public const ushort G2C_AddUnitsToMap = 10036;
-		 public const ushort G2C_TestHotfixMessage = 10037;
-		 public const ushort C2M_TestRobotCase = 10038;
-		 public const ushort M2C_TestRobotCase = 10039;
-		 public const ushort C2G_Benchmark = 10040;
-		 public const ushort G2C_Benchmark = 10041;
-		 public const ushort R2C_Disconnect = 10042;
+		 public const ushort C2G_RemoveUnit = 10037;
+		 public const ushort G2C_RemoveUnit = 10038;
+		 public const ushort G2C_TestHotfixMessage = 10039;
+		 public const ushort C2M_TestRobotCase = 10040;
+		 public const ushort M2C_TestRobotCase = 10041;
+		 public const ushort C2G_Benchmark = 10042;
+		 public const ushort G2C_Benchmark = 10043;
+		 public const ushort R2C_Disconnect = 10044;
 	}
 }

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/BattleServerMsg_CS_40001.cs.meta → Unity/Assets/Scripts/Codes/Model/Share/Const/Struct.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f8b6369de1b9da448ac2f8d9642bfdc
+guid: a4c469bea039cd64984dd626e85083c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2