Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-04-27 fb6c6d84ca327e4c3f02797fc3441057531ab27a

 ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py

@@ -302,7 +302,8 @@
def Recv_MergerChildToCenter(index, tick):

    try:

        packData = IPY_GameServer.IPY_MGMergerChildToCenter().GetData()

        Log("收到跨服子服自定义封包消息：\r\n%s" % packData)

        # 不要输出具体封包内容，可能会因为内容导致日志输出报错

        Log("收到跨服子服自定义封包消息：长度=%s" % len(packData))

        #以下添加后续处理函数

        #...

        #...