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] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E6=9C=8D=E5=A4=84?=
 =?UTF-8?q?=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);