From 68d6c025c0565f8aa2c17f9d69ac6a0e382afa77 Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Thu, 18 Jun 2020 15:07:40 -0500 Subject: [PATCH] Fixed music manager --- Assets/Prefabs/Music Manager.prefab | 239 +++++++++++++++++++ Assets/Prefabs/Music Manager.prefab.meta | 7 + Assets/Scenes/Credits.unity | 121 +++++++++- Assets/Scenes/Ending.unity | 125 +++++++++- Assets/Scenes/Level 1.unity | 281 ++++++++++------------- Assets/Scenes/Level 2.unity | 133 ++++++++++- Assets/Scenes/Level 3.unity | 135 ++++++++++- Assets/Scenes/Menu.unity | 123 +++++++++- Assets/Scripts/MusicManager.cs | 32 ++- Assets/Scripts/MusicStarter.cs | 15 ++ Assets/Scripts/MusicStarter.cs.meta | 11 + ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/TagManager.asset | 1 + 13 files changed, 1033 insertions(+), 192 deletions(-) create mode 100644 Assets/Prefabs/Music Manager.prefab create mode 100644 Assets/Prefabs/Music Manager.prefab.meta create mode 100644 Assets/Scripts/MusicStarter.cs create mode 100644 Assets/Scripts/MusicStarter.cs.meta diff --git a/Assets/Prefabs/Music Manager.prefab b/Assets/Prefabs/Music Manager.prefab new file mode 100644 index 0000000..40236e2 --- /dev/null +++ b/Assets/Prefabs/Music Manager.prefab @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3091414913033157603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3091414913033157601} + - component: {fileID: 3091414913033157600} + - component: {fileID: 3091414913033157607} + - component: {fileID: 3091414913033157606} + m_Layer: 0 + m_Name: Music Manager + m_TagString: MusicManager + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3091414913033157601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091414913033157603} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.48254675, y: -0.23101182, z: -0.10147177} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3091414913033157600 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091414913033157603} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 70468d0f91cbb24408f26c930e0cfc35, type: 3} + m_PlayOnAwake: 0 + 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!82 &3091414913033157607 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091414913033157603} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: cc47eb2acc072a44e8f9f61bbcbdca03, type: 3} + m_PlayOnAwake: 0 + 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 &3091414913033157606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091414913033157603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce5793741daafbe45a02c213f0d6dbf4, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Music Manager.prefab.meta b/Assets/Prefabs/Music Manager.prefab.meta new file mode 100644 index 0000000..74cf1c5 --- /dev/null +++ b/Assets/Prefabs/Music Manager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 29bac345150ca1a498531f21dd86ad2f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity index e5240ba..623777b 100644 --- a/Assets/Scenes/Credits.unity +++ b/Assets/Scenes/Credits.unity @@ -121,6 +121,50 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &327323259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 327323261} + - component: {fileID: 327323260} + m_Layer: 0 + m_Name: Music For Current Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &327323260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327323259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} + m_Name: + m_EditorClassIdentifier: + songName: intro +--- !u!4 &327323261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327323259} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5560644, y: -0.3557315, z: -39.379753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &449727262 GameObject: m_ObjectHideFlags: 0 @@ -374,7 +418,7 @@ RectTransform: - {fileID: 1740473843} - {fileID: 1893969631} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -778,7 +822,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -885,6 +929,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1105412668} m_CullTransparentMesh: 0 +--- !u!1001 &1435372450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.48254675 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.23101182 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10147177 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157603, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_Name + value: Music Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} --- !u!1 &1579290644 GameObject: m_ObjectHideFlags: 0 @@ -949,7 +1062,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598451562 GameObject: @@ -1162,7 +1275,7 @@ RectTransform: m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/Ending.unity b/Assets/Scenes/Ending.unity index 2eddfe3..d07c55f 100644 --- a/Assets/Scenes/Ending.unity +++ b/Assets/Scenes/Ending.unity @@ -121,6 +121,50 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &431181846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 431181848} + - component: {fileID: 431181847} + m_Layer: 0 + m_Name: Music For Current Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &431181847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431181846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} + m_Name: + m_EditorClassIdentifier: + songName: intro +--- !u!4 &431181848 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431181846} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5560644, y: -0.3557315, z: -39.379753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &449727262 GameObject: m_ObjectHideFlags: 0 @@ -374,7 +418,7 @@ RectTransform: - {fileID: 449727263} - {fileID: 1827190587} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1089,7 +1133,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1123,6 +1167,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} +--- !u!1001 &1501736835 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.48254675 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.23101182 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10147177 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157603, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_Name + value: Music Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} --- !u!1 &1579290644 GameObject: m_ObjectHideFlags: 0 @@ -1187,7 +1300,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598451562 GameObject: @@ -1400,7 +1513,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1691,7 +1804,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2061767511 GameObject: @@ -1772,5 +1885,5 @@ Transform: m_LocalScale: {x: 1.25, y: 1.25, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 7def154..a2c1b04 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -121,6 +121,50 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &239339971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239339972} + - component: {fileID: 239339973} + m_Layer: 0 + m_Name: Music For Current Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &239339972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239339971} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5560644, y: -0.3557315, z: -39.379753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &239339973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239339971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} + m_Name: + m_EditorClassIdentifier: + songName: gameplay --- !u!1 &282580749 GameObject: m_ObjectHideFlags: 0 @@ -152,7 +196,7 @@ Transform: - {fileID: 478363580} - {fileID: 523298617} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} --- !u!114 &282580751 MonoBehaviour: @@ -198,7 +242,7 @@ Transform: - {fileID: 2146985681} - {fileID: 1514400053} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &366015756 PrefabInstance: @@ -260,7 +304,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -391,7 +435,7 @@ Transform: - {fileID: 890947062} - {fileID: 1842821947} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!114 &444980957 MonoBehaviour: @@ -869,7 +913,7 @@ Transform: - {fileID: 434058324} - {fileID: 671584866} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &754243053 MonoBehaviour: @@ -1102,7 +1146,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1191,7 +1235,7 @@ PrefabInstance: - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} @@ -1420,7 +1464,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1458,7 +1502,7 @@ Transform: - {fileID: 2006296177} - {fileID: 1825371832} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!114 &1334157778 MonoBehaviour: @@ -1504,7 +1548,7 @@ Transform: - {fileID: 2005052513} - {fileID: 932422688} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!1001 &1481662238 PrefabInstance: @@ -1551,7 +1595,7 @@ PrefabInstance: - target: {fileID: 6608704605082953974, guid: 3a846b0ac67e7be41a41756ed221d199, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6608704605082953974, guid: 3a846b0ac67e7be41a41756ed221d199, type: 3} @@ -1800,7 +1844,7 @@ PrefabInstance: - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} @@ -1849,7 +1893,7 @@ Transform: - {fileID: 1513283173} - {fileID: 2124803132} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1825371831 GameObject: @@ -2013,146 +2057,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1925040025 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1925040027} - - component: {fileID: 1925040026} - - component: {fileID: 1925040028} - m_Layer: 0 - m_Name: Music - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1925040026 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: cc47eb2acc072a44e8f9f61bbcbdca03, 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!4 &1925040027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.48254675, y: -0.23101182, z: -0.10147177} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1925040028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ce5793741daafbe45a02c213f0d6dbf4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2005052512 GameObject: m_ObjectHideFlags: 0 @@ -2490,6 +2394,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2146985680} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3091414914935454842 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.48254675 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.23101182 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10147177 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157603, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_Name + value: Music Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} --- !u!1001 &4683683891847250626 PrefabInstance: m_ObjectHideFlags: 0 @@ -2595,7 +2568,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index b5bcfdb..ef8c4ef 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -166,7 +166,7 @@ PrefabInstance: - target: {fileID: 7149257932277192581, guid: 06ab2b4ada2f33647914fdc25abfe4e8, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7149257932277192581, guid: 06ab2b4ada2f33647914fdc25abfe4e8, type: 3} @@ -190,6 +190,50 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06ab2b4ada2f33647914fdc25abfe4e8, type: 3} +--- !u!1 &358812317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 358812319} + - component: {fileID: 358812318} + m_Layer: 0 + m_Name: Music For Current Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &358812318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 358812317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} + m_Name: + m_EditorClassIdentifier: + songName: gameplay +--- !u!4 &358812319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 358812317} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5560644, y: -0.3557315, z: -39.379753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &366015756 PrefabInstance: m_ObjectHideFlags: 0 @@ -250,7 +294,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -389,7 +433,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -646,7 +690,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -806,7 +850,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -870,7 +914,7 @@ Transform: - {fileID: 1178508770} - {fileID: 1049886269} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113559007 GameObject: @@ -1082,7 +1126,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1215,7 +1259,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1359,8 +1403,77 @@ Transform: - {fileID: 1513283173} - {fileID: 511029264} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1755445790 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.48254675 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.23101182 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10147177 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157603, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_Name + value: Music Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} --- !u!1001 &4683683891847250626 PrefabInstance: m_ObjectHideFlags: 0 @@ -1466,7 +1579,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} diff --git a/Assets/Scenes/Level 3.unity b/Assets/Scenes/Level 3.unity index de76909..f5e6071 100644 --- a/Assets/Scenes/Level 3.unity +++ b/Assets/Scenes/Level 3.unity @@ -171,7 +171,7 @@ PrefabInstance: - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} @@ -220,7 +220,7 @@ Transform: - {fileID: 2146985681} - {fileID: 1923529196} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &366015756 PrefabInstance: @@ -282,7 +282,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -609,7 +609,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -633,6 +633,50 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} +--- !u!1 &1000478965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1000478967} + - component: {fileID: 1000478966} + m_Layer: 0 + m_Name: Music For Current Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1000478966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000478965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} + m_Name: + m_EditorClassIdentifier: + songName: gameplay +--- !u!4 &1000478967 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000478965} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5560644, y: -0.3557315, z: -39.379753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1049886268 GameObject: m_ObjectHideFlags: 0 @@ -769,7 +813,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -833,7 +877,7 @@ Transform: - {fileID: 1178508770} - {fileID: 1049886269} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113559007 GameObject: @@ -1045,7 +1089,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1223,6 +1267,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1513283172} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1571606731 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.48254675 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.23101182 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10147177 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157603, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_Name + value: Music Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} --- !u!1 &1679737207 GameObject: m_ObjectHideFlags: 0 @@ -1253,7 +1366,7 @@ Transform: - {fileID: 1513283173} - {fileID: 511029264} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1837026017 PrefabInstance: @@ -1300,7 +1413,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1599,7 +1712,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} @@ -1714,7 +1827,7 @@ PrefabInstance: - target: {fileID: 8928797943620973878, guid: 3db23c8a19a05e246a267c399c53aef1, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 8928797943620973878, guid: 3db23c8a19a05e246a267c399c53aef1, type: 3} diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index cf38002..cbbc629 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -121,6 +121,50 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &195546182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195546184} + - component: {fileID: 195546183} + m_Layer: 0 + m_Name: Music For Current Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &195546183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195546182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} + m_Name: + m_EditorClassIdentifier: + songName: intro +--- !u!4 &195546184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195546182} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5560644, y: -0.3557315, z: -39.379753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &449727262 GameObject: m_ObjectHideFlags: 0 @@ -373,7 +417,7 @@ RectTransform: - {fileID: 449727263} - {fileID: 1827190587} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -930,7 +974,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -964,6 +1008,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} +--- !u!1001 &1182397075 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.48254675 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.23101182 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10147177 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3091414913033157603, guid: 29bac345150ca1a498531f21dd86ad2f, + type: 3} + propertyPath: m_Name + value: Music Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} --- !u!1 &1579290644 GameObject: m_ObjectHideFlags: 0 @@ -1028,7 +1141,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598451562 GameObject: @@ -1241,7 +1354,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1617,7 +1730,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/MusicManager.cs b/Assets/Scripts/MusicManager.cs index 66fca54..67802c4 100644 --- a/Assets/Scripts/MusicManager.cs +++ b/Assets/Scripts/MusicManager.cs @@ -4,8 +4,38 @@ using UnityEngine; public class MusicManager : MonoBehaviour { + static MusicManager instance; + AudioSource intro; + AudioSource gameplay; + + void Start() + { + AudioSource[] audioSources = GetComponents(); + intro = audioSources[0]; + gameplay = audioSources[1]; + } + void Awake() { - DontDestroyOnLoad(transform.gameObject); + if (instance == null) + { + instance = this; + DontDestroyOnLoad(instance); + } + else Destroy(gameObject); + } + + public void PlaySong(string songName) + { + StopOtherSongs(songName); + + if (songName == "intro" && !intro.isPlaying) intro.Play(); + if (songName == "gameplay" && !gameplay.isPlaying) gameplay.Play(); + } + + public void StopOtherSongs(string currentSongName) + { + if (currentSongName != "intro") intro.Stop(); + if (currentSongName != "gameplay") gameplay.Stop(); } } diff --git a/Assets/Scripts/MusicStarter.cs b/Assets/Scripts/MusicStarter.cs new file mode 100644 index 0000000..681436f --- /dev/null +++ b/Assets/Scripts/MusicStarter.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MusicStarter : MonoBehaviour +{ + public string songName = "gameplay"; + + void Start() + { + GameObject.FindWithTag("MusicManager") + .GetComponent() + .PlaySong(songName); + } +} diff --git a/Assets/Scripts/MusicStarter.cs.meta b/Assets/Scripts/MusicStarter.cs.meta new file mode 100644 index 0000000..ea54fde --- /dev/null +++ b/Assets/Scripts/MusicStarter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 36c5616dcfbca1744ba871a542942097 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 15c5094..f65cf81 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -21,7 +21,7 @@ PlayerSettings: m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 - m_SplashScreenLogoStyle: 1 + m_SplashScreenLogoStyle: 0 m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1984411..ae54c32 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,6 +8,7 @@ TagManager: - Charge Counter - Mirror - Booster + - MusicManager layers: - Default - TransparentFX