diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 2b7f49393b..7e3fec0acc 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -110189,8 +110189,8 @@ 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: 157, y: -16} - m_SizeDelta: {x: 398.7, y: 30} + m_AnchoredPosition: {x: 354.4, y: -14} + m_SizeDelta: {x: 793.5, y: 119.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &329602736948110786 CanvasRenderer: @@ -110233,7 +110233,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 0 + m_Text: --- !u!114 &4656998361141670262 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 6e72e21e44..c03ea9b703 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -165,6 +165,23 @@ function this.GetAllFormationHeroId() end return list end +-- 获取主线所有正在编队的英雄id +function this.GetAllMainFormationHeroId() + local list = {} + local index = 1 + for i, team in pairs(this.formationList) do + if i == FormationTypeDef.FORMATION_NORMAL then + for j = 1, #team.teamHeroInfos do + -- 加空判断避免不知名错误 + if team and team.teamHeroInfos[j] then + list[team.teamHeroInfos[j].heroId] = index + index = index + 1 + end + end + end + end + return list +end --获取单个编队所有上阵英雄 function this.GetWuJinFormationHeroIds(index) local forMationData = this.GetFormationByID(index).teamHeroInfos diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 1c2da351b2..82d89ddf07 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -236,7 +236,7 @@ function RoleEquipPanel:OnShow() end end indexBtnNum = PosIdConst.All - teamHero = FormationManager.GetAllFormationHeroId() + teamHero = FormationManager.GetAllMainFormationHeroId() this.ShowHeroEquip(true) this:OnClickAllBtn() this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index d0f0a7a100..63efe347a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -182,7 +182,7 @@ end --刷新显示 function this.RefreshShow() --LogGreen(Language[11945]) - teamHero = FormationManager.GetAllFormationHeroId() + teamHero = FormationManager.GetAllMainFormationHeroId() isUpZhen = teamHero[curHeroData.dynamicId] and true or false this.SetLoopUI() this.SetHero()