From d5d07275329bac2644a5324c2a87762a34263f89 Mon Sep 17 00:00:00 2001 From: Lachlan Date: Sun, 17 May 2015 01:51:44 +1000 Subject: [PATCH] Added re-spawn timer (3s), object doesnt disappear while dead. Added mute button(F11/F12) --- playable/Assets/Lachlan_jump_work.unity | Bin 290220 -> 291012 bytes playable/Assets/Scripts/Menu.cs | 21 +++++++---- playable/Assets/Scripts/playerController.cs | 39 +++++++++++++++----- playable/Assets/Scripts/stickController.cs | 3 ++ 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/playable/Assets/Lachlan_jump_work.unity b/playable/Assets/Lachlan_jump_work.unity index e2695a08d2c38fdb5a540edfa7de65e588da8126..8499b2e422c0e53d086b262e0a1aad33f18208a1 100644 GIT binary patch delta 19784 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 E51)3)uK)l5 delta 18969 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 YJ;o%AkG-dZuViw4~O|jViALmqF!T 0) + { + deathTimer -=Time.deltaTime; + //gameObject.active = false; + + if(deathTimer <=0) + { + //gameObject.active = true; - Vector3 spawnPos = new Vector3 (Random.Range (-20.0f, 20.0f), 15.0f, 0); //picks random position - health = 3; //resets life - transform.position = spawnPos; //changes position - rigidbody2D.velocity = Vector2.zero; + Instantiate (newCandy, transform.position + Vector3.up, transform.rotation); + Vector3 spawnPos = new Vector3 (Random.Range (-20.0f, 20.0f), 15.0f, 0); //picks random position + health = 3; //resets life + transform.position = spawnPos; //changes position + rigidbody2D.velocity = Vector2.zero; + deathTimer = deathTimer + 3.02f; + + + } }//end if }//end death @@ -181,6 +201,7 @@ public class playerController : MonoBehaviour { } + //spin IEnumerator spinAttack(Vector3 byAngles, float inTime) { isSpinning = true; canSpin = false; @@ -200,7 +221,7 @@ public class playerController : MonoBehaviour { isSpinning = false; stick.isAttacking = false; } - + //dash IEnumerator dashAttack (float dashDistance,float dashTime) { float endPosition; int dashDirection; diff --git a/playable/Assets/Scripts/stickController.cs b/playable/Assets/Scripts/stickController.cs index 9bcbabc..e8a1231 100644 --- a/playable/Assets/Scripts/stickController.cs +++ b/playable/Assets/Scripts/stickController.cs @@ -8,6 +8,7 @@ public class stickController : MonoBehaviour { public bool isAttacking; public bool isSpinning; + // Use this for initialization void Start () { @@ -51,4 +52,6 @@ public class stickController : MonoBehaviour { } + + }