From 93ab2d0b5c5b465da972a82ddba15eae282bc005 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 21 Dec 2021 16:21:12 +0800
Subject: [PATCH] rename 2005->2006

---
 server/bin/real_start_instance.sh           |  2 +-
 server/bin/restart.sh                       |  4 ++--
 server/gameserver/CMakeLists.txt            |  2 +-
 server/gameserver/app.cc                    |  2 +-
 server/gameserver/human.cc                  | 10 +++++-----
 server/gameserver/matchteam.cc              |  2 +-
 server/tools/robot/virtualclient/metamgr.py |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/bin/real_start_instance.sh b/server/bin/real_start_instance.sh
index 68b0ba45..557ffefe 100755
--- a/server/bin/real_start_instance.sh
+++ b/server/bin/real_start_instance.sh
@@ -3,7 +3,7 @@
 source /etc/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
 date >> start.log
 echo $1 $2 >> start.log
diff --git a/server/bin/restart.sh b/server/bin/restart.sh
index 26a4d027..5e26e34e 100755
--- a/server/bin/restart.sh
+++ b/server/bin/restart.sh
@@ -3,7 +3,7 @@
 source /etc/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
 
 if [[ $pid != "" ]]
@@ -13,4 +13,4 @@ else
     echo "pid 为空"
 fi
 
-nohup ./gameserver2005 -n $2 -i $1 >> gameserver2005$2_$1.out &
+nohup ./gameserver2006 -n $2 -i $1 >> gameserver2006$2_$1.out &
diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt
index f99896e7..f011b5a5 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 2005)
+set(GAME_ID 2006)
 
 if (${RELEASE})
   set(CMAKE_BUILD_TYPE "Release")
diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index 8bfe7ffc..4ca1d481 100644
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -193,7 +193,7 @@ bool App::Init(int argc, char* argv[])
     srand(time(nullptr));
     InitLog();
 #ifdef DEBUG
-    TraceMgr::Instance()->Init("gameserver2005");
+    TraceMgr::Instance()->Init("gameserver2006");
 #endif
     PerfMonitor::Instance()->Init();
     HandlerMgr::Instance()->Init();
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 826bc271..35f91525 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2075,28 +2075,28 @@ void Human::SendBattleReport()
     std::string url;
     if (!f8::IsOnlineEnv()) {
         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
                              });
         } 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 {
         if (JsonDataMgr::Instance()->channel != 0) {
             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
                                  });
             } 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
                                  });
             }
         } 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);
diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index e1f3a40e..6496571e 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -32,7 +32,7 @@ void RawTeamMember::InitRobot()
 {
     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;
         robot_meta = MetaMgr::Instance()->RandRobot(refreshed_robot_set);
diff --git a/server/tools/robot/virtualclient/metamgr.py b/server/tools/robot/virtualclient/metamgr.py
index 12d10728..a6dbc9fa 100644
--- a/server/tools/robot/virtualclient/metamgr.py
+++ b/server/tools/robot/virtualclient/metamgr.py
@@ -36,7 +36,7 @@ class MapThing(object):
         self.explosion_hit =_readInt(headers, row, 'explosion_hit')
 
 def load():
-    baseDir = '../../../../../conf_test/game2005/gameserver.dev/res1/'
+    baseDir = '../../../../../conf_test/game2006/gameserver.dev/res1/'
     with open(baseDir + 'mapThing@mapThing.csv') as f:
         csvReader = csv.reader(f)
         headers = next(csvReader)