diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index 580afcc150..3a45b8eb05 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -294,8 +294,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: -51.9, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -71, y: 6} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4479583077528819432 CanvasRenderer: @@ -325,7 +325,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: de6cd38183296a14c8a07417420b1763, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5001,11 +5001,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 0496bf9472..a161713691 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -102,12 +102,32 @@ function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster) if not curFormation or #this.formationList == 0 then return end + + + + local newTeamheroInfos = {} + for i = 1, #roleList do + newTeamheroInfos[roleList[i].heroId] = roleList[i] + end + local oldTeamheroInfos = {} + for i = 1, #curFormation.teamHeroInfos do + oldTeamheroInfos[curFormation.teamHeroInfos[i].heroId] = curFormation.teamHeroInfos[i] + if not newTeamheroInfos[curFormation.teamHeroInfos[i].heroId] then + HeroManager.SetHeroFormationList(curFormation.teamHeroInfos[i].heroId,this.formationList[index].teamId,nil) + end + end + + + curFormation.teamHeroInfos = {} for i = 1, #roleList do local teamInfo = {} teamInfo.heroId = roleList[i].heroId--roleList[i] teamInfo.position = roleList[i].position--i table.insert(curFormation.teamHeroInfos, teamInfo) + if not oldTeamheroInfos[teamInfo.heroId] then + HeroManager.SetHeroFormationList(roleList[i].heroId,this.formationList[index].teamId,1) + end end curFormation.teamPokemonInfos = {} for j = 1, #pokemonList do diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 5d037d5789..a5f0c76538 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -794,13 +794,13 @@ function this:BindEvent() --神将合成、神将置换 Util.AddClick(this.btnCompoundHero, function() - -- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then - -- JumpManager.GoJump(74) - -- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.COMPOUND_HERO) - -- else - -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND_HERO)) - -- end - UIManager.OpenPanel(UIName.CompoundHeroPanel)--开发用,之后删除 释放上面 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then + JumpManager.GoJump(74) + this.ScenceBtnClick(FUNCTION_OPEN_TYPE.COMPOUND_HERO) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND_HERO)) + end + -- UIManager.OpenPanel(UIName.CompoundHeroPanel)--开发用,之后删除 释放上面 end) this.BindRedPoint()