diff --git a/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes b/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes index 100acefbb..afce5a347 100644 Binary files a/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes and b/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_match_ui.prefab b/Assets/prefabs/ui/arena/arena_match_ui.prefab index 8df38c4e6..3c0cd594b 100644 --- a/Assets/prefabs/ui/arena/arena_match_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_match_ui.prefab @@ -107,14 +107,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6034063427409532362} - - {fileID: 8804403671410321520} + - {fileID: 1083973466778229555} m_Father: {fileID: 4913380882724635054} m_RootOrder: 1 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: -36} - m_SizeDelta: {x: 662, y: 209} + m_AnchoredPosition: {x: 0, y: -32} + m_SizeDelta: {x: 604, y: 194} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1877720936824284535 CanvasRenderer: @@ -192,8 +192,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: -172.5} - m_SizeDelta: {x: 684, y: 305} + m_AnchoredPosition: {x: 0, y: -143} + m_SizeDelta: {x: 630, y: 282} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1959679968156037996 CanvasRenderer: @@ -497,8 +497,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: 304} - m_SizeDelta: {x: 684, y: 305} + m_AnchoredPosition: {x: 0, y: 343} + m_SizeDelta: {x: 630, y: 282} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &895455004406819325 CanvasRenderer: @@ -649,7 +649,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: 32.5} + m_AnchoredPosition: {x: 0, y: 21} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6323436447430688705 @@ -707,12 +707,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 30 + m_fontSizeMax: 40 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -992,8 +992,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 100, y: 20} - m_SizeDelta: {x: 300, y: 50} + m_AnchoredPosition: {x: 22, y: 12} + m_SizeDelta: {x: 160, y: 24} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8110540760224802000 CanvasRenderer: @@ -1055,7 +1055,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -1066,7 +1066,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -1123,14 +1123,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4727827486298260641} - - {fileID: 4623697183919127515} + - {fileID: 3600034413154020453} m_Father: {fileID: 1882688869272361315} m_RootOrder: 1 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: -36} - m_SizeDelta: {x: 662, y: 209} + m_AnchoredPosition: {x: 0, y: -32} + m_SizeDelta: {x: 604, y: 194} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7975274826104171804 CanvasRenderer: @@ -1279,10 +1279,10 @@ RectTransform: m_Father: {fileID: 4605764889789527791} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -55} - m_SizeDelta: {x: 300, y: 50} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 21, y: -15} + m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3067936460715216562 CanvasRenderer: @@ -1339,12 +1339,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 20 + m_enableAutoSizing: 0 + m_fontSizeMin: 16 + m_fontSizeMax: 16 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -1355,7 +1355,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -1414,7 +1414,7 @@ RectTransform: - {fileID: 8081014521105279398} - {fileID: 6080993962222333198} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1765,6 +1765,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7369116473652704760} + - {fileID: 6514510259994709351} - {fileID: 5221279569728953363} - {fileID: 3121552964615492639} m_Father: {fileID: 0} @@ -1861,7 +1862,7 @@ MonoBehaviour: - name: arena_match_ui.match_result.btn_close hashName: 3816511078 objectType: 0 - gameObject: {fileID: 6794716816656942295} + gameObject: {fileID: 6529387611083761481} - name: arena_match_ui.match_result.match.info.tx_name hashName: 1083494078 objectType: 0 @@ -1877,11 +1878,11 @@ MonoBehaviour: - name: arena_match_ui.match_result.match.formation.hero_formation_comp hashName: 2009189997 objectType: 1 - gameObject: {fileID: 2094515170546121612} + gameObject: {fileID: 7840342942388743218} - name: arena_match_ui.match_result.self.formation.hero_formation_comp hashName: 2629823986 objectType: 1 - gameObject: {fileID: 2815906564553500711} + gameObject: {fileID: 5922398968509864804} - name: arena_match_ui.match_result.btn_start hashName: 3831512272 objectType: 0 @@ -2010,9 +2011,9 @@ 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: 159} - m_SizeDelta: {x: 286, y: 119} - m_Pivot: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 246} + m_SizeDelta: {x: 288, y: 118} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5072556643322517712 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2041,8 +2042,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 7b4a6a6a5803f454abf5ea8630153f69, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2101,8 +2102,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: -10} - m_SizeDelta: {x: 143, y: 42} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 122, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8726614689901998572 CanvasRenderer: @@ -2125,14 +2126,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.9411765} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a4f780181ba75d4e840fd9a8754eb99, type: 3} + m_Sprite: {fileID: 21300000, guid: 361db3b3bf17f4fce909a8be3ddceffc, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2277,7 +2278,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6794716816656942295 +--- !u!1 &6529387611083761481 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2285,24 +2286,24 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4483610320529038882} - - component: {fileID: 5861327955861760825} - - component: {fileID: 6353244889037430329} - - component: {fileID: 2588368138269679996} - m_Layer: 5 + - component: {fileID: 2450711617391963145} + - component: {fileID: 8927938485208193370} + - component: {fileID: 3747988298395096978} + - component: {fileID: 2612583388123175460} + m_Layer: 0 m_Name: btn_close m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4483610320529038882 +--- !u!224 &2450711617391963145 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794716816656942295} + m_GameObject: {fileID: 6529387611083761481} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2313,24 +2314,24 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 29, y: 18} - m_SizeDelta: {x: 102, y: 82} - m_Pivot: {x: 0, y: 0} ---- !u!222 &5861327955861760825 + m_AnchoredPosition: {x: 104, y: 65} + m_SizeDelta: {x: 132, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8927938485208193370 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794716816656942295} + m_GameObject: {fileID: 6529387611083761481} m_CullTransparentMesh: 1 ---- !u!114 &6353244889037430329 +--- !u!114 &3747988298395096978 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794716816656942295} + m_GameObject: {fileID: 6529387611083761481} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -2344,7 +2345,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1e55a4a32dd1ec240af52ddccebc7c46, type: 3} + m_Sprite: {fileID: 21300000, guid: bd3cdfd63768e3442ab4908a5f300e19, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2354,13 +2355,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2588368138269679996 +--- !u!114 &2612583388123175460 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794716816656942295} + m_GameObject: {fileID: 6529387611083761481} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} @@ -2685,10 +2686,10 @@ RectTransform: m_Father: {fileID: 360821232978557741} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -26} - m_SizeDelta: {x: 300, y: 50} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -22, y: 12} + m_SizeDelta: {x: 160, y: 24} m_Pivot: {x: 1, y: 0.5} --- !u!222 &7339512186985822131 CanvasRenderer: @@ -2750,7 +2751,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 4 m_VerticalAlignment: 512 @@ -2899,10 +2900,10 @@ RectTransform: m_Father: {fileID: 4913380882724635054} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 464, y: 92} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -64, y: 130} + m_SizeDelta: {x: 242, y: 56} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8036304847278165914 CanvasRenderer: @@ -3041,10 +3042,10 @@ RectTransform: m_Father: {fileID: 1882688869272361315} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 464, y: 92} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 64, y: 130} + m_SizeDelta: {x: 242, y: 56} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7031420801793741951 CanvasRenderer: @@ -3119,9 +3120,9 @@ RectTransform: - {fileID: 4727531125263320572} - {fileID: 1645907659555141206} - {fileID: 6244349061470354221} - - {fileID: 4483610320529038882} + - {fileID: 2450711617391963145} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3157,6 +3158,82 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &8607494872816747205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6514510259994709351} + - component: {fileID: 302790251138296648} + - component: {fileID: 827524857089062148} + m_Layer: 5 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6514510259994709351 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607494872816747205} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8461932745927490369} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 136} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &302790251138296648 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607494872816747205} + m_CullTransparentMesh: 1 +--- !u!114 &827524857089062148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607494872816747205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8743152846842926726 GameObject: m_ObjectHideFlags: 0 @@ -3190,10 +3267,10 @@ RectTransform: m_Father: {fileID: 360821232978557741} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -55} - m_SizeDelta: {x: 300, y: 50} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -21, y: -15} + m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!222 &5172539149600264746 CanvasRenderer: @@ -3476,11 +3553,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalPosition.x @@ -3512,11 +3593,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.x - value: -40 + value: 26 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3530,6 +3611,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} --- !u!1 &3663199460368674985 stripped @@ -3542,267 +3627,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 1064635963393402410} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1387319428845566745 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7151882202504723360} - m_Modifications: - - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Name - value: hero_formation_comp - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_SizeDelta.x - value: 780 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_SizeDelta.y - value: 204 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalScale.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalScale.y - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} ---- !u!1 &2094515170546121612 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 1387319428845566745} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4376010882360431022 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2094515170546121612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!224 &4623697183919127515 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 1387319428845566745} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1637016210762041153 PrefabInstance: m_ObjectHideFlags: 0 @@ -3852,11 +3676,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalPosition.x @@ -3888,11 +3716,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: -26 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3906,6 +3734,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} --- !u!1 &3073651592587710914 stripped @@ -3918,267 +3750,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 1637016210762041153} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2973947786109774002 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8943392860079995932} - m_Modifications: - - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Name - value: hero_formation_comp - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2198065885567531670, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3605514065162154275, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_SizeDelta.x - value: 780 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_SizeDelta.y - value: 204 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalScale.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalScale.y - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823636139317570415, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7083431916767983324, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9056102732112236531, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} ---- !u!1 &2815906564553500711 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 2973947786109774002} - m_PrefabAsset: {fileID: 0} ---- !u!114 &301669984352123485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815906564553500711} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!224 &8804403671410321520 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 2973947786109774002} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5223586103809151253 PrefabInstance: m_ObjectHideFlags: 0 @@ -4306,6 +3877,220 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} m_PrefabInstance: {fileID: 5223586103809151253} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6656636509429210097 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8943392860079995932} + m_Modifications: + - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Name + value: hero_formation_comp + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_SizeDelta.x + value: 604 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_SizeDelta.y + value: 194 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} +--- !u!224 &1083973466778229555 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + m_PrefabInstance: {fileID: 6656636509429210097} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5922398968509864804 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + m_PrefabInstance: {fileID: 6656636509429210097} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7106670889245437095 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7151882202504723360} + m_Modifications: + - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Name + value: hero_formation_comp + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_SizeDelta.x + value: 604 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_SizeDelta.y + value: 194 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} +--- !u!224 &3600034413154020453 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + m_PrefabInstance: {fileID: 7106670889245437095} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7840342942388743218 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + m_PrefabInstance: {fileID: 7106670889245437095} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9067379420394799131 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab b/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab index a1768388e..71b756976 100644 --- a/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab @@ -235,7 +235,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -370,7 +370,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -849,7 +849,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -999,11 +999,11 @@ RectTransform: m_Father: {fileID: 6198716056830969344} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -39, y: 21} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -39, y: -33} m_SizeDelta: {x: 74, y: 18} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &5237502453857999518 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1066,7 +1066,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1253,11 +1253,11 @@ RectTransform: m_Father: {fileID: 5637227811435284764} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -39, y: 21} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -39, y: -33} m_SizeDelta: {x: 74, y: 18} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &712994399502945515 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1320,7 +1320,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1455,7 +1455,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1525,7 +1525,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: -256, y: -8} + m_AnchoredPosition: {x: -256, y: 0} m_SizeDelta: {x: 128, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2714108324488187905 @@ -1660,7 +1660,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: -256, y: -8} + m_AnchoredPosition: {x: -256, y: 0} m_SizeDelta: {x: 128, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5697288812172755500 @@ -2085,11 +2085,11 @@ RectTransform: m_Father: {fileID: 8017623831780640297} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -39, y: 21} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -39, y: -33} m_SizeDelta: {x: 74, y: 18} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &807124814345746320 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2152,7 +2152,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -2288,7 +2288,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: -256, y: -8} + m_AnchoredPosition: {x: -256, y: 0} m_SizeDelta: {x: 128, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7267991669531649133 @@ -2558,7 +2558,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: -256, y: -8} + m_AnchoredPosition: {x: -256, y: 0} m_SizeDelta: {x: 128, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3793555101645060301 @@ -3244,7 +3244,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -3314,7 +3314,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: -256, y: -8} + m_AnchoredPosition: {x: -256, y: 0} m_SizeDelta: {x: 128, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1924106224417533341 @@ -3836,11 +3836,11 @@ RectTransform: m_Father: {fileID: 1096127962611753283} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -39, y: 21} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -39, y: -33} m_SizeDelta: {x: 74, y: 18} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &73160086309201784 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3903,7 +3903,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -4106,11 +4106,11 @@ RectTransform: m_Father: {fileID: 8623328077335906713} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -39, y: 21} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -39, y: -33} m_SizeDelta: {x: 74, y: 18} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &7979089244112141395 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4173,7 +4173,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/Assets/prefabs/ui/common/hero_formation_comp.prefab b/Assets/prefabs/ui/common/hero_formation_comp.prefab index 18f48812d..5b3daa82a 100644 --- a/Assets/prefabs/ui/common/hero_formation_comp.prefab +++ b/Assets/prefabs/ui/common/hero_formation_comp.prefab @@ -29,6 +29,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3605514065162154275} - {fileID: 2198065885567531670} @@ -40,8 +41,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: -191} - m_SizeDelta: {x: 672, y: 204} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 604, y: 194} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3739646478636344155 CanvasRenderer: @@ -64,7 +65,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.54901963} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -163,15 +164,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -203,7 +204,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -280 + value: -234 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -221,22 +222,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Name value: hero_cell_1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3} ---- !u!1 &5518503791000720637 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} - m_PrefabInstance: {fileID: 1274431963402879351} - m_PrefabAsset: {fileID: 0} --- !u!224 &3605514065162154275 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} m_PrefabInstance: {fileID: 1274431963402879351} m_PrefabAsset: {fileID: 0} +--- !u!1 &5518503791000720637 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + m_PrefabInstance: {fileID: 1274431963402879351} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4406758666599549634 PrefabInstance: m_ObjectHideFlags: 0 @@ -286,15 +291,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -326,7 +331,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -140 + value: -117 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -344,22 +349,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Name value: hero_cell_2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3} ---- !u!1 &6925950475946467144 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} - m_PrefabInstance: {fileID: 4406758666599549634} - m_PrefabAsset: {fileID: 0} --- !u!224 &2198065885567531670 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} m_PrefabInstance: {fileID: 4406758666599549634} m_PrefabAsset: {fileID: 0} +--- !u!1 &6925950475946467144 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + m_PrefabInstance: {fileID: 4406758666599549634} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4750045410741765768 PrefabInstance: m_ObjectHideFlags: 0 @@ -409,15 +418,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -467,6 +476,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Name value: hero_cell_3 @@ -532,15 +545,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -572,7 +585,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 + value: 117 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -590,6 +603,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Name value: hero_cell_4 @@ -655,15 +672,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -695,7 +712,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 280 + value: 234 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -713,6 +730,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Name value: hero_cell_5