Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-11-08 11:24:36 +08:00
commit c490e9c01c
1 changed files with 10 additions and 9 deletions

View File

@ -58,9 +58,9 @@ function TempPool:RecycleAll()
end end
end end
function TempPool:Destroy() function TempPool:Destroy()
self.MomNode = nil self.MomNode = {}
self.NodeList = nil self.NodeList = {}
self.UsedIndex = nil self.UsedIndex = {}
end end
-- 按钮开闭状态改变 -- 按钮开闭状态改变
@ -148,12 +148,6 @@ function GiveMePowerPanel:BindEvent()
end) end)
end end
-- 初始化Tab管理器
this.TabCtrl = TabBox.New()
this.TabCtrl:SetTabAdapter(this.TabAdapter)
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
this.TabCtrl:Init(this.tabbox, _TabData)
-- 初始化对象池 -- 初始化对象池
TempPool:Init() TempPool:Init()
--TempPool:Register("res1", this.resItem1) --TempPool:Register("res1", this.resItem1)
@ -590,6 +584,13 @@ function GiveMePowerPanel:OnOpen(...)
-- 检测任务 -- 检测任务
-- UKnowNothingToThePowerManager.CheckTask() -- UKnowNothingToThePowerManager.CheckTask()
-- --
-- 初始化Tab管理器
this.TabCtrl = TabBox.New()
this.TabCtrl:SetTabAdapter(this.TabAdapter)
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
this.TabCtrl:Init(this.tabbox, _TabData)
if this.TabCtrl then if this.TabCtrl then
this.TabCtrl:ChangeTab(1) this.TabCtrl:ChangeTab(1)
end end