From ccaefa2a93fb82d0db5fc7e74832a292fb860984 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 22 一月 2019 14:23:20 +0800
Subject: [PATCH] 5919 【后端】【1.5.100】诛仙塔功能开发

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
index 82e3515..da036c6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
@@ -284,6 +284,7 @@
 dgMergeQueryNewAccount = _IPY_ServerDefine.dgMergeQueryNewAccount
 dgBroadcastMergeClient = _IPY_ServerDefine.dgBroadcastMergeClient
 dgMergerChildToCenter = _IPY_ServerDefine.dgMergerChildToCenter
+dgLoginMergeServer = _IPY_ServerDefine.dgLoginMergeServer
 gmMapInitOk = _IPY_ServerDefine.gmMapInitOk
 gmPlayerInit = _IPY_ServerDefine.gmPlayerInit
 gmPlayerLogout = _IPY_ServerDefine.gmPlayerLogout
@@ -311,6 +312,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
@@ -506,6 +508,9 @@
 gstMergerChildToCenter = _IPY_ServerDefine.gstMergerChildToCenter
 gstQueryRecharge = _IPY_ServerDefine.gstQueryRecharge
 gstFinishRecharge = _IPY_ServerDefine.gstFinishRecharge
+gstSendDBMergeClientMsg = _IPY_ServerDefine.gstSendDBMergeClientMsg
+gstSendDBMergeClientListMsg = _IPY_ServerDefine.gstSendDBMergeClientListMsg
+gstMergePlayerData = _IPY_ServerDefine.gstMergePlayerData
 gstMax = _IPY_ServerDefine.gstMax
 btgServerSupport = _IPY_ServerDefine.btgServerSupport
 btgLineID = _IPY_ServerDefine.btgLineID

--
Gitblit v1.8.0