Merge branch 'master_develop' into master_local_test
commit
c972487af4
|
|
@ -308,22 +308,22 @@ end
|
|||
function this.IsHeroGiftActive()
|
||||
-- 关闭星级成长礼显示
|
||||
return false
|
||||
local activeNum = 0
|
||||
if not giftGoodsInfoList[GoodsTypeDef.DirectPurchaseGift] then
|
||||
return false
|
||||
else
|
||||
for i = 1, #giftGoodsInfoList[GoodsTypeDef.DirectPurchaseGift] do
|
||||
local data =giftGoodsInfoList[GoodsTypeDef.DirectPurchaseGift][i]
|
||||
if data then
|
||||
local id = data.goodsId
|
||||
if rechargeConfig[id].ShowType == 8 then --- 只有前端显示的商品类型
|
||||
activeNum = activeNum + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- local activeNum = 0
|
||||
-- if not giftGoodsInfoList[GoodsTypeDef.DirectPurchaseGift] then
|
||||
-- return false
|
||||
-- else
|
||||
-- for i = 1, #giftGoodsInfoList[GoodsTypeDef.DirectPurchaseGift] do
|
||||
-- local data =giftGoodsInfoList[GoodsTypeDef.DirectPurchaseGift][i]
|
||||
-- if data then
|
||||
-- local id = data.goodsId
|
||||
-- if rechargeConfig[id].ShowType == 8 then --- 只有前端显示的商品类型
|
||||
-- activeNum = activeNum + 1
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
|
||||
return activeNum > 0
|
||||
-- return activeNum > 0
|
||||
end
|
||||
|
||||
--- 获取礼包的显示数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue