1

server/masterserver/CMakeLists.txt

@@ -15,14 +15,6 @@ else()
   set(CMAKE_BUILD_TYPE "Debug")
   message("debug mode")
 endif()
-
-if (${LIB_DIR})
-  message(LIB_DIR: ${LIB_DIR})
-else()
-  set(LIB_DIR )
-  message(LIB_DIR: ${LIB_DIR} )
-endif()
-
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DDEBUG")
 
@@ -36,7 +28,6 @@ include_directories(
   /usr/include/glm
   ../../third_party
   ../../third_party/behaviac/inc
-  ../../third_party/recastnavigation/Recast/Include
   ../../third_party/recastnavigation/Detour/Include
   ../../third_party/recastnavigation/DetourTileCache/Include
   .
@@ -45,7 +36,7 @@ include_directories(
 link_directories(
   /usr/lib64/mysql
   /usr/local/lib
-  ../../third_party/behaviac/lib/${LIB_DIR}
+  ../../third_party/behaviac/lib
 )
 
 aux_source_directory(../../third_party/a8engine/a8
@@ -56,10 +47,6 @@ aux_source_directory(../../third_party/framework/cpp
   SRC_LIST
 )
 
-aux_source_directory(../../third_party/recastnavigation/Recast/Source
-  SRC_LIST
-)
-
 aux_source_directory(../../third_party/recastnavigation/Detour/Source
   SRC_LIST
 )
@@ -110,7 +97,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     hiredis
     tinyxml2
     tcmalloc
-    behaviac_gcc_release
+    behaviac_gcc_debug
     )
 else()
   target_link_libraries(

server/masterserver/app.cc

@@ -23,6 +23,7 @@
 
 #include "framework/cpp/msgqueue.h"
 #include "framework/cpp/tglog.h"
+#include "framework/cpp/utils.h"
 
 struct MsgNode
 {
@@ -483,7 +484,25 @@ bool App::IsSeparateChannel(int channel)
 void App::LoadSeparateChannelConfig()
 {
     std::string data;
-    a8::ReadStringFromFile("../config/separate_channels.csv", data);
+    std::string filename = "../config/separate_channels.csv";
+    if (!f8::IsOnlineEnv()) {
+        if (f8::IsTestEnv()) {
+            filename = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.test/separate_channels.csv",
+                                  {
+                                   GAME_ID,
+                                   App::Instance()->instance_id,
+                                   GAME_ID
+                                  });
+        } else {
+            filename = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.dev/separate_channels.csv",
+                                  {
+                                   GAME_ID,
+                                   App::Instance()->instance_id,
+                                   GAME_ID
+                                  });
+        }
+    }
+    a8::ReadStringFromFile(filename, data);
     std::vector<std::string> strings;
     a8::Split(data, strings, ',');
     separate_channel_hash_.clear();
@@ -493,9 +512,10 @@ void App::LoadSeparateChannelConfig()
             separate_channel_hash_.insert(channel);
         }
     }
-    a8::UdpLog::Instance()->Info("LoadSeparateChannelConfig channelids:%s",
+    a8::UdpLog::Instance()->Debug("LoadSeparateChannelConfig %s channelids:%s",
                                  {
-                                     GetSeparateChannelConfigData()
+                                  filename,
+                                  GetSeparateChannelConfigData()
                                  });
 }
 

server/masterserver/error_code.h

@@ -1,13 +0,0 @@
-#pragma once
-
-/*
-  类似http的错误码设计
-  0：成功
-  <400: 客户端的错
-  >500: 服务器的错
-*/
-enum ErrorCode_e
-{
-    ERRNO_OK = 0,
-
-};

server/masterserver/gsmgr.cc

@@ -26,18 +26,8 @@ void GSMgr::UnInit()
 
 void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_RequestTargetServer& msg)
 {
-    int channel = f8::ExtractChannelIdFromAccountId(msg.account_id());
+    int target_channel = GetTargetChannel(msg);
-    if (!App::Instance()->IsSeparateChannel(channel)) {
+
-        channel = 0;
-    }
-    #if 1
-    int src_channel = f8::ExtractChannelIdFromAccountId(msg.account_id());
-    if (channel == 0 &&
-        src_channel == kTouTiaoChannelId &&
-        msg.proto_version() == 2019071502) {
-        channel = src_channel;
-    }
-    #endif
     ss::SS_MS_ResponseTargetServer respmsg;
     respmsg.set_context_id(msg.context_id());
     if (msg.is_reconnect()) {
@@ -51,11 +41,11 @@ void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_Reques
         }
     } else {
         GSNode* node = GetNodeByTeamId(msg.team_id());
-        if (node && node->channel == channel) {
+        if (node && node->channel == target_channel) {
             respmsg.set_host(node->ip);
             respmsg.set_port(node->port);
         } else {
-            node = AllocNode(channel);
+            node = AllocNode(target_channel);
             if (node) {
                 respmsg.set_host(node->ip);
                 respmsg.set_port(node->port);
@@ -198,21 +188,6 @@ GSNode* GSMgr::AllocNode(int channel)
     std::vector<GSNode*>* sorted_nodes = GetSortedNodesByChannel(channel);
     if (sorted_nodes && !sorted_nodes->empty()) {
         size_t rnd = std::min((size_t)2, sorted_nodes->size());
-        if (rnd >= 2) {
-            GSNode* n1 = sorted_nodes->at(sorted_nodes->size() - 1);
-            GSNode* n2 = sorted_nodes->at(sorted_nodes->size() - 2);
-            if (n1->online_num < 100 && n2->online_num < 100) {
-                if (n1->instance_id < n2->instance_id) {
-                    if (n1->servicing) {
-                        return n1;
-                    }
-                } else {
-                    if (n2->servicing) {
-                        return n2;
-                    }
-                }
-            }
-        }
         int idx = rand() % rnd;
         while (idx >= 0) {
             if (sorted_nodes->at(idx)->servicing) {
@@ -329,3 +304,19 @@ void GSMgr::OnChannelChange(GSNode* node)
     RemoveNodeFromSortedNodes(node);
     AddNodeToSortedNodes(node);
 }
+
+int GSMgr::GetTargetChannel(const ss::SS_WSP_RequestTargetServer& msg)
+{
+    int channel = f8::ExtractChannelIdFromAccountId(msg.account_id());
+    if ((channel == 6000 || channel == 0) && !msg.url().empty()) {
+        std::vector<std::string> strings;
+        a8::Split(msg.url(), strings, '/');
+        if (strings.size() > 1) {
+            channel = a8::XValue(strings[1]);
+        }
+    }
+    if (!App::Instance()->IsSeparateChannel(channel)) {
+        channel = 0;
+    }
+    return channel;
+}

server/masterserver/gsmgr.h

@@ -48,6 +48,7 @@ class GSMgr : public a8::Singleton<GSMgr>
     void RemoveNodeFromSortedNodes(GSNode* node);
     std::vector<GSNode*>* GetSortedNodesByChannel(int channel);
     void OnChannelChange(GSNode* node);
+    int GetTargetChannel(const ss::SS_WSP_RequestTargetServer& msg);
 
  private:
 

server/masterserver/jsondatamgr.cc

@@ -10,13 +10,17 @@ void JsonDataMgr::Init()
     std::string masterserver_cluster_json_file;
     if (!f8::IsOnlineEnv()) {
         if (f8::IsTestEnv()) {
-            work_path_ = a8::Format("../../../conf_test/game%d/masterserver.test",
+            work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.test",
                                     {
+                                     GAME_ID,
+                                     App::Instance()->instance_id,
                                      GAME_ID
                                     });
         } else {
-            work_path_ = a8::Format("../../../conf_test/game%d/masterserver.dev",
+            work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.dev",
                                     {
+                                     GAME_ID,
+                                     App::Instance()->instance_id,
                                      GAME_ID
                                     });
         }

server/masterserver/precompile.h

@@ -5,7 +5,6 @@
 
 #include "constant.h"
 #include "types.h"
-#include "error_code.h"
 #include "global.h"
 
 namespace google

server/tools/protobuild/ss_proto.proto

@@ -22,6 +22,9 @@ message SS_WSP_RequestTargetServer
     optional string server_info = 4;
     optional int32 is_reconnect = 5;
     optional int32 proto_version = 6; //协议版本号Constant_e.ProtoVersion
+    optional string url = 7;
+    optional string query_str = 8;
+    optional string session_id = 9;
 }
 
 message SS_MS_ResponseTargetServer

third_party/a8engine

@@ -1 +1 @@
-Subproject commit 9c890ba78e289d4879f921b94b558e10d66b2b64
+Subproject commit cdb87a3e673aee3401b3e2ffce3ea1a1e6a603b0

third_party/behaviac

@@ -1 +1 @@
-Subproject commit 5beca57f6555aa0d9e4de71c93653cade928a654
+Subproject commit 240414570ee2848291d24ff8d3102dc43d4104a3

third_party/framework

@@ -1 +1 @@
-Subproject commit 180f9e3f5cdad81a58fe4f8a96b0bd6388eef222
+Subproject commit eb455bb95f97dc506566c443be0c72960ceebabf

third_party/tools

@@ -1 +1 @@
-Subproject commit 725d70ebaba30c20124075cf5e4bd751d2404d28
+Subproject commit 43a09bd136f0d28c61cd03103b9d151af1317381