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

All merges accepted

Browse Source
This commit is contained in:
Sophie 2016-04-08 22:26:21 -04:00
parent 9983916ebc
commit 72b4975ab1
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scripts/Astronaut.cs
View File

@ -228,9 +228,13 @@ public class Astronaut : MonoBehaviour {
public void Jump() public void Jump()
{ {
Debug.Log("Jump!");
if (State >= AstronautState.Ejecting) if (State >= AstronautState.Ejecting)
return; return;
_astronautAnimator.Jump(); _astronautAnimator.Jump();
if (State == AstronautState.Jumping) if (State == AstronautState.Jumping)
{ {
Dash(); Dash();
@ -238,6 +242,7 @@ public class Astronaut : MonoBehaviour {
return; return;
} }
if (!grounded) return; if (!grounded) return;
vSpeed = JumpSpeed; vSpeed = JumpSpeed;
grounded = false; grounded = false;

34
Assets/_Scenes/Main.unity
View File

@ -85,6 +85,31 @@ NavMeshSettings:
cellSize: 0.16666667 cellSize: 0.16666667
manualCellSize: 0 manualCellSize: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &431637404 stripped
GameObject:
m_PrefabParentObject: {fileID: 170392, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
m_PrefabInternal: {fileID: 1660116367}
--- !u!114 &431637410 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc,
type: 2}
m_PrefabInternal: {fileID: 1660116367}
m_Script: {fileID: 11500000, guid: 8c32c40e0b8e5eb47bb7a91068af09ca, type: 3}
--- !u!114 &431637411
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 431637404}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 77462b2431858f84b9bc2d055c2f4d45, type: 3}
m_Name:
m_EditorClassIdentifier:
aspi: {fileID: 431637410}
WalkAnimSpeed: 3
WalkAnimAngle: 20
EjectSpinSpeed: 5
--- !u!114 &1027139440 stripped --- !u!114 &1027139440 stripped
MonoBehaviour: MonoBehaviour:
m_PrefabParentObject: {fileID: 11471614, guid: 198e988adacced646a19f757f6237ae1, m_PrefabParentObject: {fileID: 11471614, guid: 198e988adacced646a19f757f6237ae1,
@ -138,6 +163,11 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 158e745881137e04ca2086294f44d74c, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 158e745881137e04ca2086294f44d74c, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!212 &1106066633 stripped
SpriteRenderer:
m_PrefabParentObject: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc,
type: 2}
m_PrefabInternal: {fileID: 1660116367}
--- !u!1001 &1223268487 --- !u!1001 &1223268487
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -297,6 +327,10 @@ Prefab:
propertyPath: m_Radius propertyPath: m_Radius
value: 0.76 value: 0.76
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: SpriteWalk
value:
objectReference: {fileID: 1106066633}
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