This commit is contained in:
aozhiwei 2023-12-28 13:44:03 +08:00
parent 0e3777a477
commit 2ae6a19c74

View File

@ -2256,10 +2256,19 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
moba_teams.size() > 2) { moba_teams.size() > 2) {
abort(); abort();
} }
for (size_t i = 0; i < moba_teams.size(); ++i) { std::vector<std::shared_ptr<Team>> room_teams;
{
auto new_team = NewTeam(); auto new_team = NewTeam();
new_team->SetInitTeamMemberNum(moba_teams.at(i)->GetMemberNum()); new_team->SetInitTeamMemberNum(0);
new_team->SetAutoFill(true); new_team->SetAutoFill(true);
}
{
auto new_team = NewTeam();
new_team->SetInitTeamMemberNum(0);
new_team->SetAutoFill(true);
}
for (size_t i = 0; i < moba_teams.size(); ++i) {
auto new_team = room_teams.at(i);
moba_teams.at(i)->TraverseMember moba_teams.at(i)->TraverseMember
( (
[ip_saddr, socket_handle, msg, p, new_team] (std::shared_ptr<MobaMember> m) -> bool [ip_saddr, socket_handle, msg, p, new_team] (std::shared_ptr<MobaMember> m) -> bool
@ -2298,7 +2307,6 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
hum->ProcSkillList(); hum->ProcSkillList();
hum->SetHP(hum->GetBattleContext()->GetMaxHP()); hum->SetHP(hum->GetBattleContext()->GetMaxHP());
hum->SetMaxHP(hum->GetHP()); hum->SetMaxHP(hum->GetHP());
//member->Join(hum);
PlayerMgr::Instance()->IncAccountNum(msg->account_id()); PlayerMgr::Instance()->IncAccountNum(msg->account_id());
RoomMgr::Instance()->OnJoinRoomOk(*msg, hum); RoomMgr::Instance()->OnJoinRoomOk(*msg, hum);
new_team->AddMember(hum); new_team->AddMember(hum);