Conjure/PixelSphinx
6
0
Fork 0
mirror of https://github.com/ConjureETS/PixelSphinx.git synced 2026-03-24 02:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

starting stun implement

Browse Source
This commit is contained in:
Sophie 2016-04-09 14:02:58 -04:00
parent ea0a08d91f
commit 1a4076cd77
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Astronaut.cs
View File

@ -211,7 +211,7 @@ public class Astronaut : MonoBehaviour {
float move = proj; float move = proj;
if (State >= AstronautState.Ejecting ) if (State >= AstronautState.Dashing )
return; return;
if (State < AstronautState.Jumping) if (State < AstronautState.Jumping)
@ -254,17 +254,15 @@ public class Astronaut : MonoBehaviour {
public void Jump() public void Jump()
{ {
if (State >= AstronautState.Dashing)
return;
if (State == AstronautState.Jumping) if (State == AstronautState.Jumping)
{ {
Dash(); Dash();
//State=AstronautState.Dashing; //TODO relacher l'état Dashing //State=AstronautState.Dashing; //TODO relacher l'état Dashing
return; return;
} }
else if (State >= AstronautState.Dashing)
return;
else if (State >= AstronautState.Ejecting)
return;
if (!grounded) return; if (!grounded) return;
@ -277,7 +275,6 @@ public class Astronaut : MonoBehaviour {
public void Dash() public void Dash()
{ {
if (Time.time < DashTime + lastDashTime) if (Time.time < DashTime + lastDashTime)
return; return;

5
Assets/Scripts/AstronautAnimator.cs
View File

@ -41,7 +41,6 @@ public class AstronautAnimator : MonoBehaviour {
public void Walk(bool right) public void Walk(bool right)
{ {
Debug.Log("Walking!");
StartCoroutine(Rotate(right? -1 : 1)); StartCoroutine(Rotate(right? -1 : 1));
} }
@ -77,12 +76,8 @@ public class AstronautAnimator : MonoBehaviour {
if (aspi.State == Astronaut.AstronautState.Walking) if (aspi.State == Astronaut.AstronautState.Walking)
{ {
Debug.Log("Walking again");
StartCoroutine(Rotate(-side)); StartCoroutine(Rotate(-side));
} }
else
Debug.Log("Walking stop");
//yield return null;
} }
public void EmitDustParticules() public void EmitDustParticules()