diff --git a/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab b/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab index 47288ec314..ebe3114310 100644 --- a/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PowerRice/PowerRicePanel.prefab @@ -546,7 +546,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1700717659683241118} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -764,6 +764,7 @@ RectTransform: m_Children: - {fileID: 3821167780554179188} - {fileID: 6991887406947613301} + - {fileID: 7113522986544161244} - {fileID: 6299137775443855104} - {fileID: 5703870284674408078} - {fileID: 3494299099718931292} @@ -1414,7 +1415,6 @@ RectTransform: - {fileID: 1711363629007474723} - {fileID: 4238880091648937923} - {fileID: 7153099400467144522} - - {fileID: 7113522986544161244} m_Father: {fileID: 1700717659683241118} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1648,12 +1648,12 @@ RectTransform: - {fileID: 121086063726210905} - {fileID: 4356974947603394339} m_Father: {fileID: 1700717659683241118} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1108, y: -49} - m_SizeDelta: {x: 900, y: 140} + m_SizeDelta: {x: 1000, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3257478417192666744 GameObject: @@ -1905,12 +1905,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8470557795340520745} - m_Father: {fileID: 3821167780554179188} - m_RootOrder: 9 + m_Father: {fileID: 1700717659683241118} + 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} - m_AnchoredPosition: {x: -274, y: 802} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 204, y: -126} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1926422399288210892 @@ -2000,7 +2000,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1700717659683241118} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2212,7 +2212,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -545} + m_AnchoredPosition: {x: 0, y: -624} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &122424317090520997 @@ -2894,7 +2894,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1700717659683241118} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3204,7 +3204,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -379.74002} - m_SizeDelta: {x: 912.8, y: 859.52} + m_SizeDelta: {x: 1000, y: 859.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8384265009896266693 CanvasRenderer: @@ -3276,12 +3276,12 @@ RectTransform: - {fileID: 9217716073908009951} - {fileID: 2786481321683172066} m_Father: {fileID: 1700717659683241118} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1108, y: -272} - m_SizeDelta: {x: 900, y: 140} + m_SizeDelta: {x: 1000, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7075936682646143345 GameObject: @@ -3392,7 +3392,7 @@ RectTransform: - {fileID: 264047954469941067} - {fileID: 4900932309319581792} m_Father: {fileID: 1700717659683241118} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3656,7 +3656,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 369, y: 37} + m_AnchoredPosition: {x: 417, y: 27} m_SizeDelta: {x: 186, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5006147964805573017 @@ -3852,7 +3852,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8113595644961861806 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index d3106351c2..caba89afef 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -573,6 +573,23 @@ function GetPassiveByMaxStar(heroConfig,list) return aaa end +function GetPassiveByMaxStar2(heroConfig,list,star) + --local OpenPassiveSkillRules = list + local heroRankUp=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",star) + if not heroRankUp then + list=heroConfig.OpenPassiveSkillRules + end + local aaa={} + if list then + for i = 1,#list do + if list[i][2]<=heroRankUp.Id then + table.insert(aaa,list[i]) + end + end + end + return aaa +end + --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua index 2e78064c25..2fd60cb56d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua @@ -76,7 +76,16 @@ function this.OnClickTabBtn(_proId) local _curData={} for key, value in pairs(curData) do --只显示在编队中的数据 if value.IsShowInTeam==1 then - table.insert(_curData,value) + local isHeroOpen = true + for i = 1, 6 do + local heroId=value.HeroList[i] + if not HeroManager.InVersion(heroId) then + isHeroOpen = false + end + end + if isHeroOpen then + table.insert(_curData,value) + end end end table.sort(_curData,function(a,b) return a.Sort 0 and self.myRank >= data.MinRank and self.myRank <= data.MaxRank) if data.MinRank == data.MaxRank then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua index c347fce0b6..074bd14cea 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua @@ -100,7 +100,7 @@ function this.GetNewTalentDataShow() local upStarSkillDataList = {} if heroConfig.Awaken then local Awaken=heroConfig.Awaken - Awaken=GetPassiveByMaxStar(heroConfig,heroConfig.Awaken) + Awaken=GetPassiveByMaxStar2(heroConfig,heroConfig.Awaken,11) for i = 1, #Awaken do local Desc = GetLanguageStrById(passiveSkillConfig[Awaken[i][3]].Desc) if heroConfig.Awaken[i][1] == 1 then--突破