From e0584b65cc1158aa8aec5f0690c82e08edcf9252 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 12 十月 2022 14:11:52 +0800
Subject: [PATCH] 9719 【越南】【BT7】【主干】跨服全民充值（主干 冲突）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py | 3 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 35495d5..f6ffb13 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -72,6 +72,7 @@
import PlayerCharm
import CrossRealmPlayer
import CrossBattlefield
+import CrossActAllRecharge
#---------------------------------------------------------------------
#---------------------------------------------------------------------
@@ -234,6 +235,8 @@
CrossBattlefield.OnPlayerLogin(curPlayer)
#跨服排位
CrossChampionship.OnPlayerLogin(curPlayer, tick)
+ #跨服全民充值
+ CrossActAllRecharge.OnPlayerLogin(curPlayer)
if isMixServerFirstLogin:
PlayerCharm.OnMixServerFirstLogin(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 90e70b1..4a8be8a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3777,6 +3777,11 @@
Def_PDict_CA_CTGBillboardRMB = "CA_CTGBillboardRMB" # 活动累计充值RMB值
Def_PDict_CA_CTGBillboardAward = "CA_CTGBillboardAward" # 活动充值目标领奖状态，按二进制位存储
+#跨服全民充值活动
+Def_PDict_CA_AllRechargeID = "CA_AllRechargeID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
+Def_PDict_CA_AllRechargeRMB = "CA_AllRechargeRMB" # 活动累计充值RMB值
+Def_PDict_CA_AllRechargeAward = "CA_AllRechargeAward" # 活动领奖状态，按二进制位存储
+
#消费返利活动
Def_PDict_CostRebateID = "CostRebateID_%s" # 玩家身上的消费返利活动ID，唯一标识，取活动开始日期time值，参数(活动编号)
Def_PDict_CostRebateTemplateID = "CostRebateTemplateID_%s" # 玩家身上的消费返利模板ID，参数(活动编号)
@@ -5627,7 +5632,11 @@
Def_RewardType_FairyCardSponsor, #仙卡赞助奖励 46
Def_RewardType_CritGodBoxCTG, #暴击神兵奖励 47
Def_RewardType_GameNotice, #玩法前瞻奖励 48
-)= range(49)
+Def_RewardType_EnterGroup, #加群奖励49
+Def_RewardType_ShediaoRedpacket, #射雕红包奖励 50
+Def_RewardType_ShediaoEquip, #射雕装备奖励 51
+Def_RewardType_CAAllRecharge, #跨服全民充值奖励 52
+)= range(53)
#boss复活相关活动定义
--
Gitblit v1.8.0