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

Corrected merge errors

Browse Source
This commit is contained in:
Sophie 2016-04-08 22:02:02 -04:00
parent c73e09979a
commit 8d80c2fbdc
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/Scripts/Astronaut.cs
View File

@ -71,11 +71,12 @@ public class Astronaut : MonoBehaviour {
_astronautAnimator = GetComponent<AstronautAnimator>(); _astronautAnimator = GetComponent<AstronautAnimator>();
_astronautAnimator.aspi = this; _astronautAnimator.aspi = this;
State = AstronautState.Idle; State = AstronautState.Idle;
if (!planet) if (!planet)
{ {
p if (!planet) planet = FindObjectOfType<PlanetManager>();
{e<PlanetManager>();
} }
State = AstronautState.Idle; State = AstronautState.Idle;
//Debug.Log(planet.GetPlanetRadius(0)); //Debug.Log(planet.GetPlanetRadius(0));
theta = 0; theta = 0;
@ -232,11 +233,11 @@ public class Astronaut : MonoBehaviour {
public void Dash() public void Dash()
{ {
iS(Time.time < DashTime + lastDashTime) if (Time.time < DashTime + lastDashTime)
return; return;
if (_state >= AstronautState.Ejecting) if (State >= AstronautState.Ejecting)
return; return;
lastDashTime = Time.time; lastDashTime = Time.time;
planet.PushWedge(this.theta); planet.PushWedge(this.theta);
@ -272,14 +273,5 @@ public class Astronaut : MonoBehaviour {
State = AstronautState.Walking; State = AstronautState.Walking;
_astronautAnimator.Walk(); _astronautAnimator.Walk();
} }
}
if (GUI.Button(new Rect(10, 190, 150, 50), "Eject"))
{
Debug.Lif(State == AstronautState.Walking)
{ StartCoroutine("WalkingStance");
}
{
StartCoroutine("WalkingStance");
}
}*/
} }