【优化】MapEventComponent组件为战斗服事件组件

DotNet/Hotfix/Helper/MapHelper.cs

@@ -97,15 +97,7 @@ namespace ET.Server
         /// 进入map
         /// </summary>
         /// <param name="player"></param>
-        /// <param name="map"></param>
-        public static void PlayerEnterAreaServerInner(WNPlayer player, Map map)
-        {
-            // 初始化角色出生坐标数据
-            player.InitBornData();
-
-            map.AddPlayer(player);
-        }
-
+        /// <param name="instanceId"></param>
         public static Map PlayerEnterAreaServer(WNPlayer player, long instanceId)
         {
             Map map = player.DomainScene().GetComponent<GameMapComponent>().Get(instanceId);
@@ -117,7 +109,10 @@ namespace ET.Server
                     oldMap.RemovePlayer(player, false);
                 }
 
-                PlayerEnterAreaServerInner(player, map);
+                // 初始化角色出生坐标数据
+                player.InitBornData();
+
+                map.AddPlayer(player);
             }
             else
             {

DotNet/Hotfix/Module/IceBattle/BattleEventHandler.cs

@@ -30,7 +30,7 @@
             }
             if (player.Map != null)
             {
-                player.Map.GetComponent<MapEventComponent>().OnReady(player);
+                player.Map.PlayerReady(player);
             }
             await ETTask.CompletedTask;
         }

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

@@ -52,7 +52,7 @@ namespace ET.Server
 
             // 登录数据
             player.OnLogin();
-            map.GetComponent<MapEventComponent>().OnPlayerLogin(player);
+            map.PlayerLogin(player);
 
             response.Player = PlayerHelper.PlayerInfoToProto(player);
             response.Player.areaId = mapConfig.TemplateID;

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

@@ -52,7 +52,7 @@ namespace ET.Server
             }
 
             map.PlayerEnterRequest(player);
-            map.GetComponent<MapEventComponent>().OnPlayerEntered(player);
+            map.PlayerEntered(player);
 
             response.MapInstanceId = player.Map.Id;
             reply();

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

@@ -18,7 +18,7 @@ namespace ET.Server
             }
             if (player.Map != null)
             {
-                player.Map.GetComponent<MapEventComponent>().OnReady(player);
+                player.Map.PlayerReady(player);
             }
 
             reply();

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

@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
 namespace ET.Server
 {
     [FriendOf(typeof (MapEventComponent))]
-    [FriendOfAttribute(typeof (Map))]
+    [FriendOf(typeof (Map))]
     public static class MapEventComponentSystem
     {
         public class MapEventComponentAwakeSystem: AwakeSystem<MapEventComponent>
@@ -18,7 +18,7 @@ namespace ET.Server
             /// <param name="self"></param>
             protected override void Awake(MapEventComponent self)
             {
-                Log.Info($"创建事件组件...");
+                Log.Info($"创建战斗服事件组件...");
             }
         }
 
@@ -30,37 +30,10 @@ namespace ET.Server
             /// <param name="self"></param>
             protected override void Destroy(MapEventComponent self)
             {
-                Log.Info($"销毁事件组件...");
+                Log.Info($"销毁战斗服事件组件...");
             }
         }
 
-        /// <summary>
-        /// 玩家进场景后推的消息
-        /// </summary>
-        /// <param name="self"></param>
-        /// <param name="player"></param>
-        public static void OnReady(this MapEventComponent self, WNPlayer player)
-        {
-        }
-
-        /// <summary>
-        /// 玩家登录事件
-        /// </summary>
-        /// <param name="self"></param>
-        /// <param name="player"></param>
-        public static void OnPlayerLogin(this MapEventComponent self, WNPlayer player)
-        {
-        }
-
-        /// <summary>
-        /// 角色成功进入场景
-        /// </summary>
-        /// <param name="self"></param>
-        /// <param name="player"></param>
-        public static void OnPlayerEntered(this MapEventComponent self, WNPlayer player)
-        {
-        }
-
         /// <summary>
         /// 单位死亡事件
         /// </summary>
@@ -99,7 +72,7 @@ namespace ET.Server
 
             map.IsGameOver = true;
 
-            if (map?.Players is not { Count: > 0 })
+            if (map.Players is not { Count: > 0 })
             {
                 return;
             }

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

@@ -25,7 +25,7 @@ namespace ET.Server
                 self.UnitObjIds = new Dictionary<string, int>();
                 self.UnitPlayerLikes = new Dictionary<string, int>();
 
-                // 场景事件组件
+                // 战斗服事件组件
                 self.AddComponent<MapEventComponent>();
                 // 场景复活组件
                 self.AddComponent<MapReliveTimeComponent>();
@@ -57,7 +57,11 @@ namespace ET.Server
             return string.IsNullOrEmpty(result)? null : JsonConvert.DeserializeObject<GetPlayerData>(result);
         }
 
-        /** 从战斗服同步角色数据 **/
+        /// <summary>
+        /// 从战斗服同步角色数据
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
         public static void SyncPlayerHistoryData(this Map self, WNPlayer player)
         {
             GetPlayerData result = self.GetPlayerData(player.GetId());
@@ -70,28 +74,33 @@ namespace ET.Server
             player.GetComponent<PlayerTempDataComponent>().SyncHistoryData(self.Prop, self.InstanceId, result);
         }
 
-        /** 场景添加角色 **/
-        public static void AddPlayer(this Map self, WNPlayer player)
-        {
-            Log.Info($"addPlayer: playerId={player.GetId()}, mapId={self.MapId}, ip={player.Session.RemoteAddress}");
-            self.SetForce(player);
-            self.Players.TryAdd(player.GetId(), player);
-            player.Map = self;
-        }
-
-        /** 获取场景角色 **/
+        /// <summary>
+        /// 获取场景角色
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="playerId"></param>
+        /// <returns></returns>
         public static WNPlayer GetPlayer(this Map self, long playerId)
         {
             return self.Players.TryGetValue(playerId, out WNPlayer player) ? player : null;
         }
 
-        /** 分配阵营 **/
+        /// <summary>
+        /// 分配阵营
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
         public static void SetForce(this Map self, WNPlayer player)
         {
             player.Force = (int)AreaForce.FORCEA;
         }
 
-        /** 移除角色,通用框架接口 切换场景/掉线会自动调用，尽量 不要手动调用 **/
+        /// <summary>
+        /// 移除角色,通用框架接口 切换场景/掉线会自动调用，尽量 不要手动调用
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        /// <param name="keepObject"></param>
         public static void RemovePlayer(this Map self, WNPlayer player, bool keepObject)
         {
             Log.Info($"removePlayer: playerId={player.GetId()}, mapId={self.MapId}, ip={player.Session.RemoteAddress}");
@@ -104,7 +113,11 @@ namespace ET.Server
             player.GetComponent<PlayerTempDataComponent>().MapData.ready = false;
         }
 
-        /** 玩家进入场景请求 **/
+        /// <summary>
+        /// 玩家进入场景请求
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
         public static void PlayerEnterRequest(this Map self, WNPlayer player)
         {
             bool ready = player.GetComponent<PlayerTempDataComponent>().MapData.ready;
@@ -127,7 +140,52 @@ namespace ET.Server
             }
         }
 
-        /** 玩家离开场景请求 **/
+        /// <summary>
+        /// 场景添加角色
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        public static void AddPlayer(this Map self, WNPlayer player)
+        {
+            Log.Info($"addPlayer: playerId={player.GetId()}, mapId={self.MapId}, ip={player.Session.RemoteAddress}");
+            self.SetForce(player);
+            self.Players.TryAdd(player.GetId(), player);
+            player.Map = self;
+        }
+
+        /// <summary>
+        /// 玩家进场景后推的消息
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        public static void PlayerReady(this Map self, WNPlayer player)
+        {
+        }
+
+        /// <summary>
+        /// 角色成功进入场景
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        public static void PlayerEntered(this Map self, WNPlayer player)
+        {
+        }
+
+        /// <summary>
+        /// 玩家登录事件
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        public static void PlayerLogin(this Map self, WNPlayer player)
+        {
+        }
+
+        /// <summary>
+        /// 玩家离开场景请求
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        /// <param name="keepObject"></param>
         public static void PlayerLeaveRequest(this Map self, WNPlayer player, bool keepObject)
         {
             try
@@ -142,13 +200,24 @@ namespace ET.Server
             Log.Debug($"playerLeaveRequest--------------------{player.GetName()} - {self.InstanceId} - {self.Prop.Name}");
         }
 
-        /** 绑定战斗服 **/
+        /// <summary>
+        /// 绑定战斗服
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="player"></param>
+        /// <param name="serverId"></param>
         public static void BindBattleServer(this Map self, WNPlayer player, string serverId)
         {
             self.BattleServerId = serverId;
         }
 
-        /** 创建单位 **/
+        /// <summary>
+        /// 创建单位
+        /// </summary>
+        /// <param name="self"></param>
+        /// <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)
         {
             if (data.Count <= 0)

DotNet/Model/Scenes/Game/Map/MapEventComponent.cs

@@ -5,8 +5,5 @@ namespace ET.Server
     [ComponentOf(typeof (Map))]
     public class MapEventComponent: Entity, IAwake, IDestroy
     {
-        /** 已杀的boss列表 **/
-        [StaticField]
-        public List<int> MonsterDeadList = new List<int>();
     }
 }