1
This commit is contained in:
parent
3b874413f1
commit
74c4733243
@ -251,7 +251,7 @@ void MatchTeam::SyncMatchInfo()
|
|||||||
{
|
{
|
||||||
cs::SMUpdateMatchInfo notifymsg;
|
cs::SMUpdateMatchInfo notifymsg;
|
||||||
for (auto member : curr_member_hash_) {
|
for (auto member : curr_member_hash_) {
|
||||||
if (member->team == this) {
|
if (phase_ > kMatchCombining || member->team == this) {
|
||||||
member->FillMFMatchTeamMember(notifymsg.mutable_info()->add_members());
|
member->FillMFMatchTeamMember(notifymsg.mutable_info()->add_members());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -317,9 +317,7 @@ void MatchTeam::UpdateMaster()
|
|||||||
CheckPrepare();
|
CheckPrepare();
|
||||||
if ((phase_left_time_ <= MetaMgr::Instance()->match_lock_time) ||
|
if ((phase_left_time_ <= MetaMgr::Instance()->match_lock_time) ||
|
||||||
IsAllPrepare()) {
|
IsAllPrepare()) {
|
||||||
for (int i = 0; i < GetSlotNum(); ++i) {
|
AutoChoose(true);
|
||||||
AutoChoose(true);
|
|
||||||
}
|
|
||||||
for (auto& member : curr_member_hash_) {
|
for (auto& member : curr_member_hash_) {
|
||||||
member->state = kMatchPrepare;
|
member->state = kMatchPrepare;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user