From 6a4df1975beb435a9c712c508035eeecc9cc293d Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 14 五月 2021 10:49:51 +0800 Subject: [PATCH] 8921 【主干】【BT2】【后端】H.活动-节日活动-垃圾分类(同步主干冲突 提交) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py index 26dac83..4f9ca84 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py @@ -236,6 +236,7 @@ OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动 OperationActionName_Turntable = "ActTurntable" # 转盘活动 OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动 +OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动 #节日活动类型列表 - 该类型无视开服天,日期到了就开启 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy, @@ -253,7 +254,7 @@ OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure, OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge, OperationActionName_CollectWords, OperationActionName_ManyDayRecharge, - OperationActionName_Turntable, OperationActionName_HorsePetFeast, + OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting, ] + FeastOperationActionNameList #需要记录开启活动时的世界等级的运营活动 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, @@ -263,7 +264,7 @@ OperationActionName_SpringSale, OperationActionName_LuckyTreasure, OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy, OperationActionName_WeekParty, OperationActionName_Turntable, - OperationActionName_CollectWords, + OperationActionName_CollectWords, OperationActionName_GarbageSorting, OperationActionName_FeastLogin, OperationActionName_FeastWish, OperationActionName_FeastTravel, OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge, @@ -274,7 +275,7 @@ OperationActionName_FlashGiftbag, OperationActionName_CostRebate, OperationActionName_SpringSale, OperationActionName_FlashSale, OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge, - OperationActionName_Turntable, OperationActionName_HorsePetFeast, + OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting, ] #跨服运营活动表名定义 @@ -710,9 +711,10 @@ Def_BT_SkyTower, #天星塔榜 Def_BT_Arena, #竞技场榜 + Def_BT_Environment, #环保榜 (垃圾分类活动) Def_BT_Max, #排行榜最大类型 -) = range(0, 28 + 2) +) = range(0, 29 + 2) ''' 跨服排行榜类型, 从 150 开始 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始 @@ -1090,8 +1092,9 @@ rptPet, # 宠物背包(用物品存储宠物的数据) 31 rptDogzItem, # 神兽物品背包 32 rptDogzEquip, # 神兽装备背包 33 +rptGarbage, # 垃圾分类背包 34 rptMax, # 最大背包类型数量,放在最后一个 -) = range(28, 28 + 7) #C++定义的枚举到27 +) = range(28, 28 + 8) #C++定义的枚举到27 #虚拟背包类型, 从255递减 Def_VPack_TypeList = ( -- Gitblit v1.8.0