From e360bb76620ab95bf47b7ebaf561fcfadee778b3 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 21 Aug 2025 17:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lua/app/ui/hero/hero_info_comp.lua.bytes | Bin 12071 -> 11874 bytes Assets/prefabs/ui/common/hero_cell.prefab | 42 ++++- Assets/prefabs/ui/hero/cell/star_cell.prefab | 12 +- Assets/prefabs/ui/hero/hero_detail_ui.prefab | 156 +++++++++++------- Assets/prefabs/ui/hero/hero_ui.prefab | 10 +- 5 files changed, 152 insertions(+), 68 deletions(-) diff --git a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes index ff2b093097c92e076244665e5628e105edb66f06..b5522e0ca7ca4bc91bb6c811bdca57bd7e5fc0b7 100644 GIT binary patch delta 6601 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 RzX>^Tez|{7$P&2i{{t*fPuTzf delta 6840 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 diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index d4bfa83b0..0c471e038 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -1638,6 +1638,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3357254900952041124} m_Modifications: + - target: {fileID: 132407509915562124, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 132407509915562124, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1188769973866937479, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1188769973866937479, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1221723042693176345, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1221723042693176345, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1668,7 +1692,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_SizeDelta.x - value: 150 + value: 120 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_SizeDelta.y @@ -1742,6 +1766,22 @@ PrefabInstance: propertyPath: m_Name value: star_cell objectReference: {fileID: 0} + - target: {fileID: 8509724669083950070, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8509724669083950070, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 9038358656544571744, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 9038358656544571744, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} --- !u!224 &7916501278192923963 stripped diff --git a/Assets/prefabs/ui/hero/cell/star_cell.prefab b/Assets/prefabs/ui/hero/cell/star_cell.prefab index 4c47a0a65..3552643c3 100644 --- a/Assets/prefabs/ui/hero/cell/star_cell.prefab +++ b/Assets/prefabs/ui/hero/cell/star_cell.prefab @@ -43,7 +43,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 30} + m_SizeDelta: {x: 170, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2790958513459659 CanvasRenderer: @@ -171,7 +171,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} + m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2243577424104549121 CanvasRenderer: @@ -247,7 +247,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} + m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5919676273321473103 CanvasRenderer: @@ -323,7 +323,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} + m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7020937526943249309 CanvasRenderer: @@ -399,7 +399,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} + m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6754522324838968588 CanvasRenderer: @@ -475,7 +475,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} + m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &890434077720592209 CanvasRenderer: diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 75a8cfba6..e8bd3c6c1 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -45,7 +45,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 40} - m_SizeDelta: {x: 620, y: 876} + m_SizeDelta: {x: 620, y: 956} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8375105319518710068 CanvasRenderer: @@ -825,11 +825,11 @@ RectTransform: m_Father: {fileID: 3121552964615492639} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -127.83, y: -347} - m_SizeDelta: {x: 125, y: 36} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 28, y: -208} + m_SizeDelta: {x: 125, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &5276734544451298542 CanvasRenderer: m_ObjectHideFlags: 0 @@ -885,14 +885,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -963,7 +963,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -250, y: -235} + m_AnchoredPosition: {x: -250, y: -311} m_SizeDelta: {x: 63, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &449696313206018681 @@ -1190,7 +1190,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: 70, y: -203} + m_AnchoredPosition: {x: 70, y: -243} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &990446035579644994 @@ -2675,7 +2675,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: -136, y: -2} + m_AnchoredPosition: {x: -136, y: -42} m_SizeDelta: {x: 380, y: 63} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6897327628286504274 @@ -3057,7 +3057,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: 200, y: -203} + m_AnchoredPosition: {x: 200, y: -243} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7445528765640808247 @@ -3393,7 +3393,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: -200, y: -203} + m_AnchoredPosition: {x: -200, y: -243} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4056061354735087138 @@ -3904,7 +3904,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: -196, y: -2} + m_AnchoredPosition: {x: -196, y: -42} m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2225766192804288032 @@ -3951,7 +3951,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 250, y: -235} + m_AnchoredPosition: {x: 250, y: -311} m_SizeDelta: {x: 63, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2089019768142590424 @@ -4706,12 +4706,12 @@ RectTransform: m_Children: - {fileID: 5989514060555468460} m_Father: {fileID: 6802774033257253966} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -263.5, y: -122.5} - m_SizeDelta: {x: 131, y: 45} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40, y: -122} + m_SizeDelta: {x: 126, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1255109160282647786 CanvasRenderer: @@ -5248,8 +5248,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 370} - m_SizeDelta: {x: 570, y: 210} + m_AnchoredPosition: {x: 0, y: 395} + m_SizeDelta: {x: 570, y: 250} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2540933998899479575 MonoBehaviour: @@ -5594,7 +5594,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: -70, y: -203} + m_AnchoredPosition: {x: -70, y: -243} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4356033973048536663 @@ -6296,11 +6296,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6802774033257253966} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -251.3, y: -122.5} + m_AnchoredPosition: {x: -268, y: -122} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1456058682979890450 @@ -6834,9 +6834,9 @@ RectTransform: m_Father: {fileID: 5129409844343259102} m_RootOrder: 3 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: 278, y: 409} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32, y: -24} m_SizeDelta: {x: 76, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4777930254788213799 @@ -7346,7 +7346,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3121552964615492639 RectTransform: m_ObjectHideFlags: 0 @@ -7379,7 +7379,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 40} - m_SizeDelta: {x: 620, y: 876} + m_SizeDelta: {x: 620, y: 956} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8965026225430654153 CanvasRenderer: @@ -8110,7 +8110,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: -140, y: -101} + m_AnchoredPosition: {x: -140, y: -141} m_SizeDelta: {x: 254, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3693407373230547367 @@ -8436,7 +8436,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 29} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 620, y: 142} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2001920563042114365 @@ -8589,8 +8589,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: 95} - m_SizeDelta: {x: 249, y: 69} + m_AnchoredPosition: {x: 0, y: 52} + m_SizeDelta: {x: 200, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2410930197316046571 CanvasRenderer: @@ -9314,7 +9314,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.75, y: -2} + m_AnchoredPosition: {x: 0.75, y: -42} m_SizeDelta: {x: 534, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4230029146921314189 @@ -9934,7 +9934,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 375} + m_AnchoredPosition: {x: 0, y: 395} m_SizeDelta: {x: 574, y: 268} m_Pivot: {x: 0.5, y: 1} --- !u!222 &85684085377220066 @@ -10003,9 +10003,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7467862993939628122} - {fileID: 8474223097521515840} - {fileID: 5192740225468937621} - - {fileID: 7467862993939628122} - {fileID: 8277223252311775671} m_Father: {fileID: 5129409844343259102} m_RootOrder: 6 @@ -10202,8 +10202,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: 20, y: 0} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 13, y: 0} + m_SizeDelta: {x: 160, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3373807023282465328 CanvasRenderer: @@ -10260,10 +10260,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 32 m_fontStyle: 0 @@ -11473,7 +11473,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2584119948269024356 RectTransform: m_ObjectHideFlags: 0 @@ -11496,7 +11496,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 40} - m_SizeDelta: {x: 611, y: 942} + m_SizeDelta: {x: 620, y: 956} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &28261399708346414 MonoBehaviour: @@ -12685,9 +12685,9 @@ RectTransform: m_Father: {fileID: 5129409844343259102} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 230, y: -123} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 239, y: 355} m_SizeDelta: {x: 103, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1743135081359274816 @@ -14278,11 +14278,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6802774033257253966} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -360} + m_AnchoredPosition: {x: 0, y: -396} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7857297243560055254 @@ -15945,7 +15945,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: 140, y: -101} + m_AnchoredPosition: {x: 140, y: -141} m_SizeDelta: {x: 254, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8188355070568033250 @@ -16520,8 +16520,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -81} - m_SizeDelta: {x: 616, y: 300} + m_AnchoredPosition: {x: 0, y: -78} + m_SizeDelta: {x: 616, y: 383} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1001773250344339554 CanvasRenderer: @@ -16598,7 +16598,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: -3} + m_AnchoredPosition: {x: 0, y: -33} m_SizeDelta: {x: 570, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9121069273870758069 @@ -17514,6 +17514,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6802774033257253966} m_Modifications: + - target: {fileID: 132407509915562124, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 132407509915562124, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 541976652809946401, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: childAlignment + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1188769973866937479, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 1188769973866937479, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 1221723042693176345, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 1221723042693176345, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_Pivot.x value: 0 @@ -17544,7 +17572,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_SizeDelta.x - value: 110 + value: 170 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_SizeDelta.y @@ -17580,7 +17608,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchoredPosition.x - value: 28 + value: 19 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchoredPosition.y @@ -17602,6 +17630,22 @@ PrefabInstance: propertyPath: m_Name value: star_cell objectReference: {fileID: 0} + - target: {fileID: 8509724669083950070, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 8509724669083950070, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 9038358656544571744, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 9038358656544571744, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} --- !u!1 &7009585597240693844 stripped diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index ed50374ba..1e6a8d2f4 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -720,8 +720,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: 20, y: 0} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 13, y: 0} + m_SizeDelta: {x: 160, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7161404777156133496 CanvasRenderer: @@ -778,10 +778,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 32 m_fontStyle: 0