Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
285068bb66
|
@ -273,7 +273,8 @@ function this.SingleFuncState(id)
|
|||
local qualifiled = this.IsQualifiled(id)
|
||||
local isOpen = this.IsSwitchOpen(id)
|
||||
local isActive = this.FuncTimeJudge(id)
|
||||
if isOpen and qualifiled and isActive then
|
||||
local isSpecialActive = this.IsSpecialActive(id)
|
||||
if isOpen and qualifiled and isActive and isSpecialActive then
|
||||
isOpen = true
|
||||
else
|
||||
isOpen = false
|
||||
|
@ -555,4 +556,13 @@ function this.SystemOpenTip(type)
|
|||
return str
|
||||
end
|
||||
|
||||
-- 一些功能特殊判断
|
||||
function this.IsSpecialActive(id)
|
||||
if id == FUNCTION_OPEN_TYPE.WEEK_CARD then
|
||||
return WeekCardManager.IsWeekCardOpen()
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
|
||||
return this
|
|
@ -91,4 +91,13 @@ function this.CheckRedReward()
|
|||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
-- 根据是否有周卡数据,判断周卡功能是否开启
|
||||
function this.IsWeekCardOpen()
|
||||
local list = this.GetWeekCardDataArray()
|
||||
if list and #list > 0 then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
|
@ -130,7 +130,7 @@ function WeekCardPage:SetCardShow(index, data)
|
|||
pre.icon2.sprite = sprite
|
||||
pre.icon3.sprite = sprite
|
||||
|
||||
local rechargeCfg = _RechargeCommodityConfig[data.id]
|
||||
local rechargeCfg = _RechargeCommodityConfig[config.RechargeId]
|
||||
if not rechargeCfg then
|
||||
return
|
||||
end
|
||||
|
@ -163,7 +163,7 @@ function WeekCardPage:SetCardShow(index, data)
|
|||
pre.red:SetActive(false)
|
||||
Util.SetGray(pre.btn, false)
|
||||
Util.AddOnceClick(pre.btn, function()
|
||||
PayManager.Pay(data.id, function(id)
|
||||
PayManager.Pay(config.RechargeId, function(id)
|
||||
-- 前端修改购买状态
|
||||
data.isBuy = true
|
||||
WeekCardManager.UpdateWeekCardData(data)
|
||||
|
|
Loading…
Reference in New Issue