From 02a9f1326fd99fc60ee14c70bb55d714803607f0 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期一, 08 七月 2019 15:25:56 +0800 Subject: [PATCH] 4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血 --- ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py index 82e3515..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 @@ -506,6 +509,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