From fb7d3d868f3f388240f2e4e9f40bdb62e05ae8ca Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 Jun 2020 19:32:44 +0800 Subject: [PATCH] 1 --- server/masterserver/CMakeLists.txt | 6 ++++-- server/masterserver/jsondatamgr.cc | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/masterserver/CMakeLists.txt b/server/masterserver/CMakeLists.txt index 0ef465d..a7f419d 100644 --- a/server/masterserver/CMakeLists.txt +++ b/server/masterserver/CMakeLists.txt @@ -1,6 +1,8 @@ project(friend_masterserver) cmake_minimum_required(VERSION 2.8) +set(GAME_ID 9003) + if (${RELEASE}) set(CMAKE_BUILD_TYPE "Release") message("release mode") @@ -8,8 +10,8 @@ else() set(CMAKE_BUILD_TYPE "Debug") message("debug mode") endif() -set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG -DGAME_ID=${GAME_ID} ") +set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG -DGAME_ID=${GAME_ID} ") include_directories( AFTER diff --git a/server/masterserver/jsondatamgr.cc b/server/masterserver/jsondatamgr.cc index 14ae7d5..a27f775 100644 --- a/server/masterserver/jsondatamgr.cc +++ b/server/masterserver/jsondatamgr.cc @@ -10,13 +10,15 @@ void JsonDataMgr::Init() std::string masterserver_cluster_json_file; if (!f8::IsOnlineEnv()) { if (f8::IsTestEnv()) { - work_path_ = a8::Format("/root/pub/friend/%d/conf_test/friend/masterserver.test", + work_path_ = a8::Format("/root/pub/%d/%d/conf_test/friend/masterserver.test", { + GAME_ID, App::Instance()->instance_id, }); } else { - work_path_ = a8::Format("/root/pub/friend/%d/conf_test/friend/masterserver.dev", + work_path_ = a8::Format("/root/pub/%d/%d/conf_test/friend/masterserver.dev", { + GAME_ID, App::Instance()->instance_id, }); }