Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
54c0a74afa
|
@ -31,6 +31,7 @@ function ActivityMainPanel:BindEvent()
|
||||||
|
|
||||||
-- 关闭界面打开主城
|
-- 关闭界面打开主城
|
||||||
Util.AddClick(this.btnBack, function()
|
Util.AddClick(this.btnBack, function()
|
||||||
|
DynamicActivityManager.NiuQiIndex = 1
|
||||||
ShopManager.SetSelectIndex(0,{})
|
ShopManager.SetSelectIndex(0,{})
|
||||||
DynamicActivityManager.RemoveUIList()
|
DynamicActivityManager.RemoveUIList()
|
||||||
if #DynamicActivityManager.OpenUIList > 0 then
|
if #DynamicActivityManager.OpenUIList > 0 then
|
||||||
|
|
|
@ -13,7 +13,7 @@ this.curActivityType = 0
|
||||||
this.OpenUIList = {}
|
this.OpenUIList = {}
|
||||||
this.selectIndex = {dataType = 0,goodsId = {}}
|
this.selectIndex = {dataType = 0,goodsId = {}}
|
||||||
this.selectIndex2 = {dataType = 0,goodsId = {}}
|
this.selectIndex2 = {dataType = 0,goodsId = {}}
|
||||||
|
this.NiuQiIndex = 1
|
||||||
function this.SetSelectIndex(dataType,goodsId,b)
|
function this.SetSelectIndex(dataType,goodsId,b)
|
||||||
this.selectIndex.dataType = dataType
|
this.selectIndex.dataType = dataType
|
||||||
this.selectIndex.goodsId = goodsId
|
this.selectIndex.goodsId = goodsId
|
||||||
|
|
|
@ -118,6 +118,7 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder)
|
||||||
|
|
||||||
local NiuQiChongTianPanelSwitchView = function(index,bool)
|
local NiuQiChongTianPanelSwitchView = function(index,bool)
|
||||||
self.curPage = index
|
self.curPage = index
|
||||||
|
DynamicActivityManager.NiuQiIndex = self.curPage
|
||||||
self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage)
|
self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage)
|
||||||
|
|
||||||
self:SetProgress()
|
self:SetProgress()
|
||||||
|
@ -127,13 +128,14 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder)
|
||||||
self.TabCtrl = TabBox.New()
|
self.TabCtrl = TabBox.New()
|
||||||
self.TabCtrl:SetTabAdapter(NiuQiChongTianPanelTabAdapter)
|
self.TabCtrl:SetTabAdapter(NiuQiChongTianPanelTabAdapter)
|
||||||
self.TabCtrl:SetChangeTabCallBack(NiuQiChongTianPanelSwitchView)
|
self.TabCtrl:SetChangeTabCallBack(NiuQiChongTianPanelSwitchView)
|
||||||
self.TabCtrl:Init(self.tabBox, _TabData, self.curIndex)
|
self.curPage = DynamicActivityManager.NiuQiIndex or 1
|
||||||
|
self.TabCtrl:Init(self.tabBox, _TabData, self.curPage)
|
||||||
self:SetTime()
|
self:SetTime()
|
||||||
end
|
end
|
||||||
|
|
||||||
function NiuQiChongTianPanel:SwitchView(index,bool)
|
function NiuQiChongTianPanel:SwitchView(index,bool)
|
||||||
self.curPage = index
|
self.curPage = index
|
||||||
|
DynamicActivityManager.NiuQiIndex = self.curPage
|
||||||
self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage)
|
self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage)
|
||||||
|
|
||||||
self:SetProgress()
|
self:SetProgress()
|
||||||
|
|
Loading…
Reference in New Issue