Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei

Branch_oumei
zhangjiannan 2025-10-14 15:28:47 +08:00
commit 844522a430
1 changed files with 9 additions and 1 deletions

View File

@ -172,6 +172,7 @@ function this:GetInfoList()
if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
table.insert(curGiftList[k],value)
curGiftList[k].name = infoList2[i].Name
--LogError("礼包名字:"..curGiftList[k].name.."/"..tostring(value.goodsId).."/"..tostring(k))
num = num + 1
end
end
@ -191,7 +192,14 @@ function this:OnShow()
item.type = i
item.index = j
item.bg = activityType[i].bg
item.name = curGiftList[i].name
--item.name = curGiftList[i].name
local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig, "PosterUiId", activityType[i].showType)
for k = 1, #infoList2 do
if infoList2[k].Id == curGiftList[i][j].goodsId then
--LogError("dddddd:"..tostring(infoList2[k].Id).."/"..tostring(curGiftList[i][j].goodsId).."/"..infoList2[k].Name)
item.name = infoList2[k].Name
end
end
table.insert(tabInfo, item)
end
end