From 6faab45ecc4c6b9679dcbe8d8ea23b59e5f0fb3d Mon Sep 17 00:00:00 2001 From: qornwh1 Date: Mon, 16 Mar 2026 20:36:24 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EB=A0=88=EC=9D=B4=EB=93=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=AA=A8=EB=91=90=EC=97=90=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MMOTestServer/MMOserver/Api/RestApi.cs | 5 ++++- MMOTestServer/MMOserver/Game/GameServer.cs | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/MMOTestServer/MMOserver/Api/RestApi.cs b/MMOTestServer/MMOserver/Api/RestApi.cs index 4de9bfa..7c418ec 100644 --- a/MMOTestServer/MMOserver/Api/RestApi.cs +++ b/MMOTestServer/MMOserver/Api/RestApi.cs @@ -98,7 +98,10 @@ public class RestApi : Singleton response.EnsureSuccessStatusCode(); BossRaidAccessResponse? raw = await response.Content.ReadFromJsonAsync(); - if (raw == null) return null; + if (raw == null) + { + return null; + } // API 응답 → 도메인 모델 매핑 return new BossRaidResult diff --git a/MMOTestServer/MMOserver/Game/GameServer.cs b/MMOTestServer/MMOserver/Game/GameServer.cs index d920875..4318702 100644 --- a/MMOTestServer/MMOserver/Game/GameServer.cs +++ b/MMOTestServer/MMOserver/Game/GameServer.cs @@ -1079,7 +1079,7 @@ public class GameServer : ServerBase BossRaidResult? result = await RestApi.Instance.BossRaidAccesssAsync(userNames, 1); // 입장 실패 - if (result != null) + if (result == null || result.BossId <= 0) { SendTo(peer, PacketSerializer.Serialize((ushort)PacketCode.INTO_BOSS_RAID, @@ -1142,13 +1142,13 @@ public class GameServer : ServerBase } SendTo(memberPeer, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, response)); - } - // 파티장에게 입장 성공 응답 (할당된 실제 레이드 맵 ID 전달) - SendTo(peer, - PacketSerializer.Serialize((ushort)PacketCode.INTO_BOSS_RAID, - new IntoBossRaidPacket - { RaidId = assignedRaidMapId, IsSuccess = true, Session = result.SessionName, Token = result.Tokens })); + // 모두에게 레이드로 이동 (할당된 실제 레이드 맵 ID 전달) + SendTo(peer, + PacketSerializer.Serialize((ushort)PacketCode.INTO_BOSS_RAID, + new IntoBossRaidPacket + { RaidId = assignedRaidMapId, IsSuccess = true, Session = result.SessionName, Token = result.Tokens })); + } Log.Debug("[GameServer] INTO_BOSS_RAID HashKey={Key} PartyId={PartyId} AssignedRaidMapId={RaidId}", hashKey, party.PartyId, assignedRaidMapId);