Merge branch 'china/dev' into 0优化/新增心愿神将提示
commit
30edf664da
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -39,6 +39,7 @@ function RewardEquipSingleShowPopup:InitComponent()
|
|||
--装备获取途径
|
||||
--this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre")
|
||||
this.getTuGrid=Util.GetGameObject(self.transform, "Content/bg/scroll/grid")
|
||||
this.equipProGridCom =this.getTuGrid:GetComponent("VerticalLayoutGroup")
|
||||
--装备被动技能
|
||||
this.skillObject=Util.GetGameObject(self.transform, "Content/skillObject")
|
||||
this.skillInfo=Util.GetGameObject(self.transform, "Content/skillObject/skillInfo"):GetComponent("Text")
|
||||
|
|
@ -221,20 +222,34 @@ function RewardEquipSingleShowPopup:OnShow()
|
|||
else
|
||||
Util.GetGameObject(self.transform, "Content/proRect"):SetActive(false)
|
||||
end
|
||||
--装备获得途径
|
||||
Util.ClearChild(this.getTuGrid.transform)
|
||||
|
||||
if this.jumpViewList and #this.jumpViewList > 0 then
|
||||
for i = 1,#this.jumpViewList do
|
||||
SubUIManager.Close(this.jumpViewList[i])
|
||||
end
|
||||
end
|
||||
this.jumpViewList = {}
|
||||
|
||||
local curitemData = itemConfig[tonumber(equipData.id)]
|
||||
if curitemData and curitemData.Jump then
|
||||
if curitemData.Jump and #curitemData.Jump>0 then
|
||||
for i = 1, #curitemData.Jump do
|
||||
local tempView = nil
|
||||
if isRewardItemPop then
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],false)
|
||||
tempView = SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],false)
|
||||
else
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],true)
|
||||
tempView = SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],true)
|
||||
end
|
||||
if tempView then
|
||||
table.insert(this.jumpViewList,tempView)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
this.equipProGridCom.spacing = 150
|
||||
if this.jumpViewList and #this.jumpViewList then
|
||||
this.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,this.equipProGridCom.spacing*(#this.jumpViewList))
|
||||
end
|
||||
end
|
||||
--道具 和 装备分解 发送请求后 回调
|
||||
function this.SendBackResolveReCallBack(drop)
|
||||
|
|
@ -274,7 +289,12 @@ function RewardEquipSingleShowPopup:OnLockClickEvent()
|
|||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function RewardEquipSingleShowPopup:OnClose()
|
||||
|
||||
if this.jumpViewList and #this.jumpViewList > 0 then
|
||||
for i = 1,#this.jumpViewList do
|
||||
SubUIManager.Close(this.jumpViewList[i])
|
||||
end
|
||||
end
|
||||
this.jumpViewList = {}
|
||||
--if func then
|
||||
-- func()
|
||||
--end
|
||||
|
|
@ -285,6 +305,12 @@ function RewardEquipSingleShowPopup:OnDestroy()
|
|||
this.spLoader:Destroy()
|
||||
curSuitProGo = {}
|
||||
_MainProList = {}
|
||||
if this.jumpViewList and #this.jumpViewList > 0 then
|
||||
for i = 1,#this.jumpViewList do
|
||||
SubUIManager.Close(this.jumpViewList[i])
|
||||
end
|
||||
end
|
||||
this.jumpViewList = {}
|
||||
end
|
||||
|
||||
return RewardEquipSingleShowPopup
|
||||
|
|
@ -37,6 +37,7 @@ function RewardTalismanSingleShowPopup:InitComponent()
|
|||
--装备获取途径
|
||||
--this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre")
|
||||
self.getTuGrid=Util.GetGameObject(self.transform, "Content/bg/scroll/grid")
|
||||
self.equipProGridCom = self.getTuGrid:GetComponent("VerticalLayoutGroup")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -193,16 +194,27 @@ function RewardTalismanSingleShowPopup:OnShowPanelData()
|
|||
self.curotherProscroll:SetActive(false)
|
||||
end
|
||||
|
||||
--装备获得途径
|
||||
Util.ClearChild(self.getTuGrid.transform)
|
||||
|
||||
if self.jumpViewList and #self.jumpViewList > 0 then
|
||||
for i = 1,#self.jumpViewList do
|
||||
SubUIManager.Close(self.jumpViewList[i])
|
||||
end
|
||||
end
|
||||
self.jumpViewList = {}
|
||||
|
||||
local curitemData = itemConfig
|
||||
if curitemData and curitemData.Jump then
|
||||
if curitemData.Jump and #curitemData.Jump>0 then
|
||||
for i = 1, #curitemData.Jump do
|
||||
SubUIManager.Open(SubUIConfig.JumpView, self.getTuGrid.transform, curitemData.Jump[i])
|
||||
local temp = SubUIManager.Open(SubUIConfig.JumpView, self.getTuGrid.transform, curitemData.Jump[i])
|
||||
table.insert(self.jumpViewList,temp)
|
||||
end
|
||||
end
|
||||
end
|
||||
self.equipProGridCom.spacing = 150
|
||||
if self.jumpViewList and #self.jumpViewList then
|
||||
self.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,self.equipProGridCom.spacing*(#self.jumpViewList))
|
||||
end
|
||||
end
|
||||
--道具 和 装备分解 发送请求后 回调
|
||||
function RewardTalismanSingleShowPopup:SendBackResolveReCallBack(drop)
|
||||
|
|
@ -227,7 +239,12 @@ function RewardTalismanSingleShowPopup:SendBackResolveReCallBack(drop)
|
|||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function RewardTalismanSingleShowPopup:OnClose()
|
||||
|
||||
if self.jumpViewList and #self.jumpViewList > 0 then
|
||||
for i = 1,#self.jumpViewList do
|
||||
SubUIManager.Close(self.jumpViewList[i])
|
||||
end
|
||||
end
|
||||
self.jumpViewList = {}
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
|
|
@ -253,7 +270,12 @@ end
|
|||
--界面销毁时调用(用于子类重写)
|
||||
function RewardTalismanSingleShowPopup:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
|
||||
if self.jumpViewList and #self.jumpViewList > 0 then
|
||||
for i = 1,#self.jumpViewList do
|
||||
SubUIManager.Close(self.jumpViewList[i])
|
||||
end
|
||||
end
|
||||
self.jumpViewList = {}
|
||||
end
|
||||
|
||||
return RewardTalismanSingleShowPopup
|
||||
|
|
@ -133,11 +133,15 @@ function RoleEquipChangePopup:OnOpen(...)
|
|||
nextEquipData=data[5]
|
||||
position=data[6]
|
||||
elseif type==4 then
|
||||
curHeroData=data[3]
|
||||
curEquipData=data[4]
|
||||
nextEquipData=data[5]
|
||||
position=data[6]
|
||||
end
|
||||
end
|
||||
|
||||
function RoleEquipChangePopup:OnShow()
|
||||
equipSuit = {}
|
||||
if curHeroData then
|
||||
equipSuit = HeroManager.GetCurHeroEquipSuitPros(curHeroData.equipIdList)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue