From 057a191b9a63f709751220c2e70b868b195cbefa Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 13 Dec 2021 11:14:02 +0800 Subject: [PATCH] 1 --- server/gameserver/metadata.h | 7 ------- server/gameserver/metamgr.cc | 23 ----------------------- server/gameserver/metamgr.h | 2 -- server/tools/protobuild/cs_proto.proto | 9 +++++---- server/tools/protobuild/metatable.proto | 16 +++++++--------- 5 files changed, 12 insertions(+), 45 deletions(-) diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h index 89feb22..b8a89ac 100644 --- a/server/gameserver/metadata.h +++ b/server/gameserver/metadata.h @@ -138,13 +138,6 @@ namespace MetaData int RandDrop(); }; - struct PlayerSkin - { - const metatable::PlayerSkin* i = nullptr; - - void Init(); - }; - struct Robot { const metatable::Robot* i = nullptr; diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index f531658..83abe84 100644 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -153,8 +153,6 @@ public: std::list equip_list; std::list player_meta_list; std::list player_list; - std::list playerskin_meta_list; - std::list playerskin_list; std::list mapthing_meta_list; std::list mapthing_list; std::list building_meta_list; @@ -203,7 +201,6 @@ public: std::map equip_hash; std::map equip_slot_hash; std::map player_hash; - std::map playerskin_hash; std::map mapthing_hash; std::map building_hash; std::map drop_hash; @@ -260,7 +257,6 @@ public: f8::ReadCsvMetaFile(res_path + "buff@buff.csv", buff_meta_list); f8::ReadCsvMetaFile(res_path + "equip@equip.csv", equip_meta_list); f8::ReadCsvMetaFile(res_path + "player@player.csv", player_meta_list); - f8::ReadCsvMetaFile(res_path + "playerskin@playerskin.csv", playerskin_meta_list); f8::ReadCsvMetaFile(res_path + "mapThing@mapThing.csv", mapthing_meta_list); f8::ReadCsvMetaFile(res_path + "drop@drop.csv", drop_meta_list); f8::ReadCsvMetaFile(res_path + "airdrop@airdrop.csv", airdrop_meta_list); @@ -763,13 +759,6 @@ private: player_hash[item.i->id()] = &item; } - for (auto& meta : playerskin_meta_list) { - MetaData::PlayerSkin& item = a8::FastAppend(playerskin_list); - item.i = &meta; - item.Init(); - playerskin_hash[item.i->id()] = &item; - } - for (auto& meta : mapthing_meta_list) { MetaData::MapThing& item = a8::FastAppend(mapthing_list); item.i = &meta; @@ -968,18 +957,6 @@ MetaData::Player* MetaMgr::GetPlayer(int id) return itr != loader_->player_hash.end() ? itr->second : nullptr; } -MetaData::PlayerSkin* MetaMgr::GetPlayerSkin(int id) -{ - auto itr = loader_->playerskin_hash.find(id); - return itr != loader_->playerskin_hash.end() ? itr->second : nullptr; -} - -std::shared_ptr> MetaMgr::GetHeroSkins(int hero_id) -{ - std::shared_ptr> p; - return p; -} - MetaData::Equip* MetaMgr::GetEquip(int id) { auto itr = loader_->equip_hash.find(id); diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index ee7ed95..9026c98 100644 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -25,8 +25,6 @@ class MetaMgr : public a8::Singleton std::list* GetMaps(); MetaData::MapThing* GetMapThing(int mapthing_id); MetaData::Player* GetPlayer(int id); - MetaData::PlayerSkin* GetPlayerSkin(int id); - std::shared_ptr> GetHeroSkins(int hero_id); MetaData::Equip* GetEquip(int id); MetaData::Equip* GetEquipBySlotId(int slot_id); MetaData::EquipUpgrade* GetEquipUpgrade(int equip_id); diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 0ee6a1f..eddb7d5 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -645,7 +645,7 @@ message MFTeamData optional int64 user_value3 = 33; //对应好友系统的user_value3 optional int64 guild_id = 34; //公会id optional int32 vip_lv = 35 [default = 0]; //等级 - optional int32 head = 36 [default = 0]; //头像框 + optional int32 head_frame = 36 [default = 0]; //头像框 optional int32 sex = 37 [default = 0]; //性别 } @@ -739,7 +739,7 @@ message MFPlayerStats optional int32 rescue_guild_member = 23; //救起公会成员次数 optional int32 vip_lv = 35 [default = 0]; //等级 - optional int32 head = 36 [default = 0]; //头像框 + optional int32 head_frame = 36 [default = 0]; //头像框 optional int32 sex = 37 [default = 0]; //性别 optional int32 charid = 38; //人物id optional int32 team_id = 39; //tamid @@ -885,7 +885,7 @@ message MFMatchTeamMember repeated MFPair skill_list = 7; //技能列表 key:技能id value:预留给之后扩展,目前传0就行 optional bool is_leader = 8; //是否队长 optional int32 state = 9; //0:准备 1:已准备 - optional int32 head = 10; //头像框 + optional int32 head_frame = 10; //头像框 repeated int32 baseskin = 11; //皮肤id optional int32 hero_skin = 12; //英雄皮肤 } @@ -938,7 +938,7 @@ message CMJoin optional int64 user_value3 = 33; //对应好友系统的user_value3 optional int64 guild_id = 34; //公会id optional int32 vip_lv = 35 [default = 0]; //等级 - optional int32 head = 36 [default = 0]; //头像框 + optional int32 head_frame = 36 [default = 0]; //头像框 optional int32 sex = 37 [default = 0]; //性别 optional bool force_entry_newbie_room = 50; //是否强制进新手房 repeated MFTeamMember team_members = 51; //包括自己 @@ -947,6 +947,7 @@ message CMJoin repeated MFPair skill_list = 54; //技能列表 key:技能id value:预留给之后扩展,目前传0就行 optional string user_data = 60 [default = ""]; //用户自定义数据 optional int32 hero_id = 61; //英雄id + repeated MFPair talent_list = 64; //天赋列表 key:天赋id value:天赋等级 /* 是否显示队伍界面(回传getSwitch返回的结果) 1:显示队伍界面 diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 13b5b8a..1b7a06f 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -118,7 +118,13 @@ message SafeAreaPos message Item { - optional int32 id = 1; //道具id + optional int32 id = 1; + optional int32 type = 2; + optional int32 sub_type = 3; + optional int32 quality = 4; + optional int32 use = 5; + optional int32 skinid = 6; + optional int32 isdefaultskin = 7; } message Equip @@ -230,14 +236,6 @@ message Player optional int32 skinlist = 48; } -message PlayerSkin -{ - optional int32 id = 1; - optional int32 itemid = 2; - optional int32 playerid = 3; - optional int32 skinid = 4; -} - message Robot { optional int32 id = 1;