diff --git a/Assets/Audio/just-a-click-away-sci-fi-background-music-109864.mp3 b/Assets/Audio/just-a-click-away-sci-fi-background-music-109864.mp3 new file mode 100644 index 0000000..431ce54 Binary files /dev/null and b/Assets/Audio/just-a-click-away-sci-fi-background-music-109864.mp3 differ diff --git a/Assets/Audio/just-a-click-away-sci-fi-background-music-109864.mp3.meta b/Assets/Audio/just-a-click-away-sci-fi-background-music-109864.mp3.meta new file mode 100644 index 0000000..447e38d --- /dev/null +++ b/Assets/Audio/just-a-click-away-sci-fi-background-music-109864.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1e173c5241e9dca48a60d8fb7f4a5362 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Background.prefab b/Assets/Images/Background.prefab index 7735401..3be82a7 100644 --- a/Assets/Images/Background.prefab +++ b/Assets/Images/Background.prefab @@ -59,7 +59,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.50980395} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Prefabs/PlayerReplayer.prefab b/Assets/Prefabs/PlayerReplayer.prefab index d6206c6..717bbb6 100644 --- a/Assets/Prefabs/PlayerReplayer.prefab +++ b/Assets/Prefabs/PlayerReplayer.prefab @@ -319,7 +319,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.4 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 92ee2b9..7c433bc 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -431,7 +431,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 55, y: -60} - m_SizeDelta: {x: 1600, y: 400} + m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &272809486 MonoBehaviour: @@ -447,7 +447,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -463,8 +463,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: EASY --- !u!222 &272809487 @@ -510,7 +510,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 1600, y: 400} + m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &348530193 MonoBehaviour: @@ -526,7 +526,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -542,8 +542,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Created by Pasha Bibko, Finnley Goodchild, Ethan Penn, and Jake Wilson --- !u!222 &348530194 @@ -958,7 +958,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 75} - m_SizeDelta: {x: 1600, y: 400} + m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &463523189 MonoBehaviour: @@ -974,7 +974,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -990,8 +990,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: '- DIFFICULTY -' --- !u!222 &463523190 @@ -1002,6 +1002,147 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 463523187} m_CullTransparentMesh: 1 +--- !u!1 &581151640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 581151641} + - component: {fileID: 581151642} + - component: {fileID: 581151643} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &581151641 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 581151640} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &581151642 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 581151640} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1e173c5241e9dca48a60d8fb7f4a5362, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &581151643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 581151640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a54fafe58853b204da37b60f25743c6a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &593693782 GameObject: m_ObjectHideFlags: 0 @@ -1090,7 +1231,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1121,6 +1262,7 @@ GameObject: m_Component: - component: {fileID: 872206453} - component: {fileID: 872206454} + - component: {fileID: 872206455} m_Layer: 5 m_Name: DifficultySlider m_TagString: Untagged @@ -1137,7 +1279,7 @@ RectTransform: m_GameObject: {fileID: 872206452} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 138833047} @@ -1148,7 +1290,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 750, y: 20} + m_SizeDelta: {x: 750, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &872206454 MonoBehaviour: @@ -1194,13 +1336,26 @@ MonoBehaviour: m_FillRect: {fileID: 1246512904} m_HandleRect: {fileID: 1012436233} m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0 + m_MinValue: 3 + m_MaxValue: 5 + m_WholeNumbers: 1 + m_Value: 4 m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!114 &872206455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872206452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 985fe7203793456f84cbf0526b831a3a, type: 3} + m_Name: + m_EditorClassIdentifier: + DifficultySlider: {fileID: 872206454} --- !u!1 &1012436232 GameObject: m_ObjectHideFlags: 0 @@ -1236,7 +1391,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 50, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1012436234 MonoBehaviour: @@ -1328,7 +1483,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1527,7 +1682,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -55, y: -60} - m_SizeDelta: {x: 1600, y: 400} + m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1390205447 MonoBehaviour: @@ -1543,7 +1698,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1559,8 +1714,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: HARD --- !u!222 &1390205448 @@ -2041,7 +2196,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2333,3 +2488,4 @@ SceneRoots: - {fileID: 2104636342} - {fileID: 1279373909} - {fileID: 1530222078} + - {fileID: 581151641} diff --git a/Assets/Scripts/BackgroundMusic.cs b/Assets/Scripts/BackgroundMusic.cs new file mode 100644 index 0000000..21bf987 --- /dev/null +++ b/Assets/Scripts/BackgroundMusic.cs @@ -0,0 +1,12 @@ +using UnityEngine; + +namespace InterfaceOff.MainMenu +{ + public class BackgroundMusic : MonoBehaviour + { + private void Start() + { + DontDestroyOnLoad(gameObject); + } + } +} diff --git a/Assets/Scripts/BackgroundMusic.cs.meta b/Assets/Scripts/BackgroundMusic.cs.meta new file mode 100644 index 0000000..7b4622c --- /dev/null +++ b/Assets/Scripts/BackgroundMusic.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a54fafe58853b204da37b60f25743c6a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DifficultyManager.cs b/Assets/Scripts/DifficultyManager.cs new file mode 100644 index 0000000..321af97 --- /dev/null +++ b/Assets/Scripts/DifficultyManager.cs @@ -0,0 +1,20 @@ +using UnityEngine.UI; +using UnityEngine; + +namespace InterfaceOff.MainMenu +{ + public class DifficultyManager : MonoBehaviour + { + public static float DifficultyMultiplier { get; private set; } = 1; + [SerializeField] private Slider DifficultySlider; + + private void Awake() + { + DifficultySlider.onValueChanged.AddListener((val) => + { + DifficultyMultiplier = val / 4f; // Makes it between 0.75 and 1.25 + Debug.Log("Difficulty Slider: " + DifficultyMultiplier); + }); + } + } +} diff --git a/Assets/Scripts/DifficultyManager.cs.meta b/Assets/Scripts/DifficultyManager.cs.meta new file mode 100644 index 0000000..03e77ce --- /dev/null +++ b/Assets/Scripts/DifficultyManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 985fe7203793456f84cbf0526b831a3a +timeCreated: 1769122965 \ No newline at end of file