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

修复组队合并问题

Browse Source
This commit is contained in:
aozhiwei 2020-03-31 17:34:10 +08:00
parent 0697a62beb
commit 8131a17b49
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/room.cc
View File

@ -1300,23 +1300,23 @@ void Room::CombineTeam()
need_combine_teams_copy.erase(team_id2); need_combine_teams_copy.erase(team_id2);
} else { } else {
if (pair1.second >= pair2.second) { if (pair1.second >= pair2.second) {
need_combine_teams.erase(team_id2);
need_combine_teams_copy.erase(team_id2);
if (pair1.second + pair2.second >= MAX_TEAM_NUM) { if (pair1.second + pair2.second >= MAX_TEAM_NUM) {
need_combine_teams.erase(team_id1); need_combine_teams.erase(team_id1);
need_combine_teams_copy.erase(team_id1); need_combine_teams_copy.erase(team_id1);
} else { } else {
pair1.second = new_team_num; pair1.second = new_team_num;
} }
need_combine_teams.erase(team_id2);
need_combine_teams_copy.erase(team_id2);
} else { } else {
need_combine_teams.erase(team_id1);
need_combine_teams_copy.erase(team_id1);
if (pair1.second + pair2.second >= MAX_TEAM_NUM) { if (pair1.second + pair2.second >= MAX_TEAM_NUM) {
need_combine_teams.erase(team_id2); need_combine_teams.erase(team_id2);
need_combine_teams_copy.erase(team_id2); need_combine_teams_copy.erase(team_id2);
} else { } else {
pair2.second = new_team_num; pair2.second = new_team_num;
} }
need_combine_teams.erase(team_id1);
need_combine_teams_copy.erase(team_id1);
} }
} }
combine_ok = true; combine_ok = true;