From 6131bc7ca14a20e49eb77280d89367aa58764a84 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 5 May 2023 12:24:04 -0700 Subject: [PATCH] fixed cymbal bugs sound no longer breaks (separate game object for sound), ui updated --- .../Prefabs/CanvasObjects/GameUICanvas.prefab | 158 ++++++++++++++- Assets/Prefabs/Player.prefab | 138 ++++++++++++- Assets/Scenes/MushroomForest.unity | 183 +----------------- Assets/Scripts/GameUIController.cs | 8 +- Assets/Scripts/PlayerBehavior.cs | 9 +- 5 files changed, 306 insertions(+), 190 deletions(-) diff --git a/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab b/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab index 0cedde3..eb88f37 100644 --- a/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab +++ b/Assets/Prefabs/CanvasObjects/GameUICanvas.prefab @@ -152,6 +152,83 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2305921245815223353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5840169765278472452} + - component: {fileID: 6772587764896891210} + - component: {fileID: 3671381468871953629} + m_Layer: 5 + m_Name: cymbal_UI_background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5840169765278472452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305921245815223353} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5910219464959875507} + m_Father: {fileID: 1885684100209428912} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -298.1, y: -60} + m_SizeDelta: {x: 65, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6772587764896891210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305921245815223353} + m_CullTransparentMesh: 1 +--- !u!114 &3671381468871953629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305921245815223353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3054742311368020042 GameObject: m_ObjectHideFlags: 0 @@ -340,8 +417,9 @@ RectTransform: - {fileID: 6181971475657436876} - {fileID: 5229343399574233433} - {fileID: 1799174769135430456} + - {fileID: 5840169765278472452} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -426,9 +504,87 @@ MonoBehaviour: trumpetBackground: {fileID: 7831297615833552022} tambourineBackground: {fileID: 3054742311368020042} clarinetBackground: {fileID: 5459305458457057368} + cymbalBackground: {fileID: 2305921245815223353} trumpetUI: {fileID: 0} tambourineUI: {fileID: 0} clarinetUI: {fileID: 0} + cymbalUI: {fileID: 0} +--- !u!1 &5358556914587397967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5910219464959875507} + - component: {fileID: 589067814855411667} + - component: {fileID: 388723793013215972} + m_Layer: 5 + m_Name: cymbal_UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5910219464959875507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358556914587397967} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5840169765278472452} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32.5, y: -32.499992} + m_SizeDelta: {x: 61, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &589067814855411667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358556914587397967} + m_CullTransparentMesh: 1 +--- !u!114 &388723793013215972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358556914587397967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5459305458457057368 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 721d30f..de4038a 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -181,6 +181,134 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3783570684438687829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8868692928122851825} + - component: {fileID: 264629194984044240} + m_Layer: 2 + m_Name: Cymbal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8868692928122851825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3783570684438687829} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5885597207104481986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &264629194984044240 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3783570684438687829} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f37bef8154eaa8adcbf8a6527c653b0b, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + 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!1 &5885597207104481991 GameObject: m_ObjectHideFlags: 0 @@ -222,6 +350,7 @@ Transform: - {fileID: 5260309551442468847} - {fileID: 5885597207531562994} - {fileID: 5885597208269163161} + - {fileID: 8868692928122851825} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -418,15 +547,14 @@ MonoBehaviour: playerInput: {fileID: 1407172087} launcher: {fileID: 6559806128767475056} hasTambourine: 1 - maxDashTime: 3 - dashStopSpeed: 0.1 - moveDirection: {x: 0, y: 0, z: 0} - dashDistance: 0.2 isDash: 0 + bonk: 2 + isInWater: 0 + dashForce: 1.2 + cymbalAudio: {fileID: 264629194984044240} grapplingGun: {fileID: 3465910379319867675} grapplingRope: {fileID: 7648135587659148198} playerController: {fileID: 5559747613460074786} - stateController: {fileID: 0} playerIsAlive: 1 footstepSound: {fileID: 8300000, guid: 229b1f1bff3f442ef84c0c9b767dda07, type: 3} deathSound: {fileID: 8300000, guid: 3498b07b14bc248cdbc50aa434f962c2, type: 3} diff --git a/Assets/Scenes/MushroomForest.unity b/Assets/Scenes/MushroomForest.unity index 3eae1d0..fdddf10 100644 --- a/Assets/Scenes/MushroomForest.unity +++ b/Assets/Scenes/MushroomForest.unity @@ -1166,27 +1166,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4599587890505526274, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} - propertyPath: cymbalBackground - value: - objectReference: {fileID: 1012187118} - target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} propertyPath: m_Name value: GameUICanvas objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} - insertIndex: -1 - addedObject: {fileID: 1012187119} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} ---- !u!224 &404810524 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} - m_PrefabInstance: {fileID: 404810523} - m_PrefabAsset: {fileID: 0} --- !u!1 &440397384 GameObject: m_ObjectHideFlags: 0 @@ -1768,83 +1756,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} ---- !u!1 &1012187118 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1012187119} - - component: {fileID: 1012187121} - - component: {fileID: 1012187120} - m_Layer: 5 - m_Name: cymbal_UI_background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1012187119 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012187118} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1249842840} - m_Father: {fileID: 404810524} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -298.1, y: -60} - m_SizeDelta: {x: 65, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1012187120 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012187118} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1012187121 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012187118} - m_CullTransparentMesh: 1 --- !u!1 &1053911357 GameObject: m_ObjectHideFlags: 0 @@ -5542,82 +5453,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1249842839 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1249842840} - - component: {fileID: 1249842842} - - component: {fileID: 1249842841} - m_Layer: 5 - m_Name: cymbal_UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1249842840 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1249842839} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1012187119} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -32.5, y: -32.499992} - m_SizeDelta: {x: 61, y: 61} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1249842841 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1249842839} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1249842842 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1249842839} - m_CullTransparentMesh: 1 --- !u!1001 &1253957776 PrefabInstance: m_ObjectHideFlags: 0 @@ -5691,10 +5526,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3893791749692807526, guid: 576d3fc87874f426294e4bbacb171478, type: 3} - propertyPath: cymbalSound - value: - objectReference: {fileID: 8300000, guid: f37bef8154eaa8adcbf8a6527c653b0b, type: 3} - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3} propertyPath: m_RootOrder value: 6 @@ -9125,7 +8956,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 63 - m_TileSpriteIndex: 46 + m_TileSpriteIndex: 47 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -9145,7 +8976,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 57 - m_TileSpriteIndex: 45 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -9205,7 +9036,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 56 - m_TileSpriteIndex: 44 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -9225,7 +9056,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 55 - m_TileSpriteIndex: 43 + m_TileSpriteIndex: 44 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -9480,6 +9311,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 1924854431, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3} - m_RefCount: 1 @@ -9488,8 +9321,6 @@ Tilemap: m_Data: {fileID: 403321508, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3} - m_RefCount: 1 m_Data: {fileID: 764218110, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -2110219687, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3} - m_RefCount: 1 diff --git a/Assets/Scripts/GameUIController.cs b/Assets/Scripts/GameUIController.cs index d026bfc..ed83f99 100644 --- a/Assets/Scripts/GameUIController.cs +++ b/Assets/Scripts/GameUIController.cs @@ -59,12 +59,12 @@ public class GameUIController : MonoBehaviour } } - public void ToggleCymbal(bool desiredState) + public void ToggleCymbal(bool toggleState) { - bool curEnabled = clarinetUI.GetComponent().enabled; - if (curEnabled != desiredState) + bool curEnabled = cymbalUI.GetComponent().enabled; + if (curEnabled != toggleState) { - cymbalUI.GetComponent().enabled = desiredState; + cymbalUI.GetComponent().enabled = toggleState; } } diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index 973c2d8..a626542 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -33,6 +33,7 @@ public class PlayerBehavior : MonoBehaviour [Header("Cymbals:")] private float cymbalActiveTime = 0f; + [SerializeField] AudioSource cymbalAudio; [Header("Grappling:")] [SerializeField] public Tutorial_GrapplingGun grapplingGun; @@ -49,7 +50,6 @@ public class PlayerBehavior : MonoBehaviour [Header("Sound")] [SerializeField] public AudioClip footstepSound; [SerializeField] public AudioClip deathSound; - [SerializeField] public AudioClip cymbalSound; AudioSource audioSource; @@ -152,9 +152,10 @@ public class PlayerBehavior : MonoBehaviour { // Play the sound this.gameUI.ToggleCymbal(false); - this.audioSource.clip = cymbalSound; - this.audioSource.loop = false; - this.audioSource.Play(); + // this.audioSource.clip = cymbalSound; + // this.audioSource.loop = false; + // this.audioSource.Play(); + cymbalAudio.Play(); // Set the cymbal active for the equivalent of one second this.cymbalActiveTime = 1;