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-28 15:11:07 +08:00
parent ca9b547686
commit 9bdd7b56dd
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/gameserver/pbutils.cc
View File

@ -2276,31 +2276,34 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
new_team->SetInitTeamMemberNum(0); new_team->SetInitTeamMemberNum(0);
new_team->SetAutoFill(true); new_team->SetAutoFill(true);
} }
cs::CMJoin join_msg = *msg;
for (size_t i = 0; i < moba_teams.size(); ++i) { for (size_t i = 0; i < moba_teams.size(); ++i) {
auto new_team = room_teams.at(i); auto new_team = room_teams.at(i);
new_team->SetInitTeamMemberNum(room_teams.at(i)->GetMemberNum()); new_team->SetInitTeamMemberNum(room_teams.at(i)->GetMemberNum());
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, join_msg, p, new_team] (std::shared_ptr<MobaMember> m) mutable -> bool
{ {
Player* hum = p->GetRoom()->NewPlayer(); Player* hum = p->GetRoom()->NewPlayer();
hum->room = p->GetRoom(); hum->room = p->GetRoom();
hum->proto_version = msg->proto_version(); hum->proto_version = join_msg.proto_version();
#if 0 #if 0
hum->hero_uniid = a8::XValue(msg.hero_uniid()); hum->hero_uniid = a8::XValue(join_msg->hero_uniid());
#endif #endif
hum->battle_uuid = m->GetNetData()->battle_uuid; hum->battle_uuid = m->GetNetData()->battle_uuid;
hum->is_valid_battle = m->GetNetData()->is_valid_battle; hum->is_valid_battle = m->GetNetData()->is_valid_battle;
hum->payload = m->GetNetData()->payload; hum->payload = m->GetNetData()->payload;
#if 1
//msg.set_session_id(member->GetSessionId()); //msg.set_session_id(member->GetSessionId());
//msg.set_team_uuid(team->GetTeamUuid()); //msg.set_team_uuid(team->GetTeamUuid());
#endif
PlayerMgr::Instance()-> PlayerMgr::Instance()->
CreatePlayerByCMJoin(hum, CreatePlayerByCMJoin(hum,
0, 0,
0, 0,
*msg join_msg
); );
hum->meta = mt::Hero::GetById(msg->hero_id()); hum->meta = mt::Hero::GetById(join_msg.hero_id());
if (!hum->meta) { if (!hum->meta) {
hum->meta = mt::Param::s().human_meta; hum->meta = mt::Param::s().human_meta;
} }
@ -2317,8 +2320,8 @@ 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());
PlayerMgr::Instance()->IncAccountNum(msg->account_id()); PlayerMgr::Instance()->IncAccountNum(join_msg.account_id());
RoomMgr::Instance()->OnJoinRoomOk(*msg, hum); RoomMgr::Instance()->OnJoinRoomOk(join_msg, hum);
new_team->AddMember(hum); new_team->AddMember(hum);
return true; return true;
}); });