【优化】场景结束改为战斗服GameOver事件驱动

DotNet/Hotfix/Helper/BattleServerEventHelper.cs

@@ -133,8 +133,8 @@ namespace ET.Server
         {
             int unitType = Convert.ToInt32(msg.SelectToken("unitType"));
             // 攻击者
-            long hitFinalPlayerId = Convert.ToInt64(msg.SelectToken("hitFinal"));
-            long belongPlayerId = Convert.ToInt64(msg.SelectToken("belongPlayerId"));
+            long hitFinalPlayerId = msg.SelectToken("hitFinal").ToString() == "" ? 0 : Convert.ToInt64(msg.SelectToken("hitFinal"));
+            long belongPlayerId = msg.SelectToken("belongPlayerId").ToString() == "" ? 0 : Convert.ToInt64(msg.SelectToken("belongPlayerId"));
             long[] atkAssistantList = JsonConvert.DeserializeObject<long[]>(Convert.ToString(msg.SelectToken("atkAssistantList")) ?? string.Empty);
             WNPlayer hitFinalPlayer = null;
 
@@ -151,8 +151,8 @@ namespace ET.Server
 
             switch (unitType)
             {
-                // 怪物死亡
                 case 0:
+                    // 怪物死亡
                     int unitTemplateId = Convert.ToInt32(msg.SelectToken("unitTemplateId"));
                     Monster monsterProp = MonsterCategory.Instance.Get(unitTemplateId);
                     if (monsterProp == null)
@@ -164,11 +164,24 @@ namespace ET.Server
                         map.GetComponent<MapEventComponent>().OnUnitDead(monsterProp, map);
                     }
                     break;
-                // 玩家死亡
                 case 1:
+                    // 玩家死亡
+                    long unitPlayerId = Convert.ToInt64(msg.SelectToken("unitPlayerId"));
+
+                    if (hitFinalPlayerId <= 0)
+                    {
+                        // 被boss杀死
+                        int attackerTemplateId = Convert.ToInt32(msg.SelectToken("attackerTemplateId"));
+                        Log.Debug($"玩家死亡...被boss杀死...playerId={unitPlayerId}, bossId={attackerTemplateId}");
+                    }
+                    else
+                    {
+                        // 被玩家杀死
+                        Log.Debug($"玩家死亡...被玩家杀死...playerId={unitPlayerId}, 攻击者={hitFinalPlayerId}");
+                    }
                     break;
-                // 宠物死亡
                 case 2:
+                    // 宠物死亡
                     break;
             }
         }

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

@@ -51,7 +51,7 @@ namespace ET.Server
         /** 单位死亡事件 **/
         public static void OnUnitDead(this MapEventComponent self, Monster monsterProp, Map map)
         {
-
+            Log.Debug($"怪物死亡处理...");
         }
 
         /** 副本消息 **/
@@ -63,18 +63,26 @@ namespace ET.Server
         /** 场景结算事件 **/
         public static void OnGameOver(this MapEventComponent self, Map map)
         {
-            // if (map?.Players is not { Count: > 0 })
-            // {
-            //     return;
-            // }
-            //
-            // foreach (WNPlayer player in map.Players.Values.Where(player => player != null))
-            // {
-            //     MessageHelper.SendToClient(player, new G2C_GameOver());
-            // }
-
-            // 战斗服结束场景
-            map.GetZoneManager().destroyZoneRequest(self.Id.ToString());
+            if (map?.Players is not { Count: > 0 })
+            {
+                return;
+            }
+
+            foreach (WNPlayer player in map.Players.Values.Where(player => player != null))
+            {
+                // 记录玩家历史
+                map.SyncPlayerHistoryData(player);
+                // 战斗服场景玩家离开
+                map.PlayerLeaveRequest(player, false);
+                // 本地场景移除玩家
+                map.RemovePlayer(player, false);
+                // 移除本地组件数据
+                map.DomainScene().GetComponent<GamePlayerComponent>().Remove(player.GetId());
+                // 战斗服结束场景
+                map.GetZoneManager().destroyZoneRequest(map.Id.ToString());
+                // 销毁
+                player.Dispose();
+            }
         }
 
         /** 拾取道具 **/