From 9d5ec7599f3abe0cebb76ce1df3c3b8c4e0aa51e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 11:40:15 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(跨服聊天;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
index 4f0250d..ac345e7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
@@ -56,8 +56,6 @@
 Def_Cmp_Equ = 0                   #等于
 Def_Cmp_Greater = 1               #大于
 
-IsMergeServer = DBConfig.IsMergeServer
-
 #跨服玩家上传数据信息列表索引
 (
 MergeRegPInfoIndex_LoginTime, # 登录时间 索引
@@ -347,10 +345,7 @@
         self.connectDB()
         return
             
-    def IsMergeServer(self):
-        global IsMergeServer
-        return IsMergeServer
-    
+    def IsMergeServer(self): return GameWorld.IsCrossServer()
     
     # 每X分钟清除已下线的玩家跨服数据, 离线超过3分钟玩家直接返回子服
     def PopOfflineMergePlayer(self):
@@ -484,7 +479,7 @@
         pos = 0
         requestType, pos = CommFunc.ReadBYTE(pack.getBuffer(), pos)
         
-        mylog.debug("begin process request type = %d"%requestType)
+        #mylog.debug("begin process request type = %d"%requestType)
         
         if requestType == CommonDefine.gstCrossServerToServerPack:
             oFuncGrade = self.GetFuncGrade('gstCrossServerToServerPack')
@@ -938,9 +933,9 @@
     
     def OnCrossServerToServerPack(self, db, pack):
 
-        if CommonDefine.IsDebug():
-            import binascii
-            mylog.debug('buf = %s'%binascii.b2a_hex(pack.getBuffer()))
+        #if CommonDefine.IsDebug():
+        #    import binascii
+        #    mylog.debug('buf = %s'%binascii.b2a_hex(pack.getBuffer()))
         
         try:
             recvPack = MergeServerRecvProtocol.tagLPStringData()
@@ -948,15 +943,19 @@
             NetPackCommon.RecCrossServerNetPack(recvPack.Data)
         except:
             msg = error.formatMsg('error', error.ERROR_NO_172, "LogicProcessThread::OnCrossServerToServerPack Catch a unexpetcted exception, error = %s"%traceback.format_exc())
-            mylog.error(msg)
+            if GameWorld.GetGameWorld().GetDebugLevel():
+                # debug下让其抛出异常报错,方便测试时发现排查问题
+                raise Exception(msg)
+            else:
+                mylog.error(msg)
 
 
 
     def OnGMToolCommand(self, db, pack):
 
-        if CommonDefine.IsDebug():
-            import binascii
-            mylog.debug('buf = %s'%binascii.b2a_hex(pack.getBuffer()))
+        #if CommonDefine.IsDebug():
+        #    import binascii
+        #    mylog.debug('buf = %s'%binascii.b2a_hex(pack.getBuffer()))
         
         try:
             ProjSpecialProcess.OnGMToolCommand(pack)
@@ -3185,7 +3184,7 @@
                         the_page = response.read()
                         
                         if the_page != "1":
-                            mylog.debug('checktoken fail:%s-%s'%(token, the_page))
+                            mylog.info('checktoken fail:%s-%s'%(token, the_page))
                             self.sendFailString(CommonDefine.dgPlayerLogin, pack, disPswCheckError)
                             return True
                     except:

--
Gitblit v1.8.0