diff --git a/Assets/Audio/Audio Mixer.mixer b/Assets/Audio/Audio Mixer.mixer index 4033f3b..997c891 100644 --- a/Assets/Audio/Audio Mixer.mixer +++ b/Assets/Audio/Audio Mixer.mixer @@ -118,6 +118,7 @@ AudioMixerController: - 88391c573bd80364c916040d855538c8 - 08116dbf9979b7b4d8fcce772ec5ebfc - dd1cda19a45ef294d8789a2af47afcf7 + - fcd09f92e84dbb2498492d6cb9c06bcd name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -135,6 +136,7 @@ AudioMixerGroupController: - {fileID: 8913006207396984383} - {fileID: 8377903610078173799} - {fileID: 6090405236815604520} + - {fileID: 1886016463503660043} m_Volume: c8ed3e32c19202b4daadc5c4fb90bf76 m_Pitch: d51ab31c176e6894b94b24c01f74415f m_Send: 00000000000000000000000000000000 @@ -169,6 +171,39 @@ AudioMixerSnapshotController: m_SnapshotID: 7b03920a55d36f54bac08488dc018422 m_FloatValues: {} m_TransitionOverrides: {} +--- !u!244 &1458683330471287751 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 2802c218d021aa04e94940948b9d3dde + m_EffectName: Attenuation + m_MixLevel: 87eb38c321ae49142b2fc2d43dfce495 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &1886016463503660043 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Clop + m_AudioMixer: {fileID: 24100000} + m_GroupID: fcd09f92e84dbb2498492d6cb9c06bcd + m_Children: [] + m_Volume: 9675209fe2317fa4cb02bced339e8d4b + m_Pitch: 1ef3a313dcc3eff4fba86b5f3eb3b843 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 1458683330471287751} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!243 &6090405236815604520 AudioMixerGroupController: m_ObjectHideFlags: 0 diff --git a/Assets/Audio/Sound Effects/Clop.bfxrsound b/Assets/Audio/Sound Effects/Clop.bfxrsound new file mode 100644 index 0000000..50fb8d3 --- /dev/null +++ b/Assets/Audio/Sound Effects/Clop.bfxrsound @@ -0,0 +1 @@ +,0.5,,0.0901,,0.2498,0.3,0.2919,,-0.6712,,,,,,,,,,,0.4206,,,,,1,,,0.1487,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Clop.bfxrsound.meta b/Assets/Audio/Sound Effects/Clop.bfxrsound.meta new file mode 100644 index 0000000..3348ef6 --- /dev/null +++ b/Assets/Audio/Sound Effects/Clop.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 66a6d450d7a80bc40b3c64aaf822eb46 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Clop.wav b/Assets/Audio/Sound Effects/Clop.wav new file mode 100644 index 0000000..8be2a99 Binary files /dev/null and b/Assets/Audio/Sound Effects/Clop.wav differ diff --git a/Assets/Audio/Sound Effects/Clop.wav.meta b/Assets/Audio/Sound Effects/Clop.wav.meta new file mode 100644 index 0000000..5b6737b --- /dev/null +++ b/Assets/Audio/Sound Effects/Clop.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 50715873a7ff4e84fb1c97a17d103041 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Playable/Player.prefab b/Assets/Resources/Playable/Player.prefab index ba7e2eb..574c5db 100644 --- a/Assets/Resources/Playable/Player.prefab +++ b/Assets/Resources/Playable/Player.prefab @@ -141,6 +141,147 @@ MonoBehaviour: layerMask: serializedVersion: 2 m_Bits: 4294966912 +--- !u!1 &4589051977042145238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9160346695589866520} + - component: {fileID: 2507938332080685619} + - component: {fileID: 9191810358152476728} + m_Layer: 6 + m_Name: Clop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9160346695589866520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4589051977042145238} + 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: 7008207192594766311} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2507938332080685619 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4589051977042145238} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 1886016463503660043, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: 50715873a7ff4e84fb1c97a17d103041, 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!114 &9191810358152476728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4589051977042145238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7cadde1ece49514692994af78ed765e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7008207192594766305 GameObject: m_ObjectHideFlags: 0 @@ -181,6 +322,7 @@ Transform: - {fileID: 2083070161} - {fileID: 5380164631756810673} - {fileID: 5932034958742124507} + - {fileID: 9160346695589866520} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Player/Clop.cs b/Assets/Scripts/Player/Clop.cs new file mode 100644 index 0000000..1b88635 --- /dev/null +++ b/Assets/Scripts/Player/Clop.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +namespace Player +{ + public class Clop : MonoBehaviour + { + private AudioSource audioSource = null; + + private void Start() => audioSource = GetComponent(); + + public void PlayClop() => audioSource.Play(); + } +} diff --git a/Assets/Scripts/Player/Clop.cs.meta b/Assets/Scripts/Player/Clop.cs.meta new file mode 100644 index 0000000..92d1bfb --- /dev/null +++ b/Assets/Scripts/Player/Clop.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c7cadde1ece49514692994af78ed765e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 69f1cb1..81e6ade 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -50,6 +50,7 @@ namespace Player private const string IsWalledParameter = "IsWalled"; private Animator animator = null; private Death death = null; + private Clop clop = null; private CollisionChecker enemyTrigger = null; private void Awake() @@ -77,6 +78,7 @@ namespace Player animator = GetComponent(); audioSource = GetComponent(); death = transform.Find("Death").gameObject.GetComponent(); + clop = transform.Find("Clop").gameObject.GetComponent(); enemyTrigger = GameObject.Find("Enemy Trigger").GetComponent(); BaseSpeed = 0.0f; @@ -288,5 +290,7 @@ namespace Player Left = -1, Right = 1 } + + public void Clop() => clop.PlayClop(); } }