From 89e61b772a69869f058267a07ddf67542683ef74 Mon Sep 17 00:00:00 2001 From: technoflesh Date: Mon, 11 Mar 2024 22:50:05 +0100 Subject: [PATCH] wayfinding path 1 & 2 --- Assets/12_Timelines/Camera Timeline.playable | 200 +++++- Assets/15_Prefabs/Waypoints.prefab | 66 +- Assets/6_Scenes/Beep.unity | 587 +++++++++++++----- Assets/7_Scripts/Camera/CameraManager.cs | 6 +- Assets/ML-Agents/Timers/Beep_timers.json | 2 +- .../DefaultSettingsVolumeProfile.asset | 4 +- 6 files changed, 651 insertions(+), 214 deletions(-) diff --git a/Assets/12_Timelines/Camera Timeline.playable b/Assets/12_Timelines/Camera Timeline.playable index 8c4cf89..8d0ef74 100644 --- a/Assets/12_Timelines/Camera Timeline.playable +++ b/Assets/12_Timelines/Camera Timeline.playable @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-9140813322855821548 +--- !u!114 &-8170392412976514431 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: DisplayName: VirtualCamera: - exposedName: a810efa488b4844ecafd7d6735782fe4 + exposedName: b1c9e7418af314f5a84d33a6396c3984 defaultValue: {fileID: 0} --- !u!114 &-5235963257230267934 MonoBehaviour: @@ -48,6 +48,38 @@ MonoBehaviour: VirtualCamera: exposedName: b4a2116d95b7b4996956fd852b0ba2fd defaultValue: {fileID: 0} +--- !u!114 &-2375411391504665447 +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: 90fb794a295e73545af71bcdb7375791, type: 3} + m_Name: CinemachineShot + m_EditorClassIdentifier: + DisplayName: + VirtualCamera: + exposedName: af4387d8b67df4c7daa86c4c5a5cf87a + defaultValue: {fileID: 0} +--- !u!114 &-214592752882199666 +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: 90fb794a295e73545af71bcdb7375791, type: 3} + m_Name: CinemachineShot + m_EditorClassIdentifier: + DisplayName: + VirtualCamera: + exposedName: b8978a6747a8c499d8488aa3d3cec05e + defaultValue: {fileID: 0} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -63,13 +95,14 @@ MonoBehaviour: m_Version: 0 m_Tracks: - {fileID: 3937275411153492513} + - {fileID: 944305115292821419} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 m_ScenePreview: 1 m_DurationMode: 0 m_MarkerTrack: {fileID: 0} ---- !u!114 &3937275411153492513 +--- !u!114 &944305115292821419 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -79,12 +112,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 05acc715f855ced458d76ee6f8ac6c61, type: 3} - m_Name: Cinemachine Track + m_Name: Cinemachine Track (1) m_EditorClassIdentifier: m_Version: 3 m_AnimClip: {fileID: 0} m_Locked: 0 - m_Muted: 1 + m_Muted: 0 m_CustomPlayableFullTypename: m_Curves: {fileID: 0} m_Parent: {fileID: 11400000} @@ -93,14 +126,14 @@ MonoBehaviour: - m_Version: 1 m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: -3373655309145298414} - m_Duration: 4.033333333333333 + m_Asset: {fileID: -8170392412976514431} + m_Duration: 5 m_TimeScale: 1 - m_ParentTrack: {fileID: 3937275411153492513} + m_ParentTrack: {fileID: 944305115292821419} m_EaseInDuration: 0 m_EaseOutDuration: 0 m_BlendInDuration: -1 - m_BlendOutDuration: 2.083333333333333 + m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 m_Curve: @@ -127,7 +160,25 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: [] + 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 @@ -140,17 +191,17 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: Camera Street Sign + m_DisplayName: LivingRoom - m_Version: 1 - m_Start: 1.95 + m_Start: 5 m_ClipIn: 0 - m_Asset: {fileID: -5235963257230267934} - m_Duration: 10.200000000000001 + m_Asset: {fileID: -214592752882199666} + m_Duration: 5 m_TimeScale: 1 - m_ParentTrack: {fileID: 3937275411153492513} + m_ParentTrack: {fileID: 944305115292821419} m_EaseInDuration: 0 m_EaseOutDuration: 0 - m_BlendInDuration: 2.083333333333333 + m_BlendInDuration: -1 m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 @@ -191,14 +242,14 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: Camera Chair Follow + m_DisplayName: Kitchen - m_Version: 1 - m_Start: 12.15 + m_Start: 10 m_ClipIn: 0 - m_Asset: {fileID: -9140813322855821548} + m_Asset: {fileID: -2375411391504665447} m_Duration: 5 m_TimeScale: 1 - m_ParentTrack: {fileID: 3937275411153492513} + m_ParentTrack: {fileID: 944305115292821419} m_EaseInDuration: 0 m_EaseOutDuration: 0 m_BlendInDuration: -1 @@ -260,6 +311,113 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: Porch Right + m_DisplayName: Porch + m_Markers: + m_Objects: [] +--- !u!114 &3937275411153492513 +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: 05acc715f855ced458d76ee6f8ac6c61, type: 3} + m_Name: Cinemachine Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 1 + 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: -3373655309145298414} + m_Duration: 15.15 + m_TimeScale: 1 + m_ParentTrack: {fileID: 3937275411153492513} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: 1.916666666666666 + 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: [] + 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: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Camera Street Sign + - m_Version: 1 + m_Start: 13.233333333333334 + m_ClipIn: 0 + m_Asset: {fileID: -5235963257230267934} + m_Duration: 10.200000000000001 + m_TimeScale: 1 + m_ParentTrack: {fileID: 3937275411153492513} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 1.916666666666666 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + 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: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Camera 3rd P m_Markers: m_Objects: [] diff --git a/Assets/15_Prefabs/Waypoints.prefab b/Assets/15_Prefabs/Waypoints.prefab index 8d34157..3de869d 100644 --- a/Assets/15_Prefabs/Waypoints.prefab +++ b/Assets/15_Prefabs/Waypoints.prefab @@ -26,12 +26,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 209990532492095435} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.4, y: -32.8, z: 82.33} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.399994, y: -32.8, z: 82.32999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8202717142006031211} + m_Father: {fileID: 7384693885281921768} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2913576066548479887 MonoBehaviour: @@ -97,12 +97,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2362562022282731342} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.6, y: -32.7, z: 77.1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.600006, y: -32.7, z: 77.100006} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8202717142006031211} + m_Father: {fileID: 7384693885281921768} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &49413528898332131 MonoBehaviour: @@ -142,6 +142,41 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2932492667792407800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7384693885281921768} + m_Layer: 0 + m_Name: Path + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7384693885281921768 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932492667792407800} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6868380804102066130} + - {fileID: 3984493130856861062} + - {fileID: 322217618113553874} + - {fileID: 1594025285695098325} + m_Father: {fileID: 8202717142006031211} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4823915812732403376 GameObject: m_ObjectHideFlags: 0 @@ -172,10 +207,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6868380804102066130} - - {fileID: 3984493130856861062} - - {fileID: 322217618113553874} - - {fileID: 1594025285695098325} + - {fileID: 7384693885281921768} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3428618077651019461 @@ -192,8 +224,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointList: - {fileID: 2913576066548479887} - - {fileID: 2663865915400535980} - {fileID: 49413528898332131} + - {fileID: 2663865915400535980} - {fileID: 2682402785939406760} m_Target: {fileID: 0} m_CurrentWaypoint: {fileID: 2913576066548479887} @@ -223,12 +255,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5987063858495885095} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.6, y: -32.7, z: 94.3} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.600006, y: -32.7, z: 94.30002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8202717142006031211} + m_Father: {fileID: 7384693885281921768} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2682402785939406760 MonoBehaviour: @@ -294,12 +326,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6158526685412160350} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.9, y: -29.94, z: 82.33} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 9.899994, y: -29.94, z: 82.32999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8202717142006031211} + m_Father: {fileID: 7384693885281921768} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2663865915400535980 MonoBehaviour: diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index eb39a2b..784da59 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 18717.44, g: 22261.611, b: 24975.488, a: 1} + m_IndirectSpecularColor: {r: 18715.012, g: 22259.738, b: 24972.97, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -204,7 +204,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} m_Name: m_EditorClassIdentifier: - m_NoiseProfile: {fileID: 11400000, guid: 20a705aea2d80e0478fb89b6f43d8530, type: 2} + m_NoiseProfile: {fileID: 11400000, guid: 8608ec81ee27a15488d33f9dad239e91, type: 2} m_PivotOffset: {x: 0, y: 0, z: 0} m_AmplitudeGain: 1 m_FrequencyGain: 1 @@ -235,12 +235,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74818588} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.9, y: -33.1, z: 77.28} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.5, y: -29.51, z: 82.30002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &74818590 BoxCollider: @@ -277,7 +277,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointPosition: {fileID: 74818589} m_WaitTime: 0 - m_ModelName: Walker + m_ModelName: Climber m_Index: 3 m_Touched: 0 --- !u!1 &83569712 @@ -305,7 +305,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83569712} serializedVersion: 2 - m_LocalRotation: {x: 0.08817883, y: 0.62572265, z: -0.07149482, w: 0.771741} + m_LocalRotation: {x: 0.029201802, y: 0.9690178, z: -0.14101738, w: 0.20066369} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -341,22 +341,22 @@ MonoBehaviour: m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 77.31962 + FieldOfView: 61.927517 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 ModeOverride: 0 - LensShift: {x: 0, y: 0} + LensShift: {x: -0, y: 0.04} GateFit: 1 - FocusDistance: 0.91 + FocusDistance: 8.7 m_SensorSize: {x: 36, y: 24} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 + Curvature: {x: 26.748837, y: 32} + BarrelClipping: 0.683 Anamorphism: 0 m_Transitions: m_BlendHint: 0 @@ -391,7 +391,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: 0.14905775, y: 0.6180894, z: -0.12085508, w: 0.76232636} + m_LocalRotation: {x: 0.041125163, 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 @@ -427,22 +427,22 @@ MonoBehaviour: m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 77.31962 + FieldOfView: 61.927517 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 ModeOverride: 0 - LensShift: {x: 0, y: 0} + LensShift: {x: -0, y: 0.04} GateFit: 1 - FocusDistance: 0.91 + FocusDistance: 8.7 m_SensorSize: {x: 36, y: 24} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 + Curvature: {x: 26.748837, y: 32} + BarrelClipping: 0.683 Anamorphism: 0 m_Transitions: m_BlendHint: 0 @@ -488,6 +488,77 @@ Transform: - {fileID: 2069309702} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &189738458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 189738459} + - component: {fileID: 189738461} + - component: {fileID: 189738460} + 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 &189738459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189738458} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -14.46, y: -33.1, z: 111.6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 709739253} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &189738460 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189738458} + 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 &189738461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189738458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_WaypointPosition: {fileID: 189738459} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 1 + m_Touched: 0 --- !u!1 &193486228 GameObject: m_ObjectHideFlags: 3 @@ -534,7 +605,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_TrackedObjectOffset: {x: 0, y: 0, z: 2.82} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 @@ -562,7 +633,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2, z: -6} + m_FollowOffset: {x: 0, y: 3, z: -8} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -713,11 +784,16 @@ PlayableDirector: m_SceneBindings: - key: {fileID: 3937275411153492513, guid: 68d832a05178f48e89734bbed0e1fd14, type: 2} value: {fileID: 470663204} + - key: {fileID: 944305115292821419, guid: 68d832a05178f48e89734bbed0e1fd14, type: 2} + value: {fileID: 470663204} m_ExposedReferences: m_References: + - af4387d8b67df4c7daa86c4c5a5cf87a: {fileID: 1391584723} - b4a2116d95b7b4996956fd852b0ba2fd: {fileID: 377437131} - a810efa488b4844ecafd7d6735782fe4: {fileID: 1391584723} - - 883f94f65bebc4904a6a31ce686eb807: {fileID: 513050373} + - b1c9e7418af314f5a84d33a6396c3984: {fileID: 1202246477} + - b8978a6747a8c499d8488aa3d3cec05e: {fileID: 604918584} + - 883f94f65bebc4904a6a31ce686eb807: {fileID: 1124157898} --- !u!1 &312971760 GameObject: m_ObjectHideFlags: 0 @@ -744,12 +820,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 312971760} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -41.79, y: -32.32, z: 110.14} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -41.79001, y: -32.32, z: 110.139984} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &312971762 BoxCollider: @@ -870,7 +946,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 1, y: 1} + m_SensorSize: {x: 36, y: 24} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -913,7 +989,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.037838764, y: 0.8817097, z: -0.07178479, w: -0.46476153} m_LocalPosition: {x: -128.4, y: 13, z: -248.6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -950,8 +1026,8 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 1 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} + FocusDistance: 0.01 + m_SensorSize: {x: 36, y: 24} Iso: 50 ShutterSpeed: 0.0005 Aperture: 1.9 @@ -988,7 +1064,7 @@ MonoBehaviour: m_Bits: 0 m_MinimumDistanceFromTarget: 0.1 m_AvoidObstacles: 1 - m_DistanceLimit: 2 + m_DistanceLimit: 2.7 m_MinimumOcclusionTime: 0 m_CameraRadius: 0.1 m_Strategy: 1 @@ -1030,17 +1106,17 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -234.4 + value: -247.36 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.y - value: 7.200001 + value: 2.9000015 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 506.55 + value: 483.56 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -1303,14 +1379,14 @@ Camera: m_Iso: 50 m_ShutterSpeed: 0.0005 m_Aperture: 2.2 - m_FocusDistance: 0.91 - m_FocalLength: 14.999999 + m_FocusDistance: 8.7 + m_FocalLength: 20 m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 + m_Curvature: {x: 26.748837, y: 32} + m_BarrelClipping: 0.683 m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} + m_LensShift: {x: 0, y: 0.04} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1319,7 +1395,7 @@ Camera: height: 1 near clip plane: 0.01 far clip plane: 5000 - field of view: 77.31962 + field of view: 61.927517 orthographic: 0 orthographic size: 10 m_Depth: 0 @@ -1345,8 +1421,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.11851885, y: 0.6224197, z: -0.09609434, w: 0.7676672} - m_LocalPosition: {x: -1.3505859, y: -4.517355, z: -13.63147} + m_LocalRotation: {x: 0.10318252, y: -0.013846379, z: 0.0014365119, w: 0.99456507} + m_LocalPosition: {x: 10.412155, y: -3.0073547, z: 12.619812} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1510,8 +1586,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: 0.09170885, y: 0.7875376, z: -0.120920286, w: 0.5972875} - m_LocalPosition: {x: -3.8285522, y: -3.5073547, z: -14.092346} + m_LocalRotation: {x: 0.05128682, y: 0.9282865, z: -0.1397017, w: 0.3407894} + m_LocalPosition: {x: 7.8688507, y: -2.9973545, z: 28.754639} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1643,14 +1719,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604918581} serializedVersion: 2 - m_LocalRotation: {x: -0.32258537, y: 0.35125482, z: -0.13529943, w: -0.8684773} + m_LocalRotation: {x: -0.27286547, y: 0.35515532, z: -0.116108984, w: -0.88652575} m_LocalPosition: {x: 44.1, y: 7.35, z: 24.72} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1882797709} m_Father: {fileID: 953333220} - m_LocalEulerAnglesHint: {x: 40.947, y: -403.80402, z: 0.636} + m_LocalEulerAnglesHint: {x: 34.491, y: -403.404, z: 0.838} --- !u!114 &604918583 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1911,6 +1987,45 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &709739252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 709739253} + m_Layer: 0 + m_Name: Path 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &709739253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709739252} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 784976915} + - {fileID: 189738459} + m_Father: {fileID: 761602138} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &751405510 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5171334526885139719, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} --- !u!1 &753465608 GameObject: m_ObjectHideFlags: 3 @@ -2086,7 +2201,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2, z: -6} + m_FollowOffset: {x: 0, y: 3, z: -8} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -2139,6 +2254,77 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &784976914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 784976915} + - component: {fileID: 784976917} + - component: {fileID: 784976916} + m_Layer: 0 + m_Name: Waypoint P2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &784976915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784976914} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -14.46, y: -33.1, z: 82.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 709739253} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &784976916 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784976914} + 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 &784976917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784976914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_WaypointPosition: {fileID: 784976915} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 0 + m_Touched: 0 --- !u!1 &799276788 GameObject: m_ObjectHideFlags: 0 @@ -2248,12 +2434,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922873252} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.9, y: -33.1, z: 96.1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.899994, y: -32.73, z: 79.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &922873254 BoxCollider: @@ -2390,12 +2576,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968728755} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -42.21, y: -30.63, z: 112.85} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -42.20999, y: -30.63, z: 112.850006} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &968728757 BoxCollider: @@ -2467,12 +2653,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1047178933} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.6, y: -30.2, z: 83.5} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.600006, y: -30.5, z: 83.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1047178935 BoxCollider: @@ -2538,12 +2724,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1057069261} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -40.1, y: -28.9, z: 89.8} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -40.100006, y: -30.44, z: 91.70999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1057069263 BoxCollider: @@ -2610,8 +2796,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1124157896} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.3505859, y: -4.517355, z: -13.63147} + m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} + m_LocalPosition: {x: 10.412155, y: -3.0073547, z: 12.619812} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2619,7 +2805,7 @@ Transform: - {fileID: 1178814725} - {fileID: 83569713} m_Father: {fileID: 953333220} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -155.26, z: 0} --- !u!114 &1124157898 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2642,22 +2828,22 @@ MonoBehaviour: m_Follow: {fileID: 1412792148} m_CommonLens: 1 m_Lens: - FieldOfView: 77.31962 + FieldOfView: 61.927517 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 ModeOverride: 0 - LensShift: {x: 0, y: 0} + LensShift: {x: -0, y: 0.04} GateFit: 1 - FocusDistance: 0.91 + FocusDistance: 8.7 m_SensorSize: {x: 36, y: 24} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 + Curvature: {x: 26.748837, y: 32} + BarrelClipping: 0.683 Anamorphism: 0 m_Transitions: m_BlendHint: 0 @@ -2723,9 +2909,9 @@ MonoBehaviour: m_Orbits: - m_Height: 14 m_Radius: 6 + - m_Height: 3 + m_Radius: 8 - m_Height: 2 - m_Radius: 6 - - m_Height: 0 m_Radius: 8 m_LegacyHeadingBias: 3.4028235e+38 m_Rigs: @@ -2805,12 +2991,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1164655402} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -25.9, y: -29.6, z: 89.6} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -25.899994, y: -29.6, z: 89.600006} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1164655404 BoxCollider: @@ -2875,7 +3061,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178814724} serializedVersion: 2 - m_LocalRotation: {x: 0.11851884, y: 0.6224197, z: -0.0960943, w: 0.76766723} + m_LocalRotation: {x: 0.023507643, y: 0.96850884, z: -0.1004793, w: 0.22658758} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2911,22 +3097,22 @@ MonoBehaviour: m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 77.31962 + FieldOfView: 61.927517 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 ModeOverride: 0 - LensShift: {x: 0, y: 0} + LensShift: {x: -0, y: 0.04} GateFit: 1 - FocusDistance: 0.91 + FocusDistance: 8.7 m_SensorSize: {x: 36, y: 24} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 + Curvature: {x: 26.748837, y: 32} + BarrelClipping: 0.683 Anamorphism: 0 m_Transitions: m_BlendHint: 0 @@ -2962,12 +3148,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1180350617} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -22.8, y: -31.4, z: 87.9} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.589996, y: -30.1, z: 87.899994} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1180350619 BoxCollider: @@ -3096,14 +3282,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1202246475} serializedVersion: 2 - m_LocalRotation: {x: 0.13192338, y: -0.8455784, z: 0.35600105, w: 0.37530887} + m_LocalRotation: {x: 0.13080873, y: -0.87012994, z: 0.2843423, w: 0.38067374} m_LocalPosition: {x: 1.01, y: 6.98, z: 22.71} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2025628616} m_Father: {fileID: 953333220} - m_LocalEulerAnglesHint: {x: 44.513, y: -130.68, z: 3.547} + m_LocalEulerAnglesHint: {x: 36.471, y: -133.004, z: -0.795} --- !u!1 &1337085230 GameObject: m_ObjectHideFlags: 0 @@ -3137,53 +3323,6 @@ Transform: - {fileID: 2110284874} m_Father: {fileID: 160784038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1373219122 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1373219123} - - component: {fileID: 1373219124} - m_Layer: 0 - m_Name: Camera Switch - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1373219123 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373219122} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 257.3517, y: -12.767355, z: -515.5802} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2110284874} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1373219124 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373219122} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e42d9805e2f341e2852b5dbdedb37c9, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera1: {fileID: 1124157896} - Camera2: {fileID: 1391584721} - Camera3: {fileID: 1202246475} --- !u!1 &1391584721 GameObject: m_ObjectHideFlags: 0 @@ -3302,22 +3441,22 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.x - value: -252.83 + value: -246.95 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.y - value: 6.25 + value: 6.76 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.z - value: 503.18 + value: 536.2 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalRotation.w - value: 0.4159286 + value: 0.92896694 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -3327,7 +3466,7 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalRotation.y - value: 0.9093973 + value: 0.3701628 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -3342,7 +3481,7 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 130.844 + value: 43.451 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -3624,7 +3763,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2, z: -6} + m_FollowOffset: {x: 0, y: 3, z: -8} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -3786,6 +3925,59 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1503240170} m_PrefabAsset: {fileID: 0} +--- !u!1 &1574653960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1574653961} + - component: {fileID: 1574653962} + m_Layer: 0 + m_Name: Ground Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1574653961 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574653960} + serializedVersion: 2 + m_LocalRotation: {x: 0.00057926774, y: 0.0017525852, z: -0.30425, w: 0.95259047} + m_LocalPosition: {x: 4.939, y: -0.506, z: -0.079} + m_LocalScale: {x: 0.56387, y: 0.26808, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 751405510} + m_LocalEulerAnglesHint: {x: 0.124, y: 0.171, z: -35.426} +--- !u!65 &1574653962 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574653960} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + 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!4 &1574719136 stripped Transform: m_CorrespondingSourceObject: {fileID: 1744424756382034348, guid: 14d8283abcefffd4a916b8611ccd49fa, @@ -4048,6 +4240,18 @@ Transform: - {fileID: 2093286053} m_Father: {fileID: 160784038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1733409757 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2913576066548479887, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + m_PrefabInstance: {fileID: 2794896440572570268} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1793470375 GameObject: m_ObjectHideFlags: 0 @@ -4121,12 +4325,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1802313638} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -29, y: -27.5, z: 90.3} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -27.690002, y: -28.35, z: 90.30002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1802313640 BoxCollider: @@ -4371,12 +4575,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1974376303} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.8, y: -31.1, z: 89.7} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.800003, y: -32.15, z: 90.76999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1974376305 BoxCollider: @@ -4539,12 +4743,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1992111699} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -18.8, y: -33.1, z: 96.5} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -16.100006, y: -32.65, z: 97.30002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1992111701 BoxCollider: @@ -4581,7 +4785,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_WaypointPosition: {fileID: 1992111700} m_WaitTime: 0 - m_ModelName: Getup + m_ModelName: Walker m_Index: 5 m_Touched: 0 --- !u!1 &2025628615 @@ -4705,12 +4909,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036664295} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.43, y: -30.63, z: 83.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.300003, y: -32.16, z: 68.57999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2036664297 BoxCollider: @@ -4808,12 +5012,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2076119479} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -32.1, y: -33.06, z: 105.13} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -32.100006, y: -32.68, z: 105.129974} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 761602138} + m_Father: {fileID: 2794896440572570269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2076119481 BoxCollider: @@ -4982,7 +5186,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1373219123} - {fileID: 470663201} - {fileID: 953333220} m_Father: {fileID: 1337085231} @@ -5090,6 +5293,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 209990532492095435, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: m_Name + value: Waypoint P1 + objectReference: {fileID: 0} - target: {fileID: 2663865915400535980, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_Index @@ -5103,17 +5311,42 @@ PrefabInstance: - target: {fileID: 2913576066548479887, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_ModelName - value: Climber + value: Walker + objectReference: {fileID: 0} + - target: {fileID: 2932492667792407800, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: m_Name + value: Path Porch>Inside + objectReference: {fileID: 0} + - target: {fileID: 2932492667792407800, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_Target value: objectReference: {fileID: 387060610} + - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: m_CurrentWaypoint + value: + objectReference: {fileID: 1733409757} - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_WaypointList.Array.size - value: 0 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: 'm_WaypointList.Array.data[0]' + value: + objectReference: {fileID: 0} + - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + propertyPath: 'm_WaypointList.Array.data[1]' + value: objectReference: {fileID: 0} - target: {fileID: 3984493130856861062, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} @@ -5133,17 +5366,17 @@ PrefabInstance: - target: {fileID: 6868380804102066130, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.x - value: -1.5 + value: -14.46 objectReference: {fileID: 0} - target: {fileID: 6868380804102066130, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.y - value: -31.3 + value: -35.6 objectReference: {fileID: 0} - target: {fileID: 6868380804102066130, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.z - value: 83.09 + value: 60.1 objectReference: {fileID: 0} - target: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} @@ -5204,57 +5437,67 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 + addedObject: {fileID: 709739253} + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + insertIndex: -1 addedObject: {fileID: 2036664296} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1047178934} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 74818589} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 922873253} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1992111700} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1974376304} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1180350618} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1164655403} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1802313639} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 1057069262} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 2076119480} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 312971761} - - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + - targetCorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 addedObject: {fileID: 968728756} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} +--- !u!4 &2794896440572570269 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7384693885281921768, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + m_PrefabInstance: {fileID: 2794896440572570268} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8839643052404795280 PrefabInstance: m_ObjectHideFlags: 0 @@ -5395,7 +5638,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5171334526885139719, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1574653961} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} --- !u!4 &8839643052404795281 stripped diff --git a/Assets/7_Scripts/Camera/CameraManager.cs b/Assets/7_Scripts/Camera/CameraManager.cs index 78f358c..505319e 100644 --- a/Assets/7_Scripts/Camera/CameraManager.cs +++ b/Assets/7_Scripts/Camera/CameraManager.cs @@ -62,13 +62,13 @@ public class CameraManager : MonoBehaviour string tag = cam.tag; Camera mainCamera = m_CMBrain.OutputCamera; - if (tag.Contains("surviellance")) + if (tag.Contains("surveillance")) { - mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig"); + mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig", "Walls"); } else { - mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig"); + mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig","Walls"); } } diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 6e9fb69..ac7e4c1 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":6.6528756,"total":7.7418388,"children":{"InitializeActuators":{"count":1,"self":0.0005034,"total":0.0005034,"children":null},"InitializeSensors":{"count":1,"self":0.0015072999999999998,"total":0.0015072999999999998,"children":null},"AgentSendState":{"count":94,"self":0.0035085999999999997,"total":0.024592,"children":{"CollectObservations":{"count":19,"self":0.0020052,"total":0.0020052,"children":null},"WriteActionMask":{"count":19,"self":0,"total":0,"children":null},"RequestDecision":{"count":19,"self":0.0190782,"total":0.0190782,"children":null}}},"DecideAction":{"count":94,"self":0.0960755,"total":1.0588469999999999,"children":{"RayPerceptionSensor.Perceive":{"count":19,"self":0.9627715,"total":0.9627715,"children":null}}},"AgentAct":{"count":94,"self":0.0035134999999999997,"total":0.0035134999999999997,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710177958","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":"1710177966"}} \ No newline at end of file +{"count":1,"self":44.284236799999995,"total":45.142047,"children":{"InitializeActuators":{"count":1,"self":0.0038079999999999998,"total":0.0038079999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.007768,"total":0.007768,"children":null},"AgentSendState":{"count":1142,"self":0.029079999999999998,"total":0.292634,"children":{"CollectObservations":{"count":229,"self":0.013764,"total":0.013764,"children":null},"WriteActionMask":{"count":229,"self":0.00108,"total":0.00108,"children":null},"RequestDecision":{"count":229,"self":0.24871,"total":0.24871,"children":null}}},"DecideAction":{"count":1142,"self":0.518506,"total":0.525597,"children":{"RayPerceptionSensor.Perceive":{"count":229,"self":0.007091,"total":0.007091,"children":null}}},"AgentAct":{"count":1142,"self":0.024687,"total":0.024687,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710191717","unity_version":"2023.2.8f1","command_line_arguments":"\/Applications\/Unity\/Hub\/Editor\/2023.2.8f1\/Unity.app\/Contents\/MacOS\/Unity -projectpath \/Users\/scn\/Documents\/BB_Beauty & The Beep\/12 Unity\/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":"1710191762"}} \ No newline at end of file diff --git a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset index 8641aec..eb009f1 100644 --- a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset +++ b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset @@ -1249,7 +1249,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aaa3b8214f75b354e9ba2caadd022259, type: 3} m_Name: DepthOfField m_EditorClassIdentifier: - active: 1 + active: 0 quality: m_OverrideState: 1 m_Value: 3 @@ -1258,7 +1258,7 @@ MonoBehaviour: m_Value: 1 focusDistance: m_OverrideState: 1 - m_Value: 3.5 + m_Value: 0.46 focusDistanceMode: m_OverrideState: 1 m_Value: 0