A301/a301_mmo_game_server
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

feat : 보스맵 종료후 -> 로비 맵 이동 처리

Browse Source
This commit is contained in:
qornwh1
2026-03-17 14:28:39 +09:00
parent 1c63b8532f
commit 9a155fa056
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MMOTestServer/MMOserver/Game/GameServer.cs
View File

@@ -964,10 +964,24 @@ public class GameServer : ServerBase
} }
int oldMapId = player.CurrentMapId; int oldMapId = player.CurrentMapId;
int newMapId = packet.MapId;
if (!channel.ChangeMap(hashKey, player, packet.MapId)) // 일단 보스맵에서 로비로 원복할떄 캐싱해둔 걸로 교체
if (newMapId == -1)
{ {
Log.Warning("[GameServer] CHANGE_MAP 유효하지 않은 맵 HashKey={Key} MapId={MapId}", hashKey, packet.MapId); if (player.PreviousMapId > 0)
{
// 레이드 맵 사용 종료 처리
channel.RemoveInstanceMap(oldMapId);
newMapId = player.PreviousMapId;
player.PreviousMapId = 0;
}
}
if (!channel.ChangeMap(hashKey, player, newMapId))
{
Log.Warning("[GameServer] CHANGE_MAP 유효하지 않은 맵 HashKey={Key} MapId={MapId}", hashKey, newMapId);
return; return;
} }
@@ -978,12 +992,12 @@ public class GameServer : ServerBase
BroadcastToMap(channelId, oldMapId, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, exitNotify)); BroadcastToMap(channelId, oldMapId, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, exitNotify));
// 새 맵 유저들에게 입장 알림 (본인 제외) // 새 맵 유저들에게 입장 알림 (본인 제외)
ChangeMapPacket enterNotify = new() { MapId = packet.MapId, IsAdd = true, Player = playerInfo }; ChangeMapPacket enterNotify = new() { MapId = newMapId, IsAdd = true, Player = playerInfo };
BroadcastToMap(channelId, packet.MapId, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, enterNotify), peer); BroadcastToMap(channelId, newMapId, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, enterNotify), peer);
// 본인에게 새 맵 플레이어 목록 전달 // 본인에게 새 맵 플레이어 목록 전달
ChangeMapPacket response = new() { MapId = packet.MapId }; ChangeMapPacket response = new() { MapId = newMapId };
AMap? newMap = channel.GetMap(packet.MapId); AMap? newMap = channel.GetMap(newMapId);
if (newMap != null) if (newMap != null)
{ {
foreach ((int uid, Player p) in newMap.GetUsers()) foreach ((int uid, Player p) in newMap.GetUsers())
@@ -998,7 +1012,7 @@ public class GameServer : ServerBase
} }
SendTo(peer, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, response)); SendTo(peer, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, response));
Log.Debug("[GameServer] CHANGE_MAP HashKey={Key} OldMap={OldMapId} NewMap={MapId}", hashKey, oldMapId, packet.MapId); Log.Debug("[GameServer] CHANGE_MAP HashKey={Key} OldMap={OldMapId} NewMap={MapId}", hashKey, oldMapId, newMapId);
} }
private void OnPartyChangeMap(NetPeer peer, int hashKey, byte[] payload) private void OnPartyChangeMap(NetPeer peer, int hashKey, byte[] payload)