From 303a03f56c01092ce7a7194e994dea2089b4728d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 11 七月 2019 14:24:45 +0800
Subject: [PATCH] 7982 【后端】【主干】渡劫条件调整

---
 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 cb878e0..1edae98 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
@@ -394,6 +396,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
@@ -508,6 +511,7 @@
 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