This commit is contained in:
aozhiwei 2021-09-07 11:51:19 +00:00
parent 3c77e04f00
commit 06c4cfe198

View File

@ -1379,11 +1379,9 @@ void Room::MatchTeam(Human* hum)
void Room::CombineTeam() void Room::CombineTeam()
{ {
#if 0
if (MetaMgr::Instance()->prebattle_combine_team) { if (MetaMgr::Instance()->prebattle_combine_team) {
return; return;
} }
#endif
std::map<int, size_t> need_combine_teams; std::map<int, size_t> need_combine_teams;
std::map<int, size_t> need_combine_teams_copy; std::map<int, size_t> need_combine_teams_copy;