浏览代码

feat:8号单

改为点击后直接领取全部可领取的奖励
flowerpig 6 月之前
父节点
当前提交
a75b948c64
共有 2 个文件被更改,包括 177 次插入103 次删除
  1. 100 74
      script/excel/ssecy/roleSystem.lua
  2. 77 29
      script/module/zhuanpan/ZhuanpanLogic.lua

+ 100 - 74
script/excel/ssecy/roleSystem.lua

@@ -1,74 +1,100 @@
-(function()roleSystem={
-[101]={name="头像",desc="头像",lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[102]={name="充值",desc="充值",lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[103]={name="点金",desc="金币多多",lv=6,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="jinbiExchange.JinbiExchangeLogic"},
-[104]={name="banner",desc="banner",lv=6,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[105]={name="VIP",desc="VIP",lv=6,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="vip.VipLogic"},
-[106]={name="钻石特权",desc="钻石特权",lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="qqTequan.TequanLogic"},
-[107]={name="平台特权",desc="平台特权",lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="qqTequan.TequanDotLogic"},
-[201]={name="聊天",desc="聊天",lv=10,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="chat.ChatLogic"},
-[202]={name="战报",desc="每天的精彩战况",lv=20,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="warReport.WarReportLogic"},
-[203]={name="排行榜",desc="查看本服玩家排行",lv=6,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="billboard.BillboardLogic"},
-[204]={name="邮件",desc="邮件",lv=1,touch=0,dotLv=1,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="mail.MailLogic"},
-[205]={name="好友",desc="好友",lv=1,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="friend.FriendLogic"},
-[206]={name="背包",desc="背包",lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="bag.BagLogic"},
-[207]={name="羁绊",desc="英雄羁绊加成",lv=16,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[301]={name="英雄",desc="英雄",lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="hero.HeroLogic"},
-[302]={name="共鸣",desc="英雄等级共鸣",lv=50,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="xingYaoMen.XingYaoGongMing"},
-[303]={name="境界",desc="境界提升",lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="roleSystem.RoleRealmLogic"},
-[401]={name="召唤",desc="召唤-普通友情高级",lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="drawCard.DrawCardLogic"},
-[402]={name="先知召唤",desc="指定阵营高级召唤",lv=20,touch=0,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="xianzhi.XianzhiLogic"},
-[501]={name="寻星",desc="幸运寻星夺宝奇兵",lv=30,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="zhuanpan.ZhuanpanLogic"},
-[502]={name="占卜",desc="占卜-卡牌合成",lv=14,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="zhanbu.ZhanbuLogic"},
-[601]={name="进化",desc="英魂-进化",lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[602]={name="英雄分解",desc="可将英雄分解",lv=12,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[603]={name="碎片分解",desc="可将碎片分解",lv=12,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[604]={name="重生",desc="高星英雄重置星级",lv=50,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[605]={name="回退",desc="回退10星及以上英雄",lv=50,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[606]={name="置换",desc="10星及以上英雄置换",lv=50,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[702]={name="符文",desc="装备符文战力大增",lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[703]={name="分解",desc="",lv=10,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[704]={name="洗练",desc="",lv=10,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[705]={name="装备合成",desc="合成高级装备",lv=80,touch=0,dotLv=0,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[801]={name="任务",desc="完成任务获取奖励",lv=6,touch=0,dotLv=5,lock=1,panelID=1901,openSvrDay=0,doubleDay=2,doubleDesc="日常任务宝箱双倍领取",modulePath="dailyTask.DailyTaskLogic"},
-[901]={name="商会",desc="这里有各种各样的商品",lv=2,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[1001]={name="公会",desc="加入公会一起征战",lv=18,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.Handler"},
-[1002]={name="公会首领",desc="击败首领获取奖励",lv=21,touch=0,dotLv=5,lock=0,panelID=1603,openSvrDay=0,doubleDay=1,doubleDesc="公会首领挑战双倍奖励",modulePath="union.UnionEctypeLogic"},
-[1003]={name="公会捐献",desc="",lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionDonateLogic"},
-[1004]={name="公会任务",desc="",lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionLivenessLogic"},
-[1005]={name="公会详情",desc="",lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionLogic"},
-[1006]={name="公会战",desc="",lv=999,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionWarLogic"},
-[1101]={name="主线-挂机",desc="主线-挂机",lv=1,touch=0,dotLv=0,lock=0,panelID=1002,openSvrDay=0,doubleDay=7,doubleDesc="扫荡奖励双倍领取",modulePath=""},
-[1102]={name="在线奖励",desc="主线-在线奖励",lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[1104]={name="悬赏",desc="派遣英雄完成悬赏",lv=10,touch=0,dotLv=5,lock=1,panelID=1002,openSvrDay=0,doubleDay=3,doubleDesc="4星悬赏任务双倍奖励",modulePath="bar.BarTaskLogic"},
-[1105]={name="章节奖励",desc="主线-章节奖励",lv=1,touch=0,dotLv=0,lock=0,panelID=1002,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="battle.BattleLogic"},
-[1201]={name="副本",desc="各种玩法应有尽有",lv=4,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="copy.CopyManage"},
-[1202]={name="副本-上层",desc="各种玩法应有尽有",lv=4,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="copy.CopyManage"},
-[1203]={name="恶魔之塔",desc="挑战恶魔塔领取进阶道具",lv=6,touch=0,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="huanjingTower.HuanjingTowerLogic"},
-[1204]={name="勇者试炼",desc="参与试炼领取奖励",lv=13,touch=1,dotLv=5,lock=2,panelID=1701,openSvrDay=0,doubleDay=6,doubleDesc="勇者试炼挑战双倍奖励",modulePath="drill.DrillLogic"},
-[1205]={name="绝望深渊",desc="可获得大量英雄经验",lv=25,touch=1,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="lianyu.LianyuLogic"},
-[1206]={name="女巫森林",desc="可获得大量实用道具",lv=11,touch=0,dotLv=5,lock=2,panelID=1701,openSvrDay=0,doubleDay=5,doubleDesc="女巫森林奖励双倍领取",modulePath="copy.CopyLogic"},
-[1207]={name="遗迹探险",desc="英雄单体作战实力展现",lv=20,touch=1,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="yjTreasure.YjTreasureLogic"},
-[1208]={name="失落神庙",desc="每两天重置一次",lv=50,touch=0,dotLv=0,lock=2,panelID=2901,openSvrDay=7,doubleDay=0,doubleDesc="",modulePath="lostTemple.lostTempleCombatLogic"},
-[1209]={name="冰龙巢穴",desc="世界BOSS等你来战",lv=15,touch=0,dotLv=0,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="copy.DragonNestLogic"},
-[1210]={name="种族试炼",desc="种族试炼",lv=75,touch=0,dotLv=75,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
-[1211]={name="妖族试炼",desc="种族试炼",lv=75,touch=0,dotLv=75,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
-[1212]={name="人族试炼",desc="种族试炼",lv=75,touch=0,dotLv=75,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
-[1213]={name="兽族试炼",desc="种族试炼",lv=75,touch=0,dotLv=75,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
-[1214]={name="仙魔试炼",desc="种族试炼",lv=75,touch=0,dotLv=75,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
-[1300]={name="竞技",desc="单服竞技玩法",lv=8,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="jjc.JjcActLogic"},
-[1301]={name="冠军联赛",desc="单服竞技玩法",lv=8,touch=0,dotLv=5,lock=2,panelID=1801,openSvrDay=0,doubleDay=4,doubleDesc="冠军联赛挑战双倍奖励",modulePath="jjc.JjcActLogic"},
-[1302]={name="王者争霸",desc="单服竞技玩法",lv=8,touch=0,dotLv=0,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[1303]={name="战神殿",desc="参与赢取强力称号",lv=30,touch=0,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="theStars.TheStarsLogic"},
-[1401]={name="天梯",desc="单人跨服竞技玩法",lv=55,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=3,doubleDay=0,doubleDesc="",modulePath="jjcLadder.JjcLadderLogic"},
-[1402]={name="魔王安达利尔",desc="公会跨服BOSS玩法",lv=18,touch=0,dotLv=0,lock=0,panelID=2801,openSvrDay=4,doubleDay=0,doubleDesc="",modulePath=""},
-[2001]={name="封印之章",desc="解封徽章获取特权",lv=12,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="chengjiu.ChengjiuLogic"},
-[2002]={name="守护之龙",desc="强力助战召唤兽",lv=6,touch=0,dotLv=5,lock=0,panelID=2111,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="moshou.MoshouLogic"},
-[2003]={name="守护之龙",desc="守护之龙洗炼",lv=30,touch=0,dotLv=0,lock=0,panelID=2113,openSvrDay=4,doubleDay=0,doubleDesc="",modulePath="moshou.MoshouLogic"},
-[2004]={name="守护之龙",desc="守护之龙圣器",lv=35,touch=0,dotLv=0,lock=0,panelID=3001,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
-[2005]={name="战令",desc="战令",lv=11,touch=0,dotLv=0,lock=0,panelID=3801,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="shop.WarOrder"},
-[2006]={name="秘宝入口",desc="秘宝",lv=30,touch=0,dotLv=0,lock=0,panelID=2120,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
-[2007]={name="稀有秘宝",desc="秘宝",lv=30,touch=0,dotLv=0,lock=0,panelID=2121,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
-[2008]={name="史诗秘宝",desc="秘宝",lv=30,touch=0,dotLv=0,lock=0,panelID=2122,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
-[2009]={name="传说秘宝",desc="秘宝",lv=30,touch=0,dotLv=0,lock=0,panelID=2123,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
-[2010]={name="神话秘宝",desc="秘宝",lv=30,touch=0,dotLv=0,lock=0,panelID=2124,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"}}end)();
+(function()roleSystem={
+[101]={name="头像",desc="头像",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[102]={name="充值",desc="充值",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[103]={name="点金",desc="每日点金金币多多",reward={{102,50}},isdisplay=1,lv=7,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="jinbiExchange.JinbiExchangeLogic"},
+[104]={name="banner",desc="banner",reward={},isdisplay=0,lv=7,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[105]={name="VIP",desc="VIP",reward={},isdisplay=0,lv=7,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="vip.VipLogic"},
+[106]={name="钻石特权",desc="钻石特权",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="qqTequan.TequanLogic"},
+[107]={name="平台特权",desc="平台特权",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="qqTequan.TequanDotLogic"},
+[109]={name="大玩咖",desc="大玩咖",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="platform.QQBigShot"},
+[110]={name="预告",desc="预告",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="roleSystem.RoleOpenPrize"},
+[111]={name="无限召唤",desc="无限召唤",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="drawCard.UnlimitDrawLogic"},
+[201]={name="聊天",desc="聊天",reward={{102,100}},isdisplay=1,lv=17,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="chat.ChatLogic"},
+[202]={name="战报",desc="精彩战况不容错过",reward={{102,150}},isdisplay=1,lv=24,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="warReport.WarReportLogic"},
+[203]={name="排行榜",desc="玩家排行谁与争锋",reward={{102,50}},isdisplay=1,lv=8,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="billboard.BillboardLogic"},
+[204]={name="邮件",desc="邮件",reward={},isdisplay=0,lv=1,touch=0,dotLv=1,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="mail.MailLogic"},
+[205]={name="好友",desc="好友",reward={},isdisplay=0,lv=1,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="friend.FriendLogic"},
+[206]={name="背包",desc="背包",reward={},isdisplay=0,lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="bag.BagLogic"},
+[207]={name="羁绊",desc="英雄羁绊战斗加成",reward={{102,200}},isdisplay=1,lv=33,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[301]={name="英雄",desc="英雄",reward={},isdisplay=0,lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="hero.HeroLogic"},
+[302]={name="共鸣",desc="英雄等级共鸣",reward={{102,250}},isdisplay=1,lv=50,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="xingYaoMen.XingYaoGongMing"},
+[303]={name="境界",desc="境界提升",reward={},isdisplay=0,lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="roleSystem.RoleRealmLogic"},
+[304]={name="酒馆",desc="英雄升星增强战力",reward={{102,100}},isdisplay=1,lv=14,touch=0,dotLv=14,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="hero.HeroPubLogic"},
+[305]={name="图鉴",desc="英雄图鉴",reward={},isdisplay=0,lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="hero.HeroBook"},
+[401]={name="召唤",desc="召唤-普通友情高级",reward={},isdisplay=0,lv=1,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="drawCard.DrawCardLogic"},
+[402]={name="先知召唤",desc="指定阵营召唤英雄",reward={{102,150}},isdisplay=1,lv=20,touch=0,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="xianzhi.XianzhiLogic"},
+[501]={name="寻星",desc="幸运寻星夺宝奇兵",reward={{102,200}},isdisplay=1,lv=34,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="zhuanpan.ZhuanpanLogic"},
+[502]={name="占卜",desc="英雄占卜响应召唤",reward={{102,100}},isdisplay=1,lv=18,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="zhanbu.ZhanbuLogic"},
+[600]={name="英魂",desc="英雄分解重生回退",reward={{102,100}},isdisplay=1,lv=12,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[601]={name="进化",desc="英魂-进化",reward={},isdisplay=0,lv=12,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[602]={name="英雄分解",desc="可将英雄分解",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[603]={name="碎片分解",desc="可将碎片分解",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[604]={name="重生",desc="高星英雄重置星级",reward={},isdisplay=0,lv=33,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[605]={name="回退",desc="回退10星及以上英雄",reward={},isdisplay=0,lv=33,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[606]={name="置换",desc="10星及以上英雄置换",reward={},isdisplay=0,lv=33,touch=0,dotLv=0,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[700]={name="锻造",desc="打造更加强力的神兵利器",reward={{102,200}},isdisplay=1,lv=38,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[702]={name="符文",desc="装备符文战力大增",reward={},isdisplay=0,lv=38,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[703]={name="分解",desc="",reward={},isdisplay=0,lv=38,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[704]={name="洗练",desc="",reward={},isdisplay=0,lv=38,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[705]={name="装备合成",desc="合成高级装备",reward={{102,250}},isdisplay=1,lv=55,touch=0,dotLv=0,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[801]={name="任务",desc="完成任务获取奖励",reward={{102,50}},isdisplay=1,lv=9,touch=0,dotLv=5,lock=1,panelID=1901,openSvrDay=0,doubleDay=2,doubleDesc="日常任务宝箱双倍领取",modulePath="dailyTask.DailyTaskLogic"},
+[802]={name="周任务",desc="完成任务获取奖励",reward={},isdisplay=0,lv=9,touch=0,dotLv=5,lock=1,panelID=1901,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="dailyTask.WeekTaskLogic"},
+[803]={name="荣耀任务",desc="完成任务获取奖励",reward={},isdisplay=0,lv=9,touch=0,dotLv=5,lock=1,panelID=1901,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="dailyTask.HonorJourney"},
+[901]={name="商城",desc="大量商品等你抢购",reward={{102,50}},isdisplay=1,lv=8,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[1001]={name="公会",desc="加入公会一起征战",reward={{102,150}},isdisplay=1,lv=20,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.Handler"},
+[1002]={name="公会首领",desc="击败首领获取奖励",reward={},isdisplay=0,lv=20,touch=0,dotLv=5,lock=0,panelID=1603,openSvrDay=0,doubleDay=1,doubleDesc="公会首领挑战双倍奖励",modulePath="union.UnionEctypeLogic"},
+[1003]={name="公会捐献",desc="",reward={},isdisplay=0,lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionDonateLogic"},
+[1004]={name="公会任务",desc="",reward={},isdisplay=0,lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionLivenessLogic"},
+[1005]={name="公会详情",desc="",reward={},isdisplay=0,lv=0,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionLogic"},
+[1006]={name="公会战",desc="",reward={},isdisplay=0,lv=999,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=999,doubleDay=0,doubleDesc="",modulePath="union.UnionWarLogic"},
+[1007]={name="公会科技",desc="",reward={},isdisplay=0,lv=20,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="union.UnionTecLogic"},
+[1101]={name="主线-挂机",desc="主线-挂机",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=1002,openSvrDay=0,doubleDay=7,doubleDesc="扫荡奖励双倍领取",modulePath=""},
+[1102]={name="在线奖励",desc="主线-在线奖励",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[1104]={name="悬赏",desc="派遣英雄完成悬赏",reward={{102,100}},isdisplay=1,lv=15,touch=0,dotLv=5,lock=1,panelID=1002,openSvrDay=0,doubleDay=3,doubleDesc="4星悬赏任务双倍奖励",modulePath="bar.BarTaskLogic"},
+[1105]={name="章节奖励",desc="主线-章节奖励",reward={},isdisplay=0,lv=1,touch=0,dotLv=0,lock=0,panelID=1002,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="battle.BattleLogic"},
+[1201]={name="副本",desc="各种玩法应有尽有",reward={},isdisplay=0,lv=4,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="copy.CopyManage"},
+[1202]={name="副本-上层",desc="各种玩法应有尽有",reward={},isdisplay=0,lv=4,touch=0,dotLv=5,lock=1,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="copy.CopyManage"},
+[1203]={name="恶魔之塔",desc="层层爬塔直冲云霄",reward={{102,100}},isdisplay=1,lv=14,touch=0,dotLv=5,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="huanjingTower.HuanjingTowerLogic"},
+[1204]={name="勇者试炼",desc="参与试炼领取奖励",reward={{102,150}},isdisplay=1,lv=28,touch=1,dotLv=5,lock=2,panelID=1701,openSvrDay=3,doubleDay=6,doubleDesc="勇者试炼挑战双倍奖励",modulePath="drill.DrillLogic"},
+[1205]={name="绝望深渊",desc="连续闯关挑战极限",reward={{102,150}},isdisplay=1,lv=23,touch=1,dotLv=5,lock=2,panelID=0,openSvrDay=2,doubleDay=0,doubleDesc="",modulePath="lianyu.LianyuLogic"},
+[1206]={name="女巫森林",desc="获得日常养成材料",reward={{102,50}},isdisplay=1,lv=10,touch=0,dotLv=5,lock=2,panelID=1701,openSvrDay=0,doubleDay=5,doubleDesc="女巫森林奖励双倍领取",modulePath="copy.CopyLogic"},
+[1207]={name="遗迹探险",desc="英雄单体作战实力展现",reward={{102,200}},isdisplay=1,lv=39,touch=1,dotLv=5,lock=2,panelID=0,openSvrDay=4,doubleDay=0,doubleDesc="",modulePath="yjTreasure.YjTreasureLogic"},
+[1208]={name="失落神庙",desc="肉鸽探索神奇秘境",reward={{102,250}},isdisplay=1,lv=40,touch=0,dotLv=0,lock=2,panelID=2901,openSvrDay=5,doubleDay=0,doubleDesc="",modulePath="lostTemple.lostTempleCombatLogic"},
+[1209]={name="冰龙巢穴",desc="世界BOSS等你来战",reward={{102,150}},isdisplay=1,lv=25,touch=0,dotLv=0,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="copy.DragonNestLogic"},
+[1210]={name="种族试炼",desc="不同种族英雄的考验",reward={{102,500}},isdisplay=1,lv=90,touch=0,dotLv=90,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
+[1211]={name="妖族试炼",desc="种族试炼",reward={},isdisplay=0,lv=90,touch=0,dotLv=90,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
+[1212]={name="人族试炼",desc="种族试炼",reward={},isdisplay=0,lv=90,touch=0,dotLv=90,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
+[1213]={name="兽族试炼",desc="种族试炼",reward={},isdisplay=0,lv=90,touch=0,dotLv=90,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
+[1214]={name="仙魔试炼",desc="种族试炼",reward={},isdisplay=0,lv=90,touch=0,dotLv=90,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="racialTrial.RacialTrialLogic"},
+[1215]={name="幽暗禁地",desc="挑战BOSS获得大量掉落",reward={{102,500}},isdisplay=1,lv=100,touch=0,dotLv=100,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="darkForbiddenarea.DarkForbiddenAreaLogic"},
+[1300]={name="竞技",desc="单服竞技玩法",reward={{102,100}},isdisplay=1,lv=13,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="jjc.JjcActLogic"},
+[1301]={name="冠军联赛",desc="单服竞技玩法",reward={},isdisplay=0,lv=13,touch=0,dotLv=5,lock=2,panelID=1801,openSvrDay=0,doubleDay=4,doubleDesc="冠军联赛挑战双倍奖励",modulePath="jjc.JjcActLogic"},
+[1302]={name="王者争霸",desc="单服竞技玩法",reward={},isdisplay=0,lv=13,touch=0,dotLv=0,lock=2,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[1303]={name="战神殿",desc="参与赢取强力称号",reward={{102,200}},isdisplay=1,lv=35,touch=0,dotLv=5,lock=2,panelID=0,openSvrDay=2,doubleDay=0,doubleDesc="",modulePath="theStars.TheStarsLogic"},
+[1304]={name="天梯赛",desc="单人跨服竞技玩法",reward={{102,300}},isdisplay=1,lv=50,touch=0,dotLv=5,lock=0,panelID=1806,openSvrDay=4,doubleDay=0,doubleDesc="",modulePath="jjcnewladder.jjcNewLadderLogic"},
+[1305]={name="诸神圣域",desc="全服神位PK玩法",reward={{102,500}},isdisplay=1,lv=105,touch=0,dotLv=5,lock=0,panelID=1807,openSvrDay=29,doubleDay=0,doubleDesc="",modulePath="godsArea.GodsAreaNS"},
+[1306]={name="战区争霸赛",desc="服务器之间为荣誉而战",reward={{102,300}},isdisplay=1,lv=60,touch=0,dotLv=5,lock=0,panelID=1808,openSvrDay=8,doubleDay=0,doubleDesc="",modulePath="areaBattle.AreaBattleNS"},
+[1402]={name="魔王梼杌",desc="本服公会团队BOSS挑战",reward={{102,200}},isdisplay=1,lv=31,touch=0,dotLv=0,lock=0,panelID=2801,openSvrDay=2,doubleDay=0,doubleDesc="",modulePath=""},
+[2001]={name="封印之章",desc="解封宝具探索奥秘",reward={{102,150}},isdisplay=1,lv=22,touch=0,dotLv=5,lock=0,panelID=0,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="chengjiu.ChengjiuLogic"},
+[2002]={name="守护凤凰",desc="强力助战召唤兽",reward={},isdisplay=0,lv=22,touch=0,dotLv=5,lock=0,panelID=2111,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="moshou.MoshouLogic"},
+[2003]={name="守护凤凰",desc="守护凤凰洗炼",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2113,openSvrDay=3,doubleDay=0,doubleDesc="",modulePath="moshou.MoshouLogic"},
+[2004]={name="守护凤凰",desc="守护凤凰圣器",reward={},isdisplay=0,lv=35,touch=0,dotLv=0,lock=0,panelID=3001,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath=""},
+[2005]={name="战令",desc="战令",reward={},isdisplay=0,lv=22,touch=0,dotLv=0,lock=0,panelID=3801,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="shop.WarOrder"},
+[2006]={name="秘宝入口",desc="秘宝",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2120,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
+[2007]={name="稀有秘宝",desc="秘宝",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2121,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
+[2008]={name="史诗秘宝",desc="秘宝",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2122,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
+[2009]={name="传说秘宝",desc="秘宝",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2123,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
+[2010]={name="神话秘宝",desc="秘宝",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2124,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
+[2011]={name="远古秘宝",desc="秘宝",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2125,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="talisman.TalismanLogic"},
+[2021]={name="圣遗入口",desc="圣遗",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2211,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="winnerRelic.WinnerRelicLogic"},
+[2022]={name="攻击型圣遗",desc="圣遗",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2212,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="winnerRelic.WinnerRelicLogic"},
+[2023]={name="防御型圣遗",desc="圣遗",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2213,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="winnerRelic.WinnerRelicLogic"},
+[2024]={name="功能型圣遗",desc="圣遗",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2214,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="winnerRelic.WinnerRelicLogic"},
+[2031]={name="精灵入口",desc="精灵",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2311,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="elf.ElfLogic"},
+[2032]={name="稀有精灵",desc="精灵",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2312,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="elf.ElfLogic"},
+[2033]={name="史诗精灵",desc="精灵",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2313,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="elf.ElfLogic"},
+[2034]={name="传说精灵",desc="精灵",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2314,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="elf.ElfLogic"},
+[2035]={name="神话精灵",desc="精灵",reward={},isdisplay=0,lv=30,touch=0,dotLv=0,lock=0,panelID=2315,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="elf.ElfLogic"},
+[3001]={name="登录豪礼",desc="合服活动",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=7101,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="present.MergeServerCharge"},
+[3002]={name="连充豪礼",desc="合服活动",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=7102,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="present.MergeServerHuoYue"},
+[3003]={name="活跃豪礼",desc="合服活动",reward={},isdisplay=0,lv=0,touch=0,dotLv=0,lock=0,panelID=7103,openSvrDay=0,doubleDay=0,doubleDesc="",modulePath="present.MergeServerLogin"}}end)();

+ 77 - 29
script/module/zhuanpan/ZhuanpanLogic.lua

@@ -644,42 +644,90 @@ function getLuck(human, msg)
     end
 	
 	local luckStatus = zhuanpan.luckStatus
-	if luckStatus == nil or luckStatus[msg.id] ~= 1 then
-	   return
+	if luckStatus == nil then
+		luckStatus = {}
+		zhuanpan.luckStatus = luckStatus
 	end
-	luckStatus[msg.id] = 2
 	
-	BagLogic.addItem(human, config[msg.id].reward[1], config[msg.id].reward[2], "zhuanpan_back")
+	-- 收集所有可领取的奖励(status == 1)
+	local itemList = {}
+	local itemListLen = 0
+	
+	-- 遍历所有配置的奖励,找到可领取的(status == 1)
+	for k, v in pairs(config) do
+		if luckStatus[k] == 1 then
+			-- 标记为已领取
+			luckStatus[k] = 2
+			
+			-- 添加奖励到背包
+			BagLogic.addItem(human, v.reward[1], v.reward[2], "zhuanpan_back")
+			
+			-- 收集到奖励列表
+			itemListLen = itemListLen + 1
+			itemList[itemListLen] = {v.reward[1], v.reward[2]}
+		end
+	end
 	
-    local itemList = {[1] = {config[msg.id].reward[1],config[msg.id].reward[2]}}
-	BagLogic.sendItemGetList(human,itemList, "zhuanpan_back")
+	-- 如果没有可领取的奖励,直接返回
+	if itemListLen == 0 then
+		return
+	end
 	
-    --计算是否需要重新扣除幸运值 重新激活奖励
-	local luck = zhuanpan.luck
-	local calc = true
-    for k, v in pairs(config) do
-        if luckStatus[k] == nil or luckStatus[k] ~= 2 then
-		   calc = false
+	-- 循环处理幸运值扣除和重新激活奖励(可能领取多轮)
+	while true do
+		-- 计算是否需要重新扣除幸运值 重新激活奖励
+		local luck = zhuanpan.luck
+		local calc = true
+		for k, v in pairs(config) do
+			if luckStatus[k] == nil or luckStatus[k] ~= 2 then
+				calc = false
+			end
+		end
+		
+		-- 如果所有奖励都已领取,扣除幸运值并重新激活
+		if calc == true then
+			zhuanpan.luckStatus = {}	
+			luck = luck - DEFAULT_MAX_LUCK
+			luck = luck < 0 and 0 or luck
+			zhuanpan.luck = luck
+			
+			-- 重新激活幸运值奖励
+			luckStatus = zhuanpan.luckStatus
+			for k, v in pairs(config) do
+				if zhuanpan.luck >= k then
+					if luckStatus[k] == nil then		
+						luckStatus[k] = 1
+					end
+				end 	
+			end
+			
+			-- 如果重新激活后还有可领取的奖励,继续循环领取
+			local hasMore = false
+			for k, v in pairs(config) do
+				if luckStatus[k] == 1 then
+					hasMore = true
+					-- 领取这个奖励
+					luckStatus[k] = 2
+					BagLogic.addItem(human, v.reward[1], v.reward[2], "zhuanpan_back")
+					itemListLen = itemListLen + 1
+					itemList[itemListLen] = {v.reward[1], v.reward[2]}
+				end
+			end
+			
+			-- 如果没有更多可领取的奖励,退出循环
+			if not hasMore then
+				break
+			end
+		else
+			-- 不是所有奖励都已领取,退出循环
+			break
 		end
-    end
-	
-	if calc == true then
-	   zhuanpan.luckStatus = {}	
-	   luck = luck - DEFAULT_MAX_LUCK
-	   luck = luck < 0 and 0 or luck
-	   zhuanpan.luck = luck
-	   
-	    -- 集火幸运值 奖励
-        local luckStatus = zhuanpan.luckStatus
-        for k, v in pairs(config) do
-            if zhuanpan.luck >= k then
-                if luckStatus[k] == nil then		
-	    		   luckStatus[k] = 1
-	    		end
-            end 	
-	    end
 	end
 	
+	-- 发送所有奖励列表
+	if itemListLen > 0 then
+		BagLogic.sendItemGetList(human, itemList, "zhuanpan_back")
+	end
 	
 	query(human, msg.type)
 end