diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 6fb57f3f43..09912d3507 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -19,7 +19,7 @@ local activityType = { [1] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21,Text = Language[12319]}, [2] = {name = Language[11936],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8,Text = ""}, [3] = {name = "关卡推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25,Text = Language[12320]}, ---[4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]}, +[4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]}, --[5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "恭喜您获得极品灵兽,这是为您准备的灵兽成长礼包,助您实力飞升"}, --[6] = {name = "惊喜礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 33,Text = "购买惊喜礼盒成功激活限时豪礼,祝您战力飞升,一路通关"}, --[7] = {name = "轩辕宝镜推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 36,Text = "恭喜您获得红色宝物,海量宝物强化资源,助您实力飞升"}, @@ -137,18 +137,21 @@ function this:GetInfoList() for k,v in pairs(activityType) do curGiftList[k] = {} local infoList2 = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",v.showType) - if infoList2==nil or #infoList2==0 then - this:ClosePanel() - return - end - for index, value in pairs(infoList) do - for i = 1, #infoList2 do - if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(curGiftList[k],value) - num = num + 1 + -- if infoList2==nil or #infoList2==0 then + -- this:ClosePanel() + -- return + -- end + if infoList2 then + for index, value in pairs(infoList) do + for i = 1, #infoList2 do + if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + table.insert(curGiftList[k],value) + num = num + 1 + end end end end + end return num end