Merge branch 'china/dev' into china/test
commit
36171c45e6
|
@ -95,23 +95,32 @@ function this:Refresh(_page)
|
|||
|
||||
local heroDatas={}
|
||||
for i = 1, #heros do
|
||||
LogError(heros[i][1].." "..heros[i][2].." "..heros[i][3])
|
||||
local CONFIG = itemConfig --heros[i][2] == 6 and itemConfig or heroConfig
|
||||
-- LogError(heros[i][1].." "..heros[i][2].." "..heros[i][3])
|
||||
local CONFIG = heros[i][2] and itemConfig or heroConfig
|
||||
if CONFIG[heros[i][1]] then
|
||||
if not heroDatas[heros[i][2]] then
|
||||
heroDatas[heros[i][2]] = {}
|
||||
end
|
||||
|
||||
LogError("groupid=="..CONFIG[heros[i][1]].RewardGroup[1])
|
||||
--LogError("groupid=="..CONFIG[heros[i][1]].RewardGroup[1])
|
||||
local group=ConfigManager.TryGetConfigData(ConfigName.RewardGroup,CONFIG[heros[i][1]].RewardGroup[1])
|
||||
if group then
|
||||
-- LogError("group.ShowItem[1]=="..group.ShowItem[1])
|
||||
-- LogError("group.ShowItem[1][1]=="..group.ShowItem[1][1])
|
||||
end
|
||||
-- 特殊物品 或者 加入了版本的神将
|
||||
if heros[i][2] == 6 or (group and HeroManager.InVersion(group.ShowItem[1][1]) ) then
|
||||
table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2],heros[i][3],heros[i][1]})
|
||||
--如果没有3 说明是升星活动进来的这个界面
|
||||
if heros[i][3] then
|
||||
-- 特殊物品 或者 加入了版本的神将
|
||||
if heros[i][2] == 6 or (group and HeroManager.InVersion(group.ShowItem[1][1]) ) then
|
||||
table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2],heros[i][3],heros[i][1]})
|
||||
end
|
||||
else
|
||||
if heros[i][2] == 6 or HeroManager.InVersion(heros[i][1]) then
|
||||
table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2],heros[i][3],heros[i][1]})
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
for i = 1, 6 do
|
||||
|
|
|
@ -403,6 +403,9 @@ function this.SetRankingNum(root,rank)
|
|||
sortNumTabs[i]=Util.GetGameObject(root,"SortNum/SortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
if rank==0 then
|
||||
return
|
||||
end
|
||||
if rank < 4 then
|
||||
sortNumTabs[rank]:SetActive(true)
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue