From 8aa1eb88e775afb0f4368bb0f24e4787a586f619 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 21 Aug 2020 18:03:07 +0800
Subject: [PATCH 1/2] 1

---
 server/bin/restart.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/bin/restart.sh b/server/bin/restart.sh
index b28b301..ed91ac0 100755
--- a/server/bin/restart.sh
+++ b/server/bin/restart.sh
@@ -3,7 +3,8 @@
 source /etc/profile
 source /root/.bash_profile
 
-pid=`ps -ef|grep 'gameserver2004 -n 1 -i 1'|grep -v grep|awk '{print $2}'`
+echo "gameserver2004 -n $2 -i $1"
+pid=$(ps -ef|grep "gameserver2004 -n $2 -i $1"|grep -v grep|awk '{print $2}')
 echo $pid
 
 if [[ $pid != "" ]]
@@ -13,4 +14,4 @@ else
     echo "pid 为空"
 fi
 
-nohup ./gameserver2004 -n $1 -i $2 >> gameserver2004$2_$1.out &
+nohup ./gameserver2004 -n $2 -i $1 >> gameserver2004$2_$1.out &

From a1e6db3f9149baea68a4020e77e0400361a21ddf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 25 Aug 2020 14:03:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/metamgr.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 9fa2f55..35f448d 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -95,18 +95,20 @@ public:
     {
         if (!f8::IsOnlineEnv()) {
             if (f8::IsTestEnv()) {
-                res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.test/res/",
+                res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.test/res%d/",
                                       {
                                        GAME_ID,
                                        App::Instance()->instance_id,
-                                       GAME_ID
+                                       GAME_ID,
+                                       App::Instance()->instance_id
                                       });
             } else {
-                res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.dev/res/",
+                res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.dev/res%d/",
                                       {
                                        GAME_ID,
                                        App::Instance()->instance_id,
-                                       GAME_ID
+                                       GAME_ID,
+                                       App::Instance()->instance_id
                                       });
             }
         } else {