Merge branch 'UnityTechnologies:main' into main

3 年前 · c0237ad9
--- a/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter.overrideController
+++ b/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter.overrideController
      type: 3}
  - m_OriginalClip: {fileID: -5795714674559577720, guid: 52ff7facc4957e944815ef86a2669a4a,
      type: 3}
-    m_OverrideClip: {fileID: -5252816984213320552, guid: 7ded5f0996b0fce4688147fd67a029e5,
-      type: 3}
+    m_OverrideClip: {fileID: 7400000, guid: cdaa7c76efa91a44e842d9766003e634, type: 2}
--- a/UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable
+++ b/UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable
--- a/UOP1_Project/Assets/Prefabs/Cutscenes/BeachCandyCutscene.prefab
+++ b/UOP1_Project/Assets/Prefabs/Cutscenes/BeachCandyCutscene.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1786584493
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1786584494}
+  - component: {fileID: 1786584497}
+  - component: {fileID: 1786584496}
+  - component: {fileID: 1786584495}
+  - component: {fileID: 3710391327490652896}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1786584494
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786584493}
+  m_LocalRotation: {x: -0.29024625, y: 0.11961316, z: -0.037482306, w: 0.948707}
+  m_LocalPosition: {x: 0, y: 0, z: 21.453949}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1896998393}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1786584497
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786584493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1786584496
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786584493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
+  m_LookaheadTime: 0
+  m_LookaheadSmoothing: 0
+  m_LookaheadIgnoreY: 0
+  m_HorizontalDamping: 0.5
+  m_VerticalDamping: 0.5
+  m_ScreenX: 0.5
+  m_ScreenY: 0.5
+  m_DeadZoneWidth: 0
+  m_DeadZoneHeight: 0
+  m_SoftZoneWidth: 0.8
+  m_SoftZoneHeight: 0.8
+  m_BiasX: 0
+  m_BiasY: 0
+  m_CenterOnActivate: 1
+--- !u!114 &1786584495
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786584493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_BindingMode: 1
+  m_FollowOffset: {x: 0, y: 0, z: -10}
+  m_XDamping: 1
+  m_YDamping: 1
+  m_ZDamping: 1
+  m_AngularDampingMode: 0
+  m_PitchDamping: 0
+  m_YawDamping: 0
+  m_RollDamping: 0
+  m_AngularDamping: 0
+--- !u!114 &3710391327490652896
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786584493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 0.5
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
+--- !u!1 &1896998392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1896998393}
+  - component: {fileID: 1896998394}
+  m_Layer: 0
+  m_Name: CM vcam Chef far
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1896998393
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1896998392}
+  m_LocalRotation: {x: 0.006729534, y: -0.9999415, z: -0.00019536972, w: -0.008467159}
+  m_LocalPosition: {x: -2.34, y: -0.87, z: 6.15}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1786584494}
+  m_Father: {fileID: 5160289480314264884}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: -0.029, y: -180.97, z: -0.771}
+--- !u!114 &1896998394
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1896998392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 0
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
+  m_Lens:
+    FieldOfView: 40
+    OrthographicSize: 5
+    NearClipPlane: 0.1
+    FarClipPlane: 2000
+    Dutch: 0
+    ModeOverride: 0
+    LensShift: {x: 0, y: 0}
+    GateFit: 2
+    m_SensorSize: {x: 2.2484744, y: 1}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 1786584494}
+--- !u!114 &3854182172996584029
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4875240042317632861}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 0.5
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
 --- !u!1 &4875240042713975712
 GameObject:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 7599918356880040883}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: -183.10399, z: 0}
--- !u!114 &4875240043567108021
+--- !u!114 &4273723253116825175
-  m_GameObject: {fileID: 6706709876804854325}
+  m_GameObject: {fileID: 4875240042900401191}
-  m_Script: {fileID: 11500000, guid: 99a9c787e5d1bbf48a389834c4a9641c, type: 3}
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
-  m_Path: {fileID: 4875240042525964252}
-  m_UpdateMethod: 0
-  m_PositionUnits: 1
-  m_Speed: 0
-  m_Position: 0
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 0.5
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
 --- !u!1 &4875240043579786444
 GameObject:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &74050692112721633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4875240043728253419}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 0.5
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
+--- !u!114 &4875240043567108021
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6706709876804854325}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 99a9c787e5d1bbf48a389834c4a9641c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Path: {fileID: 4875240042525964252}
+  m_UpdateMethod: 0
+  m_PositionUnits: 1
+  m_Speed: 0
+  m_Position: 0
+--- !u!1 &7958550132109617972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1896396147212160682}
+  - component: {fileID: 7572499432353676161}
+  m_Layer: 0
+  m_Name: CM vcam BardHare far
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1896396147212160682
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7958550132109617972}
+  m_LocalRotation: {x: -0.12550046, y: -0.12587705, z: 0.023226, w: 0.9838015}
+  m_LocalPosition: {x: -1.5700073, y: -1.51, z: 1.7099915}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4400235147370161949}
+  m_Father: {fileID: 5160289480314264884}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: -13.951, y: -15.142, z: 4.568}
+--- !u!114 &7572499432353676161
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7958550132109617972}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 0
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
+  m_Lens:
+    FieldOfView: 40
+    OrthographicSize: 10
+    NearClipPlane: 0.1
+    FarClipPlane: 5000
+    Dutch: 0
+    ModeOverride: 0
+    LensShift: {x: 0, y: 0}
+    GateFit: 2
+    m_SensorSize: {x: 2.2484744, y: 1}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 4400235147370161949}
+--- !u!1 &8600052254574682346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4400235147370161949}
+  - component: {fileID: 3234338935043515558}
+  - component: {fileID: 1102130621698208286}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4400235147370161949
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8600052254574682346}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 137.42, y: 2.16, z: 330.08}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1896396147212160682}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3234338935043515558
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8600052254574682346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1102130621698208286
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8600052254574682346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 0.5
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
 --- !u!1001 &4875240042645238086
 PrefabInstance:
  m_ObjectHideFlags: 0
    m_Modifications:
    - target: {fileID: 56426689, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 2.61708
+      value: 2.2484744
      objectReference: {fileID: 0}
    - target: {fileID: 153355930, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Waypoints.Array.data[1].tangent.x
      objectReference: {fileID: 0}
    - target: {fileID: 206388949, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 2.61708
+      value: 2.2484744
+      objectReference: {fileID: 0}
+    - target: {fileID: 246703619, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
+      propertyPath: m_Name
+      value: CM vcam PhCFixedShotPot
      objectReference: {fileID: 0}
    - target: {fileID: 246703622, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Follow
      objectReference: {fileID: 6221957862608795791}
    - target: {fileID: 246703622, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 2.61708
+      value: 2.2484744
+      objectReference: {fileID: 0}
+    - target: {fileID: 671156767, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
+      propertyPath: m_Name
+      value: CM vcam PhCFixedShotGround
      objectReference: {fileID: 0}
    - target: {fileID: 671156770, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Follow
      objectReference: {fileID: 6221957862608795791}
    - target: {fileID: 671156770, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 2.61708
+      value: 2.2484744
+      objectReference: {fileID: 0}
+    - target: {fileID: 1468852564, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
+      propertyPath: m_Enabled
+      value: 1
-      value: 2.61708
+      value: 2.2484744
      objectReference: {fileID: 0}
    - target: {fileID: 2027215994, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Follow
      objectReference: {fileID: 6221957862608795791}
    - target: {fileID: 2027215994, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 2.61708
+      value: 2.2484744
      objectReference: {fileID: 0}
    - target: {fileID: 2027215995, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
      propertyPath: m_LocalPosition.x
      propertyPath: m_LocalRotation.z
      value: 0.0564865
      objectReference: {fileID: 0}
+    - target: {fileID: 244216481246938342, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_Lens.m_SensorSize.x
+      value: 2.2484744
+      objectReference: {fileID: 0}
    - target: {fileID: 303239861944462450, guid: 45f676b6d31fd8f47983557f12803a82,
        type: 3}
      propertyPath: m_RootOrder
    - target: {fileID: 303239861944462452, guid: 45f676b6d31fd8f47983557f12803a82,
        type: 3}
      propertyPath: m_Name
-      value: 'Cutscene '
+      value: CutscenePlayableDirector
      objectReference: {fileID: 0}
    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
        type: 3}
      objectReference: {fileID: 1523799508935671481}
    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.size
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[3].first
+      value: f4de96ee87c660e43b6ce58d29aee94f
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[4].first
+      value: 4991d7ada653c5d4b85d93f546d31ce2
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[5].first
+      value: 304669f2dec87a244bcf350ce5c7363e
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[6].first
+      value: 8a06a888119bf774eb9f48e3c135e4d1
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[7].first
+      value: 585a9eb6aabe5e64680d12daa33317de
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[8].first
+      value: 1c8f1b80d9e25a64abea9e2d67cea3f3
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[9].first
+      value: c203452226b3c2f4dbbc7da0376e17b2
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[10].first
+      value: de9040af57c68f04991b88ec2f13eb6e
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[11].first
+      value: 3f5cf7974e856254ea28724fac0efe29
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[12].first
+      value: c815631ab0a3ede44a59500ec2163e4e
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[13].first
+      value: 3f1eb9baeaecebe4384b77e4e96919c8
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[14].first
+      value: fc7539fd8825e764fbc0ff508050fdcd
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[15].first
+      value: b1ac5cb257c161b4bbb5990be6418a53
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[16].first
+      value: 1f709be99f22b7b418409888f55b5a95
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[17].first
+      value: 9c910a5264e9c2a4493346b21c86a486
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[18].first
+      value: 8213f3d66248ce24d9b00f3873b7720e
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[19].first
+      value: a1f04d00594c2af4a90d204991ef1d9b
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[20].first
+      value: 75206c750fc1d524e93309a31b07e914
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[21].first
+      value: 7ac365286f6f1994b8a55e27707110e2
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[22].first
+      value: 978204679602a2d4ab95c610125aa579
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[3].second
+      value: 
+      objectReference: {fileID: 7572499432353676161}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      value: 
+      objectReference: {fileID: 4875240042701533575}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[5].second
+      propertyPath: m_ExposedReferences.m_References.Array.data[6].second
+      value: 
+      objectReference: {fileID: 4875240042701533575}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[7].second
+      value: 
+      objectReference: {fileID: 4875240043348742922}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[8].second
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[11].second
+      value: 
+      objectReference: {fileID: 4875240042701533575}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      objectReference: {fileID: 4875240043850362172}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[13].second
+      value: 
+      objectReference: {fileID: 5160289480314264882}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[14].second
+      value: 
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[15].second
+      value: 
+      objectReference: {fileID: 7572499432353676161}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[16].second
+      value: 
+      objectReference: {fileID: 1896998394}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[17].second
+      value: 
+      objectReference: {fileID: 4875240043850362172}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[18].second
+      value: 
+      objectReference: {fileID: 4875240042583035795}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[19].second
+      value: 
+      objectReference: {fileID: 4875240043047828324}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[20].second
+      value: 
+      objectReference: {fileID: 4875240042701533575}
+    - target: {fileID: 303239861944462453, guid: 45f676b6d31fd8f47983557f12803a82,
+        type: 3}
+      propertyPath: m_ExposedReferences.m_References.Array.data[21].second
+      value: 
+      objectReference: {fileID: 4875240042602518336}
+--- !u!114 &4875240042583035795 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 206388949, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &5160289480314264882 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 303239861944462452, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &5160289480314264884 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 303239861944462450, guid: 45f676b6d31fd8f47983557f12803a82,
+--- !u!114 &4875240042701533575 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 56426689, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &4875240042317632861 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 498820123, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4875240042900401191 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1064803681, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4875240043348742922 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1513022028, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &4875240043728253419 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1099923629, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4875240043850362172 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2027215994, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &4875240043047828324 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 671156770, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &4875240042602518336 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 246703622, guid: 45f676b6d31fd8f47983557f12803a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042645238086}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &4875240042525964252 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 153355930, guid: 45f676b6d31fd8f47983557f12803a82,
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 52c033c430890f944ba94b26f85b071c, type: 3}
+--- !u!95 &7992359708239205620 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 3261384800072219313, guid: 52c033c430890f944ba94b26f85b071c,
+    type: 3}
+  m_PrefabInstance: {fileID: 4875240042678169157}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6706709876804854325 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2214453683357813872, guid: 52c033c430890f944ba94b26f85b071c,
 --- !u!4 &6221957862608795791 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
-    type: 3}
-  m_PrefabInstance: {fileID: 4875240042678169157}
-  m_PrefabAsset: {fileID: 0}
--- !u!95 &7992359708239205620 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 3261384800072219313, guid: 52c033c430890f944ba94b26f85b071c,
    type: 3}
  m_PrefabInstance: {fileID: 4875240042678169157}
  m_PrefabAsset: {fileID: 0}
    - target: {fileID: 1083073290189785667, guid: 062b3805bf6784e4d9c599ee60eaa002,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -4.181
+      value: -4.336
      objectReference: {fileID: 0}
    - target: {fileID: 1083073290189785667, guid: 062b3805bf6784e4d9c599ee60eaa002,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3441791691206738763, guid: 062b3805bf6784e4d9c599ee60eaa002,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002,
        type: 3}
      propertyPath: m_Enabled
        type: 3}
      propertyPath: m_BoundingSphereOverride.w
-      value: 0.00000002115027
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6224686476861024169, guid: 062b3805bf6784e4d9c599ee60eaa002,
+        type: 3}
+      propertyPath: m_BoundingSphereOverride.x
+      value: 0
-      value: 6.989058e-10
+      value: 1e-45
-      value: 7.26e-43
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8300318066946783926, guid: 062b3805bf6784e4d9c599ee60eaa002,
        type: 3}
      value: 4.46
      objectReference: {fileID: 0}
    - target: {fileID: 1888071995402399070, guid: 062b3805bf6784e4d9c599ee60eaa002,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3441791691206738763, guid: 062b3805bf6784e4d9c599ee60eaa002,
        type: 3}
      propertyPath: m_IsActive
      value: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/RockCritter_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/RockCritter_TransitionTable.asset
    ToState: {fileID: 11400000, guid: 0fe0dc68c0fc2604ca06ad36d16b1117, type: 2}
    Conditions:
    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 64622fb90aa1df4499ab86d9672714f6, type: 2}
+      Condition: {fileID: 11400000, guid: bf212c05964237d4fa32865d4f5bf9a5, type: 2}
      Operator: 0
--- a/UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/Nibbling_Sneezing.fbx
+++ b/UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/Nibbling_Sneezing.fbx
--- a/UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/Nibbling_Sneezing.fbx.meta
+++ b/UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/Nibbling_Sneezing.fbx.meta
+fileFormatVersion: 2
+guid: aef7600d079507e4f8a620e9d5fb033b
+ModelImporter:
+  serializedVersion: 20200
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Nibbling
+  - first:
+      74: -3006480259842609890
+    second: Sneezing
+  externalObjects: {}
+  materials:
+    materialImportMode: 0
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Nibbling
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 1
+      lastFrame: 137
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 1
+    - serializedVersion: 16
+      name: Sneezing
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 122
+      lastFrame: 170
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 1
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 1
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 8
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.fbx
+++ b/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.fbx
--- a/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.fbx.meta
+++ b/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.fbx.meta
+fileFormatVersion: 2
+guid: 26bc6bb160e2055459c48676762c2e74
+ModelImporter:
+  serializedVersion: 20200
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: snooze
+  externalObjects: {}
+  materials:
+    materialImportMode: 0
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: snooze
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 1
+      lastFrame: 120
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 1
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 8
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.anim
+++ b/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.anim
--- a/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.anim.meta
+++ b/UOP1_Project/Assets/Art/Characters/RockCritter/Animation/snooze.anim.meta
+fileFormatVersion: 2
+guid: cdaa7c76efa91a44e842d9766003e634
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
+%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: SnoozeTime Elapsed Condition
+  m_EditorClassIdentifier: 
+  timerLength: 8
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
+fileFormatVersion: 2
+guid: bf212c05964237d4fa32865d4f5bf9a5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
-%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: 176cefe776b9f114393e9f982ce6e208, type: 3}
-  m_Name: SnoozeTime Elapsed Random Condition
-  m_EditorClassIdentifier: 
-  minTimerLength: 8
-  maxTimerLength: 12
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/RockCritter/Conditions/SnoozeTime
-fileFormatVersion: 2
-guid: 64622fb90aa1df4499ab86d9672714f6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: