server_common/masterserver
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加头条特殊处理

Browse Source
This commit is contained in:
aozhiwei 2020-08-20 15:54:45 +08:00
parent 30248885d0
commit a037b22de9
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/masterserver/constant.h
View File

@ -118,6 +118,12 @@ enum VirtualPlayer_e
VP_Mine = 9000003, VP_Mine = 9000003,
}; };
enum GameChannel_e
{
kWxChannelId = 6001,
kTouTiaoChannelId = 6006
};
const char* const PROJ_NAME_FMT = "game%d_masterserver"; const char* const PROJ_NAME_FMT = "game%d_masterserver";
const char* const PROJ_ROOT_FMT = "/data/logs/%s"; const char* const PROJ_ROOT_FMT = "/data/logs/%s";

8
server/masterserver/gsmgr.cc
View File

@ -30,6 +30,14 @@ void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_Reques
if (!App::Instance()->IsSeparateChannel(channel)) { if (!App::Instance()->IsSeparateChannel(channel)) {
channel = 0; 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; ss::SS_MS_ResponseTargetServer respmsg;
respmsg.set_context_id(msg.context_id()); respmsg.set_context_id(msg.context_id());
if (msg.is_reconnect()) { if (msg.is_reconnect()) {

1
server/tools/protobuild/ss_proto.proto
View File

@ -21,6 +21,7 @@ message SS_WSP_RequestTargetServer
optional string team_id = 3; optional string team_id = 3;
optional string server_info = 4; optional string server_info = 4;
optional int32 is_reconnect = 5; optional int32 is_reconnect = 5;
optional int32 proto_version = 6; //协议版本号Constant_e.ProtoVersion
} }
message SS_MS_ResponseTargetServer message SS_MS_ResponseTargetServer