From 067c557365c6a749f6f41f5d8cad8ce9e941c80f Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期二, 14 十月 2025 18:07:18 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.py index de04dd9..c825b35 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.py @@ -229,7 +229,7 @@ gstMergeRegisterPlayer = 119 #报名跨服战 gstMergeQueryRegisterResult = 120 #查询报名结果，即查询帐号密码 gstGeneralDBOper = 121 #通用数据库操作包 -gstBroadcastMergeClient = 122 #广播跨服客户端 +gstCrossServerToServerPack = 122 #跨服使用 服务器之间的封包 gstDiapatchFamilyID = 123 #分配家族ID gstMergerChildToCenter = 124 gstQueryRecharge= 125 # 查询新的充值订单 @@ -237,7 +237,9 @@ gstSendDBMergeClientMsg = 127 # 通过groupID向DB发送消息，DB以gstBroadcastMergeClient广播 gstSendDBMergeClientListMsg = 128 # 通过group组向DB发送消息，DB以gstBroadcastMergeClient广播 gstMergePlayerData = 129 #// 向跨服汇报玩家（子服）数据 -gstMax = 130 #下面的数值 需要保持为 gstMax + 1 +gstDBLogic = 130 # GameServer 向db请求逻辑处理并返回，请求ID，类型，附加数据 +gstMax = 131 #下面的数值 需要保持为 gstMax + 1 + ########################### ELoginServerToDataServer define ############################# #LoginServer发送到DataServer的封包类型 @@ -337,7 +339,8 @@ dgBroadcastMergeClient = 0x60 + 23 dgMergerChildToCenter = 0x60 + 24 dgLoginMergeServer = 0x60 + 25 -dgKick = 0x60 + 26 +dgDBGameServerToDBLogicResult = 0x60 + 26 #GameServer向DB请求的回复信息tagDGGameServerToDBLogicResult + ########################### TBalanceServerToMapServer define ############################# #数据库回应封包类型#TBalanceServerToMapServer gmMapInitOk = 1 -- Gitblit v1.8.0