【优化】addUnitPlayer方法封装一下

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

@@ -1,4 +1,5 @@
 using System;
+using System.Numerics;
 
 namespace ET.Server
 {
@@ -37,27 +38,9 @@ namespace ET.Server
                 return;
             }
 
-
-            Struct.MonsterUnit unit = new Struct.MonsterUnit();
-            unit.name = player.Map.GetRandomPlayerName();
-            unit.id = request.UnitId;
-            unit.force = request.Force;
-            if (!string.IsNullOrEmpty(request.Flag))
-            {
-                unit.flag = request.Flag;
-            }
-            else
-            {
-                unit.x = request.X;
-                unit.y = request.Y;
-            }
-            unit.autoGuard = true;
-
-            int objId = await player.Map.AddUnits(unit, true);
             // 临时openId
             string _openId = (10000 + new Random().Next(999)).ToString();
-
-            player.Map.AddUnitPlayer(_openId, request.UnitId, objId, 0, unit.name, "");
+            await player.Map.AddUnitPlayer(_openId, request.UnitId, request.Force, request.Flag, request.X, request.Y, "", "");
 
             reply();
         }

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

@@ -56,19 +56,7 @@ namespace ET.Server
             }
 
             Vector2 pos = map.GetRandomPlayerPos();
-
-            Struct.MonsterUnit unit = new Struct.MonsterUnit();
-            unit.id = templateId;
-            unit.force = 1;
-            unit.x = pos.X;
-            unit.y = pos.Y;
-            unit.autoGuard = true;
-            unit.name = request.NickName;
-            unit.alias = request.Url;
-
-            int objId = await map.AddUnits(unit, true);
-
-            map.AddUnitPlayer(request.OpenId, templateId, objId, 0, request.NickName, request.Url);
+            await map.AddUnitPlayer(request.OpenId, templateId, 1, "", pos.X, pos.Y, request.NickName, request.Url);
 
             await ETTask.CompletedTask;
         }

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

@@ -40,8 +40,6 @@ namespace ET.Server
                     GiftNum = (int)request.GiftNum, Url = request.Url, TotalMoney = unitPlayerData.GiftMoney, UnitId = unitPlayerData.ObjId});
             }
 
-            int[] units = new int[] { 101, 121, 111, 131 };
-
             Struct.TriggerEventNotify notify = null;
 
             if (DouyinItem.GiftId_1.Equals(request.GiftId) || DouyinItem.GiftId_10.Equals(request.GiftId))
@@ -79,21 +77,11 @@ namespace ET.Server
                         // 补充单位
                         for (int i = 0; i < cnt; i++)
                         {
-                            Vector2 pos = map.GetRandomPlayerPos();
-
-                            Struct.MonsterUnit unit = new Struct.MonsterUnit();
-                            unit.id = RandomGenerator.RandomArray(units);
-                            unit.force = 1;
-                            unit.x = pos.X;
-                            unit.y = pos.Y;
-                            unit.autoGuard = true;
-                            unit.name = map.GetRandomPlayerName();
-
-                            int _objId = await map.AddUnits(unit, true);
                             // 临时openId
                             string _openId = (10000 + new Random().Next(999)).ToString();
-
-                            map.AddUnitPlayer(_openId, unit.id, _objId, 0, unit.name, "");
+                            Vector2 pos = map.GetRandomPlayerPos();
+                            string name = map.GetRandomPlayerName();
+                            await map.AddUnitPlayer(_openId, 0, 1, "", pos.X, pos.Y, name, "");
                         }
                     }
                 }

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

@@ -25,21 +25,8 @@ namespace ET.Server
 
             if (unitPlayerData == null)
             {
-                int[] units = new int[] { 101, 121, 111, 131 };
                 Vector2 pos = map.GetRandomPlayerPos();
-
-                Struct.MonsterUnit unit = new Struct.MonsterUnit();
-                unit.id = RandomGenerator.RandomArray(units);
-                unit.force = 1;
-                unit.x = pos.X;
-                unit.y = pos.Y;
-                unit.autoGuard = true;
-                unit.name = request.NickName;
-                unit.alias = request.Url;
-
-                int objId = await map.AddUnits(unit, true);
-
-                unitPlayerData = map.AddUnitPlayer(request.OpenId, unit.id, objId, 0, request.NickName, request.Url);
+                unitPlayerData = await map.AddUnitPlayer(request.OpenId, 0, 1, "", pos.X, pos.Y, request.NickName, request.Url);
             }
 
             // 累计增加点赞数

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

@@ -234,7 +234,7 @@ namespace ET.Server
         /// <param name="data"></param>
         /// <param name="needReturn"></param>
         /// <returns></returns>
-        public static async ETTask<int> AddUnits(this Map self, List<Struct.MonsterUnit> data, bool needReturn)
+        private static async ETTask<int> AddUnits(this Map self, List<Struct.MonsterUnit> data, bool needReturn)
         {
             if (data.Count <= 0)
             {
@@ -256,7 +256,7 @@ namespace ET.Server
             return addUnitsResult;
         }
 
-        public static async ETTask<int> AddUnits(this Map self, Struct.MonsterUnit data, bool needReturn)
+        private static async ETTask<int> AddUnits(this Map self, Struct.MonsterUnit data, bool needReturn)
         {
             List<Struct.MonsterUnit> listData = new List<Struct.MonsterUnit>();
             listData.Add(data);
@@ -274,22 +274,6 @@ namespace ET.Server
             await ETTask.CompletedTask;
         }
 
-        /// <summary>
-        /// 场景复活数据
-        /// </summary>
-        /// <param name="self"></param>
-        /// <param name="type">1:原地复活；2:出生点复活；3:复活点复活. 4:技能复活.</param>
-        public static string ReliveData(this Map self, ReliveType type)
-        {
-            JObject jsonObject = new ();
-            jsonObject.Add("type", (int)type);
-            jsonObject.Add("qty", 0);
-            jsonObject.Add("itemType", "diamond");
-            jsonObject.Add("hp", 8);
-            jsonObject.Add("mp", 0);
-            return JsonConvert.SerializeObject(jsonObject, Formatting.Indented);
-        }
-
         /// <summary>
         /// 是否结束
         /// </summary>
@@ -306,22 +290,61 @@ namespace ET.Server
         /// <param name="self"></param>
         /// <param name="openId"></param>
         /// <param name="templateId"></param>
-        /// <param name="objId"></param>
-        /// <param name="likes"></param>
+        /// <param name="force"></param>
+        /// <param name="flag"></param>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
         /// <param name="name"></param>
         /// <param name="url"></param>
-        public static Struct.UnitPlayerData AddUnitPlayer(this Map self, string openId, int templateId, int objId, long likes, string name, string url)
+        /// <returns></returns>
+        public static async ETTask<Struct.UnitPlayerData> AddUnitPlayer(this Map self, string openId, int templateId, int force, string flag, float x, float y, string name, string url)
         {
-            if (string.IsNullOrEmpty(openId) || templateId <= 0 || objId <= 0 || self.IsGameOver())
+            if (self.IsGameOver())
             {
                 return null;
             }
 
+            if (templateId <= 0)
+            {
+                int[] units = new int[] { 101, 121, 111, 131 };
+
+                templateId = RandomGenerator.RandomArray(units);
+            }
+
+            // 战斗服数据
+            Struct.MonsterUnit unit = new Struct.MonsterUnit();
+            unit.id = templateId;
+            unit.force = force;
+            if (!string.IsNullOrEmpty(flag))
+            {
+                unit.flag = flag;
+            }
+            else
+            {
+                unit.x = x;
+                unit.y = y;
+            }
+            unit.autoGuard = true;
+            unit.name = string.IsNullOrEmpty(name)? self.GetRandomPlayerName() : name;
+            unit.alias = url;
+
+            int objId = await self.AddUnits(unit, true);
+
             Struct.UnitPlayerData unitPlayerData = null;
 
+            if (string.IsNullOrEmpty(openId))
+            {
+                openId = (10000 + new Random().Next(999)).ToString();
+            }
+
+            // 本地数据
             if (self.UnitPlayers.ContainsKey(openId))
             {
                 unitPlayerData = self.UnitPlayers[openId];
+
+                // 移除一下之前的场景单位
+                self.RemovePointUnit(unitPlayerData.ObjId).Coroutine();
+
                 unitPlayerData.TemplateId = templateId;
                 unitPlayerData.ObjId = objId;
                 unitPlayerData.Name = name;