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

Merge branch 'master' of github.com:ETSConjure/PixelSphinx

Browse Source
This commit is contained in:
Jean-Sébastien Gervais 2016-04-09 15:20:13 -04:00
commit 7b11fad39c
2 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Assets/Scripts/Astronaut.cs
View File

@ -44,18 +44,7 @@ public class Astronaut : MonoBehaviour {
if (oldState == AstronautState.Dashing) if (oldState == AstronautState.Dashing)
{ {
_astronautAnimator.Land(); _astronautAnimator.Land();
//SpriteWalk.gameObject.SetActive(false);
//SpriteDash.gameObject.SetActive(true);
} }
//else if (_state == AstronautState.Jumping)
//{
// _astronautAnimator.Jump();
//}
/*else
{
SpriteWalk.gameObject.SetActive(true);
SpriteDash.gameObject.SetActive(false);
}*/
if (State == AstronautState.Walking) if (State == AstronautState.Walking)
{ {
@ -152,6 +141,7 @@ public class Astronaut : MonoBehaviour {
if (State == AstronautState.Dashing) if (State == AstronautState.Dashing)
{ {
planet.PushWedge(this.theta); planet.PushWedge(this.theta);
State = AstronautState.Idle;
} }
height = radius; height = radius;
@ -161,43 +151,7 @@ public class Astronaut : MonoBehaviour {
if (State < AstronautState.Ejecting) vSpeed = 0f; if (State < AstronautState.Ejecting) vSpeed = 0f;
} }
UpdatePosition(); UpdatePosition();
//float x, y;
//
//PlanetUtilities.Spheric2Cartesian(theta, heightAtPos, out x, out y);
//
//
/*
if (State == AstronautState.Walking)
{
walkTime += Time.deltaTime / StepTime;
Vector3 rotation = transform.rotation.eulerAngles;
rotation.z = Mathf.Sin(walkTime * Mathf.PI)*50; transform.rotation = Quaternion.Euler(rotation);
}*/
/*
switch (State)
{
case AstronautState.Dashing:
break;
case AstronautState.Ejecting:
break;
case AstronautState.Idle:
break;
case AstronautState.Jumping:
break;
case AstronautState.Walking:
break;
}
*/
} }
public void Move(float x, float y) public void Move(float x, float y)
@ -212,7 +166,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)
@ -255,17 +209,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;
@ -278,7 +230,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

@ -51,7 +51,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));
} }
@ -90,12 +89,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;
} }