Now possible to jump and attack

3 年前 · 8c7c6a9c
--- a/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller
+++ b/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller
  m_InterruptionSource: 0
  m_OrderedInterruption: 0
  m_CanTransitionToSelf: 1
--- !u!1107 &-5902505208054257955
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: CaneHit(s)
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 1062338921458421844}
-    m_Position: {x: 310, y: 110, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 8824853613331383409}
-    m_Position: {x: 570, y: 110, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: -120, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 460, y: -140, z: 0}
-  m_ParentStateMachinePosition: {x: 30, y: 250, z: 0}
-  m_DefaultState: {fileID: 1062338921458421844}
 --- !u!1101 &-5538795969231381003
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  - serializedVersion: 1
    m_StateMachine: {fileID: 4345119286458520408}
    m_Position: {x: 60, y: 230, z: 0}
-  - serializedVersion: 1
-    m_StateMachine: {fileID: -5902505208054257955}
-    m_Position: {x: 420, y: -20, z: 0}
  m_AnyStateTransitions:
  - {fileID: -5538795969231381003}
  m_EntryTransitions: []
    - {fileID: 8071013304078578434}
    - {fileID: -992430128991661603}
    - {fileID: -2891568552439439435}
-  - first: {fileID: -5902505208054257955}
-    second: []
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: -510, y: 490, z: 0}
  m_EntryPosition: {x: -230, y: 230, z: 0}
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0.1
  m_TransitionOffset: 0
  m_ExitTime: 0.75
  m_HasExitTime: 0
  - m_ConditionMode: 2
    m_ConditionEvent: IsSurprised
    m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: HasFainted
+    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: 2430643345740167007}
  m_Solo: 0
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0.1
  m_TransitionOffset: 0
  m_ExitTime: 0.75
  m_HasExitTime: 0
  m_CanTransitionToSelf: 1
--- !u!1102 &1062338921458421844
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: CaneHit
-  m_Speed: 1.5
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 7831916655695780678}
-  - {fileID: 3248798429811070792}
-  - {fileID: 8817486432838174344}
-  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: 2ac155304be9e4c4b981fc59fbf0ae99, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!1101 &1188230412199073695
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &3248798429811070792
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Late exit
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: IsAttacking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 8824853613331383409}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.15867692
-  m_TransitionOffset: 0.31211436
-  m_ExitTime: 0.5501614
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1109 &3249358680624874759
 AnimatorTransition:
  m_ObjectHideFlags: 1
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &3510735065060121417
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Early exit
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: IsAttacking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1062338921458421844}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.054791033
-  m_TransitionOffset: 0.17735633
-  m_ExitTime: 0.5101718
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 1
 --- !u!1101 &3525189850006141372
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &5062253272111811497
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: IsAttacking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  serializedVersion: 3
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0.00020662394
-  m_ExitTime: 0.852398
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 1
 --- !u!1107 &5307822219818384105
 AnimatorStateMachine:
  serializedVersion: 6
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &5938010943531378176
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Late exit
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: IsAttacking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1062338921458421844}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.07931143
-  m_TransitionOffset: 0.19936715
-  m_ExitTime: 0.69279087
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &6193928822991170125
 AnimatorState:
  serializedVersion: 6
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &7831916655695780678
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Early exit
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: IsAttacking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 8824853613331383409}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.085659444
-  m_TransitionOffset: 0.22402006
-  m_ExitTime: 0.39091942
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 1
 --- !u!1101 &7870490288971834243
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &8817486432838174344
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: IsAttacking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  serializedVersion: 3
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0.00036855336
-  m_ExitTime: 0.82748896
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 0
-  m_CanTransitionToSelf: 1
--- !u!1102 &8824853613331383409
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: CaneHit2
-  m_Speed: 1.5
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 3510735065060121417}
-  - {fileID: 5938010943531378176}
-  - {fileID: 5062253272111811497}
-  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: 8c82fdb0da179794095b8f1f54e520ec, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!206 &8937469675511095552
 BlendTree:
  m_ObjectHideFlags: 1
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
  m_EditorClassIdentifier: 
  _transitions:
  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: 7e0b186ed246a9340bbe3ae0afb24c4b, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: a229bd64c7394ed4fbcee308330af25b, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
    Conditions:
    - ExpectedResult: 1
+    ToState: {fileID: 11400000, guid: a229bd64c7394ed4fbcee308330af25b, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+  - FromState: {fileID: 11400000, guid: a229bd64c7394ed4fbcee308330af25b, type: 2}
+    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: bf6a2f4642738ac4f8e84bcdf1cb5f93, type: 2}
+      Operator: 1
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 41dbff2af0b6f7141a32bb464309ba69, type: 2}
+      Operator: 1
+  - FromState: {fileID: 11400000, guid: a229bd64c7394ed4fbcee308330af25b, type: 2}
+    ToState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: bf6a2f4642738ac4f8e84bcdf1cb5f93, type: 2}
+      Operator: 1
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 41dbff2af0b6f7141a32bb464309ba69, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Operator: 0
  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
    Conditions:
      Condition: {fileID: 11400000, guid: ddd205b8cff23bc48b47aa5538d549be, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
    ToState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
    Conditions:
    - ExpectedResult: 0
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: 719320024c3ed2d4789670994a800541, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: a31b3419615ff8241b5cabe8d29ef4d0, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 9ad10330367c6be4c9c76859df208dd6, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
    ToState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
    Conditions:
    - ExpectedResult: 0
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: b5cf328bcf17e41469fda079c80b3c84, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: a31b3419615ff8241b5cabe8d29ef4d0, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 9ad10330367c6be4c9c76859df208dd6, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: a31b3419615ff8241b5cabe8d29ef4d0, type: 2}
    ToState: {fileID: 11400000, guid: 0d3d2071998e1dc408d1c59a2e7c0dc4, type: 2}
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 9ad10330367c6be4c9c76859df208dd6, type: 2}
      Operator: 0
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: 7e0b186ed246a9340bbe3ae0afb24c4b, type: 2}
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: 719320024c3ed2d4789670994a800541, type: 2}
-    - ExpectedResult: 1
+    - ExpectedResult: 0
-    ToState: {fileID: 11400000, guid: 719320024c3ed2d4789670994a800541, type: 2}
+    ToState: {fileID: 11400000, guid: 7e0b186ed246a9340bbe3ae0afb24c4b, type: 2}
-    - ExpectedResult: 0
+    - ExpectedResult: 1
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: 719320024c3ed2d4789670994a800541, type: 2}
+  - FromState: {fileID: 11400000, guid: 7e0b186ed246a9340bbe3ae0afb24c4b, type: 2}
+    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    - ExpectedResult: 0
+    - ExpectedResult: 1
-    - ExpectedResult: 0
+    - ExpectedResult: 1
-  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-    ToState: {fileID: 11400000, guid: 7e0b186ed246a9340bbe3ae0afb24c4b, type: 2}
+  - FromState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
+    ToState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: bf6a2f4642738ac4f8e84bcdf1cb5f93, type: 2}
+      Operator: 1
-      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: 7e0b186ed246a9340bbe3ae0afb24c4b, type: 2}
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 41dbff2af0b6f7141a32bb464309ba69, type: 2}
+      Operator: 1
+  - FromState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
+    ToState: {fileID: 11400000, guid: 38ff3f8ad5c802942938acd39d38ddd7, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscending.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscending.asset
  - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
  - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
  - {fileID: 11400000, guid: 94c42b885a988bf47a8af6a4887c88c1, type: 2}
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset
  - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
  - {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
  - {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscendingAttacking.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscendingAttacking.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
+  m_Name: JumpAscendingAttacking
+  m_EditorClassIdentifier: 
+  _actions:
+  - {fileID: 11400000, guid: 4a37fe6eda176f649b352e4c280ce246, type: 2}
+  - {fileID: 11400000, guid: 4984500e131bbe34594c4ab0e2c409f3, type: 2}
+  - {fileID: 11400000, guid: 00abdcc5c2b7e3d4d8855f1a84801fae, type: 2}
+  - {fileID: 11400000, guid: b099300f484e1344487cc666f75825cc, type: 2}
+  - {fileID: 11400000, guid: 5d9c1bbe4ffcb2146a540998d17b665d, type: 2}
+  - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
+  - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
+  - {fileID: 11400000, guid: 94c42b885a988bf47a8af6a4887c88c1, type: 2}
+  - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
+  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscendingAttacking.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscendingAttacking.asset.meta
+fileFormatVersion: 2
+guid: a229bd64c7394ed4fbcee308330af25b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescendingAttacking.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescendingAttacking.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
+  m_Name: JumpDescendingAttacking
+  m_EditorClassIdentifier: 
+  _actions:
+  - {fileID: 11400000, guid: b099300f484e1344487cc666f75825cc, type: 2}
+  - {fileID: 11400000, guid: 5d442cfcb78da8b418d6ae3e93e5748e, type: 2}
+  - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
+  - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
+  - {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
+  - {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}
+  - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescendingAttacking.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescendingAttacking.asset.meta
+fileFormatVersion: 2
+guid: 38ff3f8ad5c802942938acd39d38ddd7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: