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 2023-12-06 17:03:47 +08:00
parent b9530e1319
commit e2e579b2e3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/room.cc
View File

@ -3418,15 +3418,22 @@ void Room::ForceOver()
if (team->HasAliveMember()) { if (team->HasAliveMember()) {
alive_teams.push_back(team); alive_teams.push_back(team);
} }
team->HasPlayer();
return true; return true;
}); });
std::sort(alive_teams.begin(), alive_teams.end(), std::sort(alive_teams.begin(), alive_teams.end(),
[] (Team* a, Team *b) -> bool [] (Team* a, Team *b) -> bool
{ {
if (a->HasPlayer() && b->HasPlayer()) {
return a->GetTeamId() < b->GetTeamId();
}
if (a->HasPlayer()) { if (a->HasPlayer()) {
return true; return true;
} }
return false; if (b->HasPlayer()) {
return false;
}
return a->GetTeamId() < b->GetTeamId();
}); });
for (Team* team : alive_teams) { for (Team* team : alive_teams) {
team->TraverseMembers team->TraverseMembers

2
server/robotserver/playermgr.cc
View File

@ -17,7 +17,7 @@
void PlayerMgr::Init() void PlayerMgr::Init()
{ {
for (int i = 1; i <= 40; ++i) { for (int i = 1; i <= 19; ++i) {
int idx = i; int idx = i;
std::string account_id = a8::Format("6513_2006_%d", {idx}); std::string account_id = a8::Format("6513_2006_%d", {idx});
auto hum = std::make_shared<Player>(); auto hum = std::make_shared<Player>();