Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
0cca48270d
|
@ -203,7 +203,7 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
end
|
||||
for i = 1, #jumpSortData do
|
||||
if jumpSortData[i].id > 0 then
|
||||
if this.isRewardItemPop == true or itemConfigData.Id == 61 then--(24暂时关闭)
|
||||
if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 then--(24暂时关闭)
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false)
|
||||
else
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true)
|
||||
|
|
|
@ -197,14 +197,14 @@ end
|
|||
|
||||
--组合当前选项数据
|
||||
function this:GetCurSortHeroListData()
|
||||
local heros = {}
|
||||
this:SetSelectBtn()
|
||||
local heros = {}
|
||||
if proId ~= ProIdConst.All then
|
||||
heros = HeroManager.GetHeroDataByProperty(proId)
|
||||
else
|
||||
heros = tarHero
|
||||
end
|
||||
this:SetRoleList(heros)
|
||||
this:SetSelectBtn()
|
||||
end
|
||||
|
||||
--设置英雄列表数据
|
||||
|
@ -270,11 +270,8 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
end)
|
||||
end
|
||||
function this:SetSelectBtn()
|
||||
-- this.selectBtn:SetActive(proId ~= ProIdConst.All)
|
||||
-- if proId ~= ProIdConst.All then
|
||||
this.selectBtn.transform.localPosition = tabs[proId].transform.localPosition
|
||||
--Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = HeroElementDef[proId]
|
||||
-- end
|
||||
this.selectBtn.transform:SetParent(tabs[proId].transform)
|
||||
this.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||
end
|
||||
function this:SortHeroDatas(_heroDatas)
|
||||
--上阵最优先,星级优先,同星级等级优先,同星级同等级按sortId排序。排序时降序排序。
|
||||
|
|
Loading…
Reference in New Issue