diff --git a/game/Assets/Prefabs/Slider.prefab b/game/Assets/Prefabs/Slider.prefab index 776e36b..0b715fb 100644 --- a/game/Assets/Prefabs/Slider.prefab +++ b/game/Assets/Prefabs/Slider.prefab @@ -74,7 +74,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5921007621743368024 GameObject: m_ObjectHideFlags: 0 @@ -258,7 +258,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: -4} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5921007622753688605 CanvasRenderer: @@ -333,7 +333,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -4, y: -4} + m_SizeDelta: {x: -4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5921007622983069172 CanvasRenderer: diff --git a/game/Assets/Scenes/MainMenu.unity b/game/Assets/Scenes/MainMenu.unity index 732ab88..5da7c4c 100644 --- a/game/Assets/Scenes/MainMenu.unity +++ b/game/Assets/Scenes/MainMenu.unity @@ -603,7 +603,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -15, y: 0} + m_AnchoredPosition: {x: -18, y: 0} m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &367839464 @@ -676,10 +676,10 @@ RectTransform: m_Father: {fileID: 633465539} 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: 249.6, y: -89.799995} - m_SizeDelta: {x: 499.2, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &460731999 PrefabInstance: @@ -690,11 +690,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 5921007621743368025, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007622753688607, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007623216315232, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: _playerPref @@ -879,8 +879,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1099,10 +1099,10 @@ RectTransform: m_Father: {fileID: 633465539} 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: 249.6, y: -16} - m_SizeDelta: {x: 499.2, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &620105167 GameObject: @@ -1122,7 +1122,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &620105168 RectTransform: m_ObjectHideFlags: 0 @@ -1144,7 +1144,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -675, y: -668.4} - m_SizeDelta: {x: 563.2, y: 285.4} + m_SizeDelta: {x: 800, y: 447.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &620105169 MonoBehaviour: @@ -1280,8 +1280,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1389,7 +1389,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -1512,9 +1512,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &719847141 MonoBehaviour: @@ -2225,10 +2225,10 @@ RectTransform: m_Father: {fileID: 633465539} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 249.6, y: -52.899998} - m_SizeDelta: {x: 499.2, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1009061728 stripped MonoBehaviour: @@ -2387,10 +2387,10 @@ RectTransform: m_Father: {fileID: 633465539} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 249.6, y: -163.59999} - m_SizeDelta: {x: 499.2, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1147386789 GameObject: @@ -2424,10 +2424,10 @@ RectTransform: m_Father: {fileID: 633465539} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 249.6, y: -200.49998} - m_SizeDelta: {x: 499.2, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1163968772 PrefabInstance: @@ -2595,10 +2595,10 @@ RectTransform: m_Father: {fileID: 633465539} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 249.6, y: -126.7} - m_SizeDelta: {x: 499.2, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1213465825 GameObject: @@ -2667,7 +2667,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1213465828 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2826,8 +2826,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -0.5} - m_SizeDelta: {x: -30, y: -3} + m_AnchoredPosition: {x: 9.999997, y: -0.5} + m_SizeDelta: {x: -40.000008, y: -3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1253390189 MonoBehaviour: @@ -2876,8 +2876,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3169,8 +3169,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3608,11 +3608,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 5921007621743368025, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007622753688607, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007623216315232, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: _playerPref @@ -3935,8 +3935,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4020,7 +4020,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: 10, y: 10} + m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1494551717 MonoBehaviour: @@ -4144,8 +4144,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4353,8 +4353,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4677,8 +4677,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4736,11 +4736,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 5921007621743368025, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007622753688607, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007623216315232, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: _playerPref @@ -4988,7 +4988,7 @@ 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: 10, y: 0} + m_AnchoredPosition: {x: 15, y: 0} m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1715155169 @@ -5161,7 +5161,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 1.5 --- !u!222 &1716058276 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6041,11 +6041,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 5921007621743368025, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007622753688607, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5921007623216315234, guid: 5166a6c3767d9d14b9f17a325da7066c, type: 3} propertyPath: m_Pivot.x