server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-09-28 12:03:13 +00:00
parent b24c9c414f
commit 72db3ca30b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/matchteam.cc
View File

@ -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) { for (int i = 0; i < 4; ++i) {
AutoChoose(true); AutoChoose(true);
} }

2
server/tools/protobuild/cs_proto.proto
View File

@ -881,6 +881,7 @@ message MFMatchTeamMember
optional int32 state = 9; //0:准备 1:已准备 optional int32 state = 9; //0:准备 1:已准备
optional int32 head = 10; //头像框 optional int32 head = 10; //头像框
repeated int32 baseskin = 11; //皮肤id repeated int32 baseskin = 11; //皮肤id
optional int32 hero_skin = 12; //英雄皮肤
} }
//该消息每秒同步 //该消息每秒同步
@ -1110,6 +1111,7 @@ message CMMatchChoose
repeated MFSkin skins = 3; //皮肤列表 key: 皮肤id value:皮肤等级 repeated MFSkin skins = 3; //皮肤列表 key: 皮肤id value:皮肤等级
repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行 repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行
repeated int32 baseskin = 5; //皮肤id repeated int32 baseskin = 5; //皮肤id
optional int32 hero_skin = 6; //头像框
} }
//组队匹配-出击 //组队匹配-出击