Merge branch 'master_develop' into master_local_test

JieLing 2020-07-26 17:29:09 +08:00
commit c972487af4
1 changed files with 15 additions and 15 deletions

View File

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