From 00c5c72a0a8c3c907fae64ba0bc7c4335e6ba45c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 27 May 2022 12:52:49 +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 b5137462..c69d4ad4 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -122,6 +122,7 @@ void MatchTeam::_CMMatchChoose(f8::MsgHdr& hdr, const cs::CMMatchChoose& msg) auto member = GetMemberBySocket(hdr.socket_handle); if (member && master_team_->phase_ == kMatchChoose) { member->msg->set_hero_id(msg.hero_id()); + member->msg->set_hero_uniid(msg.hero_uniid()); *member->msg->mutable_weapons() = msg.weapons(); *member->msg->mutable_skins() = msg.skins(); *member->msg->mutable_skill_list() = msg.skill_list(); diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 068703e1..67ab9ae6 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -1151,6 +1151,7 @@ message CMMatchChoose repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行 repeated int32 baseskin = 5; //皮肤id optional int32 hero_skin = 6; //头像框 + optional string hero_uniid = 7; //英雄唯一id } //组队匹配-出击