From 5ef6b8a9669d10479395f109d833d4e9765f1bf7 Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Thu, 14 May 2015 09:28:33 +1000 Subject: [PATCH] -Added dash attack -Menu pause --- playable/Assets/Lachlan_jump_work.unity | Bin 193876 -> 194252 bytes playable/Assets/Menu.cs | 4 ++ playable/Assets/Scripts/playerController.cs | 67 +++++++++++++++++++- playable/ProjectSettings/InputManager.asset | Bin 6032 -> 6384 bytes playable/ProjectSettings/TagManager.asset | Bin 5800 -> 5808 bytes 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/playable/Assets/Lachlan_jump_work.unity b/playable/Assets/Lachlan_jump_work.unity index c967cc906870ba98f92f1208503fae55bc0b4c2f..76dd1dfcef90485633d4091728ee4565d13aa41b 100644 GIT binary patch delta 20550 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 10) { gameOverDisplay.enabled = true; gameOverDisplay.text = ""+ gameObject.name + " Wins"; + Time.timeScale = 0; } @@ -86,6 +94,15 @@ public class playerController : MonoBehaviour { } } + if (Input.GetAxisRaw (DashAttackBtn) == 1) { + //Debug.Log ("dashbutton pressed"); + if(!isDashing && canDash && Time.time - lastDash > dashWait){ + lastDash = Time.time; + StartCoroutine (dashAttack (dashDistance,dashTime)); + } + + } + rigidbody2D.velocity = velocity; //apply inputs @@ -184,6 +201,49 @@ public class playerController : MonoBehaviour { stick.isAttacking = false; } + IEnumerator dashAttack (float dashDistance,float dashTime) { + float endPosition; + int dashDirection; + + isDashing = true; + canDash = false; + stick.isAttacking = true; + Debug.Log ("" + gameObject.name + "Dashing"); + rigidbody2D.gravityScale = 0; + + + + + Vector3 startPosition = transform.position; + Debug.Log ("rotation Y: " + transform.eulerAngles.y); + if (transform.eulerAngles.y >= 150) + dashDirection = -1; + else + dashDirection = 1; + + endPosition = startPosition.x + (dashDirection * dashDistance); + Debug.Log ("Dash start: " + startPosition.x); + Debug.Log ("Dash Direction: " + (dashDirection )); + Debug.Log ("Dash end: " + endPosition); + + for (float i = 0; i < 1; i += Time.deltaTime/dashTime) { + transform.position = new Vector3(dashDirection * Mathf.Lerp((dashDirection)*startPosition.x, (dashDirection)* endPosition, i), startPosition.y, startPosition.z); + + if (stopDash) + break; + + yield return null; + } + + + stopDash = false; + isDashing = false; + canDash = true; + stick.isAttacking = false; + Debug.Log ("" + gameObject.name + " finished Dashing"); + rigidbody2D.gravityScale = 4; + } + @@ -197,6 +257,11 @@ public class playerController : MonoBehaviour { canJump = true; canSpin = true; } + + if (col.collider.tag == "wall") { + stopDash = true; + + } } void OnTriggerEnter2D(Collider2D trig) diff --git a/playable/ProjectSettings/InputManager.asset b/playable/ProjectSettings/InputManager.asset index f4eccf8ddcd2d57144d099c57c572a53e69a838e..ff1bc29ddfed01a73dc347fdaedc97d575389788 100644 GIT binary patch delta 198 zcmbQB|G|)hfq^ZNfkEQKMvfRZ&JRE?F9Q&7E@Yd`Ik|z2g;8d5pos8h34sds$qNKo zv|SR5GaO4w5|cCH0}O#GkpVZ5QES}yGx?vW9V6r9iGsqs2*LOOlgW%?GLt36^#Si;FkS!v delta 47 zcmexhI6_>6#x$8 B3c~;Z delta 45 tcmdm>yF!t*7