From ffb2b5d1c7246523bb51e75d067c14d7bb8bbdc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 25 一月 2019 16:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/1.5.200.develop'
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 1edec26..0d747d6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -231,12 +231,17 @@
OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
+OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
+#节日活动类型列表 - 该类型无视开服天，日期到了就开启
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty]
+#所有的运营活动列表，含节日活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
OperationActionName_BossReborn,OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint, OperationActionName_FlashSale,
OperationActionName_WishingWell, OperationActionName_TotalRecharge,
- OperationActionName_WeekParty, OperationActionName_LoginAward, ]
+ OperationActionName_WeekParty, OperationActionName_LoginAward, ] \
+ + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
--
Gitblit v1.8.0