From 2e677ecbfa2408d951e25bcadb22123e0375233c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 三月 2021 14:53:55 +0800
Subject: [PATCH] 8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长必买AA31、节日登录AA42、节日祝福AA43、节日游历AA46);
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 3760fb6..53dde27 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -200,6 +200,13 @@
Def_Notify_WorldKey_AssistBoss = "AssistBoss" # 协助boss
+#活动类型定义
+ActTypeList = (
+ActType_OpenComm, # 开服及常规运营活动 1
+ActType_MixServer, # 合服活动 2
+ActType_Feast, # 节日活动 3
+) = range(1, 1 + 3)
+
#运营活动表名定义
OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
OperationActionName_CostRebate = "ActCostRebate" # 消费返利活动
@@ -213,53 +220,54 @@
OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
-OperationActionName_TotalRecharge2 = "ActTotalRecharge2" # 累计充值活动
-OperationActionName_TotalRecharge3 = "ActTotalRecharge3" # 累计充值活动 - 节日充值领奖
OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
OperationActionName_CollectWords = "ActCollectWords" # 集字活动
-OperationActionName_CollectWords2 = "ActCollectWords2" # 集字活动2
OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
OperationActionName_RechargePrize = "ActRechargePrize" # 充值返利活动
OperationActionName_RechargeRebateGold = "ActRechargeRebateGold" # 充值返利仙玉活动（活动结束邮件发放，节日活动）
OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
+OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
+OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
- OperationActionName_FeastLogin, OperationActionName_TotalRecharge3,
+ OperationActionName_FeastLogin,
+ OperationActionName_FeastWish, OperationActionName_FeastTravel,
]
#所有的运营活动列表，含节日活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
OperationActionName_BossReborn,OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint, OperationActionName_FlashSale,
- OperationActionName_WishingWell, OperationActionName_TotalRecharge, OperationActionName_TotalRecharge2,
+ OperationActionName_WishingWell, OperationActionName_TotalRecharge,
OperationActionName_WeekParty, OperationActionName_LoginAward,
OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
OperationActionName_DailyGiftbag, OperationActionName_RechargePrize,
- OperationActionName_CollectWords, OperationActionName_CollectWords2] \
+ OperationActionName_CollectWords] \
+ FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
- OperationActionName_BossReborn, OperationActionName_TotalRecharge, OperationActionName_TotalRecharge2,
+ OperationActionName_BossReborn, OperationActionName_TotalRecharge,
OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
OperationActionName_WeekParty,
- OperationActionName_CollectWords, OperationActionName_CollectWords2,
- OperationActionName_FeastLogin, OperationActionName_TotalRecharge3,
+ OperationActionName_CollectWords,
+ OperationActionName_FeastLogin,
+ OperationActionName_FeastWish, OperationActionName_FeastTravel,
]
-#所有的累计充值活动
-OperationActionName_TotalRechargeDict = {
- 1:OperationActionName_TotalRecharge,
- 2:OperationActionName_TotalRecharge2,
- 3:OperationActionName_TotalRecharge3,
- }
+#支持多活动分组编号的活动名
+MultiActNumOperationActNameList = [OperationActionName_TotalRecharge, OperationActionName_CollectWords,
+ OperationActionName_FlashGiftbag, OperationActionName_CostRebate,
+ OperationActionName_SpringSale, OperationActionName_FlashSale,
+ ]
+
#跨服运营活动表名定义
CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
@@ -270,6 +278,7 @@
ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值
ActKey_State = "State" # 活动状态 0-未开启, >0开启中，也代表当日的第几个时间段
ActKey_CfgID = "CfgID" # 活动表配置ID
+ActKey_ActNum = "ActNum" # 活动分组编号
ActKey_DayIndex = "DayIndex" # 当前活动天索引，0开始，代表第1天
ActKey_TemplateID = "TemplateID" # 当前活动模板ID
ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
@@ -1103,7 +1112,7 @@
Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14
Def_UniversalGameRecType_ArenaBattleRecord, # 竞技场玩家挑战记录 15
Def_UniversalGameRecType_CrossActInfo, # 跨服运营活动信息记录 16
- Def_UniversalGameRecType_17,
+ Def_UniversalGameRecType_FeastWish, #节日祝福大奖记录17
Def_UniversalGameRecType_18,
Def_UniversalGameRecType_19,
Def_UniversalGameRecType_20,
--
Gitblit v1.8.0