From ffc3bbe2831d7b76eb0949d2f697d9f3bafa8d0a Mon Sep 17 00:00:00 2001 From: cainapple Date: Mon, 11 Jan 2021 12:35:16 +0000 Subject: [PATCH 1/2] sound --- Assets/FMOD/Desktop/Master.bank | 4 ++-- Assets/FMOD/Desktop/Master.strings.bank | 4 ++-- Assets/StreamingAssets/Master.bank | 4 ++-- Assets/StreamingAssets/Master.strings.bank | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/FMOD/Desktop/Master.bank b/Assets/FMOD/Desktop/Master.bank index fc5e4e0..fec2bb5 100644 --- a/Assets/FMOD/Desktop/Master.bank +++ b/Assets/FMOD/Desktop/Master.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36a293e93f20cd91be78bd90070b8cbecd07fbdc8635fccea22d7b236d485663 -size 2994784 +oid sha256:70b0375271054918485bb4d9c5af67d03507ba771d79723b41a7ca9cc0895036 +size 3197280 diff --git a/Assets/FMOD/Desktop/Master.strings.bank b/Assets/FMOD/Desktop/Master.strings.bank index d922fd4..70164cd 100644 --- a/Assets/FMOD/Desktop/Master.strings.bank +++ b/Assets/FMOD/Desktop/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8169b114f6fa6b2fb95e38f4c76dc46e38a7c27d107035b168cc56d97de9306 -size 730 +oid sha256:8c65dcea1d2187954ac201d73ac0a2a69a9a460824d774c6d5017629df0f5ad9 +size 846 diff --git a/Assets/StreamingAssets/Master.bank b/Assets/StreamingAssets/Master.bank index fc5e4e0..fec2bb5 100644 --- a/Assets/StreamingAssets/Master.bank +++ b/Assets/StreamingAssets/Master.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36a293e93f20cd91be78bd90070b8cbecd07fbdc8635fccea22d7b236d485663 -size 2994784 +oid sha256:70b0375271054918485bb4d9c5af67d03507ba771d79723b41a7ca9cc0895036 +size 3197280 diff --git a/Assets/StreamingAssets/Master.strings.bank b/Assets/StreamingAssets/Master.strings.bank index d922fd4..70164cd 100644 --- a/Assets/StreamingAssets/Master.strings.bank +++ b/Assets/StreamingAssets/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8169b114f6fa6b2fb95e38f4c76dc46e38a7c27d107035b168cc56d97de9306 -size 730 +oid sha256:8c65dcea1d2187954ac201d73ac0a2a69a9a460824d774c6d5017629df0f5ad9 +size 846 From f54ce99f07550eca1cea48b2cdee4155a8664c26 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Mon, 11 Jan 2021 12:42:43 +0000 Subject: [PATCH 2/2] integrate sound --- Assets/Materials/Bullet.mat | 2 +- Assets/Scripts/EntityLives.cs | 2 ++ Assets/Scripts/PlayerShootInput.cs | 26 +++++++++++++++++++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Assets/Materials/Bullet.mat b/Assets/Materials/Bullet.mat index 8e11d64..e26cb4a 100644 --- a/Assets/Materials/Bullet.mat +++ b/Assets/Materials/Bullet.mat @@ -133,7 +133,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.3634766, g: 5.3403134, b: 0, a: 1} + - _Color1: {r: 1.4539073, g: 21.361254, b: 0, a: 1} - _Color2: {r: 0.24509804, g: 0.3764706, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FarColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scripts/EntityLives.cs b/Assets/Scripts/EntityLives.cs index 92e48a6..25ddd96 100644 --- a/Assets/Scripts/EntityLives.cs +++ b/Assets/Scripts/EntityLives.cs @@ -29,6 +29,8 @@ public class EntityLives : MonoBehaviour private void Die() { + FMODUnity.RuntimeManager.PlayOneShot("event:/hit"); + --lives; if (lives > 0) { diff --git a/Assets/Scripts/PlayerShootInput.cs b/Assets/Scripts/PlayerShootInput.cs index 9a9c20f..d8b2d7c 100644 --- a/Assets/Scripts/PlayerShootInput.cs +++ b/Assets/Scripts/PlayerShootInput.cs @@ -1,6 +1,10 @@ using System; +using System.Collections; +using System.Collections.Generic; +using FMOD; using UnityEngine; using UnityEngine.InputSystem; +using Debug = UnityEngine.Debug; using PlayerInput = Input.PlayerInput; public class PlayerShootInput : ShootInputBase { @@ -12,7 +16,7 @@ public class PlayerShootInput : ShootInputBase { _actions = new PlayerInput(); } - + private void OnEnable() { _actions.Enable(); @@ -25,6 +29,11 @@ public class PlayerShootInput : ShootInputBase _actions.Default.Shoot.performed -= Shoot; } + private void Start() + { + StartCoroutine(MakePewSounds()); + } + private void Shoot(InputAction.CallbackContext obj) { _isShooting = obj.ReadValueAsButton(); @@ -35,4 +44,19 @@ public class PlayerShootInput : ShootInputBase return _isShooting; } + private IEnumerator MakePewSounds() + { + var wait = new WaitForSeconds(0.02f); + + while (true) + { + if (_isShooting) + { + FMODUnity.RuntimeManager.PlayOneShot("event:/shoot"); + } + + yield return wait; + } + } + } \ No newline at end of file