From 1a4076cd77721ba03e1cf098445bf1c290608481 Mon Sep 17 00:00:00 2001 From: Sophie Date: Sat, 9 Apr 2016 14:02:58 -0400 Subject: [PATCH] starting stun implement --- Assets/Scripts/Astronaut.cs | 11 ++++------- Assets/Scripts/AstronautAnimator.cs | 5 ----- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs index 7a9b098..8573d97 100644 --- a/Assets/Scripts/Astronaut.cs +++ b/Assets/Scripts/Astronaut.cs @@ -211,7 +211,7 @@ public class Astronaut : MonoBehaviour { float move = proj; - if (State >= AstronautState.Ejecting ) + if (State >= AstronautState.Dashing ) return; if (State < AstronautState.Jumping) @@ -254,17 +254,15 @@ public class Astronaut : MonoBehaviour { public void Jump() { + if (State >= AstronautState.Dashing) + return; + if (State == AstronautState.Jumping) { Dash(); //State=AstronautState.Dashing; //TODO relacher l'état Dashing return; - } - else if (State >= AstronautState.Dashing) - return; - else if (State >= AstronautState.Ejecting) - return; if (!grounded) return; @@ -277,7 +275,6 @@ public class Astronaut : MonoBehaviour { public void Dash() { - if (Time.time < DashTime + lastDashTime) return; diff --git a/Assets/Scripts/AstronautAnimator.cs b/Assets/Scripts/AstronautAnimator.cs index 979d237..9fa421d 100644 --- a/Assets/Scripts/AstronautAnimator.cs +++ b/Assets/Scripts/AstronautAnimator.cs @@ -41,7 +41,6 @@ public class AstronautAnimator : MonoBehaviour { public void Walk(bool right) { - Debug.Log("Walking!"); StartCoroutine(Rotate(right? -1 : 1)); } @@ -77,12 +76,8 @@ public class AstronautAnimator : MonoBehaviour { if (aspi.State == Astronaut.AstronautState.Walking) { - Debug.Log("Walking again"); StartCoroutine(Rotate(-side)); } - else - Debug.Log("Walking stop"); - //yield return null; } public void EmitDustParticules()