From e20847abf27b98f058367c540e8b6e238c8bfef2 Mon Sep 17 00:00:00 2001 From: technoflesh Date: Tue, 9 Apr 2024 12:34:47 +0200 Subject: [PATCH] treadmill anim & camera, intro still life --- Assets/12_Timelines/Chair Animations.playable | 769 +++++++++++---- Assets/{1_House => }/13_HDRI.meta | 0 .../13_HDRI/cayley_lookout_1k.hdr | 0 .../13_HDRI/cayley_lookout_1k.hdr.meta | 0 .../drackenstein_quarry_puresky_1k.hdr | 0 .../drackenstein_quarry_puresky_1k.hdr.meta | 0 ...akensberg_solitary_mountain_puresky_1k.hdr | 0 ...berg_solitary_mountain_puresky_1k.hdr.meta | 0 .../13_HDRI/evening_road_01_puresky_1k.hdr | 0 .../evening_road_01_puresky_1k.hdr.meta | 0 .../{1_House => }/13_HDRI/kiara_1_dawn_1k.hdr | 0 .../13_HDRI/kiara_1_dawn_1k.hdr.meta | 0 .../BB_SpotMini-House_2023-WallsOutside.fbx | 3 + ...SpotMini-House_2023-WallsOutside.fbx.meta} | 13 +- ...tMini-House_2023-ikea-magazine-bent-90.fbx | 3 + ...-House_2023-ikea-magazine-bent-90.fbx.meta | 107 +++ Assets/1_House/Materials/Taza.mat | 4 +- Assets/1_House/Materials/default.mat | 12 +- .../Sections/House Walls/House Walls.prefab | 80 ++ Assets/1_House/antique_standing_mirror.fbx | 3 - .../Shaders/Shader Graphs_Treadmill Belt.mat | 2 +- Assets/6_Scenes/Beep.unity | 880 +++++++++++++++++- Assets/ML-Agents/Timers/Beep_timers.json | 2 +- .../HDRPDefaultResources/C Default.asset | 4 +- .../HDRPDefaultResources/C Surveillance.asset | 4 +- 25 files changed, 1630 insertions(+), 256 deletions(-) rename Assets/{1_House => }/13_HDRI.meta (100%) rename Assets/{1_House => }/13_HDRI/cayley_lookout_1k.hdr (100%) rename Assets/{1_House => }/13_HDRI/cayley_lookout_1k.hdr.meta (100%) rename Assets/{1_House => }/13_HDRI/drackenstein_quarry_puresky_1k.hdr (100%) rename Assets/{1_House => }/13_HDRI/drackenstein_quarry_puresky_1k.hdr.meta (100%) rename Assets/{1_House => }/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr (100%) rename Assets/{1_House => }/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr.meta (100%) rename Assets/{1_House => }/13_HDRI/evening_road_01_puresky_1k.hdr (100%) rename Assets/{1_House => }/13_HDRI/evening_road_01_puresky_1k.hdr.meta (100%) rename Assets/{1_House => }/13_HDRI/kiara_1_dawn_1k.hdr (100%) rename Assets/{1_House => }/13_HDRI/kiara_1_dawn_1k.hdr.meta (100%) create mode 100644 Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx rename Assets/1_House/{antique_standing_mirror.fbx.meta => BB_SpotMini-House_2023-WallsOutside.fbx.meta} (90%) create mode 100644 Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx create mode 100644 Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx.meta delete mode 100644 Assets/1_House/antique_standing_mirror.fbx diff --git a/Assets/12_Timelines/Chair Animations.playable b/Assets/12_Timelines/Chair Animations.playable index 563f8e6..d3d7f6c 100644 --- a/Assets/12_Timelines/Chair Animations.playable +++ b/Assets/12_Timelines/Chair Animations.playable @@ -490,59 +490,23 @@ MonoBehaviour: - m_Version: 1 m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: -2724704216788110986} - m_Duration: 230.4 + m_Asset: {fileID: 3073778086298085878} + m_Duration: 85.06666666666668 m_TimeScale: 1 m_ParentTrack: {fileID: -7833274353492304785} m_EaseInDuration: 0 m_EaseOutDuration: 0 m_BlendInDuration: -1 - m_BlendOutDuration: -1 + m_BlendOutDuration: 0 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_Curve: [] 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_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -556,6 +520,72 @@ MonoBehaviour: m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 m_DisplayName: Treadmill 2 + - m_Version: 1 + m_Start: 85.06666666666666 + m_ClipIn: 0 + m_Asset: {fileID: 841549131244077006} + m_Duration: 35.03333333333336 + m_TimeScale: 1 + m_ParentTrack: {fileID: -7833274353492304785} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + 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: Treadmill 3 + - m_Version: 1 + m_Start: 120.1 + m_ClipIn: 0 + m_Asset: {fileID: -3272028622739333604} + m_Duration: 28.166666666666686 + m_TimeScale: 1 + m_ParentTrack: {fileID: -7833274353492304785} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + 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: Treadmill 3 m_Markers: m_Objects: [] --- !u!114 &-7782821484539659523 @@ -816,28 +846,6 @@ MonoBehaviour: 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 &-7240067020417438563 -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: c60f46825d6463844b7033cb04ce8146, 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} --- !u!114 &-7143259005426045118 MonoBehaviour: m_ObjectHideFlags: 1 @@ -848,7 +856,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3} - m_Name: Treadmill 011 + m_Name: Treadmill m_EditorClassIdentifier: m_Version: 3 m_AnimClip: {fileID: 0} @@ -1018,10 +1026,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 52.06666666666667 + m_Start: 85.06666666666666 m_ClipIn: 0 - m_Asset: {fileID: 6681142783393163908} - m_Duration: 110.93333333333334 + m_Asset: {fileID: 2171975509708638887} + m_Duration: 35.03333333333333 m_TimeScale: 1 m_ParentTrack: {fileID: -6448534719364408039} m_EaseInDuration: 0 @@ -1029,11 +1037,17 @@ MonoBehaviour: m_BlendInDuration: -1 m_BlendOutDuration: -1 m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1042,7 +1056,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1052,12 +1066,6 @@ MonoBehaviour: 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: [] @@ -1067,12 +1075,12 @@ MonoBehaviour: m_PreExtrapolationMode: 1 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: PathTreadmill_Chair Anim_Chair Root_011 + m_DisplayName: PathTreadmill_Chair Anim_Chair Root_023 - m_Version: 1 - m_Start: 0 + m_Start: 120.10000000000002 m_ClipIn: 0 - m_Asset: {fileID: -7240067020417438563} - m_Duration: 52.06666666666667 + m_Asset: {fileID: -6079282389891275449} + m_Duration: 28.166666666666668 m_TimeScale: 1 m_ParentTrack: {fileID: -6448534719364408039} m_EaseInDuration: 0 @@ -1134,14 +1142,14 @@ MonoBehaviour: m_Recordable: 0 m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: 0 + m_PostExtrapolationTime: Infinity m_PreExtrapolationTime: 0 - m_DisplayName: PathTreadmill_Chair Anim_Chair Root_014 + m_DisplayName: PathTreadmill_Chair Anim_Chair Root_027 - m_Version: 1 - m_Start: 163 + m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: 3294658385562618739} - m_Duration: 67.4 + m_Asset: {fileID: -3234499863390478845} + m_Duration: 85.06666666666666 m_TimeScale: 1 m_ParentTrack: {fileID: -6448534719364408039} m_EaseInDuration: 0 @@ -1149,17 +1157,11 @@ MonoBehaviour: m_BlendInDuration: -1 m_BlendOutDuration: -1 m_MixInCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1168,7 +1170,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1178,6 +1180,12 @@ MonoBehaviour: 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: [] @@ -1185,9 +1193,9 @@ MonoBehaviour: m_Recordable: 0 m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: Infinity + m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: PathTreadmill_Chair Anim_Chair Root_015 + m_DisplayName: PathTreadmill_Chair Anim_Chair Root_020 m_Markers: m_Objects: [] m_InfiniteClipPreExtrapolation: 0 @@ -1208,6 +1216,28 @@ MonoBehaviour: 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 &-6432395183471353241 +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: 5c7da324e1b63c7489786c76859c19e8, 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} --- !u!114 &-6374146727792609561 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1224,6 +1254,28 @@ MonoBehaviour: VirtualCamera: exposedName: 12b2f2738c376ab4d89c98cf7949601b defaultValue: {fileID: 0} +--- !u!114 &-6079282389891275449 +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: 6c640e097c487f2439675e9115c3df2c, 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} --- !u!114 &-5067880063159583205 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1334,28 +1386,6 @@ MonoBehaviour: 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 &-4859957121542694096 -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: d9a5c5dd8030fe242bdb64618a744e94, 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} --- !u!114 &-4416599973393052659 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1536,6 +1566,22 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] +--- !u!114 &-3826648100154061251 +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(Clone) + m_EditorClassIdentifier: + DisplayName: + VirtualCamera: + exposedName: 1e395284c6eb8944c8090fbb47f94777 + defaultValue: {fileID: 0} --- !u!114 &-3604912753155237675 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1583,6 +1629,44 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-3272028622739333604 +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(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + DisplayName: + VirtualCamera: + exposedName: fc3a55cf961c7e945961f233e87e073c + defaultValue: {fileID: 0} +--- !u!114 &-3234499863390478845 +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: e8f81ca9b86da2e4ba91e3cbc1243d34, 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} --- !u!114 &-2892204462109919394 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1803,22 +1887,6 @@ MonoBehaviour: 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 &-2724704216788110986 -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: 8303c0a5952bca543a0c0ff79ce79a48 - defaultValue: {fileID: 0} --- !u!114 &-2607610994035009344 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1844,6 +1912,28 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] +--- !u!114 &-2516875815650513382 +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(Clone) + m_EditorClassIdentifier: + m_Clip: {fileID: 7400000, guid: 8545e0db068e6ee4daf9728e3b02af39, 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} --- !u!114 &-2432545686952024146 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1866,6 +1956,32 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-2110982074466044444 +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: d0fc6f5187a81dc47999eefade6f0935, type: 3} + m_Name: Treadmill Intro + 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: + - {fileID: 3348368267044225669} + - {fileID: -1402314481955164347} + - {fileID: 215362898181990694} + m_Clips: [] + m_Markers: + m_Objects: [] --- !u!114 &-2085627637130351823 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2039,6 +2155,98 @@ MonoBehaviour: VirtualCamera: exposedName: 81e0b3f7f6a18c54c9963033af8720d0 defaultValue: {fileID: 0} +--- !u!114 &-1402314481955164347 +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 (3) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: -2110982074466044444} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -2516875815650513382} + m_Duration: 30.2 + m_TimeScale: 1 + m_ParentTrack: {fileID: -1402314481955164347} + 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: [] + 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: PathTreadmill_House Anim_Environment_018 + 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 &-1281848325110999763 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2130,10 +2338,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 52.06666666666667 + m_Start: 85.06666666666668 m_ClipIn: 0 - m_Asset: {fileID: 7757984216262843255} - m_Duration: 110.93333333333334 + m_Asset: {fileID: 1646860155849027031} + m_Duration: 35.03333333333333 m_TimeScale: 1 m_ParentTrack: {fileID: -731284633276527372} m_EaseInDuration: 0 @@ -2141,11 +2349,17 @@ MonoBehaviour: m_BlendInDuration: -1 m_BlendOutDuration: -1 m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2154,7 +2368,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2164,12 +2378,6 @@ MonoBehaviour: 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: [] @@ -2179,12 +2387,12 @@ MonoBehaviour: m_PreExtrapolationMode: 1 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: PathTreadmill_House Anim_Environment_011 + m_DisplayName: PathTreadmill_House Anim_Environment_023 - m_Version: 1 - m_Start: 0 + m_Start: 120.10000000000002 m_ClipIn: 0 - m_Asset: {fileID: -4859957121542694096} - m_Duration: 52.06666666666667 + m_Asset: {fileID: -6432395183471353241} + m_Duration: 28.166666666666668 m_TimeScale: 1 m_ParentTrack: {fileID: -731284633276527372} m_EaseInDuration: 0 @@ -2246,14 +2454,14 @@ MonoBehaviour: m_Recordable: 0 m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: 0 + m_PostExtrapolationTime: Infinity m_PreExtrapolationTime: 0 - m_DisplayName: PathTreadmill_House Anim_Environment_014 + m_DisplayName: PathTreadmill_House Anim_Environment_027 - m_Version: 1 - m_Start: 163 + m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: 1916892353010675676} - m_Duration: 67.4 + m_Asset: {fileID: 8073494768153544339} + m_Duration: 85.06666666666666 m_TimeScale: 1 m_ParentTrack: {fileID: -731284633276527372} m_EaseInDuration: 0 @@ -2315,9 +2523,9 @@ MonoBehaviour: m_Recordable: 0 m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: Infinity + m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: PathTreadmill_House Anim_Environment_015 + m_DisplayName: PathTreadmill_House Anim_Environment_020 m_Markers: m_Objects: [] m_InfiniteClipPreExtrapolation: 0 @@ -2540,6 +2748,7 @@ MonoBehaviour: - {fileID: -189732466800420715} - {fileID: 7724113305947688922} - {fileID: -7143259005426045118} + - {fileID: -2110982074466044444} - {fileID: 80719104136180795} - {fileID: -3604912753155237675} - {fileID: 2819570955230463105} @@ -2578,6 +2787,62 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] +--- !u!114 &215362898181990694 +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: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: -2110982074466044444} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -3826648100154061251} + m_Duration: 30.19999999999999 + m_TimeScale: 1 + m_ParentTrack: {fileID: 215362898181990694} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + 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: Intro Still Life + m_Markers: + m_Objects: [] --- !u!114 &653592938242529040 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2622,6 +2887,22 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &841549131244077006 +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(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + DisplayName: + VirtualCamera: + exposedName: f22406cf983ca84458dcbc6b69850ad2 + defaultValue: {fileID: 0} --- !u!114 &1073087315922276256 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2792,6 +3073,28 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &1646860155849027031 +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: 36aae29df96761b498adf8d3352199d8, 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} --- !u!114 &1884373289189587282 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2902,7 +3205,7 @@ MonoBehaviour: 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 &1916892353010675676 +--- !u!114 &2171975509708638887 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -2914,7 +3217,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} m_Name: AnimationPlayableAsset m_EditorClassIdentifier: - m_Clip: {fileID: 7400000, guid: 6da1dda7589da474cb5d4b3335803b39, type: 2} + m_Clip: {fileID: 7400000, guid: 7af9a381edfd28b4ab58f30471065c79, type: 2} m_Position: {x: 0, y: 0, z: 0} m_EulerAngles: {x: 0, y: 0, z: 0} m_UseTrackMatchFields: 1 @@ -3254,6 +3557,22 @@ MonoBehaviour: VirtualCamera: exposedName: e115da1c91cbfb74aabdb764d54a7ad1 defaultValue: {fileID: 0} +--- !u!114 &3073778086298085878 +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(Clone)(Clone) + m_EditorClassIdentifier: + DisplayName: + VirtualCamera: + exposedName: dad7dde9c443e81478bc57a14d380b3d + defaultValue: {fileID: 0} --- !u!114 &3096840171348957879 MonoBehaviour: m_ObjectHideFlags: 1 @@ -3506,7 +3825,7 @@ MonoBehaviour: m_DisplayName: Treadmill m_Markers: m_Objects: [] ---- !u!114 &3294658385562618739 +--- !u!114 &3348368267044225669 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -3515,19 +3834,89 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} - m_Name: AnimationPlayableAsset + m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (2) m_EditorClassIdentifier: - m_Clip: {fileID: 7400000, guid: 34aec1c1e579eeb4483ee156cdbf0f09, type: 2} + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: -2110982074466044444} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 5978288072850291911} + m_Duration: 30.2 + m_TimeScale: 1 + m_ParentTrack: {fileID: 3348368267044225669} + 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: [] + 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: PathTreadmill_Chair Anim_Chair Root_018 + 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_UseTrackMatchFields: 1 - m_MatchTargetFields: 63 - m_RemoveStartOffset: 1 - m_ApplyFootIK: 1 - m_Loop: 0 - m_Version: 1 + 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 &3416212576041797143 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4192,6 +4581,28 @@ MonoBehaviour: 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 &5978288072850291911 +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(Clone) + m_EditorClassIdentifier: + m_Clip: {fileID: 7400000, guid: c80a5bcfc33d6614ba1b790c70a3c55f, 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} --- !u!114 &6028355007858557264 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4324,28 +4735,6 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} ---- !u!114 &6681142783393163908 -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: dfc5be228ddd1374d8c95eb50598b328, 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} --- !u!114 &6901988458211703823 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4701,7 +5090,7 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] ---- !u!114 &7757984216262843255 +--- !u!114 &8073494768153544339 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -4713,7 +5102,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} m_Name: AnimationPlayableAsset m_EditorClassIdentifier: - m_Clip: {fileID: 7400000, guid: 6939c143bdc356640b34de2d225134cf, type: 2} + m_Clip: {fileID: 7400000, guid: 14d9607e6f2ed6a40b20576206805d61, type: 2} m_Position: {x: 0, y: 0, z: 0} m_EulerAngles: {x: 0, y: 0, z: 0} m_UseTrackMatchFields: 1 diff --git a/Assets/1_House/13_HDRI.meta b/Assets/13_HDRI.meta similarity index 100% rename from Assets/1_House/13_HDRI.meta rename to Assets/13_HDRI.meta diff --git a/Assets/1_House/13_HDRI/cayley_lookout_1k.hdr b/Assets/13_HDRI/cayley_lookout_1k.hdr similarity index 100% rename from Assets/1_House/13_HDRI/cayley_lookout_1k.hdr rename to Assets/13_HDRI/cayley_lookout_1k.hdr diff --git a/Assets/1_House/13_HDRI/cayley_lookout_1k.hdr.meta b/Assets/13_HDRI/cayley_lookout_1k.hdr.meta similarity index 100% rename from Assets/1_House/13_HDRI/cayley_lookout_1k.hdr.meta rename to Assets/13_HDRI/cayley_lookout_1k.hdr.meta diff --git a/Assets/1_House/13_HDRI/drackenstein_quarry_puresky_1k.hdr b/Assets/13_HDRI/drackenstein_quarry_puresky_1k.hdr similarity index 100% rename from Assets/1_House/13_HDRI/drackenstein_quarry_puresky_1k.hdr rename to Assets/13_HDRI/drackenstein_quarry_puresky_1k.hdr diff --git a/Assets/1_House/13_HDRI/drackenstein_quarry_puresky_1k.hdr.meta b/Assets/13_HDRI/drackenstein_quarry_puresky_1k.hdr.meta similarity index 100% rename from Assets/1_House/13_HDRI/drackenstein_quarry_puresky_1k.hdr.meta rename to Assets/13_HDRI/drackenstein_quarry_puresky_1k.hdr.meta diff --git a/Assets/1_House/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr b/Assets/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr similarity index 100% rename from Assets/1_House/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr rename to Assets/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr diff --git a/Assets/1_House/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr.meta b/Assets/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr.meta similarity index 100% rename from Assets/1_House/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr.meta rename to Assets/13_HDRI/drakensberg_solitary_mountain_puresky_1k.hdr.meta diff --git a/Assets/1_House/13_HDRI/evening_road_01_puresky_1k.hdr b/Assets/13_HDRI/evening_road_01_puresky_1k.hdr similarity index 100% rename from Assets/1_House/13_HDRI/evening_road_01_puresky_1k.hdr rename to Assets/13_HDRI/evening_road_01_puresky_1k.hdr diff --git a/Assets/1_House/13_HDRI/evening_road_01_puresky_1k.hdr.meta b/Assets/13_HDRI/evening_road_01_puresky_1k.hdr.meta similarity index 100% rename from Assets/1_House/13_HDRI/evening_road_01_puresky_1k.hdr.meta rename to Assets/13_HDRI/evening_road_01_puresky_1k.hdr.meta diff --git a/Assets/1_House/13_HDRI/kiara_1_dawn_1k.hdr b/Assets/13_HDRI/kiara_1_dawn_1k.hdr similarity index 100% rename from Assets/1_House/13_HDRI/kiara_1_dawn_1k.hdr rename to Assets/13_HDRI/kiara_1_dawn_1k.hdr diff --git a/Assets/1_House/13_HDRI/kiara_1_dawn_1k.hdr.meta b/Assets/13_HDRI/kiara_1_dawn_1k.hdr.meta similarity index 100% rename from Assets/1_House/13_HDRI/kiara_1_dawn_1k.hdr.meta rename to Assets/13_HDRI/kiara_1_dawn_1k.hdr.meta diff --git a/Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx b/Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx new file mode 100644 index 0000000..d17f920 --- /dev/null +++ b/Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a14d96d4ecd465e66d306d7173d5f7b4fb79ce17f19a1d09e31ce30524d636b0 +size 21260 diff --git a/Assets/1_House/antique_standing_mirror.fbx.meta b/Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx.meta similarity index 90% rename from Assets/1_House/antique_standing_mirror.fbx.meta rename to Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx.meta index 47a195c..7d6723e 100644 --- a/Assets/1_House/antique_standing_mirror.fbx.meta +++ b/Assets/1_House/BB_SpotMini-House_2023-WallsOutside.fbx.meta @@ -1,14 +1,9 @@ fileFormatVersion: 2 -guid: e6654787572d93e4ea5de2b7b6f1aadf +guid: c31233e4807bdee44a30ad81853d1f6a ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: antique_standing_mirror_Mat - second: {fileID: 2100000, guid: 7933ce47f14d27e4399c3ab9e5e5b7f8, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 0 @@ -38,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 4.033997 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -93,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.04033997 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx b/Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx new file mode 100644 index 0000000..4e439f7 --- /dev/null +++ b/Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa9eecc12b732ffffc8d5ce4d4bd04e58738fe1364479d7ded67b96b8f33e650 +size 86284 diff --git a/Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx.meta b/Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx.meta new file mode 100644 index 0000000..bb058cf --- /dev/null +++ b/Assets/1_House/BB_SpotMini-House_2023-ikea-magazine-bent-90.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: eb935d62094888d4b93747f21e8fbd11 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1.5 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.015 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_House/Materials/Taza.mat b/Assets/1_House/Materials/Taza.mat index 9392807..be11c31 100644 --- a/Assets/1_House/Materials/Taza.mat +++ b/Assets/1_House/Materials/Taza.mat @@ -191,7 +191,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0.4 + - _Metallic: 1 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 @@ -212,7 +212,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.5 + - _Smoothness: 0.651 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/default.mat b/Assets/1_House/Materials/default.mat index eedb41c..c1c525f 100644 --- a/Assets/1_House/Materials/default.mat +++ b/Assets/1_House/Materials/default.mat @@ -35,8 +35,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 2800000, guid: d440fdafa23187a489ead94fb7fe3b5f, type: 3} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: 05dba1ca2824e4d35bfe81035aa535ff, type: 3} + m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} - _BentNormalMap: m_Texture: {fileID: 0} @@ -71,8 +71,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d440fdafa23187a489ead94fb7fe3b5f, type: 3} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: 05dba1ca2824e4d35bfe81035aa535ff, type: 3} + m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} - _MaskMap: m_Texture: {fileID: 0} @@ -184,7 +184,7 @@ Material: - _HeightPoMAmplitude: 2 - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - - _InvTilingScale: 1 + - _InvTilingScale: 0.33333334 - _Ior: 1.5 - _IridescenceMask: 1 - _IridescenceThickness: 1 @@ -211,7 +211,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.65 + - _Smoothness: 0.602 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Sections/House Walls/House Walls.prefab b/Assets/1_House/Sections/House Walls/House Walls.prefab index 50477de..6c0fe7d 100644 --- a/Assets/1_House/Sections/House Walls/House Walls.prefab +++ b/Assets/1_House/Sections/House Walls/House Walls.prefab @@ -528,6 +528,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5267881107218755851} - {fileID: 7699300854016196017} - {fileID: 815085772436503517} - {fileID: 2073407874502708101} @@ -815,3 +816,82 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.19500005, y: 1.3000004, z: 3.2500007} m_Center: {x: 1.3881254, y: 0.7475002, z: 1.6250004} +--- !u!1001 &5661583874547685088 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 632447699569042236} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalScale.z + value: 99.999985 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.9504716 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 5.950462 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.7037938 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071069 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalRotation.y + value: 1.6519229e-10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalRotation.z + value: -6.763828e-11 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + propertyPath: m_Name + value: BB_SpotMini-House_2023-WallsOutside + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c31233e4807bdee44a30ad81853d1f6a, type: 3} +--- !u!4 &5267881107218755851 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c31233e4807bdee44a30ad81853d1f6a, + type: 3} + m_PrefabInstance: {fileID: 5661583874547685088} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/1_House/antique_standing_mirror.fbx b/Assets/1_House/antique_standing_mirror.fbx deleted file mode 100644 index 54749ae..0000000 --- a/Assets/1_House/antique_standing_mirror.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59dd292228b4f57a09b7e0a9799ef796aa8a1753512fc0b17a1ad638ab123330 -size 850860 diff --git a/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat b/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat index d7e1426..a5dc847 100644 --- a/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat +++ b/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat @@ -92,7 +92,7 @@ Material: - _RefractionModel: 0 - _RenderQueueType: 1 - _RequireSplitLighting: 0 - - _Speed: -368.7928 + - _Speed: -526.14496 - _SrcBlend: 1 - _StencilRef: 0 - _StencilRefDepth: 8 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index ece0137..1cf3ec1 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: 7710.423, g: 8946.3955, b: 9699.29, a: 1} + m_IndirectSpecularColor: {r: 7710.329, g: 8946.239, b: 9699.095, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -671,8 +671,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83569712} serializedVersion: 2 - m_LocalRotation: {x: -0.24548407, y: -0.37519085, z: 0.17405573, w: 0.87674063} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.25115955, y: -0.3064897, z: 0.14219506, w: 0.9070632} + m_LocalPosition: {x: -0.000000016001835, y: -0.000001440554, z: 0.0000012500108} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1245,8 +1245,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: -0.17943339, y: -0.3611695, z: 0.20154451, w: 0.89260304} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.18283239, y: -0.29503614, z: 0.16465093, w: 0.92326385} + m_LocalPosition: {x: -0.000004738713, y: 0.000039705894, z: 0.000048608097} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1753,6 +1753,12 @@ MonoBehaviour: m_ModelName: Climber m_Index: 6 m_Touched: 0 +--- !u!4 &227347620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3654837400929340511, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} --- !u!1 &231459586 GameObject: m_ObjectHideFlags: 0 @@ -2675,6 +2681,103 @@ MonoBehaviour: m_ModelName: Walker m_Index: 17 m_Touched: 0 +--- !u!1 &367511623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367511624} + - component: {fileID: 367511626} + - component: {fileID: 367511625} + m_Layer: 0 + m_Name: Treadmill 3 + m_TagString: surveillance + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &367511624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367511623} + serializedVersion: 2 + m_LocalRotation: {x: 0.19645707, y: -0.54973733, z: 0.1348947, w: 0.8006228} + m_LocalPosition: {x: 1.1, y: 1.2326455, z: 37.9} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1879352481} + m_Father: {fileID: 953333220} + m_LocalEulerAnglesHint: {x: 34.859, y: -86.156, z: 2.424} +--- !u!114 &367511625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367511623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 449ef5ebbe24720439ec31d15f7b6f3d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FocusTracksTarget: 0 + m_FocusTracking: 0 + m_FocusTarget: {fileID: 0} + m_FocusOffset: 0 + m_Profile: {fileID: 11400000, guid: 2046569533d42a040998cd7c7c479fff, type: 2} +--- !u!114 &367511626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367511623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 21 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1396062067} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 108.3398 + OrthographicSize: 10 + NearClipPlane: 0.01 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 1 + FocusDistance: 8.93528 + m_SensorSize: {x: 70.41, y: 52.63} + Iso: 50 + ShutterSpeed: 0.0005 + Aperture: 2.2 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1879352481} --- !u!1 &369672584 GameObject: m_ObjectHideFlags: 0 @@ -2828,7 +2931,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -3029,7 +3132,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 0.01 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 1.9 @@ -4216,7 +4319,7 @@ Camera: m_ShutterSpeed: 0.0005 m_Aperture: 2.2 m_FocusDistance: 8.93528 - m_FocalLength: 20 + m_FocalLength: 19 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -4231,7 +4334,7 @@ Camera: height: 1 near clip plane: 0.01 far clip plane: 5000 - field of view: 105.52868 + field of view: 108.3398 orthographic: 0 orthographic size: 10 m_Depth: 0 @@ -4257,8 +4360,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.20494986, y: -0.65611947, z: 0.21927615, w: 0.6924022} - m_LocalPosition: {x: 0.89001465, y: 7.3500004, z: 36.5} + m_LocalRotation: {x: 0.19645707, y: -0.54973733, z: 0.1348947, w: 0.8006228} + m_LocalPosition: {x: 1.1000061, y: 1.232645, z: 37.900024} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4451,7 +4554,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -4644,8 +4747,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: 0.0032123975, y: 0.98683614, z: -0.16048026, w: 0.019753894} - m_LocalPosition: {x: 5.707428, y: -3.2973547, z: 10.143555} + m_LocalRotation: {x: 0.06377651, y: 0.80809397, z: -0.08904471, w: 0.5787813} + m_LocalPosition: {x: -20.615662, y: -2.832098, z: 48.646362} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4682,7 +4785,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 10 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -5280,7 +5383,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562470283} serializedVersion: 2 - m_LocalRotation: {x: 0.121948026, y: 0.7725755, z: -0.603209, w: 0.15618807} + m_LocalRotation: {x: 0.37333772, y: -0.22589721, z: 0.09424884, w: 0.8948221} m_LocalPosition: {x: 6.201065, y: 33.692642, z: 12.049194} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5318,7 +5421,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 10 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 200 ShutterSpeed: 0.005 Aperture: 16 @@ -5789,7 +5892,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -6396,7 +6499,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.544002 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.002 Aperture: 3.6 @@ -8126,17 +8229,29 @@ PlayableDirector: value: {fileID: 1283640695} - key: {fileID: -7833274353492304785, guid: dd97fb6e6982ba049974d6d1ca687f10, type: 2} value: {fileID: 470663204} + - key: {fileID: 3348368267044225669, guid: dd97fb6e6982ba049974d6d1ca687f10, type: 2} + value: {fileID: 707081200} + - key: {fileID: -1402314481955164347, guid: dd97fb6e6982ba049974d6d1ca687f10, type: 2} + value: {fileID: 1283640695} + - key: {fileID: 215362898181990694, guid: dd97fb6e6982ba049974d6d1ca687f10, type: 2} + value: {fileID: 470663204} m_ExposedReferences: m_References: - 5de22b47e42f8dc478b2023dddf297fa: {fileID: 485330055} - f2994cbc8215a9e4a927f4958c7c14a0: {fileID: 672497994} + - fc3a55cf961c7e945961f233e87e073c: {fileID: 367511626} + - 22b9568c67414c44c99a16c4909dc7a0: {fileID: 1627397280} + - 1e395284c6eb8944c8090fbb47f94777: {fileID: 1546185927} + - dad7dde9c443e81478bc57a14d380b3d: {fileID: 1627397280} - 12b2f2738c376ab4d89c98cf7949601b: {fileID: 1124157898} - 96a3d220d575dc343bc2c304ac6c779d: {fileID: 1202246477} - - 8303c0a5952bca543a0c0ff79ce79a48: {fileID: 1627397280} + - 8303c0a5952bca543a0c0ff79ce79a48: {fileID: 1546185927} - b90f9b916792daf46a2a2ac51c4bf23b: {fileID: 372183242} + - f22406cf983ca84458dcbc6b69850ad2: {fileID: 367511626} - e115da1c91cbfb74aabdb764d54a7ad1: {fileID: 372183242} - e5ccab3035a2e9944aab6b5295225c31: {fileID: 1202246477} - a7e14648e201a8541ab0b635ef47c85f: {fileID: 485330055} + - 9bf4190374afd1448a4bcb8dbaadc368: {fileID: 367511626} - 81e0b3f7f6a18c54c9963033af8720d0: {fileID: 377437131} --- !u!4 &799276790 Transform: @@ -8507,6 +8622,119 @@ MonoBehaviour: m_ModelName: Walker m_Index: 3 m_Touched: 0 +--- !u!1 &823708874 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 823708875} + - component: {fileID: 823708878} + - component: {fileID: 823708877} + - component: {fileID: 823708876} + - component: {fileID: 823708879} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &823708875 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 823708874} + 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: [] + m_Father: {fileID: 1546185926} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &823708876 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 823708874} + 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 &823708877 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 823708874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0.35, 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 &823708878 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 823708874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &823708879 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 823708874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + mNoiseOffsets: {x: -626.70825, y: 869.96936, z: -297.0344} --- !u!1 &829840383 GameObject: m_ObjectHideFlags: 0 @@ -9171,11 +9399,13 @@ Transform: - {fileID: 1202246478} - {fileID: 485330053} - {fileID: 1627397278} + - {fileID: 367511624} - {fileID: 604918582} - {fileID: 1974800728} - {fileID: 372183240} - {fileID: 562470284} - {fileID: 672497992} + - {fileID: 1546185926} m_Father: {fileID: 2110284874} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &955235046 @@ -9917,7 +10147,7 @@ Transform: m_GameObject: {fileID: 1124157896} serializedVersion: 2 m_LocalRotation: {x: -0.051868558, y: 0.9246109, z: -0.34594372, w: -0.1507558} - m_LocalPosition: {x: 7.038666, y: -4.307354, z: 8.003296} + m_LocalPosition: {x: 7.9569855, y: -4.307354, z: 8.444275} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10315,13 +10545,170 @@ MonoBehaviour: m_YawDamping: 0 m_RollDamping: 0 m_AngularDamping: 0 ---- !u!1 &1178814724 +--- !u!1001 &1159905659 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1945386322} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalScale.x + value: 0.72 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalScale.y + value: 0.72 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalScale.z + value: 0.72 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.288 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.004 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalPosition.z + value: -8.419 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.13455305 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.12754321 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.69439393 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.69530237 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.428 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 71.935 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 86.704 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + propertyPath: m_Name + value: BB_SpotMini-House_2023-ikea-magazine-bent-90 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1159905663} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1159905664} + m_SourcePrefab: {fileID: 100100000, guid: eb935d62094888d4b93747f21e8fbd11, type: 3} +--- !u!4 &1159905660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + m_PrefabInstance: {fileID: 1159905659} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1159905661 stripped GameObject: - m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: eb935d62094888d4b93747f21e8fbd11, + type: 3} + m_PrefabInstance: {fileID: 1159905659} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1159905663 +Rigidbody: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_GameObject: {fileID: 1159905661} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1159905664 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159905661} + 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: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -6860369894887925525, guid: eb935d62094888d4b93747f21e8fbd11, type: 3} +--- !u!1 &1178814724 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1178814725} - component: {fileID: 1178814726} @@ -10340,8 +10727,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178814724} serializedVersion: 2 - m_LocalRotation: {x: -0.17943339, y: -0.3611695, z: 0.20154451, w: 0.89260304} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.18283229, y: -0.29503497, z: 0.16465035, w: 0.9232643} + m_LocalPosition: {x: -0.000000016001835, y: -0.000001440554, z: 0.0000012500108} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -11468,6 +11855,12 @@ MonoBehaviour: m_ModelName: Walker m_Index: 8 m_Touched: 0 +--- !u!4 &1396062067 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8108301076848869440, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1412792145 PrefabInstance: m_ObjectHideFlags: 0 @@ -12308,6 +12701,103 @@ MonoBehaviour: m_ModelName: Walker m_Index: 5 m_Touched: 0 +--- !u!1 &1546185925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1546185926} + - component: {fileID: 1546185927} + - component: {fileID: 1546185928} + m_Layer: 0 + m_Name: Intro Still Life + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1546185926 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546185925} + serializedVersion: 2 + m_LocalRotation: {x: 0.07644289, y: -0.4249972, z: 0.03604811, w: 0.90124047} + m_LocalPosition: {x: 1.6610107, y: -5.17, z: 32.916077} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 823708875} + m_Father: {fileID: 953333220} + m_LocalEulerAnglesHint: {x: 7.356, y: -52.597, z: 0.401} +--- !u!114 &1546185927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546185925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 20 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1636960755} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 7.466423 + OrthographicSize: 10 + NearClipPlane: 0.01 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 1 + FocusDistance: 8.93528 + m_SensorSize: {x: 1, y: 1} + Iso: 50 + ShutterSpeed: 0.0005 + Aperture: 2.2 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 823708875} +--- !u!114 &1546185928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546185925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 449ef5ebbe24720439ec31d15f7b6f3d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FocusTracksTarget: 0 + m_FocusTracking: 1 + m_FocusTarget: {fileID: 0} + m_FocusOffset: 0 + m_Profile: {fileID: 11400000, guid: 14b392ee213d25a48b1feddbd9f5a9be, type: 2} --- !u!1 &1548193994 GameObject: m_ObjectHideFlags: 0 @@ -12778,8 +13268,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1627397277} serializedVersion: 2 - m_LocalRotation: {x: 0.20494986, y: -0.65611947, z: 0.21927615, w: 0.6924022} - m_LocalPosition: {x: 0.89001465, y: 7.3500004, z: 36.5} + m_LocalRotation: {x: 0.42669445, y: 0.25140798, z: -0.12477503, w: 0.85974246} + m_LocalPosition: {x: -19.5, y: 6.4, z: 35} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -12819,12 +13309,12 @@ MonoBehaviour: - m_Script m_LockStageInInspector: m_StreamingVersion: 20170927 - m_Priority: 16 + m_Priority: 2 m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} + m_LookAt: {fileID: 1396062067} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 105.52868 + FieldOfView: 106.08275 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 @@ -12833,7 +13323,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 8.93528 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -12884,6 +13374,12 @@ Transform: - {fileID: 376869430} m_Father: {fileID: 160784038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1636960755 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2426604340092254430, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} --- !u!1 &1637099438 GameObject: m_ObjectHideFlags: 3 @@ -12979,6 +13475,96 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1653840002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1653840003} + - component: {fileID: 1653840005} + - component: {fileID: 1653840004} + m_Layer: 0 + m_Name: House Content|Nest Camera_L_BB_SpotMini-House_2023.blend|Dupli|59 (6) + m_TagString: surveillance + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1653840003 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653840002} + serializedVersion: 2 + m_LocalRotation: {x: -0.05326836, y: -0.61171114, z: -0.052276764, w: -0.7875527} + m_LocalPosition: {x: 5.763006, y: 6.7706704, z: 2.4049735} + m_LocalScale: {x: 0.0066539566, y: 0.0066539557, z: 0.0066539557} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 227347620} + m_LocalEulerAnglesHint: {x: 178.857, y: -104.241, z: 188.484} +--- !u!23 &1653840004 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653840002} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 19f688e6704c1984b9adad91653ecc9b, type: 2} + - {fileID: 2100000, guid: 73e40831d9e739f4eb3f5870a3939305, type: 2} + - {fileID: 2100000, guid: 7bd4455cbc480b24cb31e04c6479f3da, type: 2} + - {fileID: 2100000, guid: f6aec2e3161cba04eabe37fe3533fc4d, type: 2} + - {fileID: 2100000, guid: cf0aa4cfd51958a42aae0c1ad6f53d1d, type: 2} + - {fileID: 2100000, guid: 4b7a2dc0775bc134fad953129abb3be9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1653840005 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653840002} + m_Mesh: {fileID: -7098192852347876607, guid: 035fa817a7331e74f852d97d43c28aa6, type: 3} --- !u!1 &1657967063 GameObject: m_ObjectHideFlags: 0 @@ -14187,6 +14773,63 @@ MonoBehaviour: m_ModelName: Walker m_Index: 11 m_Touched: 0 +--- !u!1 &1879352480 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1879352481} + - component: {fileID: 1879352483} + - component: {fileID: 1879352482} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1879352481 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1879352480} + 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: [] + m_Father: {fileID: 367511624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1879352482 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1879352480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1879352483 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1879352480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1882797708 GameObject: m_ObjectHideFlags: 3 @@ -14948,6 +15591,12 @@ MonoBehaviour: m_ModelName: Walker m_Index: 4 m_Touched: 0 +--- !u!4 &1945386322 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5893359067720275355, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} --- !u!1 &1956142036 GameObject: m_ObjectHideFlags: 0 @@ -16301,6 +16950,7 @@ GameObject: m_Component: - component: {fileID: 2107604562} - component: {fileID: 2107604563} + - component: {fileID: 2107604564} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -16335,6 +16985,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &2107604564 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107604561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2110284873 GameObject: m_ObjectHideFlags: 0 @@ -17378,12 +18040,72 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalScale.x + value: 31.78 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalScale.y + value: 31.78 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalScale.z + value: 31.78 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 5.1 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 315288965566773022, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 404323751554209478, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Material value: objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} + - target: {fileID: 421108404665181308, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 421108404665181308, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Intensity @@ -17466,6 +18188,11 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 2dcff4a562f7e4820bd8128d56dc94e5, type: 2} + - target: {fileID: 1093232352580431268, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1141904950044442108, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Size.y @@ -17589,17 +18316,17 @@ PrefabInstance: - target: {fileID: 2426604340092254430, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.x - value: 4.069 + value: 4.27 objectReference: {fileID: 0} - target: {fileID: 2426604340092254430, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.y - value: 0.001 + value: 0.002 objectReference: {fileID: 0} - target: {fileID: 2426604340092254430, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.z - value: -8.34 + value: -8.599 objectReference: {fileID: 0} - target: {fileID: 2980201418459161106, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -17735,6 +18462,11 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} + - target: {fileID: 3389847649859975060, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3635445528558505471, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Material @@ -17744,17 +18476,52 @@ PrefabInstance: - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.x - value: 4.102 + value: 4.121 objectReference: {fileID: 0} - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.y - value: 0.003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.z - value: -8.184 + value: -8.643 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00016505127 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.972104 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.005758071 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.23447937 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 179.827 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -27.121002 + objectReference: {fileID: 0} + - target: {fileID: 3781712999266604032, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.6369934 objectReference: {fileID: 0} - target: {fileID: 4043761615092491033, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -17922,6 +18689,11 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} + - target: {fileID: 6268436082409462091, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6269969065988108739, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Material @@ -17934,6 +18706,26 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 2dcff4a562f7e4820bd8128d56dc94e5, type: 2} + - target: {fileID: 6488384725308077761, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 13.12 + objectReference: {fileID: 0} + - target: {fileID: 6488384725308077761, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.76 + objectReference: {fileID: 0} + - target: {fileID: 6736229006374745618, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Size.z + value: 218.4 + objectReference: {fileID: 0} + - target: {fileID: 6736229006374745618, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Intensity @@ -18177,12 +18969,12 @@ PrefabInstance: - target: {fileID: 8963458750444552278, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_HoldSpeed - value: 280 + value: 200 objectReference: {fileID: 0} - target: {fileID: 8963458750444552278, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_HoldSpeedTimer - value: 200 + value: 20 objectReference: {fileID: 0} - target: {fileID: 9105791565900276401, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -18322,6 +19114,14 @@ PrefabInstance: type: 3} insertIndex: 1 addedObject: {fileID: 731623068} + - targetCorrespondingSourceObject: {fileID: 3654837400929340511, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + insertIndex: 52 + addedObject: {fileID: 1653840003} + - targetCorrespondingSourceObject: {fileID: 5893359067720275355, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + insertIndex: 1 + addedObject: {fileID: 1159905660} - targetCorrespondingSourceObject: {fileID: 5171334526885139719, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} insertIndex: -1 diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 5aa9712..2922c00 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":238.430208,"total":240.2171563,"children":{"InitializeActuators":{"count":1,"self":0.0005022,"total":0.0005022,"children":null},"InitializeSensors":{"count":1,"self":0.00099969999999999985,"total":0.00099969999999999985,"children":null},"AgentSendState":{"count":11611,"self":0.130714,"total":0.17718699999999998,"children":{"CollectObservations":{"count":2323,"self":0.03655,"total":0.03655,"children":null},"WriteActionMask":{"count":2323,"self":0.0055109,"total":0.0055109,"children":null},"RequestDecision":{"count":2323,"self":0.0044120999999999995,"total":0.0044120999999999995,"children":null}}},"DecideAction":{"count":11611,"self":1.5163735,"total":1.5369403,"children":{"RayPerceptionSensor.Perceive":{"count":2323,"self":0.0205668,"total":0.0205668,"children":null}}},"AgentAct":{"count":11611,"self":0.0703271,"total":0.0703271,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712587648","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\Gebruiker\\Documents\\BB_BeautyBeep\\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":"1712587888"}} \ No newline at end of file +{"count":1,"self":500.5054464,"total":501.7833864,"children":{"InitializeActuators":{"count":1,"self":0,"total":0,"children":null},"InitializeSensors":{"count":1,"self":0.0015107999999999999,"total":0.0015107999999999999,"children":null},"AgentSendState":{"count":7450,"self":0.0856981,"total":0.1433504,"children":{"CollectObservations":{"count":1490,"self":0.0496358,"total":0.0496358,"children":null},"WriteActionMask":{"count":1490,"self":0.0050089999999999996,"total":0.0050089999999999996,"children":null},"RequestDecision":{"count":1490,"self":0.0030074999999999998,"total":0.0030074999999999998,"children":null}}},"DecideAction":{"count":7450,"self":1.0475484,"total":1.0606836,"children":{"RayPerceptionSensor.Perceive":{"count":1490,"self":0.0131352,"total":0.0131352,"children":null}}},"AgentAct":{"count":7450,"self":0.0714114,"total":0.0714114,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712655177","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\Gebruiker\\Documents\\BB_BeautyBeep\\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":"1712655679"}} \ No newline at end of file diff --git a/Assets/Settings/HDRPDefaultResources/C Default.asset b/Assets/Settings/HDRPDefaultResources/C Default.asset index 510b08a..92305e4 100644 --- a/Assets/Settings/HDRPDefaultResources/C Default.asset +++ b/Assets/Settings/HDRPDefaultResources/C Default.asset @@ -1027,7 +1027,7 @@ MonoBehaviour: m_Value: 1 focusDistance: m_OverrideState: 1 - m_Value: 18.52 + m_Value: 0.1 focusDistanceMode: m_OverrideState: 1 m_Value: 0 @@ -1048,7 +1048,7 @@ MonoBehaviour: m_Value: 5 m_NearMaxBlur: m_OverrideState: 1 - m_Value: 0 + m_Value: 1.09 m_FarSampleCount: m_OverrideState: 1 m_Value: 7 diff --git a/Assets/Settings/HDRPDefaultResources/C Surveillance.asset b/Assets/Settings/HDRPDefaultResources/C Surveillance.asset index 5479c60..c73cbb0 100644 --- a/Assets/Settings/HDRPDefaultResources/C Surveillance.asset +++ b/Assets/Settings/HDRPDefaultResources/C Surveillance.asset @@ -159,10 +159,10 @@ MonoBehaviour: m_Value: 4 upperHemisphereLuxValue: m_OverrideState: 1 - m_Value: 3.2590904 + m_Value: 3.2591033 upperHemisphereLuxColor: m_OverrideState: 1 - m_Value: {x: 0.33901125, y: 0.42040265, z: 0.5} + m_Value: {x: 0.33901075, y: 0.42040232, z: 0.5} desiredLuxValue: m_OverrideState: 1 m_Value: 30000