From e7b4604451819b926eceba643833a46feb4c802f Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Fri, 19 Jun 2020 08:44:31 -0500 Subject: [PATCH] Gameplay music starts once and never stops --- Assets/Scenes/Credits.unity | 121 +-------------------- Assets/Scenes/Ending.unity | 126 ++-------------------- Assets/Scenes/Level 1.unity | 96 +++-------------- Assets/Scenes/Level 2.unity | 133 ++--------------------- Assets/Scenes/Level 3.unity | 136 ++--------------------- Assets/Scenes/Level 4.unity | 191 ++++----------------------------- Assets/Scenes/Level 5.unity | 128 ++-------------------- Assets/Scenes/Menu.unity | 7 +- Assets/Scripts/MusicManager.cs | 19 ++-- Assets/Scripts/MusicStarter.cs | 8 +- 10 files changed, 86 insertions(+), 879 deletions(-) diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity index a128881..2683a6f 100644 --- a/Assets/Scenes/Credits.unity +++ b/Assets/Scenes/Credits.unity @@ -121,50 +121,6 @@ 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 @@ -418,7 +374,7 @@ RectTransform: - {fileID: 1740473843} - {fileID: 1893969631} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -822,7 +778,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -929,75 +885,6 @@ 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 @@ -1062,7 +949,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598451562 GameObject: @@ -1275,7 +1162,7 @@ RectTransform: m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 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 b7f2bf8..7e207c1 100644 --- a/Assets/Scenes/Ending.unity +++ b/Assets/Scenes/Ending.unity @@ -121,51 +121,6 @@ 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: gameplay - delay: 0 ---- !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 @@ -419,7 +374,7 @@ RectTransform: - {fileID: 449727263} - {fileID: 1827190587} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1134,7 +1089,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1197,7 +1152,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1092080714 AudioSource: @@ -1295,75 +1250,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !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 @@ -1428,7 +1314,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598451562 GameObject: @@ -1641,7 +1527,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1886,5 +1772,5 @@ Transform: m_LocalScale: {x: 1.25, y: 1.25, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index b3a8540..c9a6dc3 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -331,7 +331,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -349,7 +349,7 @@ GameObject: - component: {fileID: 239339972} - component: {fileID: 239339973} m_Layer: 0 - m_Name: Music For Current Scene + m_Name: Play Next Song m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -381,8 +381,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} m_Name: m_EditorClassIdentifier: - songName: gameplay - delay: 0 + beginGameplayMusic: 1 --- !u!1 &297843864 GameObject: m_ObjectHideFlags: 0 @@ -413,7 +412,7 @@ Transform: - {fileID: 2146985681} - {fileID: 1514400053} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &366015756 PrefabInstance: @@ -475,7 +474,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -732,7 +731,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -887,7 +886,7 @@ PrefabInstance: - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} @@ -1116,7 +1115,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1153,7 +1152,7 @@ Transform: - {fileID: 2005052513} - {fileID: 932422688} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!1001 &1481662238 PrefabInstance: @@ -1200,7 +1199,7 @@ PrefabInstance: - target: {fileID: 6608704605082953974, guid: 3a846b0ac67e7be41a41756ed221d199, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6608704605082953974, guid: 3a846b0ac67e7be41a41756ed221d199, type: 3} @@ -1449,7 +1448,7 @@ PrefabInstance: - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} @@ -1498,7 +1497,7 @@ Transform: - {fileID: 1513283173} - {fileID: 2124803132} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2005052512 GameObject: @@ -1756,75 +1755,6 @@ 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 @@ -1930,7 +1860,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 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 d73d7e4..abebd14 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: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7149257932277192581, guid: 06ab2b4ada2f33647914fdc25abfe4e8, type: 3} @@ -190,50 +190,6 @@ 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 @@ -294,7 +250,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -433,7 +389,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -690,7 +646,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -825,7 +781,7 @@ Transform: - {fileID: 1178508770} - {fileID: 1049886269} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113559007 GameObject: @@ -1037,7 +993,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1170,7 +1126,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 8 + value: 6 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1314,77 +1270,8 @@ Transform: - {fileID: 1513283173} - {fileID: 511029264} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 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 &1763892216 PrefabInstance: m_ObjectHideFlags: 0 @@ -1435,7 +1322,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1559,7 +1446,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 2 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 9285e15..0aa2629 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: 3 + value: 1 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: 8 + m_RootOrder: 6 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: 5 + value: 3 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: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -633,51 +633,6 @@ 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 - delay: 0 ---- !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 @@ -789,7 +744,7 @@ Transform: - {fileID: 1178508770} - {fileID: 1049886269} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113559007 GameObject: @@ -1001,7 +956,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1058,7 +1013,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 13 + value: 11 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1248,75 +1203,6 @@ 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 @@ -1347,7 +1233,7 @@ Transform: - {fileID: 1513283173} - {fileID: 511029264} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1837026017 PrefabInstance: @@ -1394,7 +1280,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1688,7 +1574,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} @@ -1803,7 +1689,7 @@ PrefabInstance: - target: {fileID: 8928797943620973878, guid: 3db23c8a19a05e246a267c399c53aef1, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8928797943620973878, guid: 3db23c8a19a05e246a267c399c53aef1, type: 3} diff --git a/Assets/Scenes/Level 4.unity b/Assets/Scenes/Level 4.unity index 9405be8..56e2b21 100644 --- a/Assets/Scenes/Level 4.unity +++ b/Assets/Scenes/Level 4.unity @@ -211,90 +211,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 142890844} m_PrefabAsset: {fileID: 0} ---- !u!1001 &163150392 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.94 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.y - value: 2.66 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalScale.x - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalScale.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalScale.z - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505599, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_Name - value: Mirror - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} --- !u!1001 &213948448 PrefabInstance: m_ObjectHideFlags: 0 @@ -340,7 +256,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 15 + value: 13 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -409,7 +325,7 @@ Transform: - {fileID: 2146985681} - {fileID: 662913369} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &349887080 PrefabInstance: @@ -894,7 +810,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -958,7 +874,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 13 + value: 11 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1040,7 +956,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1076679790 GameObject: @@ -1072,7 +988,7 @@ Transform: - {fileID: 349887081} - {fileID: 1997026893} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1093635589 PrefabInstance: @@ -1119,7 +1035,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 17 + value: 15 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1203,7 +1119,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1272,7 +1188,7 @@ Transform: - {fileID: 142890845} - {fileID: 434478194} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1140517022 PrefabInstance: @@ -1319,7 +1235,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 20 + value: 18 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1408,7 +1324,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 21 + value: 19 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1532,7 +1448,7 @@ Transform: - {fileID: 1330448517} - {fileID: 2060194338} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1330448516 PrefabInstance: @@ -1669,7 +1585,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1798,75 +1714,6 @@ 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: 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 &1679737207 GameObject: m_ObjectHideFlags: 0 @@ -1897,7 +1744,7 @@ Transform: - {fileID: 1513283173} - {fileID: 1174959821} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1751774589 PrefabInstance: @@ -1954,7 +1801,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -2018,7 +1865,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 14 + value: 12 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -2102,7 +1949,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 19 + value: 17 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -2186,7 +2033,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 16 + value: 14 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -2570,7 +2417,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} diff --git a/Assets/Scenes/Level 5.unity b/Assets/Scenes/Level 5.unity index aa8e091..9c2b217 100644 --- a/Assets/Scenes/Level 5.unity +++ b/Assets/Scenes/Level 5.unity @@ -405,7 +405,7 @@ Transform: - {fileID: 2146985681} - {fileID: 662913369} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &302033993 PrefabInstance: @@ -1171,51 +1171,6 @@ 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 - delay: 0 ---- !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: 18 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1056888295 PrefabInstance: m_ObjectHideFlags: 0 @@ -1320,7 +1275,7 @@ Transform: - {fileID: 349887081} - {fileID: 1790126600} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1097003962 PrefabInstance: @@ -1421,7 +1376,7 @@ Transform: - {fileID: 142890845} - {fileID: 434478194} m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1169655797 PrefabInstance: @@ -1473,7 +1428,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 24 + value: 22 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1597,7 +1552,7 @@ Transform: - {fileID: 271884594} - {fileID: 2040330264} m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1200625941 PrefabInstance: @@ -2025,75 +1980,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} ---- !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: 16 - 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 &1585853960 PrefabInstance: m_ObjectHideFlags: 0 @@ -2208,7 +2094,7 @@ Transform: - {fileID: 1513283173} - {fileID: 1174959821} m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1730442185 PrefabInstance: @@ -2802,7 +2688,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 88585b2..53220e4 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -132,7 +132,7 @@ GameObject: - component: {fileID: 195546184} - component: {fileID: 195546183} m_Layer: 0 - m_Name: Music For Current Scene + m_Name: Play Next Song m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -150,7 +150,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 36c5616dcfbca1744ba871a542942097, type: 3} m_Name: m_EditorClassIdentifier: - songName: intro --- !u!4 &195546184 Transform: m_ObjectHideFlags: 0 @@ -163,7 +162,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &449727262 GameObject: @@ -1053,7 +1052,7 @@ PrefabInstance: - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3091414913033157601, guid: 29bac345150ca1a498531f21dd86ad2f, type: 3} diff --git a/Assets/Scripts/MusicManager.cs b/Assets/Scripts/MusicManager.cs index d8a9768..8228eac 100644 --- a/Assets/Scripts/MusicManager.cs +++ b/Assets/Scripts/MusicManager.cs @@ -5,6 +5,7 @@ using UnityEngine; public class MusicManager : MonoBehaviour { static MusicManager instance; + bool gameStarted = false; AudioSource intro; AudioSource gameplay; @@ -25,15 +26,17 @@ public class MusicManager : MonoBehaviour else Destroy(gameObject); } - public void PlaySong(string songName) + public void PlayNextSong(bool beginGameplayMusic) { - if (songName == "intro" && !intro.isPlaying) intro.Play(); - if (songName == "gameplay" && !gameplay.isPlaying) gameplay.Play(); - } + if (beginGameplayMusic) gameStarted = true; + if (gameStarted) + { - public void StopOtherSongs(string currentSongName = "") - { - if (currentSongName != "intro") intro.Stop(); - if (currentSongName != "gameplay") gameplay.Stop(); + if (intro.isPlaying) + { + intro.Stop(); + gameplay.Play(); + } + } else if (!intro.isPlaying) intro.Play(); } } diff --git a/Assets/Scripts/MusicStarter.cs b/Assets/Scripts/MusicStarter.cs index e259b28..f1fad25 100644 --- a/Assets/Scripts/MusicStarter.cs +++ b/Assets/Scripts/MusicStarter.cs @@ -5,9 +5,7 @@ using UnityEngine; public class MusicStarter : MonoBehaviour { - public string songName = "gameplay"; - public int delay = 0; - + public bool beginGameplayMusic = false; int delayForSetup = 250; void Start() @@ -19,8 +17,6 @@ public class MusicStarter : MonoBehaviour { await Task.Delay(delayForSetup); MusicManager m = GameObject.FindWithTag("MusicManager").GetComponent(); - m.StopOtherSongs(songName); - await Task.Delay(delay); - m.PlaySong(songName); + m.PlayNextSong(beginGameplayMusic); } }