From 72db3ca30b6895b00532e228eeb78221db3a13f6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 28 Sep 2021 12:03:13 +0000
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc         | 2 +-
 server/tools/protobuild/cs_proto.proto | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index e09e93f..ae77ef3 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -237,7 +237,7 @@ void MatchTeam::UpdateMaster()
                     }
                 }
             }
-            if (phase_left_time_ <= 0) {
+            if (phase_left_time_ <= MetaMgr::Instance()->match_lock_time) {
                 for (int i = 0; i < 4; ++i) {
                     AutoChoose(true);
                 }
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index e78786c..be898de 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -881,6 +881,7 @@ message MFMatchTeamMember
     optional int32 state = 9; //0:准备 1:已准备
     optional int32 head = 10; //头像框
     repeated int32 baseskin = 11; //皮肤id
+    optional int32 hero_skin = 12; //英雄皮肤
 }
 
 //该消息每秒同步
@@ -1110,6 +1111,7 @@ message CMMatchChoose
     repeated MFSkin skins = 3; //皮肤列表 key: 皮肤id value:皮肤等级
     repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行
     repeated int32 baseskin = 5; //皮肤id
+    optional int32 hero_skin = 6; //头像框
 }
 
 //组队匹配-出击