diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index d1a5378f..13655300 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -840,20 +840,20 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg) return; } #endif -#ifdef MYDEBUG1 +#ifdef MYDEBUG { auto data = a8::MutableXObject::CreateObject(); data->SetVal("zone_id", 1); data->SetVal("node_id", 1); - data->SetVal("room_uuid", App::Instance()->NewUuid()); - data->SetVal("start_time", Global::g_nowtime); + data->SetVal("room_uuid", f8::App::Instance()->NewGlobalUuid()); + data->SetVal("start_time", f8::App::Instance()->GetNowTime()); auto team_list = a8::MutableXObject::CreateArray(); { std::map test_members; test_members[msg->account_id()] = msg->session_id(); auto team = a8::MutableXObject::CreateObject(); auto members = a8::MutableXObject::CreateArray(); - team->SetVal("team_uuid", App::Instance()->NewUuid()); + team->SetVal("team_uuid", f8::App::Instance()->NewGlobalUuid()); for (auto& pair : test_members) { auto member = a8::MutableXObject::CreateObject(); member->SetVal("account_id", pair.first); @@ -868,7 +868,7 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg) test_members[msg->account_id()] = "6513_2006_2"; auto team = a8::MutableXObject::CreateObject(); auto members = a8::MutableXObject::CreateArray(); - team->SetVal("team_uuid", App::Instance()->NewUuid()); + team->SetVal("team_uuid", f8::App::Instance()->NewGlobalUuid()); for (auto& pair : test_members) { auto member = a8::MutableXObject::CreateObject(); member->SetVal("account_id", pair.first);