diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 479a498190..e5eeebdf6a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -63024,7 +63024,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8204720010108857596} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -96833,7 +96833,7 @@ RectTransform: - {fileID: 224436586190574230} - {fileID: 224846748792666554} m_Father: {fileID: 8204720010108857596} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -256080,9 +256080,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 468245187776722909} - {fileID: 4962302989025463740} - {fileID: 224756175707085414} - - {fileID: 468245187776722909} m_Father: {fileID: 224121395815468788} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -256172,7 +256172,7 @@ RectTransform: - {fileID: 6811487750097457237} - {fileID: 9144041776289725838} m_Father: {fileID: 8204720010108857596} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -256289,7 +256289,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.011501, y: 154.1} + m_AnchoredPosition: {x: -0.011501, y: 154.09998} m_SizeDelta: {x: 1080, y: 314.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8260539129276802463 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index bf862f26b7..0cf061a40c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -104,15 +104,17 @@ function this:Refresh(_page) --LogError("groupid=="..CONFIG[heros[i][1]].RewardGroup[1]) local group=ConfigManager.TryGetConfigData(ConfigName.RewardGroup,CONFIG[heros[i][1]].RewardGroup[1]) - if group then + local heroId=0 + if group and group.ShowItem then -- LogError("group.ShowItem[1]=="..group.ShowItem[1]) -- LogError("group.ShowItem[1][1]=="..group.ShowItem[1][1]) + heroId=group.ShowItem[1][1] end --如果没有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]}) + table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2],heros[i][3],heros[i][1],heroId}) end else if heros[i][2] == 6 or HeroManager.InVersion(heros[i][1]) then @@ -189,7 +191,7 @@ function this.SingleHeroDataShow(go,_heroData,_index) Util.AddLongPressClick(cardclickBtn, function() if itemType ~= 6 then - UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroData.Id, heroData.Star) + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false,_heroData[5],10) else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,heroData.Id) end