Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
16c00cbffc
|
@ -165,7 +165,7 @@ function EveryDayGiftNew:SetGrowGift()
|
|||
if DynamicActivityManager.curLevel == 0 then
|
||||
DynamicActivityManager.curLevel = #growData
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.curLevel = DynamicActivityManager.Index
|
||||
DynamicActivityManager.Index = DynamicActivityManager.curLevel
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -204,7 +204,7 @@ function EveryDayGiftNew:RefreshReward(Data)
|
|||
text = DynamicActivityManager.Index-1
|
||||
num = growData[DynamicActivityManager.Index].data.shopItemData.BuyRule[2]
|
||||
end
|
||||
if DynamicActivityManager.curLevel < 2 then
|
||||
if DynamicActivityManager.curLevel <= 2 then
|
||||
self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum)
|
||||
elseif DynamicActivityManager.curLevel + 1 > #growData then
|
||||
self.tip.text = ""
|
||||
|
@ -354,6 +354,14 @@ function EveryDayGiftNew:GetRemainTime()
|
|||
self.localTimer = Timer.New(function ()
|
||||
self.endTime.text = la..TimeToFelaxible(freshTime)
|
||||
if freshTime <= 0 then
|
||||
if self.actConfig.ActiveType > 0 then
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType)
|
||||
if id then
|
||||
self:RefreshData(nil,true,true)
|
||||
else
|
||||
self.parent:ClosePanel()
|
||||
end
|
||||
end
|
||||
self:RefreshData(nil,true,true)
|
||||
end
|
||||
if actData then
|
||||
|
|
|
@ -89,7 +89,7 @@ function RechargeViewNew:SetGrowGift()
|
|||
if DynamicActivityManager.curLevel == 0 then
|
||||
DynamicActivityManager.curLevel = #growData
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.curLevel = DynamicActivityManager.Index
|
||||
DynamicActivityManager.Index = DynamicActivityManager.curLevel
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -128,7 +128,7 @@ function RechargeViewNew:RefreshReward(Data)
|
|||
text = DynamicActivityManager.Index-1
|
||||
num = growData[DynamicActivityManager.Index].data.shopItemData.BuyRule[2]
|
||||
end
|
||||
if DynamicActivityManager.curLevel < 2 then
|
||||
if DynamicActivityManager.curLevel <= 2 then
|
||||
self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum)
|
||||
elseif DynamicActivityManager.curLevel + 1 > #growData then
|
||||
self.tip.text = ""
|
||||
|
|
Loading…
Reference in New Issue