diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index f6b0b0bbd2..3434d14799 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -150,10 +150,10 @@ RectTransform: m_Father: {fileID: 136085602} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 31, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &95245974 CanvasRenderer: @@ -5418,7 +5418,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &351397706 @@ -15313,10 +15313,10 @@ RectTransform: m_Father: {fileID: 136085602} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 97.52, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506673911 CanvasRenderer: @@ -59919,7 +59919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3414655680617284804 RectTransform: m_ObjectHideFlags: 0 @@ -61619,7 +61619,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826034946034072 @@ -62138,7 +62138,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826035233796703 @@ -62424,7 +62424,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826035594093052 @@ -63319,7 +63319,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826036035083391 @@ -63683,7 +63683,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826036237771050 @@ -83322,7 +83322,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261126307273 @@ -83571,9 +83571,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261139886263 @@ -83648,9 +83648,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261196340906 @@ -83842,7 +83842,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261212098139 @@ -84275,9 +84275,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261390384789 @@ -85521,7 +85521,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261646268033 @@ -85619,7 +85619,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261649573758 @@ -85790,9 +85790,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261777695568 @@ -86168,9 +86168,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261844073132 @@ -86287,7 +86287,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261866451864 @@ -86646,7 +86646,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261958035100 @@ -86744,7 +86744,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261984099562 @@ -86840,9 +86840,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262002252256 @@ -87221,7 +87221,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262060962360 @@ -87614,9 +87614,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262256548568 @@ -87771,7 +87771,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262294965716 @@ -87867,9 +87867,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262325622925 @@ -89205,7 +89205,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262616649152 @@ -89724,9 +89724,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262791904998 @@ -90333,7 +90333,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262910380400 @@ -90429,9 +90429,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262916179914 @@ -90852,9 +90852,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263129528938 @@ -90892,7 +90892,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116263129528932 @@ -91206,9 +91206,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263232579479 @@ -106663,10 +106663,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221.4, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2414242672251041193 CanvasRenderer: @@ -112623,10 +112623,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 154.87999, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &79708565718575260 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index 5ab372297c..823930a569 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -303,14 +303,14 @@ function this.FreshTeam2(formation, isBlue) end for i, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(formation.teamHeroInfos[i].heroId) - teamRoot[heroData.position].hero:SetActive(true) - teamRoot[heroData.position].levelText.text = heroData.lv + teamRoot[hero.position].hero:SetActive(true) + teamRoot[hero.position].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, teamRoot[heroData.position].starGrid, star,starType) + SetHeroStars(this.spLoader, teamRoot[hero.position].starGrid, star,starType) local heroConfig = heroData.heroConfig - teamRoot[heroData.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - heroData,teamRoot[heroData.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - teamRoot[heroData.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + teamRoot[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + teamRoot[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + teamRoot[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end end -- 控制显示编队信息