diff --git a/GameServer/Game/Battle/BattleManager.cs b/GameServer/Game/Battle/BattleManager.cs index 211eca4b..d793bf07 100644 --- a/GameServer/Game/Battle/BattleManager.cs +++ b/GameServer/Game/Battle/BattleManager.cs @@ -15,7 +15,7 @@ namespace EggLink.DanhengServer.Game.Battle { public class BattleManager(PlayerInstance player) : BasePlayerManager(player) { - public void StartBattle(SceneCastSkillCsReq req, MazeSkill skill, List hitTargetEntityIdList) + public void StartBattle(SceneCastSkillCsReq req, MazeSkill skill) { if (Player.BattleInstance != null) return; var targetList = new List(); @@ -25,7 +25,7 @@ namespace EggLink.DanhengServer.Game.Battle if (Player.SceneInstance!.AvatarInfo.ContainsKey((int)req.AttackedByEntityId)) { - foreach (var entity in hitTargetEntityIdList) + foreach (var entity in req.HitTargetEntityIdList) { Player.SceneInstance!.Entities.TryGetValue((int)entity, out var entityInstance); if (entityInstance is EntityMonster monster) @@ -52,7 +52,7 @@ namespace EggLink.DanhengServer.Game.Battle } else { bool isAmbushed = false; - foreach (var entity in hitTargetEntityIdList) + foreach (var entity in req.HitTargetEntityIdList) { if (Player.SceneInstance!.AvatarInfo.ContainsKey((int)entity)) { diff --git a/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs b/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs index 4c062dab..bad05e20 100644 --- a/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs +++ b/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs @@ -43,23 +43,8 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Battle if (req.AssistMonsterEntityIdList.Count > 0) { - List hitTargetEntityIdList = new List(); - if (req.HitTargetEntityIdList.Count > 0) - { - foreach (uint id in req.HitTargetEntityIdList) - { - hitTargetEntityIdList.Add(id); - } - } - else - { - foreach (uint id in req.AssistMonsterEntityIdList) - { - hitTargetEntityIdList.Add(id); - } - } // Start battle - connection.Player!.BattleManager!.StartBattle(req, mazeSkill!, [.. hitTargetEntityIdList]); + connection.Player!.BattleManager!.StartBattle(req, mazeSkill!); } else {