diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index dd181f4..7cbb8f7 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -131,7 +131,7 @@ GameObject: - component: {fileID: 19056828} - component: {fileID: 19056827} - component: {fileID: 19056829} - m_Layer: 0 + m_Layer: 9 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -502,10 +502,8 @@ GameObject: - component: {fileID: 377437130} - component: {fileID: 377437131} - component: {fileID: 377437132} - - component: {fileID: 377437134} - component: {fileID: 377437133} - - component: {fileID: 377437135} - m_Layer: 0 + m_Layer: 9 m_Name: Camera Street Sign m_TagString: Untagged m_Icon: {fileID: 0} @@ -520,14 +518,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377437129} serializedVersion: 2 - m_LocalRotation: {x: 0.14941801, y: -0.763991, z: 0.19090846, w: 0.5979516} - m_LocalPosition: {x: -402.8, y: 27.1, z: 239.7} + m_LocalRotation: {x: -0.04124628, y: 0.8674601, z: -0.07296037, w: -0.49039644} + m_LocalPosition: {x: -407.15, y: 23.37, z: 250.07} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 19056825} m_Father: {fileID: 1337085231} - m_LocalEulerAnglesHint: {x: 4.641, y: -110.1, z: 0} + m_LocalEulerAnglesHint: {x: 6.664, y: -113.018, z: 2.402} --- !u!114 &377437131 MonoBehaviour: m_ObjectHideFlags: 0 @@ -546,10 +544,10 @@ MonoBehaviour: m_StreamingVersion: 20170927 m_Priority: 10 m_StandbyUpdate: 2 - m_LookAt: {fileID: 3413039205880321923} + m_LookAt: {fileID: 1574719136} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 80 + FieldOfView: 60 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 @@ -589,7 +587,7 @@ MonoBehaviour: m_CollideAgainst: serializedVersion: 2 m_Bits: 4294967295 - m_IgnoreTag: + m_IgnoreTag: Untagged m_TransparentLayers: serializedVersion: 2 m_Bits: 0 @@ -613,197 +611,14 @@ MonoBehaviour: m_GameObject: {fileID: 377437129} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} - m_Name: - m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.5 - TAAQuality: 1 - taaSharpenMode: 0 - taaRingingReduction: 0 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - taaJitterScale: 1 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - screenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - screenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - fsrOverrideSharpness: 0 - fsrSharpness: 0.92 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 5770166122053453 - data2: 13799031440106553368 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - sssCustomDownsampleSteps: 0 - msaaMode: 1 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 - m_Version: 9 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 ---- !u!20 &377437134 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 377437129} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 1 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &377437135 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 377437129} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 729aad4491e915a41bda2b8325cf757a, type: 3} + 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: cd5adfa3bab344f2bad6ea615667c217, type: 2} + m_FocusTracking: 3 + m_FocusTarget: {fileID: 1574719136} + m_FocusOffset: 1 + m_Profile: {fileID: 11400000, guid: 14b392ee213d25a48b1feddbd9f5a9be, type: 2} --- !u!1001 &387060609 PrefabInstance: m_ObjectHideFlags: 0 @@ -935,8 +750,7 @@ GameObject: - component: {fileID: 470663204} - component: {fileID: 470663199} - component: {fileID: 470663198} - - component: {fileID: 470663203} - m_Layer: 0 + m_Layer: 9 m_Name: Camera Brain m_TagString: Untagged m_Icon: {fileID: 0} @@ -1094,19 +908,19 @@ Camera: serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 + m_projectionMatrixMode: 2 m_GateFitMode: 1 m_FOVAxisMode: 0 m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 20.784609 + m_FocusDistance: 4.480884 + m_FocalLength: 11.100281 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} + m_SensorSize: {x: 20.726, y: 15.545} m_LensShift: {x: 0, y: 0} m_NormalizedViewPortRect: serializedVersion: 2 @@ -1142,73 +956,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: -0.00000060848396, y: 0.20388046, z: 0.00000012671964, w: 0.9789958} - m_LocalPosition: {x: -251.85825, y: 6.249988, z: 513.6272} + m_LocalRotation: {x: -0.026846563, y: -0.04668268, z: -0.0012550915, w: 0.9985482} + m_LocalPosition: {x: -253.18797, y: 6.7592316, z: 521.45233} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1337085231} m_LocalEulerAnglesHint: {x: 21.658, y: 140.648, z: 0.002} ---- !u!114 &470663203 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470663197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: - volumeTrigger: {fileID: 470663201} - volumeLayer: - serializedVersion: 2 - m_Bits: 64 - stopNaNPropagation: 1 - finalBlitToCameraTarget: 0 - antialiasingMode: 0 - temporalAntialiasing: - jitterSpread: 0.75 - sharpness: 0.25 - stationaryBlending: 0.95 - motionBlending: 0.85 - subpixelMorphologicalAntialiasing: - quality: 2 - fastApproximateAntialiasing: - fastMode: 0 - keepAlpha: 0 - fog: - enabled: 1 - excludeSkybox: 1 - debugLayer: - lightMeter: - width: 512 - height: 256 - showCurves: 1 - histogram: - width: 512 - height: 256 - channel: 3 - waveform: - exposure: 0.12 - height: 256 - vectorscope: - size: 256 - exposure: 0.12 - overlaySettings: - linearDepth: 0 - motionColorIntensity: 4 - motionGridSize: 64 - colorBlindnessType: 0 - colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} - m_ShowToolkit: 0 - m_ShowCustomSorter: 0 - breakBeforeColorGrading: 0 - m_BeforeTransparentBundles: [] - m_BeforeStackBundles: [] - m_AfterStackBundles: [] --- !u!114 &470663204 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1286,7 +1040,8 @@ GameObject: - component: {fileID: 513050372} - component: {fileID: 513050373} - component: {fileID: 513050374} - m_Layer: 0 + - component: {fileID: 513050375} + m_Layer: 9 m_Name: Camera Chair Follow m_TagString: Untagged m_Icon: {fileID: 0} @@ -1301,7 +1056,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: -0.00000060848396, y: 0.20388046, z: 0.00000012671964, w: 0.9789958} + m_LocalRotation: {x: -0.026846563, y: -0.04668268, z: -0.0012550915, w: 0.9985482} m_LocalPosition: {x: -252.36751, y: 6.25, z: 512.41} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1327,7 +1082,7 @@ MonoBehaviour: m_StreamingVersion: 20170927 m_Priority: 10 m_StandbyUpdate: 2 - m_LookAt: {fileID: 1412792148} + m_LookAt: {fileID: 2022532225} m_Follow: {fileID: 1412792148} m_Lens: FieldOfView: 70 @@ -1339,7 +1094,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} + m_SensorSize: {x: 20.726, y: 15.545} Iso: 200 ShutterSpeed: 0.005 Aperture: 16 @@ -1385,6 +1140,23 @@ MonoBehaviour: m_Damping: 0 m_DampingWhenOccluded: 0 m_OptimalTargetDistance: 0 +--- !u!114 &513050375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513050371} + 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!4 &537498496 stripped Transform: m_CorrespondingSourceObject: {fileID: 9148272401270991874, guid: f03606b436da1d94e977c8ffa2825bd9, @@ -2930,6 +2702,37 @@ Transform: - {fileID: 1201075076} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1574719135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1574719136} + m_Layer: 0 + m_Name: street sign focus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1574719136 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574719135} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3413039205880321923} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1577385986 PrefabInstance: m_ObjectHideFlags: 0 @@ -3042,7 +2845,7 @@ GameObject: - component: {fileID: 1637099442} - component: {fileID: 1637099441} - component: {fileID: 1637099440} - m_Layer: 0 + m_Layer: 9 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3429,6 +3232,12 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2022532225 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9, + type: 3} + m_PrefabInstance: {fileID: 1412792145} + m_PrefabAsset: {fileID: 0} --- !u!1 &2024103100 GameObject: m_ObjectHideFlags: 0 @@ -3862,7 +3671,7 @@ GameObject: - component: {fileID: 8771930213004705762} m_Layer: 0 m_Name: suburb - m_TagString: Untagged + m_TagString: intro camera avoid m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -7596,7 +7405,8 @@ Transform: m_LocalPosition: {x: 218.83261, y: -3.324669, z: 74.01691} m_LocalScale: {x: 7.2819557, y: 7.2819557, z: 7.281955} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1574719136} m_Father: {fileID: 402030874} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3445680733547772124 diff --git a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile.asset b/Assets/6_Scenes/Beep/Global Volume Profile.asset similarity index 91% rename from Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile.asset rename to Assets/6_Scenes/Beep/Global Volume Profile.asset index c3e4edb..5811643 100644 --- a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile.asset +++ b/Assets/6_Scenes/Beep/Global Volume Profile.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Camera Street Sign Profile + m_Name: Global Volume Profile m_EditorClassIdentifier: components: [] diff --git a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile 1.asset.meta b/Assets/6_Scenes/Beep/Global Volume Profile.asset.meta similarity index 79% rename from Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile 1.asset.meta rename to Assets/6_Scenes/Beep/Global Volume Profile.asset.meta index 94d6e72..2c4deb9 100644 --- a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile 1.asset.meta +++ b/Assets/6_Scenes/Beep/Global Volume Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd5adfa3bab344f2bad6ea615667c217 +guid: ae68780cbaf0a4f87a2d23c765afdfaf NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/6_Scenes/Beep_Profiles/Camera Brain Profile.asset b/Assets/6_Scenes/Beep_Profiles/Camera Brain Profile.asset new file mode 100644 index 0000000..8b05e7c --- /dev/null +++ b/Assets/6_Scenes/Beep_Profiles/Camera Brain Profile.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Camera Brain Profile + m_EditorClassIdentifier: + components: [] diff --git a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile.asset.meta b/Assets/6_Scenes/Beep_Profiles/Camera Brain Profile.asset.meta similarity index 79% rename from Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile.asset.meta rename to Assets/6_Scenes/Beep_Profiles/Camera Brain Profile.asset.meta index cb70273..44d6622 100644 --- a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile.asset.meta +++ b/Assets/6_Scenes/Beep_Profiles/Camera Brain Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 61d39c945e9b440a182812fb6cc24b28 +guid: d88e0a25d53574c5c9866f6352cebc76 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile 1.asset b/Assets/6_Scenes/Beep_Profiles/Camera Chair Follow Profile.asset similarity index 85% rename from Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile 1.asset rename to Assets/6_Scenes/Beep_Profiles/Camera Chair Follow Profile.asset index 72f6480..d8bd872 100644 --- a/Assets/6_Scenes/Beep_Profiles/Camera Street Sign Profile 1.asset +++ b/Assets/6_Scenes/Beep_Profiles/Camera Chair Follow Profile.asset @@ -1,20 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3} - m_Name: Camera Street Sign Profile 1 - m_EditorClassIdentifier: - settings: - - {fileID: 6790101055935642128} ---- !u!114 &6790101055935642128 +--- !u!114 &-2240211195157872562 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -32,13 +18,27 @@ MonoBehaviour: value: 1 focusDistance: overrideState: 1 - value: 10 + value: 9.3 aperture: - overrideState: 0 - value: 5.6 + overrideState: 1 + value: 1.8 focalLength: overrideState: 0 value: 50 kernelSize: overrideState: 0 value: 1 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3} + m_Name: Camera Chair Follow Profile + m_EditorClassIdentifier: + settings: + - {fileID: -2240211195157872562} diff --git a/Assets/6_Scenes/Beep_Profiles/Camera Chair Follow Profile.asset.meta b/Assets/6_Scenes/Beep_Profiles/Camera Chair Follow Profile.asset.meta new file mode 100644 index 0000000..6de1675 --- /dev/null +++ b/Assets/6_Scenes/Beep_Profiles/Camera Chair Follow Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f89808bce5e1c47958d99092a213bfff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 87de300..da773d1 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":40.389686399999995,"total":40.70251,"children":{"InitializeActuators":{"count":1,"self":0.003981,"total":0.003981,"children":null},"InitializeSensors":{"count":1,"self":0.0066279999999999993,"total":0.0066279999999999993,"children":null},"AgentSendState":{"count":446,"self":0.008608,"total":0.016527999999999998,"children":{"CollectObservations":{"count":90,"self":0.003087,"total":0.003087,"children":null},"WriteActionMask":{"count":90,"self":0.000727,"total":0.000727,"children":null},"RequestDecision":{"count":90,"self":0.0041059999999999994,"total":0.0041059999999999994,"children":null}}},"DecideAction":{"count":446,"self":0.25875899999999996,"total":0.262905,"children":{"RayPerceptionSensor.Perceive":{"count":90,"self":0.0041459999999999995,"total":0.0041459999999999995,"children":null}}},"AgentAct":{"count":446,"self":0.018865,"total":0.018865,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709724484","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":"1709724524"}} \ No newline at end of file +{"count":1,"self":47.293216,"total":47.650662999999994,"children":{"InitializeActuators":{"count":1,"self":0.00586,"total":0.00586,"children":null},"InitializeSensors":{"count":1,"self":0.0095649999999999989,"total":0.0095649999999999989,"children":null},"AgentSendState":{"count":586,"self":0.012293,"total":0.021258,"children":{"CollectObservations":{"count":118,"self":0.003991,"total":0.003991,"children":null},"WriteActionMask":{"count":118,"self":0.00083099999999999992,"total":0.00083099999999999992,"children":null},"RequestDecision":{"count":118,"self":0.004143,"total":0.004143,"children":null}}},"DecideAction":{"count":586,"self":0.29126799999999997,"total":0.297078,"children":{"RayPerceptionSensor.Perceive":{"count":118,"self":0.00581,"total":0.00581,"children":null}}},"AgentAct":{"count":586,"self":0.020513,"total":0.020513,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709740530","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":"1709740578"}} \ No newline at end of file diff --git a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset index 6382933..c4c48ff 100644 --- a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset +++ b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset @@ -151,65 +151,6 @@ MonoBehaviour: m_SampleCount: m_OverrideState: 1 m_Value: 8 ---- !u!114 &-6803020888861455489 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 4b709909182ba0943abef2c49ed59205, type: 3} - m_Name: PaniniProjection - m_EditorClassIdentifier: - active: 1 - distance: - m_OverrideState: 1 - m_Value: 0 - cropToFit: - m_OverrideState: 1 - m_Value: 1 ---- !u!114 &-6478015333758393343 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 2c1be1b6c95cd2e41b27903b9270817f, type: 3} - m_Name: Vignette - m_EditorClassIdentifier: - active: 0 - mode: - m_OverrideState: 1 - m_Value: 0 - color: - m_OverrideState: 1 - m_Value: {r: 0, g: 0, b: 0, a: 1} - center: - m_OverrideState: 1 - m_Value: {x: 0.5, y: 0.5} - intensity: - m_OverrideState: 1 - m_Value: 0 - smoothness: - m_OverrideState: 1 - m_Value: 0.2 - roundness: - m_OverrideState: 1 - m_Value: 1 - rounded: - m_OverrideState: 1 - m_Value: 0 - mask: - m_OverrideState: 1 - m_Value: {fileID: 0} - opacity: - m_OverrideState: 1 - m_Value: 1 --- !u!114 &-6352799959969513434 MonoBehaviour: m_ObjectHideFlags: 3 @@ -306,79 +247,6 @@ MonoBehaviour: occlusionOnlyReflectionNormalization: m_OverrideState: 1 m_Value: 1 ---- !u!114 &-5557326520755739776 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 15cc4c5fcb677014ebdc0d8be227b40c, type: 3} - m_Name: ScreenSpaceLensFlare - m_EditorClassIdentifier: - active: 0 - intensity: - m_OverrideState: 1 - m_Value: 0 - tintColor: - m_OverrideState: 1 - m_Value: {r: 1, g: 1, b: 1, a: 1} - bloomMip: - m_OverrideState: 1 - m_Value: 1 - firstFlareIntensity: - m_OverrideState: 1 - m_Value: 1 - secondaryFlareIntensity: - m_OverrideState: 1 - m_Value: 1 - warpedFlareIntensity: - m_OverrideState: 1 - m_Value: 1 - warpedFlareScale: - m_OverrideState: 1 - m_Value: {x: 1, y: 1} - samples: - m_OverrideState: 1 - m_Value: 1 - sampleDimmer: - m_OverrideState: 1 - m_Value: 0.5 - vignetteEffect: - m_OverrideState: 1 - m_Value: 1 - startingPosition: - m_OverrideState: 1 - m_Value: 1.25 - scale: - m_OverrideState: 1 - m_Value: 1.5 - streaksIntensity: - m_OverrideState: 1 - m_Value: 1 - streaksLength: - m_OverrideState: 1 - m_Value: 0.5 - streaksOrientation: - m_OverrideState: 1 - m_Value: 0 - streaksThreshold: - m_OverrideState: 1 - m_Value: 0.25 - resolution: - m_OverrideState: 1 - m_Value: 4 - spectralLut: - m_OverrideState: 1 - m_Value: {fileID: 0} - chromaticAbberationIntensity: - m_OverrideState: 1 - m_Value: 0.5 - chromaticAbberationSampleCount: - m_OverrideState: 1 - m_Value: 3 --- !u!114 &-5320661601775074523 MonoBehaviour: m_ObjectHideFlags: 3 @@ -742,45 +610,6 @@ MonoBehaviour: saturation: m_OverrideState: 1 m_Value: 0 ---- !u!114 &-3437942941472996320 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 46a79c9cffef5cc469553b1341c2ecdf, type: 3} - m_Name: RecursiveRendering - m_EditorClassIdentifier: - active: 0 - enable: - m_OverrideState: 1 - m_Value: 0 - layerMask: - m_OverrideState: 1 - m_Value: - serializedVersion: 2 - m_Bits: 4294967295 - maxDepth: - m_OverrideState: 1 - m_Value: 4 - rayLength: - m_OverrideState: 1 - m_Value: 10 - minSmoothness: - m_OverrideState: 1 - m_Value: 0.5 - rayMiss: - m_OverrideState: 1 - m_Value: 3 - lastBounce: - m_OverrideState: 1 - m_Value: 3 - ambientProbeDimmer: - m_OverrideState: 1 - m_Value: 1 --- !u!114 &-3314964760258956391 MonoBehaviour: m_ObjectHideFlags: 3 @@ -806,123 +635,6 @@ MonoBehaviour: m_MaxSamples: m_OverrideState: 1 m_Value: 6 ---- !u!114 &-3305041014524376578 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 384c4d03a551c44448145f4093304119, type: 3} - m_Name: ScreenSpaceReflection - m_EditorClassIdentifier: - active: 1 - quality: - m_OverrideState: 1 - m_Value: 1 - enabled: - m_OverrideState: 1 - m_Value: 1 - enabledTransparent: - m_OverrideState: 1 - m_Value: 1 - tracing: - m_OverrideState: 1 - m_Value: 1 - m_MinSmoothness: - m_OverrideState: 1 - m_Value: 0.9 - m_SmoothnessFadeStart: - m_OverrideState: 1 - m_Value: 0.9 - reflectSky: - m_OverrideState: 1 - m_Value: 1 - usedAlgorithm: - m_OverrideState: 1 - m_Value: 0 - depthBufferThickness: - m_OverrideState: 1 - m_Value: 0.01 - screenFadeDistance: - m_OverrideState: 1 - m_Value: 0.1 - accumulationFactor: - m_OverrideState: 1 - m_Value: 0.75 - biasFactor: - m_OverrideState: 1 - m_Value: 0.5 - speedRejectionParam: - m_OverrideState: 1 - m_Value: 0.5 - speedRejectionScalerFactor: - m_OverrideState: 1 - m_Value: 0.2 - speedSmoothReject: - m_OverrideState: 1 - m_Value: 0 - speedSurfaceOnly: - m_OverrideState: 1 - m_Value: 1 - speedTargetOnly: - m_OverrideState: 1 - m_Value: 1 - enableWorldSpeedRejection: - m_OverrideState: 1 - m_Value: 0 - m_RayMaxIterations: - m_OverrideState: 1 - m_Value: 24 - rayMiss: - m_OverrideState: 1 - m_Value: 3 - lastBounceFallbackHierarchy: - m_OverrideState: 1 - m_Value: 3 - ambientProbeDimmer: - m_OverrideState: 1 - m_Value: 1 - layerMask: - m_OverrideState: 1 - m_Value: - serializedVersion: 2 - m_Bits: 4294967295 - textureLodBias: - m_OverrideState: 1 - m_Value: 1 - m_RayLength: - m_OverrideState: 1 - m_Value: 50 - m_ClampValue: - m_OverrideState: 1 - m_Value: 1 - m_Denoise: - m_OverrideState: 1 - m_Value: 1 - m_DenoiserRadius: - m_OverrideState: 1 - m_Value: 0.75 - m_DenoiserAntiFlickeringStrength: - m_OverrideState: 1 - m_Value: 1 - mode: - m_OverrideState: 1 - m_Value: 2 - m_FullResolution: - m_OverrideState: 1 - m_Value: 0 - sampleCount: - m_OverrideState: 1 - m_Value: 1 - bounceCount: - m_OverrideState: 1 - m_Value: 1 - m_RayMaxIterationsRT: - m_OverrideState: 1 - m_Value: 48 --- !u!114 &-2239355638492639023 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1307,24 +1019,18 @@ MonoBehaviour: - {fileID: -6080844802261472055} - {fileID: -3314964760258956391} - {fileID: 9219839369190479486} - - {fileID: -3437942941472996320} - - {fileID: -3305041014524376578} - {fileID: 1677635988147190222} - {fileID: -1988887012532590100} - {fileID: 8098072302648435049} - {fileID: 3654020196863678948} - {fileID: 8158684307098964669} - {fileID: 405838469936014064} - - {fileID: 7049988323590120579} - - {fileID: -6803020888861455489} - {fileID: -6352799959969513434} - {fileID: 5602483959143658810} - {fileID: 5036919984216512174} - {fileID: -1442420718626273897} - {fileID: -8308199868632852039} - {fileID: -5320661601775074523} - - {fileID: -5557326520755739776} - - {fileID: -6478015333758393343} - {fileID: -5703741376142700804} --- !u!114 &196157046809651451 MonoBehaviour: @@ -1554,13 +1260,13 @@ MonoBehaviour: m_Value: 1 enabled: m_OverrideState: 1 - m_Value: 0 + m_Value: 1 colorMode: m_OverrideState: 1 m_Value: 1 color: m_OverrideState: 1 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_Value: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} tint: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} @@ -1584,7 +1290,7 @@ MonoBehaviour: m_Value: 50 meanFreePath: m_OverrideState: 1 - m_Value: 400 + m_Value: 100 enableVolumetricFog: m_OverrideState: 1 m_Value: 0 @@ -1989,196 +1695,6 @@ MonoBehaviour: cullingDistance: m_OverrideState: 1 m_Value: 1000 ---- !u!114 &7049988323590120579 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 4bff652df78c97c4f963064ad1f34619, type: 3} - m_Name: ColorCurves - m_EditorClassIdentifier: - active: 1 - master: - m_OverrideState: 1 - m_Value: - k__BackingField: 2 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - red: - m_OverrideState: 1 - m_Value: - k__BackingField: 2 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - green: - m_OverrideState: 1 - m_Value: - k__BackingField: 2 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - blue: - m_OverrideState: 1 - m_Value: - k__BackingField: 2 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueVsHue: - m_OverrideState: 1 - m_Value: - k__BackingField: 0 - m_Loop: 1 - m_ZeroValue: 0.5 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueVsSat: - m_OverrideState: 1 - m_Value: - k__BackingField: 0 - m_Loop: 1 - m_ZeroValue: 0.5 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - satVsSat: - m_OverrideState: 1 - m_Value: - k__BackingField: 0 - m_Loop: 0 - m_ZeroValue: 0.5 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - lumVsSat: - m_OverrideState: 1 - m_Value: - k__BackingField: 0 - m_Loop: 0 - m_ZeroValue: 0.5 - m_Range: 1 - m_Curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_SelectedCurve: 0 --- !u!114 &7502528774814404555 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2386,13 +1902,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5a6b00fcf518bb94a90b408492e07b44, type: 3} m_Name: FilmGrain m_EditorClassIdentifier: - active: 0 + active: 1 type: m_OverrideState: 1 - m_Value: 0 + m_Value: 2 intensity: m_OverrideState: 1 - m_Value: 0 + m_Value: 0.078 response: m_OverrideState: 1 m_Value: 0.8 @@ -2439,16 +1955,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aaa3b8214f75b354e9ba2caadd022259, type: 3} m_Name: DepthOfField m_EditorClassIdentifier: - active: 0 + active: 1 quality: m_OverrideState: 1 - m_Value: 1 + m_Value: 3 focusMode: m_OverrideState: 1 - m_Value: 0 + m_Value: 1 focusDistance: m_OverrideState: 1 - m_Value: 10 + m_Value: 1.79 focusDistanceMode: m_OverrideState: 1 m_Value: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 50dc5a1..77d4ef9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,7 +4,6 @@ "com.unity.collab-proxy": "2.2.0", "com.unity.feature.development": "1.0.2", "com.unity.ml-agents": "2.3.0-exp.3", - "com.unity.postprocessing": "3.4.0", "com.unity.recorder": "5.0.0", "com.unity.render-pipelines.high-definition": "16.0.5", "com.unity.rendering.denoising": "1.0.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 75aec93..9d70fcc 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -125,15 +125,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.postprocessing": { - "version": "3.4.0", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.physics": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.recorder": { "version": "5.0.0", "depth": 0, diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 0542a7b..c008590 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -17,6 +17,7 @@ TagManager: - swap_Getup - swap_Sloper - chair + - intro camera avoid layers: - Default - TransparentFX @@ -27,7 +28,7 @@ TagManager: - virtualCamPost - Walls - Chair - - + - post processing - - -