From 6faea8f62e2c62a03077c73e6370d5fb0bbafdd5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 07 五月 2021 12:11:33 +0800
Subject: [PATCH] 5064 【主干】【bt2】【bt2_1.100.1】VIP升级导致节日祝福石被删除

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   73 +++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 820ffd7..fc07677 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,36 +220,61 @@
 OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
 OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
-OperationActionName_TotalRecharge2 = "ActTotalRecharge2" # 累计充值活动
 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_RechargePrize = "ActRechargePrize" # 充值返利活动(节日活动)
+OperationActionName_RechargeRebateGold = "ActRechargeRebateGold" # 充值返利仙玉活动(活动结束邮件发放,节日活动)
 OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
+OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
+OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
+OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
+OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
+OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
+OperationActionName_Turntable = "ActTurntable" # 转盘活动
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
-FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket]
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
+                                OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
+                                OperationActionName_FeastLogin,
+                                OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                OperationActionName_RechargePrize,
+                                ]
 #所有的运营活动列表,含节日活动
 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_GrowupBuy
+                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
+                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
+                           OperationActionName_Turntable,
                            ] + 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_SpringSale, OperationActionName_LuckyTreasure,
+                                   OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
+                                   OperationActionName_WeekParty, OperationActionName_Turntable,
+                                   OperationActionName_CollectWords,
+                                   OperationActionName_FeastLogin,
+                                   OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   ]
+
+#支持多活动分组编号的活动名
+MultiActNumOperationActNameList = [OperationActionName_TotalRecharge, OperationActionName_CollectWords,
+                                   OperationActionName_FlashGiftbag, OperationActionName_CostRebate,
+                                   OperationActionName_SpringSale, OperationActionName_FlashSale,
+                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   OperationActionName_Turntable,
+                                   ]
 
 #跨服运营活动表名定义
 CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
@@ -254,6 +286,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" # 活动开启时世界等级
@@ -917,7 +950,9 @@
 CDBPlayerRefresh_SkillReducePer6,   # 受到技能伤害减少6
 CDBPlayerRefresh_SkillReducePer7,   # 受到技能伤害减少7
 CDBPlayerRefresh_ExAttr17,          # ExAttr17 
-) = range(146, 230)
+CDBPlayerRefresh_BossActScore, # boss 活动积分 230
+CDBPlayerRefresh_FuncSysPrivilege, # 功能特权令 231
+) = range(146, 232)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -927,6 +962,7 @@
 TYPE_Price_FamilyActivity = 15    # 仙盟活跃令
 TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃
 TYPE_Price_Honor = 18    # 荣誉
+TYPE_Price_BossActScore = 19    # boss活动积分,bt版用
 TYPE_Price_Rune = 23    # 符印精华点
 TYPE_Price_RuneSplinters = 24    # 符印碎片
 TYPE_Price_TreasureScore = 25    # 寻宝积分
@@ -935,7 +971,7 @@
 TYPE_Price_SoulDust = 28    # 魂尘
 TYPE_Price_SoulSplinters = 29    # 聚魂碎片
 TYPE_Price_SoulCore = 30    # 核心环
-
+TYPE_Price_FuncSysPrivilege = 31    # 功能系统特权令
 
 #以下是旧的金钱类型
 TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分
@@ -958,6 +994,8 @@
                            TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
                            TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
                            TYPE_Price_Honor:CDBPlayerRefresh_Honor,
+                           TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
+                           TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
                            }
 
 # 高效战斗状态
@@ -1087,8 +1125,8 @@
                                 Def_UniversalGameRecType_Reward,    # 通用奖励表(TopBar)14
                                 Def_UniversalGameRecType_ArenaBattleRecord, # 竞技场玩家挑战记录 15
                                 Def_UniversalGameRecType_CrossActInfo, # 跨服运营活动信息记录 16
-                                Def_UniversalGameRecType_17,
-                                Def_UniversalGameRecType_18,
+                                Def_UniversalGameRecType_FeastWish, #节日祝福大奖记录17
+                                Def_UniversalGameRecType_ActWorldLVLimitInfo, # 运营活动世界等级限制开启信息 18
                                 Def_UniversalGameRecType_19,
                                 Def_UniversalGameRecType_20,
                                 Def_UniversalGameRecType_21,
@@ -1836,10 +1874,7 @@
 RedPackType_FeastSysBig = 31 # 节日系统大红包
 RedPackType_FeastSysSmall = 32 # 节日系统小红包
 RedPackType_FeastSucc = 33 # 节日成就红包
+RedPackType_Server = 36 # 全服红包
+
 # 节日红包类型
 FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
-# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
-RedPackMaxCountDict = {1:[RedPackType_OpenServer],
-                       2:[RedPackType_FeastSucc],
-                       }
-

--
Gitblit v1.8.0