server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-03-18 20:53:43 +08:00
parent 7c27125a5d
commit ea20fcbf97
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/gameserver/roommgr.cc
View File

@ -346,27 +346,34 @@ std::shared_ptr<Room> RoomMgr::GetJoinableRoom(std::shared_ptr<CustomBattle> p)
for (int i = 0; i < RoomType_Max; ++i) {
group_rooms.push_back(std::vector<std::shared_ptr<Room>>());
}
#if 0
for (auto& pair : inactive_room_hash_) {
auto& room = pair.second;
if (!room->GetCustomBattle() &&
room->CanJoin(msg.account_id(),
self_room_type,
(RoomMode_e)msg.room_mode(),
proto_version,
channel,
msg.mapid(),
msg)) {
if (!msg.team_uuid().empty() && room->HaveMyTeam(msg.team_uuid())) {
room->CanJoin(p)) {
group_rooms.at(room->GetRoomType()).push_back(room);
}
}
if (!group_rooms.at(p->GetRoomType()).empty()) {
return group_rooms[p->GetRoomType()][rand() % group_rooms[p->GetRoomType()].size()];
}
if (p->GetRoomType() == kPvpRankMode) {
} else {
if (p->GetRoomType() == RoomType_OldBrid2) {
for (auto& room : group_rooms[RoomType_OldBrid3]) {
if (room->GetGasInactiveReaminTime() > 8 &&
room->GetPlayerNum() + 8 < room->GetRoomMaxPlayerNum()) {
return room;
}
}
} else if (p->GetRoomType() == RoomType_OldBrid3) {
for (auto& room : group_rooms[RoomType_OldBrid2]) {
if (room->GetGasInactiveReaminTime() > 8 &&
room->GetPlayerNum() + 8 < room->GetRoomMaxPlayerNum()) {
return room;
}
group_rooms[room->GetRoomType()].push_back(room);
}
}
#endif
if (!group_rooms[p->GetRoomType()].empty()) {
return group_rooms[p->GetRoomType()][rand() % group_rooms[p->GetRoomType()].size()];
}
return nullptr;
}