From a9f3d4fe120b8319e477fdda0ae6fcfa38a22741 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 28 Sep 2021 14:03:58 +0800 Subject: [PATCH] 1 --- server/gameserver/matchteam.cc | 12 +++++++++++- server/gameserver/matchteam.h | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index 2af0512..7abe171 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -199,6 +199,7 @@ void MatchTeam::UpdateMaster() ChooseLeader(); phase_ = kMatchChoose; phase_start_tick_ = a8::XGetTickCount(); + countdown_ = MetaMgr::Instance()->match_choose_time; } } break; @@ -207,12 +208,21 @@ void MatchTeam::UpdateMaster() if (phase_left_time_ <= 0) { phase_ = kMatchLock; phase_start_tick_ = a8::XGetTickCount(); + countdown_ = MetaMgr::Instance()->match_lock_time; } } break; case kMatchLock: { - + if (phase_left_time_ <= 0) { + phase_ = kMatchStartGame; + phase_start_tick_ = a8::XGetTickCount(); + StartGame(); + } + } + break; + case kMatchStartGame: + { } break; default: diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h index 78fa44c..d148577 100644 --- a/server/gameserver/matchteam.h +++ b/server/gameserver/matchteam.h @@ -6,7 +6,8 @@ enum MatchTeamPhase_e { kMatchCombining = 1, kMatchChoose = 2, - kMatchLock = 3 + kMatchLock = 3, + kMatchStartGame = 4 }; enum MatchTeamMember_e