From fe9b738b1cb89e3b4d320924fceef70a8e1f6fac Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期四, 04 三月 2021 14:24:50 +0800 Subject: [PATCH] 8650 【主干】【BT2】活动规则优化（多活动支持的改为单表模式，增加活动分组编号字段区分不同的活动编号；常规活动改为不受合服影响，合服活动独立出来；累计充值活动、集字活动适配为新模式 master冲突补同步）； --- 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 031ef7d..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 @@ -507,6 +510,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