Bladeren bron

Merge branch 'master' of https://gitee.com/wangwenfan/congkong into zwc

zhanwencai 1 jaar geleden
bovenliggende
commit
ef8b6c24f6
2 gewijzigde bestanden met toevoegingen van 468 en 447 verwijderingen
  1. 424 423
      script/excel/ssecy/absAct.lua
  2. 44 24
      script/module/absAct/HeroGrowUp.lua

+ 424 - 423
script/excel/ssecy/absAct.lua

@@ -1,134 +1,134 @@
 (function()absActivity={
-[1001]={absType=1,type=1,order=1,turns={101,102,104},openDay=0,days=3,eachDays=0,continueDays=0,loopType=3,actName=[[特惠礼盒]],panelID=3305,startDate={},endDate={},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}},
-[2001]={absType=2,type=2,order=1,turns={2001},openDay=10,days=3,eachDays=0,continueDays=6,loopType=3,actName=[[奥斯曼的礼物]],panelID=3702,startDate={},endDate={},openLv=5,moduleFn=[[absAct.MangHeLogic]],effect=0,icon=0,ad={},param={535,1}},
-[3001]={absType=3,type=3,order=1,turns={101,102,103,104,105,106,107,108,109},openDay=9,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[英雄up]],panelID=3703,startDate={},endDate={},openLv=5,moduleFn=[[absAct.HeroUpLogic]],effect=0,icon=0,ad={205011,105008,305008,205010,105007,305006,205007,305007,305011},param={沙德拉}},
-[4001]={absType=4,type=4,order=1,turns={101,102,103},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[英灵召唤]],panelID=3704,startDate={},endDate={},openLv=5,moduleFn=[[absAct.PerpleHeroLogic]],effect=0,icon=0,ad={},param={}},
-[4003]={absType=4,type=1,order=1,turns={201,202,203},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[英雄礼盒]],panelID=3706,startDate={},endDate={},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}},
-[4004]={absType=4,type=8,order=1,turns={101,102,103},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[英灵传说]],panelID=3708,startDate={},endDate={},openLv=5,moduleFn=[[absAct.HeroLoginPickLogic]],effect=0,icon=0,ad={},param={}},
-[5001]={absType=6,type=6,order=1,turns={101,102},openDay=16,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[掉落活动]],panelID=3707,startDate={},endDate={},openLv=5,moduleFn=[[absAct.DropExchangeLogic]],effect=0,icon=0,ad={},param={}},
-[5002]={absType=6,type=1,order=1,turns={301,301},openDay=16,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[掉落礼盒]],panelID=3707,startDate={},endDate={},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}},
-[6001]={absType=9,type=9,order=1,turns={101,102,103},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[占卜轮盘]],panelID=3308,startDate={},endDate={},openLv=5,moduleFn=[[absAct.AbsZhanbuLunpanLogic]],effect=0,icon=0,ad={},param={}},
-[8001]={absType=11,type=11,order=1,turns={101,102},openDay=2,days=14,eachDays=0,continueDays=0,loopType=3,actName=[[打工]],panelID=3610,startDate={},endDate={},openLv=5,moduleFn=[[absAct.HeroGrowUp]],effect=0,icon=0,ad={},param={}},
-[10001]={absType=7,type=7,order=1,turns={101,102,103,104,105},openDay=0,days=5,eachDays=0,continueDays=0,loopType=3,actName=[[英雄兑换]],panelID=3307,startDate={},endDate={},openLv=5,moduleFn=[[absAct.AbsJifenDrawLogic]],effect=0,icon=0,ad={},param={}},
-[11001]={absType=10,type=10,order=1,turns={10},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[打赏返利]],panelID=3106,startDate={year=2021,month=7,day=27},endDate={year=2121,month=7,day=30},openLv=1,moduleFn=[[absAct.RechargeBackLogic]],effect=0,icon=0,ad={},param={}},
-[12001]={absType=12,type=12,order=1,turns={101,102,103,104},openDay=17,days=3,eachDays=4,continueDays=0,loopType=3,actName=[[铂金周卡]],panelID=3311,startDate={},endDate={},openLv=5,moduleFn=[[absAct.AbsWeeklyCardLogic]],effect=0,icon=0,ad={},param={2005}},
-[13001]={absType=13,type=13,order=1,turns={101},openDay=26,days=9999,eachDays=0,continueDays=0,loopType=4,actName=[[365王卡]],panelID=3312,startDate={},endDate={},openLv=5,moduleFn=[[absAct.Abs365CardLogic]],effect=0,icon=0,ad={},param={}},
-[14001]={absType=14,type=1,order=1,turns={401},openDay=0,days=1,eachDays=0,continueDays=0,loopType=3,actName=[[每日礼包]],panelID=3103,startDate={},endDate={},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}},
-[15001]={absType=15,type=34,order=1,turns={101},openDay=11,days=3,eachDays=6,continueDays=0,loopType=3,actName=[[洗炼双倍]],panelID=3901,startDate={},endDate={},openLv=30,moduleFn=[[absAct.AbsActMoShouXiLian]],effect=0,icon=0,ad={},param={}},
-[17001]={absType=22,type=46,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=4,actName=[[新服-战力达标]],panelID=3609,startDate={},endDate={},openLv=5,moduleFn=[[absAct.AbsOpenServerTotalConsume]],effect=0,icon=0,ad={},param={3,"zhanliReach"}},
-[30001]={absType=5,type=19,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[英雄降临]],panelID=5012,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn=[[absAct.HeroComeLogic]],effect=0,icon=0,ad={},param={}},
-[30002]={absType=5,type=22,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[专属任务]],panelID=5014,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn=[[absAct.ExclusiveTaskLogic]],effect=0,icon=0,ad={},param={}},
-[30003]={absType=5,type=20,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[夙愿礼盒]],panelID=5013,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn=[[absAct.WishGiftLogic]],effect=0,icon=0,ad={},param={}},
-[30004]={absType=5,type=21,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[每日祈福]],panelID=5011,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn=[[absAct.EveryDayPrayLogic]],effect=0,icon=0,ad={},param={}},
-[30005]={absType=5,type=14,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[星辰宝藏]],panelID=5015,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn=[[absAct.AbsSurpriseChest]],effect=0,icon=0,ad={},param={}},
-[31001]={absType=15,type=15,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[国庆双倍]],panelID=5001,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn=[[absAct.DoubleChargeLogic]],effect=0,icon=0,ad={},param={}},
-[31002]={absType=15,type=18,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[七日狂欢]],panelID=5002,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn=[[absAct.SevenDayLogic]],effect=0,icon=0,ad={},param={}},
-[31003]={absType=15,type=16,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[举国欢庆]],panelID=5003,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn=[[absAct.DrumBlastingLogic]],effect=0,icon=0,ad={},param={}},
-[31004]={absType=15,type=17,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[节日定制]],panelID=5004,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn=[[absAct.SpecialCustomLogic]],effect=0,icon=0,ad={},param={}},
-[40001]={absType=16,type=18,order=1,turns={102},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName=[[合服奖励]],panelID=5021,startDate={},endDate={},openLv=5,moduleFn=[[absAct.SevenDayLogic]],effect=0,icon=0,ad={},param={}},
-[40002]={absType=16,type=23,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName=[[特惠秒杀]],panelID=5022,startDate={},endDate={},openLv=5,moduleFn=[[absAct.SeckillGiftLogic]],effect=0,icon=0,ad={},param={}},
-[40003]={absType=16,type=24,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName=[[消费返利]],panelID=5023,startDate={},endDate={},openLv=5,moduleFn=[[absAct.UseDiamondLogic]],effect=0,icon=0,ad={},param={}},
-[40004]={absType=16,type=1,order=1,turns={501},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName=[[合服礼盒]],panelID=5024,startDate={},endDate={},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}},
-[40005]={absType=16,type=25,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName=[[许愿神树]],panelID=5025,startDate={},endDate={},openLv=5,moduleFn=[[absAct.WishCupLogic]],effect=0,icon=0,ad={},param={}},
-[40006]={absType=16,type=26,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName=[[合服排行]],panelID=5026,startDate={},endDate={},openLv=5,moduleFn=[[absAct.AbsReachRankLogic]],effect=0,icon=0,ad={},param={"topupRank"}},
-[70001]={absType=19,type=30,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[浪漫邂逅]],panelID=5056,startDate={year=2022,month=02,day=14},endDate={year=2022,month=02,day=16},openLv=5,moduleFn=[[absAct.AbsSignGiftLogic]],effect=0,icon=0,ad={},param={}},
-[70002]={absType=19,type=31,order=1,turns={103},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[欢度元宵]],panelID=5057,startDate={year=2022,month=02,day=14},endDate={year=2022,month=02,day=16},openLv=5,moduleFn=[[absAct.DailyFixedTaskLogic]],effect=0,icon=0,ad={},param={}},
-[70003]={absType=19,type=33,order=1,turns={103},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[难忘今宵]],panelID=5058,startDate={year=2022,month=02,day=14},endDate={year=2022,month=02,day=16},openLv=5,moduleFn=[[absAct.FestivalSevenDayCardLogic]],effect=0,icon=0,ad={},param={}},
-[80001]={absType=20,type=18,order=1,turns={103},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[恭]],panelID=5061,startDate={year=2022,month=01,day=31},endDate={year=2022,month=02,day=06},openLv=5,moduleFn=[[absAct.SevenDayLogic]],effect=0,icon=0,ad={},param={}},
-[80002]={absType=20,type=22,order=1,turns={102},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[喜]],panelID=5062,startDate={year=2022,month=01,day=31},endDate={year=2022,month=02,day=06},openLv=5,moduleFn=[[absAct.ExclusiveTaskLogic]],effect=0,icon=0,ad={},param={}},
-[80003]={absType=20,type=28,order=1,turns={104},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[发]],panelID=5063,startDate={year=2022,month=01,day=31},endDate={year=2022,month=02,day=06},openLv=5,moduleFn=[[absAct.FestivalSevenDayCardLogic]],effect=0,icon=0,ad={},param={}},
-[80004]={absType=20,type=1,order=1,turns={701},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[财]],panelID=5064,startDate={year=2022,month=01,day=31},endDate={year=2022,month=02,day=06},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}},
-[701]={absType=70,type=18,order=1,turns={701},openDay=7,days=4,eachDays=1,continueDays=0,loopType=6,actName=[[登录有礼]],panelID=7011,startDate={},endDate={},openLv=0,moduleFn=[[absAct.SevenDayLogic]],effect=0,icon=0,ad={},param={}},
-[702]={absType=70,type=71,order=1,turns={701},openDay=7,days=4,eachDays=1,continueDays=0,loopType=6,actName=[[累计充值]],panelID=7012,startDate={},endDate={},openLv=0,moduleFn=[[absAct.TotalReachLogic]],effect=0,icon=0,ad={},param={2}},
-[703]={absType=70,type=71,order=1,turns={702},openDay=7,days=4,eachDays=1,continueDays=0,loopType=6,actName=[[天命召唤]],panelID=7013,startDate={},endDate={},openLv=0,moduleFn=[[absAct.TotalReachLogic]],effect=0,icon=0,ad={},param={3}},
-[711]={absType=71,type=18,order=1,turns={702},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName=[[登录有礼]],panelID=7022,startDate={},endDate={},openLv=0,moduleFn=[[absAct.SevenDayLogic]],effect=0,icon=0,ad={},param={}},
-[712]={absType=71,type=72,order=1,turns={701},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName=[[单笔充值]],panelID=7023,startDate={},endDate={},openLv=0,moduleFn=[[absAct.SingleReachLogic]],effect=0,icon=0,ad={},param={}},
-[713]={absType=71,type=71,order=1,turns={703},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName=[[高级召唤]],panelID=7024,startDate={},endDate={},openLv=0,moduleFn=[[absAct.TotalReachLogic]],effect=0,icon=0,ad={},param={1}},
-[714]={absType=71,type=71,order=1,turns={704},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName=[[累计消耗]],panelID=7025,startDate={},endDate={},openLv=0,moduleFn=[[absAct.TotalReachLogic]],effect=0,icon=0,ad={},param={4}},
-[721]={absType=72,type=73,order=1,turns={701},openDay=7,days=3,eachDays=1,continueDays=0,loopType=7,actName=[[跨服充值榜1]],panelID=7031,startDate={},endDate={},openLv=0,moduleFn=[[absAct.AbsActBillboardLogic]],effect=0,icon=0,ad={},param={2}},
-[722]={absType=72,type=73,order=1,turns={702},openDay=7,days=3,eachDays=15,continueDays=0,loopType=7,actName=[[跨服充值榜2]],panelID=7031,startDate={},endDate={},openLv=0,moduleFn=[[absAct.AbsActBillboardLogic]],effect=0,icon=0,ad={},param={2}},
-[731]={absType=73,type=73,order=1,turns={703},openDay=7,days=3,eachDays=8,continueDays=0,loopType=7,actName=[[跨服召唤榜1]],panelID=7041,startDate={},endDate={},openLv=0,moduleFn=[[absAct.AbsActBillboardLogic]],effect=0,icon=0,ad={},param={1}},
-[732]={absType=73,type=73,order=1,turns={704},openDay=7,days=3,eachDays=22,continueDays=0,loopType=7,actName=[[跨服召唤榜2]],panelID=7041,startDate={},endDate={},openLv=0,moduleFn=[[absAct.AbsActBillboardLogic]],effect=0,icon=0,ad={},param={1}},
-[741]={absType=74,type=27,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[限时狂欢]],panelID=7051,startDate={year=2022,month=02,day=17},endDate={year=2022,month=02,day=19},openLv=5,moduleFn=[[absAct.DailyFixedTaskLogic]],effect=0,icon=0,ad={},param={}},
-[742]={absType=74,type=28,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[限时周卡]],panelID=7052,startDate={year=2022,month=02,day=17},endDate={year=2022,month=02,day=19},openLv=5,moduleFn=[[absAct.FestivalSevenDayCardLogic]],effect=0,icon=0,ad={},param={}},
-[743]={absType=74,type=1,order=1,turns={601},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName=[[限时好礼]],panelID=7053,startDate={year=2022,month=02,day=17},endDate={year=2022,month=02,day=19},openLv=5,moduleFn=[[absAct.PremiumGiftLogic]],effect=0,icon=0,ad={},param={}}}end)();
+[701]={absType=70,type=18,order=1,turns={701},openDay=7,days=4,eachDays=1,continueDays=0,loopType=6,actName="登录有礼",panelID=7011,startDate={},endDate={},openLv=0,moduleFn="absAct.SevenDayLogic",effect=0,icon=0,ad={},param={}},
+[702]={absType=70,type=71,order=1,turns={701},openDay=7,days=4,eachDays=1,continueDays=0,loopType=6,actName="累计充值",panelID=7012,startDate={},endDate={},openLv=0,moduleFn="absAct.TotalReachLogic",effect=0,icon=0,ad={},param={2}},
+[703]={absType=70,type=71,order=1,turns={702},openDay=7,days=4,eachDays=1,continueDays=0,loopType=6,actName="天命召唤",panelID=7013,startDate={},endDate={},openLv=0,moduleFn="absAct.TotalReachLogic",effect=0,icon=0,ad={},param={3}},
+[711]={absType=71,type=18,order=1,turns={702},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName="登录有礼",panelID=7022,startDate={},endDate={},openLv=0,moduleFn="absAct.SevenDayLogic",effect=0,icon=0,ad={},param={}},
+[712]={absType=71,type=72,order=1,turns={701},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName="单笔充值",panelID=7023,startDate={},endDate={},openLv=0,moduleFn="absAct.SingleReachLogic",effect=0,icon=0,ad={},param={}},
+[713]={absType=71,type=71,order=1,turns={703},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName="高级召唤",panelID=7024,startDate={},endDate={},openLv=0,moduleFn="absAct.TotalReachLogic",effect=0,icon=0,ad={},param={1}},
+[714]={absType=71,type=71,order=1,turns={704},openDay=7,days=3,eachDays=5,continueDays=0,loopType=6,actName="累计消耗",panelID=7025,startDate={},endDate={},openLv=0,moduleFn="absAct.TotalReachLogic",effect=0,icon=0,ad={},param={4}},
+[721]={absType=72,type=73,order=1,turns={701},openDay=7,days=3,eachDays=1,continueDays=0,loopType=7,actName="跨服充值榜1",panelID=7031,startDate={},endDate={},openLv=0,moduleFn="absAct.AbsActBillboardLogic",effect=0,icon=0,ad={},param={2}},
+[722]={absType=72,type=73,order=1,turns={702},openDay=7,days=3,eachDays=15,continueDays=0,loopType=7,actName="跨服充值榜2",panelID=7031,startDate={},endDate={},openLv=0,moduleFn="absAct.AbsActBillboardLogic",effect=0,icon=0,ad={},param={2}},
+[731]={absType=73,type=73,order=1,turns={703},openDay=7,days=3,eachDays=8,continueDays=0,loopType=7,actName="跨服召唤榜1",panelID=7041,startDate={},endDate={},openLv=0,moduleFn="absAct.AbsActBillboardLogic",effect=0,icon=0,ad={},param={1}},
+[732]={absType=73,type=73,order=1,turns={704},openDay=7,days=3,eachDays=22,continueDays=0,loopType=7,actName="跨服召唤榜2",panelID=7041,startDate={},endDate={},openLv=0,moduleFn="absAct.AbsActBillboardLogic",effect=0,icon=0,ad={},param={1}},
+[741]={absType=74,type=27,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="限时狂欢",panelID=7051,startDate={year=2022,month=2,day=17},endDate={year=2022,month=2,day=19},openLv=5,moduleFn="absAct.DailyFixedTaskLogic",effect=0,icon=0,ad={},param={}},
+[742]={absType=74,type=28,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="限时周卡",panelID=7052,startDate={year=2022,month=2,day=17},endDate={year=2022,month=2,day=19},openLv=5,moduleFn="absAct.FestivalSevenDayCardLogic",effect=0,icon=0,ad={},param={}},
+[743]={absType=74,type=1,order=1,turns={601},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="限时好礼",panelID=7053,startDate={year=2022,month=2,day=17},endDate={year=2022,month=2,day=19},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}},
+[1001]={absType=1,type=1,order=1,turns={101,102,104},openDay=0,days=3,eachDays=0,continueDays=0,loopType=3,actName="特惠礼盒",panelID=3305,startDate={},endDate={},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}},
+[2001]={absType=2,type=2,order=1,turns={2001},openDay=10,days=3,eachDays=0,continueDays=6,loopType=3,actName="奥斯曼的礼物",panelID=3702,startDate={},endDate={},openLv=5,moduleFn="absAct.MangHeLogic",effect=0,icon=0,ad={},param={535,1}},
+[3001]={absType=3,type=3,order=1,turns={101,102,103,104,105,106,107,108,109},openDay=9,days=3,eachDays=6,continueDays=0,loopType=3,actName="英雄up",panelID=3703,startDate={},endDate={},openLv=5,moduleFn="absAct.HeroUpLogic",effect=0,icon=0,ad={205011,105008,305008,205010,105007,305006,205007,305007,305011},param={"沙德拉"}},
+[4001]={absType=4,type=4,order=1,turns={101,102,103},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName="英灵召唤",panelID=3704,startDate={},endDate={},openLv=5,moduleFn="absAct.PerpleHeroLogic",effect=0,icon=0,ad={},param={}},
+[4003]={absType=4,type=1,order=1,turns={201,202,203},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName="英雄礼盒",panelID=3706,startDate={},endDate={},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}},
+[4004]={absType=4,type=8,order=1,turns={101,102,103},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName="英灵传说",panelID=3708,startDate={},endDate={},openLv=5,moduleFn="absAct.HeroLoginPickLogic",effect=0,icon=0,ad={},param={}},
+[5001]={absType=6,type=6,order=1,turns={101,102},openDay=16,days=3,eachDays=6,continueDays=0,loopType=3,actName="掉落活动",panelID=3707,startDate={},endDate={},openLv=5,moduleFn="absAct.DropExchangeLogic",effect=0,icon=0,ad={},param={}},
+[5002]={absType=6,type=1,order=1,turns={301,301},openDay=16,days=3,eachDays=6,continueDays=0,loopType=3,actName="掉落礼盒",panelID=3707,startDate={},endDate={},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}},
+[6001]={absType=9,type=9,order=1,turns={101,102,103},openDay=13,days=3,eachDays=6,continueDays=0,loopType=3,actName="占卜轮盘",panelID=3308,startDate={},endDate={},openLv=5,moduleFn="absAct.AbsZhanbuLunpanLogic",effect=0,icon=0,ad={},param={}},
+[8001]={absType=11,type=11,order=1,turns={101,102},openDay=2,days=14,eachDays=0,continueDays=0,loopType=3,actName="打工",panelID=3610,startDate={year=2024,month=6,day=28},endDate={year=2024,month=9,day=28},openLv=5,moduleFn="absAct.HeroGrowUp",effect=0,icon=0,ad={},param={}},
+[10001]={absType=7,type=7,order=1,turns={101,102,103,104,105},openDay=0,days=5,eachDays=0,continueDays=0,loopType=3,actName="英雄兑换",panelID=3307,startDate={},endDate={},openLv=5,moduleFn="absAct.AbsJifenDrawLogic",effect=0,icon=0,ad={},param={}},
+[11001]={absType=10,type=10,order=1,turns={10},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="打赏返利",panelID=3106,startDate={year=2021,month=7,day=27},endDate={year=2121,month=7,day=30},openLv=1,moduleFn="absAct.RechargeBackLogic",effect=0,icon=0,ad={},param={}},
+[12001]={absType=12,type=12,order=1,turns={101,102,103,104},openDay=17,days=3,eachDays=4,continueDays=0,loopType=3,actName="铂金周卡",panelID=3311,startDate={},endDate={},openLv=5,moduleFn="absAct.AbsWeeklyCardLogic",effect=0,icon=0,ad={},param={2005}},
+[13001]={absType=13,type=13,order=1,turns={101},openDay=26,days=9999,eachDays=0,continueDays=0,loopType=4,actName="365王卡",panelID=3312,startDate={},endDate={},openLv=5,moduleFn="absAct.Abs365CardLogic",effect=0,icon=0,ad={},param={}},
+[14001]={absType=14,type=1,order=1,turns={401},openDay=0,days=1,eachDays=0,continueDays=0,loopType=3,actName="每日礼包",panelID=3103,startDate={},endDate={},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}},
+[15001]={absType=15,type=34,order=1,turns={101},openDay=11,days=3,eachDays=6,continueDays=0,loopType=3,actName="洗炼双倍",panelID=3901,startDate={},endDate={},openLv=30,moduleFn="absAct.AbsActMoShouXiLian",effect=0,icon=0,ad={},param={}},
+[17001]={absType=22,type=46,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=4,actName="新服-战力达标",panelID=3609,startDate={},endDate={},openLv=5,moduleFn="absAct.AbsOpenServerTotalConsume",effect=0,icon=0,ad={},param={3,"zhanliReach"}},
+[30001]={absType=5,type=19,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="英雄降临",panelID=5012,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn="absAct.HeroComeLogic",effect=0,icon=0,ad={},param={}},
+[30002]={absType=5,type=22,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="专属任务",panelID=5014,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn="absAct.ExclusiveTaskLogic",effect=0,icon=0,ad={},param={}},
+[30003]={absType=5,type=20,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="夙愿礼盒",panelID=5013,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn="absAct.WishGiftLogic",effect=0,icon=0,ad={},param={}},
+[30004]={absType=5,type=21,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="每日祈福",panelID=5011,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn="absAct.EveryDayPrayLogic",effect=0,icon=0,ad={},param={}},
+[30005]={absType=5,type=14,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="星辰宝藏",panelID=5015,startDate={year=2022,month=2,day=22},endDate={year=2022,month=2,day=28},openLv=5,moduleFn="absAct.AbsSurpriseChest",effect=0,icon=0,ad={},param={}},
+[31001]={absType=15,type=15,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="国庆双倍",panelID=5001,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn="absAct.DoubleChargeLogic",effect=0,icon=0,ad={},param={}},
+[31002]={absType=15,type=18,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="七日狂欢",panelID=5002,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn="absAct.SevenDayLogic",effect=0,icon=0,ad={},param={}},
+[31003]={absType=15,type=16,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="举国欢庆",panelID=5003,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn="absAct.DrumBlastingLogic",effect=0,icon=0,ad={},param={}},
+[31004]={absType=15,type=17,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="节日定制",panelID=5004,startDate={year=2021,month=10,day=1},endDate={year=2021,month=10,day=7},openLv=5,moduleFn="absAct.SpecialCustomLogic",effect=0,icon=0,ad={},param={}},
+[40001]={absType=16,type=18,order=1,turns={102},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName="合服奖励",panelID=5021,startDate={},endDate={},openLv=5,moduleFn="absAct.SevenDayLogic",effect=0,icon=0,ad={},param={}},
+[40002]={absType=16,type=23,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName="特惠秒杀",panelID=5022,startDate={},endDate={},openLv=5,moduleFn="absAct.SeckillGiftLogic",effect=0,icon=0,ad={},param={}},
+[40003]={absType=16,type=24,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName="消费返利",panelID=5023,startDate={},endDate={},openLv=5,moduleFn="absAct.UseDiamondLogic",effect=0,icon=0,ad={},param={}},
+[40004]={absType=16,type=1,order=1,turns={501},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName="合服礼盒",panelID=5024,startDate={},endDate={},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}},
+[40005]={absType=16,type=25,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName="许愿神树",panelID=5025,startDate={},endDate={},openLv=5,moduleFn="absAct.WishCupLogic",effect=0,icon=0,ad={},param={}},
+[40006]={absType=16,type=26,order=1,turns={101},openDay=0,days=7,eachDays=0,continueDays=0,loopType=5,actName="合服排行",panelID=5026,startDate={},endDate={},openLv=5,moduleFn="absAct.AbsReachRankLogic",effect=0,icon=0,ad={},param={"topupRank"}},
+[70001]={absType=19,type=30,order=1,turns={101},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="浪漫邂逅",panelID=5056,startDate={year=2022,month=2,day=14},endDate={year=2022,month=2,day=16},openLv=5,moduleFn="absAct.AbsSignGiftLogic",effect=0,icon=0,ad={},param={}},
+[70002]={absType=19,type=31,order=1,turns={103},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="欢度元宵",panelID=5057,startDate={year=2022,month=2,day=14},endDate={year=2022,month=2,day=16},openLv=5,moduleFn="absAct.DailyFixedTaskLogic",effect=0,icon=0,ad={},param={}},
+[70003]={absType=19,type=33,order=1,turns={103},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="难忘今宵",panelID=5058,startDate={year=2022,month=2,day=14},endDate={year=2022,month=2,day=16},openLv=5,moduleFn="absAct.FestivalSevenDayCardLogic",effect=0,icon=0,ad={},param={}},
+[80001]={absType=20,type=18,order=1,turns={103},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="恭",panelID=5061,startDate={year=2022,month=1,day=31},endDate={year=2022,month=2,day=6},openLv=5,moduleFn="absAct.SevenDayLogic",effect=0,icon=0,ad={},param={}},
+[80002]={absType=20,type=22,order=1,turns={102},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="喜",panelID=5062,startDate={year=2022,month=1,day=31},endDate={year=2022,month=2,day=6},openLv=5,moduleFn="absAct.ExclusiveTaskLogic",effect=0,icon=0,ad={},param={}},
+[80003]={absType=20,type=28,order=1,turns={104},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="发",panelID=5063,startDate={year=2022,month=1,day=31},endDate={year=2022,month=2,day=6},openLv=5,moduleFn="absAct.FestivalSevenDayCardLogic",effect=0,icon=0,ad={},param={}},
+[80004]={absType=20,type=1,order=1,turns={701},openDay=0,days=0,eachDays=0,continueDays=0,loopType=1,actName="财",panelID=5064,startDate={year=2022,month=1,day=31},endDate={year=2022,month=2,day=6},openLv=5,moduleFn="absAct.PremiumGiftLogic",effect=0,icon=0,ad={},param={}}}end)();
 (function()premiumGift={
-[10011]={price=6,cnt=1,reward={{102,300},{118,5},{112,100},{101,200000}},actId=101,icon=0,buyID=10011,needItem={},name=[[特惠材料礼包]]},
-[10012]={price=30,cnt=1,reward={{102,1500},{118,15},{112,500},{111,1000000}},actId=101,icon=0,buyID=10012,needItem={},name=[[特惠材料礼盒]]},
-[10013]={price=68,cnt=1,reward={{102,3400},{118,25},{112,1000},{111,2000000}},actId=101,icon=0,buyID=10013,needItem={},name=[[招募经验礼盒]]},
-[10014]={price=128,cnt=1,reward={{102,6400},{118,35},{112,2000},{101,8000000}},actId=101,icon=0,buyID=10014,needItem={},name=[[招募金币礼盒]]},
-[10015]={price=328,cnt=1,reward={{102,16400},{118,40},{124,2},{127,1000}},actId=101,icon=0,buyID=10015,needItem={},name=[[特惠招募礼盒]]},
-[10016]={price=648,cnt=1,reward={{102,32400},{515,1},{124,3},{134,5000}},actId=101,icon=0,buyID=10016,needItem={},name=[[超级SSR礼盒]]},
-[10021]={price=6,cnt=1,reward={{102,300},{118,5},{112,100},{101,200000}},actId=102,icon=0,buyID=10021,needItem={},name=[[特惠材料礼包]]},
-[10022]={price=30,cnt=1,reward={{102,1500},{118,15},{112,500},{111,1000000}},actId=102,icon=0,buyID=10022,needItem={},name=[[特惠材料礼盒]]},
-[10023]={price=68,cnt=1,reward={{102,3400},{118,25},{111,2000000},{132,1}},actId=102,icon=0,buyID=10023,needItem={},name=[[特惠材料礼包]]},
-[10024]={price=128,cnt=1,reward={{102,6400},{118,35},{124,1},{101,8000000}},actId=102,icon=0,buyID=10024,needItem={},name=[[传说装备礼盒]]},
-[10025]={price=328,cnt=1,reward={{102,16400},{118,40},{548,1},{166,7500}},actId=102,icon=0,buyID=10025,needItem={},name=[[传说装备礼盒]]},
-[10026]={price=648,cnt=1,reward={{102,32400},{118,50},{548,2},{166,15000}},actId=102,icon=0,buyID=10026,needItem={},name=[[传说装备礼盒]]},
-[10031]={price=6,cnt=3,reward={{102,60},{118,1},{112,100},{101,200000}},actId=103,icon=0,buyID=10031,needItem={},name=[[特惠材料礼包]]},
-[10032]={price=30,cnt=3,reward={{102,300},{118,3},{112,500},{111,1000000}},actId=103,icon=0,buyID=10032,needItem={},name=[[特惠材料礼盒]]},
-[10033]={price=68,cnt=3,reward={{102,680},{118,5},{112,1000},{111,2000000}},actId=103,icon=0,buyID=10033,needItem={},name=[[特惠招募礼盒]]},
-[10034]={price=128,cnt=3,reward={{102,1280},{124,1},{118,10},{101,8000000}},actId=103,icon=0,buyID=10034,needItem={},name=[[先知招募礼包]]},
-[10035]={price=328,cnt=3,reward={{102,3280},{124,2},{118,20},{801005,50}},actId=103,icon=0,buyID=10035,needItem={},name=[[先知招募礼盒]]},
-[10036]={price=648,cnt=1,reward={{102,6480},{534,1},{124,3},{134,5000}},actId=103,icon=0,buyID=10036,needItem={},name=[[SSR自选礼盒]]},
-[10041]={price=6,cnt=1,reward={{102,300},{118,5},{112,100},{101,200000}},actId=104,icon=0,buyID=10041,needItem={},name=[[特惠材料礼包]]},
-[10042]={price=30,cnt=1,reward={{102,1500},{118,15},{112,500},{111,1000000}},actId=104,icon=0,buyID=10042,needItem={},name=[[特惠材料礼盒]]},
-[10043]={price=68,cnt=1,reward={{102,3400},{101,4000000},{111,2000000},{132,1}},actId=104,icon=0,buyID=10043,needItem={},name=[[金币经验礼盒]]},
-[10044]={price=128,cnt=1,reward={{102,6400},{80004,1},{118,20},{134,1000}},actId=104,icon=0,buyID=10044,needItem={},name=[[符文招募礼盒]]},
-[10045]={price=328,cnt=1,reward={{102,16400},{118,35},{124,2},{133,2}},actId=104,icon=0,buyID=10045,needItem={},name=[[突破升星礼盒]]},
-[10046]={price=648,cnt=1,reward={{102,32400},{80005,1},{124,3},{114,100}},actId=104,icon=0,buyID=10046,needItem={},name=[[超级符文礼盒]]},
-[20011]={price=6,cnt=1,reward={{102,300},{538,10},{101,1000000}},actId=201,icon=0,buyID=20011,needItem={},name=[[修罗材料礼盒]]},
-[20012]={price=30,cnt=1,reward={{102,1500},{538,15},{101,3000000}},actId=201,icon=0,buyID=20012,needItem={},name=[[修罗普通礼盒]]},
-[20013]={price=128,cnt=3,reward={{102,3000},{538,20},{111,4000000}},actId=201,icon=0,buyID=20013,needItem={},name=[[修罗进阶礼盒]]},
-[20014]={price=328,cnt=10,reward={{102,7000},{538,40},{111,15000000}},actId=201,icon=0,buyID=20014,needItem={},name=[[修罗经验礼盒]]},
-[20015]={price=328,cnt=10,reward={{102,7000},{538,40},{101,25000000}},actId=201,icon=0,buyID=20015,needItem={},name=[[修罗金币礼盒]]},
-[20016]={price=328,cnt=1,reward={{102,7000},{538,30},{556,1}},actId=201,icon=0,buyID=20016,needItem={},name=[[修罗超级礼盒]]},
-[20021]={price=6,cnt=1,reward={{102,300},{538,10},{101,1000000}},actId=202,icon=0,buyID=20021,needItem={},name=[[救世材料礼盒]]},
-[20022]={price=30,cnt=1,reward={{102,1500},{538,15},{101,3000000}},actId=202,icon=0,buyID=20022,needItem={},name=[[救世普通礼盒]]},
-[20023]={price=128,cnt=3,reward={{102,3000},{538,20},{111,4000000}},actId=202,icon=0,buyID=20023,needItem={},name=[[救世进阶礼盒]]},
-[20024]={price=328,cnt=10,reward={{102,7000},{538,40},{111,15000000}},actId=202,icon=0,buyID=20024,needItem={},name=[[救世经验礼盒]]},
-[20025]={price=328,cnt=10,reward={{102,7000},{538,40},{101,25000000}},actId=202,icon=0,buyID=20025,needItem={},name=[[救世金币礼盒]]},
-[20026]={price=328,cnt=1,reward={{102,7000},{538,30},{557,1}},actId=202,icon=0,buyID=20026,needItem={},name=[[救世超级礼盒]]},
-[20031]={price=6,cnt=1,reward={{102,300},{538,10},{101,1000000}},actId=203,icon=0,buyID=20031,needItem={},name=[[舞者材料礼盒]]},
-[20032]={price=30,cnt=1,reward={{102,1500},{538,15},{101,3000000}},actId=203,icon=0,buyID=20032,needItem={},name=[[舞者普通礼盒]]},
-[20033]={price=128,cnt=3,reward={{102,3000},{538,20},{111,4000000}},actId=203,icon=0,buyID=20033,needItem={},name=[[舞者进阶礼盒]]},
-[20034]={price=328,cnt=10,reward={{102,7000},{538,40},{111,15000000}},actId=203,icon=0,buyID=20034,needItem={},name=[[舞者经验礼盒]]},
-[20035]={price=328,cnt=10,reward={{102,7000},{538,40},{101,25000000}},actId=203,icon=0,buyID=20035,needItem={},name=[[舞者金币礼盒]]},
-[20036]={price=328,cnt=1,reward={{102,7000},{538,30},{558,1}},actId=203,icon=0,buyID=20036,needItem={},name=[[舞者超级礼盒]]},
-[30011]={price=6,cnt=1,reward={{102,300},{118,5},{537,10},{101,200000}},actId=301,icon=0,buyID=30011,needItem={},name=[[全神遗物小礼盒]]},
-[30012]={price=30,cnt=1,reward={{102,1500},{118,15},{537,30},{111,300000}},actId=301,icon=0,buyID=30012,needItem={},name=[[全神遗物中礼盒]]},
-[30013]={price=68,cnt=1,reward={{102,3400},{118,25},{537,50},{111,2000000}},actId=301,icon=0,buyID=30013,needItem={},name=[[全神遗物大礼盒]]},
-[30014]={price=128,cnt=1,reward={{102,6400},{118,35},{537,100},{101,8000000}},actId=301,icon=0,buyID=30014,needItem={},name=[[全神遗物特大礼盒]]},
-[30015]={price=328,cnt=1,reward={{102,16400},{118,40},{537,250},{801005,50}},actId=301,icon=0,buyID=30015,needItem={},name=[[全神遗物巨大礼盒]]},
-[30016]={price=648,cnt=1,reward={{102,32400},{118,50},{537,500},{134,5000}},actId=301,icon=0,buyID=30016,needItem={},name=[[全神遗物超级礼盒]]},
-[40001]={price=6,cnt=1,reward={{102,300},{101,200000},{166,300},{112,100}},actId=401,icon=0,buyID=40001,needItem={},name=[[全名礼包]]},
-[40002]={price=12,cnt=1,reward={{102,600},{111,200000},{166,500},{531,3}},actId=401,icon=0,buyID=40002,needItem={},name=[[圣石小礼包]]},
-[40003]={price=30,cnt=1,reward={{102,1000},{101,2000000},{166,1000},{531,6}},actId=401,icon=0,buyID=40003,needItem={},name=[[圣石中礼包]]},
-[40004]={price=68,cnt=1,reward={{102,3000},{127,500},{166,2000},{531,10}},actId=401,icon=0,buyID=40004,needItem={},name=[[圣石大礼包]]},
-[50001]={price=0,cnt=1,reward={{102,200},{112,100},{118,4},{101,200000}},actId=501,icon=10006,buyID=0,needItem={},name=[[免费全民礼盒]]},
-[50002]={price=128,cnt=10,reward={{102,6400},{118,80},{124,6},{127,1000}},actId=501,icon=10002,buyID=50001,needItem={},name=[[特惠招募礼盒]]},
-[50003]={price=128,cnt=10,reward={{102,6400},{118,80},{548,1},{166,7500}},actId=501,icon=10001,buyID=50002,needItem={},name=[[史诗装备礼盒]]},
-[50004]={price=128,cnt=5,reward={{102,6400},{118,80},{124,6},{114,30}},actId=501,icon=10005,buyID=50003,needItem={},name=[[突破升星礼盒]]},
-[50005]={price=328,cnt=5,reward={{102,16400},{534,1},{124,9},{134,5000}},actId=501,icon=10002,buyID=50004,needItem={},name=[[超级SSR礼盒]]},
-[50006]={price=328,cnt=5,reward={{102,16400},{118,180},{548,2},{166,15000}},actId=501,icon=10001,buyID=50005,needItem={},name=[[传说装备礼盒]]},
-[50007]={price=328,cnt=5,reward={{102,16400},{80004,1},{124,9},{133,1}},actId=501,icon=10007,buyID=50006,needItem={},name=[[超级符文礼盒]]},
-[60001]={price=6,cnt=5,reward={{102,300},{101,500000},{118,10},{80003,1}},actId=601,icon=10011,buyID=70001,needItem={},name=[[限时惊喜好礼]]},
-[60002]={price=30,cnt=5,reward={{102,1500},{101,1000000},{124,2},{80004,1}},actId=601,icon=10011,buyID=70002,needItem={},name=[[限时时光好礼]]},
-[60003]={price=68,cnt=5,reward={{102,3400},{101,2000000},{124,5},{134,10000}},actId=601,icon=10010,buyID=70003,needItem={},name=[[限时荆棘好礼]]},
-[60004]={price=128,cnt=5,reward={{102,6400},{101,3000000},{166,15000},{542,1}},actId=601,icon=10010,buyID=70004,needItem={},name=[[限时天启好礼]]},
-[60005]={price=328,cnt=5,reward={{102,16400},{101,4000000},{134,30000},{80005,1}},actId=601,icon=10009,buyID=70005,needItem={},name=[[限时闪耀好礼]]},
-[60006]={price=648,cnt=5,reward={{102,32400},{101,5000000},{543,1},{166,50000}},actId=601,icon=10009,buyID=70006,needItem={},name=[[限时曙光好礼]]},
-[70001]={price=30,cnt=3,reward={{102,600},{120,3},{112,1000},{101,1000000}},actId=701,icon=10011,buyID=80001,needItem={},name=[[瑞虎迎春礼盒]]},
-[70002]={price=68,cnt=3,reward={{102,1360},{120,6},{124,3},{127,500}},actId=701,icon=10011,buyID=80002,needItem={},name=[[瑞虎呈祥礼盒]]},
-[70003]={price=128,cnt=10,reward={{102,2560},{120,15},{118,40},{134,2500}},actId=701,icon=10010,buyID=80003,needItem={},name=[[瑞虎吉祥礼盒]]},
-[70004]={price=328,cnt=10,reward={{102,6560},{120,35},{109,15000},{166,15000}},actId=701,icon=10009,buyID=80004,needItem={},name=[[瑞虎如意礼盒]]},
-[70005]={price=648,cnt=10,reward={{102,12960},{120,70},{80004,2},{124,18}},actId=701,icon=10009,buyID=80005,needItem={},name=[[瑞虎发财礼盒]]}}end)();
+[10011]={price=6,cnt=1,reward={{102,300},{118,5},{112,100},{101,200000}},actId=101,icon=0,buyID=10011,needItem={},name="特惠材料礼包"},
+[10012]={price=30,cnt=1,reward={{102,1500},{118,15},{112,500},{111,1000000}},actId=101,icon=0,buyID=10012,needItem={},name="特惠材料礼盒"},
+[10013]={price=68,cnt=1,reward={{102,3400},{118,25},{112,1000},{111,2000000}},actId=101,icon=0,buyID=10013,needItem={},name="招募经验礼盒"},
+[10014]={price=128,cnt=1,reward={{102,6400},{118,35},{112,2000},{101,8000000}},actId=101,icon=0,buyID=10014,needItem={},name="招募金币礼盒"},
+[10015]={price=328,cnt=1,reward={{102,16400},{118,40},{124,2},{127,1000}},actId=101,icon=0,buyID=10015,needItem={},name="特惠招募礼盒"},
+[10016]={price=648,cnt=1,reward={{102,32400},{515,1},{124,3},{134,5000}},actId=101,icon=0,buyID=10016,needItem={},name="超级SSR礼盒"},
+[10021]={price=6,cnt=1,reward={{102,300},{118,5},{112,100},{101,200000}},actId=102,icon=0,buyID=10021,needItem={},name="特惠材料礼包"},
+[10022]={price=30,cnt=1,reward={{102,1500},{118,15},{112,500},{111,1000000}},actId=102,icon=0,buyID=10022,needItem={},name="特惠材料礼盒"},
+[10023]={price=68,cnt=1,reward={{102,3400},{118,25},{111,2000000},{132,1}},actId=102,icon=0,buyID=10023,needItem={},name="特惠材料礼包"},
+[10024]={price=128,cnt=1,reward={{102,6400},{118,35},{124,1},{101,8000000}},actId=102,icon=0,buyID=10024,needItem={},name="传说装备礼盒"},
+[10025]={price=328,cnt=1,reward={{102,16400},{118,40},{548,1},{166,7500}},actId=102,icon=0,buyID=10025,needItem={},name="传说装备礼盒"},
+[10026]={price=648,cnt=1,reward={{102,32400},{118,50},{548,2},{166,15000}},actId=102,icon=0,buyID=10026,needItem={},name="传说装备礼盒"},
+[10031]={price=6,cnt=3,reward={{102,60},{118,1},{112,100},{101,200000}},actId=103,icon=0,buyID=10031,needItem={},name="特惠材料礼包"},
+[10032]={price=30,cnt=3,reward={{102,300},{118,3},{112,500},{111,1000000}},actId=103,icon=0,buyID=10032,needItem={},name="特惠材料礼盒"},
+[10033]={price=68,cnt=3,reward={{102,680},{118,5},{112,1000},{111,2000000}},actId=103,icon=0,buyID=10033,needItem={},name="特惠招募礼盒"},
+[10034]={price=128,cnt=3,reward={{102,1280},{124,1},{118,10},{101,8000000}},actId=103,icon=0,buyID=10034,needItem={},name="先知招募礼包"},
+[10035]={price=328,cnt=3,reward={{102,3280},{124,2},{118,20},{801005,50}},actId=103,icon=0,buyID=10035,needItem={},name="先知招募礼盒"},
+[10036]={price=648,cnt=1,reward={{102,6480},{534,1},{124,3},{134,5000}},actId=103,icon=0,buyID=10036,needItem={},name="SSR自选礼盒"},
+[10041]={price=6,cnt=1,reward={{102,300},{118,5},{112,100},{101,200000}},actId=104,icon=0,buyID=10041,needItem={},name="特惠材料礼包"},
+[10042]={price=30,cnt=1,reward={{102,1500},{118,15},{112,500},{111,1000000}},actId=104,icon=0,buyID=10042,needItem={},name="特惠材料礼盒"},
+[10043]={price=68,cnt=1,reward={{102,3400},{101,4000000},{111,2000000},{132,1}},actId=104,icon=0,buyID=10043,needItem={},name="金币经验礼盒"},
+[10044]={price=128,cnt=1,reward={{102,6400},{80004,1},{118,20},{134,1000}},actId=104,icon=0,buyID=10044,needItem={},name="符文招募礼盒"},
+[10045]={price=328,cnt=1,reward={{102,16400},{118,35},{124,2},{133,2}},actId=104,icon=0,buyID=10045,needItem={},name="突破升星礼盒"},
+[10046]={price=648,cnt=1,reward={{102,32400},{80005,1},{124,3},{114,100}},actId=104,icon=0,buyID=10046,needItem={},name="超级符文礼盒"},
+[20011]={price=6,cnt=1,reward={{102,300},{538,10},{101,1000000}},actId=201,icon=0,buyID=20011,needItem={},name="修罗材料礼盒"},
+[20012]={price=30,cnt=1,reward={{102,1500},{538,15},{101,3000000}},actId=201,icon=0,buyID=20012,needItem={},name="修罗普通礼盒"},
+[20013]={price=128,cnt=3,reward={{102,3000},{538,20},{111,4000000}},actId=201,icon=0,buyID=20013,needItem={},name="修罗进阶礼盒"},
+[20014]={price=328,cnt=10,reward={{102,7000},{538,40},{111,15000000}},actId=201,icon=0,buyID=20014,needItem={},name="修罗经验礼盒"},
+[20015]={price=328,cnt=10,reward={{102,7000},{538,40},{101,25000000}},actId=201,icon=0,buyID=20015,needItem={},name="修罗金币礼盒"},
+[20016]={price=328,cnt=1,reward={{102,7000},{538,30},{556,1}},actId=201,icon=0,buyID=20016,needItem={},name="修罗超级礼盒"},
+[20021]={price=6,cnt=1,reward={{102,300},{538,10},{101,1000000}},actId=202,icon=0,buyID=20021,needItem={},name="救世材料礼盒"},
+[20022]={price=30,cnt=1,reward={{102,1500},{538,15},{101,3000000}},actId=202,icon=0,buyID=20022,needItem={},name="救世普通礼盒"},
+[20023]={price=128,cnt=3,reward={{102,3000},{538,20},{111,4000000}},actId=202,icon=0,buyID=20023,needItem={},name="救世进阶礼盒"},
+[20024]={price=328,cnt=10,reward={{102,7000},{538,40},{111,15000000}},actId=202,icon=0,buyID=20024,needItem={},name="救世经验礼盒"},
+[20025]={price=328,cnt=10,reward={{102,7000},{538,40},{101,25000000}},actId=202,icon=0,buyID=20025,needItem={},name="救世金币礼盒"},
+[20026]={price=328,cnt=1,reward={{102,7000},{538,30},{557,1}},actId=202,icon=0,buyID=20026,needItem={},name="救世超级礼盒"},
+[20031]={price=6,cnt=1,reward={{102,300},{538,10},{101,1000000}},actId=203,icon=0,buyID=20031,needItem={},name="舞者材料礼盒"},
+[20032]={price=30,cnt=1,reward={{102,1500},{538,15},{101,3000000}},actId=203,icon=0,buyID=20032,needItem={},name="舞者普通礼盒"},
+[20033]={price=128,cnt=3,reward={{102,3000},{538,20},{111,4000000}},actId=203,icon=0,buyID=20033,needItem={},name="舞者进阶礼盒"},
+[20034]={price=328,cnt=10,reward={{102,7000},{538,40},{111,15000000}},actId=203,icon=0,buyID=20034,needItem={},name="舞者经验礼盒"},
+[20035]={price=328,cnt=10,reward={{102,7000},{538,40},{101,25000000}},actId=203,icon=0,buyID=20035,needItem={},name="舞者金币礼盒"},
+[20036]={price=328,cnt=1,reward={{102,7000},{538,30},{558,1}},actId=203,icon=0,buyID=20036,needItem={},name="舞者超级礼盒"},
+[30011]={price=6,cnt=1,reward={{102,300},{118,5},{537,10},{101,200000}},actId=301,icon=0,buyID=30011,needItem={},name="全神遗物小礼盒"},
+[30012]={price=30,cnt=1,reward={{102,1500},{118,15},{537,30},{111,300000}},actId=301,icon=0,buyID=30012,needItem={},name="全神遗物中礼盒"},
+[30013]={price=68,cnt=1,reward={{102,3400},{118,25},{537,50},{111,2000000}},actId=301,icon=0,buyID=30013,needItem={},name="全神遗物大礼盒"},
+[30014]={price=128,cnt=1,reward={{102,6400},{118,35},{537,100},{101,8000000}},actId=301,icon=0,buyID=30014,needItem={},name="全神遗物特大礼盒"},
+[30015]={price=328,cnt=1,reward={{102,16400},{118,40},{537,250},{801005,50}},actId=301,icon=0,buyID=30015,needItem={},name="全神遗物巨大礼盒"},
+[30016]={price=648,cnt=1,reward={{102,32400},{118,50},{537,500},{134,5000}},actId=301,icon=0,buyID=30016,needItem={},name="全神遗物超级礼盒"},
+[40001]={price=6,cnt=1,reward={{102,300},{101,200000},{166,300},{112,100}},actId=401,icon=0,buyID=40001,needItem={},name="全名礼包"},
+[40002]={price=12,cnt=1,reward={{102,600},{111,200000},{166,500},{531,3}},actId=401,icon=0,buyID=40002,needItem={},name="圣石小礼包"},
+[40003]={price=30,cnt=1,reward={{102,1000},{101,2000000},{166,1000},{531,6}},actId=401,icon=0,buyID=40003,needItem={},name="圣石中礼包"},
+[40004]={price=68,cnt=1,reward={{102,3000},{127,500},{166,2000},{531,10}},actId=401,icon=0,buyID=40004,needItem={},name="圣石大礼包"},
+[50001]={price=0,cnt=1,reward={{102,200},{112,100},{118,4},{101,200000}},actId=501,icon=10006,buyID=0,needItem={},name="免费全民礼盒"},
+[50002]={price=128,cnt=10,reward={{102,6400},{118,80},{124,6},{127,1000}},actId=501,icon=10002,buyID=50001,needItem={},name="特惠招募礼盒"},
+[50003]={price=128,cnt=10,reward={{102,6400},{118,80},{548,1},{166,7500}},actId=501,icon=10001,buyID=50002,needItem={},name="史诗装备礼盒"},
+[50004]={price=128,cnt=5,reward={{102,6400},{118,80},{124,6},{114,30}},actId=501,icon=10005,buyID=50003,needItem={},name="突破升星礼盒"},
+[50005]={price=328,cnt=5,reward={{102,16400},{534,1},{124,9},{134,5000}},actId=501,icon=10002,buyID=50004,needItem={},name="超级SSR礼盒"},
+[50006]={price=328,cnt=5,reward={{102,16400},{118,180},{548,2},{166,15000}},actId=501,icon=10001,buyID=50005,needItem={},name="传说装备礼盒"},
+[50007]={price=328,cnt=5,reward={{102,16400},{80004,1},{124,9},{133,1}},actId=501,icon=10007,buyID=50006,needItem={},name="超级符文礼盒"},
+[60001]={price=6,cnt=5,reward={{102,300},{101,500000},{118,10},{80003,1}},actId=601,icon=10011,buyID=70001,needItem={},name="限时惊喜好礼"},
+[60002]={price=30,cnt=5,reward={{102,1500},{101,1000000},{124,2},{80004,1}},actId=601,icon=10011,buyID=70002,needItem={},name="限时时光好礼"},
+[60003]={price=68,cnt=5,reward={{102,3400},{101,2000000},{124,5},{134,10000}},actId=601,icon=10010,buyID=70003,needItem={},name="限时荆棘好礼"},
+[60004]={price=128,cnt=5,reward={{102,6400},{101,3000000},{166,15000},{542,1}},actId=601,icon=10010,buyID=70004,needItem={},name="限时天启好礼"},
+[60005]={price=328,cnt=5,reward={{102,16400},{101,4000000},{134,30000},{80005,1}},actId=601,icon=10009,buyID=70005,needItem={},name="限时闪耀好礼"},
+[60006]={price=648,cnt=5,reward={{102,32400},{101,5000000},{543,1},{166,50000}},actId=601,icon=10009,buyID=70006,needItem={},name="限时曙光好礼"},
+[70001]={price=30,cnt=3,reward={{102,600},{120,3},{112,1000},{101,1000000}},actId=701,icon=10011,buyID=80001,needItem={},name="瑞虎迎春礼盒"},
+[70002]={price=68,cnt=3,reward={{102,1360},{120,6},{124,3},{127,500}},actId=701,icon=10011,buyID=80002,needItem={},name="瑞虎呈祥礼盒"},
+[70003]={price=128,cnt=10,reward={{102,2560},{120,15},{118,40},{134,2500}},actId=701,icon=10010,buyID=80003,needItem={},name="瑞虎吉祥礼盒"},
+[70004]={price=328,cnt=10,reward={{102,6560},{120,35},{109,15000},{166,15000}},actId=701,icon=10009,buyID=80004,needItem={},name="瑞虎如意礼盒"},
+[70005]={price=648,cnt=10,reward={{102,12960},{120,70},{80004,2},{124,18}},actId=701,icon=10009,buyID=80005,needItem={},name="瑞虎发财礼盒"}}end)();
 (function()wishGift={
-[1]={price=68,name=[[]],cnt=1,reward={{102,1360},{547,5},{547,5},{101,3000000}},actId=101,icon=10011,buyID=60001,needItem={}},
-[2]={price=128,name=[[]],cnt=3,reward={{102,2560},{547,10},{547,10},{111,4000000}},actId=101,icon=10010,buyID=60002,needItem={}},
-[3]={price=328,name=[[]],cnt=10,reward={{102,6560},{547,20},{547,20},{101,20000000}},actId=101,icon=10009,buyID=60003,needItem={}},
-[4]={price=328,name=[[]],cnt=10,reward={{102,6560},{547,20},{547,20},{111,10000000}},actId=101,icon=10009,buyID=60004,needItem={}},
-[5]={price=328,name=[[]],cnt=4,reward={{102,6560},{547,20},{547,20},{133,1}},actId=101,icon=10009,buyID=60005,needItem={}}}end)();
+[1]={price=68,name="",cnt=1,reward={{102,1360},{547,5},{547,5},{101,3000000}},actId=101,icon=10011,buyID=60001,needItem={}},
+[2]={price=128,name="",cnt=3,reward={{102,2560},{547,10},{547,10},{111,4000000}},actId=101,icon=10010,buyID=60002,needItem={}},
+[3]={price=328,name="",cnt=10,reward={{102,6560},{547,20},{547,20},{101,20000000}},actId=101,icon=10009,buyID=60003,needItem={}},
+[4]={price=328,name="",cnt=10,reward={{102,6560},{547,20},{547,20},{111,10000000}},actId=101,icon=10009,buyID=60004,needItem={}},
+[5]={price=328,name="",cnt=4,reward={{102,6560},{547,20},{547,20},{133,1}},actId=101,icon=10009,buyID=60005,needItem={}}}end)();
 (function()mangHeGift={
 [1]={price=30,reward={{102,600},{535,10},{118,5}},actId=1,buyID=2001,cnt=30}}end)();
 (function()mangHe={
@@ -184,10 +184,11 @@
 [4]={need=50,item={166,4000}},
 [5]={need=100,item={166,5000}}}end)();
 (function()mangHeMr={
-[1]={item={[2001]={535,2},[2101]={102,200}},desc=[[每日登陆]]},
-[2]={item={[2001]={535,3},[2101]={102,200}},desc=[[每日活跃达到100]]},
-[3]={item={[2001]={535,5},[2101]={102,200}},desc=[[充值任意金额]]}}end)();
-(function()absLogin={}end)();
+[1]={item={[2001]={535,2},[2101]={102,200}},desc="每日登陆"},
+[2]={item={[2001]={535,3},[2101]={102,200}},desc="每日活跃达到100"},
+[3]={item={[2001]={535,5},[2101]={102,200}},desc="充值任意金额"}}end)();
+(function()absLogin={
+}end)();
 (function()heroUp={
 [1]={actID=101,heroId=205011,singlePer=10,tenPer=2000},
 [2]={actID=102,heroId=105008,singlePer=10,tenPer=2000},
@@ -219,48 +220,48 @@
 (function()everyDayPray={
 [101]={items={{205009,50},{105006,50},{305009,50},{105009,50},{205008,50}},loginReward={{547,1},{547,1},{547,1},{547,1},{547,1},{547,1},{547,1}}}}end)();
 (function()heroLog={
-[1]={desc=[[获得1个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[2]={desc=[[获得2个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[3]={desc=[[获得3个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[4]={desc=[[获得4个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[5]={desc=[[获得5个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[6]={desc=[[获得6个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[7]={desc=[[获得7个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[8]={desc=[[获得8个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[9]={desc=[[获得9个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[10]={desc=[[获得10个英雄]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
-[11]={desc=[[获得英雄升至6星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,6}}},
-[12]={desc=[[获得英雄升至7星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,7}}},
-[13]={desc=[[获得英雄升至8星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,8}}},
-[14]={desc=[[获得英雄升至9星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,9}}},
-[15]={desc=[[获得英雄升至10星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,10}}},
-[16]={desc=[[获得英雄升至11星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,11}}},
-[17]={desc=[[获得英雄升至12星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,12}}},
-[18]={desc=[[获得英雄升至13星]],maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,13}}}}end)();
+[1]={desc="获得1个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[2]={desc="获得2个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[3]={desc="获得3个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[4]={desc="获得4个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[5]={desc="获得5个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[6]={desc="获得6个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[7]={desc="获得7个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[8]={desc="获得8个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[9]={desc="获得9个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[10]={desc="获得10个英雄",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=7,rules={205012}},
+[11]={desc="获得英雄升至6星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,6}}},
+[12]={desc="获得英雄升至7星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,7}}},
+[13]={desc="获得英雄升至8星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,8}}},
+[14]={desc="获得英雄升至9星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,9}}},
+[15]={desc="获得英雄升至10星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,10}}},
+[16]={desc="获得英雄升至11星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,11}}},
+[17]={desc="获得英雄升至12星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,12}}},
+[18]={desc="获得英雄升至13星",maxCnt=1,panelID=1303,item={{102,100}},boxItem={{102,100},{117,1}},actID=101,type=8,rules={{205012,13}}}}end)();
 (function()exclusiveTask={
-[1]={desc=[[获得1个活动英雄]],maxCnt=1,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[2]={desc=[[获得2个活动英雄]],maxCnt=2,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[3]={desc=[[获得3个活动英雄]],maxCnt=3,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[4]={desc=[[获得4个活动英雄]],maxCnt=4,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[5]={desc=[[获得5个活动英雄]],maxCnt=5,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[6]={desc=[[获得6个活动英雄]],maxCnt=6,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[7]={desc=[[获得7个活动英雄]],maxCnt=7,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[8]={desc=[[获得8个活动英雄]],maxCnt=8,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[9]={desc=[[获得9个活动英雄]],maxCnt=9,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[10]={desc=[[获得10个活动英雄]],maxCnt=10,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
-[11]={desc=[[活动英雄升至6星]],maxCnt=1,panelID=1101,item={{124,1}},addBoxCnt=10,actID=101,type=8,rules={{505010,6}},refresh=0},
-[12]={desc=[[活动英雄升至7星]],maxCnt=1,panelID=1101,item={{124,2}},addBoxCnt=10,actID=101,type=8,rules={{505010,7}},refresh=0},
-[13]={desc=[[活动英雄升至8星]],maxCnt=1,panelID=1101,item={{124,3}},addBoxCnt=10,actID=101,type=8,rules={{505010,8}},refresh=0},
-[14]={desc=[[活动英雄升至9星]],maxCnt=1,panelID=1101,item={{124,4}},addBoxCnt=10,actID=101,type=8,rules={{505010,9}},refresh=0},
-[15]={desc=[[活动英雄升至10星]],maxCnt=1,panelID=1101,item={{124,5}},addBoxCnt=10,actID=101,type=8,rules={{505010,10}},refresh=0},
-[16]={desc=[[活动英雄升至11星]],maxCnt=1,panelID=1101,item={{124,6}},addBoxCnt=10,actID=101,type=8,rules={{505010,11}},refresh=0},
-[17]={desc=[[活动英雄升至12星]],maxCnt=1,panelID=1101,item={{124,7}},addBoxCnt=10,actID=101,type=8,rules={{505010,12}},refresh=0},
-[18]={desc=[[活动英雄升至13星]],maxCnt=1,panelID=1101,item={{124,8}},addBoxCnt=10,actID=101,type=8,rules={{505010,13}},refresh=0},
-[19]={desc=[[每日登录]],maxCnt=1,panelID=0,item={{101,50000}},addBoxCnt=10,actID=102,type=1,rules={},refresh=1},
-[20]={desc=[[活跃值达到100]],maxCnt=100,panelID=1901,item={{801005,50}},addBoxCnt=10,actID=102,type=2,rules={},refresh=1},
-[21]={desc=[[充值任意金额]],maxCnt=1,panelID=3101,item={{111,200000}},addBoxCnt=10,actID=102,type=3,rules={},refresh=1},
-[22]={desc=[[挑战冰龙巢穴1次]],maxCnt=1,panelID=1713,item={{112,200}},addBoxCnt=10,actID=102,type=4,rules={},refresh=1},
-[23]={desc=[[今日累计消耗5000钻石]],maxCnt=5000,panelID=2002,item={{118,10}},addBoxCnt=10,actID=102,type=5,rules={},refresh=1}}end)();
+[1]={desc="获得1个活动英雄",maxCnt=1,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[2]={desc="获得2个活动英雄",maxCnt=2,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[3]={desc="获得3个活动英雄",maxCnt=3,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[4]={desc="获得4个活动英雄",maxCnt=4,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[5]={desc="获得5个活动英雄",maxCnt=5,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[6]={desc="获得6个活动英雄",maxCnt=6,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[7]={desc="获得7个活动英雄",maxCnt=7,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[8]={desc="获得8个活动英雄",maxCnt=8,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[9]={desc="获得9个活动英雄",maxCnt=9,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[10]={desc="获得10个活动英雄",maxCnt=10,panelID=5012,item={{102,1000}},addBoxCnt=10,actID=101,type=7,rules={505010},refresh=0},
+[11]={desc="活动英雄升至6星",maxCnt=1,panelID=1101,item={{124,1}},addBoxCnt=10,actID=101,type=8,rules={{505010,6}},refresh=0},
+[12]={desc="活动英雄升至7星",maxCnt=1,panelID=1101,item={{124,2}},addBoxCnt=10,actID=101,type=8,rules={{505010,7}},refresh=0},
+[13]={desc="活动英雄升至8星",maxCnt=1,panelID=1101,item={{124,3}},addBoxCnt=10,actID=101,type=8,rules={{505010,8}},refresh=0},
+[14]={desc="活动英雄升至9星",maxCnt=1,panelID=1101,item={{124,4}},addBoxCnt=10,actID=101,type=8,rules={{505010,9}},refresh=0},
+[15]={desc="活动英雄升至10星",maxCnt=1,panelID=1101,item={{124,5}},addBoxCnt=10,actID=101,type=8,rules={{505010,10}},refresh=0},
+[16]={desc="活动英雄升至11星",maxCnt=1,panelID=1101,item={{124,6}},addBoxCnt=10,actID=101,type=8,rules={{505010,11}},refresh=0},
+[17]={desc="活动英雄升至12星",maxCnt=1,panelID=1101,item={{124,7}},addBoxCnt=10,actID=101,type=8,rules={{505010,12}},refresh=0},
+[18]={desc="活动英雄升至13星",maxCnt=1,panelID=1101,item={{124,8}},addBoxCnt=10,actID=101,type=8,rules={{505010,13}},refresh=0},
+[19]={desc="每日登录",maxCnt=1,panelID=0,item={{101,50000}},addBoxCnt=10,actID=102,type=1,rules={},refresh=1},
+[20]={desc="活跃值达到100",maxCnt=100,panelID=1901,item={{801005,50}},addBoxCnt=10,actID=102,type=2,rules={},refresh=1},
+[21]={desc="充值任意金额",maxCnt=1,panelID=3101,item={{111,200000}},addBoxCnt=10,actID=102,type=3,rules={},refresh=1},
+[22]={desc="挑战冰龙巢穴1次",maxCnt=1,panelID=1713,item={{112,200}},addBoxCnt=10,actID=102,type=4,rules={},refresh=1},
+[23]={desc="今日累计消耗5000钻石",maxCnt=5000,panelID=2002,item={{118,10}},addBoxCnt=10,actID=102,type=5,rules={},refresh=1}}end)();
 (function()exclusiveTaskBox={
 [1]={needCnt=30,item={{118,5}},actId=101,buyID=4007},
 [2]={needCnt=60,item={{118,6}},actId=101,buyID=0},
@@ -395,29 +396,29 @@
 [39]={groupID=102,lv=19,items={{102,100}},itemsKing={{118,10},{102,500}},needJifen=0,lastNeedLv=0,lastItems={},lastItemsKing={},buyID=0,kingBuyItems={},kingBuyItems2={}},
 [40]={groupID=102,lv=20,items={{102,100}},itemsKing={{118,10},{124,1}},needJifen=0,lastNeedLv=0,lastItems={},lastItemsKing={},buyID=0,kingBuyItems={},kingBuyItems2={}}}end)();
 (function()heroGrowUpTask={
-[1001]={mainType=1,taskType=1,taskArgs={1},name=[[登录游戏]],desc=[[进行{1}次游戏登录]],items={{539,100}},panelID=0},
-[1003]={mainType=1,taskType=6,taskArgs={1},name=[[战报点赞]],desc=[[进行{1}次战报点赞]],items={{539,100}},panelID=1018},
-[1004]={mainType=1,taskType=2,taskArgs={1},name=[[天命召唤]],desc=[[进行{1}次天命召唤]],items={{539,200}},panelID=1304},
-[1005]={mainType=1,taskType=8,taskArgs={1},name=[[符文合成]],desc=[[合成{1}次任意符文]],items={{539,200}},panelID=1502},
-[1006]={mainType=1,taskType=9,taskArgs={1},name=[[冰龙巢穴]],desc=[[挑战{1}次冰龙巢穴]],items={{539,200}},panelID=1713},
-[1007]={mainType=1,taskType=3,taskArgs={1},name=[[占卜合成]],desc=[[占卜任意合成{1}次]],items={{539,200}},panelID=1403},
-[1008]={mainType=1,taskType=4,taskArgs={2000000},name=[[消耗金币]],desc=[[累计消耗{1}金币]],items={{539,200}},panelID=1101},
-[2001]={mainType=2,taskType=10,taskArgs={10},name=[[商城购买]],desc=[[随机商城购买道具{1}次]],items={{539,500}},panelID=2001},
-[2002]={mainType=2,taskType=12,taskArgs={10,5},name=[[英雄获取]],desc=[[获取{1}个{2}星英雄]],items={{539,500}},panelID=1303},
-[2003]={mainType=2,taskType=13,taskArgs={1},name=[[战神殿]],desc=[[挑战{1}次战神殿]],items={{539,500}},panelID=1804},
-[2004]={mainType=2,taskType=11,taskArgs={20,{105010,205008,305006,405005}},name=[[上阵指定英雄:{1}]],desc=[[冠军联赛胜利{1}次]],items={{539,500}},panelID=1802},
-[2005]={mainType=2,taskType=14,taskArgs={1,32},name=[[王者争霸]],desc=[[进入王者争霸{1}强]],items={{539,500}},panelID=1803},
-[2006]={mainType=2,taskType=4,taskArgs={10000000},name=[[消耗金币]],desc=[[累计消耗{1}金币]],items={{539,500}},panelID=1101},
-[2007]={mainType=2,taskType=5,taskArgs={3000},name=[[消耗钻石]],desc=[[累计消耗{1}钻石]],items={{539,500}},panelID=2002},
-[3001]={mainType=3,taskType=15,taskArgs={150},name=[[悬赏任务]],desc=[[完成{1}次悬赏任务]],items={{539,1000}},panelID=1003},
-[3002]={mainType=3,taskType=12,taskArgs={1,9},name=[[英雄获取]],desc=[[获取{1}个{2}星英雄]],items={{539,1000}},panelID=1101},
-[3003]={mainType=3,taskType=7,taskArgs={250},name=[[冠军联赛]],desc=[[冠军联赛获得{1}场胜利]],items={{539,1000}},panelID=1802},
-[3004]={mainType=3,taskType=16,taskArgs={100},name=[[勇者试炼]],desc=[[勇者试炼胜利{1}次]],items={{539,1000}},panelID=1710},
-[3005]={mainType=3,taskType=17,taskArgs={7},name=[[悬赏任务]],desc=[[接取{1}次红色悬赏任务]],items={{539,1000}},panelID=1003},
-[3006]={mainType=3,taskType=18,taskArgs={50000000},name=[[英雄经验]],desc=[[消耗{1}英雄经验]],items={{539,1000}},panelID=1101},
-[3007]={mainType=3,taskType=20,taskArgs={150},name=[[遗迹探险]],desc=[[击败{1}个遗迹探险守卫]],items={{539,1000}},panelID=1711},
-[3008]={mainType=3,taskType=21,taskArgs={60},name=[[装备分解]],desc=[[分解{1}件任意装备]],items={{539,1000}},panelID=1503},
-[3009]={mainType=3,taskType=19,taskArgs={60},name=[[装备洗练]],desc=[[任意洗练装备{1}次]],items={{539,1000}},panelID=1504}}end)();
+[1001]={mainType=1,taskType=1,taskArgs={1},name="登录游戏",desc="进行{1}次游戏登录",items={{539,100}},panelID=0},
+[1003]={mainType=1,taskType=6,taskArgs={1},name="战报点赞",desc="进行{1}次战报点赞",items={{539,100}},panelID=1018},
+[1004]={mainType=1,taskType=2,taskArgs={1},name="天命召唤",desc="进行{1}次天命召唤",items={{539,200}},panelID=1304},
+[1005]={mainType=1,taskType=8,taskArgs={1},name="符文合成",desc="合成{1}次任意符文",items={{539,200}},panelID=1502},
+[1006]={mainType=1,taskType=9,taskArgs={1},name="冰龙巢穴",desc="挑战{1}次冰龙巢穴",items={{539,200}},panelID=1713},
+[1007]={mainType=1,taskType=3,taskArgs={1},name="占卜合成",desc="占卜任意合成{1}次",items={{539,200}},panelID=1403},
+[1008]={mainType=1,taskType=4,taskArgs={2000000},name="消耗金币",desc="累计消耗{1}金币",items={{539,200}},panelID=1101},
+[2001]={mainType=2,taskType=10,taskArgs={10},name="商城购买",desc="随机商城购买道具{1}次",items={{539,500}},panelID=2001},
+[2002]={mainType=2,taskType=12,taskArgs={10,5},name="英雄获取",desc="获取{1}个{2}星英雄",items={{539,500}},panelID=1303},
+[2003]={mainType=2,taskType=13,taskArgs={1},name="战神殿",desc="挑战{1}次战神殿",items={{539,500}},panelID=1804},
+[2004]={mainType=2,taskType=11,taskArgs={20,{105010,205008,305006,405005}},name="上阵指定英雄:{1}",desc="冠军联赛胜利{1}次",items={{539,500}},panelID=1802},
+[2005]={mainType=2,taskType=14,taskArgs={1,32},name="王者争霸",desc="进入王者争霸{1}强",items={{539,500}},panelID=1803},
+[2006]={mainType=2,taskType=4,taskArgs={10000000},name="消耗金币",desc="累计消耗{1}金币",items={{539,500}},panelID=1101},
+[2007]={mainType=2,taskType=5,taskArgs={3000},name="消耗钻石",desc="累计消耗{1}钻石",items={{539,500}},panelID=2002},
+[3001]={mainType=3,taskType=15,taskArgs={150},name="悬赏任务",desc="完成{1}次悬赏任务",items={{539,1000}},panelID=1003},
+[3002]={mainType=3,taskType=12,taskArgs={1,9},name="英雄获取",desc="获取{1}个{2}星英雄",items={{539,1000}},panelID=1101},
+[3003]={mainType=3,taskType=7,taskArgs={250},name="冠军联赛",desc="冠军联赛获得{1}场胜利",items={{539,1000}},panelID=1802},
+[3004]={mainType=3,taskType=16,taskArgs={100},name="勇者试炼",desc="勇者试炼胜利{1}次",items={{539,1000}},panelID=1710},
+[3005]={mainType=3,taskType=17,taskArgs={7},name="悬赏任务",desc="接取{1}次红色悬赏任务",items={{539,1000}},panelID=1003},
+[3006]={mainType=3,taskType=18,taskArgs={50000000},name="英雄经验",desc="消耗{1}英雄经验",items={{539,1000}},panelID=1101},
+[3007]={mainType=3,taskType=20,taskArgs={150},name="遗迹探险",desc="击败{1}个遗迹探险守卫",items={{539,1000}},panelID=1711},
+[3008]={mainType=3,taskType=21,taskArgs={60},name="装备分解",desc="分解{1}件任意装备",items={{539,1000}},panelID=1503},
+[3009]={mainType=3,taskType=19,taskArgs={60},name="装备洗练",desc="任意洗练装备{1}次",items={{539,1000}},panelID=1504}}end)();
 (function()absWeeklyCard={
 [1]={[101]={{118,10}},[102]={{124,1}},[103]={{118,10}},[104]={{124,1}}},
 [2]={[101]={{102,1888}},[102]={{102,1888}},[103]={{102,1888}},[104]={{102,1888}}},
@@ -427,15 +428,15 @@
 [6]={[101]={{127,1000}},[102]={{128,30}},[103]={{127,1000}},[104]={{128,30}}},
 [7]={[101]={{109,8888}},[102]={{109,8888}},[103]={{109,8888}},[104]={{109,8888}}}}end)();
 (function()abs365Card={
-[101]={item={{101,10000000,1100},{111,5000000,1100},{112,1000,1100},{134,1000,1050},{801004,100,1000},{801005,50,1000},{118,10,1000},{124,1,1000},{80003,1,700},{102,1000,800},{132,1,150}},item2={{101,100000,1000},{111,20000,1000},{112,100,1000},{134,100,1000},{118,1,1000}},desc=[[]]}}end)();
+[101]={item={{101,10000000,1100},{111,5000000,1100},{112,1000,1100},{134,1000,1050},{801004,100,1000},{801005,50,1000},{118,10,1000},{124,1,1000},{80003,1,700},{102,1000,800},{132,1,150}},item2={{101,100000,1000},{111,20000,1000},{112,100,1000},{134,100,1000},{118,1,1000}},desc=""}}end)();
 (function()surpriseChest={
-[1]={day=1,desc=[[活跃度达到{1}点]],maxCnt=100,panelID=1901,items={{801005,10},{801004,20},{111,40000},{112,100}},yuanbao=500,actId=101,type=1},
-[2]={day=2,desc=[[冠军联赛挑战{1}次]],maxCnt=20,panelID=1802,items={{801005,10},{801004,20},{101,200000},{547,1}},yuanbao=500,actId=101,type=2},
-[3]={day=3,desc=[[在线时长达到{1}分钟]],maxCnt=30,panelID=0,items={{801005,10},{801004,20},{111,40000},{112,100}},yuanbao=500,actId=101,type=3},
-[4]={day=4,desc=[[接取任意悬赏任务{1}次]],maxCnt=10,panelID=1003,items={{801005,10},{801004,20},{101,200000},{547,1}},yuanbao=500,actId=101,type=4},
-[5]={day=5,desc=[[占卜消耗{1}个占卜币]],maxCnt=150,panelID=1403,items={{801005,10},{801004,20},{111,40000},{101,200000}},yuanbao=500,actId=101,type=5},
-[6]={day=6,desc=[[挑战{1}次公会boss]],maxCnt=9,panelID=1603,items={{801005,10},{801004,20},{112,100},{547,1}},yuanbao=500,actId=101,type=6},
-[7]={day=7,desc=[[参与女巫森林{1}次]],maxCnt=20,panelID=1704,items={{801055,50},{547,2}},yuanbao=500,actId=101,type=7}}end)();
+[1]={day=1,desc="活跃度达到{1}点",maxCnt=100,panelID=1901,items={{801005,10},{801004,20},{111,40000},{112,100}},yuanbao=500,actId=101,type=1},
+[2]={day=2,desc="冠军联赛挑战{1}次",maxCnt=20,panelID=1802,items={{801005,10},{801004,20},{101,200000},{547,1}},yuanbao=500,actId=101,type=2},
+[3]={day=3,desc="在线时长达到{1}分钟",maxCnt=30,panelID=0,items={{801005,10},{801004,20},{111,40000},{112,100}},yuanbao=500,actId=101,type=3},
+[4]={day=4,desc="接取任意悬赏任务{1}次",maxCnt=10,panelID=1003,items={{801005,10},{801004,20},{101,200000},{547,1}},yuanbao=500,actId=101,type=4},
+[5]={day=5,desc="占卜消耗{1}个占卜币",maxCnt=150,panelID=1403,items={{801005,10},{801004,20},{111,40000},{101,200000}},yuanbao=500,actId=101,type=5},
+[6]={day=6,desc="挑战{1}次公会boss",maxCnt=9,panelID=1603,items={{801005,10},{801004,20},{112,100},{547,1}},yuanbao=500,actId=101,type=6},
+[7]={day=7,desc="参与女巫森林{1}次",maxCnt=20,panelID=1704,items={{801055,50},{547,2}},yuanbao=500,actId=101,type=7}}end)();
 (function()sevenDay={
 [1]={day=1,item={{101,500000}},actId=101},
 [2]={day=2,item={{102,200}},actId=101},
@@ -466,183 +467,183 @@
 [27]={day=6,item={{801005,50}},actId=103},
 [28]={day=7,item={{120,2}},actId=103}}end)();
 (function()drum={
-[1]={day=1,desc=[[活跃值达到50点]],name=[[福袋任务1]],needCnt=50,panelID=1901,item={{101,30000},{102,10}},blasting={1,4},type=1,actId=101},
-[2]={day=1,desc=[[进行3次英雄召唤]],name=[[福袋任务2]],needCnt=3,panelID=1303,item={{101,30000},{102,10}},blasting={1,5},type=2,actId=101},
-[3]={day=1,desc=[[恶魔之塔挑战成功或扫荡1次]],name=[[福袋任务3]],needCnt=1,panelID=1703,item={{101,30000},{102,10}},blasting={1,6},type=3,actId=101},
-[4]={day=1,desc=[[进行5次英雄召唤]],name=[[福袋任务4]],needCnt=5,panelID=1303,item={{101,30000},{102,10}},blasting={2,4},type=2,actId=101},
-[5]={day=1,desc=[[活跃值达到75点]],name=[[福袋任务5]],needCnt=75,panelID=1901,item={{101,30000},{102,10}},blasting={2,5},type=1,actId=101},
-[6]={day=1,desc=[[恶魔之塔挑战成功或扫荡2次]],name=[[福袋任务6]],needCnt=2,panelID=1703,item={{101,30000},{102,10}},blasting={2,6},type=3,actId=101},
-[7]={day=1,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[8]={day=1,desc=[[进行10次英雄召唤]],name=[[福袋任务8]],needCnt=10,panelID=1303,item={{101,30000},{102,10}},blasting={3,5},type=2,actId=101},
-[9]={day=1,desc=[[活跃值达到100点]],name=[[福袋任务9]],needCnt=100,panelID=1901,item={{101,30000},{102,10}},blasting={3,6},type=1,actId=101},
-[10]={day=2,desc=[[勇者试炼胜利3次]],name=[[福袋任务1]],needCnt=3,panelID=1710,item={{101,30000},{102,10}},blasting={1,4},type=5,actId=101},
-[11]={day=2,desc=[[参与4次女巫森林]],name=[[福袋任务2]],needCnt=4,panelID=1704,item={{101,30000},{102,10}},blasting={1,5},type=6,actId=101},
-[12]={day=2,desc=[[冠军联赛挑战5次]],name=[[福袋任务3]],needCnt=5,panelID=1802,item={{101,30000},{102,10}},blasting={1,6},type=7,actId=101},
-[13]={day=2,desc=[[参与6次女巫森林]],name=[[福袋任务4]],needCnt=6,panelID=1704,item={{101,30000},{102,10}},blasting={2,4},type=6,actId=101},
-[14]={day=2,desc=[[勇者试炼胜利5次]],name=[[福袋任务5]],needCnt=5,panelID=1710,item={{101,30000},{102,10}},blasting={2,5},type=5,actId=101},
-[15]={day=2,desc=[[冠军联赛挑战10次]],name=[[福袋任务6]],needCnt=10,panelID=1802,item={{101,30000},{102,10}},blasting={2,6},type=7,actId=101},
-[16]={day=2,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[17]={day=2,desc=[[参与10次女巫森林]],name=[[福袋任务8]],needCnt=10,panelID=1704,item={{101,30000},{102,10}},blasting={3,5},type=6,actId=101},
-[18]={day=2,desc=[[勇者试炼胜利7次]],name=[[福袋任务9]],needCnt=7,panelID=1710,item={{101,30000},{102,10}},blasting={3,6},type=5,actId=101},
-[19]={day=3,desc=[[随机商城购买3次]],name=[[福袋任务1]],needCnt=3,panelID=2001,item={{101,30000},{102,10}},blasting={1,4},type=8,actId=101},
-[20]={day=3,desc=[[冒险扫荡1次]],name=[[福袋任务2]],needCnt=1,panelID=1011,item={{101,30000},{102,10}},blasting={1,5},type=9,actId=101},
-[21]={day=3,desc=[[挑战冰龙巢穴1次]],name=[[福袋任务3]],needCnt=1,panelID=1713,item={{101,30000},{102,10}},blasting={1,6},type=10,actId=101},
-[22]={day=3,desc=[[冒险扫荡2次]],name=[[福袋任务4]],needCnt=2,panelID=1011,item={{101,30000},{102,10}},blasting={2,4},type=9,actId=101},
-[23]={day=3,desc=[[随机商城购买6次]],name=[[福袋任务5]],needCnt=6,panelID=2001,item={{101,30000},{102,10}},blasting={2,5},type=8,actId=101},
-[24]={day=3,desc=[[金币购买6次]],name=[[福袋任务6]],needCnt=6,panelID=3000,item={{101,30000},{102,10}},blasting={2,6},type=11,actId=101},
-[25]={day=3,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[26]={day=3,desc=[[冒险扫荡3次]],name=[[福袋任务8]],needCnt=3,panelID=1011,item={{101,30000},{102,10}},blasting={3,5},type=9,actId=101},
-[27]={day=3,desc=[[随机商城购买10次]],name=[[福袋任务9]],needCnt=10,panelID=2001,item={{101,30000},{102,10}},blasting={3,6},type=8,actId=101},
-[28]={day=4,desc=[[接取悬赏任务3次]],name=[[福袋任务1]],needCnt=3,panelID=1003,item={{101,30000},{102,10}},blasting={1,4},type=12,actId=101},
-[29]={day=4,desc=[[恶魔之塔挑战成功或扫荡2次]],name=[[福袋任务2]],needCnt=2,panelID=1703,item={{101,30000},{102,10}},blasting={1,5},type=3,actId=101},
-[30]={day=4,desc=[[进行1次公会捐款]],name=[[福袋任务3]],needCnt=1,panelID=1604,item={{101,30000},{102,10}},blasting={1,6},type=13,actId=101},
-[31]={day=4,desc=[[恶魔之塔挑战成功或扫荡3次]],name=[[福袋任务4]],needCnt=3,panelID=1703,item={{101,30000},{102,10}},blasting={2,4},type=3,actId=101},
-[32]={day=4,desc=[[接取悬赏任务5次]],name=[[福袋任务5]],needCnt=5,panelID=1003,item={{101,30000},{102,10}},blasting={2,5},type=12,actId=101},
-[33]={day=4,desc=[[挑战公会首领3次]],name=[[福袋任务6]],needCnt=3,panelID=1603,item={{101,30000},{102,10}},blasting={2,6},type=14,actId=101},
-[34]={day=4,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[35]={day=4,desc=[[恶魔之塔挑战成功或扫荡4次]],name=[[福袋任务8]],needCnt=4,panelID=1703,item={{101,30000},{102,10}},blasting={3,5},type=3,actId=101},
-[36]={day=4,desc=[[接取悬赏任务7次]],name=[[福袋任务9]],needCnt=7,panelID=1003,item={{101,30000},{102,10}},blasting={3,6},type=12,actId=101},
-[37]={day=5,desc=[[占卜消耗50个占卜币]],name=[[福袋任务1]],needCnt=50,panelID=1403,item={{101,30000},{102,10}},blasting={1,4},type=15,actId=101},
-[38]={day=5,desc=[[今日累计消耗钻石500]],name=[[福袋任务2]],needCnt=500,panelID=2001,item={{101,30000},{102,10}},blasting={1,5},type=16,actId=101},
-[39]={day=5,desc=[[参与10次女巫森林]],name=[[福袋任务3]],needCnt=10,panelID=1704,item={{101,30000},{102,10}},blasting={1,6},type=6,actId=101},
-[40]={day=5,desc=[[今日累计消耗钻石1000]],name=[[福袋任务4]],needCnt=1000,panelID=2001,item={{101,30000},{102,10}},blasting={2,4},type=16,actId=101},
-[41]={day=5,desc=[[占卜消耗70个占卜币]],name=[[福袋任务5]],needCnt=70,panelID=1403,item={{101,30000},{102,10}},blasting={2,5},type=15,actId=101},
-[42]={day=5,desc=[[参与1次绝望深渊]],name=[[福袋任务6]],needCnt=1,panelID=1709,item={{101,30000},{102,10}},blasting={2,6},type=17,actId=101},
-[43]={day=5,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[44]={day=5,desc=[[今日累计消耗钻石1500]],name=[[福袋任务8]],needCnt=1500,panelID=2001,item={{101,30000},{102,10}},blasting={3,5},type=16,actId=101},
-[45]={day=5,desc=[[占卜消耗120个占卜币]],name=[[福袋任务9]],needCnt=120,panelID=1403,item={{101,30000},{102,10}},blasting={3,6},type=15,actId=101},
-[46]={day=6,desc=[[合成1次符文]],name=[[福袋任务1]],needCnt=1,panelID=1502,item={{101,30000},{102,10}},blasting={1,4},type=18,actId=101},
-[47]={day=6,desc=[[冒险扫荡2次]],name=[[福袋任务2]],needCnt=2,panelID=1011,item={{101,30000},{102,10}},blasting={1,5},type=9,actId=101},
-[48]={day=6,desc=[[挑战公会首领5次]],name=[[福袋任务3]],needCnt=5,panelID=1603,item={{101,30000},{102,10}},blasting={1,6},type=14,actId=101},
-[49]={day=6,desc=[[冒险扫荡3次]],name=[[福袋任务4]],needCnt=3,panelID=1011,item={{101,30000},{102,10}},blasting={2,4},type=9,actId=101},
-[50]={day=6,desc=[[合成2次符文]],name=[[福袋任务5]],needCnt=2,panelID=1502,item={{101,30000},{102,10}},blasting={2,5},type=18,actId=101},
-[51]={day=6,desc=[[挑战公会首领8次]],name=[[福袋任务6]],needCnt=8,panelID=1603,item={{101,30000},{102,10}},blasting={2,6},type=14,actId=101},
-[52]={day=6,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[53]={day=6,desc=[[冒险扫荡5次]],name=[[福袋任务8]],needCnt=5,panelID=1011,item={{101,30000},{102,10}},blasting={3,5},type=9,actId=101},
-[54]={day=6,desc=[[合成3次符文]],name=[[福袋任务9]],needCnt=3,panelID=1502,item={{101,30000},{102,10}},blasting={3,6},type=18,actId=101},
-[55]={day=7,desc=[[冠军联赛挑战5次]],name=[[福袋任务1]],needCnt=5,panelID=1802,item={{101,30000},{102,10}},blasting={1,4},type=7,actId=101},
-[56]={day=7,desc=[[占卜消耗150个占卜币]],name=[[福袋任务2]],needCnt=150,panelID=1403,item={{101,30000},{102,10}},blasting={1,5},type=15,actId=101},
-[57]={day=7,desc=[[进行20次英雄召唤]],name=[[福袋任务3]],needCnt=20,panelID=1303,item={{101,30000},{102,10}},blasting={1,6},type=2,actId=101},
-[58]={day=7,desc=[[参与1次绝望深渊]],name=[[福袋任务4]],needCnt=1,panelID=1709,item={{101,30000},{102,10}},blasting={2,4},type=17,actId=101},
-[59]={day=7,desc=[[冠军联赛挑战10次]],name=[[福袋任务5]],needCnt=10,panelID=1802,item={{101,30000},{102,10}},blasting={2,5},type=7,actId=101},
-[60]={day=7,desc=[[挑战冰龙巢穴1次]],name=[[福袋任务6]],needCnt=1,panelID=1713,item={{101,30000},{102,10}},blasting={2,6},type=10,actId=101},
-[61]={day=7,desc=[[累计充值6元]],name=[[福袋任务7]],needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
-[62]={day=7,desc=[[勇者试炼胜利10次]],name=[[福袋任务8]],needCnt=10,panelID=1710,item={{101,30000},{102,10}},blasting={3,5},type=5,actId=101},
-[63]={day=7,desc=[[冠军联赛挑战15次]],name=[[福袋任务9]],needCnt=15,panelID=1802,item={{101,30000},{102,10}},blasting={3,6},type=7,actId=101}}end)();
+[1]={day=1,desc="活跃值达到50点",name="福袋任务1",needCnt=50,panelID=1901,item={{101,30000},{102,10}},blasting={1,4},type=1,actId=101},
+[2]={day=1,desc="进行3次英雄召唤",name="福袋任务2",needCnt=3,panelID=1303,item={{101,30000},{102,10}},blasting={1,5},type=2,actId=101},
+[3]={day=1,desc="恶魔之塔挑战成功或扫荡1次",name="福袋任务3",needCnt=1,panelID=1703,item={{101,30000},{102,10}},blasting={1,6},type=3,actId=101},
+[4]={day=1,desc="进行5次英雄召唤",name="福袋任务4",needCnt=5,panelID=1303,item={{101,30000},{102,10}},blasting={2,4},type=2,actId=101},
+[5]={day=1,desc="活跃值达到75点",name="福袋任务5",needCnt=75,panelID=1901,item={{101,30000},{102,10}},blasting={2,5},type=1,actId=101},
+[6]={day=1,desc="恶魔之塔挑战成功或扫荡2次",name="福袋任务6",needCnt=2,panelID=1703,item={{101,30000},{102,10}},blasting={2,6},type=3,actId=101},
+[7]={day=1,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[8]={day=1,desc="进行10次英雄召唤",name="福袋任务8",needCnt=10,panelID=1303,item={{101,30000},{102,10}},blasting={3,5},type=2,actId=101},
+[9]={day=1,desc="活跃值达到100点",name="福袋任务9",needCnt=100,panelID=1901,item={{101,30000},{102,10}},blasting={3,6},type=1,actId=101},
+[10]={day=2,desc="勇者试炼胜利3次",name="福袋任务1",needCnt=3,panelID=1710,item={{101,30000},{102,10}},blasting={1,4},type=5,actId=101},
+[11]={day=2,desc="参与4次女巫森林",name="福袋任务2",needCnt=4,panelID=1704,item={{101,30000},{102,10}},blasting={1,5},type=6,actId=101},
+[12]={day=2,desc="冠军联赛挑战5次",name="福袋任务3",needCnt=5,panelID=1802,item={{101,30000},{102,10}},blasting={1,6},type=7,actId=101},
+[13]={day=2,desc="参与6次女巫森林",name="福袋任务4",needCnt=6,panelID=1704,item={{101,30000},{102,10}},blasting={2,4},type=6,actId=101},
+[14]={day=2,desc="勇者试炼胜利5次",name="福袋任务5",needCnt=5,panelID=1710,item={{101,30000},{102,10}},blasting={2,5},type=5,actId=101},
+[15]={day=2,desc="冠军联赛挑战10次",name="福袋任务6",needCnt=10,panelID=1802,item={{101,30000},{102,10}},blasting={2,6},type=7,actId=101},
+[16]={day=2,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[17]={day=2,desc="参与10次女巫森林",name="福袋任务8",needCnt=10,panelID=1704,item={{101,30000},{102,10}},blasting={3,5},type=6,actId=101},
+[18]={day=2,desc="勇者试炼胜利7次",name="福袋任务9",needCnt=7,panelID=1710,item={{101,30000},{102,10}},blasting={3,6},type=5,actId=101},
+[19]={day=3,desc="随机商城购买3次",name="福袋任务1",needCnt=3,panelID=2001,item={{101,30000},{102,10}},blasting={1,4},type=8,actId=101},
+[20]={day=3,desc="冒险扫荡1次",name="福袋任务2",needCnt=1,panelID=1011,item={{101,30000},{102,10}},blasting={1,5},type=9,actId=101},
+[21]={day=3,desc="挑战冰龙巢穴1次",name="福袋任务3",needCnt=1,panelID=1713,item={{101,30000},{102,10}},blasting={1,6},type=10,actId=101},
+[22]={day=3,desc="冒险扫荡2次",name="福袋任务4",needCnt=2,panelID=1011,item={{101,30000},{102,10}},blasting={2,4},type=9,actId=101},
+[23]={day=3,desc="随机商城购买6次",name="福袋任务5",needCnt=6,panelID=2001,item={{101,30000},{102,10}},blasting={2,5},type=8,actId=101},
+[24]={day=3,desc="金币购买6次",name="福袋任务6",needCnt=6,panelID=3000,item={{101,30000},{102,10}},blasting={2,6},type=11,actId=101},
+[25]={day=3,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[26]={day=3,desc="冒险扫荡3次",name="福袋任务8",needCnt=3,panelID=1011,item={{101,30000},{102,10}},blasting={3,5},type=9,actId=101},
+[27]={day=3,desc="随机商城购买10次",name="福袋任务9",needCnt=10,panelID=2001,item={{101,30000},{102,10}},blasting={3,6},type=8,actId=101},
+[28]={day=4,desc="接取悬赏任务3次",name="福袋任务1",needCnt=3,panelID=1003,item={{101,30000},{102,10}},blasting={1,4},type=12,actId=101},
+[29]={day=4,desc="恶魔之塔挑战成功或扫荡2次",name="福袋任务2",needCnt=2,panelID=1703,item={{101,30000},{102,10}},blasting={1,5},type=3,actId=101},
+[30]={day=4,desc="进行1次公会捐款",name="福袋任务3",needCnt=1,panelID=1604,item={{101,30000},{102,10}},blasting={1,6},type=13,actId=101},
+[31]={day=4,desc="恶魔之塔挑战成功或扫荡3次",name="福袋任务4",needCnt=3,panelID=1703,item={{101,30000},{102,10}},blasting={2,4},type=3,actId=101},
+[32]={day=4,desc="接取悬赏任务5次",name="福袋任务5",needCnt=5,panelID=1003,item={{101,30000},{102,10}},blasting={2,5},type=12,actId=101},
+[33]={day=4,desc="挑战公会首领3次",name="福袋任务6",needCnt=3,panelID=1603,item={{101,30000},{102,10}},blasting={2,6},type=14,actId=101},
+[34]={day=4,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[35]={day=4,desc="恶魔之塔挑战成功或扫荡4次",name="福袋任务8",needCnt=4,panelID=1703,item={{101,30000},{102,10}},blasting={3,5},type=3,actId=101},
+[36]={day=4,desc="接取悬赏任务7次",name="福袋任务9",needCnt=7,panelID=1003,item={{101,30000},{102,10}},blasting={3,6},type=12,actId=101},
+[37]={day=5,desc="占卜消耗50个占卜币",name="福袋任务1",needCnt=50,panelID=1403,item={{101,30000},{102,10}},blasting={1,4},type=15,actId=101},
+[38]={day=5,desc="今日累计消耗钻石500",name="福袋任务2",needCnt=500,panelID=2001,item={{101,30000},{102,10}},blasting={1,5},type=16,actId=101},
+[39]={day=5,desc="参与10次女巫森林",name="福袋任务3",needCnt=10,panelID=1704,item={{101,30000},{102,10}},blasting={1,6},type=6,actId=101},
+[40]={day=5,desc="今日累计消耗钻石1000",name="福袋任务4",needCnt=1000,panelID=2001,item={{101,30000},{102,10}},blasting={2,4},type=16,actId=101},
+[41]={day=5,desc="占卜消耗70个占卜币",name="福袋任务5",needCnt=70,panelID=1403,item={{101,30000},{102,10}},blasting={2,5},type=15,actId=101},
+[42]={day=5,desc="参与1次绝望深渊",name="福袋任务6",needCnt=1,panelID=1709,item={{101,30000},{102,10}},blasting={2,6},type=17,actId=101},
+[43]={day=5,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[44]={day=5,desc="今日累计消耗钻石1500",name="福袋任务8",needCnt=1500,panelID=2001,item={{101,30000},{102,10}},blasting={3,5},type=16,actId=101},
+[45]={day=5,desc="占卜消耗120个占卜币",name="福袋任务9",needCnt=120,panelID=1403,item={{101,30000},{102,10}},blasting={3,6},type=15,actId=101},
+[46]={day=6,desc="合成1次符文",name="福袋任务1",needCnt=1,panelID=1502,item={{101,30000},{102,10}},blasting={1,4},type=18,actId=101},
+[47]={day=6,desc="冒险扫荡2次",name="福袋任务2",needCnt=2,panelID=1011,item={{101,30000},{102,10}},blasting={1,5},type=9,actId=101},
+[48]={day=6,desc="挑战公会首领5次",name="福袋任务3",needCnt=5,panelID=1603,item={{101,30000},{102,10}},blasting={1,6},type=14,actId=101},
+[49]={day=6,desc="冒险扫荡3次",name="福袋任务4",needCnt=3,panelID=1011,item={{101,30000},{102,10}},blasting={2,4},type=9,actId=101},
+[50]={day=6,desc="合成2次符文",name="福袋任务5",needCnt=2,panelID=1502,item={{101,30000},{102,10}},blasting={2,5},type=18,actId=101},
+[51]={day=6,desc="挑战公会首领8次",name="福袋任务6",needCnt=8,panelID=1603,item={{101,30000},{102,10}},blasting={2,6},type=14,actId=101},
+[52]={day=6,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[53]={day=6,desc="冒险扫荡5次",name="福袋任务8",needCnt=5,panelID=1011,item={{101,30000},{102,10}},blasting={3,5},type=9,actId=101},
+[54]={day=6,desc="合成3次符文",name="福袋任务9",needCnt=3,panelID=1502,item={{101,30000},{102,10}},blasting={3,6},type=18,actId=101},
+[55]={day=7,desc="冠军联赛挑战5次",name="福袋任务1",needCnt=5,panelID=1802,item={{101,30000},{102,10}},blasting={1,4},type=7,actId=101},
+[56]={day=7,desc="占卜消耗150个占卜币",name="福袋任务2",needCnt=150,panelID=1403,item={{101,30000},{102,10}},blasting={1,5},type=15,actId=101},
+[57]={day=7,desc="进行20次英雄召唤",name="福袋任务3",needCnt=20,panelID=1303,item={{101,30000},{102,10}},blasting={1,6},type=2,actId=101},
+[58]={day=7,desc="参与1次绝望深渊",name="福袋任务4",needCnt=1,panelID=1709,item={{101,30000},{102,10}},blasting={2,4},type=17,actId=101},
+[59]={day=7,desc="冠军联赛挑战10次",name="福袋任务5",needCnt=10,panelID=1802,item={{101,30000},{102,10}},blasting={2,5},type=7,actId=101},
+[60]={day=7,desc="挑战冰龙巢穴1次",name="福袋任务6",needCnt=1,panelID=1713,item={{101,30000},{102,10}},blasting={2,6},type=10,actId=101},
+[61]={day=7,desc="累计充值6元",name="福袋任务7",needCnt=6,panelID=3100,item={{101,30000},{102,10}},blasting={3,4},type=4,actId=101},
+[62]={day=7,desc="勇者试炼胜利10次",name="福袋任务8",needCnt=10,panelID=1710,item={{101,30000},{102,10}},blasting={3,5},type=5,actId=101},
+[63]={day=7,desc="冠军联赛挑战15次",name="福袋任务9",needCnt=15,panelID=1802,item={{101,30000},{102,10}},blasting={3,6},type=7,actId=101}}end)();
 (function()blasting={
-[1]={desc=[[完成福袋任务1、2、3]],name=[[礼炮奖励]],needCnt=3,panelID=0,item={[1]={{111,20000},{801004,10}},[2]={{101,50000},{801004,10}},[3]={{111,20000},{801004,10}},[4]={{101,50000},{801004,10}},[5]={{122,2},{801004,10}},[6]={{122,2},{801004,10}},[7]={{111,20000},{801004,10}}},actId=101},
-[2]={desc=[[完成福袋任务4、5、6]],name=[[礼炮奖励]],needCnt=3,panelID=0,item={[1]={{101,50000},{801004,10}},[2]={{117,5},{801004,10}},[3]={{101,50000},{801004,10}},[4]={{117,5},{801004,10}},[5]={{101,50000},{801004,10}},[6]={{111,20000},{801004,10}},[7]={{101,50000},{801004,10}}},actId=101},
-[3]={desc=[[完成福袋任务7、8、9]],name=[[礼炮奖励]],needCnt=3,panelID=0,item={[1]={{801005,5},{102,20}},[2]={{801005,5},{102,20}},[3]={{801005,5},{102,20}},[4]={{801005,5},{102,20}},[5]={{801005,5},{102,20}},[6]={{134,100},{102,20}},[7]={{134,100},{102,20}}},actId=101},
-[4]={desc=[[完成福袋任务1、4、7]],name=[[礼炮奖励]],needCnt=3,panelID=0,item={[1]={{801005,5},{102,20}},[2]={{801005,5},{102,20}},[3]={{801005,5},{102,20}},[4]={{801005,5},{102,20}},[5]={{801005,5},{102,20}},[6]={{134,100},{102,20}},[7]={{134,100},{102,20}}},actId=101},
-[5]={desc=[[完成福袋任务2、5、8]],name=[[礼炮奖励]],needCnt=3,panelID=0,item={[1]={{111,20000},{112,50}},[2]={{111,20000},{112,50}},[3]={{111,20000},{112,50}},[4]={{111,20000},{112,50}},[5]={{111,20000},{112,50}},[6]={{111,20000},{117,5}},[7]={{111,20000},{117,5}}},actId=101},
-[6]={desc=[[完成福袋任务3、6、9]],name=[[礼炮奖励]],needCnt=3,panelID=0,item={[1]={{101,50000},{112,50}},[2]={{101,50000},{122,1}},[3]={{101,50000},{112,50}},[4]={{101,50000},{122,1}},[5]={{101,50000},{112,50}},[6]={{115,5},{112,50}},[7]={{115,5},{112,50}}},actId=101}}end)();
+[1]={desc="完成福袋任务1、2、3",name="礼炮奖励",needCnt=3,panelID=0,item={[1]={{111,20000},{801004,10}},[2]={{101,50000},{801004,10}},[3]={{111,20000},{801004,10}},[4]={{101,50000},{801004,10}},[5]={{122,2},{801004,10}},[6]={{122,2},{801004,10}},[7]={{111,20000},{801004,10}}},actId=101},
+[2]={desc="完成福袋任务4、5、6",name="礼炮奖励",needCnt=3,panelID=0,item={[1]={{101,50000},{801004,10}},[2]={{117,5},{801004,10}},[3]={{101,50000},{801004,10}},[4]={{117,5},{801004,10}},[5]={{101,50000},{801004,10}},[6]={{111,20000},{801004,10}},[7]={{101,50000},{801004,10}}},actId=101},
+[3]={desc="完成福袋任务7、8、9",name="礼炮奖励",needCnt=3,panelID=0,item={[1]={{801005,5},{102,20}},[2]={{801005,5},{102,20}},[3]={{801005,5},{102,20}},[4]={{801005,5},{102,20}},[5]={{801005,5},{102,20}},[6]={{134,100},{102,20}},[7]={{134,100},{102,20}}},actId=101},
+[4]={desc="完成福袋任务1、4、7",name="礼炮奖励",needCnt=3,panelID=0,item={[1]={{801005,5},{102,20}},[2]={{801005,5},{102,20}},[3]={{801005,5},{102,20}},[4]={{801005,5},{102,20}},[5]={{801005,5},{102,20}},[6]={{134,100},{102,20}},[7]={{134,100},{102,20}}},actId=101},
+[5]={desc="完成福袋任务2、5、8",name="礼炮奖励",needCnt=3,panelID=0,item={[1]={{111,20000},{112,50}},[2]={{111,20000},{112,50}},[3]={{111,20000},{112,50}},[4]={{111,20000},{112,50}},[5]={{111,20000},{112,50}},[6]={{111,20000},{117,5}},[7]={{111,20000},{117,5}}},actId=101},
+[6]={desc="完成福袋任务3、6、9",name="礼炮奖励",needCnt=3,panelID=0,item={[1]={{101,50000},{112,50}},[2]={{101,50000},{122,1}},[3]={{101,50000},{112,50}},[4]={{101,50000},{122,1}},[5]={{101,50000},{112,50}},[6]={{115,5},{112,50}},[7]={{115,5},{112,50}}},actId=101}}end)();
 (function()blastingBox={
 [1]={needCnt=5,item={{102,200},{112,100},{127,50}},actId=101,buyID=4007},
 [2]={needCnt=10,item={{80002,1},{134,300},{801004,30}},actId=101,buyID=0},
 [3]={needCnt=20,item={{80003,1},{118,10},{102,500}},actId=101,buyID=0},
 [4]={needCnt=30,item={{546,1},{801005,50},{124,1}},actId=101,buyID=0}}end)();
 (function()custom={
-[10001]={name=[[免费订制礼包]],actId=101,limitCnt=1,price=0,fixed={{102,30}},first={{118,1},{134,100}},second={{80001,1},{109,100},{112,100}},third={{801051,5},{801052,5},{801053,5},{801005,5}},buyID=0},
-[10002]={name=[[初级订制礼包]],actId=101,limitCnt=1,price=0,fixed={{102,60}},first={{118,3},{112,300},{134,300}},second={{80001,3},{536,1},{109,300}},third={{801051,10},{801052,10},{801053,10},{801005,10}},buyID=4001},
-[10003]={name=[[中级订制礼包]],actId=101,limitCnt=1,price=0,fixed={{102,300}},first={{118,5},{112,500},{134,500}},second={{80002,1},{536,2},{109,500}},third={{801051,15},{801052,15},{801053,15},{801005,15}},buyID=4002},
-[10004]={name=[[高级订制礼包]],actId=101,limitCnt=1,price=0,fixed={{102,680}},first={{118,10},{132,1},{134,1000}},second={{80002,2},{536,3},{109,1000}},third={{801051,25},{801052,25},{801053,25},{801005,25}},buyID=4003},
-[10005]={name=[[特级订制礼包]],actId=101,limitCnt=3,price=0,fixed={{102,1280}},first={{118,15},{114,30},{134,2000}},second={{80003,1},{536,4},{109,2000}},third={{801051,50},{801052,50},{801053,50},{801005,50}},buyID=4004},
-[10006]={name=[[顶级订制礼包]],actId=101,limitCnt=3,price=0,fixed={{102,3280}},first={{118,30},{133,1},{134,3000}},second={{80004,1},{536,5},{109,3000}},third={{801054,50},{801055,50},{801005,50}},buyID=4005},
-[10007]={name=[[豪华订制礼包]],actId=101,limitCnt=3,price=0,fixed={{102,6480}},first={{118,50},{124,3},{134,5000}},second={{80004,2},{536,6},{109,5000}},third={{801051,50},{801052,50},{801053,50},{801005,50},{801054,50},{801055,50}},buyID=4006},
-[20001]={name=[[免费订制礼包]],actId=102,limitCnt=1,price=0,fixed={},first={{112,20},{101,100000},{111,20000}},second={{801051,2},{801052,2},{801053,2},{801005,2}},third={{117,1},{115,1},{122,1}},buyID=0},
-[20002]={name=[[初级订制礼包]],actId=102,limitCnt=1,price=60,fixed={},first={{118,1},{80001,1}},second={{801051,5},{801052,5},{801053,5},{801005,5}},third={{134,100},{109,100},{112,100}},buyID=0},
-[20003]={name=[[中级订制礼包]],actId=102,limitCnt=1,price=300,fixed={},first={{118,3},{80001,3},{132,1}},second={{801051,15},{801052,15},{801053,15},{801005,15}},third={{134,200},{109,200},{112,200}},buyID=0},
-[20004]={name=[[高级订制礼包]],actId=102,limitCnt=1,price=680,fixed={},first={{118,5},{80002,1},{546,1}},second={{801051,25},{801052,25},{801053,25},{801005,25}},third={{134,300},{109,300},{112,300}},buyID=0},
-[20005]={name=[[特级订制礼包]],actId=102,limitCnt=1,price=1280,fixed={},first={{118,10},{80002,2},{114,30}},second={{801051,50},{801052,50},{801053,50},{801005,50}},third={{134,500},{109,500},{112,500}},buyID=0},
-[20006]={name=[[顶级订制礼包]],actId=102,limitCnt=1,price=3280,fixed={},first={{118,20},{80003,1},{124,1}},second={{801054,50},{801055,50},{801005,50}},third={{134,1000},{109,1000},{112,1000}},buyID=0},
-[20007]={name=[[豪华订制礼包]],actId=102,limitCnt=1,price=6480,fixed={},first={{118,40},{80003,2},{133,1}},second={{801051,50},{801052,50},{801053,50},{801005,50},{801054,50},{801055,50}},third={{134,2000},{109,2000},{112,2000}},buyID=0}}end)();
+[10001]={name="免费订制礼包",actId=101,limitCnt=1,price=0,fixed={{102,30}},first={{118,1},{134,100}},second={{80001,1},{109,100},{112,100}},third={{801051,5},{801052,5},{801053,5},{801005,5}},buyID=0},
+[10002]={name="初级订制礼包",actId=101,limitCnt=1,price=0,fixed={{102,60}},first={{118,3},{112,300},{134,300}},second={{80001,3},{536,1},{109,300}},third={{801051,10},{801052,10},{801053,10},{801005,10}},buyID=4001},
+[10003]={name="中级订制礼包",actId=101,limitCnt=1,price=0,fixed={{102,300}},first={{118,5},{112,500},{134,500}},second={{80002,1},{536,2},{109,500}},third={{801051,15},{801052,15},{801053,15},{801005,15}},buyID=4002},
+[10004]={name="高级订制礼包",actId=101,limitCnt=1,price=0,fixed={{102,680}},first={{118,10},{132,1},{134,1000}},second={{80002,2},{536,3},{109,1000}},third={{801051,25},{801052,25},{801053,25},{801005,25}},buyID=4003},
+[10005]={name="特级订制礼包",actId=101,limitCnt=3,price=0,fixed={{102,1280}},first={{118,15},{114,30},{134,2000}},second={{80003,1},{536,4},{109,2000}},third={{801051,50},{801052,50},{801053,50},{801005,50}},buyID=4004},
+[10006]={name="顶级订制礼包",actId=101,limitCnt=3,price=0,fixed={{102,3280}},first={{118,30},{133,1},{134,3000}},second={{80004,1},{536,5},{109,3000}},third={{801054,50},{801055,50},{801005,50}},buyID=4005},
+[10007]={name="豪华订制礼包",actId=101,limitCnt=3,price=0,fixed={{102,6480}},first={{118,50},{124,3},{134,5000}},second={{80004,2},{536,6},{109,5000}},third={{801051,50},{801052,50},{801053,50},{801005,50},{801054,50},{801055,50}},buyID=4006},
+[20001]={name="免费订制礼包",actId=102,limitCnt=1,price=0,fixed={},first={{112,20},{101,100000},{111,20000}},second={{801051,2},{801052,2},{801053,2},{801005,2}},third={{117,1},{115,1},{122,1}},buyID=0},
+[20002]={name="初级订制礼包",actId=102,limitCnt=1,price=60,fixed={},first={{118,1},{80001,1}},second={{801051,5},{801052,5},{801053,5},{801005,5}},third={{134,100},{109,100},{112,100}},buyID=0},
+[20003]={name="中级订制礼包",actId=102,limitCnt=1,price=300,fixed={},first={{118,3},{80001,3},{132,1}},second={{801051,15},{801052,15},{801053,15},{801005,15}},third={{134,200},{109,200},{112,200}},buyID=0},
+[20004]={name="高级订制礼包",actId=102,limitCnt=1,price=680,fixed={},first={{118,5},{80002,1},{546,1}},second={{801051,25},{801052,25},{801053,25},{801005,25}},third={{134,300},{109,300},{112,300}},buyID=0},
+[20005]={name="特级订制礼包",actId=102,limitCnt=1,price=1280,fixed={},first={{118,10},{80002,2},{114,30}},second={{801051,50},{801052,50},{801053,50},{801005,50}},third={{134,500},{109,500},{112,500}},buyID=0},
+[20006]={name="顶级订制礼包",actId=102,limitCnt=1,price=3280,fixed={},first={{118,20},{80003,1},{124,1}},second={{801054,50},{801055,50},{801005,50}},third={{134,1000},{109,1000},{112,1000}},buyID=0},
+[20007]={name="豪华订制礼包",actId=102,limitCnt=1,price=6480,fixed={},first={{118,40},{80003,2},{133,1}},second={{801051,50},{801052,50},{801053,50},{801005,50},{801054,50},{801055,50}},third={{134,2000},{109,2000},{112,2000}},buyID=0}}end)();
 (function()doubleCharge={
 [101]={buyId={[101]=1,[102]=1,[103]=1,[104]=1,[105]=1,[106]=1,[107]=1}}}end)();
 (function()seckill={
-[1]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=1,price=0,name=[[超值礼包]],cont={},buyID=5001,actId=101},
-[2]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=2,price=0,name=[[超值礼包]],cont={},buyID=5002,actId=101},
-[3]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=3,price=0,name=[[超值礼包]],cont={},buyID=5003,actId=101},
-[4]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=4,price=0,name=[[超值礼包]],cont={},buyID=5004,actId=101},
-[5]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=5,price=0,name=[[超值礼包]],cont={},buyID=5005,actId=101},
-[6]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=6,price=0,name=[[超值礼包]],cont={},buyID=5006,actId=101},
-[7]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=7,price=0,name=[[超值礼包]],cont={},buyID=5007,actId=101},
-[8]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=1,price=0,name=[[特惠礼包]],cont={},buyID=5008,actId=101},
-[9]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=2,price=0,name=[[特惠礼包]],cont={},buyID=5009,actId=101},
-[10]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=3,price=0,name=[[特惠礼包]],cont={},buyID=5010,actId=101},
-[11]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=4,price=0,name=[[特惠礼包]],cont={},buyID=5011,actId=101},
-[12]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=5,price=0,name=[[特惠礼包]],cont={},buyID=5012,actId=101},
-[13]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=6,price=0,name=[[特惠礼包]],cont={},buyID=5013,actId=101},
-[14]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=7,price=0,name=[[特惠礼包]],cont={},buyID=5014,actId=101},
-[15]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=1,price=0,name=[[尊享礼包]],cont={},buyID=5015,actId=101},
-[16]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=2,price=0,name=[[尊享礼包]],cont={},buyID=5016,actId=101},
-[17]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=3,price=0,name=[[尊享礼包]],cont={},buyID=5017,actId=101},
-[18]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=4,price=0,name=[[尊享礼包]],cont={},buyID=5018,actId=101},
-[19]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=5,price=0,name=[[尊享礼包]],cont={},buyID=5019,actId=101},
-[20]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=6,price=0,name=[[尊享礼包]],cont={},buyID=5020,actId=101},
-[21]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=7,price=0,name=[[尊享礼包]],cont={},buyID=5021,actId=101},
-[22]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=1,price=48,name=[[一键购买]],cont={1,8,15},buyID=5022,actId=101},
-[23]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=2,price=48,name=[[一键购买]],cont={2,9,16},buyID=5023,actId=101},
-[24]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=3,price=48,name=[[一键购买]],cont={3,10,17},buyID=5024,actId=101},
-[25]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=4,price=48,name=[[一键购买]],cont={4,11,18},buyID=5025,actId=101},
-[26]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=5,price=48,name=[[一键购买]],cont={5,12,19},buyID=5026,actId=101},
-[27]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=6,price=48,name=[[一键购买]],cont={6,13,20},buyID=5027,actId=101},
-[28]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=7,price=48,name=[[一键购买]],cont={7,14,21},buyID=5028,actId=101}}end)();
+[1]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=1,price=0,name="超值礼包",cont={},buyID=5001,actId=101},
+[2]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=2,price=0,name="超值礼包",cont={},buyID=5002,actId=101},
+[3]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=3,price=0,name="超值礼包",cont={},buyID=5003,actId=101},
+[4]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=4,price=0,name="超值礼包",cont={},buyID=5004,actId=101},
+[5]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=5,price=0,name="超值礼包",cont={},buyID=5005,actId=101},
+[6]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=6,price=0,name="超值礼包",cont={},buyID=5006,actId=101},
+[7]={item={{102,300},{118,4},{112,100},{101,200000}},limitCnt=1,day=7,price=0,name="超值礼包",cont={},buyID=5007,actId=101},
+[8]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=1,price=0,name="特惠礼包",cont={},buyID=5008,actId=101},
+[9]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=2,price=0,name="特惠礼包",cont={},buyID=5009,actId=101},
+[10]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=3,price=0,name="特惠礼包",cont={},buyID=5010,actId=101},
+[11]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=4,price=0,name="特惠礼包",cont={},buyID=5011,actId=101},
+[12]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=5,price=0,name="特惠礼包",cont={},buyID=5012,actId=101},
+[13]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=6,price=0,name="特惠礼包",cont={},buyID=5013,actId=101},
+[14]={item={{102,600},{118,8},{112,200},{101,400000}},limitCnt=1,day=7,price=0,name="特惠礼包",cont={},buyID=5014,actId=101},
+[15]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=1,price=0,name="尊享礼包",cont={},buyID=5015,actId=101},
+[16]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=2,price=0,name="尊享礼包",cont={},buyID=5016,actId=101},
+[17]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=3,price=0,name="尊享礼包",cont={},buyID=5017,actId=101},
+[18]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=4,price=0,name="尊享礼包",cont={},buyID=5018,actId=101},
+[19]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=5,price=0,name="尊享礼包",cont={},buyID=5019,actId=101},
+[20]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=6,price=0,name="尊享礼包",cont={},buyID=5020,actId=101},
+[21]={item={{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=7,price=0,name="尊享礼包",cont={},buyID=5021,actId=101},
+[22]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=1,price=48,name="一键购买",cont={1,8,15},buyID=5022,actId=101},
+[23]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=2,price=48,name="一键购买",cont={2,9,16},buyID=5023,actId=101},
+[24]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=3,price=48,name="一键购买",cont={3,10,17},buyID=5024,actId=101},
+[25]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=4,price=48,name="一键购买",cont={4,11,18},buyID=5025,actId=101},
+[26]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=5,price=48,name="一键购买",cont={5,12,19},buyID=5026,actId=101},
+[27]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=6,price=48,name="一键购买",cont={6,13,20},buyID=5027,actId=101},
+[28]={item={{102,300},{118,4},{112,100},{101,200000},{102,600},{118,8},{112,200},{101,400000},{102,1500},{118,12},{112,500},{111,1000000}},limitCnt=1,day=7,price=48,name="一键购买",cont={7,14,21},buyID=5028,actId=101}}end)();
 (function()useDiamond={
-[1]={needUse=1000,desc=[[消费1000钻石]],item={{101,300000},{111,150000},{112,150}},actId=101,special=0},
-[2]={needUse=2000,desc=[[消费2000钻石]],item={{101,400000},{111,200000},{118,4}},actId=101,special=0},
-[3]={needUse=3500,desc=[[消费3500钻石]],item={{101,500000},{111,250000},{112,225}},actId=101,special=0},
-[4]={needUse=5500,desc=[[消费5500钻石]],item={{101,700000},{111,350000},{118,8}},actId=101,special=0},
-[5]={needUse=8000,desc=[[消费8000钻石]],item={{101,800000},{111,400000},{112,375}},actId=101,special=0},
-[6]={needUse=11000,desc=[[消费11000钻石]],item={{101,1000000},{111,500000},{118,12}},actId=101,special=0},
-[7]={needUse=15000,desc=[[消费15000钻石]],item={{101,1300000},{111,650000},{112,600}},actId=101,special=0},
-[8]={needUse=21000,desc=[[消费21000钻石]],item={{101,2000000},{111,1000000},{118,24}},actId=101,special=0},
-[9]={needUse=32000,desc=[[消费32000钻石]],item={{101,3700000},{111,1850000},{124,3}},actId=101,special=0},
-[10]={needUse=50000,desc=[[消费50000钻石]],item={{101,6000000},{111,3000000},{124,3}},actId=101,special=0},
-[11]={needUse=50,desc=[[]],item={{80003,1}},actId=101,special=1},
-[12]={needUse=100,desc=[[]],item={{80004,1}},actId=101,special=1}}end)();
+[1]={needUse=1000,desc="消费1000钻石",item={{101,300000},{111,150000},{112,150}},actId=101,special=0},
+[2]={needUse=2000,desc="消费2000钻石",item={{101,400000},{111,200000},{118,4}},actId=101,special=0},
+[3]={needUse=3500,desc="消费3500钻石",item={{101,500000},{111,250000},{112,225}},actId=101,special=0},
+[4]={needUse=5500,desc="消费5500钻石",item={{101,700000},{111,350000},{118,8}},actId=101,special=0},
+[5]={needUse=8000,desc="消费8000钻石",item={{101,800000},{111,400000},{112,375}},actId=101,special=0},
+[6]={needUse=11000,desc="消费11000钻石",item={{101,1000000},{111,500000},{118,12}},actId=101,special=0},
+[7]={needUse=15000,desc="消费15000钻石",item={{101,1300000},{111,650000},{112,600}},actId=101,special=0},
+[8]={needUse=21000,desc="消费21000钻石",item={{101,2000000},{111,1000000},{118,24}},actId=101,special=0},
+[9]={needUse=32000,desc="消费32000钻石",item={{101,3700000},{111,1850000},{124,3}},actId=101,special=0},
+[10]={needUse=50000,desc="消费50000钻石",item={{101,6000000},{111,3000000},{124,3}},actId=101,special=0},
+[11]={needUse=50,desc="",item={{80003,1}},actId=101,special=1},
+[12]={needUse=100,desc="",item={{80004,1}},actId=101,special=1}}end)();
 (function()wishCup={
-[1]={item={{801004,30}},day=1,desc=[[]],lock=0,actId=101},
-[2]={item={{801041,10}},day=1,desc=[[]],lock=0,actId=101},
-[3]={item={{801042,10}},day=1,desc=[[]],lock=0,actId=101},
-[4]={item={{801043,10}},day=1,desc=[[]],lock=0,actId=101},
-[5]={item={{801044,10}},day=1,desc=[[达到100活跃]],lock=1,actId=101},
-[6]={item={{118,20}},day=1,desc=[[充值任意金额]],lock=1,actId=101},
-[7]={item={{801004,30}},day=2,desc=[[]],lock=0,actId=101},
-[8]={item={{801041,10}},day=2,desc=[[]],lock=0,actId=101},
-[9]={item={{801042,10}},day=2,desc=[[]],lock=0,actId=101},
-[10]={item={{801043,10}},day=2,desc=[[]],lock=0,actId=101},
-[11]={item={{801005,10}},day=2,desc=[[达到100活跃]],lock=1,actId=101},
-[12]={item={{118,20}},day=2,desc=[[充值任意金额]],lock=1,actId=101},
-[13]={item={{801004,30}},day=3,desc=[[]],lock=0,actId=101},
-[14]={item={{801041,10}},day=3,desc=[[]],lock=0,actId=101},
-[15]={item={{801042,10}},day=3,desc=[[]],lock=0,actId=101},
-[16]={item={{801043,10}},day=3,desc=[[]],lock=0,actId=101},
-[17]={item={{801005,10}},day=3,desc=[[达到100活跃]],lock=1,actId=101},
-[18]={item={{118,20}},day=3,desc=[[充值任意金额]],lock=1,actId=101},
-[19]={item={{801004,30}},day=4,desc=[[]],lock=0,actId=101},
-[20]={item={{801041,10}},day=4,desc=[[]],lock=0,actId=101},
-[21]={item={{801042,10}},day=4,desc=[[]],lock=0,actId=101},
-[22]={item={{801043,10}},day=4,desc=[[]],lock=0,actId=101},
-[23]={item={{801005,10}},day=4,desc=[[达到100活跃]],lock=1,actId=101},
-[24]={item={{118,20}},day=4,desc=[[充值任意金额]],lock=1,actId=101},
-[25]={item={{801004,30}},day=5,desc=[[]],lock=0,actId=101},
-[26]={item={{801041,10}},day=5,desc=[[]],lock=0,actId=101},
-[27]={item={{801042,10}},day=5,desc=[[]],lock=0,actId=101},
-[28]={item={{801043,10}},day=5,desc=[[]],lock=0,actId=101},
-[29]={item={{801005,10}},day=5,desc=[[达到100活跃]],lock=1,actId=101},
-[30]={item={{118,20}},day=5,desc=[[充值任意金额]],lock=1,actId=101},
-[31]={item={{801004,30}},day=6,desc=[[]],lock=0,actId=101},
-[32]={item={{801041,10}},day=6,desc=[[]],lock=0,actId=101},
-[33]={item={{801042,10}},day=6,desc=[[]],lock=0,actId=101},
-[34]={item={{801043,10}},day=6,desc=[[]],lock=0,actId=101},
-[35]={item={{801005,10}},day=6,desc=[[达到100活跃]],lock=1,actId=101},
-[36]={item={{118,20}},day=6,desc=[[充值任意金额]],lock=1,actId=101},
-[37]={item={{801004,30}},day=7,desc=[[]],lock=0,actId=101},
-[38]={item={{801041,10}},day=7,desc=[[]],lock=0,actId=101},
-[39]={item={{801042,10}},day=7,desc=[[]],lock=0,actId=101},
-[40]={item={{801043,10}},day=7,desc=[[]],lock=0,actId=101},
-[41]={item={{801005,10}},day=7,desc=[[达到100活跃]],lock=1,actId=101},
-[42]={item={{118,20}},day=7,desc=[[充值任意金额]],lock=1,actId=101}}end)();
+[1]={item={{801004,30}},day=1,desc="",lock=0,actId=101},
+[2]={item={{801041,10}},day=1,desc="",lock=0,actId=101},
+[3]={item={{801042,10}},day=1,desc="",lock=0,actId=101},
+[4]={item={{801043,10}},day=1,desc="",lock=0,actId=101},
+[5]={item={{801044,10}},day=1,desc="达到100活跃",lock=1,actId=101},
+[6]={item={{118,20}},day=1,desc="充值任意金额",lock=1,actId=101},
+[7]={item={{801004,30}},day=2,desc="",lock=0,actId=101},
+[8]={item={{801041,10}},day=2,desc="",lock=0,actId=101},
+[9]={item={{801042,10}},day=2,desc="",lock=0,actId=101},
+[10]={item={{801043,10}},day=2,desc="",lock=0,actId=101},
+[11]={item={{801005,10}},day=2,desc="达到100活跃",lock=1,actId=101},
+[12]={item={{118,20}},day=2,desc="充值任意金额",lock=1,actId=101},
+[13]={item={{801004,30}},day=3,desc="",lock=0,actId=101},
+[14]={item={{801041,10}},day=3,desc="",lock=0,actId=101},
+[15]={item={{801042,10}},day=3,desc="",lock=0,actId=101},
+[16]={item={{801043,10}},day=3,desc="",lock=0,actId=101},
+[17]={item={{801005,10}},day=3,desc="达到100活跃",lock=1,actId=101},
+[18]={item={{118,20}},day=3,desc="充值任意金额",lock=1,actId=101},
+[19]={item={{801004,30}},day=4,desc="",lock=0,actId=101},
+[20]={item={{801041,10}},day=4,desc="",lock=0,actId=101},
+[21]={item={{801042,10}},day=4,desc="",lock=0,actId=101},
+[22]={item={{801043,10}},day=4,desc="",lock=0,actId=101},
+[23]={item={{801005,10}},day=4,desc="达到100活跃",lock=1,actId=101},
+[24]={item={{118,20}},day=4,desc="充值任意金额",lock=1,actId=101},
+[25]={item={{801004,30}},day=5,desc="",lock=0,actId=101},
+[26]={item={{801041,10}},day=5,desc="",lock=0,actId=101},
+[27]={item={{801042,10}},day=5,desc="",lock=0,actId=101},
+[28]={item={{801043,10}},day=5,desc="",lock=0,actId=101},
+[29]={item={{801005,10}},day=5,desc="达到100活跃",lock=1,actId=101},
+[30]={item={{118,20}},day=5,desc="充值任意金额",lock=1,actId=101},
+[31]={item={{801004,30}},day=6,desc="",lock=0,actId=101},
+[32]={item={{801041,10}},day=6,desc="",lock=0,actId=101},
+[33]={item={{801042,10}},day=6,desc="",lock=0,actId=101},
+[34]={item={{801043,10}},day=6,desc="",lock=0,actId=101},
+[35]={item={{801005,10}},day=6,desc="达到100活跃",lock=1,actId=101},
+[36]={item={{118,20}},day=6,desc="充值任意金额",lock=1,actId=101},
+[37]={item={{801004,30}},day=7,desc="",lock=0,actId=101},
+[38]={item={{801041,10}},day=7,desc="",lock=0,actId=101},
+[39]={item={{801042,10}},day=7,desc="",lock=0,actId=101},
+[40]={item={{801043,10}},day=7,desc="",lock=0,actId=101},
+[41]={item={{801005,10}},day=7,desc="达到100活跃",lock=1,actId=101},
+[42]={item={{118,20}},day=7,desc="充值任意金额",lock=1,actId=101}}end)();
 (function()topupRank={
 [1]={ranks={1,1},totalNeedValue=500,totalRewards={{562,3},{543,4},{124,30},{102,25000},{7014,1}},totalMailID=2011,actId=101},
 [2]={ranks={2,2},totalNeedValue=500,totalRewards={{562,2},{543,3},{124,27},{102,22500},{7015,1}},totalMailID=2011,actId=101},
@@ -668,24 +669,24 @@
 [10]={roleMin=61,roleMax=70,totalRewards={{118,4},{134,700},{101,1200000},{111,600000}},actId=101},
 [11]={roleMin=71,roleMax=150,totalRewards={{118,4},{134,500},{101,1000000},{111,500000}},actId=101}}end)();
 (function()dailyFixedTask={
-[1]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc=[[每日登录]],day=1,actId=101,needCnt=1,type=1},
-[2]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc=[[每日登录]],day=2,actId=101,needCnt=1,type=1},
-[3]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc=[[每日登录]],day=3,actId=101,needCnt=1,type=1},
-[4]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc=[[完成100活跃]],day=1,actId=101,needCnt=100,type=2},
-[5]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc=[[完成100活跃]],day=2,actId=101,needCnt=100,type=2},
-[6]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc=[[完成100活跃]],day=3,actId=101,needCnt=100,type=2},
-[7]={item={{124,1},{134,1000},{112,500},{118,10}},desc=[[充值任意金额]],day=1,actId=101,needCnt=1,type=3},
-[8]={item={{124,1},{134,1000},{112,500},{118,10}},desc=[[充值任意金额]],day=2,actId=101,needCnt=1,type=3},
-[9]={item={{124,1},{134,1000},{112,500},{118,10}},desc=[[充值任意金额]],day=3,actId=101,needCnt=1,type=3},
-[10]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc=[[消耗88个占卜币]],day=1,actId=103,needCnt=88,type=4},
-[11]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc=[[消耗88个占卜币]],day=2,actId=103,needCnt=88,type=4},
-[12]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc=[[消耗88个占卜币]],day=3,actId=103,needCnt=88,type=4},
-[13]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc=[[完成100活跃]],day=1,actId=103,needCnt=100,type=2},
-[14]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc=[[完成100活跃]],day=2,actId=103,needCnt=100,type=2},
-[15]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc=[[完成100活跃]],day=3,actId=103,needCnt=100,type=2},
-[16]={item={{124,1},{134,1000},{112,500},{118,10}},desc=[[充值任意金额]],day=1,actId=103,needCnt=1,type=3},
-[17]={item={{124,1},{134,1000},{112,500},{118,10}},desc=[[充值任意金额]],day=2,actId=103,needCnt=1,type=3},
-[18]={item={{124,1},{134,1000},{112,500},{118,10}},desc=[[充值任意金额]],day=3,actId=103,needCnt=1,type=3}}end)();
+[1]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc="每日登录",day=1,actId=101,needCnt=1,type=1},
+[2]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc="每日登录",day=2,actId=101,needCnt=1,type=1},
+[3]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc="每日登录",day=3,actId=101,needCnt=1,type=1},
+[4]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc="完成100活跃",day=1,actId=101,needCnt=100,type=2},
+[5]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc="完成100活跃",day=2,actId=101,needCnt=100,type=2},
+[6]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc="完成100活跃",day=3,actId=101,needCnt=100,type=2},
+[7]={item={{124,1},{134,1000},{112,500},{118,10}},desc="充值任意金额",day=1,actId=101,needCnt=1,type=3},
+[8]={item={{124,1},{134,1000},{112,500},{118,10}},desc="充值任意金额",day=2,actId=101,needCnt=1,type=3},
+[9]={item={{124,1},{134,1000},{112,500},{118,10}},desc="充值任意金额",day=3,actId=101,needCnt=1,type=3},
+[10]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc="消耗88个占卜币",day=1,actId=103,needCnt=88,type=4},
+[11]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc="消耗88个占卜币",day=2,actId=103,needCnt=88,type=4},
+[12]={item={{801005,20},{801004,30},{111,100000},{112,100}},desc="消耗88个占卜币",day=3,actId=103,needCnt=88,type=4},
+[13]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc="完成100活跃",day=1,actId=103,needCnt=100,type=2},
+[14]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc="完成100活跃",day=2,actId=103,needCnt=100,type=2},
+[15]={item={{801005,30},{801004,60},{101,500000},{118,5}},desc="完成100活跃",day=3,actId=103,needCnt=100,type=2},
+[16]={item={{124,1},{134,1000},{112,500},{118,10}},desc="充值任意金额",day=1,actId=103,needCnt=1,type=3},
+[17]={item={{124,1},{134,1000},{112,500},{118,10}},desc="充值任意金额",day=2,actId=103,needCnt=1,type=3},
+[18]={item={{124,1},{134,1000},{112,500},{118,10}},desc="充值任意金额",day=3,actId=103,needCnt=1,type=3}}end)();
 (function()festvialSevenDayCard={
 [12001]={item={[1]={{118,120}},[2]={{124,6}},[3]={{101,30000000}},[4]={{120,20}},[5]={{128,60}},[6]={{127,10000}},[7]={{109,24000}}},buyID=7005,mailId=2014,actId=103,zuanshi={{102,3960}}},
 [13001]={item={[1]={{118,120}},[2]={{124,6}},[3]={{101,30000000}},[4]={{114,30}},[5]={{128,60}},[6]={{127,10000}},[7]={{109,24000}}},buyID=7006,mailId=2015,actId=104,zuanshi={{102,3960}}},
@@ -695,13 +696,13 @@
 [10002]={actId=101,day=2,freeItem={{102,520}},giftItem={{102,1314},{120,3},{124,2},{127,400}},buyID=8001},
 [10003]={actId=101,day=3,freeItem={{102,520}},giftItem={{102,1314},{120,3},{133,1},{80004,1}},buyID=8001}}end)();
 (function()singleReach={
-[1]={actId=701,buyID=101,maxCnt=3,item={{102,200},{118,5},{801005,20}},mainId=712,desc=[[单笔充值6元]]},
-[2]={actId=701,buyID=102,maxCnt=3,item={{102,500},{118,10},{80003,1}},mainId=712,desc=[[单笔充值30元]]},
-[3]={actId=701,buyID=103,maxCnt=3,item={{102,680},{118,15},{124,1}},mainId=712,desc=[[单笔充值68元]]},
-[4]={actId=701,buyID=104,maxCnt=3,item={{102,1280},{118,20},{80004,1}},mainId=712,desc=[[单笔充值128元]]},
-[5]={actId=701,buyID=105,maxCnt=3,item={{102,1980},{118,30},{124,2}},mainId=712,desc=[[单笔充值198元]]},
-[6]={actId=701,buyID=106,maxCnt=3,item={{102,3280},{118,40},{801056,50}},mainId=712,desc=[[单笔充值328元]]},
-[7]={actId=701,buyID=107,maxCnt=3,item={{102,6480},{118,50},{561,1}},mainId=712,desc=[[单笔充值648元]]}}end)();
+[1]={actId=701,buyID=101,maxCnt=3,item={{102,200},{118,5},{801005,20}},mainId=712,desc="单笔充值6元"},
+[2]={actId=701,buyID=102,maxCnt=3,item={{102,500},{118,10},{80003,1}},mainId=712,desc="单笔充值30元"},
+[3]={actId=701,buyID=103,maxCnt=3,item={{102,680},{118,15},{124,1}},mainId=712,desc="单笔充值68元"},
+[4]={actId=701,buyID=104,maxCnt=3,item={{102,1280},{118,20},{80004,1}},mainId=712,desc="单笔充值128元"},
+[5]={actId=701,buyID=105,maxCnt=3,item={{102,1980},{118,30},{124,2}},mainId=712,desc="单笔充值198元"},
+[6]={actId=701,buyID=106,maxCnt=3,item={{102,3280},{118,40},{801056,50}},mainId=712,desc="单笔充值328元"},
+[7]={actId=701,buyID=107,maxCnt=3,item={{102,6480},{118,50},{561,1}},mainId=712,desc="单笔充值648元"}}end)();
 (function()totalReach={
 [1]={actId=701,needCnt=10,item={{801005,20},{601,1},{102,100}},mainId=702},
 [2]={actId=701,needCnt=30,item={{801005,30},{124,1},{102,300}},mainId=702},
@@ -737,34 +738,34 @@
 [32]={actId=704,needCnt=50000,item={{118,20},{801005,50},{102,3000}},mainId=714},
 [33]={actId=704,needCnt=100000,item={{7030,1},{561,1},{102,5000}},mainId=714}}end)();
 (function()billboard={
-[1]={actId=701,param=0,totalNeedValue=2000,desc=[[累计充值{1}可上榜]],maxRank=1,minRank=1,item={{7031,1},{562,6},{118,200},{102,30000}},cnt=1,mailId=7005,mainId=721},
-[2]={actId=701,param=0,totalNeedValue=2000,desc=[[累计充值{1}可上榜]],maxRank=2,minRank=2,item={{7032,1},{562,4},{118,150},{102,20000}},cnt=1,mailId=7005,mainId=721},
-[3]={actId=701,param=0,totalNeedValue=2000,desc=[[累计充值{1}可上榜]],maxRank=3,minRank=3,item={{7033,1},{562,2},{118,100},{102,10000}},cnt=1,mailId=7005,mainId=721},
-[4]={actId=701,param=0,totalNeedValue=100,desc=[[累计充值{1}可上榜]],maxRank=4,minRank=10,item={{801056,100},{118,50},{102,5000}},cnt=7,mailId=7005,mainId=721},
-[5]={actId=701,param=0,totalNeedValue=100,desc=[[累计充值{1}可上榜]],maxRank=11,minRank=20,item={{801056,50},{118,30},{102,4000}},cnt=10,mailId=7005,mainId=721},
-[6]={actId=701,param=0,totalNeedValue=1,desc=[[累计充值{1}可上榜]],maxRank=21,minRank=50,item={{801005,50},{118,20},{102,3000}},cnt=30,mailId=7005,mainId=721},
-[7]={actId=701,param=0,totalNeedValue=1,desc=[[累计充值{1}可上榜]],maxRank=51,minRank=100,item={{801005,50},{118,10},{102,2000}},cnt=50,mailId=7005,mainId=721},
-[8]={actId=702,param=0,totalNeedValue=2000,desc=[[累计充值{1}可上榜]],maxRank=1,minRank=1,item={{7031,1},{562,6},{118,200},{102,30000}},cnt=1,mailId=7005,mainId=722},
-[9]={actId=702,param=0,totalNeedValue=2000,desc=[[累计充值{1}可上榜]],maxRank=2,minRank=2,item={{7032,1},{562,4},{118,150},{102,20000}},cnt=1,mailId=7005,mainId=722},
-[10]={actId=702,param=0,totalNeedValue=2000,desc=[[累计充值{1}可上榜]],maxRank=3,minRank=3,item={{7033,1},{562,2},{118,100},{102,10000}},cnt=1,mailId=7005,mainId=722},
-[11]={actId=702,param=0,totalNeedValue=100,desc=[[累计充值{1}可上榜]],maxRank=4,minRank=10,item={{801056,100},{118,50},{102,5000}},cnt=7,mailId=7005,mainId=722},
-[12]={actId=702,param=0,totalNeedValue=100,desc=[[累计充值{1}可上榜]],maxRank=11,minRank=20,item={{801056,50},{118,30},{102,4000}},cnt=10,mailId=7005,mainId=722},
-[13]={actId=702,param=0,totalNeedValue=1,desc=[[累计充值{1}可上榜]],maxRank=21,minRank=50,item={{801005,50},{118,20},{102,3000}},cnt=30,mailId=7005,mainId=722},
-[14]={actId=702,param=0,totalNeedValue=1,desc=[[累计充值{1}可上榜]],maxRank=51,minRank=100,item={{801005,50},{118,10},{102,2000}},cnt=50,mailId=7005,mainId=722},
-[15]={actId=703,param=0,totalNeedValue=1000,desc=[[累计高级召唤{1}可上榜]],maxRank=1,minRank=1,item={{7034,1},{562,3},{124,6},{102,30000}},cnt=1,mailId=7006,mainId=731},
-[16]={actId=703,param=0,totalNeedValue=1000,desc=[[累计高级召唤{1}可上榜]],maxRank=2,minRank=2,item={{7035,1},{562,2},{124,5},{102,20000}},cnt=1,mailId=7006,mainId=731},
-[17]={actId=703,param=0,totalNeedValue=1000,desc=[[累计高级召唤{1}可上榜]],maxRank=3,minRank=3,item={{7036,1},{562,1},{124,4},{102,10000}},cnt=1,mailId=7006,mainId=731},
-[18]={actId=703,param=0,totalNeedValue=300,desc=[[累计高级召唤{1}可上榜]],maxRank=4,minRank=10,item={{801056,100},{124,3},{102,5000}},cnt=7,mailId=7006,mainId=731},
-[19]={actId=703,param=0,totalNeedValue=300,desc=[[累计高级召唤{1}可上榜]],maxRank=11,minRank=20,item={{801056,50},{124,2},{102,4000}},cnt=10,mailId=7006,mainId=731},
-[20]={actId=703,param=0,totalNeedValue=50,desc=[[累计高级召唤{1}可上榜]],maxRank=21,minRank=50,item={{801005,50},{124,1},{102,3000}},cnt=30,mailId=7006,mainId=731},
-[21]={actId=703,param=0,totalNeedValue=50,desc=[[累计高级召唤{1}可上榜]],maxRank=51,minRank=100,item={{801005,50},{125,300},{102,2000}},cnt=50,mailId=7006,mainId=731},
-[22]={actId=704,param=0,totalNeedValue=1000,desc=[[累计高级召唤{1}可上榜]],maxRank=1,minRank=1,item={{7034,1},{562,3},{124,6},{102,30000}},cnt=1,mailId=7006,mainId=732},
-[23]={actId=704,param=0,totalNeedValue=1000,desc=[[累计高级召唤{1}可上榜]],maxRank=2,minRank=2,item={{7035,1},{562,2},{124,5},{102,20000}},cnt=1,mailId=7006,mainId=732},
-[24]={actId=704,param=0,totalNeedValue=1000,desc=[[累计高级召唤{1}可上榜]],maxRank=3,minRank=3,item={{7036,1},{562,1},{124,4},{102,10000}},cnt=1,mailId=7006,mainId=732},
-[25]={actId=704,param=0,totalNeedValue=300,desc=[[累计高级召唤{1}可上榜]],maxRank=4,minRank=10,item={{801056,100},{124,3},{102,5000}},cnt=7,mailId=7006,mainId=732},
-[26]={actId=704,param=0,totalNeedValue=300,desc=[[累计高级召唤{1}可上榜]],maxRank=11,minRank=20,item={{801056,50},{124,2},{102,4000}},cnt=10,mailId=7006,mainId=732},
-[27]={actId=704,param=0,totalNeedValue=50,desc=[[累计高级召唤{1}可上榜]],maxRank=21,minRank=50,item={{801005,50},{124,1},{102,3000}},cnt=30,mailId=7006,mainId=732},
-[28]={actId=704,param=0,totalNeedValue=50,desc=[[累计高级召唤{1}可上榜]],maxRank=51,minRank=100,item={{801005,50},{125,300},{102,2000}},cnt=50,mailId=7006,mainId=732}}end)();
+[1]={actId=701,param=0,totalNeedValue=2000,desc="累计充值{1}可上榜",maxRank=1,minRank=1,item={{7031,1},{562,6},{118,200},{102,30000}},cnt=1,mailId=7005,mainId=721},
+[2]={actId=701,param=0,totalNeedValue=2000,desc="累计充值{1}可上榜",maxRank=2,minRank=2,item={{7032,1},{562,4},{118,150},{102,20000}},cnt=1,mailId=7005,mainId=721},
+[3]={actId=701,param=0,totalNeedValue=2000,desc="累计充值{1}可上榜",maxRank=3,minRank=3,item={{7033,1},{562,2},{118,100},{102,10000}},cnt=1,mailId=7005,mainId=721},
+[4]={actId=701,param=0,totalNeedValue=100,desc="累计充值{1}可上榜",maxRank=4,minRank=10,item={{801056,100},{118,50},{102,5000}},cnt=7,mailId=7005,mainId=721},
+[5]={actId=701,param=0,totalNeedValue=100,desc="累计充值{1}可上榜",maxRank=11,minRank=20,item={{801056,50},{118,30},{102,4000}},cnt=10,mailId=7005,mainId=721},
+[6]={actId=701,param=0,totalNeedValue=1,desc="累计充值{1}可上榜",maxRank=21,minRank=50,item={{801005,50},{118,20},{102,3000}},cnt=30,mailId=7005,mainId=721},
+[7]={actId=701,param=0,totalNeedValue=1,desc="累计充值{1}可上榜",maxRank=51,minRank=100,item={{801005,50},{118,10},{102,2000}},cnt=50,mailId=7005,mainId=721},
+[8]={actId=702,param=0,totalNeedValue=2000,desc="累计充值{1}可上榜",maxRank=1,minRank=1,item={{7031,1},{562,6},{118,200},{102,30000}},cnt=1,mailId=7005,mainId=722},
+[9]={actId=702,param=0,totalNeedValue=2000,desc="累计充值{1}可上榜",maxRank=2,minRank=2,item={{7032,1},{562,4},{118,150},{102,20000}},cnt=1,mailId=7005,mainId=722},
+[10]={actId=702,param=0,totalNeedValue=2000,desc="累计充值{1}可上榜",maxRank=3,minRank=3,item={{7033,1},{562,2},{118,100},{102,10000}},cnt=1,mailId=7005,mainId=722},
+[11]={actId=702,param=0,totalNeedValue=100,desc="累计充值{1}可上榜",maxRank=4,minRank=10,item={{801056,100},{118,50},{102,5000}},cnt=7,mailId=7005,mainId=722},
+[12]={actId=702,param=0,totalNeedValue=100,desc="累计充值{1}可上榜",maxRank=11,minRank=20,item={{801056,50},{118,30},{102,4000}},cnt=10,mailId=7005,mainId=722},
+[13]={actId=702,param=0,totalNeedValue=1,desc="累计充值{1}可上榜",maxRank=21,minRank=50,item={{801005,50},{118,20},{102,3000}},cnt=30,mailId=7005,mainId=722},
+[14]={actId=702,param=0,totalNeedValue=1,desc="累计充值{1}可上榜",maxRank=51,minRank=100,item={{801005,50},{118,10},{102,2000}},cnt=50,mailId=7005,mainId=722},
+[15]={actId=703,param=0,totalNeedValue=1000,desc="累计高级召唤{1}可上榜",maxRank=1,minRank=1,item={{7034,1},{562,3},{124,6},{102,30000}},cnt=1,mailId=7006,mainId=731},
+[16]={actId=703,param=0,totalNeedValue=1000,desc="累计高级召唤{1}可上榜",maxRank=2,minRank=2,item={{7035,1},{562,2},{124,5},{102,20000}},cnt=1,mailId=7006,mainId=731},
+[17]={actId=703,param=0,totalNeedValue=1000,desc="累计高级召唤{1}可上榜",maxRank=3,minRank=3,item={{7036,1},{562,1},{124,4},{102,10000}},cnt=1,mailId=7006,mainId=731},
+[18]={actId=703,param=0,totalNeedValue=300,desc="累计高级召唤{1}可上榜",maxRank=4,minRank=10,item={{801056,100},{124,3},{102,5000}},cnt=7,mailId=7006,mainId=731},
+[19]={actId=703,param=0,totalNeedValue=300,desc="累计高级召唤{1}可上榜",maxRank=11,minRank=20,item={{801056,50},{124,2},{102,4000}},cnt=10,mailId=7006,mainId=731},
+[20]={actId=703,param=0,totalNeedValue=50,desc="累计高级召唤{1}可上榜",maxRank=21,minRank=50,item={{801005,50},{124,1},{102,3000}},cnt=30,mailId=7006,mainId=731},
+[21]={actId=703,param=0,totalNeedValue=50,desc="累计高级召唤{1}可上榜",maxRank=51,minRank=100,item={{801005,50},{125,300},{102,2000}},cnt=50,mailId=7006,mainId=731},
+[22]={actId=704,param=0,totalNeedValue=1000,desc="累计高级召唤{1}可上榜",maxRank=1,minRank=1,item={{7034,1},{562,3},{124,6},{102,30000}},cnt=1,mailId=7006,mainId=732},
+[23]={actId=704,param=0,totalNeedValue=1000,desc="累计高级召唤{1}可上榜",maxRank=2,minRank=2,item={{7035,1},{562,2},{124,5},{102,20000}},cnt=1,mailId=7006,mainId=732},
+[24]={actId=704,param=0,totalNeedValue=1000,desc="累计高级召唤{1}可上榜",maxRank=3,minRank=3,item={{7036,1},{562,1},{124,4},{102,10000}},cnt=1,mailId=7006,mainId=732},
+[25]={actId=704,param=0,totalNeedValue=300,desc="累计高级召唤{1}可上榜",maxRank=4,minRank=10,item={{801056,100},{124,3},{102,5000}},cnt=7,mailId=7006,mainId=732},
+[26]={actId=704,param=0,totalNeedValue=300,desc="累计高级召唤{1}可上榜",maxRank=11,minRank=20,item={{801056,50},{124,2},{102,4000}},cnt=10,mailId=7006,mainId=732},
+[27]={actId=704,param=0,totalNeedValue=50,desc="累计高级召唤{1}可上榜",maxRank=21,minRank=50,item={{801005,50},{124,1},{102,3000}},cnt=30,mailId=7006,mainId=732},
+[28]={actId=704,param=0,totalNeedValue=50,desc="累计高级召唤{1}可上榜",maxRank=51,minRank=100,item={{801005,50},{125,300},{102,2000}},cnt=50,mailId=7006,mainId=732}}end)();
 (function()zhanliReach={
 [101]={needConsume=10000,rewards={{102,200},{118,10}},actId=101},
 [102]={needConsume=20000,rewards={{102,200},{118,10}},actId=101},
@@ -778,4 +779,4 @@
 (function()absMoShouXiLian={
 [1]={number=5,multiple=2,buyid=6001,actId=101},
 [2]={number=5,multiple=2,buyid=6002,actId=0},
-[3]={number=5,multiple=2,buyid=6003,actId=0}}end)();
+[3]={number=5,multiple=2,buyid=6003,actId=0}}end)();

+ 44 - 24
script/module/absAct/HeroGrowUp.lua

@@ -42,6 +42,7 @@ DAY_TIME_SEC = 1 * 86400
 WEEK_TIME_SEC = 7 * 86400
 ACT_TIME_SEC1 = 28 * 86400
 ACT_TIME_SEC2 = 14 * 86400
+local SERVER_TIME_ZONE = 8  -- 服务器所在区服时区 北京东八区
 
 -- 任务分类
 MAINTYPE_DAY = 1 		-- 每日
@@ -140,23 +141,28 @@ function initAfterHot()
 	end
 end
 
--- 本期活动开始时间
+-- 本期活动开始时间 --@warning actID不存在
 function getActStartTime()
     --local id = AbsActLogic.getIDByActID(human, DG_ABS_ACT_ID)
+	 --[[if absActConfig.actId and absActConfig.actId ~= 0 then
+        return absActConfig.startDate,absActConfig.endDate,absActConfig.actId
+    end]]
 
     local absActConfig = AbsActExcel.absActivity[DG_ABS_ACT_ID]
-    if absActConfig.actId and absActConfig.actId ~= 0 then
-        return absActConfig.realStartTime,absActConfig.realEndTime,absActConfig.actId
-    end
+	assert(#absActConfig.turns ~= 0,"invalid config error")
+	return absActConfig.startDate,absActConfig.endDate,absActConfig.turns[1] -- @error 目前默认第一期
+	
+end
+
+local function transBeiJingTime(d)
+	return os.time(d) - SERVER_TIME_ZONE * 3600
 end
 
 -- 活动剩余时间
-function getActLeftTime()
-    local absActConfig = AbsActExcel.absActivity[DG_ABS_ACT_ID]
-    if absActConfig.actId then
-        return absActConfig.realEndTime - os.time()
-    end
-    return 0
+function getActLeftTime(dateCfg)
+	local finishTime = transBeiJingTime(dateCfg)
+	local now = os.time()
+    return finishTime > now and finishTime - now or 0
 end
 
 -- 任务周期
@@ -181,11 +187,21 @@ function getTaskStartTime(actStartTime, mainType)
 end
 
 -- 获取任务剩余时间
-function getTaskLeftTime(actStartTime, mainType)
+function getTaskLeftTime(actStartDate, mainType)
 	local time = getTaskTime(mainType)
 	if not time then return end
-	local actLeftTime = getActLeftTime(actStartTime)
-	return actLeftTime % time
+
+	--local actLeftTime = getActLeftTime(actStartTime)
+	--return actLeftTime % time
+	actStartDate.hour = actStartDate.hour or  0
+	actStartDate.min = actStartDate.min or 0
+	actStartDate.sec = actStartDate.sec or 0
+	local actStartTime = os.time(actStartDate)
+	local now = os.time()
+	if now < actStartTime then 
+		return 0
+	end
+	return (now - actStartTime) % time
 end
 
 -- 是否开放
@@ -262,7 +278,7 @@ end
 
 -- 根据类型获取任务id
 function getTaskIDList(mainType)
-	return TASKTYPE_2_MAINTYPES and MAINTYPE_2_IDLIST[mainType]
+	return MAINTYPE_2_IDLIST and MAINTYPE_2_IDLIST[mainType]
 end
 
 -- 根据任务类型获取影响的分类
@@ -600,16 +616,19 @@ function fontBaseNet(net, human, actStartTime, lvdefine)
 end
 
 -- 封装任务信息
-function fontTaskNet(net, id, human)
+local function fontTaskNet(id, human)
 	local cf = AbsActExcel.heroGrowUpTask[id]
-	net.id = id 
-	net.taskName = getTaskName(cf)
-	net.taskDesc = getTaskDesc(cf)
-	net.maxValue = getMaxValue(cf)
-	net.nowValue = math.min(getValue(human, cf), net.maxValue)	
-	Grid.makeItem(net.item, cf.items[1][1], cf.items[1][2])
-	net.panelID = cf.panelID
-	net.state = getTaskState(human, id, cf)
+	local ret = {}
+	ret.id = id 
+	ret.taskName = getTaskName(cf)
+	ret.taskDesc = getTaskDesc(cf)
+	ret.maxValue = getMaxValue(cf)
+	ret.nowValue = math.min(getValue(human, cf), ret.maxValue)	
+	ret.item = ret.item or {}
+	Grid.makeItem(ret.item, cf.items[1][1], cf.items[1][2])
+	ret.panelID = cf.panelID
+	ret.state = getTaskState(human, id, cf)
+	return ret
 end
 
 -- 积分任务界面
@@ -637,10 +656,11 @@ function sendTaskQuery(human, mainType)
     msgRet.data.hasTaskRed = isTaskRed(human) and 1 or 0
 	msgRet.mainType = mainType
 	msgRet.taskLeftTime = leftTime
+	msgRet.taskList = msgRet.taskList or {}
 	msgRet.taskList[0] = list and #list or 0
 	for i = 1, msgRet.taskList[0] do
 		local id = list[i]
-		fontTaskNet(msgRet.taskList[i], id, human)
+		msgRet.taskList[i] = fontTaskNet(id, human)
 	end
 	msgRet.taskReds[0] = MAINTYPE_CNT
 	for i = 1, msgRet.taskReds[0] do