diff --git a/Assets/Scenes/The Room.unity b/Assets/Scenes/The Room.unity index 6e8950f..38f1fd2 100644 --- a/Assets/Scenes/The Room.unity +++ b/Assets/Scenes/The Room.unity @@ -36,7 +36,7 @@ RenderSettings: m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 m_ReflectionIntensity: 0.75 - m_CustomReflection: {fileID: 155013945} + m_CustomReflection: {fileID: 158193549} m_Sun: {fileID: 0} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 @@ -6333,7 +6333,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aedfc62aaa42cdd4486201736cd94a4f, type: 3} ---- !u!89 &155013945 +--- !u!89 &158193549 Cubemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7006,6 +7006,17 @@ GameObject: - component: {fileID: 514106905} - component: {fileID: 514106904} - component: {fileID: 514106903} + - component: {fileID: 514106913} + - component: {fileID: 514106912} + - component: {fileID: 514106911} + - component: {fileID: 514106910} + - component: {fileID: 514106909} + - component: {fileID: 514106918} + - component: {fileID: 514106917} + - component: {fileID: 514106916} + - component: {fileID: 514106915} + - component: {fileID: 514106914} + - component: {fileID: 514106919} m_Layer: 0 m_Name: Test m_TagString: Untagged @@ -7022,7 +7033,7 @@ Transform: m_GameObject: {fileID: 514106898} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.015, y: 2.47, z: 59.621} + m_LocalPosition: {x: -0.015, y: 2.47, z: 62.23} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -7040,27 +7051,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86a75d0253697424fb4b506c394f13bc, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Chameleon.Components.PictureFrameBuilder - _width: 2 - _height: 2 - _frameThickness: 0.075 - _frameDepth: 0.3 - _cornerRadius: 0.02 - _bevelSegments: 2 - _frameInnerDepth: 0.1 - _padding: 0.05 - _pictureDepth: -0.05 - _pictureMaterial: {fileID: 2100000, guid: 879c2b231ff45a547a8bc5e4aa92a1db, type: 2} - _innerMaterial: {fileID: 2100000, guid: 1a69dbe623b694948b1033886c8520e9, type: 2} - _frameMaterial: {fileID: 2100000, guid: c017d286f7d324b8f83796be458d4bce, type: 2} - _backMaterial: {fileID: 2100000, guid: c017d286f7d324b8f83796be458d4bce, type: 2} + _size: 1 + _aspect: {x: 0.6603142, y: 1} + _frameThickness: 0.028 + _frameDepth: 0.113 + _cornerRadius: 0 + _bevelSegments: 4 + _frameInnerDepth: 0.078 + _padding: 0.013 + _pictureDepth: -0.002 + _pictureMaterial: {fileID: 2100000, guid: 982cb05868545c047b146ec56a2644fe, type: 2} + _innerMaterial: {fileID: 2100000, guid: a7794896ef878a64399cca929db5c43c, type: 2} + _frameMaterial: {fileID: 2100000, guid: a7794896ef878a64399cca929db5c43c, type: 2} + _backMaterial: {fileID: 2100000, guid: a7794896ef878a64399cca929db5c43c, type: 2} _generateColliders: 1 _colliders: - - {fileID: 514106908} - - {fileID: 514106907} - - {fileID: 514106906} - - {fileID: 514106905} - - {fileID: 514106904} - - {fileID: 514106903} + - {fileID: 514106918} + - {fileID: 514106917} + - {fileID: 514106916} + - {fileID: 514106915} + - {fileID: 514106914} + - {fileID: 514106919} --- !u!23 &514106901 MeshRenderer: m_ObjectHideFlags: 0 @@ -7086,10 +7097,10 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 879c2b231ff45a547a8bc5e4aa92a1db, type: 2} - - {fileID: 2100000, guid: 1a69dbe623b694948b1033886c8520e9, type: 2} - - {fileID: 2100000, guid: c017d286f7d324b8f83796be458d4bce, type: 2} - - {fileID: 2100000, guid: c017d286f7d324b8f83796be458d4bce, type: 2} + - {fileID: 2100000, guid: 982cb05868545c047b146ec56a2644fe, type: 2} + - {fileID: 2100000, guid: a7794896ef878a64399cca929db5c43c, type: 2} + - {fileID: 2100000, guid: a7794896ef878a64399cca929db5c43c, type: 2} + - {fileID: 2100000, guid: a7794896ef878a64399cca929db5c43c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7140,7 +7151,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.75, y: 1.75, z: 0.05} + m_Size: {x: 1.1844697, y: 1.65, z: 0.05} m_Center: {x: 0, y: 0, z: 0.075} --- !u!65 &514106904 BoxCollider: @@ -7161,7 +7172,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.85, y: 1.85, z: 0.20000002} + m_Size: {x: 1.2844697, y: 1.75, z: 0.20000002} m_Center: {x: 0, y: 0, z: 0.2} --- !u!65 &514106905 BoxCollider: @@ -7182,8 +7193,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.075, y: 1.85, z: 0.3} - m_Center: {x: -0.9625, y: 0, z: 0.15} + m_Size: {x: 0.075, y: 1.75, z: 0.3} + m_Center: {x: -0.6797348, y: 0, z: 0.15} --- !u!65 &514106906 BoxCollider: m_ObjectHideFlags: 0 @@ -7203,8 +7214,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.075, y: 1.85, z: 0.3} - m_Center: {x: 0.9625, y: 0, z: 0.15} + m_Size: {x: 0.075, y: 1.75, z: 0.3} + m_Center: {x: 0.6797348, y: 0, z: 0.15} --- !u!65 &514106907 BoxCollider: m_ObjectHideFlags: 0 @@ -7224,8 +7235,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2, y: 0.075, z: 0.3} - m_Center: {x: 0, y: -0.9625, z: 0.15} + m_Size: {x: 1.4344697, y: 0.075, z: 0.3} + m_Center: {x: 0, y: -0.91249996, z: 0.15} --- !u!65 &514106908 BoxCollider: m_ObjectHideFlags: 0 @@ -7245,8 +7256,239 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2, y: 0.075, z: 0.3} - m_Center: {x: 0, y: 0.9625, z: 0.15} + m_Size: {x: 1.4344697, y: 0.075, z: 0.3} + m_Center: {x: 0, y: 0.91249996, z: 0.15} +--- !u!65 &514106909 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.50031424, y: 0.84000003, z: 0.06} + m_Center: {x: 0, y: 0, z: 0.089999996} +--- !u!65 &514106910 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.08, y: 0.84000003, z: 0.12} + m_Center: {x: -0.2901571, y: 0, z: 0.06} +--- !u!65 &514106911 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.08, y: 0.84000003, z: 0.12} + m_Center: {x: 0.2901571, y: 0, z: 0.06} +--- !u!65 &514106912 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.6603142, y: 0.08, z: 0.12} + m_Center: {x: 0, y: -0.46, z: 0.06} +--- !u!65 &514106913 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.6603142, y: 0.08, z: 0.12} + m_Center: {x: 0, y: 0.46, z: 0.06} +--- !u!65 &514106914 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.6043142, y: 0.944, z: 0.034999996} + m_Center: {x: 0, y: 0, z: 0.0955} +--- !u!65 &514106915 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.028, y: 0.944, z: 0.113} + m_Center: {x: -0.3161571, y: 0, z: 0.0565} +--- !u!65 &514106916 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.028, y: 0.944, z: 0.113} + m_Center: {x: 0.3161571, y: 0, z: 0.0565} +--- !u!65 &514106917 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.6603142, y: 0.028, z: 0.113} + m_Center: {x: 0, y: -0.486, z: 0.0565} +--- !u!65 &514106918 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.6603142, y: 0.028, z: 0.113} + m_Center: {x: 0, y: 0.486, z: 0.0565} +--- !u!65 &514106919 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514106898} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.5783142, y: 0.918, z: 0.0019999966} + m_Center: {x: 0, y: 0, z: 0.07700001} --- !u!4 &533835922 stripped Transform: m_CorrespondingSourceObject: {fileID: 3735698105527916168, guid: b613810bdd529fa4fb86f1a44754c2bc, type: 3}