From afbecc0c95b290568a5bba024da080ca748d83a5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 14 Aug 2020 21:54:41 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E6=9C=8D?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/app.cc         | 5 +++--
 server/gameserver/jsondatamgr.cc | 3 +++
 server/gameserver/jsondatamgr.h  | 2 +-
 server/gameserver/metamgr.cc     | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index 6aea47e..bdfc594 100755
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -143,11 +143,12 @@ bool App::Init(int argc, char* argv[])
     PlayerMgr::Instance()->Init();
     GGListener::Instance()->Init();
 
-    a8::UdpLog::Instance()->Info("gameserver starting instance_id:%d pid:%d debug_mode:%d",
+    a8::UdpLog::Instance()->Info("gameserver starting instance_id:%d pid:%d debug_mode:%d channel:%d",
                                  {
                                   instance_id,
                                   getpid(),
-                                  debug_mode
+                                  debug_mode,
+                                  JsonDataMgr::Instance()->channel
                                  });
     {
         int perf_log_time = 1000 * 30;
diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc
index ff19a58..ccd4abd 100644
--- a/server/gameserver/jsondatamgr.cc
+++ b/server/gameserver/jsondatamgr.cc
@@ -34,6 +34,9 @@ void JsonDataMgr::Init()
     gameserver_cluster_json_.ReadFromFile(gameserver_cluster_json_file);
     ip = GetConf()->At("ip")->AsXValue().GetString();
     listen_port = GetConf()->At("listen_port")->AsXValue();
+    if (GetConf()->HasKey("channel")) {
+        channel = GetConf()->At("channel")->AsXValue();
+    }
     server_info = a8::Format("%s:%d", {ip, listen_port});
     Reload();
 }
diff --git a/server/gameserver/jsondatamgr.h b/server/gameserver/jsondatamgr.h
index 37a254e..ffd259a 100644
--- a/server/gameserver/jsondatamgr.h
+++ b/server/gameserver/jsondatamgr.h
@@ -15,7 +15,7 @@ public:
 
     std::string ip;
     int listen_port = 0;
-
+    int channel = 0;
     std::string server_info;
 
     void Reload();
diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 72fc810..fadbcf0 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -7,6 +7,7 @@
 
 #include "metamgr.h"
 #include "app.h"
+#include "jsondatamgr.h"
 
 #define METAMGR_READ(field_name, def_val) MetaMgr::Instance()->field_name = \
         a8::XValue(MetaMgr::Instance()->GetSysParamAsString(#field_name, #def_val));
@@ -111,6 +112,9 @@ public:
         } else {
             res_path = "../res/";
         }
+        if (JsonDataMgr::Instance()->channel != 0) {
+            res_path = a8::Format("%s%d", {res_path, JsonDataMgr::Instance()->channel});
+        }
 
         f8::ReadCsvMetaFile(res_path + "parameter@parameter.csv", parameter_meta_list);
         f8::ReadCsvMetaFile(res_path + "map@map.csv", map_meta_list);

From a6ac990ec00d4cfc93aa189296615e1c9f7d5786 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 14 Aug 2020 21:59:38 +0800
Subject: [PATCH 02/17] 1

---
 server/gameserver/roommgr.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 07f0a27..a6fb3a1 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -166,6 +166,15 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
     hum->ProcPrepareItems2(msg.prepare_items2());
     room->AddPlayer(hum);
     PlayerMgr::Instance()->IncAccountNum(msg.account_id());
+    if (JsonDataMgr::Instance()->channel != 0 &&
+        JsonDataMgr::Instance()->channel != channel) {
+        a8::UdpLog::Instance()->Warning
+            ("join room channel not match channel:%d account_id:%s",
+             {
+              JsonDataMgr::Instance()->channel,
+              msg.account_id()
+             });
+    }
 }
 
 void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)

From 3d4c1e9d27fb1844af268a6c3bbd9822dcbb3973 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 18 Aug 2020 20:17:41 +0800
Subject: [PATCH 03/17] 1

---
 server/gameserver/metamgr.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index fadbcf0..7a62638 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -113,7 +113,7 @@ public:
             res_path = "../res/";
         }
         if (JsonDataMgr::Instance()->channel != 0) {
-            res_path = a8::Format("%s%d", {res_path, JsonDataMgr::Instance()->channel});
+            res_path = a8::Format("%s%d/", {res_path, JsonDataMgr::Instance()->channel});
         }
 
         f8::ReadCsvMetaFile(res_path + "parameter@parameter.csv", parameter_meta_list);

From 4cec94f747ed7cd4cac1a2ce7e180da2184acd31 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 19 Aug 2020 19:42:59 +0800
Subject: [PATCH 04/17] 1

---
 server/gameserver/metamgr.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 7a62638..9fa2f55 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -112,9 +112,6 @@ public:
         } else {
             res_path = "../res/";
         }
-        if (JsonDataMgr::Instance()->channel != 0) {
-            res_path = a8::Format("%s%d/", {res_path, JsonDataMgr::Instance()->channel});
-        }
 
         f8::ReadCsvMetaFile(res_path + "parameter@parameter.csv", parameter_meta_list);
         f8::ReadCsvMetaFile(res_path + "map@map.csv", map_meta_list);

From 1fdd2c3ff43a3e48f036309f35e01c67f58822cd Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 19 Aug 2020 19:45:37 +0800
Subject: [PATCH 05/17] 1

---
 server/gameserver/roommgr.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index a6fb3a1..c51ab1a 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -385,6 +385,7 @@ void RoomMgr::ReportServerState(int instance_id, const std::string& host, int po
     url_params->SetVal("port", JsonDataMgr::Instance()->listen_port);
     url_params->SetVal("online_num", PlayerMgr::Instance()->OnlineNum());
     url_params->SetVal("room_num", RoomNum());
+    url_params->SetVal("channel", JsonDataMgr::Instance()->channel);
     url_params->SetVal("alive_count", PerfMonitor::Instance()->real_alive_count);
     url_params->SetVal("servicing", App::Instance()->servicing ? 1 : 0);
     f8::HttpClientPool::Instance()->HttpGet(a8::XParams()

From 2fab34b404272523b67c454e2a433bfd43f5d864 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 19 Aug 2020 20:12:18 +0800
Subject: [PATCH 06/17] 1

---
 server/gameserver/jsondatamgr.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc
index ccd4abd..4e81bcc 100644
--- a/server/gameserver/jsondatamgr.cc
+++ b/server/gameserver/jsondatamgr.cc
@@ -47,10 +47,13 @@ void JsonDataMgr::UnInit()
 
 std::shared_ptr<a8::XObject> JsonDataMgr::GetConf()
 {
-    if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > gameserver_cluster_json_.Size()) {
-        abort();
+    for (int i = 0; i < gameserver_cluster_json_.Size(); ++i) {
+        std::shared_ptr<a8::XObject> conf = gameserver_cluster_json_.At(i);
+        if (conf->At("instance_id")->AsXValue().GetInt() == App::Instance()->instance_id) {
+            return conf;
+        }
     }
-    return gameserver_cluster_json_[App::Instance()->instance_id - 1];
+    abort();
 }
 
 std::shared_ptr<a8::XObject> JsonDataMgr::GetMasterServerClusterConf()

From 4546e3ec20bf2236c8e69a8681d5dfe8ebd274be Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 20 Aug 2020 13:22:10 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=A4=B4=E6=9D=A1=E4=B8=8D=E6=8E=89?=
 =?UTF-8?q?=E8=90=BD=E6=97=B6=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/constant.h   |  3 ++-
 server/gameserver/human.cc     | 18 ++++++++++++++++--
 server/gameserver/human.h      |  1 +
 server/gameserver/playermgr.cc |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index e407b20..26210d6 100755
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -324,7 +324,8 @@ enum ColliderTag_e
 
 enum GameChannel_e
 {
-    kWxChannelId = 6001
+    kWxChannelId = 6001,
+    kTouTiaoChannelId = 6006
 };
 
 const char* const PROJ_NAME_FMT = "game%d_gameserver";
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 22024c5..6b1ee5e 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2436,6 +2436,20 @@ void Human::GenZbModeBattleReportData(a8::MutableXObject* params)
 
 void Human::DeadDrop()
 {
+    auto SkinCanDrop =
+        [this] (Skin* skin) -> bool
+        {
+            #ifdef DEBUG
+            return false;
+            #else
+            if (JsonDataMgr::Instance()->channel == kTouTiaoChannelId) {
+                return false;
+            } else {
+                return skin->skin_id != 0;
+            }
+            #endif
+        };
+
     if (GetRace() == kHumanRace && !HasBuffEffect(kBET_Terminator)) {
         for (auto& weapon : weapons) {
             if (weapon.weapon_id != 0 && weapon.weapon_id != default_weapon.weapon_id) {
@@ -2449,7 +2463,7 @@ void Human::DeadDrop()
     }
     {
         Skin* old_skin = GetSkinByIdx(kSkinSlot_HAT);
-        if (old_skin && old_skin->skin_id != 0) {
+        if (old_skin && old_skin->skin_id != 0 && SkinCanDrop(old_skin)) {
             a8::Vec2 dir = a8::Vec2::UP;
             dir.Rotate(a8::RandAngle());
             room->CreateLoot(old_skin->skin_id, GetPos() + dir * (40 + rand() % 50), 1, 1);
@@ -2458,7 +2472,7 @@ void Human::DeadDrop()
     }
     {
         Skin* old_skin = GetSkinByIdx(kSkinSlot_CLOTH);
-        if (old_skin && old_skin->skin_id != 0) {
+        if (old_skin && old_skin->skin_id != 0 && SkinCanDrop(old_skin)) {
             a8::Vec2 dir = a8::Vec2::UP;
             dir.Rotate(a8::RandAngle());
             room->CreateLoot(old_skin->skin_id, GetPos() + dir * (40 + rand() % 50), 1, 1);
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 0d5ae22..d2cbed4 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -44,6 +44,7 @@ class Human : public MoveableEntity
     bool auto_fill = false;
     int today_enter_times = 0;
     int account_registertime = 0;
+    int channel = 0;
     MetaData::Player* meta = nullptr;
     MetaData::Equip* helmet_meta = nullptr;
     MetaData::Equip* chest_meta = nullptr;
diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc
index 5e8a40a..5218bda 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -63,6 +63,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum,
     hum->today_enter_times = msg.today_enter_times();
     hum->create_tick = a8::XGetTickCount();
     hum->account_registertime = f8::ExtractRegisterTimeFromSessionId(msg.session_id());
+    hum->channel = f8::ExtractChannelIdFromAccountId(msg.account_id());
     hum->atk_add = msg.atk_add();
     hum->emoji1 = msg.emoji1();
     hum->emoji2 = msg.emoji2();

From d40e904b0add3d7c423bb242c4c14a6f28db3538 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 20 Aug 2020 15:45:31 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=A4=B4=E6=9D=A1=E7=89=88=E4=BC=AA?=
 =?UTF-8?q?=E8=A3=85=E6=97=A0=E9=99=90=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/player.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 7457e5a..2d8d4cc 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -284,6 +284,9 @@ void Player::UpdateUseItemId()
     MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquip(use_item_id);
     if (item_meta && item_meta->i->equip_type() == EQUIP_TYPE_CAMOUFLAGE) {
         int item_num = GetItemNum(use_item_id);
+        if (JsonDataMgr::Instance()->channel == kTouTiaoChannelId) {
+            item_num = 1;
+        }
         if (item_num > 0) {
             MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(item_meta->i->buffid());
             if (buff_meta && !GetBuffById(item_meta->i->buffid())) {

From 41787f8d597634a8744f8b3f970af4787b5ca38a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 20 Aug 2020 15:47:54 +0800
Subject: [PATCH 09/17] 1

---
 server/gameserver/player.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 2d8d4cc..245de3c 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -287,6 +287,11 @@ void Player::UpdateUseItemId()
         if (JsonDataMgr::Instance()->channel == kTouTiaoChannelId) {
             item_num = 1;
         }
+        #ifdef DEBUG
+        if (channel == kTouTiaoChannelId) {
+            item_num = 1;
+        }
+        #endif
         if (item_num > 0) {
             MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(item_meta->i->buffid());
             if (buff_meta && !GetBuffById(item_meta->i->buffid())) {

From 47e21123191b7d7eca7e1f2949c8128d695b3156 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 20 Aug 2020 16:59:34 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=A0=E9=81=93=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/human.cc | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 6b1ee5e..ddcdb43 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -23,6 +23,7 @@
 #include "buff.h"
 #include "roomobstacle.h"
 #include "aicomponent.h"
+#include "jsondatamgr.h"
 
 #include "framework/cpp/utils.h"
 #include "framework/cpp/httpclientpool.h"
@@ -2528,10 +2529,24 @@ void Human::SendBattleReport()
         if (App::Instance()->HasFlag(3)) {
             url = "http://192.168.100.41/webapp/index.php?c=Role&a=battleReport";
         } else {
-            url = "https://game2004api-test.kingsome.cn/webapp/index.php?c=Role&a=battleReport";
+            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 {
-        url = "http://game2004api.kingsome.cn/webapp/index.php?c=Role&a=battleReport";
+        if (JsonDataMgr::Instance()->channel != 0) {
+            url = a8::Format("http://game2004api.kingsome.cn/%d/webapp/index.php?c=Role&a=battleReport",
+                             {
+                                 JsonDataMgr::Instance()->channel
+                             });
+        } else {
+            url = "http://game2004api.kingsome.cn/webapp/index.php?c=Role&a=battleReport";
+        }
     }
     std::string data;
     params->ToUrlEncodeStr(data);

From cdf4acffd0225c876437f7335f779a00f056393b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Aug 2020 11:15:03 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E5=99=A8?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/metadata.cc           | 4 ++--
 server/tools/protobuild/metatable.proto | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc
index 9035774..4d9a06e 100644
--- a/server/gameserver/metadata.cc
+++ b/server/gameserver/metadata.cc
@@ -104,8 +104,8 @@ namespace MetaData
         }
         {
             std::vector<std::string> strings;
-            if (!i->spera_type().empty()) {
-                a8::Split(i->spera_type(), strings, '|');
+            if (!i->spera_attr().empty()) {
+                a8::Split(i->spera_attr(), strings, '|');
             } else {
                 a8::Split(i->attr_type(), strings, '|');
             }
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index 9ff3ce9..112126c 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -104,7 +104,7 @@ message EquipUpgrade
 {
     optional int32 id = 1;
     optional string attr_type = 4;
-    optional string spera_type = 5;
+    optional string spera_attr = 5;
 }
 
 message Player

From cde2d860c08f205e5501205346f074282c361d94 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Aug 2020 15:43:09 +0800
Subject: [PATCH 12/17] 1

---
 server/gameserver/room.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index e26e8da..1aab7f1 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2731,7 +2731,8 @@ void Room::AddPlayerPostProc(Player* hum)
          {
              Human* hum = (Human*)param.sender.GetUserData();
              std::string debugmsg = a8::Format("weapon_id:%d weapon_lv:%d atk:%f fire_rate:%f "
-                                               "volume:%d maxhp:%f curr_hp:%f",
+                                               "volume:%d maxhp:%f hp:%f curr_hp:%f curr_max_hp:%f "
+                                               "base_reload_time:%f grow_reload_time:%f finaly_reload_time:%f",
                                                {
                                                 hum->curr_weapon->weapon_id,
                                                 hum->curr_weapon->weapon_lv,
@@ -2739,7 +2740,14 @@ void Room::AddPlayerPostProc(Player* hum)
                                                 hum->curr_weapon->GetAttrValue(kHAT_FireRate),
                                                 hum->curr_weapon->GetAttrValue(kHAT_Volume),
                                                 hum->curr_weapon->GetAttrValue(kHAT_MaxHp),
-                                                hum->GetHP()
+                                                hum->curr_weapon->GetAttrValue(kHAT_Hp),
+                                                hum->GetHP(),
+                                                hum->GetMaxHP(),
+                                                hum->curr_weapon->meta->i->reload_time(),
+                                                hum->curr_weapon->GetUpgradeMeta() ?
+                                                hum->curr_weapon->GetUpgradeMeta()->GetAttrValue
+                                                (hum->curr_weapon->weapon_lv, kHAT_ReloadTime) : 0,
+                                                hum->curr_weapon->GetAttrValue(kHAT_ReloadTime)
                                                });
              hum->SendDebugMsg(debugmsg);
          },

From 9a5d7b7ae239bb04a2ff0bdef68d668ef6799982 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 21 Aug 2020 16:57:35 +0800
Subject: [PATCH 13/17] 1

---
 server/bin/restart.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 server/bin/restart.sh

diff --git a/server/bin/restart.sh b/server/bin/restart.sh
new file mode 100755
index 0000000..b28b301
--- /dev/null
+++ b/server/bin/restart.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+source /etc/profile
+source /root/.bash_profile
+
+pid=`ps -ef|grep 'gameserver2004 -n 1 -i 1'|grep -v grep|awk '{print $2}'`
+echo $pid
+
+if [[ $pid != "" ]]
+then
+    echo $pid|xargs kill -9
+else
+    echo "pid 为空"
+fi
+
+nohup ./gameserver2004 -n $1 -i $2 >> gameserver2004$2_$1.out &

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 14/17] 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 15/17] =?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 {

From 8d64947cec93e0ce90a93962e9ec294d039d3efb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 25 Aug 2020 14:23:24 +0800
Subject: [PATCH 16/17] 1

---
 server/bin/restart.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/bin/restart.sh b/server/bin/restart.sh
index b28b301..069e591 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 'gameserver2004 -n 1 -i 1'|grep -v grep|awk '{print $2}'`
+pid=`ps -ef|grep 'gameserver2004 -n $1 -i $2'|grep -v grep|awk '{print $2}'`
 echo $pid
 
 if [[ $pid != "" ]]

From 1f8ed08d7660d90cc4909633b2c1ff2784e313b6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 25 Aug 2020 14:31:41 +0800
Subject: [PATCH 17/17] 1

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

diff --git a/server/bin/restart.sh b/server/bin/restart.sh
index 069e591..b0b4343 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 'gameserver2004 -n $1 -i $2'|grep -v grep|awk '{print $2}'`
+pid=$(ps -ef|grep "gameserver2004 -n $2 -i $1"|grep -v grep|awk '{print $2}')
 echo $pid
 
 if [[ $pid != "" ]]
@@ -13,4 +13,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 &