diff --git a/Assets/Prefabs/chandelier.prefab b/Assets/Prefabs/chandelier.prefab index bc76cb1..f8cb575 100644 --- a/Assets/Prefabs/chandelier.prefab +++ b/Assets/Prefabs/chandelier.prefab @@ -972,99 +972,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &3818526129970948622 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3818526129970948620} - - component: {fileID: 3818526129970948621} - m_Layer: 0 - m_Name: Point Light (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3818526129970948620 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3818526129970948622} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.00999999, y: 0.26199996, z: -0.01099968} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3707755749088051062} - m_RootOrder: 28 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &3818526129970948621 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3818526129970948622} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 2 - m_Shape: 0 - m_Color: {r: 0.8018868, g: 0.4741959, b: 0.14751692, a: 1} - m_Intensity: 7 - m_Range: 5 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 0.381 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 --- !u!1 &4053038011774821836 GameObject: m_ObjectHideFlags: 0 @@ -1120,7 +1027,6 @@ Transform: - {fileID: 7241724558237135371} - {fileID: 411983010573495523} - {fileID: 4143189979052050204} - - {fileID: 3818526129970948620} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/torch.prefab b/Assets/Prefabs/torch.prefab index df7bbb4..cf0bed4 100644 --- a/Assets/Prefabs/torch.prefab +++ b/Assets/Prefabs/torch.prefab @@ -81,99 +81,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &3237020045313182412 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4063973187316772697} - - component: {fileID: 3728888745194434655} - m_Layer: 0 - m_Name: Point Light (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4063973187316772697 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3237020045313182412} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.193, y: 0.465, z: -0.432} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5617436693956522523} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &3728888745194434655 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3237020045313182412} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 2 - m_Shape: 0 - m_Color: {r: 0.7176471, g: 0.39133137, b: 0.19215687, a: 1} - m_Intensity: 4 - m_Range: 5 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 0.365 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 --- !u!1 &5097780408527202465 GameObject: m_ObjectHideFlags: 0 @@ -203,7 +110,6 @@ Transform: m_Children: - {fileID: 8195382234559625345} - {fileID: 1604732952988585921} - - {fileID: 4063973187316772697} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Room Noah.unity b/Assets/Scenes/Room Noah.unity index 9c2d7c4..7c5da8e 100644 --- a/Assets/Scenes/Room Noah.unity +++ b/Assets/Scenes/Room Noah.unity @@ -317,7 +317,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8241653567469244187, guid: a0bb8b1d8df1141d68ec9f14b413e9ac, type: 3} propertyPath: m_RootOrder - value: 1 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8241653567469244187, guid: a0bb8b1d8df1141d68ec9f14b413e9ac, type: 3} propertyPath: m_LocalPosition.x @@ -374,7 +374,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_LocalPosition.x @@ -493,7 +493,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_RootOrder - value: 1 + value: 8 objectReference: {fileID: 0} - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_LocalPosition.x @@ -1535,7 +1535,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_RootOrder - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_LocalPosition.x @@ -1728,7 +1728,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3707755749088051062, guid: 2821b3377980d44cea265fc32432cd53, type: 3} propertyPath: m_LocalPosition.z - value: 2.19 + value: 2.183 objectReference: {fileID: 0} - target: {fileID: 3707755749088051062, guid: 2821b3377980d44cea265fc32432cd53, type: 3} propertyPath: m_LocalRotation.w @@ -1758,10 +1758,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3818526129970948621, guid: 2821b3377980d44cea265fc32432cd53, type: 3} - propertyPath: m_Shadows.m_Type - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4053038011774821836, guid: 2821b3377980d44cea265fc32432cd53, type: 3} propertyPath: m_Name value: chandelier (2) @@ -2000,10 +1996,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1706901751} m_Modifications: - - target: {fileID: 3728888745194434655, guid: 5bbc03c254995402fb7233f6a54607d8, type: 3} - propertyPath: m_Shadows.m_Type - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5097780408527202465, guid: 5bbc03c254995402fb7233f6a54607d8, type: 3} propertyPath: m_Name value: torch (1) @@ -2254,7 +2246,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_LocalPosition.x @@ -2749,7 +2741,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490613629109168776, guid: 3f06072c6fbc34764a5a3635d5cc82cc, type: 3} propertyPath: m_RootOrder - value: 1 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490613629109168776, guid: 3f06072c6fbc34764a5a3635d5cc82cc, type: 3} propertyPath: m_LocalPosition.x @@ -3040,7 +3032,7 @@ Camera: m_GameObject: {fileID: 1541137046} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 2 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -3896,7 +3888,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490613629109168776, guid: 3f06072c6fbc34764a5a3635d5cc82cc, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4490613629109168776, guid: 3f06072c6fbc34764a5a3635d5cc82cc, type: 3} propertyPath: m_LocalPosition.x @@ -4257,6 +4249,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1706901751} m_Modifications: + - target: {fileID: 3728888745194434655, guid: 5bbc03c254995402fb7233f6a54607d8, type: 3} + propertyPath: m_Lightmapping + value: 4 + objectReference: {fileID: 0} - target: {fileID: 3728888745194434655, guid: 5bbc03c254995402fb7233f6a54607d8, type: 3} propertyPath: m_Shadows.m_Type value: 2 @@ -4511,7 +4507,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_RootOrder - value: 4 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5969184322309325230, guid: 3d1d4886883924444a311220792ec335, type: 3} propertyPath: m_LocalPosition.x @@ -4559,6 +4555,99 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d1d4886883924444a311220792ec335, type: 3} +--- !u!1 &2140911778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2140911780} + - component: {fileID: 2140911779} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &2140911779 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140911778} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 8 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &2140911780 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140911778} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.546, y: 1.904, z: 2.951} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &303449257362815456 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8790481540709566688, guid: b0b545b84e0d1474ca4299b87203bcb5, type: 3} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 690f820..2b29167 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -177,6 +177,10 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1