merge master

server/gameserver/app.cc

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

server/tools/protobuild/ss_msgid.proto

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

server/tools/protobuild/ss_proto.proto

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