From c3710e97b2d365a0ffbc8da198fe344a97b90cc0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 25 一月 2019 22:55:50 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动(活动表、封包)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
index 031ef7d..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
@@ -507,6 +509,8 @@
 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