diff --git a/Assets/Code/Gameplay/Enemies/BasicEnemy.cs b/Assets/Code/Gameplay/Enemies/BasicEnemy.cs index a513c63..7b987b1 100644 --- a/Assets/Code/Gameplay/Enemies/BasicEnemy.cs +++ b/Assets/Code/Gameplay/Enemies/BasicEnemy.cs @@ -16,13 +16,18 @@ namespace Code.Gameplay.Enemies [SerializeField] private float _blinkDuration = 0.2f; [SerializeField] private Color _hitColor = Color.red; + [SerializeField] private AudioSource _audioSource; + private Color _originalColor; private Vector3 _startPosition; private bool _facingRight = true; + + private AudioClip _deathClip; private void Start() { + _deathClip = Resources.Load("Audio/SFX/BirdDeathSFX"); _startPosition = transform.position; } @@ -93,6 +98,7 @@ namespace Code.Gameplay.Enemies private void Die() { + _audioSource.PlayOneShot(_deathClip); Destroy(gameObject); } } diff --git a/Assets/Code/Gameplay/Player/PlayerHealth.cs b/Assets/Code/Gameplay/Player/PlayerHealth.cs index 44a5085..b523d96 100644 --- a/Assets/Code/Gameplay/Player/PlayerHealth.cs +++ b/Assets/Code/Gameplay/Player/PlayerHealth.cs @@ -27,6 +27,7 @@ namespace Code.Gameplay.Player public float nextAttackTime => _lastAttackTime + _attackCooldown; private AudioClip _attackClip; + private AudioClip _damageClip; public event Action OnHealthChanged; public event Action OnDied; @@ -39,6 +40,7 @@ namespace Code.Gameplay.Player private void Start() { _attackClip = Resources.Load("Audio/SFX/AttackSFX"); + _damageClip = Resources.Load("Audio/SFX/DamageSFX"); _currentHealth = _maxHealth; OnHealthChanged?.Invoke(_currentHealth); } @@ -59,6 +61,7 @@ namespace Code.Gameplay.Player _currentHealth -= _damageFromEnemy; OnHealthChanged?.Invoke(_currentHealth); OnTookDamage?.Invoke(); + audioSource.PlayOneShot(_damageClip); if (_currentHealth <= 0) { diff --git a/Assets/Code/Gameplay/Player/PlayerMovement.cs b/Assets/Code/Gameplay/Player/PlayerMovement.cs index f0b06ec..8a1fdee 100644 --- a/Assets/Code/Gameplay/Player/PlayerMovement.cs +++ b/Assets/Code/Gameplay/Player/PlayerMovement.cs @@ -23,7 +23,8 @@ namespace Code.Gameplay.Player [SerializeField] private float _jumpDuration = 0.5f; [SerializeField] private float _sprintPitchMultiplier = 1.2f; - [SerializeField] private AudioSource audioSource; + [SerializeField] private AudioSource walkAudioSource; + [SerializeField] private AudioSource jumpAudioSource; private IInputService _input; private bool _isJumping; @@ -38,8 +39,6 @@ namespace Code.Gameplay.Player private AudioClip _jumpClip; private AudioClip _walkClip; - - private bool _wasMovingLastFrame; public bool isGrounded { get; private set; } @@ -79,7 +78,7 @@ namespace Code.Gameplay.Player { case true when isGrounded: _isJumping = true; - audioSource.PlayOneShot(_jumpClip); + jumpAudioSource.PlayOneShot(_jumpClip); _jumpTimer = 0f; _rb.linearVelocity = new Vector2(_rb.linearVelocity.x, _jumpForce); break; @@ -159,17 +158,24 @@ namespace Code.Gameplay.Player _rb.linearVelocity = new Vector2(targetVelocityX, _rb.linearVelocity.y); - // Проигрываем звук ходьбы ТОЛЬКО при начале движения - if (isMoving && !_wasMovingLastFrame && isGrounded) + if (isMoving && isGrounded) { - if (_walkClip) + if (_walkClip && walkAudioSource) { - audioSource.pitch = _input.SprintHeld ? _sprintPitchMultiplier : 1f; - audioSource.PlayOneShot(_walkClip); + walkAudioSource.pitch = _input.SprintHeld ? _sprintPitchMultiplier : 1f; + if (walkAudioSource.clip != _walkClip) + { + walkAudioSource.clip = _walkClip; + walkAudioSource.Play(); + } } } - - _wasMovingLastFrame = isMoving; + else + { + walkAudioSource.Stop(); + walkAudioSource.pitch = 1; + walkAudioSource.clip = null; + } } private void HandleJump() @@ -185,12 +191,12 @@ namespace Code.Gameplay.Player private async void StartBlinking() { - _spriteRenderer.color = new Color(1, 1, 1, 0.5f); // полупрозрачность - float blinkDuration = 2f; - float blinkInterval = 0.1f; - int blinkCount = (int)(blinkDuration / blinkInterval); + _spriteRenderer.color = new Color(1, 1, 1, 0.5f); + const float blinkDuration = 2f; + const float blinkInterval = 0.1f; + var blinkCount = (int)(blinkDuration / blinkInterval); - for (int i = 0; i < blinkCount; i++) + for (var i = 0; i < blinkCount; i++) { _spriteRenderer.enabled = !_spriteRenderer.enabled; await UniTask.Delay(TimeSpan.FromSeconds(blinkInterval)); diff --git a/Assets/Resources/Audio/Music/MainMenuTheme.ogg b/Assets/Resources/Audio/Music/MainMenuTheme.ogg index fe0e10b..434db19 100644 --- a/Assets/Resources/Audio/Music/MainMenuTheme.ogg +++ b/Assets/Resources/Audio/Music/MainMenuTheme.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e5d02ccfdeedaafc3317b6f190a40fda16af690620a3e92c16959ef7dcb35f2 -size 6034561 +oid sha256:998504b3934770bd59664f2ef45f00fd659c0beed338f8325825166e45148857 +size 5006966 diff --git a/Assets/Resources/Audio/SFX/BirdDeathSFX.mp3 b/Assets/Resources/Audio/SFX/BirdDeathSFX.mp3 new file mode 100644 index 0000000..a4f027b --- /dev/null +++ b/Assets/Resources/Audio/SFX/BirdDeathSFX.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:639b71c562b5fa7a6293be25dcbfba01aa3f9cfeaee862005818af00818a9ed9 +size 24144 diff --git a/Assets/Resources/Audio/SFX/BirdDeathSFX.mp3.meta b/Assets/Resources/Audio/SFX/BirdDeathSFX.mp3.meta new file mode 100644 index 0000000..3275c62 --- /dev/null +++ b/Assets/Resources/Audio/SFX/BirdDeathSFX.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e5624994353fdd8d5994056b4fa2f67d +AudioImporter: + externalObjects: {} + serializedVersion: 8 + 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/Resources/Audio/SFX/BirdSFX.mp3 b/Assets/Resources/Audio/SFX/BirdSFX.mp3 new file mode 100644 index 0000000..3007f6b --- /dev/null +++ b/Assets/Resources/Audio/SFX/BirdSFX.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22b4e5ea08d3db0ca979f9cced0412f7eb65d610c5cafbd4872cfcb9041f01c8 +size 448800 diff --git a/Assets/Resources/Audio/SFX/BirdSFX.mp3.meta b/Assets/Resources/Audio/SFX/BirdSFX.mp3.meta new file mode 100644 index 0000000..219d522 --- /dev/null +++ b/Assets/Resources/Audio/SFX/BirdSFX.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: da45cc662eb37b05fa86d992f932e975 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + 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/Resources/Audio/SFX/DamageSFX.mp3 b/Assets/Resources/Audio/SFX/DamageSFX.mp3 new file mode 100644 index 0000000..0246f94 --- /dev/null +++ b/Assets/Resources/Audio/SFX/DamageSFX.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71d5a3d9c290f3e76973bc5ddf9b15109f118d929db382b8cf35d4f9e39e850e +size 17760 diff --git a/Assets/Resources/Audio/SFX/DamageSFX.mp3.meta b/Assets/Resources/Audio/SFX/DamageSFX.mp3.meta new file mode 100644 index 0000000..5909dc3 --- /dev/null +++ b/Assets/Resources/Audio/SFX/DamageSFX.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 43f915a7118825fb58ac724dc23dfe89 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + 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/Resources/Audio/SFX/WalkSFX.mp3 b/Assets/Resources/Audio/SFX/WalkSFX.mp3 index cee55ee..763caf1 100644 --- a/Assets/Resources/Audio/SFX/WalkSFX.mp3 +++ b/Assets/Resources/Audio/SFX/WalkSFX.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb5b4d5b701020392187ff0c51fc4ccc92f3af72863b764bdbcef4749d372a1d -size 4608 +oid sha256:0d125b16284de923febb4faaf27451900e2a4ac72d56ed9f6798df6482e07fd2 +size 4752 diff --git a/Assets/Resources/Scenes/Gameplay.unity b/Assets/Resources/Scenes/Gameplay.unity index 91a6d10..3cad4af 100644 --- a/Assets/Resources/Scenes/Gameplay.unity +++ b/Assets/Resources/Scenes/Gameplay.unity @@ -422,7 +422,8 @@ Transform: m_LocalPosition: {x: 169, y: -8.5, z: 0} m_LocalScale: {x: 407.97116, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 683550237} m_Father: {fileID: 1132724089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &34885261 @@ -4650,6 +4651,84 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &683550236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 683550237} + - component: {fileID: 683550238} + m_Layer: 3 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &683550237 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683550236} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.8, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 34885260} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &683550238 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683550236} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &708433102 GameObject: m_ObjectHideFlags: 0 @@ -4663,6 +4742,7 @@ GameObject: - component: {fileID: 708433106} - component: {fileID: 708433105} - component: {fileID: 708433104} + - component: {fileID: 708433108} m_Layer: 6 m_Name: Enemy3 m_TagString: Untagged @@ -4771,6 +4851,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 708433107} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &708433107 SpriteRenderer: serializedVersion: 2 @@ -4830,6 +4911,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!82 &708433108 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708433102} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &715911820 GameObject: m_ObjectHideFlags: 0 @@ -6208,6 +6386,7 @@ GameObject: - component: {fileID: 827109868} - component: {fileID: 827109867} - component: {fileID: 827109866} + - component: {fileID: 827109870} m_Layer: 6 m_Name: Enemy6 m_TagString: Untagged @@ -6316,6 +6495,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 827109869} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &827109869 SpriteRenderer: serializedVersion: 2 @@ -6375,6 +6555,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!82 &827109870 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 827109864} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &848687908 GameObject: m_ObjectHideFlags: 0 @@ -7730,6 +8007,7 @@ GameObject: - component: {fileID: 1110174282} - component: {fileID: 1110174281} - component: {fileID: 1110174280} + - component: {fileID: 1110174284} m_Layer: 6 m_Name: Enemy2 m_TagString: Untagged @@ -7838,6 +8116,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 1110174283} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &1110174283 SpriteRenderer: serializedVersion: 2 @@ -7897,6 +8176,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!82 &1110174284 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110174278} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &1115106004 GameObject: m_ObjectHideFlags: 0 @@ -9401,6 +9777,7 @@ GameObject: - component: {fileID: 1338893540} - component: {fileID: 1338893539} - component: {fileID: 1338893538} + - component: {fileID: 1338893542} m_Layer: 6 m_Name: Enemy7 m_TagString: Untagged @@ -9509,6 +9886,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 1338893541} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &1338893541 SpriteRenderer: serializedVersion: 2 @@ -9568,6 +9946,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!82 &1338893542 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338893536} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &1347306611 GameObject: m_ObjectHideFlags: 0 @@ -10764,6 +11239,7 @@ GameObject: - component: {fileID: 1519585065} - component: {fileID: 1519585064} - component: {fileID: 1519585063} + - component: {fileID: 1519585067} m_Layer: 6 m_Name: Enemy5 m_TagString: Untagged @@ -10872,6 +11348,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 1519585066} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &1519585066 SpriteRenderer: serializedVersion: 2 @@ -10931,6 +11408,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!82 &1519585067 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519585061} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &1522594387 GameObject: m_ObjectHideFlags: 0 @@ -11344,6 +11918,7 @@ GameObject: - component: {fileID: 1602881082} - component: {fileID: 1602881081} - component: {fileID: 1602881080} + - component: {fileID: 1602881084} m_Layer: 6 m_Name: Enemy4 m_TagString: Untagged @@ -11452,6 +12027,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 1602881083} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &1602881083 SpriteRenderer: serializedVersion: 2 @@ -11511,6 +12087,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!82 &1602881084 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602881078} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &1616841230 GameObject: m_ObjectHideFlags: 0 @@ -11527,6 +12200,8 @@ GameObject: - component: {fileID: 1616841236} - component: {fileID: 1616841237} - component: {fileID: 1616841238} + - component: {fileID: 1616841239} + - component: {fileID: 1616841240} m_Layer: 0 m_Name: Player m_TagString: Player @@ -11662,7 +12337,8 @@ MonoBehaviour: _groundCheckRadius: 0.3 _jumpDuration: 0.5 _sprintPitchMultiplier: 1.5 - audioSource: {fileID: 1616841238} + walkAudioSource: {fileID: 1616841239} + jumpAudioSource: {fileID: 1616841240} --- !u!61 &1616841235 BoxCollider2D: m_ObjectHideFlags: 0 @@ -11754,6 +12430,200 @@ MonoBehaviour: _healthBar: {fileID: 1475998710} audioSource: {fileID: 1616841238} --- !u!82 &1616841238 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616841230} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + 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!82 &1616841239 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616841230} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &1616841240 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13548,6 +14418,7 @@ GameObject: - component: {fileID: 1888761050} - component: {fileID: 1888761054} - component: {fileID: 1888761053} + - component: {fileID: 1888761055} m_Layer: 6 m_Name: Enemy1 m_TagString: Untagged @@ -13573,6 +14444,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 1888761051} _blinkDuration: 0.2 _hitColor: {r: 1, g: 0, b: 0, a: 1} + _audioSource: {fileID: 519420034} --- !u!212 &1888761051 SpriteRenderer: serializedVersion: 2 @@ -13715,6 +14587,103 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!82 &1888761055 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888761049} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: da45cc662eb37b05fa86d992f932e975, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 15 + 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 &1894168246 GameObject: m_ObjectHideFlags: 0