camera manager fixed

10 months ago · 1fc6e8e6a4
4 changed files with 72 additions and 367 deletions
--- a/Assets/12_Timelines/Camera
+++ b/Assets/12_Timelines/Camera
@ -117,7 +117,7 @@ MonoBehaviour:
  m_Version: 3
  m_AnimClip: {fileID: 0}
  m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
  m_CustomPlayableFullTypename: 
  m_Curves: {fileID: 0}
  m_Parent: {fileID: 11400000}
--- a/Assets/6_Scenes/Beep.unity
+++ b/Assets/6_Scenes/Beep.unity
@ -131,7 +131,7 @@ GameObject:
  - component: {fileID: 19056828}
  - component: {fileID: 19056827}
  - component: {fileID: 19056829}
-  m_Layer: 9
+  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -234,7 +234,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 83569712}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.0292018, y: 0.9690178, z: -0.14101738, w: 0.20066367}
+  m_LocalRotation: {x: 0.029201807, y: 0.9690178, z: -0.1410174, w: 0.20066367}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -266,7 +266,7 @@ MonoBehaviour:
  m_LockStageInInspector: 00000000
  m_StreamingVersion: 20170927
  m_Priority: 10
-  m_StandbyUpdate: 1
+  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
  m_Lens:
@ -320,7 +320,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 155411616}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.04112516, y: 0.9588749, z: -0.19859606, w: 0.19856326}
+  m_LocalRotation: {x: 0.04112516, y: 0.9588749, z: -0.19859606, w: 0.19856328}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -352,7 +352,7 @@ MonoBehaviour:
  m_LockStageInInspector: 00000000
  m_StreamingVersion: 20170927
  m_Priority: 10
-  m_StandbyUpdate: 1
+  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
  m_Lens:
@ -632,7 +632,7 @@ PlayableDirector:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 264146865}
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 3
  m_PlayableAsset: {fileID: 11400000, guid: 68d832a05178f48e89734bbed0e1fd14, type: 2}
  m_InitialState: 1
@ -723,7 +723,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 2
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
@ -765,7 +765,7 @@ GameObject:
  - component: {fileID: 377437131}
  - component: {fileID: 377437132}
  - component: {fileID: 377437133}
-  m_Layer: 9
+  m_Layer: 0
  m_Name: Camera Street Sign
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -780,7 +780,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 377437129}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.037838772, y: 0.8817097, z: -0.071784794, w: -0.46476156}
+  m_LocalRotation: {x: -0.03783876, y: 0.8817096, z: -0.07178476, w: -0.46476156}
  m_LocalPosition: {x: -128.4, y: 13, z: -248.6}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -804,7 +804,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 0
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 1574719136}
  m_Follow: {fileID: 0}
@ -1170,14 +1170,14 @@ Camera:
  m_Iso: 50
  m_ShutterSpeed: 0.0005
  m_Aperture: 2.2
-  m_FocusDistance: 8.7
-  m_FocalLength: 20
+  m_FocusDistance: 8.93528
+  m_FocalLength: 14.999999
  m_BladeCount: 5
-  m_Curvature: {x: 26.748837, y: 32}
-  m_BarrelClipping: 0.683
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
  m_Anamorphism: 0
  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0.04}
+  m_LensShift: {x: 0, y: 0}
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
@ -1186,7 +1186,7 @@ Camera:
    height: 1
  near clip plane: 0.01
  far clip plane: 5000
-  field of view: 61.927517
+  field of view: 77.31962
  orthographic: 0
  orthographic size: 10
  m_Depth: 0
@ -1212,8 +1212,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 470663197}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.10318252, y: -0.013846447, z: 0.0014365191, w: 0.99456507}
-  m_LocalPosition: {x: 10.412155, y: -3.0073547, z: 12.619812}
+  m_LocalRotation: {x: -0.32258537, y: 0.35125482, z: -0.13529943, w: -0.8684773}
+  m_LocalPosition: {x: 43.5, y: 7.3500004, z: -5.200012}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -1239,7 +1239,7 @@ MonoBehaviour:
  m_BlendUpdateMethod: 1
  m_DefaultBlend:
    m_Style: 1
-    m_Time: 2
+    m_Time: 0
    m_CustomCurve:
      serializedVersion: 2
      m_Curve: []
@ -1320,7 +1320,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 2
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
@ -1362,7 +1362,7 @@ GameObject:
  - component: {fileID: 513050373}
  - component: {fileID: 513050374}
  - component: {fileID: 513050375}
-  m_Layer: 9
+  m_Layer: 0
  m_Name: Camera Chair Follow
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -1401,7 +1401,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 11
+  m_Priority: 2
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 1412792148}
  m_Follow: {fileID: 1412792148}
@ -1551,7 +1551,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 2
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
@ -1638,8 +1638,6 @@ GameObject:
  m_Component:
  - component: {fileID: 701091197}
  - component: {fileID: 701091200}
-  - component: {fileID: 701091199}
-  - component: {fileID: 701091198}
  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
@ -1662,55 +1660,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 372183240}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &701091198
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 701091196}
-  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 &701091199
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 701091196}
-  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 &701091200
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -1794,8 +1743,6 @@ GameObject:
  m_Component:
  - component: {fileID: 753465609}
  - component: {fileID: 753465612}
-  - component: {fileID: 753465611}
-  - component: {fileID: 753465610}
  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
@ -1818,55 +1765,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 1974800728}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &753465610
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 753465608}
-  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 &753465611
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 753465608}
-  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 &753465612
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -2550,8 +2448,8 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 12
-  m_StandbyUpdate: 1
+  m_Priority: 1
+  m_StandbyUpdate: 2
  m_LookAt: {fileID: 537498496}
  m_Follow: {fileID: 1412792148}
  m_CommonLens: 1
@ -2718,7 +2616,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1178814724}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.023507647, y: 0.96850884, z: -0.1004793, w: 0.22658761}
+  m_LocalRotation: {x: 0.023507642, y: 0.96850884, z: -0.1004793, w: 0.22658756}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -2750,7 +2648,7 @@ MonoBehaviour:
  m_LockStageInInspector: 00000000
  m_StreamingVersion: 20170927
  m_Priority: 10
-  m_StandbyUpdate: 1
+  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
  m_Lens:
@ -2830,7 +2728,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 2
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
@ -3049,7 +2947,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 2
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
@ -3706,7 +3604,7 @@ GameObject:
  - component: {fileID: 1637099442}
  - component: {fileID: 1637099441}
  - component: {fileID: 1637099440}
-  m_Layer: 9
+  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -3889,8 +3787,6 @@ GameObject:
  m_Component:
  - component: {fileID: 1660739143}
  - component: {fileID: 1660739146}
-  - component: {fileID: 1660739145}
-  - component: {fileID: 1660739144}
  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
@ -3913,55 +3809,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 485330053}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1660739144
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660739142}
-  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 &1660739145
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660739142}
-  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 &1660739146
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -4140,9 +3987,18 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 948dabd0a7f227d408cf79b856777469, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_VCamList: []
+  m_VCamList:
+  - {fileID: 1124157898}
+  - {fileID: 513050373}
+  - {fileID: 377437131}
+  - {fileID: 1391584723}
+  - {fileID: 1202246477}
+  - {fileID: 485330055}
+  - {fileID: 604918584}
+  - {fileID: 1974800730}
+  - {fileID: 372183242}
+  - {fileID: 372183242}
  m_CMBrain: {fileID: 470663204}
-  m_Parent: {fileID: 953333219}
 --- !u!1 &1882797708
 GameObject:
  m_ObjectHideFlags: 3
@ -4153,8 +4009,6 @@ GameObject:
  m_Component:
  - component: {fileID: 1882797709}
  - component: {fileID: 1882797712}
-  - component: {fileID: 1882797711}
-  - component: {fileID: 1882797710}
  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
@ -4177,55 +4031,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 604918582}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1882797710
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1882797708}
-  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 &1882797711
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1882797708}
-  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 &1882797712
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -4479,7 +4284,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 3
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 0}
  m_Follow: {fileID: 0}
@ -4519,8 +4324,6 @@ GameObject:
  m_Component:
  - component: {fileID: 2025628616}
  - component: {fileID: 2025628619}
-  - component: {fileID: 2025628618}
-  - component: {fileID: 2025628617}
  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
@ -4543,55 +4346,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 1202246478}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2025628617
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2025628615}
-  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 &2025628618
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2025628615}
-  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 &2025628619
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -4785,8 +4539,6 @@ GameObject:
  m_Component:
  - component: {fileID: 2119379805}
  - component: {fileID: 2119379808}
-  - component: {fileID: 2119379807}
-  - component: {fileID: 2119379806}
  m_Layer: 0
  m_Name: cm
  m_TagString: Untagged
@ -4809,55 +4561,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 1391584722}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2119379806
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2119379804}
-  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 &2119379807
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2119379804}
-  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 &2119379808
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -4878,16 +4581,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1082572882027964806, guid: 796c0c7bfd2e89547bd866eedcc6d386,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2932492667792407800, guid: 796c0c7bfd2e89547bd866eedcc6d386,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386,
        type: 3}
      propertyPath: m_Target
--- a/Assets/7_Scripts/Camera/CameraManager.cs
+++ b/Assets/7_Scripts/Camera/CameraManager.cs
@ -8,13 +8,13 @@ public class CameraManager : MonoBehaviour
 {
    public static CameraManager instance { get; private set; }

-    public CinemachineVirtualCamera[] m_VCamList;
+    public CinemachineVirtualCameraBase[] m_VCamList = new CinemachineVirtualCameraBase[10];

    private CinemachineVirtualCamera m_ActiveCamera;

    public CinemachineBrain m_CMBrain;

-    public GameObject m_Parent;
+    //public GameObject m_Parent;

    private void Awake()
    {
@ -31,31 +31,38 @@ public class CameraManager : MonoBehaviour
    private void Start()
    {
        // Get all virtual camera objects in Unity
-        CompleteVCChildList();
+        //CompleteVCChildList();
    }

-    private void Update()
+    private void LateUpdate()
    {
        // Check if a key between 0 and 9 is pressed
        for (int i = 0; i <= 9; i++)
        {
            if (Input.GetKeyDown(KeyCode.Alpha0 + i))
            {
+                Debug.Log($"Button Pressed {i}");
+                if (i != 0)
+                {
+                    // Blend Transition Off
+                    m_CMBrain.m_DefaultBlend.m_Time = 0f;
+                }
+                else
+                {
+                        m_CMBrain.m_DefaultBlend.m_Time = 2.5f;
+                }
                // Set priorities based on the key pressed
                SetCameraPriorities(i);
                break; // Exit loop after handling the key press
            }
        }
-        SetCullingMask();
    }

    private void CompleteVCChildList()
    {
-        m_VCamList = m_Parent.GetComponentsInChildren<CinemachineVirtualCamera>();
+        //m_VCamList = m_Parent.GetComponentsInChildren<CinemachineVirtualCamera>();
    }
    
-    private void CompleteVCList() => m_VCamList = FindObjectsByType<CinemachineVirtualCamera>(FindObjectsSortMode.None);
-    
    private void SetCullingMask()
    {
        GameObject cam = m_CMBrain.ActiveVirtualCamera.VirtualCameraGameObject;
@ -64,29 +71,34 @@ public class CameraManager : MonoBehaviour

        if (tag.Contains("surveillance"))
        {
-            mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig", "Walls");
+            mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig", "Walls", "post processing");
        }
        else
        {
-            mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig","Walls");
+            mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig","Walls", "post processing");
        }
    }

    private void SetCameraPriorities(int keyPressed)
    {
-        if (keyPressed < m_VCamList.Length)
-        {
-            m_VCamList[keyPressed].Priority = 1;
-            //Debug.Log($"{m_VCamList[keyPressed].gameObject.name}");
-        }
+
+        

        // Assign priority 2 to all other virtual cameras
        for (int i = 0; i < m_VCamList.Length; i++)
        {
            if (i != keyPressed)
            {
-                m_VCamList[i].Priority = 2;
+                m_VCamList[i].Priority = 0;
            }
        }
+
+        if (keyPressed < m_VCamList.Length)
+        {
+
+            m_VCamList[keyPressed].Priority = 10;
+        }
+
+        SetCullingMask();
    }
 }
--- a/Assets/ML-Agents/Timers/Beep_timers.json
+++ b/Assets/ML-Agents/Timers/Beep_timers.json
@ -1 +1 @@
-{"count":1,"self":7.7843767999999995,"total":10.934324799999999,"children":{"InitializeActuators":{"count":1,"self":0.0010069,"total":0.0010069,"children":null},"InitializeSensors":{"count":1,"self":0.0015153,"total":0.0015153,"children":null},"AgentSendState":{"count":249,"self":0.0030978,"total":0.0262465,"children":{"CollectObservations":{"count":50,"self":0.0024814,"total":0.0024814,"children":null},"WriteActionMask":{"count":50,"self":0,"total":0,"children":null},"RequestDecision":{"count":50,"self":0.0206673,"total":0.0206673,"children":null}}},"DecideAction":{"count":249,"self":0.146207,"total":3.1166563,"children":{"RayPerceptionSensor.Perceive":{"count":50,"self":2.9704492,"total":2.9704493,"children":null}}},"AgentAct":{"count":249,"self":0.0045230999999999995,"total":0.0045230999999999995,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710245623","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 Git\\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":"1710245634"}}
+{"count":1,"self":15.900295999999999,"total":16.4082023,"children":{"InitializeActuators":{"count":1,"self":0.0015072,"total":0.0015072,"children":null},"InitializeSensors":{"count":1,"self":0.0015067,"total":0.0015067,"children":null},"AgentSendState":{"count":503,"self":0.0080412,"total":0.3315709,"children":{"CollectObservations":{"count":101,"self":0.0035083,"total":0.0035083,"children":null},"WriteActionMask":{"count":101,"self":0,"total":0,"children":null},"RequestDecision":{"count":101,"self":0.3200214,"total":0.3200214,"children":null}}},"DecideAction":{"count":503,"self":0.1672998,"total":0.1672998,"children":{"RayPerceptionSensor.Perceive":{"count":101,"self":0,"total":0,"children":null}}},"AgentAct":{"count":503,"self":0.0055135,"total":0.0055135,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710249346","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 Git\\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":"1710249362"}}