diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 7a30cffe78..95de4b72ee 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -11857,8 +11857,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: 0, y: 126} - m_SizeDelta: {x: 36, y: 55} + m_AnchoredPosition: {x: 94.00005, y: 86.999985} + m_SizeDelta: {x: 77, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3776138697539501030 CanvasRenderer: @@ -11888,7 +11888,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: 47ef2427dd4f05142a716d2fd78d65bb, type: 3} + m_Sprite: {fileID: 21300000, guid: e22fa2a5e1f8ae649bb120a284c9628d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30048,8 +30048,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: 0, y: 126} - m_SizeDelta: {x: 36, y: 55} + m_AnchoredPosition: {x: 94.00005, y: 86.999985} + m_SizeDelta: {x: 77, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8917906655218195033 CanvasRenderer: @@ -30079,7 +30079,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: 5c27e9ed20f02844883262f0354d334e, type: 3} + m_Sprite: {fileID: 21300000, guid: 10e19afed93ba6140b1ea0869b09b545, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -32476,8 +32476,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: 0, y: 126} - m_SizeDelta: {x: 36, y: 55} + m_AnchoredPosition: {x: 94.00005, y: 86.999985} + m_SizeDelta: {x: 77, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &170732579879472137 CanvasRenderer: @@ -32507,7 +32507,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: cbbb49276b6ddd74ea8aeb218335ba94, type: 3} + m_Sprite: {fileID: 21300000, guid: c4fee6190ef6cbc43895727e136cc46a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -44739,8 +44739,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: 0, y: 126} - m_SizeDelta: {x: 36, y: 55} + m_AnchoredPosition: {x: 94.00005, y: 86.999985} + m_SizeDelta: {x: 77, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2284111287694195488 CanvasRenderer: @@ -44770,7 +44770,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: 94c92b99d283cba449c244ba414b1526, type: 3} + m_Sprite: {fileID: 21300000, guid: 190125bd7c49cdd43975dc359040b05d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -45444,8 +45444,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: 0, y: 126} - m_SizeDelta: {x: 36, y: 55} + m_AnchoredPosition: {x: 94.00005, y: 86.999985} + m_SizeDelta: {x: 77, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &707482936467534613 CanvasRenderer: @@ -45475,7 +45475,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: c916dc24ca2e65d4783b8d438aaa7175, type: 3} + m_Sprite: {fileID: 21300000, guid: f2ed33d17fb66734ebdb21d2e58d0279, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -67415,8 +67415,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: 0, y: 126} - m_SizeDelta: {x: 36, y: 55} + m_AnchoredPosition: {x: 94, y: 87} + m_SizeDelta: {x: 77, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2275346600031864067 CanvasRenderer: @@ -67446,7 +67446,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: 4183b1991dd96c0488fd3d730eeb9cf3, type: 3} + m_Sprite: {fileID: 21300000, guid: 32aa65b4e004b7643993ec1681b92621, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index be9b273400..35759f2cb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -259,7 +259,7 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index) self.cardList[cardPre].icon.texture = CardRendererManager.GetSpineTexture((index%4 == 0 and 7 or index%4 + 3), liveName, Vector3.one * scale, livePos, true) end self.cardList[cardPre].icon.transform.localScale = Vector3.one - self.cardList[cardPre].icon.transform.localPosition = Vector3.zero + self.cardList[cardPre].icon.transform.localPosition = Vector3.zero+ Vector3(0,-50,0) SetHEeroLiveToward(self.cardList[cardPre].icon.gameObject,heroConfig[data.heroId].Toward) self.cardList[cardPre].proImage.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.property)) self.cardList[cardPre].cardBg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[data.quality])