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

dev_chengFeng
gaoxin 2021-03-26 14:33:21 +08:00
commit d48458f417
1 changed files with 3 additions and 4 deletions

View File

@ -30,7 +30,7 @@ local BtnState ={
function NiuQiChongTian:InitComponent()
self.backBtn = Util.GetGameObject(self.gameObject,"backBtn")
self.tabBox = Util.GetGameObject(self.gameObject, "TabBox")
self.upView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
--进度条
self.progress = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount
@ -66,7 +66,7 @@ end
--界面打开时调用(用于子类重写)
function NiuQiChongTian:OnOpen()
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.NiuQiChongTian })
end
-- 打开,重新打开时回调
@ -75,7 +75,6 @@ function NiuQiChongTian:OnShow()
local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi)
if not actId or actId <= 0 then return end
self.gameObject:SetActive(true)
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.NiuQiChongTian })
self.TabCtrl = TabBox.New()
self.TabCtrl:SetTabAdapter(this.TabAdapter)
@ -213,7 +212,7 @@ end
--界面销毁时调用(用于子类重写)
function NiuQiChongTian:OnDestroy()
SubUIManager.Close(this.UpView)
SubUIManager.Close(self.UpView)
sortingOrder = 0
end