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

1

Browse Source
This commit is contained in:
aozhiwei 2022-12-16 16:36:21 +08:00
parent 66b0cd9f06
commit e8ca00b86d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/config.cc
View File

@ -2,9 +2,19 @@
#include "config.h" #include "config.h"
#include "f8/utils.h"
#include "metamgr.h"
#define METAMGR_READ(field_name, def_val) Config::Instance()->field_name = \
a8::XValue(Config::Instance()->GetSysParamAsString(#field_name, #def_val));
#define METAMGR_READ_STR(field_name, def_val) Config::Instance()->field_name = \
a8::XValue(Config::Instance()->GetSysParamAsString(#field_name, def_val)).GetString();
void Config::Init() void Config::Init()
{ {
f8::ReadCsvMetaFile(MetaMgr::Instance()->GetResDir() + "parameter@parameter.csv",
parameter_meta_list);
} }
void Config::UnInit() void Config::UnInit()

12
server/gameserver/metamgr.cc
View File

@ -18,12 +18,6 @@
#include "mapmgr.h" #include "mapmgr.h"
#include "mapinstance.h" #include "mapinstance.h"
#define METAMGR_READ(field_name, def_val) MetaMgr::Instance()->field_name = \
a8::XValue(MetaMgr::Instance()->GetSysParamAsString(#field_name, #def_val));
#define METAMGR_READ_STR(field_name, def_val) MetaMgr::Instance()->field_name = \
a8::XValue(MetaMgr::Instance()->GetSysParamAsString(#field_name, def_val)).GetString();
template <typename T> template <typename T>
static bool LoadMetaFile(const std::string& res_path, const std::string& name, std::list<T>& meta_list) static bool LoadMetaFile(const std::string& res_path, const std::string& name, std::list<T>& meta_list)
{ {
@ -150,8 +144,6 @@ static void ParseElemets(const std::string& textid,
class MetaDataLoader class MetaDataLoader
{ {
public: public:
std::list<metatable::Parameter> parameter_meta_list;
std::list<MetaData::Parameter> parameter_list;
std::list<metatable::Map> map_meta_list; std::list<metatable::Map> map_meta_list;
std::list<MetaData::Map> map_list; std::list<MetaData::Map> map_list;
std::list<metatable::SafeArea> safearea_meta_list; std::list<metatable::SafeArea> safearea_meta_list;
@ -205,7 +197,6 @@ public:
std::list<metatable::PveGeminiMode> pve_gemini_mode_meta_list; std::list<metatable::PveGeminiMode> pve_gemini_mode_meta_list;
std::list<metatable::NpcStandard> npc_standard_meta_list; std::list<metatable::NpcStandard> npc_standard_meta_list;
std::map<std::string, MetaData::Parameter*> parameter_hash;
std::map<int, MetaData::Map*> gamemap_hash; std::map<int, MetaData::Map*> gamemap_hash;
std::map<int, MetaData::AirDrop*> airdrop_hash; std::map<int, MetaData::AirDrop*> airdrop_hash;
std::map<int, MetaData::AirRaid*> airraid_hash; std::map<int, MetaData::AirRaid*> airraid_hash;
@ -263,7 +254,6 @@ public:
res_path = "../res/"; res_path = "../res/";
} }
LoadMetaFile(res_path, "parameter@parameter", parameter_meta_list);
LoadMetaFile(res_path, "map@map", map_meta_list); LoadMetaFile(res_path, "map@map", map_meta_list);
LoadMetaFile(res_path, "safearea@safearea", safearea_meta_list); LoadMetaFile(res_path, "safearea@safearea", safearea_meta_list);
LoadMetaFile(res_path, "safearea_pos@safearea_pos", safearea_pos_meta_list); LoadMetaFile(res_path, "safearea_pos@safearea_pos", safearea_pos_meta_list);
@ -647,12 +637,14 @@ private:
void BindToMetaData() void BindToMetaData()
{ {
#if 0
for (auto& meta : parameter_meta_list) { for (auto& meta : parameter_meta_list) {
MetaData::Parameter& item = a8::FastAppend(parameter_list); MetaData::Parameter& item = a8::FastAppend(parameter_list);
item.pb = &meta; item.pb = &meta;
item.Init(); item.Init();
parameter_hash[item.pb->param_name()] = &item; parameter_hash[item.pb->param_name()] = &item;
} }
#endif
{ {
for (auto& meta : map_meta_list) { for (auto& meta : map_meta_list) {