diff --git a/Assets/12_Timelines/Camera Timeline.playable b/Assets/12_Timelines/Camera Timeline.playable index bbd5652..f485ee2 100644 --- a/Assets/12_Timelines/Camera Timeline.playable +++ b/Assets/12_Timelines/Camera Timeline.playable @@ -68,7 +68,7 @@ MonoBehaviour: m_Version: 3 m_AnimClip: {fileID: 0} m_Locked: 0 - m_Muted: 0 + m_Muted: 1 m_CustomPlayableFullTypename: m_Curves: {fileID: 0} m_Parent: {fileID: 11400000} @@ -78,13 +78,13 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -3373655309145298414} - m_Duration: 27.366666666666667 + m_Duration: 38.40000000000001 m_TimeScale: 1 m_ParentTrack: {fileID: 3937275411153492513} m_EaseInDuration: 0 m_EaseOutDuration: 0 m_BlendInDuration: -1 - m_BlendOutDuration: 1.7666666666666657 + m_BlendOutDuration: 2.616666666666667 m_MixInCurve: serializedVersion: 2 m_Curve: @@ -111,25 +111,7 @@ MonoBehaviour: 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 @@ -144,61 +126,25 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: Camera Street Sign - m_Version: 1 - m_Start: 25.6 + m_Start: 35.783333333333346 m_ClipIn: 0 m_Asset: {fileID: -5235963257230267934} - m_Duration: 9.18333333333333 + m_Duration: 11.516666666666666 m_TimeScale: 1 m_ParentTrack: {fileID: 3937275411153492513} m_EaseInDuration: 0 m_EaseOutDuration: 0 - m_BlendInDuration: 1.7666666666666657 - m_BlendOutDuration: 6.566666666666666 + m_BlendInDuration: 2.616666666666667 + m_BlendOutDuration: 8.899999999999999 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 @@ -213,7 +159,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: House - m_Version: 1 - m_Start: 28.216666666666665 + m_Start: 38.40000000000001 m_ClipIn: 0 m_Asset: {fileID: 7310266897944482791} m_Duration: 16.86666666666667 @@ -221,7 +167,7 @@ MonoBehaviour: m_ParentTrack: {fileID: 3937275411153492513} m_EaseInDuration: 0 m_EaseOutDuration: 0 - m_BlendInDuration: 6.566666666666666 + m_BlendInDuration: 8.899999999999999 m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 diff --git a/Assets/12_Timelines/Chair Animations.playable b/Assets/12_Timelines/Chair Animations.playable index 8bbf9c8..c35255b 100644 --- a/Assets/12_Timelines/Chair Animations.playable +++ b/Assets/12_Timelines/Chair Animations.playable @@ -1,27 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-286257330412732563 -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: b4e64838fd52ce24eb015d4391a04e1d, 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 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -58,81 +36,12 @@ MonoBehaviour: m_Version: 3 m_AnimClip: {fileID: 0} m_Locked: 0 - m_Muted: 0 + m_Muted: 1 m_CustomPlayableFullTypename: m_Curves: {fileID: 0} m_Parent: {fileID: 11400000} m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 0 - m_ClipIn: 0 - m_Asset: {fileID: -286257330412732563} - m_Duration: 80.56666666666666 - m_TimeScale: 1 - m_ParentTrack: {fileID: 1884373289189587282} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: -1 - m_BlendOutDuration: -1 - m_MixInCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 1 - m_PreExtrapolationMode: 1 - m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 0 - m_DisplayName: Animation Clip_Chair_PathHouseTour003 + m_Clips: [] m_Markers: m_Objects: [] m_InfiniteClipPreExtrapolation: 0 diff --git a/Assets/15_Prefabs/Environment.prefab b/Assets/15_Prefabs/Environment.prefab index 6426550..af89567 100644 --- a/Assets/15_Prefabs/Environment.prefab +++ b/Assets/15_Prefabs/Environment.prefab @@ -1485,143 +1485,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!1 &1479026834293839180 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 946300249434265602} - - component: {fileID: 737011820628488422} - - component: {fileID: 1227253864179317320} - - component: {fileID: 5108072913580185978} - - component: {fileID: 2108655503289449112} - m_Layer: 0 - m_Name: House Content|CoatRack_L_BB_SpotMini-House_2023.blend|Dupli|64 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &946300249434265602 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1479026834293839180} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.20554255, y: 0.5172484, z: -0.004127526} - m_LocalScale: {x: 0.025400002, y: 0.025400002, z: 0.0254} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 379373613294101549} - m_Father: {fileID: 3654837400929340511} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &737011820628488422 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1479026834293839180} - m_Mesh: {fileID: -373215618245328478, guid: 035fa817a7331e74f852d97d43c28aa6, type: 3} ---- !u!23 &1227253864179317320 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1479026834293839180} - 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: ce1db622676aba44d9f59002104bdcd7, 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!64 &5108072913580185978 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1479026834293839180} - 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: -373215618245328478, guid: 035fa817a7331e74f852d97d43c28aa6, type: 3} ---- !u!54 &2108655503289449112 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1479026834293839180} - serializedVersion: 4 - m_Mass: 10 - m_Drag: 0.05 - 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!1 &1528485605078464453 GameObject: m_ObjectHideFlags: 0 @@ -2100,7 +1963,7 @@ Transform: - {fileID: 5851350172372219738} - {fileID: 2167145518393631948} - {fileID: 6905787899199828322} - - {fileID: 946300249434265602} + - {fileID: 9166527864064062079} - {fileID: 5998474730012710496} - {fileID: 1476477242129981571} - {fileID: 280070695569229175} @@ -8838,91 +8701,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6504088808750301867 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 379373613294101549} - - component: {fileID: 5971620279505045355} - - component: {fileID: 5674643360851467179} - m_Layer: 0 - m_Name: House Content|hanger_L_BB_SpotMini-House_2023.blend|Dupli|16 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &379373613294101549 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6504088808750301867} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071069, y: -0.000000029802319, z: -0.000000029802319, w: 0.7071067} - m_LocalPosition: {x: -10.884495, y: 16.328527, z: 58.2177} - m_LocalScale: {x: 3.139255, y: 3.1392543, z: 3.1392548} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 946300249434265602} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5971620279505045355 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6504088808750301867} - m_Mesh: {fileID: 7246052415007059945, guid: 035fa817a7331e74f852d97d43c28aa6, type: 3} ---- !u!23 &5674643360851467179 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6504088808750301867} - 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: 2648a6c054c4508488c09e13b13cfe06, 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!1 &6506472639467825856 GameObject: m_ObjectHideFlags: 0 @@ -14780,6 +14558,100 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8578444299677722539} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8700028673438209428 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3654837400929340511} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalScale.x + value: 3.07 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalScale.y + value: 3.07 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalScale.z + value: 3.07 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.20554255 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.5172484 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.004127526 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + propertyPath: m_Name + value: BB_SpotMini-House_2023-coatrack + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a14a5cb2aebdc654aaef0e8dd225fb35, type: 3} +--- !u!4 &9166527864064062079 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a14a5cb2aebdc654aaef0e8dd225fb35, + type: 3} + m_PrefabInstance: {fileID: 8700028673438209428} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8944816839135557851 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/1_House/BB_SpotMini-House_2023-coatrack.fbx b/Assets/1_House/BB_SpotMini-House_2023-coatrack.fbx new file mode 100644 index 0000000..98e32ec --- /dev/null +++ b/Assets/1_House/BB_SpotMini-House_2023-coatrack.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8813d9a0ae882ffa67d42bb555718d2e622e9489b1341fe915061f9cc1c09aed +size 113740 diff --git a/Assets/1_House/BB_SpotMini-House_2023-coatrack.fbx.meta b/Assets/1_House/BB_SpotMini-House_2023-coatrack.fbx.meta new file mode 100644 index 0000000..dc80845 --- /dev/null +++ b/Assets/1_House/BB_SpotMini-House_2023-coatrack.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: a14a5cb2aebdc654aaef0e8dd225fb35 +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 + 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: 1 + 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/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 3939094..6e3d641 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -129,7 +129,6 @@ GameObject: m_Component: - component: {fileID: 19056825} - component: {fileID: 19056828} - - component: {fileID: 19056827} - component: {fileID: 19056829} m_Layer: 9 m_Name: cm @@ -153,33 +152,6 @@ Transform: m_Children: [] m_Father: {fileID: 377437130} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &19056827 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 19056824} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0.5 - m_VerticalDamping: 0.5 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!114 &19056828 MonoBehaviour: m_ObjectHideFlags: 3 @@ -281,6 +253,78 @@ MonoBehaviour: m_ModelName: Walker m_Index: 7 m_Touched: 0 +--- !u!1 &66452993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 66452994} + - component: {fileID: 66452996} + - component: {fileID: 66452995} + m_Layer: 0 + m_Name: Waypoint (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &66452994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66452993} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.45, y: -32, z: 100.35} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &66452995 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66452993} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &66452996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66452993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 66452994} + m_WaitTime: 0 + m_ModelName: Stairs + m_Index: 5 + m_Touched: 0 --- !u!1 &83569712 GameObject: m_ObjectHideFlags: 3 @@ -306,7 +350,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83569712} serializedVersion: 2 - m_LocalRotation: {x: -0.092859425, y: 0.45725533, z: -0.048077524, w: -0.8831667} + m_LocalRotation: {x: -0.092859626, y: 0.45725456, z: -0.04807753, w: -0.883167} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -703,7 +747,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: -0.15844756, y: 0.45239812, z: -0.08203547, w: -0.8737852} + m_LocalRotation: {x: -0.15844774, y: 0.45239735, z: -0.082035385, w: -0.87378556} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -801,6 +845,78 @@ Transform: - {fileID: 139104059} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &169185837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 169185838} + - component: {fileID: 169185840} + - component: {fileID: 169185839} + m_Layer: 0 + m_Name: Waypoint (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &169185838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169185837} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.45, y: -32, z: 95.79} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &169185839 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169185837} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &169185840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169185837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 169185838} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 4 + m_Touched: 0 --- !u!1 &193486228 GameObject: m_ObjectHideFlags: 3 @@ -1695,7 +1811,6 @@ GameObject: m_Component: - component: {fileID: 377437130} - component: {fileID: 377437131} - - component: {fileID: 377437132} - component: {fileID: 377437133} m_Layer: 9 m_Name: Camera Street Sign @@ -1712,14 +1827,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377437129} serializedVersion: 2 - m_LocalRotation: {x: -0.037838772, y: 0.8817097, z: -0.071784794, w: -0.46476156} - m_LocalPosition: {x: -128.4, y: 13, z: -248.6} + m_LocalRotation: {x: -0.02815998, y: 0.8577978, z: -0.06055394, w: -0.5096305} + m_LocalPosition: {x: -138.3, y: 11.9, z: -256.8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 19056825} m_Father: {fileID: 953333220} - m_LocalEulerAnglesHint: {x: 6.664, y: -113.018, z: 2.402} + m_LocalEulerAnglesHint: {x: 7.619, y: -118.518, z: 0.775} --- !u!114 &377437131 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1736,12 +1851,12 @@ MonoBehaviour: - m_Script m_LockStageInInspector: m_StreamingVersion: 20170927 - m_Priority: 10 + m_Priority: 2 m_StandbyUpdate: 2 m_LookAt: {fileID: 1574719136} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 47.36291 + FieldOfView: 50.228626 OrthographicSize: 10 NearClipPlane: 0.01 FarClipPlane: 5000 @@ -1766,36 +1881,6 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 19056825} ---- !u!114 &377437132 -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: e501d18bb52cf8c40b1853ca4904654f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_CollideAgainst: - serializedVersion: 2 - m_Bits: 4294967295 - m_IgnoreTag: Untagged - m_TransparentLayers: - serializedVersion: 2 - m_Bits: 0 - m_MinimumDistanceFromTarget: 0.1 - m_AvoidObstacles: 1 - m_DistanceLimit: 2.7 - m_MinimumOcclusionTime: 0 - m_CameraRadius: 0.1 - m_Strategy: 1 - m_MaximumEffort: 4 - m_SmoothingTime: 0 - m_Damping: 2 - m_DampingWhenOccluded: 2 - m_OptimalTargetDistance: 0 --- !u!114 &377437133 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1809,9 +1894,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FocusTracksTarget: 0 - m_FocusTracking: 0 - m_FocusTarget: {fileID: 0} - m_FocusOffset: 384.2 + m_FocusTracking: 3 + m_FocusTarget: {fileID: 733355931} + m_FocusOffset: -7.9 m_Profile: {fileID: 11400000, guid: 49f53dca955104346b9d7134815189b4, type: 2} --- !u!1 &381261432 GameObject: @@ -1840,7 +1925,7 @@ Transform: m_GameObject: {fileID: 381261432} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -19.19, y: -32, z: 95.79} + m_LocalPosition: {x: -19.19, y: -31.49, z: 95.79} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1973,7 +2058,7 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -244.09 + value: -246 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -2096,7 +2181,7 @@ Transform: m_GameObject: {fileID: 450192916} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -19.7, y: -18, z: 122.965} + m_LocalPosition: {x: -19.7, y: -18, z: 124.84} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2188,7 +2273,7 @@ MonoBehaviour: TAAQuality: 2 taaSharpenMode: 1 taaRingingReduction: 0 - taaHistorySharpening: 0.35 + taaHistorySharpening: 0.029 taaAntiFlicker: 0.759 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 @@ -2243,7 +2328,7 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 1041 + data1: 17585669137 data2: 671088640 defaultFrameSettings: 0 m_Version: 9 @@ -2316,13 +2401,13 @@ Camera: m_GateFitMode: 1 m_FOVAxisMode: 0 m_Iso: 50 - m_ShutterSpeed: 0.0014597453 - m_Aperture: 2.9877112 - m_FocusDistance: 5.4703116 - m_FocalLength: 30.952475 - m_BladeCount: 7 - m_Curvature: {x: 17.835052, y: 24.436434} - m_BarrelClipping: 0.5270465 + m_ShutterSpeed: 0.002 + m_Aperture: 3.6 + m_FocusDistance: 8.543994 + m_FocalLength: 35.000004 + m_BladeCount: 5 + m_Curvature: {x: 26.748837, y: 32} + m_BarrelClipping: 0.683 m_Anamorphism: 0 m_SensorSize: {x: 70.41, y: 52.63} m_LensShift: {x: 0, y: 0} @@ -2360,8 +2445,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.04618719, y: 0.9504152, z: -0.17234325, w: 0.2547069} - m_LocalPosition: {x: 5.628647, y: -3.307354, z: 10.080261} + m_LocalRotation: {x: 0.04618708, y: 0.9504154, z: -0.17234343, w: 0.25470608} + m_LocalPosition: {x: 5.628662, y: -3.307354, z: 10.080261} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2675,7 +2760,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513050371} serializedVersion: 2 - m_LocalRotation: {x: 0.110700816, y: 0.88874876, z: -0.29751557, w: 0.3306893} + m_LocalRotation: {x: 0.11070082, y: 0.8887488, z: -0.29751557, w: 0.3306893} m_LocalPosition: {x: 5.3480835, y: -3.2973547, z: 10.518677} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3364,14 +3449,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672497991} serializedVersion: 2 - m_LocalRotation: {x: 0.23587899, y: 0.2414631, z: -0.05066075, w: 0.93994164} - m_LocalPosition: {x: -24.299988, y: 26.1, z: -95.70001} + m_LocalRotation: {x: 0.30837563, y: 0.24856578, z: -0.1083548, w: 0.9117997} + m_LocalPosition: {x: -34.27179, y: 43.80899, z: -77.00635} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 292591928} m_Father: {fileID: 953333220} - m_LocalEulerAnglesHint: {x: 27.897, y: 29.115, z: 1.211} + m_LocalEulerAnglesHint: {x: 38.041, y: 29.386, z: -3.224} --- !u!114 &672497993 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3385,7 +3470,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FocusTracksTarget: 0 - m_FocusTracking: 0 + m_FocusTracking: 1 m_FocusTarget: {fileID: 0} m_FocusOffset: 0 m_Profile: {fileID: 11400000, guid: 2e11975fdea60f6468a538186460a777, type: 2} @@ -3412,8 +3497,8 @@ MonoBehaviour: m_Lens: FieldOfView: 82.51232 OrthographicSize: 10 - NearClipPlane: 0.01 - FarClipPlane: 6707 + NearClipPlane: 4 + FarClipPlane: 3569.5 Dutch: 0 ModeOverride: 0 LensShift: {x: 0, y: 0} @@ -4082,6 +4167,12 @@ Transform: m_Children: [] m_Father: {fileID: 307298035} m_LocalEulerAnglesHint: {x: -1.081, y: -131.736, z: 11.131} +--- !u!4 &733355931 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6550294550714858454, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} --- !u!1 &735591288 GameObject: m_ObjectHideFlags: 0 @@ -4527,7 +4618,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!320 &799276789 PlayableDirector: m_ObjectHideFlags: 0 @@ -4970,7 +5061,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &999681661 Transform: m_ObjectHideFlags: 0 @@ -5007,6 +5098,78 @@ Transform: - {fileID: 366084618} m_Father: {fileID: 1261856864} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1023568901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1023568902} + - component: {fileID: 1023568904} + - component: {fileID: 1023568903} + m_Layer: 0 + m_Name: Waypoint (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1023568902 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023568901} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.190001, y: -32, z: 95.79} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1023568903 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023568901} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1023568904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023568901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 1023568902} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 3 + m_Touched: 0 --- !u!1 &1071041248 GameObject: m_ObjectHideFlags: 0 @@ -5185,7 +5348,7 @@ Transform: m_GameObject: {fileID: 1124157896} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} - m_LocalPosition: {x: 5.628647, y: -3.307354, z: 10.080261} + m_LocalPosition: {x: 5.628662, y: -3.307354, z: 10.080261} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5380,7 +5543,7 @@ Transform: m_GameObject: {fileID: 1128635107} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -12.190001, y: -32.36, z: 72.25} + m_LocalPosition: {x: -12.190001, y: -32.36, z: 74.49} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5530,7 +5693,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178814724} serializedVersion: 2 - m_LocalRotation: {x: -0.15844756, y: 0.45239812, z: -0.08203547, w: -0.8737852} + m_LocalRotation: {x: -0.15844774, y: 0.45239738, z: -0.08203539, w: -0.87378556} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6029,7 +6192,7 @@ Transform: - {fileID: 2110284874} m_Father: {fileID: 160784038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1385701109 +--- !u!1 &1357627195 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6037,26 +6200,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1385701110} - - component: {fileID: 1385701112} - - component: {fileID: 1385701111} + - component: {fileID: 1357627196} m_Layer: 0 - m_Name: Waypoint (14) + m_Name: Path Stairs m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1385701110 +--- !u!4 &1357627196 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1385701109} + m_GameObject: {fileID: 1357627195} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -19.7, y: -32, z: 99.79} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2116519615} + - {fileID: 1485169530} + - {fileID: 1949048332} + - {fileID: 1023568902} + - {fileID: 169185838} + - {fileID: 66452994} + - {fileID: 2130108973} + - {fileID: 1478354854} + m_Father: {fileID: 1261856864} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1385701109 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1385701110} + - component: {fileID: 1385701112} + - component: {fileID: 1385701111} + m_Layer: 0 + m_Name: Waypoint (14) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1385701110 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1385701109} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.7, y: -31.66, z: 99.79} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6651,12 +6853,156 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1478354853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1478354854} + - component: {fileID: 1478354856} + - component: {fileID: 1478354855} + m_Layer: 0 + m_Name: Waypoint (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1478354854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478354853} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -17.86, y: -18.3, z: 137.03} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1478354855 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478354853} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1478354856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478354853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 1478354854} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 7 + m_Touched: 0 --- !u!4 &1484385545 stripped Transform: m_CorrespondingSourceObject: {fileID: 6618138482202815428, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} m_PrefabInstance: {fileID: 1412792145} m_PrefabAsset: {fileID: 0} +--- !u!1 &1485169529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1485169530} + - component: {fileID: 1485169532} + - component: {fileID: 1485169531} + m_Layer: 0 + m_Name: Waypoint (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1485169530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485169529} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.190001, y: -34.98, z: 64.64} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1485169531 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485169529} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1485169532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485169529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 1485169530} + m_WaitTime: 0 + m_ModelName: Stairs + m_Index: 1 + m_Touched: 0 --- !u!1001 &1503240170 PrefabInstance: m_ObjectHideFlags: 0 @@ -7489,7 +7835,7 @@ Transform: m_GameObject: {fileID: 1803922973} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -12.190001, y: -32, z: 96.79} + m_LocalPosition: {x: -12.190001, y: -31.56, z: 96.79} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7881,7 +8227,7 @@ MonoBehaviour: - {fileID: 982989168} - {fileID: 707081198} - {fileID: 707081198} - - {fileID: 982989168} + - {fileID: 707081198} --- !u!4 &1916559815 Transform: m_ObjectHideFlags: 1 @@ -8109,6 +8455,78 @@ MonoBehaviour: m_ModelName: Walker m_Index: 4 m_Touched: 0 +--- !u!1 &1949048331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1949048332} + - component: {fileID: 1949048334} + - component: {fileID: 1949048333} + m_Layer: 0 + m_Name: Waypoint (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1949048332 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949048331} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.190001, y: -32.36, z: 74.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1949048333 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949048331} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1949048334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949048331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 1949048332} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 2 + m_Touched: 0 --- !u!1 &1956142036 GameObject: m_ObjectHideFlags: 0 @@ -8237,6 +8655,34 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 753465609} +--- !u!1 &1997253123 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8394107354306734277, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1997253127 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997253123} + 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: -712071879011977679, guid: a14a5cb2aebdc654aaef0e8dd225fb35, type: 3} --- !u!1 &2048760401 GameObject: m_ObjectHideFlags: 0 @@ -8474,6 +8920,78 @@ Transform: - {fileID: 953333220} m_Father: {fileID: 1337085231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2116519614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2116519615} + - component: {fileID: 2116519617} + - component: {fileID: 2116519616} + m_Layer: 0 + m_Name: Waypoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2116519615 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116519614} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.1, y: -35.01, z: 58.79} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2116519616 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116519614} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2116519617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116519614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 1 + m_WaypointPosition: {fileID: 2116519615} + m_WaitTime: 5 + m_ModelName: Walker + m_Index: 0 + m_Touched: 0 --- !u!1 &2119379804 GameObject: m_ObjectHideFlags: 3 @@ -8545,7 +9063,7 @@ Transform: m_GameObject: {fileID: 2128339116} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -11.190001, y: -35.01, z: 58.79} + m_LocalPosition: {x: -13.1, y: -35.01, z: 58.79} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8586,10 +9104,82 @@ MonoBehaviour: m_EditorClassIdentifier: m_StartingPosition: 1 m_WaypointPosition: {fileID: 2128339117} - m_WaitTime: 70 + m_WaitTime: 5 m_ModelName: Walker m_Index: 0 m_Touched: 0 +--- !u!1 &2130108972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2130108973} + - component: {fileID: 2130108975} + - component: {fileID: 2130108974} + m_Layer: 0 + m_Name: Waypoint (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2130108973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2130108972} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.45, y: -18.3, z: 124.76} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1357627196} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2130108974 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2130108972} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2130108975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2130108972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingPosition: 0 + m_WaypointPosition: {fileID: 2130108973} + m_WaitTime: 0 + m_ModelName: Walker + m_Index: 6 + m_Touched: 0 --- !u!1001 &2794896440572570268 PrefabInstance: m_ObjectHideFlags: 0 @@ -8735,6 +9325,10 @@ PrefabInstance: type: 3} insertIndex: 2 addedObject: {fileID: 999681661} + - targetCorrespondingSourceObject: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386, + type: 3} + insertIndex: 3 + addedObject: {fileID: 1357627196} - targetCorrespondingSourceObject: {fileID: 3323686536704768863, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} insertIndex: -1 @@ -8847,7 +9441,12 @@ PrefabInstance: - target: {fileID: 421108404665181308, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_ShadowAngle - value: 0.79 + value: 5.63 + objectReference: {fileID: 0} + - target: {fileID: 421108404665181308, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Shadows.m_Type + value: 1 objectReference: {fileID: 0} - target: {fileID: 421108404665181308, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -8993,6 +9592,11 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: d96a42ec539df4c079bb7c84fe1e4eea, type: 2} + - target: {fileID: 4051651558617938473, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4648500137498506069, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Material @@ -9077,12 +9681,12 @@ PrefabInstance: - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_PenumbraTint - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_ShadowDimmer - value: 0.893 + value: 0.837 objectReference: {fileID: 0} - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -9092,7 +9696,17 @@ PrefabInstance: - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_AngularDiameter - value: 0.79 + value: 5.63 + objectReference: {fileID: 0} + - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_FilterSizeTraced + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_InteractsWithSky + value: 1 objectReference: {fileID: 0} - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -9101,9 +9715,29 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} - propertyPath: m_UseContactShadow.m_Level + propertyPath: m_ShadowUpdateMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_UseRayTracedShadows + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_NumRayTracingSamples + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_UseScreenSpaceShadows value: 1 objectReference: {fileID: 0} + - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_UseContactShadow.m_Level + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6776963497370390179, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_DirLightPCSSMaxPenumbraSize @@ -9178,6 +9812,11 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2} + - target: {fileID: 8033612881308010768, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: ce1db622676aba44d9f59002104bdcd7, type: 2} - target: {fileID: 8246992606812663403, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Material @@ -9266,6 +9905,10 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1185551446} m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8394107354306734277, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1997253127} - targetCorrespondingSourceObject: {fileID: 9038900611742963550, 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 f337e47..ca63140 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":54.7840256,"total":55.3427303,"children":{"InitializeActuators":{"count":1,"self":0,"total":0,"children":null},"InitializeSensors":{"count":1,"self":0.0020147,"total":0.0020147,"children":null},"AgentSendState":{"count":2477,"self":0.0155464,"total":0.0205599,"children":{"CollectObservations":{"count":496,"self":0.0035018999999999996,"total":0.0035018999999999996,"children":null},"WriteActionMask":{"count":496,"self":0.0015115999999999999,"total":0.0015115999999999999,"children":null},"RequestDecision":{"count":496,"self":0,"total":0,"children":null}}},"DecideAction":{"count":2477,"self":0.51278079999999993,"total":0.5142831,"children":{"RayPerceptionSensor.Perceive":{"count":496,"self":0.0015023,"total":0.0015023,"children":null}}},"AgentAct":{"count":2477,"self":0.0218467,"total":0.0218467,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711572839","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":"1711572894"}} \ No newline at end of file +{"count":1,"self":5.697208,"total":5.7350933,"children":{"InitializeActuators":{"count":1,"self":0.000503,"total":0.000503,"children":null},"InitializeSensors":{"count":1,"self":0.001035,"total":0.001035,"children":null},"AgentSendState":{"count":2,"self":0.0005335,"total":0.0005335,"children":{"CollectObservations":{"count":1,"self":0,"total":0,"children":null},"WriteActionMask":{"count":1,"self":0,"total":0,"children":null},"RequestDecision":{"count":1,"self":0,"total":0,"children":null}}},"DecideAction":{"count":2,"self":0.034797499999999995,"total":0.034797499999999995,"children":{"RayPerceptionSensor.Perceive":{"count":1,"self":0,"total":0,"children":null}}},"AgentAct":{"count":2,"self":0.0010161,"total":0.0010161,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711627013","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":"1711627019"}} \ No newline at end of file diff --git a/Assets/Settings/HDRPDefaultResources/C Default.asset b/Assets/Settings/HDRPDefaultResources/C Default.asset index 0f2d853..df12377 100644 --- a/Assets/Settings/HDRPDefaultResources/C Default.asset +++ b/Assets/Settings/HDRPDefaultResources/C Default.asset @@ -128,7 +128,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 56b145d2b9ee1ac4f846968484e7485a, type: 3} m_Name: ContactShadows m_EditorClassIdentifier: - active: 1 + active: 0 quality: m_OverrideState: 1 m_Value: 3 diff --git a/Assets/Settings/HDRPDefaultResources/C House.asset b/Assets/Settings/HDRPDefaultResources/C House.asset index 351bc29..0549647 100644 --- a/Assets/Settings/HDRPDefaultResources/C House.asset +++ b/Assets/Settings/HDRPDefaultResources/C House.asset @@ -407,7 +407,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 953beb541740ddc499d005ee80c9ff29, type: 3} m_Name: Fog m_EditorClassIdentifier: - active: 1 + active: 0 quality: m_OverrideState: 1 m_Value: 1 @@ -1027,7 +1027,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 56b145d2b9ee1ac4f846968484e7485a, type: 3} m_Name: ContactShadows m_EditorClassIdentifier: - active: 1 + active: 0 quality: m_OverrideState: 1 m_Value: 3 @@ -1148,7 +1148,7 @@ MonoBehaviour: interCascadeBorders: 1 maxShadowDistance: m_OverrideState: 1 - m_Value: 1481.2 + m_Value: 150 directionalTransmissionMultiplier: m_OverrideState: 1 m_Value: 1 diff --git a/Assets/Settings/HDRPDefaultResources/C Street.asset b/Assets/Settings/HDRPDefaultResources/C Street.asset index 6817b50..431d265 100644 --- a/Assets/Settings/HDRPDefaultResources/C Street.asset +++ b/Assets/Settings/HDRPDefaultResources/C Street.asset @@ -374,19 +374,19 @@ MonoBehaviour: active: 0 quality: m_OverrideState: 1 - m_Value: 1 + m_Value: 3 enable: m_OverrideState: 1 m_Value: 1 length: m_OverrideState: 1 - m_Value: 0.15 + m_Value: 0.116 opacity: m_OverrideState: 1 m_Value: 1 distanceScaleFactor: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 0.35 maxDistance: m_OverrideState: 1 m_Value: 50 @@ -401,13 +401,13 @@ MonoBehaviour: m_Value: 0 rayBias: m_OverrideState: 1 - m_Value: 0.2 + m_Value: 0.277 thicknessScale: m_OverrideState: 1 - m_Value: 0.15 + m_Value: 0.02 m_SampleCount: m_OverrideState: 1 - m_Value: 10 + m_Value: 41 --- !u!114 &1073523410240040159 MonoBehaviour: m_ObjectHideFlags: 3 @@ -469,7 +469,7 @@ MonoBehaviour: m_Value: 1 focusDistance: m_OverrideState: 1 - m_Value: 57 + m_Value: 0.1 focusDistanceMode: m_OverrideState: 1 m_Value: 0 @@ -496,7 +496,7 @@ MonoBehaviour: m_Value: 7 m_FarMaxBlur: m_OverrideState: 1 - m_Value: 8 + m_Value: 1.58 m_Resolution: m_OverrideState: 1 m_Value: 2