From 0dbd6af8f41fd1a2941c228a49f7fb56f11122e1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 29 Sep 2021 15:28:43 +0800 Subject: [PATCH] 1 --- server/gameserver/matchteam.cc | 1 + server/tools/protobuild/cs_proto.proto | 1 + 2 files changed, 2 insertions(+) diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index 10c2712..3bb6057 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -235,6 +235,7 @@ void MatchTeam::SyncMatchInfo() } notifymsg.mutable_info()->set_phase(phase_); notifymsg.mutable_info()->set_countdown(phase_left_time_); + notifymsg.mutable_info()->set_predict_time(MetaMgr::Instance()->match_team_time); for (auto& member : curr_member_hash_) { if (member->socket_handle != 0) { GGListener::Instance()->SendToClient(member->socket_handle, 0, notifymsg); diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 00c4f2c..e285e87 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -890,6 +890,7 @@ message MFMatchInfo repeated MFMatchTeamMember members = 1; //成员列表 optional int32 phase = 2; //阶段 1:合并队伍(匹配中) 2：选择角色 3:锁定（已准备） optional int32 countdown = 3; //倒计时(单位秒) + optional int32 predict_time = 4; //预计时间(单位秒) } //end mfmsg