From 0eb19b3a2ce987617503bc2894846fdec8acda72 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 8 Dec 2020 11:20:27 +0800 Subject: [PATCH] 1 --- server/gameserver/roommgr.cc | 6 +++--- server/tools/protobuild/cs_proto.proto | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 3aace70..231e1bb 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -267,7 +267,7 @@ Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg, creator_register_time, proto_version, channel, - msg.map_id()); + msg.mapid()); } if (self_room_type == RT_MidBrid) { return CreateRoom(msg, @@ -276,7 +276,7 @@ Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg, creator_register_time, proto_version, channel, - msg.map_id()); + msg.mapid()); } for (int i = 0; i < RT_Max; ++i) { for (Room* room : group_rooms[i]) { @@ -291,7 +291,7 @@ Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg, creator_register_time, proto_version, channel, - msg.map_id()); + msg.mapid()); } Room* RoomMgr::GetRoomByUuid(long long room_uuid) diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 95ad389..2213c35 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -754,7 +754,7 @@ message CMJoin optional bool force_entry_newbie_room = 50; //是否强制进新手房 repeated MFTeamMember team_members = 51; //包括自己 optional int32 room_mode = 52; //0:吃鸡模式 1:僵尸模式 - optional int32 map_id = 53; //地图id 0:随机地图 + optional int32 mapid = 53; //地图id 0:随机地图 } //断线重连