Merge branch 'china/local' into china/test
commit
6d7c8e50a4
|
@ -679,7 +679,7 @@ function this.IsMonthCardActive()
|
||||||
local curAllMonthCardData = this.GetMonthCardData()
|
local curAllMonthCardData = this.GetMonthCardData()
|
||||||
local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0
|
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 curLuxuryMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD].endingTime ~= 0
|
||||||
local isMonthCardActive = curMonthCardOpenState or curLuxuryMonthCardOpenState
|
local isMonthCardActive = curLuxuryMonthCardOpenState
|
||||||
return isMonthCardActive
|
return isMonthCardActive
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue