From 5f3b500dd8efc188323d6e6ec2a74857e82142c8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 19:50:38 +0800
Subject: [PATCH] 1111 【后台】 扣除玩家物品、扣除玩家货币命令支持;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 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 d4e8700..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')
@@ -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)

--
Gitblit v1.8.0