Add Ledge Climb

Kassout · Apr 18, 2023 · ea8eb57 · ea8eb57
1 parent c60cded
commit ea8eb57
Show file tree

Hide file tree

Showing 11 changed files with 1,520 additions and 12 deletions.
diff --git a/PlatformerController/Assets/Animation/Animations/LedgeClimb.anim b/PlatformerController/Assets/Animation/Animations/LedgeClimb.anim
diff --git a/PlatformerController/Assets/Animation/Animations/LedgeClimb.anim.meta b/PlatformerController/Assets/Animation/Animations/LedgeClimb.anim.meta
diff --git a/PlatformerController/Assets/Animation/Animations/Run.anim b/PlatformerController/Assets/Animation/Animations/Run.anim
@@ -0,0 +1,105 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Run
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - serializedVersion: 2
+    curve:
+    - time: 0
+      value: {fileID: 1390506691, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.083333336
+      value: {fileID: -601796100, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.16666667
+      value: {fileID: 919098476, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.25
+      value: {fileID: 976904710, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.33333334
+      value: {fileID: 285988174, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.41666666
+      value: {fileID: 608537908, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.5
+      value: {fileID: 204066285, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.5833333
+      value: {fileID: 417843998, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.6666667
+      value: {fileID: 1939706676, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.75
+      value: {fileID: 1608457649, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.8333333
+      value: {fileID: -435722931, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - time: 0.9166667
+      value: {fileID: 2039016733, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+    flags: 2
+  m_SampleRate: 12
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping:
+    - {fileID: 1390506691, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: -601796100, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 919098476, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 976904710, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 285988174, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 608537908, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 204066285, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 417843998, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 1939706676, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 1608457649, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: -435722931, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+    - {fileID: 2039016733, guid: 4507dc19fecf7dc47ba8074c027db7fd, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/PlatformerController/Assets/Animation/Animations/Run.anim.meta b/PlatformerController/Assets/Animation/Animations/Run.anim.meta
diff --git a/PlatformerController/Assets/Animation/Controllers/Player Animation Controller.controller b/PlatformerController/Assets/Animation/Controllers/Player Animation Controller.controller
@@ -104,6 +104,33 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-3781046201325162355
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LedgeClimb
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 8598943731173493842}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: a9de54933cfa1a24f99f92f0e4e8066e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-3715267526874573543
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -180,24 +207,28 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -4324384882950429314}
-    m_Position: {x: 260, y: 110, z: 0}
+    m_Position: {x: 310, y: 110, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 6190802396996155023}
-    m_Position: {x: 260, y: 200, z: 0}
+    m_Position: {x: 310, y: 200, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -104262345927898006}
     m_Position: {x: 100, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5594578535453641177}
-    m_Position: {x: 400, y: 0, z: 0}
+    m_Position: {x: 310, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3781046201325162355}
+    m_Position: {x: 520, y: 0, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: 1494769657716722603}
   - {fileID: -5098144713096885798}
+  - {fileID: 4309525311248953219}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 270, y: -100, z: 0}
+  m_AnyStatePosition: {x: 330, y: -110, z: 0}
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
@@ -301,6 +332,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: canClimbLedge
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -328,6 +365,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 2
     m_ConditionEvent: isWallSliding
     m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: canClimbLedge
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: -104262345927898006}
   m_Solo: 0
@@ -367,14 +407,39 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &4309525311248953219
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: canClimbLedge
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3781046201325162355}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 0
 --- !u!1102 &6190802396996155023
 AnimatorState:
   serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Walk
+  m_Name: Run
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
@@ -388,9 +453,31 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: e317e8ab10d941944964c60cf54cd86b, type: 2}
+  m_Motion: {fileID: 7400000, guid: 6fe1c20b72fd7704c800517a06ac2f44, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &8598943731173493842
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -4324384882950429314}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0.2999999
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
diff --git a/PlatformerController/Assets/Scenes/MainScene.unity b/PlatformerController/Assets/Scenes/MainScene.unity
@@ -402,6 +402,37 @@ MonoBehaviour:
   m_CameraActivatedEvent:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &549563377
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 549563378}
+  m_Layer: 0
+  m_Name: Ledge Check
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &549563378
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 549563377}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.48, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1398032899}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &576534574
 GameObject:
   m_ObjectHideFlags: 0
@@ -41357,6 +41388,7 @@ Transform:
   m_Children:
   - {fileID: 360449007}
   - {fileID: 1096669988}
+  - {fileID: 549563378}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -41446,7 +41478,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   amountOfJumps: 1
   movementSpeed: 9
-  jumpForce: 20
+  jumpForce: 21
   groundCheckRadius: 0.3
   wallCheckDistance: 0.65
   wallSlideSpeed: 1
@@ -41455,10 +41487,16 @@ MonoBehaviour:
   wallJumpForce: 30
   jumpTimerSet: 0.15
   turnTimerSet: 0.1
+  wallJumpTimerSet: 0.5
+  ledgeClimbXOffset1: 0.3
+  ledgeClimbXOffset2: 0.5
+  ledgeClimbYOffset1: 0
+  ledgeClimbYOffset2: 2
   wallHopDirection: {x: 1, y: 0.5}
   wallJumpDirection: {x: 1, y: 2}
   groundCheck: {fileID: 360449007}
   wallCheck: {fileID: 1096669988}
+  ledgeCheck: {fileID: 549563378}
   whatIsGround:
     serializedVersion: 2
     m_Bits: 64