From 61ab3e940c40963e09fa7d1e68d5ca7e711ed270 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 09 四月 2025 15:47:24 +0800
Subject: [PATCH] 10367 【越南】【英语】【BT】【砍树】仙盟攻城战-服务端(跨服仙盟支持;后台查询区服仙盟支持;活动时间流程支持;攻城战主活动功能完整流程:公示、分组、战备、战斗、榜单、竞猜、领奖等;)

---
 ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
index 82e3515..2c8bdb0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
@@ -284,6 +284,8 @@
 dgMergeQueryNewAccount = _IPY_ServerDefine.dgMergeQueryNewAccount
 dgBroadcastMergeClient = _IPY_ServerDefine.dgBroadcastMergeClient
 dgMergerChildToCenter = _IPY_ServerDefine.dgMergerChildToCenter
+dgLoginMergeServer = _IPY_ServerDefine.dgLoginMergeServer
+dgDBGameServerToDBLogicResult = _IPY_ServerDefine.dgDBGameServerToDBLogicResult
 gmMapInitOk = _IPY_ServerDefine.gmMapInitOk
 gmPlayerInit = _IPY_ServerDefine.gmPlayerInit
 gmPlayerLogout = _IPY_ServerDefine.gmPlayerLogout
@@ -311,6 +313,7 @@
 gmQueryNewGuyCardState = _IPY_ServerDefine.gmQueryNewGuyCardState
 gmUpdateNewGuyCardState = _IPY_ServerDefine.gmUpdateNewGuyCardState
 gmReChargePush = _IPY_ServerDefine.gmReChargePush
+gmMergePlayerData = _IPY_ServerDefine.gmMergePlayerData
 mgMapInit = _IPY_ServerDefine.mgMapInit
 mgMapInitOK = _IPY_ServerDefine.mgMapInitOK
 mgPlayerIsBattle = _IPY_ServerDefine.mgPlayerIsBattle
@@ -394,6 +397,7 @@
 gbProxyDBOper = _IPY_ServerDefine.gbProxyDBOper
 gbSynPlayerName = _IPY_ServerDefine.gbSynPlayerName
 gbMergerChildToCenter = _IPY_ServerDefine.gbMergerChildToCenter
+gbCrossServerState = _IPY_ServerDefine.gbCrossServerState
 gstPlayerLogin = _IPY_ServerDefine.gstPlayerLogin
 gstPlayerDetail = _IPY_ServerDefine.gstPlayerDetail
 gstCreatePlayer = _IPY_ServerDefine.gstCreatePlayer
@@ -506,6 +510,10 @@
 gstMergerChildToCenter = _IPY_ServerDefine.gstMergerChildToCenter
 gstQueryRecharge = _IPY_ServerDefine.gstQueryRecharge
 gstFinishRecharge = _IPY_ServerDefine.gstFinishRecharge
+gstSendDBMergeClientMsg = _IPY_ServerDefine.gstSendDBMergeClientMsg
+gstSendDBMergeClientListMsg = _IPY_ServerDefine.gstSendDBMergeClientListMsg
+gstMergePlayerData = _IPY_ServerDefine.gstMergePlayerData
+gstDBLogic = _IPY_ServerDefine.gstDBLogic
 gstMax = _IPY_ServerDefine.gstMax
 btgServerSupport = _IPY_ServerDefine.btgServerSupport
 btgLineID = _IPY_ServerDefine.btgLineID

--
Gitblit v1.8.0