【ID1008091】

【活动优化】超值基金购买后,主城超值基金入口倒计时消失
dev_chengFeng
jiaoyangna 2021-04-06 11:52:44 +08:00
parent 86a99f3344
commit f1a8a740c7
2 changed files with 10 additions and 18 deletions

View File

@ -649,7 +649,10 @@ function this.CreatActivity()
if v.ActiveType > 0 then
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then
local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0)
local tempConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[activityId].ShowArt,"PageType",0,"ActiveType:"..v.ActiveType)
if not tempConfig then
tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0)
end
if tempConfig then
activityTabs[k].img.sprite = Util.LoadSprite(tempConfig.Icon[1])
else
@ -662,22 +665,6 @@ function this.CreatActivity()
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end
--开发用
-- LogGreen("v.ActiveType:"..v.ActiveType)
-- if v.ActiveType == 62 then
-- local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
-- LogRed("activityId:"..tostring(activityId))
-- LogRed("IsQualifiled:"..tostring(ActivityGiftManager.IsQualifiled(v.ActiveType)))
-- local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0)
-- local imageName = ""
-- if activityId and activityId > 0 and tempConfig then
-- imageName = tempConfig.Icon[1]
-- else
-- imageName = v.Icon[1]
-- end
-- LogRed("imageName:"..tostring(imageName))
-- end
activityTabs[k].img:SetNativeSize()
Util.AddOnceClick(activityTabs[k].go,function()
if v.ActiveType > 0 then
@ -966,7 +953,9 @@ function this.TimeFormat()
activityTabs[k].go.gameObject:SetActive(false)
else
activityTabs[k].go.gameObject:SetActive(true)
if time >= 86400 then
if OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_128) > 0 and OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_328) > 0 then
activityTabs[k].timeImg.gameObject:SetActive(false)
elseif time >= 86400 then
activityTabs[k].timeText.text = TimeToDH(time)
else
activityTabs[k].timeText.text = TimeToHMS(time)

View File

@ -185,6 +185,9 @@ function this.GetGoodsBuyTime(type, goodsId)
return 0
end
for k,v in pairs(giftGoodsInfoList[type]) do
if not goodsId then
return v.buyTimes
end
if v.goodsId == goodsId then
return v.buyTimes
end