This commit is contained in:
aozhiwei 2023-07-20 14:34:36 +08:00
parent 8b46efd124
commit 662ffe6879

View File

@ -292,18 +292,21 @@ Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg,
if (!group_rooms[self_room_type].empty()) { if (!group_rooms[self_room_type].empty()) {
return group_rooms[self_room_type][rand() % group_rooms[self_room_type].size()]; return group_rooms[self_room_type][rand() % group_rooms[self_room_type].size()];
} }
if (self_room_type == RoomType_OldBrid2) { if (msg.room_mode() == kPvpRankMode) {
for (auto& room : group_rooms[RoomType_OldBrid3]) { } else {
if (room->GetGasInactiveReaminTime() > 8 && if (self_room_type == RoomType_OldBrid2) {
room->GetPlayerNum() + 8 < room->GetRoomMaxPlayerNum()) { for (auto& room : group_rooms[RoomType_OldBrid3]) {
return room; if (room->GetGasInactiveReaminTime() > 8 &&
room->GetPlayerNum() + 8 < room->GetRoomMaxPlayerNum()) {
return room;
}
} }
} } else if (self_room_type == RoomType_OldBrid3) {
} else if (self_room_type == RoomType_OldBrid3) { for (auto& room : group_rooms[RoomType_OldBrid2]) {
for (auto& room : group_rooms[RoomType_OldBrid2]) { if (room->GetGasInactiveReaminTime() > 8 &&
if (room->GetGasInactiveReaminTime() > 8 && room->GetPlayerNum() + 8 < room->GetRoomMaxPlayerNum()) {
room->GetPlayerNum() + 8 < room->GetRoomMaxPlayerNum()) { return room;
return room; }
} }
} }
} }