From 456ac47c8f21489a94c6eb54550bc74c37f2c08e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 20 Sep 2023 16:44:29 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 4 +++- server/gameserver/roommgr.cc | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index aab13f4d..2f3ec159 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1438,9 +1438,11 @@ void Player::PushJoinRoomMsg() { cs::SMMapInfo notifymsg; notifymsg.set_map_id(room->GetMapMeta()->map_id()); + if (proto_version < cs::ProtoVersion) { #if 1 - notifymsg.set_map_id(1001); + notifymsg.set_map_id(1001); #endif + } notifymsg.set_map_width(room->GetMapMeta()->map_width()); notifymsg.set_map_height(room->GetMapMeta()->map_height()); notifymsg.set_room_mode((int)room->GetRoomMode()); diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index b282573f..9782d702 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -810,9 +810,12 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg) { msg->set_force_enter_newbie_room(false); msg->set_pve_instance_id(0); +#ifdef DEBUG +#else if (msg->proto_version() < cs::ProtoVersion) { msg->set_mapid(2001); } +#endif #ifdef DEBUG1 if (DebugCmd::Enable()) { msg->set_room_mode(kPvpRankMode);