Correction animation & ladders at the same time
This commit is contained in:
parent
36e3f7492a
commit
027b59712c
@ -6,7 +6,7 @@ DONE
|
|||||||
- Dash done
|
- Dash done
|
||||||
- Courir done ----------------->(Sunny a un saut amplifié quand tu sautes en pentes ou en prenant de l'elant avec la course)
|
- Courir done ----------------->(Sunny a un saut amplifié quand tu sautes en pentes ou en prenant de l'elant avec la course)
|
||||||
- S'accroupir done ------------>(Il peut crouch et courir en même temps)
|
- S'accroupir done ------------>(Il peut crouch et courir en même temps)
|
||||||
- Climb done ------------------>(Faire en sorte que si tu lache la touche, Sunny tombe du Ladders, Debuger l'animation de saut sur le Ladders)
|
- Climb done ------------------>
|
||||||
|
|
||||||
DOING
|
DOING
|
||||||
- Une zone ou tu es ralenti
|
- Une zone ou tu es ralenti
|
||||||
@ -105,10 +105,17 @@ public class Player : MonoBehaviour
|
|||||||
verticalValue = Input.GetAxis("Vertical");
|
verticalValue = Input.GetAxis("Vertical");
|
||||||
|
|
||||||
if (Input.GetKeyDown(KeyCode.Space) && canJump)
|
if (Input.GetKeyDown(KeyCode.Space) && canJump)
|
||||||
|
{
|
||||||
|
if (isClimbing)
|
||||||
|
{
|
||||||
|
isJumping = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
isJumping = true;
|
isJumping = true;
|
||||||
animController.SetBool("Jumping", true);
|
animController.SetBool("Jumping", true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
HanddleRun();
|
HanddleRun();
|
||||||
|
|
||||||
@ -176,7 +183,18 @@ public class Player : MonoBehaviour
|
|||||||
rb.gravityScale = 0f;
|
rb.gravityScale = 0f;
|
||||||
rb.velocity = new Vector2();
|
rb.velocity = new Vector2();
|
||||||
animController.SetBool("Climbing", true);
|
animController.SetBool("Climbing", true);
|
||||||
}
|
Debug.Log("Escalader");
|
||||||
|
/*if (isJumping)
|
||||||
|
{
|
||||||
|
animController.SetBool("Climbing", false);
|
||||||
|
}*/
|
||||||
|
}/*else
|
||||||
|
{
|
||||||
|
Debug.Log("Pas esclade");
|
||||||
|
//isClimbing = false;
|
||||||
|
//animController.SetBool("Climbing", false);
|
||||||
|
}*/
|
||||||
|
|
||||||
currentDash = dashLimit;
|
currentDash = dashLimit;
|
||||||
grounded = true;
|
grounded = true;
|
||||||
canJump = true;
|
canJump = true;
|
||||||
@ -191,6 +209,8 @@ public class Player : MonoBehaviour
|
|||||||
rb.gravityScale = originalGravity;
|
rb.gravityScale = originalGravity;
|
||||||
rb.velocity = new Vector2();
|
rb.velocity = new Vector2();
|
||||||
animController.SetBool("Climbing", false);
|
animController.SetBool("Climbing", false);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -119,7 +119,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 300, y: 300}
|
m_MinSize: {x: 300, y: 300}
|
||||||
m_MaxSize: {x: 24288, y: 24288}
|
m_MaxSize: {x: 24288, y: 24288}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 16014
|
controlID: 83
|
||||||
--- !u!114 &6
|
--- !u!114 &6
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@ -144,7 +144,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 200, y: 300}
|
m_MinSize: {x: 200, y: 300}
|
||||||
m_MaxSize: {x: 16192, y: 24288}
|
m_MaxSize: {x: 16192, y: 24288}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 15959
|
controlID: 84
|
||||||
--- !u!114 &7
|
--- !u!114 &7
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@ -169,7 +169,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 200, y: 200}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 16192, y: 16192}
|
m_MaxSize: {x: 16192, y: 16192}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 15960
|
controlID: 85
|
||||||
--- !u!114 &8
|
--- !u!114 &8
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@ -194,7 +194,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 100, y: 200}
|
m_MinSize: {x: 100, y: 200}
|
||||||
m_MaxSize: {x: 8096, y: 16192}
|
m_MaxSize: {x: 8096, y: 16192}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 15971
|
controlID: 61
|
||||||
--- !u!114 &9
|
--- !u!114 &9
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@ -322,8 +322,8 @@ MonoBehaviour:
|
|||||||
y: 0
|
y: 0
|
||||||
width: 563
|
width: 563
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 275, y: 50}
|
m_MinSize: {x: 276, y: 71}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 22}
|
m_ActualView: {fileID: 22}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 22}
|
- {fileID: 22}
|
||||||
@ -391,9 +391,9 @@ MonoBehaviour:
|
|||||||
m_SceneHierarchy:
|
m_SceneHierarchy:
|
||||||
m_TreeViewState:
|
m_TreeViewState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs: fe180000
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: fc09ffff880cffff240dfffff40dffff94c0ffffc8c1ffff
|
m_ExpandedIDs: 2afbffff
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@ -836,7 +836,7 @@ MonoBehaviour:
|
|||||||
m_FarClip: 10000
|
m_FarClip: 10000
|
||||||
m_DynamicClip: 1
|
m_DynamicClip: 1
|
||||||
m_OcclusionCulling: 0
|
m_OcclusionCulling: 0
|
||||||
m_LastSceneViewRotation: {x: -0.101033226, y: 0.27443978, z: -0.029008372, w: -0.95584327}
|
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
|
||||||
m_LastSceneViewOrtho: 0
|
m_LastSceneViewOrtho: 0
|
||||||
m_ReplacementShader: {fileID: 0}
|
m_ReplacementShader: {fileID: 0}
|
||||||
m_ReplacementString:
|
m_ReplacementString:
|
||||||
@ -989,9 +989,9 @@ MonoBehaviour:
|
|||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_FolderTreeState:
|
m_FolderTreeState:
|
||||||
scrollPos: {x: 0, y: 25}
|
scrollPos: {x: 0, y: 25}
|
||||||
m_SelectedIDs: 069d0000
|
m_SelectedIDs: c6620000
|
||||||
m_LastClickedID: 40198
|
m_LastClickedID: 25286
|
||||||
m_ExpandedIDs: 00000000029d0000089d0000e8a5000000ca9a3b
|
m_ExpandedIDs: 00000000ba620000bc620000be62000000ca9a3b
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@ -1019,7 +1019,7 @@ MonoBehaviour:
|
|||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 00000000029d0000089d0000e8a5000000ca9a3b
|
m_ExpandedIDs: 00000000ba620000bc620000be620000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user