diff --git a/Assets/Prefabs/UI/LevelConfirmMenu.prefab b/Assets/Prefabs/UI/LevelConfirmMenu.prefab index 569ab9a6..9b9e3a43 100644 --- a/Assets/Prefabs/UI/LevelConfirmMenu.prefab +++ b/Assets/Prefabs/UI/LevelConfirmMenu.prefab @@ -33,9 +33,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1936850923066780126} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 266.5, y: -75} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2968163887214456956 @@ -232,7 +232,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 23, y: -121} + m_AnchoredPosition: {x: 23, y: -251.92} m_SizeDelta: {x: -224.8314, y: 307.8118} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2667865570943019976 @@ -345,13 +345,14 @@ GameObject: - component: {fileID: 5455602294483642302} - component: {fileID: 6366784497255586293} - component: {fileID: 931507183618830756} + - component: {fileID: 3532396626154906965} m_Layer: 0 m_Name: ConfirmPopup m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5455602294483642302 RectTransform: m_ObjectHideFlags: 0 @@ -359,7 +360,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593702389427837575} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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 @@ -368,10 +369,10 @@ RectTransform: - {fileID: 1936850923066780126} m_Father: {fileID: 7944572313058047776} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.3, y: 0.25} - m_AnchorMax: {x: 0.7, y: 0.75} + m_AnchorMin: {x: 0.33900002, y: 0.2976042} + m_AnchorMax: {x: 0.6666758, y: 0.9122084} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -4.9990845, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6366784497255586293 CanvasRenderer: @@ -394,14 +395,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.92445034, b: 0, a: 1} + 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: -5456581511811481741, guid: dadef309ebc24224f958fa2bcd65d7c4, type: 3} + m_Sprite: {fileID: -7663927530950790571, guid: ffce6854bf816db478723dc732929007, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -411,6 +412,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3532396626154906965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1593702389427837575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter + m_AspectMode: 2 + m_AspectRatio: 0.7055703 --- !u!1 &2496371209791633318 GameObject: m_ObjectHideFlags: 0 @@ -1239,9 +1254,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1936850923066780126} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -75} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6779017702749071 @@ -1361,7 +1376,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 378, y: 1} + m_AnchoredPosition: {x: 250, y: 1} m_SizeDelta: {x: 150, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6749540931972845406 @@ -1703,7 +1718,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 18.000061} + m_AnchoredPosition: {x: 0, y: -33} m_SizeDelta: {x: 0, y: 104.8042} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5316188293517483191 @@ -1839,7 +1854,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 18} + m_AnchoredPosition: {x: 0, y: -33} m_SizeDelta: {x: 0, y: 104.8042} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8995662174827258194 @@ -1978,7 +1993,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 125} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 341.5, y: 150} m_Pivot: {x: 0.5, y: 0} --- !u!114 &4213333726324520130 MonoBehaviour: @@ -2055,7 +2070,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -387, y: -75} + m_AnchoredPosition: {x: -250, y: -75} m_SizeDelta: {x: 150, y: 200} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2151603547065558192 @@ -2370,8 +2385,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -159, y: -87} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: -44, y: -178} + m_SizeDelta: {x: 107.3864, y: 107.3864} m_Pivot: {x: 1, y: 1} --- !u!222 &3451490436647349682 CanvasRenderer: @@ -2491,8 +2506,8 @@ RectTransform: - {fileID: 9090652446732982277} m_Father: {fileID: 7944572313058047776} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.1, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchorMin: {x: 0.2033047, y: 0.094791666} + m_AnchorMax: {x: 0.79800004, y: 0.9122084} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2524,7 +2539,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -5456581511811481741, guid: dadef309ebc24224f958fa2bcd65d7c4, type: 3} + m_Sprite: {fileID: -135860965172787373, guid: ecdc03722fc0a314895000dc0cd82475, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Prefabs/UI/PauseMenu.prefab b/Assets/Prefabs/UI/PauseMenu.prefab index a1f15a86..b4300dd4 100644 --- a/Assets/Prefabs/UI/PauseMenu.prefab +++ b/Assets/Prefabs/UI/PauseMenu.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 5131618775662232356} - component: {fileID: 2284563239151529287} - component: {fileID: 3083882772934295339} + - component: {fileID: 2181820907823665012} m_Layer: 0 m_Name: PauseMenu m_TagString: Untagged @@ -37,10 +38,10 @@ RectTransform: - {fileID: 9052230212113207254} m_Father: {fileID: 1596438591304698361} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.1, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.201, y: 0.09034897} + m_AnchorMax: {x: 0.804, y: 0.90958333} + m_AnchoredPosition: {x: -5.5, y: 1} + m_SizeDelta: {x: 0, y: -1.9023323} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3414474029174947724 CanvasRenderer: @@ -70,7 +71,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -5456581511811481741, guid: dadef309ebc24224f958fa2bcd65d7c4, type: 3} + m_Sprite: {fileID: -135860965172787373, guid: ecdc03722fc0a314895000dc0cd82475, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -109,6 +110,20 @@ MonoBehaviour: pauseMenuPanel: {fileID: 667683895919791839} pauseButton: {fileID: 2741683265562644894} canvasGroup: {fileID: 0} +--- !u!114 &2181820907823665012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 667683895919791839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter + m_AspectMode: 2 + m_AspectRatio: 0.976 --- !u!1 &1177549678470543294 GameObject: m_ObjectHideFlags: 0 @@ -614,6 +629,7 @@ GameObject: - component: {fileID: 1639126667473908565} - component: {fileID: 7622719397492147892} - component: {fileID: 6441509209781287517} + - component: {fileID: 452533018326745068} m_Layer: 0 m_Name: Text (TMP) m_TagString: Untagged @@ -635,10 +651,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1302888740346723223} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -135} - m_SizeDelta: {x: 0, y: 178.6466} + m_AnchorMin: {x: 0, y: 0.70400006} + m_AnchorMax: {x: 1, y: 0.8301673} + m_AnchoredPosition: {x: 0, y: -4} + m_SizeDelta: {x: 0, y: -5.197706} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7622719397492147892 CanvasRenderer: @@ -739,6 +755,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &452533018326745068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393876071688605581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter + m_AspectMode: 2 + m_AspectRatio: 7.998008 --- !u!1 &5311617088286560893 GameObject: m_ObjectHideFlags: 0 @@ -751,6 +781,7 @@ GameObject: - component: {fileID: 3956398402257402681} - component: {fileID: 1026615620890952921} - component: {fileID: 5036997843630872876} + - component: {fileID: 7177724580106873594} m_Layer: 0 m_Name: Resume m_TagString: Untagged @@ -772,10 +803,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1302888740346723223} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -191, y: -99} - m_SizeDelta: {x: 153, y: 154} + m_AnchorMin: {x: 0.8316005, y: 0.745783} + m_AnchorMax: {x: 0.9391002, y: 0.8506335} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: -1, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &3956398402257402681 CanvasRenderer: @@ -871,6 +902,20 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 +--- !u!114 &7177724580106873594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5311617088286560893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter + m_AspectMode: 1 + m_AspectRatio: 0.9944555 --- !u!1 &5428575275238917432 GameObject: m_ObjectHideFlags: 0 @@ -1277,8 +1322,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5605205583985027889} - - component: {fileID: 3446002550086852002} - component: {fileID: 3810284243795851676} + - component: {fileID: 7491581222591190131} m_Layer: 0 m_Name: Buttons m_TagString: Untagged @@ -1304,25 +1349,11 @@ RectTransform: - {fileID: 6855320393561945426} m_Father: {fileID: 1302888740346723223} 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: -89.297} - m_SizeDelta: {x: 429.964, y: 780.1} + m_AnchorMin: {x: 0.25412482, y: 0.22863281} + m_AnchorMax: {x: 0.7471072, y: 0.67300004} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3446002550086852002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9039430485754110792} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter - m_HorizontalFit: 0 - m_VerticalFit: 0 --- !u!114 &3810284243795851676 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1343,7 +1374,21 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 250} + m_CellSize: {x: 200, y: 200} m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!114 &7491581222591190131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9039430485754110792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter + m_AspectMode: 2 + m_AspectRatio: 1.0827775