diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index b3a4539..6f08a0f 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -49,6 +49,7 @@ public: std::list killpoint_list; std::list robot_meta_list; std::vector robot_list; + std::list text_meta_list; std::map parameter_hash; std::map gamemap_hash; @@ -72,6 +73,7 @@ public: std::map equipupgrade_hash; std::map robot_hash; std::map> airline_hash; + std::map text_hash; void Load() { @@ -115,6 +117,7 @@ public: f8::ReadCsvMetaFile(res_path + "rankPoint@rankPoint.csv", rankpoint_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 + "text@text.csv", text_meta_list); BindToMetaData(); #if 1 { @@ -310,6 +313,10 @@ private: robot_hash[meta.id()] = &item; } + for (auto& meta : text_meta_list) { + text_hash[meta.textid()] = meta.text(); + } + } private: @@ -496,3 +503,9 @@ MetaData::Robot* MetaMgr::GetRobot(int robot_id) auto itr = loader_->robot_hash.find(robot_id); return itr != loader_->robot_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; +} diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index ebba418..20a6057 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -42,6 +42,7 @@ class MetaMgr : public a8::Singleton int GetKillPointParam2(int kill_num); std::vector* GetRobotList(); MetaData::Robot* GetRobot(int robot_id); + std::string GetText(const std::string& textid, const std::string& def_text); int gas_inactive_time = 10; int jump_time = 10; diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index d664b7f..b21b334 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -190,6 +190,12 @@ message KillPoint optional int32 parameter2 = 3; } +message Text +{ + optional string textid = 1; + optional string text = 2; +} + //end message DoorObjJson