From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py b/ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py
index c57ad42..726429d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/NetPackCommon.py
@@ -29,7 +29,7 @@
import ChPyNetSendPack
import traceback
import ChMapToGamePyPack
-import MergeChildMsg
+import CrossRealmMsg
#-------------------------------------------------------------------------------
#---全局变量---
@@ -95,9 +95,13 @@
# Log("ReadPyPackTable: moudle: %s"%dir(moudle))
for index in range(regCnt):
+ if not config.get(section, "PacketCMD_%s"%(index + 1)):
+ continue
cmd = config.get(section, "PacketCMD_%s"%(index + 1))
subCmd = config.get(section, "PacketSubCMD_%s"%(index + 1))
callFunc = config.get(section, "PacketCallFunc_%s"%(index + 1))
+ if not cmd or not subCmd or not callFunc:
+ continue
cmd = int(cmd, 16)
subCmd = int(subCmd, 16)
@@ -205,7 +209,8 @@
except Exception:
Log("python自定义封包解析失败~~~~~\r\n%s" % traceback.format_exc())
- #raise Exception("python自定义封包解析失败~~~~~\r\n%s" % traceback.format_exc())
+ if GameWorld.GetGameWorld().GetDebugLevel():
+ raise Exception("python自定义封包解析失败~~~~~\r\n%s" % traceback.format_exc())
return
@@ -297,11 +302,12 @@
def Recv_MergerChildToCenter(index, tick):
try:
packData = IPY_GameServer.IPY_MGMergerChildToCenter().GetData()
- Log("收到跨服子服自定义封包消息：\r\n%s" % packData)
+ # 不要输出具体封包内容，可能会因为内容导致日志输出报错
+ Log("收到跨服子服自定义封包消息：长度=%s" % len(packData))
#以下添加后续处理函数
#...
#...
- MergeChildMsg.Recv_MergerChildToCenterProcess(packData, tick)
+ CrossRealmMsg.OnCrossServerReceiveMsg(packData, tick)
except Exception:
Log("跨服子服自定义封包消息处理失败")
return
--
Gitblit v1.8.0