From 9a7a3ce94bf366fd51b48f3830fd3ac494bf189e Mon Sep 17 00:00:00 2001 From: WatchAndyTW Date: Tue, 9 Jul 2024 16:41:28 +0800 Subject: [PATCH] It's challenge improvement once again --- GameServer/Game/Challenge/ChallengeInstance.cs | 3 +-- .../Recv/Challenge/HandlerStartChallengeCsReq.cs | 14 ++------------ .../Send/Challenge/PacketGetChallengeScRsp.cs | 3 --- .../Send/Challenge/PacketStartChallengeScRsp.cs | 1 - 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/GameServer/Game/Challenge/ChallengeInstance.cs b/GameServer/Game/Challenge/ChallengeInstance.cs index 33cbb889..efdb8bed 100644 --- a/GameServer/Game/Challenge/ChallengeInstance.cs +++ b/GameServer/Game/Challenge/ChallengeInstance.cs @@ -5,13 +5,12 @@ using EggLink.DanhengServer.Game.Battle; using EggLink.DanhengServer.Game.Player; using EggLink.DanhengServer.Game.Scene; using EggLink.DanhengServer.Game.Scene.Entity; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Challenge; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Server.Packet.Send.Challenge; using EggLink.DanhengServer.Server.Packet.Send.Lineup; using EggLink.DanhengServer.Util; using System.Text.Json.Serialization; -using System.Text.RegularExpressions; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Challenge; namespace EggLink.DanhengServer.Game.Challenge { diff --git a/GameServer/Server/Packet/Recv/Challenge/HandlerStartChallengeCsReq.cs b/GameServer/Server/Packet/Recv/Challenge/HandlerStartChallengeCsReq.cs index b2f7a6ec..c1915f06 100644 --- a/GameServer/Server/Packet/Recv/Challenge/HandlerStartChallengeCsReq.cs +++ b/GameServer/Server/Packet/Recv/Challenge/HandlerStartChallengeCsReq.cs @@ -23,22 +23,12 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Battle if (req.TeamOne.Count > 0) { - List team = new(); - foreach (int id in req.TeamOne) - { - team.Add((int)id); - }; - connection.Player!.LineupManager!.ReplaceLineup(0, team, ExtraLineupType.LineupChallenge); + connection.Player!.LineupManager!.ReplaceLineup(0, req.TeamOne.Select(x => (int)x).ToList(), ExtraLineupType.LineupChallenge); } if (req.TeamTwo.Count > 0) { - List team = new(); - foreach (int id in req.TeamTwo) - { - team.Add((int)id); - }; - connection.Player!.LineupManager!.ReplaceLineup(0, team, ExtraLineupType.LineupChallenge2); + connection.Player!.LineupManager!.ReplaceLineup(0, req.TeamTwo.Select(x => (int)x).ToList(), ExtraLineupType.LineupChallenge2); } connection.Player!.ChallengeManager!.StartChallenge((int)req.ChallengeId, storyBuffInfo, bossBuffInfo); diff --git a/GameServer/Server/Packet/Send/Challenge/PacketGetChallengeScRsp.cs b/GameServer/Server/Packet/Send/Challenge/PacketGetChallengeScRsp.cs index 21a29478..c23b35a7 100644 --- a/GameServer/Server/Packet/Send/Challenge/PacketGetChallengeScRsp.cs +++ b/GameServer/Server/Packet/Send/Challenge/PacketGetChallengeScRsp.cs @@ -15,9 +15,6 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Battle foreach (var challengeExcel in GameData.ChallengeConfigData.Values) { - // Skip Apocalyptic Shadow - if (challengeExcel.ID > 30000) continue; - if (player.ChallengeManager!.ChallengeData.History.ContainsKey(challengeExcel.ID)) { var history = player.ChallengeManager!.ChallengeData.History[challengeExcel.ID]; diff --git a/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs b/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs index 33c1788e..ea76b695 100644 --- a/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs +++ b/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs @@ -24,7 +24,6 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Challenge if (player.ChallengeManager!.ChallengeInstance != null) { proto.CurChallenge = player.ChallengeManager.ChallengeInstance.ToProto(); - proto.Scene = player.SceneInstance!.ToProto(); proto.LineupList.Add(player.LineupManager!.GetExtraLineup(ExtraLineupType.LineupChallenge)!.ToProto()); proto.LineupList.Add(player.LineupManager!.GetExtraLineup(ExtraLineupType.LineupChallenge2)!.ToProto()); }