diff options
| author |   Carson Katri <carson.katri@gmail.com> | 2021-06-12 21:01:31 -0400 |
|---|---|---|
| committer | Carson Katri <carson.katri@gmail.com> | 2021-06-12 21:01:31 -0400 |
| commit | 40442030540232988de9482cabe6bcf879b04968 (patch) | |
| tree | f656e9a073948f845c9ea913fb2602aa46f62e7b | |
| parent | 632b053d73e7cdf2cd7038935d1c8a0df97b575e (diff) | |
| parent | dd1fb08b20c3da60e4aeeb036975845006cfaab3 (diff) | |
| download | gmtk-gamejam-40442030540232988de9482cabe6bcf879b04968.tar.gz gmtk-gamejam-40442030540232988de9482cabe6bcf879b04968.tar.zst gmtk-gamejam-40442030540232988de9482cabe6bcf879b04968.zip | |
Merge branch 'master' of git.cameronkatri.com:gmtk-gamejam
| -rw-r--r-- | Assets/Scripts/Controllers/Hoop.cs | 10 | ||||
| -rw-r--r-- | Assets/Sprites/Hoop.anim | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Assets/Scripts/Controllers/Hoop.cs b/Assets/Scripts/Controllers/Hoop.cs index 5633743..8809b87 100644 --- a/Assets/Scripts/Controllers/Hoop.cs +++ b/Assets/Scripts/Controllers/Hoop.cs @@ -11,13 +11,21 @@ namespace Controllers [SerializeField] private BoxCollider2D Rim; [SerializeField] private BoxCollider2D Net; [SerializeField] private AudioSource shotSound; - + + private Animator HoopAnimator; + + private void Awake() + { + HoopAnimator = GetComponentInChildren<Animator>(); + } + private void OnTriggerEnter2D(Collider2D other) { if (other.GetComponent<Ball>() == null) return; if (Rim.IsTouching(other) && Net.IsTouching(other)) { + HoopAnimator.Rebind(); shotSound.Play(); if (this == controller.PlayerHoop) controller.player.Score(Rim.transform.position); diff --git a/Assets/Sprites/Hoop.anim b/Assets/Sprites/Hoop.anim index eac1247..7bda0d1 100644 --- a/Assets/Sprites/Hoop.anim +++ b/Assets/Sprites/Hoop.anim @@ -75,7 +75,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 |