diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 2f0233b..c419ed6 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -1,7 +1,7 @@ project(gameserver) cmake_minimum_required(VERSION 2.8) -set(GAME_ID 2004) +set(GAME_ID 2005) if (${RELEASE}) set(CMAKE_BUILD_TYPE "Release") diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 331938b..d1f273d 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2526,33 +2526,22 @@ void Human::SendBattleReport() }; std::string url; if (!f8::IsOnlineEnv()) { - if (App::Instance()->HasFlag(3)) { - url = "http://192.168.100.41/webapp/index.php?c=Role&a=battleReport"; - } else { - if (JsonDataMgr::Instance()->channel != 0) { - url = a8::Format("http://game2004api-test.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", - { - JsonDataMgr::Instance()->channel - }); - } else { - url = "https://game2004api-test.kingsome.cn/webapp/index.php?c=Role&a=battleReport"; - } - } + url = "http://game2005api-test.kingsome.cn/webapp/index.php?c=Role&a=battleReport"; } else { if (JsonDataMgr::Instance()->channel != 0) { if (kTouTiaoChannelId == JsonDataMgr::Instance()->channel) { - url = a8::Format("http://game2004api-al.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", + url = a8::Format("http://game2005api-al.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", { - JsonDataMgr::Instance()->channel - }); + JsonDataMgr::Instance()->channel + }); } else { - url = a8::Format("http://game2004api.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", + url = a8::Format("http://game2005api.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", { - JsonDataMgr::Instance()->channel - }); + JsonDataMgr::Instance()->channel + }); } } else { - url = "http://game2004api.kingsome.cn/webapp/index.php?c=Role&a=battleReport"; + url = "http://game2005api.kingsome.cn/webapp/index.php?c=Role&a=battleReport"; } } std::string data; diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index d901f24..27b2903 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -95,7 +95,7 @@ static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times) void RoomMgr::Init() { InstallReportStateTimer(); - gm_hash_["6001_2004_oTR6b5d0UzpqJ1w-QbdUawWimgz0"] = 1; + gm_hash_["6001_2005_oTR6b5d0UzpqJ1w-QbdUawWimgz0"] = 1; } void RoomMgr::UnInit()