diff --git a/server/masterserver/constant.h b/server/masterserver/constant.h index 24b7fd5..546cca7 100755 --- a/server/masterserver/constant.h +++ b/server/masterserver/constant.h @@ -118,6 +118,12 @@ enum VirtualPlayer_e VP_Mine = 9000003, }; +enum GameChannel_e +{ + kWxChannelId = 6001, + kTouTiaoChannelId = 6006 +}; + const char* const PROJ_NAME_FMT = "game%d_masterserver"; const char* const PROJ_ROOT_FMT = "/data/logs/%s"; diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc index ab728fd..68fd153 100644 --- a/server/masterserver/gsmgr.cc +++ b/server/masterserver/gsmgr.cc @@ -30,6 +30,14 @@ void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_Reques 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()) { diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index aecbd44..ab225c3 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -21,6 +21,7 @@ message SS_WSP_RequestTargetServer optional string team_id = 3; optional string server_info = 4; optional int32 is_reconnect = 5; + optional int32 proto_version = 6; //协议版本号Constant_e.ProtoVersion } message SS_MS_ResponseTargetServer