1
This commit is contained in:
parent
2ad0ec33d3
commit
496918e59d
@ -1,7 +1,7 @@
|
|||||||
project(gameserver)
|
project(gameserver)
|
||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
set(GAME_ID 2004)
|
set(GAME_ID 2005)
|
||||||
|
|
||||||
if (${RELEASE})
|
if (${RELEASE})
|
||||||
set(CMAKE_BUILD_TYPE "Release")
|
set(CMAKE_BUILD_TYPE "Release")
|
||||||
|
@ -2526,33 +2526,22 @@ void Human::SendBattleReport()
|
|||||||
};
|
};
|
||||||
std::string url;
|
std::string url;
|
||||||
if (!f8::IsOnlineEnv()) {
|
if (!f8::IsOnlineEnv()) {
|
||||||
if (App::Instance()->HasFlag(3)) {
|
url = "http://game2005api-test.kingsome.cn/webapp/index.php?c=Role&a=battleReport";
|
||||||
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";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (JsonDataMgr::Instance()->channel != 0) {
|
if (JsonDataMgr::Instance()->channel != 0) {
|
||||||
if (kTouTiaoChannelId == JsonDataMgr::Instance()->channel) {
|
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 {
|
} 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 {
|
} 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;
|
std::string data;
|
||||||
|
@ -95,7 +95,7 @@ static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times)
|
|||||||
void RoomMgr::Init()
|
void RoomMgr::Init()
|
||||||
{
|
{
|
||||||
InstallReportStateTimer();
|
InstallReportStateTimer();
|
||||||
gm_hash_["6001_2004_oTR6b5d0UzpqJ1w-QbdUawWimgz0"] = 1;
|
gm_hash_["6001_2005_oTR6b5d0UzpqJ1w-QbdUawWimgz0"] = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RoomMgr::UnInit()
|
void RoomMgr::UnInit()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user