diff options
| author |   Cameron Katri <me@cameronkatri.com> | 2021-06-12 18:41:18 -0400 |
|---|---|---|
| committer | Cameron Katri <me@cameronkatri.com> | 2021-06-12 18:41:18 -0400 |
| commit | 40471cf464366a7f49110a31d00fec160856b60f (patch) | |
| tree | 33f8f8ea1e6da3e2dbed8cd46b06e9bf5bb9cfbe | |
| parent | a524f24128a4653bbc06eede2379107f9255faf9 (diff) | |
| download | gmtk-gamejam-40471cf464366a7f49110a31d00fec160856b60f.tar.gz gmtk-gamejam-40471cf464366a7f49110a31d00fec160856b60f.tar.zst gmtk-gamejam-40471cf464366a7f49110a31d00fec160856b60f.zip | |
Add sound effects for dribble and shoot
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Assets/.DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | Assets/Prefabs/Hoop.prefab | 98 | ||||
| -rw-r--r-- | Assets/Scenes/Main.unity | 98 | ||||
| -rw-r--r-- | Assets/Scripts/Controllers/CameraController.cs | 2 | ||||
| -rw-r--r-- | Assets/Scripts/Controllers/GameController.cs | 7 | ||||
| -rw-r--r-- | Assets/Scripts/Controllers/Hoop.cs | 14 | ||||
| -rw-r--r-- | Assets/Sounds/Dribble.mp3 | bin | 0 -> 77739 bytes | |||
| -rw-r--r-- | Assets/Sounds/swishsound.wav | bin | 0 -> 5508 bytes | |||
| -rw-r--r-- | Assets/Sprites/.DS_Store | bin | 6148 -> 0 bytes |
10 files changed, 218 insertions, 3 deletions
@@ -69,3 +69,5 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* + +.DS_Store diff --git a/Assets/.DS_Store b/Assets/.DS_Store Binary files differdeleted file mode 100644 index 005151d..0000000 --- a/Assets/.DS_Store +++ /dev/null diff --git a/Assets/Prefabs/Hoop.prefab b/Assets/Prefabs/Hoop.prefab index 7dfd3b9..aaa78b6 100644 --- a/Assets/Prefabs/Hoop.prefab +++ b/Assets/Prefabs/Hoop.prefab @@ -17,6 +17,7 @@ GameObject: - component: {fileID: 1029364543094105199} - component: {fileID: 2639737386686648195} - component: {fileID: 1022133350338841181} + - component: {fileID: 5401724803266703353} m_Layer: 0 m_Name: Hoop m_TagString: Untagged @@ -252,3 +253,100 @@ MonoBehaviour: m_EditorClassIdentifier: Rim: {fileID: 2639737386686648195} Net: {fileID: 1029364543094105199} + shotSound: {fileID: 5401724803266703353} +--- !u!82 &5401724803266703353 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106494524751008836} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 0626d151c4dfd8345b0f548141ea4a73, 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 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 3a19e19..dc057fc 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -560,6 +560,7 @@ GameObject: m_Component: - component: {fileID: 1174357919} - component: {fileID: 1174357920} + - component: {fileID: 1174357921} m_Layer: 0 m_Name: Game m_TagString: Untagged @@ -596,6 +597,103 @@ MonoBehaviour: ball: {fileID: 707826158} PlayerHoop: {fileID: 614591307} EnemyHoop: {fileID: 1354192742} + dribbleSound: {fileID: 1174357921} +--- !u!82 &1174357921 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174357918} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 09f412701b6b62449ae56680cf2812f5, 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!4 &1189511746 stripped Transform: m_CorrespondingSourceObject: {fileID: 6095859834264611321, guid: c64ad9b908cb44602b3d13a74aef751f, type: 3} diff --git a/Assets/Scripts/Controllers/CameraController.cs b/Assets/Scripts/Controllers/CameraController.cs index faffbe5..7d42be5 100644 --- a/Assets/Scripts/Controllers/CameraController.cs +++ b/Assets/Scripts/Controllers/CameraController.cs @@ -7,7 +7,7 @@ namespace Controllers [SerializeField] private Transform target; [SerializeField] private float speed; - private void Update() + private void FixedUpdate() { transform.position = Vector3.MoveTowards(transform.position, new Vector3(target.transform.position.x, target.transform.position.y, -10f), Time.deltaTime * speed); } diff --git a/Assets/Scripts/Controllers/GameController.cs b/Assets/Scripts/Controllers/GameController.cs index 8dd6fc4..54a0425 100644 --- a/Assets/Scripts/Controllers/GameController.cs +++ b/Assets/Scripts/Controllers/GameController.cs @@ -21,11 +21,15 @@ namespace Controllers [SerializeField] public Hoop PlayerHoop; [SerializeField] public Hoop EnemyHoop; + [SerializeField] public AudioSource dribbleSound; + private void Awake() { player = new Player { isEnemy = false, controller = this }; enemy = new Player { isEnemy = true, controller = this }; ball.controller = this; + PlayerHoop.controller = this; + EnemyHoop.controller = this; } public struct Player @@ -88,6 +92,7 @@ namespace Controllers if (Vector2.Distance(controller.ball.transform.position, handPosition) >= 1f) return false; controller.state = dribble; + controller.dribbleSound.Play(); Move(handPosition); return true; } @@ -100,6 +105,7 @@ namespace Controllers public bool Shoot(Transform playerTransform) { if (controller.state != dribble) return false; // We must be dribbling the ball to shoot it. + controller.dribbleSound.Stop(); controller.state = shoot; controller.ball.Shoot(hoop.transform.position); lastShotPosition = playerTransform.position; @@ -109,6 +115,7 @@ namespace Controllers internal void BallDropped() { + dribbleSound.Stop(); state = State.Idle; } diff --git a/Assets/Scripts/Controllers/Hoop.cs b/Assets/Scripts/Controllers/Hoop.cs index 58f7130..5633743 100644 --- a/Assets/Scripts/Controllers/Hoop.cs +++ b/Assets/Scripts/Controllers/Hoop.cs @@ -3,17 +3,27 @@ using UnityEngine; namespace Controllers { + [RequireComponent(typeof(AudioSource))] public class Hoop : MonoBehaviour { + internal GameController controller; + [SerializeField] private BoxCollider2D Rim; [SerializeField] private BoxCollider2D Net; + [SerializeField] private AudioSource shotSound; private void OnTriggerEnter2D(Collider2D other) { if (other.GetComponent<Ball>() == null) return; - + if (Rim.IsTouching(other) && Net.IsTouching(other)) - Debug.Log("Swish!"); + { + shotSound.Play(); + if (this == controller.PlayerHoop) + controller.player.Score(Rim.transform.position); + else if (this == controller.EnemyHoop) + controller.enemy.Score(Rim.transform.position); + } } } }
\ No newline at end of file diff --git a/Assets/Sounds/Dribble.mp3 b/Assets/Sounds/Dribble.mp3 Binary files differnew file mode 100644 index 0000000..39f436e --- /dev/null +++ b/Assets/Sounds/Dribble.mp3 diff --git a/Assets/Sounds/swishsound.wav b/Assets/Sounds/swishsound.wav Binary files differnew file mode 100644 index 0000000..187a4b4 --- /dev/null +++ b/Assets/Sounds/swishsound.wav diff --git a/Assets/Sprites/.DS_Store b/Assets/Sprites/.DS_Store Binary files differdeleted file mode 100644 index 4568ce0..0000000 --- a/Assets/Sprites/.DS_Store +++ /dev/null |