diff --git a/Assets/Main Mixer.mixer b/Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Audio/Main Mixer.mixer similarity index 100% rename from Assets/Main Mixer.mixer rename to Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Audio/Main Mixer.mixer diff --git a/Assets/Main Mixer.mixer.meta b/Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Audio/Main Mixer.mixer.meta similarity index 100% rename from Assets/Main Mixer.mixer.meta rename to Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Audio/Main Mixer.mixer.meta diff --git a/Assets/AudioManager.cs b/Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/AudioManager.cs similarity index 100% rename from Assets/AudioManager.cs rename to Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/AudioManager.cs diff --git a/Assets/AudioManager.cs.meta b/Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/AudioManager.cs.meta similarity index 100% rename from Assets/AudioManager.cs.meta rename to Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/AudioManager.cs.meta diff --git a/Assets/OptionsScreen.cs b/Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/OptionsScreen.cs similarity index 100% rename from Assets/OptionsScreen.cs rename to Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/OptionsScreen.cs diff --git a/Assets/OptionsScreen.cs.meta b/Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/OptionsScreen.cs.meta similarity index 100% rename from Assets/OptionsScreen.cs.meta rename to Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Scripts/OptionsScreen.cs.meta diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 91045ba..753c2ec 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -156,7 +156,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -613,8 +613,8 @@ RectTransform: m_Father: {fileID: 684044597} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1019,8 +1019,8 @@ RectTransform: m_Father: {fileID: 1299549684} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1437,7 +1437,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1996,7 +1996,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2197,7 +2197,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 80 + m_text: 100 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 1a720ceb9285174499a73898e09bd868, type: 2} m_sharedMaterial: {fileID: 69611261040843789, guid: 1a720ceb9285174499a73898e09bd868, type: 2} @@ -3362,7 +3362,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 80 + m_text: 100 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 1a720ceb9285174499a73898e09bd868, type: 2} m_sharedMaterial: {fileID: 69611261040843789, guid: 1a720ceb9285174499a73898e09bd868, type: 2} @@ -3895,7 +3895,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &997522403 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5438,6 +5438,10 @@ PrefabInstance: propertyPath: m_Name value: Options Button objectReference: {fileID: 0} + - target: {fileID: 8900608489955080584, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3} --- !u!224 &1579296636 stripped @@ -5477,8 +5481,8 @@ RectTransform: m_Father: {fileID: 981775343} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5883,7 +5887,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 80 + m_text: 100 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 1a720ceb9285174499a73898e09bd868, type: 2} m_sharedMaterial: {fileID: 69611261040843789, guid: 1a720ceb9285174499a73898e09bd868, type: 2} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f63cf2f..cb4a355 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c6c1313191d7b623d28393930