1
This commit is contained in:
parent
78dab46f87
commit
650b9ba773
@ -27,6 +27,7 @@
|
|||||||
#include "gamelog.h"
|
#include "gamelog.h"
|
||||||
#include "asynctaskmgr.h"
|
#include "asynctaskmgr.h"
|
||||||
#include "guildmgr.h"
|
#include "guildmgr.h"
|
||||||
|
#include "metamgr.h"
|
||||||
|
|
||||||
#include "MSConnMgr.h"
|
#include "MSConnMgr.h"
|
||||||
#include "IMConnMgr.h"
|
#include "IMConnMgr.h"
|
||||||
@ -98,6 +99,7 @@ bool App::Init(int argc, char* argv[])
|
|||||||
GameLog::Instance()->Init();
|
GameLog::Instance()->Init();
|
||||||
a8::IoLoop::Instance()->Init(1);
|
a8::IoLoop::Instance()->Init(1);
|
||||||
JsonDataMgr::Instance()->Init();
|
JsonDataMgr::Instance()->Init();
|
||||||
|
MetaMgr::Instance()->Init();
|
||||||
uuid.SetMachineId(instance_id);
|
uuid.SetMachineId(instance_id);
|
||||||
IMConnMgr::Instance()->Init();
|
IMConnMgr::Instance()->Init();
|
||||||
MSConnMgr::Instance()->Init();
|
MSConnMgr::Instance()->Init();
|
||||||
@ -155,6 +157,7 @@ void App::UnInit()
|
|||||||
WSListener::Instance()->UnInit();
|
WSListener::Instance()->UnInit();
|
||||||
IMConnMgr::Instance()->UnInit();
|
IMConnMgr::Instance()->UnInit();
|
||||||
MSConnMgr::Instance()->UnInit();
|
MSConnMgr::Instance()->UnInit();
|
||||||
|
MetaMgr::Instance()->UnInit();
|
||||||
JsonDataMgr::Instance()->UnInit();
|
JsonDataMgr::Instance()->UnInit();
|
||||||
f8::HttpClientPool::Instance()->UnInit();
|
f8::HttpClientPool::Instance()->UnInit();
|
||||||
a8::IoLoop::Instance()->UnInit();
|
a8::IoLoop::Instance()->UnInit();
|
||||||
|
@ -1,3 +1,13 @@
|
|||||||
#include "precompile.h"
|
#include "precompile.h"
|
||||||
|
|
||||||
#include "metadata.h"
|
#include "metadata.h"
|
||||||
|
|
||||||
|
namespace MetaData
|
||||||
|
{
|
||||||
|
|
||||||
|
void Guild::Init()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
@ -7,6 +7,8 @@ namespace MetaData
|
|||||||
struct Guild
|
struct Guild
|
||||||
{
|
{
|
||||||
const metatable::Guild* i = nullptr;
|
const metatable::Guild* i = nullptr;
|
||||||
|
|
||||||
|
void Init();
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -20,13 +20,16 @@
|
|||||||
class MetaDataLoader
|
class MetaDataLoader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
std::map<size_t, std::map<std::string, std::string> > dirty_words;
|
std::list<metatable::Guild> guild_meta_list;
|
||||||
|
std::list<MetaData::Guild> guild_list;
|
||||||
|
|
||||||
|
std::map<int, MetaData::Guild*> guild_hash;
|
||||||
|
|
||||||
void Load()
|
void Load()
|
||||||
{
|
{
|
||||||
if (!f8::IsOnlineEnv()) {
|
if (!f8::IsOnlineEnv()) {
|
||||||
if (f8::IsTestEnv()) {
|
if (f8::IsTestEnv()) {
|
||||||
res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/rankserver.test/res%d/",
|
res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/imserver.test/res%d/",
|
||||||
{
|
{
|
||||||
GAME_ID,
|
GAME_ID,
|
||||||
App::Instance()->instance_id,
|
App::Instance()->instance_id,
|
||||||
@ -34,7 +37,7 @@ public:
|
|||||||
App::Instance()->instance_id
|
App::Instance()->instance_id
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/rankserver.dev/res%d/",
|
res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/imserver.dev/res%d/",
|
||||||
{
|
{
|
||||||
GAME_ID,
|
GAME_ID,
|
||||||
App::Instance()->instance_id,
|
App::Instance()->instance_id,
|
||||||
@ -45,6 +48,9 @@ public:
|
|||||||
} else {
|
} else {
|
||||||
res_path = "../res/";
|
res_path = "../res/";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
f8::ReadCsvMetaFile(res_path + "Clan@Clan.csv", guild_meta_list);
|
||||||
|
BindToMetaData();
|
||||||
Check();
|
Check();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,6 +62,12 @@ private:
|
|||||||
|
|
||||||
void BindToMetaData()
|
void BindToMetaData()
|
||||||
{
|
{
|
||||||
|
for (auto& meta : guild_meta_list) {
|
||||||
|
MetaData::Guild& item = a8::FastAppend(guild_list);
|
||||||
|
item.i = &meta;
|
||||||
|
item.Init();
|
||||||
|
guild_hash[item.i->grade()] = &item;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user