diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 0843e8c7..01f9c30f 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -744,12 +744,14 @@ void Human::FillMFTeamData(Human* hum, cs::MFTeamData* team_data, bool is_game_o room->GetFrameNo() - room->GetBattleStartFrameNo() < 4) { team_data->set_user_data(user_data); } + #if 0 if (HasBuffEffect(kBET_Jump) && GetTeam()) { bool can_follow = hum->CanFollow(this); if (can_follow) { team_data->set_can_follow(can_follow); } } + #endif { for (auto itr : skins) { auto skin = team_data->add_skin(); diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index ac2f650e..b7b4133d 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -24,11 +24,7 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p) } else { p->set_hero_id(msg->hero_id()); *p->mutable_weapons() = msg->weapons(); - #if 0 - *p->mutable_skins() = msg->skins(); - #endif *p->mutable_skill_list() = msg->skill_list(); - *p->mutable_baseskin() = msg->baseskin(); } p->set_is_leader(is_leader); p->set_state(state); @@ -133,14 +129,7 @@ void MatchTeam::_CMMatchChoose(f8::MsgHdr& hdr, const cs::CMMatchChoose& msg) member->msg->set_hero_id(msg.hero_id()); member->msg->set_hero_uniid(msg.hero_uniid()); *member->msg->mutable_weapons() = msg.weapons(); - #if 0 - *member->msg->mutable_skins() = msg.skins(); - #endif *member->msg->mutable_skill_list() = msg.skill_list(); - *member->msg->mutable_baseskin() = msg.baseskin(); - #if 0 - member->msg->set_hero_skin(msg.hero_skin()); - #endif ++member->choose_hero_times; #ifdef DEBUG a8::XPrintf("matchchoose %s\n", {member->msg->account_id()}); diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index ab00148e..ee7d9765 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -111,7 +111,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum, } } #endif - #if 1 + #if 0 { int idx = 0; for (int skin_id : msg.baseskin()) { @@ -119,8 +119,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum, ++idx; } } - #else - hum->SetSkinInfo(msg.baseskin()); #endif #if 0 for (auto& pair : msg.talent_list()) { diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 0e8d82a2..87fff1a6 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -628,7 +628,6 @@ message MFTeamData optional float max_health = 9; //最大血量 optional bool riding = 40 [default = false]; //是否倒 下 optional string user_data = 60 [default = ""]; //用户自定义数据(只同步一次) - optional int32 can_follow = 62 [default = 0]; //是否可跟随 optional int32 score = 63 [default = 0]; //pve模式积分 optional int32 hero_id = 64 [default = 0]; //英雄id(只同步一次) @@ -910,13 +909,10 @@ message MFMatchTeamMember optional string avatar_url = 3; //头像 optional int32 hero_id = 4; //英雄id repeated MFWeapon weapons = 5; //武器列表 - repeated MFSkin skins = 6; //皮肤列表 key: 皮肤id value:皮肤等级 repeated MFPair skill_list = 7; //技能列表 key:技能id value:预留给之后扩展,目前传0就行 optional bool is_leader = 8; //是否队长 optional int32 state = 9; //0:准备 1:已准备 optional int32 head_frame = 10; //头像框 - repeated int32 baseskin = 11; //皮肤id - optional int32 hero_skin = 12; //英雄皮肤 } //该消息每秒同步 @@ -958,7 +954,6 @@ message CMJoin optional bool auto_fill = 6; //是否自动填充玩家 optional string name = 8; //角色名 optional string avatar_url = 11; //头像 - repeated int32 baseskin = 13; //皮肤id repeated MFWeapon weapons = 17; //武器列表 optional string session_id = 20; //session_id optional int32 head_frame = 36 [default = 0]; //头像框 @@ -1106,10 +1101,7 @@ message CMMatchChoose { optional int32 hero_id = 1; //英雄id repeated MFWeapon weapons = 2; //武器列表 - 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; //头像框 optional string hero_uniid = 7; //英雄唯一id }