Merge branch '360test' of https://gitee.com/wangwenfan/congkong into 360test

script/excel/ssecy/yunying.lua

@@ -1,77 +1,110 @@
-(function()config={
-[1]={name="活动",icon=1,sortID=1,panelID=3301,pos=1,funcs={101,102,103,10001,6001,1001,313,311,12001,13001,104},serverIndex={{1,999999}}},
-[2]={name="福利",icon=2,sortID=2,panelID=3501,pos=1,funcs={201,202,203,204,205},serverIndex={{1,999999}}},
-[3]={name="新服",icon=3,sortID=3,panelID=3601,pos=1,funcs={301,302,303,17001},serverIndex={{1,999999}}},
-[4]={name="奥斯曼的礼物",icon=4,sortID=4,panelID=3702,pos=2,funcs={2001},serverIndex={{1,999999}}},
-[5]={name="英雄up",icon=5,sortID=5,panelID=3703,pos=2,funcs={3001},serverIndex={{1,999999}}},
-[6]={name="精英召唤",icon=6,sortID=6,panelID=3704,pos=2,funcs={4001,4003,4004},serverIndex={{1,999999}}},
-[7]={name="全神的遗物",icon=7,sortID=7,panelID=3707,pos=2,funcs={5001,5002},serverIndex={{1,999999}}},
-[8]={name="打工",icon=8,sortID=8,panelID=3610,pos=1,funcs={8001},serverIndex={{1,999999}}},
-[9]={name="钻石加号",icon=11,sortID=11,panelID=3101,pos=1,funcs={14001,11001,312,315,316},serverIndex={{1,999999}}},
-[10]={name="新英雄来袭",icon=12,sortID=12,panelID=5010,pos=1,funcs={30001,30002,30003,30004,30005},serverIndex={{1,999999}}},
-[11]={name="国庆活动",icon=13,sortID=13,panelID=5000,pos=1,funcs={31001,31002,31003,31004,31005},serverIndex={{1,999999}}},
-[12]={name="开服庆典",icon=14,sortID=14,panelID=7000,pos=1,funcs={601,602,603,604,605,606},serverIndex={{1,999999}}},
-[13]={name="限时活动",icon=15,sortID=15,panelID=7010,pos=1,funcs={701,702,703},serverIndex={{1,999999}}},
-[14]={name="限时活动",icon=16,sortID=16,panelID=7021,pos=1,funcs={711,712,713,714},serverIndex={{1,999999}}},
-[15]={name="跨服充值榜",icon=17,sortID=17,panelID=7031,pos=1,funcs={721,722},serverIndex={{1,999999}}},
-[16]={name="跨服召唤榜",icon=18,sortID=18,panelID=7041,pos=1,funcs={731,732},serverIndex={{1,999999}}},
-[17]={name="合服活动",icon=19,sortID=19,panelID=5020,pos=1,funcs={40001,40002,40003,40004,40005,40006},serverIndex={{1,999999}}},
-[18]={name="限时活动",icon=20,sortID=20,panelID=7050,pos=1,funcs={741,742,743,744},serverIndex={{1,999999}}},
-[19]={name="新春活动",icon=21,sortID=21,panelID=5060,pos=1,funcs={80001,80002,80003,80004},serverIndex={{1,999999}}},
-[20]={name="元宵活动",icon=22,sortID=22,panelID=5055,pos=1,funcs={70001,70002,70003},serverIndex={{1,999999}}},
-[21]={name="洗炼双倍",icon=23,sortID=23,panelID=3901,pos=1,funcs={15001},serverIndex={{1,999999}}},
-[22]={name="英雄EVA横幅",icon=34,sortID=24,panelID=8001,pos=2,funcs={9001},serverIndex={{1,999999}}},
-[24]={name="周末冲刺",icon=51,sortID=26,panelID=9100,pos=1,funcs={9101},serverIndex={{1,999999}}}}end)();
-(function()func={
-[101]={actName="",icon=101,effect=0,openLv=3,panelID=3302,moduleFn="present.FirstChargeLogic",param=0},
-[102]={actName="",icon=102,effect=0,openLv=5,panelID=3303,moduleFn="present.MonthCard",param=0},
-[103]={actName="",icon=103,effect=0,openLv=10,panelID=3304,moduleFn="present.TequanShopLogic",param=0},
-[104]={actName="",icon=701,effect=0,openLv=3,panelID=3313,moduleFn="present.HeroSkinLogic",param=0},
-[201]={actName="",icon=201,effect=0,openLv=5,panelID=3502,moduleFn="loginSign.LoginSignLogic",param=0},
-[202]={actName="",icon=202,effect=0,openLv=5,panelID=3503,moduleFn="present.RelationGiftLogic",param=0},
-[203]={actName="",icon=203,effect=0,openLv=5,panelID=3504,moduleFn="present.CDK",param=0},
-[204]={actName="",icon=204,effect=0,openLv=5,panelID=3505,moduleFn="present.ChongJiLogic",param=0},
-[205]={actName="",icon=205,effect=0,openLv=5,panelID=3506,moduleFn="present.FundLogic",param=0},
-[301]={actName="",icon=301,effect=0,openLv=5,panelID=3602,moduleFn="present.OpenServerGiftLogic",param=0},
-[302]={actName="",icon=302,effect=0,openLv=5,panelID=3603,moduleFn="present.KingWorldLogic",param=0},
-[303]={actName="",icon=303,effect=0,openLv=5,panelID=3605,moduleFn="present.MengxinLogic",param=0},
-[311]={actName="",icon=311,effect=0,openLv=5,panelID=3607,moduleFn="present.FundLogic",param=0},
-[312]={actName="",icon=312,effect=0,openLv=5,panelID=3107,moduleFn="present.DailyLibaoLogic",param=0},
-[313]={actName="",icon=313,effect=0,openLv=3,panelID=3310,moduleFn="present.OverflowFundLogic",param=0},
-[315]={actName="",icon=315,effect=0,openLv=1,panelID=3104,moduleFn="present.RichangLibaoLogic",param=0},
-[316]={actName="",icon=316,effect=0,openLv=1,panelID=3207,moduleFn="present.RichangLibaoLogic",param=0},
-[401]={actName="幸运盲盒",icon=401,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=401},
-[402]={actName="幸运盲盒",icon=402,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=402},
-[403]={actName="幸运盲盒",icon=403,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=403},
-[404]={actName="幸运盲盒",icon=404,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=404},
-[501]={actName="",icon=501,effect=0,openLv=5,panelID=3608,moduleFn="present.LimitPerpleHeroLogic",param=501},
-[601]={actName="",icon=601,effect=0,openLv=5,panelID=7001,moduleFn="present.OpenServerTotalConsume",param=5},
-[602]={actName="",icon=602,effect=0,openLv=5,panelID=7002,moduleFn="present.OpenServerRank",param=6},
-[603]={actName="",icon=603,effect=0,openLv=5,panelID=7003,moduleFn="present.OpenServerSingleCharge",param=7},
-[604]={actName="",icon=604,effect=0,openLv=5,panelID=7004,moduleFn="present.OpenServerTotalConsume",param=8},
-[605]={actName="",icon=605,effect=0,openLv=5,panelID=7005,moduleFn="present.OpenServerRank",param=9},
-[606]={actName="",icon=606,effect=0,openLv=5,panelID=7006,moduleFn="present.OpenServerRank",param=10},
-[9001]={actName="",icon=9001,effect=0,openLv=5,panelID=8001,moduleFn="absAct.NewHeroLogic",param=305013},
-[9101]={actName="",icon=9101,effect=0,openLv=1,panelID=9100,moduleFn="WeekendLoopActivity.WeekendLoopActManager",param=0},
-[17001]={actName="",icon=17001,effect=0,openLv=5,panelID=3609,moduleFn="present.OpenServerActPowerUp",param=0}}end)();
-(function()banner={
-[1]={name="天命召唤",icon=1,sortID=99,funcID={},panelID=1304,serverIndex={{1,999999}}},
-[2]={name="特惠礼盒",icon=2,sortID=6,funcID={1001},panelID=0,serverIndex={{1,999999}}},
-[3]={name="首充",icon=3,sortID=3,funcID={101},panelID=0,serverIndex={{1,999999}}},
-[4]={name="钻石月卡",icon=4,sortID=5,funcID={102},panelID=0,serverIndex={{1,999999}}},
-[5]={name="贵族之证",icon=5,sortID=4,funcID={103},panelID=0,serverIndex={{1,999999}}},
-[6]={name="奥斯曼的礼物",icon=6,sortID=1,funcID={2001},panelID=0,serverIndex={{1,999999}}},
-[7]={name="英雄UP活动",icon=7,sortID=1,funcID={3001},panelID=0,serverIndex={{1,999999}}},
-[8]={name="精英召唤",icon=11,sortID=1,funcID={4001},panelID=0,serverIndex={{1,999999}}},
-[9]={name="全神的遗物",icon=9,sortID=1,funcID={5001},panelID=0,serverIndex={{1,999999}}},
-[10]={name="占卜轮盘",icon=10,sortID=2,funcID={6001},panelID=0,serverIndex={{1,999999}}},
-[11]={name="新英雄来袭",icon=18,sortID=1,funcID={30001,30002,30003,30004,30005},panelID=0,serverIndex={{1,999999}}},
-[12]={name="国庆活动",icon=29,sortID=1,funcID={31001,31002,31003,31004,31005},panelID=0,serverIndex={{1,999999}}},
-[13]={name="开服庆典",icon=23,sortID=1,funcID={601,602,603,604,605,606},panelID=0,serverIndex={{1,999999}}},
-[14]={name="合服活动",icon=22,sortID=1,funcID={40001,40002,40003,40004,40005,40006},panelID=0,serverIndex={{1,999999}}},
-[15]={name="限时活动",icon=24,sortID=1,funcID={741,742,743,744},panelID=0,serverIndex={{1,999999}}},
-[16]={name="新春活动",icon=28,sortID=1,funcID={80001,80002,80003,80004},panelID=0,serverIndex={{1,999999}}},
-[17]={name="元宵活动",icon=26,sortID=1,funcID={70001,70002,70003},panelID=0,serverIndex={{1,999999}}},
-[18]={name="洗炼双倍",icon=27,sortID=1,funcID={15001},panelID=0,serverIndex={{1,999999}}},
-[19]={name="英雄EVA横幅",icon=35,sortID=1,funcID={9001},panelID=8001,serverIndex={{1,999999}}},
-[20]={name="周末冲刺",icon=51,sortID=1,funcID={9101},panelID=9100,serverIndex={{1,999999}}}}end)();
+(function()config={
+[1]={name="活动",icon=1,sortID=1,panelID=3301,pos=1,funcs={312,315,316,3314,101,102,103,6001,1001,313,311,12001,13001,104},serverIndex={{1,999999}}},
+[2]={name="福利",icon=2,sortID=2,panelID=3501,pos=1,funcs={},serverIndex={{1,999999}}},
+[3]={name="新服",icon=3,sortID=3,panelID=3601,pos=1,funcs={301,302,303,17001},serverIndex={{1,999999}}},
+[4]={name="奥斯曼的礼物",icon=4,sortID=4,panelID=3702,pos=2,funcs={2001},serverIndex={{1,999999}}},
+[5]={name="英雄up",icon=5,sortID=5,panelID=3703,pos=2,funcs={3001},serverIndex={{1,999999}}},
+[6]={name="精英召唤",icon=6,sortID=6,panelID=3704,pos=2,funcs={4001,4003,4004},serverIndex={{1,999999}}},
+[7]={name="全神的遗物",icon=7,sortID=7,panelID=3707,pos=2,funcs={5001,5002},serverIndex={{1,999999}}},
+[8]={name="打工",icon=8,sortID=8,panelID=3610,pos=1,funcs={8001},serverIndex={{1,999999}}},
+[9]={name="钻石加号",icon=11,sortID=11,panelID=3101,pos=1,funcs={14001},serverIndex={{1,999999}}},
+[10]={name="新英雄来袭",icon=12,sortID=12,panelID=5010,pos=1,funcs={30001,30002,30003,30004,30005},serverIndex={{1,999999}}},
+[11]={name="国庆活动",icon=13,sortID=13,panelID=5000,pos=1,funcs={31001,31002,31003,31004,31005},serverIndex={{1,999999}}},
+[12]={name="开服庆典",icon=14,sortID=14,panelID=7000,pos=1,funcs={601,602,604,605,606,607},serverIndex={{1,999999}}},
+[13]={name="限时活动",icon=15,sortID=15,panelID=7010,pos=1,funcs={701,702,703},serverIndex={{1,999999}}},
+[14]={name="限时活动",icon=16,sortID=16,panelID=7021,pos=1,funcs={711,712,713,714},serverIndex={{1,999999}}},
+[15]={name="跨服充值榜",icon=17,sortID=17,panelID=7031,pos=1,funcs={721,722},serverIndex={{1,999999}}},
+[16]={name="跨服召唤榜",icon=18,sortID=18,panelID=7041,pos=1,funcs={731,732},serverIndex={{1,999999}}},
+[18]={name="限时活动",icon=20,sortID=20,panelID=7050,pos=1,funcs={741,742,743,744},serverIndex={{1,999999}}},
+[19]={name="新春活动",icon=21,sortID=21,panelID=5060,pos=1,funcs={80001,80002,80003,80004},serverIndex={{1,999999}}},
+[20]={name="元宵活动",icon=22,sortID=22,panelID=5055,pos=1,funcs={70001,70002,70003},serverIndex={{1,999999}}},
+[21]={name="洗炼双倍",icon=23,sortID=23,panelID=3901,pos=1,funcs={15001},serverIndex={{1,999999}}},
+[22]={name="英雄EVA横幅",icon=39,sortID=24,panelID=8001,pos=2,funcs={9001},serverIndex={{1,999999}}},
+[24]={name="周末冲刺",icon=51,sortID=26,panelID=9100,pos=1,funcs={9101},serverIndex={{1,999999}}},
+[25]={name="在线豪礼",icon=52,sortID=27,panelID=18001,pos=1,funcs={18001},serverIndex={{1,999999}}},
+[26]={name="新首充",icon=53,sortID=29,panelID=19001,pos=1,funcs={19001},serverIndex={{1,999999}}},
+[27]={name="代金券",icon=52,sortID=27,panelID=8200,pos=1,funcs={8201,8202},serverIndex={{1,999999}}},
+[28]={name="周循环活动",icon=54,sortID=30,panelID=7060,pos=1,funcs={751,752,753,754},serverIndex={{1,999999}}},
+[29]={name="跨服商业活动一",icon=55,sortID=31,panelID=7070,pos=1,funcs={7071,7072,7073,7074},serverIndex={{1,999999}}},
+[30]={name="新日常",icon=56,sortID=56,panelID=20001,pos=1,funcs={201,202,203,204,205,10001,11001},serverIndex={{1,999999}}},
+[31]={name="合服福利",icon=57,sortID=57,panelID=7100,pos=1,funcs={7101,7102,7103},serverIndex={{1,999999}}},
+[32]={name="英雄远征",icon=58,sortID=58,panelID=7200,pos=1,funcs={7201,7202,7203,7204},serverIndex={{1,999999}}},
+[33]={name="烹饪嘉年华",icon=59,sortID=59,panelID=7300,pos=1,funcs={7301,7302,7303,7304},serverIndex={{1,999999}}},
+[34]={name="天选盛宴",icon=60,sortID=60,panelID=7400,pos=1,funcs={7401,7402,7403,7404},serverIndex={{1,999999}}},
+[35]={name="通用节日活动",icon=63,sortID=61,panelID=7500,pos=1,funcs={7501,7502,7503,7504},serverIndex={{1,999999}}}}end)();
+(function()func={
+[101]={actName="",icon=101,effect=0,openLv=3,panelID=3302,moduleFn="present.FirstChargeLogic",param=0},
+[102]={actName="",icon=102,effect=0,openLv=5,panelID=3303,moduleFn="present.MonthCard",param=0},
+[103]={actName="",icon=103,effect=0,openLv=10,panelID=3304,moduleFn="present.TequanShopLogic",param=0},
+[104]={actName="",icon=701,effect=0,openLv=3,panelID=3313,moduleFn="present.HeroSkinLogic",param=0},
+[201]={actName="",icon=201,effect=0,openLv=5,panelID=3502,moduleFn="loginSign.LoginSignLogic",param=0},
+[202]={actName="",icon=202,effect=0,openLv=5,panelID=3503,moduleFn="present.RelationGiftLogic",param=0},
+[203]={actName="",icon=203,effect=0,openLv=5,panelID=3504,moduleFn="present.CDK",param=0},
+[204]={actName="",icon=204,effect=0,openLv=5,panelID=3505,moduleFn="present.ChongJiLogic",param=0},
+[205]={actName="",icon=205,effect=0,openLv=5,panelID=3506,moduleFn="present.FundLogic",param=0},
+[301]={actName="",icon=301,effect=0,openLv=5,panelID=3602,moduleFn="present.OpenServerGiftLogic",param=0},
+[302]={actName="",icon=302,effect=0,openLv=5,panelID=3603,moduleFn="present.KingWorldLogic",param=0},
+[303]={actName="",icon=303,effect=0,openLv=5,panelID=3605,moduleFn="present.MengxinLogic",param=0},
+[311]={actName="",icon=311,effect=0,openLv=5,panelID=3607,moduleFn="present.FundLogic",param=0},
+[312]={actName="",icon=312,effect=0,openLv=5,panelID=3107,moduleFn="present.DailyLibaoLogic",param=0},
+[313]={actName="",icon=313,effect=0,openLv=3,panelID=3310,moduleFn="present.OverflowFundLogic",param=0},
+[315]={actName="",icon=315,effect=0,openLv=1,panelID=3104,moduleFn="present.RichangLibaoLogic",param=0},
+[316]={actName="",icon=316,effect=0,openLv=1,panelID=3207,moduleFn="present.RichangLibaoLogic",param=0},
+[401]={actName="幸运盲盒",icon=401,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=401},
+[402]={actName="幸运盲盒",icon=402,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=402},
+[403]={actName="幸运盲盒",icon=403,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=403},
+[404]={actName="幸运盲盒",icon=404,effect=0,openLv=5,panelID=3606,moduleFn="present.LimitMangHeLogic",param=404},
+[501]={actName="",icon=501,effect=0,openLv=5,panelID=3608,moduleFn="present.LimitPerpleHeroLogic",param=501},
+[601]={actName="",icon=601,effect=0,openLv=5,panelID=7001,moduleFn="present.OpenServerTotalConsume",param=5},
+[602]={actName="",icon=602,effect=0,openLv=5,panelID=7002,moduleFn="present.OpenServerRank",param=6},
+[603]={actName="",icon=603,effect=0,openLv=5,panelID=7003,moduleFn="present.OpenServerSingleCharge",param=7},
+[604]={actName="",icon=604,effect=0,openLv=5,panelID=7004,moduleFn="present.OpenServerTotalConsume",param=8},
+[605]={actName="",icon=605,effect=0,openLv=5,panelID=7005,moduleFn="present.OpenServerRank",param=9},
+[606]={actName="",icon=606,effect=0,openLv=5,panelID=7006,moduleFn="present.OpenServerRank",param=10},
+[607]={actName="",icon=607,effect=0,openLv=1,panelID=7007,moduleFn="present.OpenServerActAddUpCharge",param=0},
+[608]={actName="",icon=608,effect=0,openLv=5,panelID=7008,moduleFn="present.OpenServerGiftPackage",param=11},
+[752]={actName="",icon=752,effect=0,openLv=1,panelID=752,moduleFn="absAct.AbsDiscountStoreLogic",param=0},
+[753]={actName="",icon=753,effect=0,openLv=1,panelID=752,moduleFn="absAct.AbsExcellentGiftLogic",param=0},
+[754]={actName="",icon=754,effect=0,openLv=1,panelID=752,moduleFn="absAct.AbsLotteryCardLogic",param=0},
+[3314]={actName="",icon=3314,effect=0,openLv=1,panelID=3314,moduleFn="present.ActCycleRechargeLogic",param=0},
+[7071]={actName="",icon=7071,effect=0,openLv=1,panelID=7070,moduleFn="serverCommerce.ServerCommerceManager",param=0},
+[7101]={actName="",icon=7101,effect=0,openLv=1,panelID=7101,moduleFn="present.MergeServerCharge",param=0},
+[7102]={actName="",icon=7102,effect=0,openLv=1,panelID=7102,moduleFn="present.MergeServerHuoYue",param=0},
+[7103]={actName="",icon=7103,effect=0,openLv=1,panelID=7103,moduleFn="present.MergeServerLogin",param=0},
+[8201]={actName="",icon=8201,effect=0,openLv=1,panelID=8201,moduleFn="voucher.VoucherShopLogic",param=0},
+[8202]={actName="",icon=8202,effect=0,openLv=1,panelID=8202,moduleFn="voucher.VoucherShopLogic",param=0},
+[9001]={actName="",icon=9001,effect=0,openLv=5,panelID=8001,moduleFn="absAct.NewHeroLogic",param=405013},
+[9101]={actName="",icon=9101,effect=0,openLv=1,panelID=9100,moduleFn="WeekendLoopActivity.WeekendLoopActManager",param=0},
+[17001]={actName="",icon=17001,effect=0,openLv=5,panelID=3609,moduleFn="present.OpenServerActPowerUp",param=0},
+[18001]={actName="",icon=18001,effect=0,openLv=1,panelID=18001,moduleFn="present.OnlineAwardLogic",param=0},
+[19001]={actName="",icon=19001,effect=0,openLv=12,panelID=19001,moduleFn="present.NewFirstChargeLogic",param=0}}end)();
+(function()banner={
+[1]={name="天命召唤",icon=1,sortID=99,funcID={},panelID=1304,serverIndex={{1,999999}}},
+[2]={name="特惠礼盒",icon=2,sortID=6,funcID={1001},panelID=0,serverIndex={{1,999999}}},
+[3]={name="首充",icon=3,sortID=3,funcID={},panelID=0,serverIndex={{1,999999}}},
+[4]={name="钻石月卡",icon=4,sortID=5,funcID={102},panelID=0,serverIndex={{1,999999}}},
+[5]={name="贵族之证",icon=5,sortID=4,funcID={103},panelID=0,serverIndex={{1,999999}}},
+[6]={name="奥斯曼的礼物",icon=6,sortID=1,funcID={2001},panelID=0,serverIndex={{1,999999}}},
+[7]={name="英雄UP活动",icon=7,sortID=1,funcID={3001},panelID=0,serverIndex={{1,999999}}},
+[8]={name="精英召唤",icon=11,sortID=1,funcID={4001},panelID=0,serverIndex={{1,999999}}},
+[9]={name="全神的遗物",icon=9,sortID=1,funcID={5001},panelID=0,serverIndex={{1,999999}}},
+[10]={name="占卜轮盘",icon=10,sortID=2,funcID={6001},panelID=0,serverIndex={{1,999999}}},
+[11]={name="新英雄来袭",icon=18,sortID=1,funcID={30001,30002,30003,30004,30005},panelID=0,serverIndex={{1,999999}}},
+[12]={name="国庆活动",icon=29,sortID=1,funcID={31001,31002,31003,31004,31005},panelID=0,serverIndex={{1,999999}}},
+[13]={name="开服庆典",icon=23,sortID=1,funcID={601,602,603,604,605,606,607},panelID=0,serverIndex={{1,999999}}},
+[14]={name="合服活动",icon=22,sortID=1,funcID={40001,40002,40003,40004,40005,40006},panelID=0,serverIndex={{1,999999}}},
+[15]={name="限时活动",icon=24,sortID=1,funcID={741,742,743,744},panelID=0,serverIndex={{1,999999}}},
+[16]={name="新春活动",icon=28,sortID=1,funcID={80001,80002,80003,80004},panelID=0,serverIndex={{1,999999}}},
+[17]={name="元宵活动",icon=26,sortID=1,funcID={70001,70002,70003},panelID=0,serverIndex={{1,999999}}},
+[18]={name="洗炼双倍",icon=27,sortID=1,funcID={15001},panelID=0,serverIndex={{1,999999}}},
+[19]={name="英雄EVA横幅",icon=39,sortID=1,funcID={9001},panelID=8001,serverIndex={{1,999999}}},
+[20]={name="周末冲刺",icon=51,sortID=1,funcID={9101},panelID=9100,serverIndex={{1,999999}}},
+[21]={name="周循环活动",icon=52,sortID=1,funcID={751,752,753,754},panelID=0,serverIndex={{1,999999}}},
+[22]={name="跨服商业活动一",icon=53,sortID=1,funcID={7071,7072,7073,7074},panelID=7070,serverIndex={{1,999999}}},
+[23]={name="合服福利",icon=57,sortID=1,funcID={7101,7102,7103},panelID=7100,serverIndex={{1,999999}}},
+[24]={name="英雄远征",icon=58,sortID=1,funcID={7201,7202,7203,7204},panelID=7200,serverIndex={{1,999999}}},
+[25]={name="烹饪嘉年华",icon=59,sortID=1,funcID={7301,7302,7303,7304},panelID=7300,serverIndex={{1,999999}}},
+[26]={name="天选盛宴",icon=60,sortID=1,funcID={7401,7402,7403,7404},panelID=7400,serverIndex={{1,999999}}},
+[27]={name="通用节日活动",icon=63,sortID=1,funcID={7501,7502,7503,7504},panelID=7500,serverIndex={{1,999999}}}}end)();
+(function()cycleactivity={
+[1]={activityid={11,18,28,32,33,34},day=7}}end)();

script/module/absAct/Proto.lua

@@ -1583,7 +1583,7 @@ CG_ABS_FESTIVAL_SHOP_QUERY = {}
 
 -- 回复商店数据
 GC_ABS_FESTIVAL_SHOP_QUERY = {
-    {"tGoodInfo",   15,      GOODS},         -- 物品信息
+    {"tGoodInfo",   20,      GOODS},         -- 物品信息
 }
 
 -- 购买物品

script/module/present/ActCycleRechargeLogic.lua

@@ -271,7 +271,7 @@ function Query(human)
 
     for k, v in ipairs(cycleRechargeCfg) do
         len = len + 1
-        msgAwardList[0] = msgMaxLen
+        msgAwardList[0] = len
         msgAwardList[len].idx = k
         msgAwardList[len].moneyCond = v.moneyCond
 

script/module/yunying/YunYingLogic.lua

@@ -106,7 +106,10 @@ local function initYYInfo(yyID, config)
         local funcConfig = getFuncConfig(funcID)
 
         if YYFUNCINFO[funcID] then
-           assert(nil, "initYYInfo is error!!!!"..yyID.."-"..funcID)
+           -- 如果 funcID 已经存在，说明可能是在热更新时重复初始化，或者配置有重复
+           -- 先清理旧的，然后继续初始化
+           print("WARNING: funcID "..funcID.." already exists in YYFUNCINFO, clearing old data")
+           YYFUNCINFO[funcID] = nil
         end
 
         if funcConfig then
@@ -150,6 +153,8 @@ end
 -- 初始化
 function init()
     ID2YYInfo = ID2YYInfo or { }
+    -- 先保存旧的 YYFUNCINFO 用于清理，然后清空
+    local oldYYFUNCINFO = YYFUNCINFO or {}
     YYFUNCINFO = {}
 	BANNER_LIST_SERVER = {}
 
@@ -159,13 +164,10 @@ function init()
         end
     end
 
-    for funcID, info in pairs(YYFUNCINFO) do
-        if YunYingExcel.func[funcID] == nil then
-           YYFUNCINFO[funcID] = nil
-        end
-
-        if AbsActExcel.absActivity[funcID] == nil then
-           YYFUNCINFO[funcID] = nil
+    -- 清理旧的 YYFUNCINFO 中不再存在的配置
+    for funcID, info in pairs(oldYYFUNCINFO) do
+        if YunYingExcel.func[funcID] == nil and AbsActExcel.absActivity[funcID] == nil then
+           -- 配置已不存在，不需要清理（因为已经清空了）
         end
     end