diff --git a/Assets/Scenes/Levels/LevelModel.cs b/Assets/Scenes/Levels/LevelModel.cs index 6ba66fcf..d4f0666b 100644 --- a/Assets/Scenes/Levels/LevelModel.cs +++ b/Assets/Scenes/Levels/LevelModel.cs @@ -4,6 +4,5 @@ using UnityEngine; public class LevelModel : ScriptableObject { public string SceneName; - public string Name; public Sprite MenuSprite; } \ No newline at end of file diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index a6c4ad52..2244e4d3 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -671,7 +671,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1801607763} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.35437503} m_AnchorMax: {x: 0, y: 0.35437503} @@ -1011,7 +1011,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1801607763} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.35437503} m_AnchorMax: {x: 1, y: 0.35437503} @@ -1173,7 +1173,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a7bc1809032b184bae6f306e7ab1544, type: 3} m_Name: m_EditorClassIdentifier: - _botsCount: 1 + _botsCount: 3 --- !u!4 &962136217 Transform: m_ObjectHideFlags: 0 @@ -1342,7 +1342,6 @@ MonoBehaviour: - {fileID: 11400000, guid: d2b1e56b926cd5c47bf02a7b708b6290, type: 2} - {fileID: 11400000, guid: 6cef405d05be36f489f8d16e3df67868, type: 2} _levelImage: {fileID: 713212109} - _levelNameText: {fileID: 1138818630} _nextButton: {fileID: 866147930} _prevButton: {fileID: 668707257} --- !u!114 &1102420990 @@ -1357,141 +1356,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8cb3eaf5cf6e0bc4186337ad058574cb, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1138818628 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1138818629} - - component: {fileID: 1138818631} - - component: {fileID: 1138818630} - m_Layer: 5 - m_Name: LevelNameText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1138818629 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1138818628} - 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_Children: [] - m_Father: {fileID: 1801607763} - 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: 0, y: 0} - m_SizeDelta: {x: 741.76807, y: 252.78479} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1138818630 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1138818628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: MATS - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 98ae539f0ab864f65b5fc85d09757eb2, type: 2} - m_sharedMaterial: {fileID: 644716123368233633, guid: 98ae539f0ab864f65b5fc85d09757eb2, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4288400342 - m_fontColor: {r: 0.8392157, g: 0.79607844, b: 0.60784316, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 200 - m_fontSizeBase: 200 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1138818631 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1138818628} - m_CullTransparentMesh: 1 --- !u!1 &1386322996 GameObject: m_ObjectHideFlags: 0 @@ -1616,7 +1480,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1801607763} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.24900001} m_AnchorMax: {x: 0.5, y: 0.24900001} @@ -1746,7 +1610,7 @@ RectTransform: m_Children: - {fileID: 1862883449} m_Father: {fileID: 1801607763} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1846,7 +1710,6 @@ RectTransform: m_Children: - {fileID: 1003420331} - {fileID: 713212107} - - {fileID: 1138818629} - {fileID: 1907154469} - {fileID: 1722082207} - {fileID: 1623606163} @@ -1892,7 +1755,7 @@ RectTransform: - {fileID: 17255437} - {fileID: 136704028} m_Father: {fileID: 1801607763} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2096,7 +1959,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1801607763} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scripts/LevelChooser.cs b/Assets/Scripts/LevelChooser.cs index b90eee99..64fa6bed 100644 --- a/Assets/Scripts/LevelChooser.cs +++ b/Assets/Scripts/LevelChooser.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using TMPro; using UnityEngine; using UnityEngine.UI; @@ -7,7 +6,6 @@ public class LevelChooser : MonoBehaviour { [SerializeField] private List _levels; [SerializeField] private Image _levelImage; - [SerializeField] private TextMeshProUGUI _levelNameText; [SerializeField] private GameObject _nextButton; [SerializeField] private GameObject _prevButton; @@ -47,7 +45,6 @@ public class LevelChooser : MonoBehaviour private void UpdateUI() { _levelImage.sprite = CurrentLevel.MenuSprite; - _levelNameText.text = CurrentLevel.Name; UpdateButtonsVisibility(); }