diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 0d930fa364..09912d3507 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -136,15 +136,22 @@ function this:GetInfoList() local num = 0 for k,v in pairs(activityType) do curGiftList[k] = {} - local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",v.showType) - 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 + local infoList2 = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",v.showType) + -- 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