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

FEEDBACK : Pousser la plateforme avec le dash une fois qu'on touche au sol. (pas avant)

Browse Source
This commit is contained in:
Jean-Sébastien Gervais 2016-04-09 09:08:16 -04:00
parent 5954106bf0
commit 2b2c52909a
2 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Astronaut.cs
View File

@ -146,12 +146,11 @@ public class Astronaut : MonoBehaviour {
float radius = GetGroundRadius(); float radius = GetGroundRadius();
if (grounded = (height <= radius)) if (grounded = (height <= radius))
{ {
/*if (State == AstronautState.Dashing) //Pousser la plateforme avec le dash une fois qu'on touche au sol.
if (State == AstronautState.Dashing)
{ {
planet.PushWedge(Repeat(theta,360)); planet.PushWedge(this.theta);
State = AstronautState.Idle; }
//TODO_SR Create dash impact here
}*/
height = radius; height = radius;
if (State == AstronautState.Jumping) if (State == AstronautState.Jumping)
@ -280,7 +279,7 @@ public class Astronaut : MonoBehaviour {
lastDashTime = Time.time; lastDashTime = Time.time;
planet.PushWedge(this.theta); //TODO devrait se faire juste avant d'être groundé //planet.PushWedge(this.theta); //TODO devrait se faire juste avant d'être groundé
State = AstronautState.Dashing; State = AstronautState.Dashing;
_astronautAnimator.Dash(); _astronautAnimator.Dash();
//vSpeed = -DashSpeed; //vSpeed = -DashSpeed;

60
Assets/_Scenes/Main.unity
View File

@ -85,6 +85,56 @@ NavMeshSettings:
cellSize: 0.16666667 cellSize: 0.16666667
manualCellSize: 0 manualCellSize: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1001 &49842865
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalPosition.z
value: 0.11
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 154602, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: m_Name
value: Astronaut_2
objectReference: {fileID: 0}
- target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: PlayerNumber
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
m_IsPrefabParent: 0
--- !u!114 &1027139440 stripped --- !u!114 &1027139440 stripped
MonoBehaviour: MonoBehaviour:
m_PrefabParentObject: {fileID: 11471614, guid: 198e988adacced646a19f757f6237ae1, m_PrefabParentObject: {fileID: 11471614, guid: 198e988adacced646a19f757f6237ae1,
@ -273,13 +323,9 @@ Prefab:
propertyPath: m_Name propertyPath: m_Name
value: Astronaut_1 value: Astronaut_1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} - target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: DustParticlesEmitter propertyPath: PlayerNumber
value: value: 1
objectReference: {fileID: 138982, guid: 6233079c5a9a756458811f283fdca112, type: 2}
- target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
propertyPath: EjectSpinSpeed
value: -50
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}