1

server/gameserver/human.cc

@@ -270,8 +270,8 @@ void Human::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data
     if (vip_lv != 0) {
         p->set_vip_lv(vip_lv);
     }
-    if (head != 0) {
+    if (head_frame != 0) {
-        p->set_head(head);
+        p->set_head_frame(head_frame);
     }
     if (sex != 0) {
         p->set_sex(sex);
@@ -400,8 +400,8 @@ void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb)
     if (vip_lv != 0) {
         stats_pb->set_vip_lv(vip_lv);
     }
-    if (head != 0) {
+    if (head_frame != 0) {
-        stats_pb->set_head(head);
+        stats_pb->set_head_frame(head_frame);
     }
     if (sex != 0) {
         stats_pb->set_sex(sex);
@@ -500,8 +500,8 @@ void Human::FillMFTeamData(Human* hum, cs::MFTeamData* team_data, bool is_game_o
         if (vip_lv != 0) {
             team_data->set_vip_lv(vip_lv);
         }
-        if (head != 0) {
+        if (head_frame != 0) {
-            team_data->set_head(head);
+            team_data->set_head_frame(head_frame);
         }
         if (sex != 0) {
             team_data->set_sex(sex);

server/gameserver/human.h

@@ -128,7 +128,7 @@ class Human : public Creature
     long long user_value3 = 0;
     long long guild_id = 0;
     int vip_lv = 0;
-    int head = 0;
+    int head_frame = 0;
     int sex = 0;
     std::string user_data;
     long long last_cmmove_frameno = 0;

server/gameserver/matchteam.cc

@@ -24,7 +24,7 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p)
     }
     p->set_is_leader(is_leader);
     p->set_state(state);
-    p->set_head(msg.head());
+    p->set_head_frame(msg.head_frame());
     p->set_hero_skin(msg.hero_skin());
 }
 
@@ -51,10 +51,12 @@ void RawTeamMember::InitRobot()
             {
                 MetaData::Player* hero_meta = MetaMgr::Instance()->GetPlayer(msg.hero_id());
                 if (hero_meta) {
+                    #if 0
                     MetaData::PlayerSkin* skin_meta = MetaMgr::Instance()->GetPlayerSkin(hero_meta->i->skinlist());
                     if (skin_meta) {
                         msg.set_hero_skin(skin_meta->i->id());
                     }
+                    #endif
                 }
             }
         } else {

server/gameserver/metadata.cc

@@ -642,11 +642,6 @@ namespace MetaData
         return 0;
     }
 
-    void PlayerSkin::Init()
-    {
-
-    }
-
     void Robot::Init()
     {
         {
@@ -1535,4 +1530,9 @@ namespace MetaData
 
     }
 
+    void Item::Init()
+    {
+
+    }
+
 }

server/gameserver/metadata.h

@@ -84,6 +84,8 @@ namespace MetaData
     struct Item
     {
         const metatable::Item* i = nullptr;
+
+        void Init();
     };
 
     struct Buff;

server/gameserver/metamgr.cc

@@ -1201,3 +1201,13 @@ std::vector<std::tuple<int, std::string>>* MetaMgr::GetTextElements(const std::s
     auto itr = loader_->text_element_hash.find(textid);
     return itr != loader_->text_element_hash.end() ? &itr->second : nullptr;
 }
+
+MetaData::Item* MetaMgr::GetItem(int id)
+{
+    return nullptr;
+}
+
+MetaData::Item* MetaMgr::GetHeroSkin(int hero_id)
+{
+    return nullptr;
+}

server/gameserver/metamgr.h

@@ -28,6 +28,8 @@ class MetaMgr : public a8::Singleton<MetaMgr>
     MetaData::Equip* GetEquip(int id);
     MetaData::Equip* GetEquipBySlotId(int slot_id);
     MetaData::EquipUpgrade* GetEquipUpgrade(int equip_id);
+    MetaData::Item* GetItem(int id);
+    MetaData::Item* GetHeroSkin(int id);
     MetaData::Building* GetBuilding(int building_id);
     MetaData::Drop* GetDrop(int drop_id);
     MetaData::SafeArea* GetSafeArea(int area_id);

server/gameserver/playermgr.cc

@@ -83,7 +83,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum,
     hum->user_value3 = msg.user_value3();
     hum->guild_id = msg.guild_id();
     hum->vip_lv = msg.vip_lv();
-    hum->head = msg.head();
+    hum->head_frame = msg.head_frame();
     hum->sex = msg.sex();
     hum->user_data = msg.user_data();
     for (auto& weapon : msg.weapons()) {

server/tools/protobuild/cs_proto.proto

@@ -265,7 +265,7 @@ message MFPlayerFull
     optional int32 killer_id = 33; //杀手id(自杀时为自己) 特殊id: -1:倒在安全区
 
     optional int32 vip_lv = 35 [default = 0]; //vip等级
-    optional int32 head = 36 [default = 0]; //头像框
+    optional int32 head_frame = 36 [default = 0]; //头像框
     optional int32 sex = 37 [default = 0]; //性别
 
     repeated MFSkill skill_list = 38; //技能列表

server/tools/protobuild/metatable.proto

@@ -125,6 +125,7 @@ message Item
     optional int32 use = 5;
     optional int32 skinid = 6;
     optional int32 isdefaultskin = 7;
+    optional int32 playerid = 8;
 }
 
 message Equip