Merge branch 'ciro'

UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab

   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 409860038}
-  m_LocalRotation: {x: 0.8939347, y: 0.39576405, z: -0.042497154, w: 0.20602317}
-  m_LocalPosition: {x: -0.2854, y: 0.417, z: -0.3647}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8151672050672611396}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1707782073
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1707782074}
-  m_Layer: 9
-  m_Name: Hint
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1707782074
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1707782073}
   m_LocalRotation: {x: -0.13346307, y: -0.388644, z: -0.46032965, w: 0.7869181}
   m_LocalPosition: {x: 0.365, y: 0.42075947, z: -0.223}
   m_LocalScale: {x: 1, y: 1, z: 1}
         transform: {fileID: 6742437446004126022}
         weight: 1
       m_Item1:
-        transform: {fileID: 719926533656049987}
+        transform: {fileID: 3222399745563398193}
         weight: 0
       m_Item2:
         transform: {fileID: 0}
   m_Material: {fileID: 0}
   m_IsTrigger: 1
   m_Enabled: 1
-  m_Radius: 0.34339768
+  m_Radius: 0.3
-  m_Center: {x: 0.023397654, y: 0.65, z: 2.217162e-10}
+  m_Center: {x: 0, y: 0.65, z: 0}
 --- !u!143 &7139847135753839646
 CharacterController:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Height: 1.3
   m_Radius: 0.3
-  m_SlopeLimit: 45
-  m_StepOffset: 0.05
+  m_SlopeLimit: 50
+  m_StepOffset: 0.15
-  m_MinMoveDistance: 0.001
+  m_MinMoveDistance: 0.005
   m_Center: {x: 0, y: 0.65, z: 0}
 --- !u!95 &6236864711762602263
 Animator:
   m_EditorClassIdentifier: 
   _transitionTableSO: {fileID: 11400000, guid: f0baa4ca2bfa24e4cb6d1efe9fa81ea3, type: 2}
   _debugger:
-    debugTransitions: 0
+    debugTransitions: 1
     appendConditionsInfo: 1
     appendActionsInfo: 1
     currentState: 
   m_EditorClassIdentifier: 
   m_Weight: 0
   m_Data:
-    m_ConstrainedObject: {fileID: 2776490476495705815}
+    m_ConstrainedObject: {fileID: 719926533656049987}
     m_SourceObjects:
       m_Length: 1
       m_Item0:
   m_Father: {fileID: 7980046698497209273}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2346068202725057742
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2776490476495705815}
-  m_Layer: 9
-  m_Name: Controller
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2776490476495705815
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2346068202725057742}
-  m_LocalRotation: {x: -0.20725605, y: -0.20488772, z: -0.49939996, w: 0.81588334}
-  m_LocalPosition: {x: 0.40939957, y: 0.3401454, z: 0.11575337}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 3060529613368993013}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -90.773964, y: -36.015335, z: -30.551819}
 --- !u!1 &2561880875395320411
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3054586532798924688}
-  m_LocalRotation: {x: 0.8457748, y: 0.4910613, z: 0.0037771466, w: 0.2085893}
-  m_LocalPosition: {x: -0.37819502, y: 0.33638594, z: -0.12222849}
+  m_LocalRotation: {x: -0.20725605, y: -0.20488772, z: -0.49939996, w: 0.81588334}
+  m_LocalPosition: {x: 0.40939957, y: 0.3401454, z: 0.11575337}
-  m_Father: {fileID: 8151672050672611396}
+  m_Father: {fileID: 3060529613368993013}
-  m_LocalEulerAnglesHint: {x: 159.566, y: -13.027985, z: -62.636993}
+  m_LocalEulerAnglesHint: {x: -90.773964, y: -36.015335, z: -30.551819}
 --- !u!1 &3441791691206738763
 GameObject:
   m_ObjectHideFlags: 0
   m_EditorClassIdentifier: 
   m_Weight: 1
   m_Effectors:
-  - m_Transform: {fileID: 2776490476495705815}
+  - m_Transform: {fileID: 719926533656049987}
     m_Style:
       shape: {fileID: 4300000, guid: 687b70eb9c49243639f9379f6965034f, type: 2}
       color: {r: 0.12220478, g: 1, b: 0, a: 0.16862746}
     m_Visible: 1
-  - m_Transform: {fileID: 719926533656049987}
+  - m_Transform: {fileID: 3222399745563398193}
     m_Style:
       shape: {fileID: 4300000, guid: 687b70eb9c49243639f9379f6965034f, type: 2}
       color: {r: 0.12220478, g: 1, b: 0, a: 0.16862746}
     m_Visible: 1
-  - m_Transform: {fileID: 1707782074}
+  - m_Transform: {fileID: 409860039}
     m_Style:
       shape: {fileID: 4300000, guid: c6793350c150f456688e39a81f97364a, type: 2}
       color: {r: 0.016251087, g: 1, b: 0, a: 0.5}
     m_Visible: 1
-  - m_Transform: {fileID: 409860039}
+  - m_Transform: {fileID: 1223245873766977938}
     m_Style:
       shape: {fileID: 4300000, guid: c6793350c150f456688e39a81f97364a, type: 2}
       color: {r: 0.0073928833, g: 1, b: 0, a: 0.5}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 719926533656049987}
-  - {fileID: 409860039}
+  - {fileID: 3222399745563398193}
+  - {fileID: 1223245873766977938}
   m_Father: {fileID: 8365657167153843912}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
     m_Root: {fileID: 3597017886523096375}
     m_Mid: {fileID: 996919128022108076}
     m_Tip: {fileID: 7980046698497209273}
-    m_Target: {fileID: 719926533656049987}
-    m_Hint: {fileID: 409860039}
+    m_Target: {fileID: 3222399745563398193}
+    m_Hint: {fileID: 1223245873766977938}
     m_TargetPositionWeight: 1
     m_TargetRotationWeight: 1
     m_HintWeight: 1
   m_SettingsGUIToggle: 1
+--- !u!1 &6174286042992265391
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1223245873766977938}
+  m_Layer: 9
+  m_Name: Hint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1223245873766977938
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6174286042992265391}
+  m_LocalRotation: {x: 0.8939347, y: 0.39576405, z: -0.042497154, w: 0.20602317}
+  m_LocalPosition: {x: -0.2854, y: 0.417, z: -0.3647}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8151672050672611396}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6594267824979261258
 GameObject:
   m_ObjectHideFlags: 0
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 2776490476495705815}
-  - {fileID: 1707782074}
+  - {fileID: 719926533656049987}
+  - {fileID: 409860039}
   m_Father: {fileID: 8365657167153843912}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
     m_Root: {fileID: 6915316659346450001}
     m_Mid: {fileID: 1923828950100165288}
     m_Tip: {fileID: 5715074524044649684}
-    m_Target: {fileID: 2776490476495705815}
-    m_Hint: {fileID: 1707782074}
+    m_Target: {fileID: 719926533656049987}
+    m_Hint: {fileID: 409860039}
     m_TargetPositionWeight: 1
     m_TargetRotationWeight: 1
     m_HintWeight: 1
   m_Father: {fileID: 1083073290189785667}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8624255680823624289
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3222399745563398193}
+  m_Layer: 9
+  m_Name: Controller
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3222399745563398193
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8624255680823624289}
+  m_LocalRotation: {x: 0.8457748, y: 0.4910613, z: 0.0037771466, w: 0.2085893}
+  m_LocalPosition: {x: -0.37819502, y: 0.33638594, z: -0.12222849}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8151672050672611396}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 159.566, y: -13.027985, z: -62.636993}
 --- !u!1 &8663361307073201546
 GameObject:
   m_ObjectHideFlags: 0
     - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -4.73489
-      value: 0
+      value: -0.0021913797
-      value: 0
+      value: 3.4678483
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
         type: 3}
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &6283366920650448094 stripped
+--- !u!4 &5700738674217691736 stripped
-  m_CorrespondingSourceObject: {fileID: -2324313729559432842, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &8637924750589673304 stripped
+--- !u!4 &1083073290189785667 stripped
-  m_CorrespondingSourceObject: {fileID: 9182121511924208368, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &4758616446005709032 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!137 &2643181883930254223 stripped
+SkinnedMeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &436620074108784059 stripped
+--- !u!4 &7479199366626129125 stripped
-  m_CorrespondingSourceObject: {fileID: 1045485693096927251, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
-  m_PrefabInstance: {fileID: 616254372594363816}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &7450739070704029045 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -1158771302699065123, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5944104996185666453 stripped
+--- !u!4 &489423445654532973 stripped
-  m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705,
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &9049048348530379419 stripped
+--- !u!4 &8916725356198928834 stripped
-  m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &928224351994020785 stripped
+--- !u!4 &8237582483159280860 stripped
-  m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &1083073290189785667 stripped
+--- !u!4 &8291487101514034000 stripped
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &6905220490405268265 stripped
+--- !u!4 &8613994902604584134 stripped
-  m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &2518796056843120514 stripped
+--- !u!4 &4150588075678938521 stripped
-  m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &9121043209303941797 stripped
+--- !u!4 &5337852870612368657 stripped
-  m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5337852870612368657 stripped
+--- !u!4 &2553538599320838613 stripped
-  m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &7646398735186508214 stripped
+--- !u!4 &6238229487294904517 stripped
-  m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &6251068571708505270 stripped
+--- !u!4 &3509300304837266133 stripped
-  m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!137 &2643181883930254223 stripped
-SkinnedMeshRenderer:
-  m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!4 &1693530112229282522 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &7479199366626129125 stripped
+--- !u!4 &2961255287932742051 stripped
-  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &489423445654532973 stripped
+--- !u!4 &4323982477642669181 stripped
-  m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8916725356198928834 stripped
+--- !u!4 &7422665375057060625 stripped
-  m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8237582483159280860 stripped
+--- !u!4 &5616668664904030341 stripped
-  m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8291487101514034000 stripped
+--- !u!4 &8764961453140708844 stripped
-  m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5700738674217691736 stripped
+--- !u!4 &5352552595453864673 stripped
-  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8613994902604584134 stripped
+--- !u!4 &8865730958858592416 stripped
-  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &4150588075678938521 stripped
+--- !u!4 &313519885195136893 stripped
-  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &2553538599320838613 stripped
+--- !u!4 &1780510391696116336 stripped
-  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &2680419760045213584 stripped
+--- !u!4 &3597017886523096375 stripped
-  m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &6924639228666418553 stripped
+--- !u!4 &996919128022108076 stripped
-  m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8746458819780820913 stripped
+--- !u!4 &7980046698497209273 stripped
-  m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5328577669981913599 stripped
+--- !u!4 &5338329370284706551 stripped
-  m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &675585260765626204 stripped
+--- !u!4 &722022415557853372 stripped
-  m_CorrespondingSourceObject: {fileID: -9084524466672233740, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &6856479198010907045 stripped
+--- !u!4 &8520217290748661238 stripped
-  m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &7103292230657876148 stripped
+--- !u!4 &8731736048503314800 stripped
-  m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &8731736048503314800 stripped
+--- !u!4 &7103292230657876148 stripped
-  m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8520217290748661238 stripped
+--- !u!4 &6856479198010907045 stripped
-  m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &722022415557853372 stripped
+--- !u!4 &675585260765626204 stripped
-  m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -9084524466672233740, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5338329370284706551 stripped
+--- !u!4 &5328577669981913599 stripped
-  m_CorrespondingSourceObject: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &7980046698497209273 stripped
+--- !u!4 &8746458819780820913 stripped
-  m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &996919128022108076 stripped
+--- !u!4 &6924639228666418553 stripped
-  m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &3597017886523096375 stripped
+--- !u!4 &2680419760045213584 stripped
-  m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &1780510391696116336 stripped
+--- !u!4 &6251068571708505270 stripped
-  m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &313519885195136893 stripped
+--- !u!4 &6283366920650448094 stripped
-  m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2324313729559432842, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8865730958858592416 stripped
+--- !u!4 &7646398735186508214 stripped
-  m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5352552595453864673 stripped
+--- !u!4 &9121043209303941797 stripped
-  m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &8764961453140708844 stripped
+--- !u!4 &2518796056843120514 stripped
-  m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &5616668664904030341 stripped
+--- !u!4 &6905220490405268265 stripped
-  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &7422665375057060625 stripped
+--- !u!4 &928224351994020785 stripped
-  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &4323982477642669181 stripped
+--- !u!4 &9049048348530379419 stripped
-  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &2961255287932742051 stripped
+--- !u!4 &5944104996185666453 stripped
-  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_PrefabInstance: {fileID: 616254372594363816}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &7450739070704029045 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -1158771302699065123, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &1693530112229282522 stripped
+--- !u!4 &436620074108784059 stripped
-  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 1045485693096927251, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &3509300304837266133 stripped
+--- !u!4 &4758616446005709032 stripped
-  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705,
---- !u!4 &6238229487294904517 stripped
+--- !u!4 &8637924750589673304 stripped
-  m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 9182121511924208368, guid: c478a391cfbc4b74ebda3f9a57283705,
     type: 3}
   m_PrefabInstance: {fileID: 616254372594363816}
   m_PrefabAsset: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6881708490215676357, guid: 5bf7aeff6af6cad4ba9c19219c9841db,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+--- !u!4 &3583992150622067535 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db,
+    type: 3}
+  m_PrefabInstance: {fileID: 2293294246731547253}
+  m_PrefabAsset: {fileID: 0}
-    type: 3}
-  m_PrefabInstance: {fileID: 2293294246731547253}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &3583992150622067535 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db,
     type: 3}
   m_PrefabInstance: {fileID: 2293294246731547253}
   m_PrefabAsset: {fileID: 0}
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f8a6e96eef53e5a4686f9a85a72fe73b, type: 3}
---- !u!198 &4559447277278735044 stripped
-ParticleSystem:
-  m_CorrespondingSourceObject: {fileID: 8368940308521127494, guid: f8a6e96eef53e5a4686f9a85a72fe73b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5431934865371800706}
-  m_PrefabAsset: {fileID: 0}
+    type: 3}
+  m_PrefabInstance: {fileID: 5431934865371800706}
+  m_PrefabAsset: {fileID: 0}
+--- !u!198 &4559447277278735044 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 8368940308521127494, guid: f8a6e96eef53e5a4686f9a85a72fe73b,
     type: 3}
   m_PrefabInstance: {fileID: 5431934865371800706}
   m_PrefabAsset: {fileID: 0}
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a75f6395e1487b344a0ffafad66fc95a, type: 3}
---- !u!198 &3258071037643727441 stripped
-ParticleSystem:
-  m_CorrespondingSourceObject: {fileID: 5197471990935564586, guid: a75f6395e1487b344a0ffafad66fc95a,
+--- !u!4 &9135146627525748615 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2004471342811329788, guid: a75f6395e1487b344a0ffafad66fc95a,
---- !u!4 &9135146627525748615 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2004471342811329788, guid: a75f6395e1487b344a0ffafad66fc95a,
+--- !u!198 &3258071037643727441 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 5197471990935564586, guid: a75f6395e1487b344a0ffafad66fc95a,
     type: 3}
   m_PrefabInstance: {fileID: 7284536550510007163}
   m_PrefabAsset: {fileID: 0}
       propertyPath: m_Name
       value: LandingParticle
       objectReference: {fileID: 0}
+    - target: {fileID: 8525369151793231701, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+--- !u!4 &8517470450379016030 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,
+    type: 3}
+  m_PrefabInstance: {fileID: 8181670996397994228}
+  m_PrefabAsset: {fileID: 0}
 --- !u!198 &334012115255375375 stripped
 ParticleSystem:
   m_CorrespondingSourceObject: {fileID: 8442424470799517435, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,
---- !u!4 &8517470450379016030 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,
-    type: 3}
-  m_PrefabInstance: {fileID: 8181670996397994228}
-  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Mountain_Path.asset

       m_KeyId: 0
       m_Key: 
     m_FallbackState: 0
+    m_WaitForCompletion: 1

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/GravityGround.asset

   m_Script: {fileID: 11500000, guid: 5e724f945a0fb204fa0f39919afe653b, type: 3}
   m_Name: GravityGround
   m_EditorClassIdentifier: 
-  verticalPull: -5
+  verticalPull: -10

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/ShakeCam.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 63a903051ce61cb45a169b9074844fa9, type: 3}
-  m_Name: ShakeCamAction
+  m_Name: ShakeCam
   m_EditorClassIdentifier: 
   camShakeEvent: {fileID: 11400000, guid: 3d8e5223e1e74274cbb375151106b21e, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PlayLiftoffJumpParticles.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 44b3d687684302544b7c240cfbe221eb, type: 3}
-  m_Name: PlayLiftoffJumpParticlesAction
+  m_Name: PlayLiftoffJumpParticles
   m_EditorClassIdentifier: 

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/GetHitFlashingEffect.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d78e64f40e78cdb4081b22e3e9f02fab, type: 3}
-  m_Name: GetHitFlashingEffectAction
+  m_Name: GetHitFlashingEffect
   m_EditorClassIdentifier: 

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AnimatorMoveSpeed.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 89b354c39b5e27d4b974ab1569e800b8, type: 3}
-  m_Name: AnimatorMoveSpeedAction
+  m_Name: AnimatorMoveSpeed
   m_EditorClassIdentifier: 
   parameterName: MovingSpeed

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset

     - ExpectedResult: 0
       Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
       Operator: 0
-  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
-    ToState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
-      Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
-      Operator: 0
-    - ExpectedResult: 0
-      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: 0
       Condition: {fileID: 11400000, guid: 9ad10330367c6be4c9c76859df208dd6, type: 2}
       Operator: 0
-  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
-    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    Conditions:
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
-    ToState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
-      Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: ddd205b8cff23bc48b47aa5538d549be, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
-    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: b5cf328bcf17e41469fda079c80b3c84, type: 2}
-      Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
-      Operator: 0
   - FromState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
     ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
     Conditions:
     Conditions:
     - ExpectedResult: 1
       Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
-    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: b5cf328bcf17e41469fda079c80b3c84, type: 2}
       Operator: 0
   - FromState: {fileID: 11400000, guid: a31b3419615ff8241b5cabe8d29ef4d0, type: 2}
     ToState: {fileID: 11400000, guid: 0d3d2071998e1dc408d1c59a2e7c0dc4, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset

   m_Name: Idle
   m_EditorClassIdentifier: 
   _actions:
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
+  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}
-  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
-  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscending.asset

   m_Name: JumpAscending
   m_EditorClassIdentifier: 
   _actions:
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
+  - {fileID: 11400000, guid: 00abdcc5c2b7e3d4d8855f1a84801fae, type: 2}
+  - {fileID: 11400000, guid: 94c42b885a988bf47a8af6a4887c88c1, type: 2}
-  - {fileID: 11400000, guid: 00abdcc5c2b7e3d4d8855f1a84801fae, type: 2}
-  - {fileID: 11400000, guid: 94c42b885a988bf47a8af6a4887c88c1, type: 2}
-  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscendingAttacking.asset

   m_Name: JumpAscendingAttacking
   m_EditorClassIdentifier: 
   _actions:
+  - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
+  - {fileID: 11400000, guid: 00abdcc5c2b7e3d4d8855f1a84801fae, type: 2}
+  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}
+  - {fileID: 11400000, guid: 94c42b885a988bf47a8af6a4887c88c1, type: 2}
-  - {fileID: 11400000, guid: 00abdcc5c2b7e3d4d8855f1a84801fae, type: 2}
-  - {fileID: 11400000, guid: 94c42b885a988bf47a8af6a4887c88c1, type: 2}
-  - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
-  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset

   m_Name: JumpDescending
   m_EditorClassIdentifier: 
   _actions:
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
+  - {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}
-  - {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}
-  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescendingAttacking.asset

   m_Name: JumpDescendingAttacking
   m_EditorClassIdentifier: 
   _actions:
+  - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
+  - {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}
-  - {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}
-  - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Sliding.asset

   m_Name: Sliding
   m_EditorClassIdentifier: 
   _actions:
-  - {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
+  - {fileID: 11400000, guid: b5ff176a9c04b144d97cb4f1cd3f7bef, type: 2}
+  - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
+  - {fileID: 11400000, guid: bcf4edc006209d54da9cd4c18329bb43, type: 2}
+  - {fileID: 11400000, guid: bd85c54d16eb60c4c99504f1679af851, type: 2}
   - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
   - {fileID: 11400000, guid: 4badb7afa3370ba4d8a229584c5c744f, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset

   m_Name: Walking
   m_EditorClassIdentifier: 
   _actions:
+  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
+  - {fileID: 11400000, guid: 5aac41c53e47f1040a52303b2000ceb5, type: 2}
+  - {fileID: 11400000, guid: fa0ce5b895dcf17499819f0d6f2dce96, type: 2}
-  - {fileID: 11400000, guid: fa0ce5b895dcf17499819f0d6f2dce96, type: 2}
-  - {fileID: 11400000, guid: 5aac41c53e47f1040a52303b2000ceb5, type: 2}
-  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
-  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}

UOP1_Project/Assets/Scripts/Characters/Protagonist.cs

 
 	private void Update()
 	{
+		GroundCheck();
+	private void GroundCheck()
+	{
+		
+	}
+
-		float targetSpeed = 0f;
+		float targetSpeed;
 		Vector3 adjustedMovement;
 
 		if (gameplayCameraTransform.isSet)

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/AerialMovementActionSO.cs

 
 			if (signVel != signInput || absVel < targetSpeed)
 			{
-				currentAxisSpeed += axisInput * acceleration * Time.deltaTime;
+				currentAxisSpeed += axisInput * acceleration;
 				currentAxisSpeed = Mathf.Clamp(currentAxisSpeed, -targetSpeed, targetSpeed);
 			}
 			else

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/AscendActionSO.cs

 	{
 		_gravityContributionMultiplier += Protagonist.GRAVITY_COMEBACK_MULTIPLIER;
 		_gravityContributionMultiplier *= Protagonist.GRAVITY_DIVIDER; //Reduce the gravity effect
-		_verticalMovement += Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * Time.deltaTime * _gravityContributionMultiplier;
+
+		//Note that deltaTime is used even though it's going to be used in ApplyMovementVectorAction, this is because it represents an acceleration, not a speed
+		_verticalMovement += Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * _gravityContributionMultiplier * Time.deltaTime;
 		//Note that even if it's added, the above value is negative due to Physics.gravity.y
 
 		_protagonistScript.movementVector.y = _verticalMovement;

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DescendActionSO.cs

 
 	public override void OnUpdate()
 	{
+		//Note that deltaTime is used even though it's going to be used in ApplyMovementVectorAction, this is because it represents an acceleration, not a speed
 		_verticalMovement += Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * Time.deltaTime;
 		//Note that even if it's added, the above value is negative due to Physics.gravity.y
 

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/HorizontalMoveActionSO.cs

 
 	public override void OnUpdate()
 	{
+		//delta.Time is used when the movement is applied (ApplyMovementVectorAction)
 		_protagonistScript.movementVector.x = _protagonistScript.movementInput.x * _originSO.speed;
 		_protagonistScript.movementVector.z = _protagonistScript.movementInput.z * _originSO.speed;
 	}

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/SlideActionSO.cs

 
 public class SlideAction : StateAction
 {
-	private Protagonist _protagonistScript;
+	private Protagonist _protagonist;
-		_protagonistScript = stateMachine.GetComponent<Protagonist>();
+		_protagonist = stateMachine.GetComponent<Protagonist>();
-		Vector3 velocity = _protagonistScript.movementVector;
-		float speed = -Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * Time.deltaTime;
+		float speed = -Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * .4f;
+		Vector3 hitNormal = _protagonist.lastHit.normal;
+		Vector3 slideDirection = new Vector3(hitNormal.x, -hitNormal.y, hitNormal.z);
+		Vector3.OrthoNormalize(ref hitNormal, ref slideDirection);
-		Vector3 hitNormal = _protagonistScript.lastHit.normal;
-		var vector = new Vector3(hitNormal.x, -hitNormal.y, hitNormal.z);
-		Vector3.OrthoNormalize(ref hitNormal, ref vector);
+		//Trick below has been commented because it was pushing the character "into" the ground much too often,
+		//producing a collision, which would result in the character being stuck while in the Sliding state
-		// Cheap way to avoid overshooting the character, which causes it to move away from the slope
-		if (Mathf.Sign(vector.x) == Mathf.Sign(velocity.x))
-			vector.x *= 0.5f;
-		if (Mathf.Sign(vector.z) == Mathf.Sign(velocity.z))
-			vector.z *= 0.5f;
+		//Vector3 slidingMovement = _protagonist.movementVector;
+		//// Cheap way to avoid overshooting the character, which causes it to move away from the slope
+		//if (Mathf.Sign(slideDirection.x) == Mathf.Sign(slidingMovement.x))
+		//	slideDirection.x *= 0.5f;
+		//if (Mathf.Sign(slideDirection.z) == Mathf.Sign(slidingMovement.z))
+		//	slideDirection.z *= 0.5f;
-		velocity += vector * speed;
+		//slidingMovement += slideDirection * speed;
-		_protagonistScript.movementVector = velocity;
+		_protagonist.movementVector = slideDirection * speed;
 	}
 }

UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/HasHitHeadConditionSO.cs

 		bool isMovingUpwards = _protagonistScript.movementVector.y > 0f;
 		if (isMovingUpwards)
 		{
-			// Making sure the collision is near the top of the head
-			float permittedDistance = _characterController.radius / 2f;
-			float topPositionY = _transform.position.y + _characterController.height;
-			float distance = Mathf.Abs(_protagonistScript.lastHit.point.y - topPositionY);
-			if (distance <= permittedDistance)
+			if(_characterController.collisionFlags == CollisionFlags.Above)
 			{
 				_protagonistScript.jumpInput = false;
 				_protagonistScript.movementVector.y = 0f;

UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsSlidingConditionSO.cs

 
 	protected override bool Statement()
 	{
-		if (_protagonistScript.lastHit == null)
-			return false;
+		float stepHeight = _protagonistScript.lastHit.point.y - _protagonistScript.transform.position.y;
+		bool isWalkableStep = stepHeight <= _characterController.stepOffset;
-		return (currentSlope >= _characterController.slopeLimit);
+		bool isSlopeTooSteep = currentSlope >= _characterController.slopeLimit;
+
+		if (!isSlopeTooSteep)
+		{
+			//Pendence is within slope limits
+			return false;
+		}
+		else
+		{
+			//If the slope is too steep, we prevent sliding if it's within the step limit
+			return !isWalkableStep;
+		}
 	}
 }

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_False_OnEnter.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: 4c70afd7f911db7449d578cc18700875, type: 3}
+  m_Name: IsAirborne_False_OnEnter
+  m_EditorClassIdentifier: 
+  parameterType: 0
+  parameterName: IsAirborne
+  boolValue: 0
+  intValue: 0
+  floatValue: 0
+  whenToRun: 0

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_False_OnEnter.asset.meta

+fileFormatVersion: 2
+guid: b5ff176a9c04b144d97cb4f1cd3f7bef
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_SlidingCheck.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: 8139f9f328ed1144690b7a9ffca2d5b4, type: 3}
-  m_Name: Timer_SlidingCheck
-  m_EditorClassIdentifier: 
-  cacheResult: 1
-  timerLength: 0.25

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_SlidingCheck.asset.meta

-fileFormatVersion: 2
-guid: b5cf328bcf17e41469fda079c80b3c84
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: