server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename 2005->2006

Browse Source
This commit is contained in:
aozhiwei 2021-12-21 16:21:12 +08:00
parent 6a2355c730
commit 93ab2d0b5c
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/bin/real_start_instance.sh
View File

@ -3,7 +3,7 @@
source /etc/profile source /etc/profile
source /root/.bash_profile source /root/.bash_profile
./gameserver2005 -n $1 -i $2 >> gameserver2005$2_$1.out ./gameserver2006 -n $1 -i $2 >> gameserver2006$2_$1.out
echo $? >> start.log echo $? >> start.log
date >> start.log date >> start.log
echo $1 $2 >> start.log echo $1 $2 >> start.log

4
server/bin/restart.sh
View File

@ -3,7 +3,7 @@
source /etc/profile source /etc/profile
source /root/.bash_profile source /root/.bash_profile
pid=$(ps -ef|grep "gameserver2005 -n $2 -i $1"|grep -v grep|awk '{print $2}') pid=$(ps -ef|grep "gameserver2006 -n $2 -i $1"|grep -v grep|awk '{print $2}')
echo $pid echo $pid
if [[ $pid != "" ]] if [[ $pid != "" ]]
@ -13,4 +13,4 @@ else
echo "pid 为空" echo "pid 为空"
fi fi
nohup ./gameserver2005 -n $2 -i $1 >> gameserver2005$2_$1.out & nohup ./gameserver2006 -n $2 -i $1 >> gameserver2006$2_$1.out &

2
server/gameserver/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project(gameserver) project(gameserver)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(GAME_ID 2005) set(GAME_ID 2006)
if (${RELEASE}) if (${RELEASE})
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")

2
server/gameserver/app.cc
View File

@ -193,7 +193,7 @@ bool App::Init(int argc, char* argv[])
srand(time(nullptr)); srand(time(nullptr));
InitLog(); InitLog();
#ifdef DEBUG #ifdef DEBUG
TraceMgr::Instance()->Init("gameserver2005"); TraceMgr::Instance()->Init("gameserver2006");
#endif #endif
PerfMonitor::Instance()->Init(); PerfMonitor::Instance()->Init();
HandlerMgr::Instance()->Init(); HandlerMgr::Instance()->Init();

10
server/gameserver/human.cc
View File

@ -2075,28 +2075,28 @@ void Human::SendBattleReport()
std::string url; std::string url;
if (!f8::IsOnlineEnv()) { if (!f8::IsOnlineEnv()) {
if (JsonDataMgr::Instance()->channel != 0) { if (JsonDataMgr::Instance()->channel != 0) {
url = a8::Format("http://game2005api-test.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", url = a8::Format("http://game2006api-test.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport",
{ {
JsonDataMgr::Instance()->channel JsonDataMgr::Instance()->channel
}); });
} else { } else {
url = "https://game2005api-test.kingsome.cn/webapp/index.php?c=Role&a=battleReport"; url = "https://game2006api-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://game2005api-al.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", url = a8::Format("http://game2006api-al.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport",
{ {
JsonDataMgr::Instance()->channel JsonDataMgr::Instance()->channel
}); });
} else { } else {
url = a8::Format("http://game2005api.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport", url = a8::Format("http://game2006api.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport",
{ {
JsonDataMgr::Instance()->channel JsonDataMgr::Instance()->channel
}); });
} }
} else { } else {
url = "http://game2005api.kingsome.cn/webapp/index.php?c=Role&a=battleReport"; url = "http://game2006api.kingsome.cn/webapp/index.php?c=Role&a=battleReport";
} }
} }
JsonDataMgr::Instance()->GetBattleReportUrl(url); JsonDataMgr::Instance()->GetBattleReportUrl(url);

2
server/gameserver/matchteam.cc
View File

@ -32,7 +32,7 @@ void RawTeamMember::InitRobot()
{ {
static long long robot_idx = 1000; static long long robot_idx = 1000;
msg.set_account_id(a8::Format("6000_2005_%d", {++robot_idx})); msg.set_account_id(a8::Format("6000_2006_%d", {++robot_idx}));
{ {
std::set<int> refreshed_robot_set; std::set<int> refreshed_robot_set;
robot_meta = MetaMgr::Instance()->RandRobot(refreshed_robot_set); robot_meta = MetaMgr::Instance()->RandRobot(refreshed_robot_set);

2
server/tools/robot/virtualclient/metamgr.py
View File

@ -36,7 +36,7 @@ class MapThing(object):
self.explosion_hit =_readInt(headers, row, 'explosion_hit') self.explosion_hit =_readInt(headers, row, 'explosion_hit')
def load(): def load():
baseDir = '../../../../../conf_test/game2005/gameserver.dev/res1/' baseDir = '../../../../../conf_test/game2006/gameserver.dev/res1/'
with open(baseDir + 'mapThing@mapThing.csv') as f: with open(baseDir + 'mapThing@mapThing.csv') as f:
csvReader = csv.reader(f) csvReader = csv.reader(f)
headers = next(csvReader) headers = next(csvReader)