Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
03babfe313
|
@ -218,7 +218,7 @@ end
|
||||||
|
|
||||||
function UpperMonthCard:SetBoughtPanelInfo()
|
function UpperMonthCard:SetBoughtPanelInfo()
|
||||||
local endTime = OperatingManager.GetGoodsEndTime(self.chargerBaseType)
|
local endTime = OperatingManager.GetGoodsEndTime(self.chargerBaseType)
|
||||||
self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) + 1 .. Language[10017]
|
self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017]
|
||||||
local startStr, endStr = OperatingManager.GetShowTime(endTime)
|
local startStr, endStr = OperatingManager.GetShowTime(endTime)
|
||||||
self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr
|
self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr
|
||||||
|
|
||||||
|
@ -232,7 +232,7 @@ function UpperMonthCard:SetBoughtPanelInfo()
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
else
|
else
|
||||||
OperatingManager.SetSerData(self.chargerBaseType)
|
OperatingManager.SetSerData(self.chargerBaseType)
|
||||||
self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) + 1 .. Language[10017]
|
self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017]
|
||||||
end
|
end
|
||||||
end, 1, -1, true)
|
end, 1, -1, true)
|
||||||
self.timer:Start()
|
self.timer:Start()
|
||||||
|
@ -256,7 +256,7 @@ end
|
||||||
function UpperMonthCard:FreshBoughtShow()
|
function UpperMonthCard:FreshBoughtShow()
|
||||||
self.boughtPanel:SetActive(true)
|
self.boughtPanel:SetActive(true)
|
||||||
self.buyPanel:SetActive(false)
|
self.buyPanel:SetActive(false)
|
||||||
self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) + 1 .. Language[10017]
|
self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017]
|
||||||
local startStr, endStr = OperatingManager.GetShowTime(OperatingManager.GetGoodsEndTime(self.chargerBaseType))
|
local startStr, endStr = OperatingManager.GetShowTime(OperatingManager.GetGoodsEndTime(self.chargerBaseType))
|
||||||
self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr
|
self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue