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-12-13 11:14:02 +08:00
parent c8261ea620
commit 057a191b9a
5 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/metadata.h
View File

@ -138,13 +138,6 @@ namespace MetaData
int RandDrop();
};
struct PlayerSkin
{
const metatable::PlayerSkin* i = nullptr;
void Init();
};
struct Robot
{
const metatable::Robot* i = nullptr;

23
server/gameserver/metamgr.cc
View File

@ -153,8 +153,6 @@ public:
std::list<MetaData::Equip> equip_list;
std::list<metatable::Player> player_meta_list;
std::list<MetaData::Player> player_list;
std::list<metatable::PlayerSkin> playerskin_meta_list;
std::list<MetaData::PlayerSkin> playerskin_list;
std::list<metatable::MapThing> mapthing_meta_list;
std::list<MetaData::MapThing> mapthing_list;
std::list<metatable::BuildingJson> building_meta_list;
@ -203,7 +201,6 @@ public:
std::map<int, MetaData::Equip*> equip_hash;
std::map<int, MetaData::Equip*> equip_slot_hash;
std::map<int, MetaData::Player*> player_hash;
std::map<int, MetaData::PlayerSkin*> playerskin_hash;
std::map<int, MetaData::MapThing*> mapthing_hash;
std::map<int, MetaData::Building*> building_hash;
std::map<int, MetaData::Drop*> 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<std::vector<MetaData::PlayerSkin*>> MetaMgr::GetHeroSkins(int hero_id)
{
std::shared_ptr<std::vector<MetaData::PlayerSkin*>> p;
return p;
}
MetaData::Equip* MetaMgr::GetEquip(int id)
{
auto itr = loader_->equip_hash.find(id);

2
server/gameserver/metamgr.h
View File

@ -25,8 +25,6 @@ class MetaMgr : public a8::Singleton<MetaMgr>
std::list<MetaData::Map>* GetMaps();
MetaData::MapThing* GetMapThing(int mapthing_id);
MetaData::Player* GetPlayer(int id);
MetaData::PlayerSkin* GetPlayerSkin(int id);
std::shared_ptr<std::vector<MetaData::PlayerSkin*>> GetHeroSkins(int hero_id);
MetaData::Equip* GetEquip(int id);
MetaData::Equip* GetEquipBySlotId(int slot_id);
MetaData::EquipUpgrade* GetEquipUpgrade(int equip_id);

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

@ -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:显示队伍界面

16
server/tools/protobuild/metatable.proto
View File

@ -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;