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

Walking animation

Browse Source
This commit is contained in:
Sophie 2016-04-09 13:11:32 -04:00
parent 803bd94c77
commit 990560f27a
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Prefabs/Astronaut.prefab
View File

@ -145,7 +145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab270b0cb2475114ab8eb45661af0df1, type: 3} m_Script: {fileID: 11500000, guid: ab270b0cb2475114ab8eb45661af0df1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PlayerNumber: 1 PlayerNumber: 0
--- !u!114 &11491252 --- !u!114 &11491252
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -158,8 +158,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
aspi: {fileID: 0} aspi: {fileID: 0}
WalkAnimSpeed: 0 WalkAnimSpeed: 4
WalkAnimAngle: 0 WalkAnimAngle: 15
EjectSpinSpeed: 80 EjectSpinSpeed: 80
DustParticlesEmitter: {fileID: 138982, guid: 6233079c5a9a756458811f283fdca112, type: 2} DustParticlesEmitter: {fileID: 138982, guid: 6233079c5a9a756458811f283fdca112, type: 2}
--- !u!114 &11494368 --- !u!114 &11494368

24
Assets/Scripts/Astronaut.cs
View File

@ -56,11 +56,10 @@ public class Astronaut : MonoBehaviour {
SpriteDash.gameObject.SetActive(false); SpriteDash.gameObject.SetActive(false);
}*/ }*/
/*if (_state == AstronautState.Walking) if (State == AstronautState.Walking)
{ {
//StartCoroutine(WalkingStance()); _astronautAnimator.Walk(walkRight);
_astronautAnimator.Walk(); }
}*/
} }
} }
@ -68,6 +67,7 @@ public class Astronaut : MonoBehaviour {
private float height = 0; private float height = 0;
private float vSpeed = 0; private float vSpeed = 0;
private bool grounded = false; private bool grounded = false;
private bool walkRight = false;
private float walkTime = 0; private float walkTime = 0;
private int nextStep = 1; private int nextStep = 1;
@ -221,6 +221,7 @@ public class Astronaut : MonoBehaviour {
} }
else else
{ {
walkRight = move > 0;
State = AstronautState.Walking; State = AstronautState.Walking;
walkTime = 0f; walkTime = 0f;
} }
@ -237,7 +238,7 @@ public class Astronaut : MonoBehaviour {
float newHeight = GetGroundRadius(newTheta); float newHeight = GetGroundRadius(newTheta);
if (newHeight > height) if (newHeight > height)
{ {
Debug.Log("Blocked by wall"); //Debug.Log("Blocked by wall");
return; // Blocked by wall return; // Blocked by wall
} }
@ -303,7 +304,7 @@ public class Astronaut : MonoBehaviour {
/// </summary> /// </summary>
public void Stun() public void Stun()
{ {
print("Stunned"); //print("Stunned");
} }
public void OnGUI() public void OnGUI()
@ -311,7 +312,14 @@ public class Astronaut : MonoBehaviour {
if (GUI.Button(new Rect(10, 10, 150, 50), State.ToString())) if (GUI.Button(new Rect(10, 10, 150, 50), State.ToString()))
{ {
Debug.Log("Clicked the button with an image"); Debug.Log("Clicked the button with an image");
Eject(); //_astronautAnimator.Walk();
} //Eject();
}
/* if (GUI.Button(new Rect(60, 10, 150, 50), "Stop"))
{
Debug.Log("Clicked the button with an image");
_astronautAnimator.StopWalk();
//Eject();
}*/
} }
} }

18
Assets/Scripts/AstronautAnimator.cs
View File

@ -39,9 +39,10 @@ public class AstronautAnimator : MonoBehaviour {
aspi.SpriteDash.gameObject.SetActive(false); aspi.SpriteDash.gameObject.SetActive(false);
} }
public void Walk() public void Walk(bool right)
{ {
StartCoroutine(Rotate()); Debug.Log("Walking!");
StartCoroutine(Rotate(right? -1 : 1));
} }
public void Eject() public void Eject()
@ -58,9 +59,9 @@ public class AstronautAnimator : MonoBehaviour {
} }
} }
IEnumerator Rotate() IEnumerator Rotate(float side)
{ {
for (float i = 0.5f; i < 2.5f; i+= Time.deltaTime*WalkAnimSpeed) for (float i = 0.5f; i < 1.5f; i+= Time.deltaTime*WalkAnimSpeed)
{ {
/*int roundDown = 10; /*int roundDown = 10;
//0.5, 1.5 et 2.5 //0.5, 1.5 et 2.5
@ -70,15 +71,18 @@ public class AstronautAnimator : MonoBehaviour {
aspi.SpriteWalk.flipX = !aspi.SpriteWalk.flipX; aspi.SpriteWalk.flipX = !aspi.SpriteWalk.flipX;
}*/ }*/
float position = Mathf.PingPong(i, 1f); float position = Mathf.PingPong(i, 1f);
transform.rotation = Quaternion.Euler(0, 0, (position - 0.5f) * WalkAnimAngle * 2); transform.localRotation = Quaternion.Euler(0, 0, side * (position - 0.5f) * WalkAnimAngle * 2);
yield return null; yield return null;
} }
if (aspi.State == Astronaut.AstronautState.Walking) if (aspi.State == Astronaut.AstronautState.Walking)
{ {
StartCoroutine(Rotate()); Debug.Log("Walking again");
StartCoroutine(Rotate(-side));
} }
yield return null; else
Debug.Log("Walking stop");
//yield return null;
} }
public void EmitDustParticules() public void EmitDustParticules()

8
Assets/_Scenes/Main.unity
View File

@ -132,10 +132,6 @@ Prefab:
propertyPath: m_Name propertyPath: m_Name
value: Astronaut_0 value: Astronaut_0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: PlayerNumber
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
@ -515,6 +511,10 @@ Prefab:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: PlayerNumber
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0