merge master

This commit is contained in:
aozhiwei 2019-06-05 15:55:45 +08:00
commit 28825c7d9a
3 changed files with 12 additions and 5 deletions

View File

@ -373,10 +373,8 @@ void App::DispatchMsg()
void App::ProcessGameGateMsg(f8::MsgHdr& hdr) void App::ProcessGameGateMsg(f8::MsgHdr& hdr)
{ {
if (hdr.msgid == ss::_SS_Ping) { if (hdr.msgid == ss::_SS_Ping) {
#if 0
ss::SS_Pong pongmsg; ss::SS_Pong pongmsg;
GGListener::Instance()->SendProxyMsg(hdr.socket_handle, pongmsg); GGListener::Instance()->SendProxyMsg(hdr.socket_handle, pongmsg);
#endif
return; return;
} }
f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->ggmsghandler, f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->ggmsghandler,

View File

@ -3,12 +3,11 @@ package ss;
//id定义 //id定义
enum SSMessageId_e enum SSMessageId_e
{ {
_SS_Ping = 8;
_SS_Pong = 9;
_SS_WSP_SocketDisconnect = 10; _SS_WSP_SocketDisconnect = 10;
_SS_WSP_RequestTargetServer = 11; _SS_WSP_RequestTargetServer = 11;
_SS_MS_ResponseTargetServer = 12; _SS_MS_ResponseTargetServer = 12;
_SS_Ping = 150;
_SS_Pong = 151;
} }

View File

@ -1,5 +1,15 @@
package ss; package ss;
message SS_Ping
{
}
message SS_Pong
{
}
message SS_WSP_SocketDisconnect message SS_WSP_SocketDisconnect
{ {
} }