From 5a3d41487f5866c769d48c4f0da3d1a85830fadf Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 20 Mar 2024 17:15:50 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 10 ++++++++-- server/gameserver/team.h | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index b85a4fb0..0b70974a 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2512,9 +2512,15 @@ void Team::FillMFMobaBattleDataTeam(cs::MFMobaBattleDataTeam* p) }); } -void Team::FillSMTeamFullNotify(cs::SMTeamFullNotify* p) +void Team::FillMFTeamFull(cs::MFTeamFull* p) { - + p->set_team_id(GetTeamId()); + TraverseMembers + ( + [p] (Human* hum) -> bool + { + hum->FillMFTeamMemberNew(p->add_members()); + }); } bool PBUtils::SupportSandTable(int proto_version) diff --git a/server/gameserver/team.h b/server/gameserver/team.h index 97eb49be..1968341d 100644 --- a/server/gameserver/team.h +++ b/server/gameserver/team.h @@ -3,8 +3,8 @@ namespace cs { class MFMobaBattleDataTeam; + class MFTeamFull; class SMGameOver; - class SMTeamFullNotify; } namespace a8 @@ -64,7 +64,7 @@ class Team : public std::enable_shared_from_this long long GetLastKillFrameNo() { return last_kill_frameno_; } bool MemberHasOb(); void FillMFMobaBattleDataTeam(cs::MFMobaBattleDataTeam* p); - void FillSMTeamFullNotify(cs::SMTeamFullNotify* p); + void FillMFTeamFull(cs::MFTeamFull* p); private: int team_id_ = 0;