server/game2004
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加text读取

Browse Source
This commit is contained in:
aozhiwei 2020-10-20 17:09:15 +08:00
parent f24e49355b
commit a1b59166f5
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/metamgr.cc
View File

@ -62,6 +62,7 @@ public:
std::vector<MetaData::Robot> robot_list; std::vector<MetaData::Robot> robot_list;
std::list<metatable::AI> ai_meta_list; std::list<metatable::AI> ai_meta_list;
std::list<MetaData::AI> ai_list; std::list<MetaData::AI> ai_list;
std::list<metatable::Text> text_meta_list;
std::map<std::string, MetaData::Parameter*> parameter_hash; std::map<std::string, MetaData::Parameter*> parameter_hash;
std::map<int, MetaData::Map*> gamemap_hash; std::map<int, MetaData::Map*> gamemap_hash;
@ -90,6 +91,7 @@ public:
std::map<int, MetaData::Robot*> robot_hash; std::map<int, MetaData::Robot*> robot_hash;
std::map<int, std::vector<MetaData::AirLine*>> airline_hash; std::map<int, std::vector<MetaData::AirLine*>> airline_hash;
std::map<int, MetaData::AI*> ai_hash; std::map<int, MetaData::AI*> ai_hash;
std::map<std::string, std::string> text_hash;
void Load() void Load()
{ {
@ -138,6 +140,7 @@ public:
f8::ReadCsvMetaFile(res_path + "equipUpgrade@equipUpgrade.csv", equipupgrade_meta_list); f8::ReadCsvMetaFile(res_path + "equipUpgrade@equipUpgrade.csv", equipupgrade_meta_list);
f8::ReadCsvMetaFile(res_path + "robot@robot.csv", robot_meta_list); f8::ReadCsvMetaFile(res_path + "robot@robot.csv", robot_meta_list);
f8::ReadCsvMetaFile(res_path + "ai@ai.csv", ai_meta_list); f8::ReadCsvMetaFile(res_path + "ai@ai.csv", ai_meta_list);
f8::ReadCsvMetaFile(res_path + "text@text.csv", text_meta_list);
BindToMetaData(); BindToMetaData();
#if 1 #if 1
{ {
@ -616,6 +619,11 @@ private:
item.Init(); item.Init();
ai_hash[a8::MakeInt64(meta.ai_level(), meta.ai_mode())] = &item; ai_hash[a8::MakeInt64(meta.ai_level(), meta.ai_mode())] = &item;
} }
for (auto& meta : text_meta_list) {
text_hash[meta.textid()] = meta.text();
}
} }
private: private:
@ -848,3 +856,9 @@ MetaData::AI* MetaMgr::GetAI(int ai_level, int ai_mode)
auto itr = loader_->ai_hash.find(a8::MakeInt64(ai_level, ai_mode)); auto itr = loader_->ai_hash.find(a8::MakeInt64(ai_level, ai_mode));
return itr != loader_->ai_hash.end() ? itr->second : nullptr; return itr != loader_->ai_hash.end() ? itr->second : nullptr;
} }
std::string MetaMgr::GetText(const std::string& textid, const std::string& def_text)
{
auto itr = loader_->text_hash.find(textid);
return itr != loader_->text_hash.end() ? itr->second : def_text;
}

1
server/gameserver/metamgr.h
View File

@ -48,6 +48,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
int GetKillPointParam2(int kill_num); int GetKillPointParam2(int kill_num);
MetaData::Robot* RandRobot(std::set<int>& refreshed_robot_set); MetaData::Robot* RandRobot(std::set<int>& refreshed_robot_set);
MetaData::AI* GetAI(int ai_level, int ai_mode); MetaData::AI* GetAI(int ai_level, int ai_mode);
std::string GetText(const std::string& textid, const std::string& def_text="");
int gas_inactive_time = 10; int gas_inactive_time = 10;
int newbie_gas_inactive_time = 5; int newbie_gas_inactive_time = 5;

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

@ -271,6 +271,12 @@ message AI
optional int32 ai_mode = 12; optional int32 ai_mode = 12;
} }
message Text
{
optional string textid = 1;
optional string text = 2;
}
//end //end
message DoorObjJson message DoorObjJson