Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
01b6b4e1fd
|
@ -7,11 +7,11 @@ this._CurPageIndex =1
|
||||||
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
||||||
[1] = { --限时召唤
|
[1] = { --限时召唤
|
||||||
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
|
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
|
||||||
rpType = RedPointType.TimeLimited,
|
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,
|
||||||
},
|
},
|
||||||
[2] = { --乾坤宝盒
|
[2] = { --乾坤宝盒
|
||||||
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
||||||
rpType = RedPointType.QianKunBox,
|
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
local TimeLimitedCall = require("Modules/Operating/TimeLimitedCall")
|
local TimeLimitedCall = require("Modules/Operating/TimeLimitedCall")
|
||||||
|
@ -104,6 +104,7 @@ function this.OnPageTabChange(index, lastIndex)
|
||||||
end
|
end
|
||||||
this.PageList[index]:OnShow(this.sortingOrder, _PageInfo[index].params and unpack(_PageInfo[index].params) or nil)
|
this.PageList[index]:OnShow(this.sortingOrder, _PageInfo[index].params and unpack(_PageInfo[index].params) or nil)
|
||||||
this.PageList[index].gameObject:SetActive(true)
|
this.PageList[index].gameObject:SetActive(true)
|
||||||
|
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = _PageInfo[index].panelType })
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 绑定数据
|
-- 绑定数据
|
||||||
|
|
|
@ -36,6 +36,7 @@ function TimeLimitedCall:InitComponent(gameObject)
|
||||||
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
||||||
self.activityBtn = Util.GetGameObject(self.gameObject,"btngroup/activity")
|
self.activityBtn = Util.GetGameObject(self.gameObject,"btngroup/activity")
|
||||||
self.rewardBtn = Util.GetGameObject(self.gameObject,"btngroup/reward")
|
self.rewardBtn = Util.GetGameObject(self.gameObject,"btngroup/reward")
|
||||||
|
self.rewardBtn:SetActive(false)--(暂时关闭)
|
||||||
self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --剩余时间
|
self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --剩余时间
|
||||||
self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限
|
self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限
|
||||||
self.slider = Util.GetGameObject(self.gameObject, "nextlevel/Slider"):GetComponent("Slider")
|
self.slider = Util.GetGameObject(self.gameObject, "nextlevel/Slider"):GetComponent("Slider")
|
||||||
|
|
|
@ -108,15 +108,20 @@ function RankingSingleListPanel:OnClose()
|
||||||
RankingManager.ClearData()
|
RankingManager.ClearData()
|
||||||
RankingManager.isRequest=0
|
RankingManager.isRequest=0
|
||||||
this.noneImage:SetActive(false)
|
this.noneImage:SetActive(false)
|
||||||
|
-- if this.liveNode then
|
||||||
|
-- --Log("==YSP== 删除立绘")
|
||||||
|
-- poolManager:UnLoadLive(npc, this.liveNode)
|
||||||
|
-- this.liveNode=nil
|
||||||
|
-- end
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面销毁时调用(用于子类重写)
|
||||||
|
function RankingSingleListPanel:OnDestroy()
|
||||||
if this.liveNode then
|
if this.liveNode then
|
||||||
--Log("==YSP== 删除立绘")
|
--Log("==YSP== 删除立绘")
|
||||||
poolManager:UnLoadLive(npc, this.liveNode)
|
poolManager:UnLoadLive(npc, this.liveNode)
|
||||||
this.liveNode=nil
|
this.liveNode=nil
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
|
||||||
function RankingSingleListPanel:OnDestroy()
|
|
||||||
for _, playerHead in ipairs(this.playerHeadList) do
|
for _, playerHead in ipairs(this.playerHeadList) do
|
||||||
playerHead:Recycle()
|
playerHead:Recycle()
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue