【超值基金】月卡不开超值基金不显示
parent
918beb5c35
commit
91e13dc314
|
@ -997,29 +997,32 @@ function this.TimeFormat()
|
||||||
activityTabs[k].go.gameObject:SetActive(false)
|
activityTabs[k].go.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
elseif v.ActId == 668 then
|
elseif v.ActId == 668 then
|
||||||
--超值基金
|
-- 加入对月卡的判断
|
||||||
|
local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||||
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
||||||
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
||||||
activityTabs[k].go.gameObject:SetActive(isOpen_128 or isOpen_328)
|
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
|
||||||
local cardType = nil
|
if isMonthCardActive then
|
||||||
if isOpen_328 then
|
local cardType = nil
|
||||||
cardType = GoodsTypeDef.MONTHCARD_328
|
if isOpen_328 then
|
||||||
end
|
cardType = GoodsTypeDef.MONTHCARD_328
|
||||||
if not cardType and isOpen_128 then
|
end
|
||||||
cardType = GoodsTypeDef.MONTHCARD_128
|
if not cardType and isOpen_128 then
|
||||||
end
|
cardType = GoodsTypeDef.MONTHCARD_128
|
||||||
if cardType then
|
end
|
||||||
local data = OperatingManager.GetGiftGoodsInfo(cardType)
|
if cardType then
|
||||||
if data then
|
local data = OperatingManager.GetGiftGoodsInfo(cardType)
|
||||||
local time = data.endTime - PlayerManager.serverTime
|
if data then
|
||||||
if time < 1 then
|
local time = data.endTime - PlayerManager.serverTime
|
||||||
activityTabs[k].go.gameObject:SetActive(false)
|
if time < 1 then
|
||||||
else
|
activityTabs[k].go.gameObject:SetActive(false)
|
||||||
activityTabs[k].go.gameObject:SetActive(true)
|
|
||||||
if time >= 86400 then
|
|
||||||
activityTabs[k].timeText.text = TimeToDH(time)
|
|
||||||
else
|
else
|
||||||
activityTabs[k].timeText.text = TimeToHMS(time)
|
activityTabs[k].go.gameObject:SetActive(true)
|
||||||
|
if time >= 86400 then
|
||||||
|
activityTabs[k].timeText.text = TimeToDH(time)
|
||||||
|
else
|
||||||
|
activityTabs[k].timeText.text = TimeToHMS(time)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1178,9 +1181,11 @@ function this.RefreshGiftBtnShow()
|
||||||
for k,v in pairs(activitys) do
|
for k,v in pairs(activitys) do
|
||||||
local ishow = DynamicActivityManager.IsQualifiled(v.Id)
|
local ishow = DynamicActivityManager.IsQualifiled(v.Id)
|
||||||
if v.ActId == 668 and ishow then
|
if v.ActId == 668 and ishow then
|
||||||
|
-- 加入对月卡的判断
|
||||||
|
local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||||
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
||||||
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
||||||
activityTabs[k].go.gameObject:SetActive(isOpen_128 or isOpen_328)
|
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1235,24 +1240,28 @@ function this.RefreshActivityShow()
|
||||||
end
|
end
|
||||||
elseif v.ActId == 668 then
|
elseif v.ActId == 668 then
|
||||||
--超值基金
|
--超值基金
|
||||||
|
-- 加入对月卡的判断
|
||||||
|
local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||||
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
||||||
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
||||||
activityTabs[k].go.gameObject:SetActive(isOpen_128 or isOpen_328)
|
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
|
||||||
local cardType = nil
|
if isMonthCardActive then
|
||||||
if isOpen_328 then
|
local cardType = nil
|
||||||
cardType = GoodsTypeDef.MONTHCARD_328
|
if isOpen_328 then
|
||||||
end
|
cardType = GoodsTypeDef.MONTHCARD_328
|
||||||
if not cardType and isOpen_128 then
|
end
|
||||||
cardType = GoodsTypeDef.MONTHCARD_328
|
if not cardType and isOpen_128 then
|
||||||
end
|
cardType = GoodsTypeDef.MONTHCARD_328
|
||||||
if cardType then
|
end
|
||||||
local data = OperatingManager.GetGiftGoodsInfo(cardType)
|
if cardType then
|
||||||
if data then
|
local data = OperatingManager.GetGiftGoodsInfo(cardType)
|
||||||
local time = data.endTime - PlayerManager.serverTime
|
if data then
|
||||||
if time < 1 then
|
local time = data.endTime - PlayerManager.serverTime
|
||||||
activityTabs[k].go.gameObject:SetActive(false)
|
if time < 1 then
|
||||||
else
|
activityTabs[k].go.gameObject:SetActive(false)
|
||||||
activityTabs[k].go.gameObject:SetActive(true)
|
else
|
||||||
|
activityTabs[k].go.gameObject:SetActive(true)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -672,6 +672,14 @@ function this.GetMonthCardData()
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
function this.IsMonthCardActive()
|
||||||
|
local curAllMonthCardData = this.GetMonthCardData()
|
||||||
|
local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0
|
||||||
|
local curLuxuryMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD].endingTime ~= 0
|
||||||
|
local isMonthCardActive = curMonthCardOpenState or curLuxuryMonthCardOpenState
|
||||||
|
return isMonthCardActive
|
||||||
|
end
|
||||||
|
|
||||||
--月卡到期
|
--月卡到期
|
||||||
local addTimeNum = 30 * 24 * 60 * 60
|
local addTimeNum = 30 * 24 * 60 * 60
|
||||||
function this.RefreshMonthCardEnd()
|
function this.RefreshMonthCardEnd()
|
||||||
|
|
Loading…
Reference in New Issue