diff --git a/Assets/Animations/Dragonfly/Dragonfly Sprite Sheet_0.controller b/Assets/Animations/Dragonfly/Dragonfly Sprite Sheet_0.controller index e36fd94..14c9db5 100644 --- a/Assets/Animations/Dragonfly/Dragonfly Sprite Sheet_0.controller +++ b/Assets/Animations/Dragonfly/Dragonfly Sprite Sheet_0.controller @@ -11,7 +11,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2145833296484662918} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 290, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4517665047112255071} + m_Position: {x: 400, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -22,6 +25,31 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2145833296484662918} +--- !u!1101 &-5973128873523817582 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4517665047112255071} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2145833296484662918 AnimatorState: serializedVersion: 6 @@ -32,7 +60,8 @@ AnimatorState: m_Name: dragonfly m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -5973128873523817582} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -56,7 +85,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Dragonfly Sprite Sheet_0 serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -70,3 +105,29 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &4517665047112255071 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 61f4386..a01c178 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -182,6 +182,134 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2527928271762902999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2061348307210159591} + - component: {fileID: 5232671287789524908} + m_Layer: 2 + m_Name: Clarinet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2061348307210159591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2527928271762902999} + 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 &5232671287789524908 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2527928271762902999} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b78678700130e584aa9046e8a3e80767, 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 &3783570684438687829 GameObject: m_ObjectHideFlags: 0 @@ -352,6 +480,7 @@ Transform: - {fileID: 5885597207531562994} - {fileID: 5885597208269163161} - {fileID: 8868692928122851825} + - {fileID: 2061348307210159591} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -548,6 +677,7 @@ MonoBehaviour: playerInput: {fileID: 1407172087} launcher: {fileID: 6559806128767475056} hasTambourine: 1 + clarinetAudio: {fileID: 5232671287789524908} dashForce: 50 dashTime: 1 reflectForce: 2 diff --git a/Assets/SFX/clarinet bite.mp3 b/Assets/SFX/clarinet bite.mp3 new file mode 100644 index 0000000..aac5139 Binary files /dev/null and b/Assets/SFX/clarinet bite.mp3 differ diff --git a/Assets/SFX/clarinet bite.mp3.meta b/Assets/SFX/clarinet bite.mp3.meta new file mode 100644 index 0000000..167061e --- /dev/null +++ b/Assets/SFX/clarinet bite.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b78678700130e584aa9046e8a3e80767 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SFX/fato_shadow_-_wild_land.mp3 b/Assets/SFX/fato_shadow_-_wild_land.mp3 new file mode 100644 index 0000000..049cf68 Binary files /dev/null and b/Assets/SFX/fato_shadow_-_wild_land.mp3 differ diff --git a/Assets/SFX/fato_shadow_-_wild_land.mp3.meta b/Assets/SFX/fato_shadow_-_wild_land.mp3.meta new file mode 100644 index 0000000..b163a10 --- /dev/null +++ b/Assets/SFX/fato_shadow_-_wild_land.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 13f7b7438f6750943a6af2957316d7db +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ClarinetScene.unity b/Assets/Scenes/ClarinetScene.unity index 4798f72..dfd3dd7 100644 --- a/Assets/Scenes/ClarinetScene.unity +++ b/Assets/Scenes/ClarinetScene.unity @@ -60954,36 +60954,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -2, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 11 - m_TileSpriteIndex: 11 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -1, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 14 - m_TileSpriteIndex: 14 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 0, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 12 - m_TileSpriteIndex: 12 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 5, y: -15, z: 0} second: serializedVersion: 2 @@ -64464,7 +64434,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -11, y: -11, z: 0} + - first: {x: -9, y: -11, z: 0} second: serializedVersion: 2 m_TileIndex: 11 @@ -64474,7 +64444,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -10, y: -11, z: 0} + - first: {x: -8, y: -11, z: 0} second: serializedVersion: 2 m_TileIndex: 14 @@ -64484,7 +64454,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -9, y: -11, z: 0} + - first: {x: -7, y: -11, z: 0} second: serializedVersion: 2 m_TileIndex: 12 @@ -127598,13 +127568,13 @@ Tilemap: m_Data: {fileID: 11400000, guid: 5478e85db4ae08b46a3910b403fe80c4, type: 2} - m_RefCount: 30 m_Data: {fileID: 11400000, guid: 45175e3d4466c674fb6c13ca38ce840f, type: 2} - - m_RefCount: 13 + - m_RefCount: 12 m_Data: {fileID: 11400000, guid: f0167dfba7d78444ba833f64ca4007d2, type: 2} - - m_RefCount: 14 + - m_RefCount: 13 m_Data: {fileID: 11400000, guid: 2fd777b86deeec247bf3576fbd149d00, type: 2} - m_RefCount: 46 m_Data: {fileID: 11400000, guid: 798041ec2cd3c584bab050019dc27b84, type: 2} - - m_RefCount: 60 + - m_RefCount: 59 m_Data: {fileID: 11400000, guid: 52a05c9a292a7cb4999c15d18c3f0f30, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -127847,13 +127817,13 @@ Tilemap: m_Data: {fileID: 1729167117, guid: 5d712e80103d05a418217f3452dcd570, type: 3} - m_RefCount: 12 m_Data: {fileID: -717821893, guid: 5d712e80103d05a418217f3452dcd570, type: 3} - - m_RefCount: 13 + - m_RefCount: 12 m_Data: {fileID: 1877226299, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} - - m_RefCount: 14 + - m_RefCount: 13 m_Data: {fileID: 967020061, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} - m_RefCount: 46 m_Data: {fileID: -1084513563, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} - - m_RefCount: 60 + - m_RefCount: 59 m_Data: {fileID: -776105136, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} - m_RefCount: 11 m_Data: {fileID: -1115023906, guid: 5d712e80103d05a418217f3452dcd570, type: 3} @@ -128074,7 +128044,7 @@ Tilemap: - m_RefCount: 5 m_Data: {fileID: 1430899303, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3} m_TileMatrixArray: - - m_RefCount: 10969 + - m_RefCount: 10966 m_Data: e00: 1 e01: 0 @@ -128111,7 +128081,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 11938 + - m_RefCount: 11935 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -128264,22 +128234,14 @@ CompositeCollider2D: Y: -70000000 - X: -150000000 Y: -70000000 - - - X: -80000000 + - - X: -60000000 Y: -100000000 - - X: -110000000 + - X: -90000000 Y: -100000000 - - X: -110000000 + - X: -90000000 Y: -110000000 - - X: -80000000 + - X: -60000000 Y: -110000000 - - - X: 10000000 - Y: -140000000 - - X: -20000000 - Y: -140000000 - - X: -20000000 - Y: -150000000 - - X: 10000000 - Y: -150000000 - - X: -119670480 Y: -259963648 - X: -119670480 @@ -129226,14 +129188,10 @@ CompositeCollider2D: - {x: -18, y: -6} - {x: -18, y: -7} - {x: -15, y: -7} - - - {x: -8, y: -10} - - {x: -11, y: -10} - - {x: -11, y: -11} - - {x: -8, y: -11} - - - {x: 1, y: -14} - - {x: -2, y: -14} - - {x: -2, y: -15} - - {x: 1, y: -15} + - - {x: -6, y: -10} + - {x: -9, y: -10} + - {x: -9, y: -11} + - {x: -6, y: -11} - - {x: -11.967048, y: -25.996365} - {x: -11.967048, y: -25.948069} - {x: -11.998298, y: -25.948069} @@ -129662,9 +129620,9 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 9567c15965a4246e0bd2f434e2d6fac6, type: 3} + m_audioClip: {fileID: 8300000, guid: 13f7b7438f6750943a6af2957316d7db, type: 3} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.394 m_Pitch: 1 Loop: 1 Mute: 0 diff --git a/Assets/Scenes/TransitionToClarinet.unity b/Assets/Scenes/TransitionToClarinet.unity index 2574e9a..7b988a0 100644 --- a/Assets/Scenes/TransitionToClarinet.unity +++ b/Assets/Scenes/TransitionToClarinet.unity @@ -920,8 +920,7 @@ MonoBehaviour: - The musician dashed and he dived with glorious pomp, - making his way through the weedy Reed Swamp. - You found the clarinet! - - Press [ACTION] to Clarinet Dash at a downwards angle in the direction you're - facing. + - Press 'J' to Clarinet Dash at a downwards angle in the direction you're facing. - If you hit water, you'll be launched back up! - (This level was built by Max.) backgroundImageObject: {fileID: 619461775} diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index 4559e4b..c13c40d 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -18,6 +18,7 @@ public class PlayerBehavior : MonoBehaviour bool unlockedTambourine; [Header("Clarinet:")] + [SerializeField] AudioSource clarinetAudio; bool unlockedClarinet; // things for dash private bool isDash = false; @@ -107,6 +108,7 @@ public class PlayerBehavior : MonoBehaviour this.gameUI.ToggleClarinet(false); playerInput.DeactivateInput(); currentDash = 0.0f; + clarinetAudio.Play(); } if (!playerController.IsGrounded() && isDash && (currentDash < dashTime)) {