animation setup

10 months ago · fb394eed6b
15 changed files with 3589373 additions and 40 deletions
--- a/Assets/11_Animation.meta
+++ b/Assets/11_Animation.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 48409412705f9664a8e5e65c7ef04f91
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/11_Animation/1_Physics.meta
+++ b/Assets/11_Animation/1_Physics.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b1470ecd1ca0ab41b1e01e5119d4d78
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/11_Animation/1_Physics/Chair_Environment_Demo.anim
+++ b/Assets/11_Animation/1_Physics/Chair_Environment_Demo.anim
--- a/Assets/11_Animation/1_Physics/Chair_Environment_Demo.anim.meta
+++ b/Assets/11_Animation/1_Physics/Chair_Environment_Demo.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9157d56f2e7b5544398c7cc91908bd7f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/12_Timelines.meta
+++ b/Assets/12_Timelines.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38cefc7d79ca62f44b12ffde4bdcaffd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/12_Timelines/Demo.playable
+++ b/Assets/12_Timelines/Demo.playable
@ -0,0 +1,155 @@
+%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: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: Demo
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks:
+  - {fileID: 3150996222589718392}
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
+--- !u!114 &3150996222589718392
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 6594720663993679383}
+    m_Duration: 34.916666666666664
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 3150996222589718392}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Chair_Environment_006
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &6594720663993679383
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+  m_Name: AnimationPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 7400000, guid: 9157d56f2e7b5544398c7cc91908bd7f, type: 2}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- a/Assets/12_Timelines/Demo.playable.meta
+++ b/Assets/12_Timelines/Demo.playable.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39a3168ba99eb1d409dfe0fdd8f6139b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/12_Timelines/Environment.controller
+++ b/Assets/12_Timelines/Environment.controller
@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Environment
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 6230017847458082547}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &1766773150135514650
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Chair_Chair_004
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  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: 3804be900da7cfb44aea576480677064, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &6230017847458082547
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1766773150135514650}
+    m_Position: {x: 365, y: 193, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1766773150135514650}
--- a/Assets/12_Timelines/Environment.controller.meta
+++ b/Assets/12_Timelines/Environment.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c831963cac3b2c54885ddee203bf659a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/6_Scenes/Beep.unity
+++ b/Assets/6_Scenes/Beep.unity
@ -119,6 +119,77 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1 &38044914
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 38044915}
+  - component: {fileID: 38044917}
+  - component: {fileID: 38044916}
+  m_Layer: 0
+  m_Name: Waypoint (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &38044915
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 38044914}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -41.17, y: 2.05, z: 4.06}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1518800082}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &38044916
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 38044914}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &38044917
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 38044914}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WaypointPosition: {fileID: 38044915}
+  m_WaitTime: 0
+  m_ModelName: Walker
+  m_Index: 4
+  m_Touched: 0
 --- !u!1 &83944016
 GameObject:
  m_ObjectHideFlags: 0
@ -144,8 +215,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 83944016}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.48614922, y: -0.120646, z: 0.06797593, w: 0.86283416}
-  m_LocalPosition: {x: -243.0392, y: 48.23103, z: 445.67957}
+  m_LocalRotation: {x: 0.07016466, y: 0.8622818, z: -0.48583862, w: 0.124530464}
+  m_LocalPosition: {x: -207.11497, y: 15.466, z: 511.18195}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -259,6 +330,77 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1412792145}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &340222531
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 340222532}
+  - component: {fileID: 340222534}
+  - component: {fileID: 340222533}
+  m_Layer: 0
+  m_Name: Waypoint (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &340222532
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 340222531}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -19.92, y: 2.05, z: 27.58}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1518800082}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &340222533
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 340222531}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &340222534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 340222531}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WaypointPosition: {fileID: 340222532}
+  m_WaitTime: 0
+  m_ModelName: Walker
+  m_Index: 1
+  m_Touched: 0
 --- !u!1001 &387060609
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -275,17 +417,17 @@ PrefabInstance:
    - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -246.86632
+      value: -196.28
      objectReference: {fileID: 0}
    - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 7.7849693
+      value: 6.38
      objectReference: {fileID: 0}
    - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 509.56186
+      value: 492.38998
      objectReference: {fileID: 0}
    - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
        type: 3}
@ -597,8 +739,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 470663197}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.48614922, y: -0.120646, z: 0.06797593, w: 0.86283416}
-  m_LocalPosition: {x: -243.0392, y: 48.23103, z: 445.67957}
+  m_LocalRotation: {x: 0.07016466, y: 0.8622818, z: -0.48583862, w: 0.124530464}
+  m_LocalPosition: {x: -207.11497, y: 15.466, z: 511.18195}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -707,6 +849,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 479999559}
+  - component: {fileID: 479999560}
  m_Layer: 0
  m_Name: Environment
  m_TagString: Untagged
@ -723,7 +866,7 @@ Transform:
  m_GameObject: {fileID: 479999558}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.19631481, y: 32.76503, z: -49.481876}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -732,6 +875,28 @@ Transform:
  - {fileID: 4679177718800847518}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &479999560
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479999558}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: c831963cac3b2c54885ddee203bf659a, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &500859070
 GameObject:
  m_ObjectHideFlags: 3
@ -902,6 +1067,77 @@ Transform:
  - {fileID: 692607588}
  m_Father: {fileID: 1665610483}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &618872486
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 618872487}
+  - component: {fileID: 618872489}
+  - component: {fileID: 618872488}
+  m_Layer: 0
+  m_Name: Waypoint (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &618872487
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 618872486}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -41.17, y: 2.05, z: 14.08}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1518800082}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &618872488
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 618872486}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &618872489
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 618872486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WaypointPosition: {fileID: 618872487}
+  m_WaitTime: 0
+  m_ModelName: Walker
+  m_Index: 3
+  m_Touched: 0
 --- !u!1 &627166284
 GameObject:
  m_ObjectHideFlags: 3
@ -1374,12 +1610,14 @@ PlayableDirector:
  m_GameObject: {fileID: 799276788}
  m_Enabled: 1
  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: efe6e04e5fa756b4786cdfea6579dead, type: 2}
+  m_PlayableAsset: {fileID: 11400000, guid: 39a3168ba99eb1d409dfe0fdd8f6139b, type: 2}
  m_InitialState: 1
  m_WrapMode: 2
  m_DirectorUpdateMode: 1
  m_InitialTime: 0
-  m_SceneBindings: []
+  m_SceneBindings:
+  - key: {fileID: 3150996222589718392, guid: 39a3168ba99eb1d409dfe0fdd8f6139b, type: 2}
+    value: {fileID: 479999560}
  m_ExposedReferences:
    m_References: []
 --- !u!4 &799276790
@ -1695,6 +1933,77 @@ Transform:
  - {fileID: 83944017}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1397856638
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1397856639}
+  - component: {fileID: 1397856641}
+  - component: {fileID: 1397856640}
+  m_Layer: 0
+  m_Name: Waypoint (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1397856639
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1397856638}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -41.17, y: 2.05, z: -3.09}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1518800082}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1397856640
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1397856638}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1397856641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1397856638}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WaypointPosition: {fileID: 1397856639}
+  m_WaitTime: 0
+  m_ModelName: Walker
+  m_Index: 5
+  m_Touched: 0
 --- !u!1001 &1412792145
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1706,7 +2015,7 @@ PrefabInstance:
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -245.03485
+      value: -205.2589
      objectReference: {fileID: 0}
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
@ -1716,12 +2025,12 @@ PrefabInstance:
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 501.46985
+      value: 504.89
      objectReference: {fileID: 0}
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.9500255
+      value: 0.30789012
      objectReference: {fileID: 0}
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
@ -1731,7 +2040,7 @@ PrefabInstance:
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.31217235
+      value: -0.951422
      objectReference: {fileID: 0}
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
@ -1746,7 +2055,7 @@ PrefabInstance:
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 36.38
+      value: -144.136
      objectReference: {fileID: 0}
    - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
        type: 3}
@ -1798,7 +2107,7 @@ PrefabInstance:
        type: 3}
      propertyPath: m_InitialModel
      value: 
-      objectReference: {fileID: 5022602860645237092, guid: 00d0acaeb52a3894a9b8ca8c664b12db,
+      objectReference: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522,
        type: 3}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
@ -1991,6 +2300,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_WaypointList:
  - {fileID: 1201075077}
+  - {fileID: 340222534}
+  - {fileID: 1817046960}
+  - {fileID: 618872489}
+  - {fileID: 38044917}
+  - {fileID: 1397856641}
  m_Target: {fileID: 387060610}
  m_CurrentWaypoint: {fileID: 1201075077}
 --- !u!4 &1518800082
@ -2002,11 +2316,16 @@ Transform:
  m_GameObject: {fileID: 1518800080}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -232.9, y: 38.5, z: 423.46}
+  m_LocalPosition: {x: -182.51, y: 4.33, z: 455.77}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1201075076}
+  - {fileID: 340222532}
+  - {fileID: 1817046958}
+  - {fileID: 618872487}
+  - {fileID: 38044915}
+  - {fileID: 1397856639}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1633830348
@ -2086,6 +2405,77 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 5587459427348284559}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1817046957
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1817046958}
+  - component: {fileID: 1817046960}
+  - component: {fileID: 1817046959}
+  m_Layer: 0
+  m_Name: Waypoint (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1817046958
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1817046957}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -35.89, y: 2.05, z: 22.32}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1518800082}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1817046959
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1817046957}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1817046960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1817046957}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WaypointPosition: {fileID: 1817046958}
+  m_WaitTime: 0
+  m_ModelName: Walker
+  m_Index: 2
+  m_Touched: 0
 --- !u!1 &1916559813
 GameObject:
  m_ObjectHideFlags: 1
@ -2118,8 +2508,10 @@ MonoBehaviour:
  m_References:
    m_Keys:
    - 4dd796d72d7f3cc43b39fc1ffbe6eea2
+    - 56513ad6d2dc6bc43808f3e1b382c7f4
    m_Values:
-    - {fileID: 0}
+    - {fileID: 479999558}
+    - {fileID: 479999558}
 --- !u!4 &1916559815
 Transform:
  m_ObjectHideFlags: 1
@ -2299,7 +2691,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7f6f2722d84da164ba3be22a8cd14381, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_CaptureFrameRate: 30
+  m_CaptureFrameRate: 60
  outputDirectory: SampleRecordings/Projection
  texture: {fileID: 0}
  m_ProjectionType: 3
@ -12717,12 +13109,12 @@ PrefabInstance:
    - target: {fileID: 7042328936429111467, guid: 32cafafe30d4dce489e79503a5c2ac12,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0.51
+      value: 0.485
      objectReference: {fileID: 0}
    - target: {fileID: 7042328936429111467, guid: 32cafafe30d4dce489e79503a5c2ac12,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1.003
+      value: -1.579
      objectReference: {fileID: 0}
    - target: {fileID: 7042328936429111467, guid: 32cafafe30d4dce489e79503a5c2ac12,
        type: 3}
--- a/Assets/ML-Agents/Timers/Beep_timers.json
+++ b/Assets/ML-Agents/Timers/Beep_timers.json
@ -1 +1 @@
-{"count":1,"self":102.3287168,"total":103.5031497,"children":{"InitializeActuators":{"count":1,"self":0.0015086,"total":0.0015086,"children":null},"InitializeSensors":{"count":1,"self":0.0020095,"total":0.0020095,"children":null},"AgentSendState":{"count":4862,"self":0.057065399999999995,"total":0.3548618,"children":{"CollectObservations":{"count":973,"self":0.0172076,"total":0.0172076,"children":null},"WriteActionMask":{"count":973,"self":0.0015118,"total":0.0015118,"children":null},"RequestDecision":{"count":973,"self":0.27907699999999996,"total":0.27907699999999996,"children":null}}},"DecideAction":{"count":4862,"self":0.7736535,"total":0.78123259999999994,"children":{"RayPerceptionSensor.Perceive":{"count":973,"self":0.0075791,"total":0.0075791,"children":null}}},"AgentAct":{"count":4862,"self":0.034820699999999996,"total":0.034820699999999996,"children":null}},"gauges":{"c_Walker.CumulativeReward":{"count":2,"max":26.0910969,"min":-0.8243657,"runningAverage":12.6333656,"value":-0.8243657,"weightedAverage":19.36223}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1708963677","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1708963780"}}
+{"count":1,"self":39.4287328,"total":39.729905699999996,"children":{"InitializeActuators":{"count":1,"self":0.0005092,"total":0.0005092,"children":null},"InitializeSensors":{"count":1,"self":0.001503,"total":0.001503,"children":null},"AgentSendState":{"count":923,"self":0.065381,"total":0.0938227,"children":{"CollectObservations":{"count":185,"self":0.0057532999999999994,"total":0.0057532999999999994,"children":null},"WriteActionMask":{"count":185,"self":0,"total":0,"children":null},"RequestDecision":{"count":185,"self":0.022688399999999997,"total":0.022688399999999997,"children":null}}},"DecideAction":{"count":923,"self":0.2002734,"total":0.2017811,"children":{"RayPerceptionSensor.Perceive":{"count":185,"self":0.0015076999999999998,"total":0.0015076999999999998,"children":null}}},"AgentAct":{"count":923,"self":0.0035581999999999996,"total":0.0035581999999999996,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709292866","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1709292906"}}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -80,7 +80,7 @@ PlayerSettings:
  androidApplicationEntry: 2
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
-  runInBackground: 0
+  runInBackground: 1
  captureSingleScreen: 0
  muteOtherAudioSources: 0
  Prepare IOS For Recording: 0
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@ -82,7 +82,7 @@ QualitySettings:
    billboardsFaceCameraPosition: 1
    useLegacyDetailDistribution: 1
    adaptiveVsync: 0
-    vSyncCount: 1
+    vSyncCount: 0
    realtimeGICPUUsage: 25
    adaptiveVsyncExtraA: 0
    adaptiveVsyncExtraB: 0
@ -166,17 +166,4 @@ QualitySettings:
    terrainMaxTrees: 50
    excludedTargetPlatforms: []
  m_TextureMipmapLimitGroupNames: []
-  m_PerPlatformDefaultQuality:
-    Android: 0
-    CloudRendering: 0
-    Lumin: 0
-    Nintendo Switch: 0
-    PS4: 0
-    Server: 0
-    Stadia: 0
-    Standalone: 0
-    WebGL: 0
-    Windows Store Apps: 0
-    XboxOne: 0
-    iPhone: 0
-    tvOS: 0
+  m_PerPlatformDefaultQuality: {}
--- a/ProjectSettings/TimeManager.asset
+++ b/ProjectSettings/TimeManager.asset
@ -3,7 +3,11 @@
 --- !u!5 &1
 TimeManager:
  m_ObjectHideFlags: 0
-  Fixed Timestep: 0.02
+  Fixed Timestep:
+    m_Count: 2822399
+    m_Rate:
+      m_Denominator: 1
+      m_Numerator: 141120000
  Maximum Allowed Timestep: 0.33333334
-  m_TimeScale: 1
+  m_TimeScale: 0
  Maximum Particle Timestep: 0.03
--- a/test.md
+++ b/test.md
@ -1 +1,5 @@
+<<<<<<< HEAD
 iiiii
+=======
+iiii
+>>>>>>> 21f7ada7c07e4da7133dd964e0ec4e37894e512f