Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
3054bbfdeb
|
@ -69,7 +69,12 @@ function EveryDayGiftNew:InitComponent()
|
||||||
end
|
end
|
||||||
|
|
||||||
function EveryDayGiftNew:BindEvent()
|
function EveryDayGiftNew:BindEvent()
|
||||||
|
|
||||||
Util.AddOnceClick(self.btn2,function ()
|
Util.AddOnceClick(self.btn2,function ()
|
||||||
|
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
|
||||||
|
if actData then
|
||||||
|
PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用!")
|
||||||
|
else
|
||||||
PayManager.Pay(onKeyPackId, function(id)
|
PayManager.Pay(onKeyPackId, function(id)
|
||||||
FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId)
|
FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId)
|
||||||
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
|
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
|
||||||
|
@ -77,6 +82,7 @@ function EveryDayGiftNew:BindEvent()
|
||||||
MonthCardManager.CheckMonthCardPatFace()
|
MonthCardManager.CheckMonthCardPatFace()
|
||||||
self:RefreshData(nil,false,false)
|
self:RefreshData(nil,false,false)
|
||||||
end)
|
end)
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -263,7 +269,7 @@ function EveryDayGiftNew:RefreshReward(Data)
|
||||||
NotEnoughPopup:Show(Data.data.costId)
|
NotEnoughPopup:Show(Data.data.costId)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[11701])
|
PopupTipPanel.ShowTip(string.format("名望等级不足,请升至%s级后才可购买!",DynamicActivityManager.Index-1))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
@ -397,11 +403,11 @@ function EveryDayGiftNew:RefreshOneKeyShow()
|
||||||
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
|
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
|
||||||
if actData then
|
if actData then
|
||||||
Util.SetGray(self.btn2,true)
|
Util.SetGray(self.btn2,true)
|
||||||
self.btn2:GetComponent("Button").interactable = false
|
-- self.btn2:GetComponent("Button").interactable = false
|
||||||
self.btn2Text.text = string.format("剩余%s天",math.ceil((actData.endTime - GetTimeStamp())/86400))
|
self.btn2Text.text = string.format("剩余%s天",math.ceil((actData.endTime - GetTimeStamp())/86400))
|
||||||
else
|
else
|
||||||
Util.SetGray(self.btn2,false)
|
Util.SetGray(self.btn2,false)
|
||||||
self.btn2:GetComponent("Button").interactable = true
|
-- self.btn2:GetComponent("Button").interactable = true
|
||||||
self.btn2Text.text = string.format("60元七天特惠")
|
self.btn2Text.text = string.format("60元七天特惠")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -186,7 +186,7 @@ function RechargeViewNew:RefreshReward(Data)
|
||||||
NotEnoughPopup:Show(Data.data.costId)
|
NotEnoughPopup:Show(Data.data.costId)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[11701])
|
PopupTipPanel.ShowTip(string.format("名望等级不足,请升至%s级后才可购买!",DynamicActivityManager.Index-1))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in New Issue