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 2023-04-28 15:59:18 +08:00
parent 99970f916a
commit e8981f141c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/app.cc
View File

@ -176,7 +176,7 @@ bool App::Init(int argc, char* argv[])
mt::MetaMgr::Instance()->Init(); mt::MetaMgr::Instance()->Init();
SelfChecker::Init(); SelfChecker::Init();
EntityFactory::Instance()->Init(); EntityFactory::Instance()->Init();
uuid.SetMachineId((node_id - 1) * MAX_NODE_ID + instance_id); uuid_.SetMachineId((node_id - 1) * MAX_NODE_ID + instance_id);
KillMgr::Instance()->Init(); KillMgr::Instance()->Init();
RoomMgr::Instance()->Init(); RoomMgr::Instance()->Init();
MatchMgr::Instance()->Init(); MatchMgr::Instance()->Init();
@ -498,7 +498,7 @@ bool App::ParseOpt()
long long App::NewUuid() long long App::NewUuid()
{ {
return uuid.Generate(); return uuid_.Generate();
} }
bool App::HasFlag(int flag) bool App::HasFlag(int flag)

3
server/gameserver/app.h
View File

@ -59,7 +59,6 @@ public:
int argc = 0; int argc = 0;
char** argv = nullptr; char** argv = nullptr;
volatile bool terminated = false; volatile bool terminated = false;
a8::uuid::SnowFlake uuid;
public: public:
int instance_id = 0; int instance_id = 0;
@ -82,6 +81,8 @@ private:
std::set<int> flags; std::set<int> flags;
private: private:
a8::uuid::SnowFlake uuid_;
long long last_run_tick_ = 0; long long last_run_tick_ = 0;
std::mutex *loop_mutex_ = nullptr; std::mutex *loop_mutex_ = nullptr;
std::condition_variable *loop_cond_ = nullptr; std::condition_variable *loop_cond_ = nullptr;