From f831e34bdde38daab3b3d4368bc7b6e866f804ea Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 11:10:44 +0100 Subject: [PATCH 1/9] fix glass --- Assets/Materials/Glass.mat | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/Materials/Glass.mat b/Assets/Materials/Glass.mat index c55d691..1e0c03b 100644 --- a/Assets/Materials/Glass.mat +++ b/Assets/Materials/Glass.mat @@ -10,7 +10,8 @@ Material: m_Name: Glass m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON + - _ALPHABLEND_ON + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -68,12 +69,12 @@ Material: - _Glossiness: 1 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 + - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: From 87df1087a6dbd02732649b38fea05edb2ee095ed Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 15:07:32 +0100 Subject: [PATCH 2/9] Fix static objects in scene for lightingh --- .../Materials/Vol_42_1_Base_Color.mat | 11 ++++++----- Assets/Scenes/FabLab/FabLab.unity | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat b/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat index cef0451..a304c24 100644 --- a/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat +++ b/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat @@ -11,6 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _PARALLAXMAP + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -39,11 +40,11 @@ Material: m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} - m_Scale: {x: 2000, y: 2000} + m_Scale: {x: 100, y: 100} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: b900361e13e6eaa44963cb851faf3ed3, type: 3} - m_Scale: {x: 2000, y: 2000} + m_Scale: {x: 100, y: 100} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -63,14 +64,14 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _GlossMapScale: 0 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.08 - - _SmoothnessTextureChannel: 0 + - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 7d7d19e..c47dc10 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2412,9 +2412,9 @@ Transform: - {fileID: 1782748918} - {fileID: 60326086} - {fileID: 670219875} + - {fileID: 336078038} - {fileID: 373875250} - {fileID: 1627809130} - - {fileID: 336078038} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6328,7 +6328,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23784 + m_Name: pb_Mesh32318 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6915,7 +6915,7 @@ Transform: m_Children: - {fileID: 936418819} m_Father: {fileID: 45957245} - m_RootOrder: 22 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &360260901 PrefabInstance: From 13b2a1b391f2fb5b89921afd0c4c73864ab0e1c0 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 15:13:21 +0100 Subject: [PATCH 3/9] add set walls to static for baked lighting --- Assets/Scenes/FabLab/FabLab.unity | 152 +++++++++++------- .../com.unity.probuilder/Settings.json | 12 +- 2 files changed, 101 insertions(+), 63 deletions(-) diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index c47dc10..924a2f0 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2392,14 +2392,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1043384080} - - {fileID: 804182423} - {fileID: 1329833008} - {fileID: 260182308} - {fileID: 765875807} - {fileID: 1290121936} - {fileID: 1527984575637916538} - - {fileID: 1173886246} - {fileID: 1705480523} - {fileID: 808552922} - {fileID: 146814758} @@ -2410,11 +2407,11 @@ Transform: - {fileID: 1821824934} - {fileID: 293073269} - {fileID: 1782748918} + - {fileID: 336078038} - {fileID: 60326086} - {fileID: 670219875} - - {fileID: 336078038} - {fileID: 373875250} - - {fileID: 1627809130} + - {fileID: 1173886246} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2435,7 +2432,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -2584,7 +2581,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &104072647 Transform: @@ -5763,7 +5760,7 @@ Transform: - {fileID: 899232842} - {fileID: 497015422} m_Father: {fileID: 45957245} - m_RootOrder: 10 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &175085081 PrefabInstance: @@ -6264,7 +6261,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 17 + value: 15 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -6328,7 +6325,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32318 + m_Name: pb_Mesh35080 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6915,7 +6912,7 @@ Transform: m_Children: - {fileID: 936418819} m_Father: {fileID: 45957245} - m_RootOrder: 20 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &360260901 PrefabInstance: @@ -7201,7 +7198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -7509,7 +7506,7 @@ Transform: m_Children: - {fileID: 1888977164} m_Father: {fileID: 45957245} - m_RootOrder: 14 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &453609084 PrefabInstance: @@ -11192,7 +11189,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24406 + m_Name: pb_Mesh35706 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11356,7 +11353,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24358 + m_Name: pb_Mesh35658 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11411,9 +11408,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 0 + offset: 48 format: 0 - dimension: 0 + dimension: 2 - stream: 0 offset: 0 format: 0 @@ -11446,8 +11443,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 7968 - _typelessdata: 00000000000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f000000000000803e000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e000000000000803e000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803e00000000000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803e0000003f000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf00000000000000000000003f000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf000000000000803e0000803e000080be0000003facff7fb4c8e170b40000803fc2df7fbfa57800bdcab683b4000080bf0000803e0000803e1500003fea88803c0200003facff7fb4c8e170b40000803fc2df7fbfa57800bdcab683b4000080bf000000000000003f0000803e000000000000003facffffb4000000000000803f4f7f7fbf234880bdfb7effb4000080bf0000803e0000003f0000803e000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000003f00000000000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000003f0000803e0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000403f000000000000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000403f0000803e000000000000003f169288b4169288340000803fc2df7fbfa57800bd4d3884b4000080bf0000803e0000003f1500003fea88803c0200003f169208b5169208350000803f4f7f7fbf234880bdfc7effb4000080bf000000000000003f0000003f0000803e0000003f169288b4169288340000803fc2df7fbfa57800bd4d3884b4000080bf000000000000403f0000003f0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf000000000000403f0000003f0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf000000000000803f0000803e0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803f000000000000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803f000000bf000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000003f000080be000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000003f000080be0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000403f000000bf0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000403f000080be0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803f000000bf0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f000000bf000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f00000000000080be000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f00000000000080be000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803e000000bf000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803e0000003f0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf000000000000003f0000803e0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803e0000003f0000803e0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803e0000003f0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf000000000000803e000000000000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000003f0000003f000000000000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803e000000000000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000003f000000000000803e0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803e000000000000003f0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf00000000000000000000003f0000003f000000bfcbc4ae340000803fcbc4ae3418bd7dbfed0b963454ce073e000080bf000000000000803f0000803e0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803f0000803e0000003f000080becbc4ae340000803fcbc4ae3418bd7dbfed0b963454ce073e000080bf0000803e0000403f1f00003ffcffff3e1341a2becbc42e350000803fcbc42e354d4c77bfd54bf734bc5b843e000080bf000000000000403f000000000000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803f000000000000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000003f0000403f0000803e0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803e0000403f1f00003ffcffff3e1341a2be84ff7f340000803f68f449b418bd7dbfa4428c3454ce073e000080bf000000000000403f0000803e0000003f000080be84ffff340000803f000000004d4c77bfd54bf734bc5b843e000080bf0000803e0000403f0000803e0000003f0000000084ff7f340000803f68f449b418bd7dbfa4428c3454ce073e000080bf0000803e0000003f000080be0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803f000080be0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000403f0000403f000000bf0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803f000000bf0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803f0000403f000000bf0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803f0000003f000080be0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000403f0000003f000080be0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803e000000bf0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803e000000bf0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803f00000000000080be0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000403f000000000000803e0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803e0000000000000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000003f000000000000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803e0000803e00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000003f0000803e0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e00000000000000000000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f000000000000003f0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf00000000000000000000003f0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf000000000000803e0000003f0000803e000000bf0000000000000000000080bfc2df7fbfcf7800bd00000000000080bf000000000000803e0000803e00000000000000bf0000000000000000000080bfc2df7fbfcf7800bd00000000000080bf0000803e0000003fd3ffff3eea88803c000000bf0000000000000000000080bf4f7f7fbf784880bd00000000000080bf000000000000003f0000803e000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000403f00000000000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803f00000000000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000403f0000803e000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803fd3ffff3eea88803c000000bf0000000000000000000080bfc2df7fbfd17800bd00000000000080bf000000000000003f0000803e000080be000000bf0000000000000000000080bfc2df7fbfd17800bd00000000000080bf0000803e0000403f0000803e00000000000000bf0000000000000000000080bf4f7f7fbf7a4880bd00000000000080bf0000803e0000003f0000003f000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf000000000000403f0000003f000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf000000000000803f000080be000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000403f000000bf000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803f000000bf000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000403f000080be000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803f000080be00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000003f000000bf00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000003f000080be0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803e000000bf0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803e000080be0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f00000000000000bf0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f000000000000803e000000bf000080becbc42eb4000080bfcbc42eb418bd7dbfed0b163454ce073e000080bf0000803e0000803e0000003f000000bf000000bfcbc42eb4000080bfcbc42eb418bd7dbfed0b163454ce073e000080bf00000000000000001f00003f010000bf1341a2becbc4aeb4000080bfcbc4aeb44d4c77bfd54b7734bc5b843e000080bf000000000000803e0000803e000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803e000000000000803e000000bf0000000084ffffb3000080bf68f4c93318bd7dbfa4420c3454ce073e000080bf0000803e0000003f1f00003f010000bf1341a2be84ffffb3000080bf68f4c93318bd7dbfa4420c3454ce073e000080bf000000000000803e0000003f000000bf0000000000000000000080bf68f44934000080bf0000000000000000000080bf000000000000003f0000803e000000bf000080be84ff7fb4000080bf000000004d4c77bfd54b7734bc5b843e000080bf0000803e0000803e00000000000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000003f0000003f0000803e000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803e0000803e000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803e0000003f00000000000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803e00000000000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000003f000000000000803e000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000403f0000003f000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf000000000000403f0000803e000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803f0000003f000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f00000000000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803f00000000000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000403f000080be000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000403f000080be000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000403f0000003f000080be000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803f000000bf000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f000000bf000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000403f000000bf000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000003f000080be000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803e000080be000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000403f00000000000000bf000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803e000000bf000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803f00000000000000bf000080be0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000803e000000bf000000bf0000003f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000000000bf000080be0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803e000000bf000000bf0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e00000000000000bf000000000000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000003f000000bf000000000000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000003f000000bf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000003f000000bf000080be00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000803e000000bf000000bf00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f00000000000000bf0000803e0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000403f000000bf0000803e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000403f000000bf0000003f0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000803f000000bf0000003f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f000000bf0000003f00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000803f000000bf0000803e00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000403f000000bf0000803e000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000403f000000bf00000000000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000003f000000bf0000003f000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803f000000bf0000003f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f000000bf0000803e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000403f000000bf00000000000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000003f000000bf000080be000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803e000000bf000000bf000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f00000000000000bf000080be000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803e000000bf000000bf000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000000000003f000000bf000000000000803f00000000c5a4c336c5a4c3b64e7717340000803f000080bf0000003f000000001f00003f010000bf1341a2be0000803f00000000c5a4c336c5a4c3b668f449340000803f000080bf0000803e000000001f00003f010080be1341a2be0000803f00000000c5a4c336c5a4c3b64e7717340000803f000080bf0000803e0000803e0000003f000080be000000000000803f00000000c5a4c336c5a4c3b668f4c9330000803f000080bf0000003f0000803e1f00003fca88803c1341a2be0000803f88e1f03396ccc63696ccc6b64d7717340000803f000080bf0000803e0000003ffeffff3eea88803c3a5f2d330000803f88e1703466f4c93666f4c9b667f449340000803f000080bf0000003f0000003f1f00003fffff7f3e1341a2be0000803f229208b496ccc63696ccc6b68171fc330000803f000080bf0000803e0000403f0000003f0000803e000000000000803f229288b4c5a4c336c5a4c3b668f449330000803f000080bf0000003f0000403fd3ffff3eea88803c000000bf0000803fb10dc0b6e31892b7e21892373fc5aeb40000803f000080bf000000000000003f0000003f0000803e000000bf0000803fb10d40b66ec066b76dc066378e765ab40000803f000080bf000000000000403f0000003f0000003f000000bf0000803f00000000154f29b7154f2937e79dc4b40000803f000080bf000000000000803f1f00003ffcffff3e1341a2be0000803f00000000154f29b7154f29373fc52eb50000803f000080bf0000803e0000803f0000003f0000003f000000000000803f00000000c5a4c336c5a4c3b668f4c9340000803f000080bf0000003f0000803f1500003fea88803c0200003f0000803fc0db4cb4fdffadb6fdffad36c0db4c200000803f000080bf0000803f0000003fd3ffff3eea88803c0200803e0000803fb70dc0b6fdff2db7fdff2d37000000000000803f000080bf0000403f0000003f0000003f0000803e0000803e0000803fc0db4cb4fdffadb6fdffad36c0db4c200000803f000080bf0000403f0000403f0000003f0000803e0000003f0000803ffb3fb3360000000000000000000000000000803f000080bf0000803f0000403f0000003f0000003f0000803e0000803f000000000000000000000000000000000000803f000080bf0000403f0000803f0000003f0000003f0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f0000003f000000bf0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f000000000000003f000000bf0000803e0000803f000000000000000000000000000000000000803f000080bf0000403f000000000000003f000080be0000803e0000803f000000000000000000000000000000000000803f000080bf0000403f0000803e0000003f000080be0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f0000803e + m_DataSize: 9296 + _typelessdata: 00000000000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f00000000d9827a3f513f313e0000803e000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e00000000d9827a3f7ca17f3e0000803e000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803e4dea663f80a17f3e00000000000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803e4cea663f503f313e0000003f000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000000000000000db827a3fd401a73e0000003f000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf000000000000803e4eea663fd801a73e0000803e000080be0000003facff7fb4c8e170b40000803fc2df7fbfa57800bdcab683b4000080bf0000803e0000803e4dea663f80a17f3e1500003fea88803c0200003facff7fb4c8e170b40000803fc2df7fbfa57800bdcab683b4000080bf000000000000003fe816523fe701a73e0000803e000000000000003facffffb4000000000000803f4f7f7fbf234880bdfb7effb4000080bf0000803e0000003fc051533f83a17f3e0000803e000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000003fc051533f83a17f3e00000000000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000003fc051533f533f313e0000803e0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000403f33b93f3f86a17f3e000000000000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000403f32b93f3f553f313e0000803e000000000000003f169288b4169288340000803fc2df7fbfa57800bd4d3884b4000080bf0000803e0000003fc051533f83a17f3e1500003fea88803c0200003f169208b5169208350000803f4f7f7fbf234880bdfc7effb4000080bf000000000000003fe816523fe701a73e0000003f0000803e0000003f169288b4169288340000803fc2df7fbfa57800bd4d3884b4000080bf000000000000403f33b93f3fdb01a73e0000003f0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf000000000000403f33b93f3fdb01a73e0000003f0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf000000000000803fa4202c3fdc01a73e0000803e0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803fa5202c3f88a17f3e000000000000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803fa5202c3f593f313e000000bf000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000003fbf51533f6dd7a33c000080be000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000003fbf51533f40bac53d000080be0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000403f31b93f3f46bac53d000000bf0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000403f30b93f3f90d7a33c000080be0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803fa5202c3f4dbac53d000000bf0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803fa3202c3fd5d7a33c000000bf000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f00000000db827a3f0bd7a33c000080be000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f00000000da827a3f39bac53d000080be000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803e4dea663f3abac53d000000bf000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803e4bea663f39d7a33c0000003f0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf000000000000003f97a1ff3ed601a73e0000803e0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803e0000003f99a1ff3e77a17f3e0000803e0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803e5a69133f79a17f3e0000003f0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf000000000000803e5a69133fd501a73e000000000000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000003f0000003f9ba1ff3e473f313e000000000000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803e5a69133f483f313e000000000000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000003f00000000e701273f4b3f313e0000803e0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803e00000000e601273f78a17f3e0000003f0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000000000000000e801273fd301a73e0000003f0000003f000000bfcbc4ae340000803fcbc4ae3418bd7dbfed0b963454ce073e000080bf000000000000803f623fb13ed301a73e0000803e0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803f663fb13e72a17f3e0000803e0000003f000080becbc4ae340000803fcbc4ae3418bd7dbfed0b963454ce073e000080bf0000803e0000403f7e70d83e75a17f3e1f00003ffcffff3e1341a2becbc42e350000803fcbc42e354d4c77bfd54bf734bc5b843e000080bf000000000000403f84f3cd3ee701a73e000000000000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803f693fb13e423f313e000000000000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000003f0000403f8170d83e443f313e0000803e0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803e0000403f7e70d83e75a17f3e1f00003ffcffff3e1341a2be84ff7f340000803f68f449b418bd7dbfa4428c3454ce073e000080bf000000000000403f84f3cd3ee701a73e0000803e0000003f000080be84ffff340000803f000000004d4c77bfd54bf734bc5b843e000080bf0000803e0000403f7e70d83e75a17f3e0000803e0000003f0000000084ff7f340000803f68f449b418bd7dbfa4428c3454ce073e000080bf0000803e0000003f99a1ff3e77a17f3e000080be0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803f6b3fb13e23bac53d000080be0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000403f0000403f8270d83e26bac53d000000bf0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803f6b3fb13e10d7a33c000000bf0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803f0000403f8270d83e0dd7a33c000000bf0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803f0000003fa0a1ff3e0bd7a33c000080be0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000403f0000003f9da1ff3e28bac53d000080be0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803e5c69133f2cbac53d000000bf0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803e5c69133f16d7a33c000000bf0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803f00000000eb01273f34d7a33c000080be0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000403f00000000ea01273f34bac53d0000803e0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803e4e69133f5069133f0000000000000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000003f82a1ff3e87a1ff3e000000000000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803e4d69133f87a1ff3e0000803e00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000003f82a1ff3e5069133f0000803e0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e00000000db01273f5069133f000000000000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f00000000da01273f88a1ff3e0000003f0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000000000000000dc01273fdc01273f0000003f0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf000000000000803e4e69133fdd01273f0000003f0000803e000000bf0000000000000000000080bfc2df7fbfcf7800bd00000000000080bf000000000000803e4e69133fdd01273f0000803e00000000000000bf0000000000000000000080bfc2df7fbfcf7800bd00000000000080bf0000803e0000003f82a1ff3e5069133fd3ffff3eea88803c000000bf0000000000000000000080bf4f7f7fbf784880bd00000000000080bf000000000000003f990b013fd701273f0000803e000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000403f6a70d83e5069133f00000000000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803f533fb13e86a1ff3e00000000000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000403f6970d83e86a1ff3e0000803e000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803f523fb13e4e69133fd3ffff3eea88803c000000bf0000000000000000000080bfc2df7fbfd17800bd00000000000080bf000000000000003f990b013fd701273f0000803e000080be000000bf0000000000000000000080bfc2df7fbfd17800bd00000000000080bf0000803e0000403f6a70d83e5069133f0000803e00000000000000bf0000000000000000000080bf4f7f7fbf7a4880bd00000000000080bf0000803e0000003f82a1ff3e5069133f0000003f000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf000000000000403f6870d83edd01273f0000003f000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf000000000000803f513fb13edc01273f000080be000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000403f6770d83e6d70d83e000000bf000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803f4e3fb13e543fb13e000000bf000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000403f6670d83e513fb13e000080be000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803f513fb13e7070d83e000080be00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000003f81a1ff3e6d70d83e000000bf00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000003f7ea1ff3e523fb13e000080be0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803e4d69133f6b70d83e000000bf0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803e4c69133f4f3fb13e000080be0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f00000000d901273f6a70d83e000000bf0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f00000000d801273f4e3fb13e0000803e000000bf000080becbc42eb4000080bfcbc42eb418bd7dbfed0b163454ce073e000080bf0000803e0000803e8ba17f3e82a17f3e0000003f000000bf000000bfcbc42eb4000080bfcbc42eb418bd7dbfed0b163454ce073e000080bf0000000000000000db01a73edd01a73e1f00003f010000bf1341a2becbc4aeb4000080bfcbc4aeb44d4c77bfd54b7734bc5b843e000080bf000000000000803ef201a73ebb4d8a3e0000803e000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000000087a17f3ed901a73e0000803e000000bf0000000084ffffb3000080bf68f4c93318bd7dbfa4420c3454ce073e000080bf0000803e0000003f88a17f3e4d3f313e1f00003f010000bf1341a2be84ffffb3000080bf68f4c93318bd7dbfa4420c3454ce073e000080bf000000000000803ef201a73ebb4d8a3e0000003f000000bf0000000000000000000080bf68f44934000080bf0000000000000000000080bf000000000000003fe001a73e4f3f313e0000803e000000bf000080be84ff7fb4000080bf000000004d4c77bfd54b7734bc5b843e000080bf0000803e0000803e8ba17f3e82a17f3e00000000000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000003f0000003f563f313e4c3f313e0000803e000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803e8ba17f3e82a17f3e0000803e000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803e0000003f88a17f3e4d3f313e00000000000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803e553f313e7ea17f3e00000000000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000003f00000000553f313ed801a73e0000803e000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000403f87a17f3e35bac53d0000003f000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf000000000000403fdf01a73e2fbac53d0000803e000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803f82a17f3e5ad7a33c0000003f000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf000000000000803fdb01a73e19d7a33c00000000000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803f553f313e6bd7a33c00000000000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000403f553f313e35bac53d000080be000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000403f46bac53d2dbac53d000080be000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000403f0000003f43bac53d483f313e000080be000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803f52bac53d4ad7a33c000000bf000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803f8bd7a33c0bd7a33c000000bf000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000403f6dd7a33c2abac53d000000bf000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000003f75d7a33c433f313e000080be000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803e3cbac53d7ba17f3e000080be000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000000039bac53dd601a73e000000bf000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803e2ed7a33c75a17f3e000000bf000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803f000000000bd7a33cd301a73e000000bf000080be0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000803e83a17f3e6670d83e000000bf000000bf0000003f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000dd01a73e4e3fb13e000000bf000080be0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803edd01a73e6670d83e000000bf000000bf0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000000081a17f3e4f3fb13e000000bf000000000000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000003f82a17f3e7fa1ff3e000000bf000000000000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000003fdb01a73e7ea1ff3e000000bf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000003f4d3f313e7fa1ff3e000000bf000080be00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000803e4f3f313e6770d83e000000bf000000bf00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f00000000533f313e4f3fb13e000000bf0000803e0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000403f83a17f3e4c69133f000000bf0000803e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000403fdc01a73e4c69133f000000bf0000003f0000803e000080bf00000000000000000000000000000000000080bf000080bf0000803e0000803f83a17f3ed801273f000000bf0000003f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fdd01a73ed801273f000000bf0000003f00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000803f493f313ed801273f000000bf0000803e00000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000403f4b3f313e4c69133f000000bf0000803e000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000403f2fbac53d4c69133f000000bf00000000000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000003f33bac53d7fa1ff3e000000bf0000003f000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803f32bac53dd901273f000000bf0000003f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f19d7a33cda01273f000000bf0000803e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000403f0bd7a33c4c69133f000000bf00000000000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000003f48d7a33c7ea1ff3e000000bf000080be000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803e32bac53d6670d83e000000bf000000bf000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000000034bac53d4e3fb13e000000bf000080be000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803e4dd7a33c6670d83e000000bf000000bf000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000000055d7a33c4e3fb13e0000003f000000bf000000000000803f00000000c5a4c336c5a4c3b64e7717340000803f000080bf0000003f00000000473f313e94202c3f1f00003f010000bf1341a2be0000803f00000000c5a4c336c5a4c3b668f449340000803f000080bf0000803e00000000b64d8a3e94202c3f1f00003f010080be1341a2be0000803f00000000c5a4c336c5a4c3b64e7717340000803f000080bf0000803e0000803eb84d8a3e20b93f3f0000003f000080be000000000000803f00000000c5a4c336c5a4c3b668f4c9330000803f000080bf0000003f0000803e4a3f313e21b93f3f1f00003fca88803c1341a2be0000803f88e1f03396ccc63696ccc6b64d7717340000803f000080bf0000803e0000003fb94d8a3e868c543ffeffff3eea88803c3a5f2d330000803f88e1703466f4c93666f4c9b667f449340000803f000080bf0000003f0000003f4d3f313e868c543f1f00003fffff7f3e1341a2be0000803f229208b496ccc63696ccc6b68171fc330000803f000080bf0000803e0000403fb94d8a3e3bea663f0000003f0000803e000000000000803f229288b4c5a4c336c5a4c3b668f449330000803f000080bf0000003f0000403f4f3f313e3aea663fd3ffff3eea88803c000000bf0000803fb10dc0b6e31892b7e21892373fc5aeb40000803f000080bf000000000000003fda01a73e868c543f0000003f0000803e000000bf0000803fb10d40b66ec066b76dc066378e765ab40000803f000080bf000000000000403fda01a73e3bea663f0000003f0000003f000000bf0000803f00000000154f29b7154f2937e79dc4b40000803f000080bf000000000000803fdb01a73ec8827a3f1f00003ffcffff3e1341a2be0000803f00000000154f29b7154f29373fc52eb50000803f000080bf0000803e0000803fb94d8a3ec7827a3f0000003f0000003f000000000000803f00000000c5a4c336c5a4c3b668f4c9340000803f000080bf0000003f0000803f4e3f313ec7827a3f1500003fea88803c0200003f0000803fc0db4cb4fdffadb6fdffad36c0db4c200000803f000080bf0000803f0000003f3ed7a33c868c543fd3ffff3eea88803c0200803e0000803fb70dc0b6fdff2db7fdff2d37000000000000803f000080bf0000403f0000003f37bac53d868c543f0000003f0000803e0000803e0000803fc0db4cb4fdffadb6fdffad36c0db4c200000803f000080bf0000403f0000403f3bbac53d3aea663f0000003f0000803e0000003f0000803ffb3fb3360000000000000000000000000000803f000080bf0000803f0000403f5cd7a33c3bea663f0000003f0000003f0000803e0000803f000000000000000000000000000000000000803f000080bf0000403f0000803f42bac53dc7827a3f0000003f0000003f0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f97d7a33cc8827a3f0000003f000000bf0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f000000000bd7a33c92202c3f0000003f000000bf0000803e0000803f000000000000000000000000000000000000803f000080bf0000403f0000000034bac53d93202c3f0000003f000080be0000803e0000803f000000000000000000000000000000000000803f000080bf0000403f0000803e31bac53d21b93f3f0000003f000080be0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f0000803e23d7a33c21b93f3f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -12116,7 +12113,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -14703,11 +14700,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 45957245} + m_TransformParent: {fileID: 1173886246} m_Modifications: - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_RootOrder - value: 1 + value: 15 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalScale.y @@ -14719,15 +14716,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalPosition.x - value: -10.056675 + value: -6.0029993 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalPosition.y - value: 5.514353 + value: -2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalPosition.z - value: -10.822918 + value: 2.3339996 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalRotation.w @@ -14757,10 +14754,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8009913117430456680, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -5057947061324796563, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_Name value: doors objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 2097318422176739615, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3291878491632897987, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} --- !u!4 &804182423 stripped @@ -14995,7 +15012,7 @@ Transform: - {fileID: 2128333932} - {fileID: 197140882} m_Father: {fileID: 45957245} - m_RootOrder: 9 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &815680570 PrefabInstance: @@ -16324,7 +16341,7 @@ Transform: - {fileID: 193352390} - {fileID: 1967593823} m_Father: {fileID: 45957245} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &899232841 PrefabInstance: @@ -16425,7 +16442,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &915677070 Transform: @@ -17206,15 +17223,15 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 45957245} + m_TransformParent: {fileID: 1173886246} m_Modifications: - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_RootOrder - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalScale.x - value: 0.04186486 + value: 0.041864865 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalScale.y @@ -17226,15 +17243,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.x - value: -2.5845757 + value: 1.4691 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.y - value: 7.404353 + value: -0.10999966 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.z - value: -16.637917 + value: -3.480999 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalRotation.w @@ -17268,6 +17285,10 @@ PrefabInstance: propertyPath: m_Name value: WindowUK objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} --- !u!4 &1043384080 stripped @@ -17708,7 +17729,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24488 + m_Name: pb_Mesh35788 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18647,8 +18668,11 @@ Transform: - {fileID: 1757592331} - {fileID: 2039536873} - {fileID: 104072647} + - {fileID: 1627809130} + - {fileID: 804182423} + - {fileID: 1043384080} m_Father: {fileID: 45957245} - m_RootOrder: 7 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -19555,7 +19579,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24010 + m_Name: pb_Mesh35310 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19719,7 +19743,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23816 + m_Name: pb_Mesh35112 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19774,9 +19798,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 0 + offset: 48 format: 0 - dimension: 0 + dimension: 2 - stream: 0 offset: 0 format: 0 @@ -19809,8 +19833,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 10320 - _typelessdata: 00000000000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f000000000000803e000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e000000000000803e000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803e00000000000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803e0000803e000000bf0000003f11fe8fb51b4192b50000803f0efe7fbfe385fc3b70dc8eb5000080bf0000803e000000000000003f000000bf0000003f000000001b4112b60000803f000080bf0000000000000000000080bf0000000000000000dc00003f13f981be0900003f11fe8fb51b4192b50000803f0efe7fbfe385fc3b70dc8eb5000080bf000000000000803e0000803e000080be0000003f11fe0fb6000000000000803f38f87fbf6f7e7c3cb1f90fb6000080bf0000803e0000803e0000803e000080be0000003f8bce8db58bce8d350000803f0efe7fbfe385fc3b3ae58eb5000080bf0000803e0000803edc00003f13f981be0900003f8bce0db68bce0d360000803f38f87fbf6f7e7c3cb1f90fb6000080bf000000000000803e0000003f000000000000003f8bce8db58bce8d350000803f0efe7fbfe385fc3b3ae58eb5000080bf000000000000003f0000803e000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000003f00000000000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000003f0000803e0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000403f000000000000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000403f0000803e000000000000003fa4fe3fb514d17db50000803f701f7ebfc68ff73dd2e71fb5000080bf0000803e0000003f0000003f000000000000003f0000000014d1fdb50000803f000080bf0000000000000000000080bf000000000000003f7400003fcca6413e0600003fa4fe3fb514d17db50000803f701f7ebfc68ff73dd2e71fb5000080bf000000000000403f0000803e0000803e0000003fa4febfb5000000000000803fd7ba78bff74d723ecf8abab5000080bf0000803e0000403f0000803e0000803e0000003fb7641ab5b7641a350000803f701f7ebfc68ff73da0ec2bb5000080bf0000803e0000403f7400003fcca6413e0600003fb7649ab5b7649a350000803fd7ba78bff74d723ecf8abab5000080bf000000000000403f0000003f0000003f0000003fb7641ab5b7641a350000803f701f7ebfc68ff73da0ec2bb5000080bf000000000000803f0000803e0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803f000000000000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803f000000bf000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000003f000080be000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000003f000080be0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000403f000000bf0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000403f000080be0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803f000000bf0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f000000bf000000bf0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000803f00000000000080be000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f00000000000080be000080be0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000403f0000803ee0feffbe9b1590be0300003f489a5b35489a5bb50000803f99007ebfd559ffbd1f823e35000080bf0000803f0000803e000080be000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803ee0feffbe9b1590be0300003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000803f0000803e000080be000080be0000003fb0014035000000000000803f99007ebfd559ffbd1f823e35000080bf0000403f0000803e000080be000000000000003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000403f0000003fae01003ff0ffff3efa2f81b9f80ee1350000803fa31a77b48bf67fbf5280e035732c8bbc000080bf000000000000003f0000803e0000003f0000000048f9ff350000803f00000000f8ff7fbf40f9ff35922c813a000080bf0000803e0000003f0000803e0000003f0000803ef80ee1350000803fa31a77b48bf67fbf5280e035732c8bbc000080bf0000803e0000803e7401003ff4ffff3ef479843ea824c2350000803fa31af7b4f8d77fbf9eddbf35da240fbd000080bf000000000000803e0000803e0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803e0000003f000000000000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000003f0000003f000000000000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803e0000803e0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803e000000000000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000003f000000000000803e0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803e000000007401003ff4ffff3ef479843ea4fb3f350000803f39f546b5fdf57fbfb3793c3545378fbc000080bf000000000000803e0000803e0000003f0000803ea4fbbf350000803f00000000f8d77fbf9fddbf35da240fbd000080bf0000803e0000803e0000803e0000003f0000003fa4fb3f350000803f39f546b5fdf57fbfb3793c3545378fbc000080bf0000803e000000000000003f0000003f0000003f000000000000803f39f5c6b5000080bf0000000000000000000080bf00000000000000000000003f0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000000000803f0000803e0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803f0000803e0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803e0000403f0000003f0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf000000000000403f000000000000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803f000000000000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000003f0000403f0000003f0000003f000080bef71c80350000803ff71c8035feff7fbfcd0c8035472e013a000080bf000000000000403f0000803e0000003f00000000f71c80350000803ff71c8035feff7fbfcd0c8035472e013a000080bf0000803e0000003fae01003ff0ffff3efa2f81b9f71c00360000803ff71c0036f8ff7fbf41f9ff35922c813a000080bf000000000000003f000080be0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803f000080be0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000403f0000403f000000bf0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803f000000bf0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803f0000403f000000bf0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803f0000003f000080be0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000403f0000003f000080be0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803e000000bf0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803e000000bf0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803f00000000000080be0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000403f000000000000803e0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803e0000000000000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000003f000000000000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803e0000803e00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000003f0000803e0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e00000000000000000000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f000000000000003f0000003f000000bfb0641ab5b0641a35000080bf701f7ebfbe8ff73d98ec2b35000080bf00000000000000000000803e0000803e000000bfb0641ab5b0641a35000080bf701f7ebfbe8ff73d98ec2b35000080bf0000803e0000803e7800003fcca6413e060000bfb0649ab5b0649a35000080bfd8ba78bfe94d723ec58aba35000080bf000000000000803e7800003fcca6413e060000bf98fe3fb514d17db5000080bf701f7ebfbe8ff73dc7e71f35000080bf000000000000803e0000803e00000000000000bf98fe3fb514d17db5000080bf701f7ebfbe8ff73dc7e71f35000080bf0000803e0000003f0000803e0000803e000000bf98febfb500000000000080bfd8ba78bfe94d723ec48aba35000080bf0000803e0000803e0000003f00000000000000bf0000000014d1fdb5000080bf000080bf0000000000000000000080bf000000000000003f0000803e000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000403f00000000000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803f00000000000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000403f0000803e000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803f0000003f00000000000000bf82ce8db582ce8d35000080bf0efe7fbfdb85fc3b31e58e35000080bf000000000000003f0000803e000080be000000bf82ce8db582ce8d35000080bf0efe7fbfdb85fc3b31e58e35000080bf0000803e0000403fe000003f13f981be090000bf82ce0db682ce0d36000080bf38f87fbf607e7c3ca8f90f36000080bf000000000000403fe000003f13f981be090000bf08fe8fb51b4192b5000080bf0efe7fbfdb85fc3b67dc8e35000080bf000000000000403f0000803e000000bf000000bf08fe8fb51b4192b5000080bf0efe7fbfdb85fc3b67dc8e35000080bf0000803e0000803f0000803e000080be000000bf08fe0fb600000000000080bf38f87fbf607e7c3ca8f90f36000080bf0000803e0000403f0000003f000000bf000000bf000000001b4112b6000080bf000080bf0000000000000000000080bf000000000000803f000080be000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000403f000000bf000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803f000000bf000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000403f000080be000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803f000080be00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000003f000000bf00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000003f000080be0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803e000000bf0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803e000080be0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f00000000000000bf0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f000000000000803e000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803e0000003f000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000000000000003f000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf000000000000803e0000803e000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803e000000000000803e000000bf00000000f71c00b5000080bff71c00b5feff7fbfcd0c0035472e013a000080bf0000803e0000003f0000003f000000bf000080bef71c00b5000080bff71c00b5feff7fbfcd0c0035472e013a000080bf000000000000803eae01003f040000bffa2f81b9f71c80b5000080bff71c80b5f8ff7fbf41f97f35922c813a000080bf000000000000003f00000000000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000003f0000003f0000803e000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803e0000003f00000000000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803e00000000000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000003f000000000000803e000000bf0000803ef80e61b5000080bfa31af7338bf67fbf52806035732c8bbc000080bf0000803e0000403fae01003f040000bffa2f81b9f80e61b5000080bfa31af7338bf67fbf52806035732c8bbc000080bf000000000000003f7401003f030000bff479843ea82442b5000080bfa31a7734f8d77fbf9edd3f35da240fbd000080bf000000000000403f0000803e000000bf0000000048f97fb5000080bf00000000f8ff7fbf40f97f35982c813a000080bf0000803e0000003f0000803e000000bf0000003fa4fbbfb4000080bf39f5c634fdf57fbfb379bc3445378fbc000080bf0000803e0000803f7401003f030000bff479843ea4fbbfb4000080bf39f5c634fdf57fbfb379bc3445378fbc000080bf000000000000403f0000003f000000bf0000003f00000000000080bf39f54635000080bf0000000000000000000080bf000000000000803f0000803e000000bf0000803ea4fb3fb5000080bf00000000f8d77fbf9fdd3f35da240fbd000080bf0000803e0000403f00000000000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803f0000803e000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000403f0000803e000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803f00000000000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000403f000080be000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000403f000080be000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000403f0000003f000080be000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803f000000bf000000bf0000003fb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000803f0000803f000080be000000bf0000803eb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000403f0000403f5dffffbe010000bf40c5bb3eb723f034000080bfb723f034cdf467bff3f567b4a6a1d83e000080bf0000803f0000403f5dffffbe010000bf40c5bb3ea3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000803f0000403f000080be000000bf00000000a3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000403f0000003f000080be000000bf0000803ea3008034000080bf00000000cdf467bff4f567b4a6a1d83e000080bf0000403f0000403f000000bf000000bf0000000000000000000080bfca822eb4000080bf0000000000000000000080bf0000803f0000003f000080be000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803e000080be000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000403f00000000000000bf000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803e000000bf000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803f000000008cfeffbe9c1590be44c5bb3e000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000803e0000803e000000bf000000bf0000003f000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000000000000000e0feffbe9b1590be0300003f000080bf12b22438f8959db7f3959d37732170b4000080bf000080bf000000000000803e5dffffbe010000bf40c5bb3e000080bf9309ef3754e518b850e518387a21f0b4000080bf000080bf0000803e000000005dffffbe62553fb340c5bb3e000080bf78c2dcb746b0e7b74ab0e737e5c495b4000080bf000080bf0000803e0000003f000000bf000000000000003f000080bfa9d9ffb74ee518b851e518381179b3b4000080bf000080bf000000000000003f47ffffbe9b1590bef70b5032000080bf0650e137d2966e37ce966eb716e20234000080bf000080bf0000003f0000803e000000bf000000bf00000000000080bf8796d337923a5e378d3a5eb7ca822e34000080bf000080bf0000003f000000005dffffbeffff7f3e40c5bb3e000080bf0000000050e518b850e518387a2170b4000080bf000080bf0000803e0000403f000000bf0000803e0000003f000080bf0000000050e518b850e518387a21f0b3000080bf000080bf000000000000403f000000bf0000003f0000803e000080bf50e598b750e598b750e598376484de2e000080bf000080bf0000803e0000803f000000bf0000003f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f000000bf0000003f00000000000080bf000023b78e3ade368e3adeb61644562d000080bf000080bf0000003f0000803f000000bf0000803e00000000000080bf000000008e3a5e378e3a5eb700000000000080bf000080bf0000003f0000403f000000bf0000803e000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000403f000000bf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000003f000000bf00000000000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000003f000000bf0000003f000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803f000000bf0000003f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f000000bf0000803e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000403f000000bf00000000000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000003f7affffbe9b1590be030080be000080bf566cb637fbff4b36fbff4bb6566c36a3000080bf000080bf0000403f0000803e000000bf000000bf000080be000080bf23429937000000000000000000000000000080bf000080bf0000403f00000000000000bf00000000000000bf000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000803f0000003f7affffbe9b1590be030080be000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000403f0000803e000000bf000080be000000bf000080bf000000000300863758f484b7a657ff3da2007ebf000080bf0000803f0000803e000000bf000080be000000bf000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000803f0000803e000000bf000000bf000080be000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000403f000000007affffbe9b1590be030080be000080bf274299372742993758f484b7a657ff3da2007ebf000080bf0000403f0000803e000000bf000000bf000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000000ae01003f040000bffa2f81b90000803f230c95b89f78e0b89878e038743040b50000803f000080bf0000003f000000000000003f000000bf000080be0000803f1fa78bb85636d7b84d36d738542080b50000803f000080bf0000803e000000001301003f13f981be0a0080be0000803f230c95b89f78e0b89878e038743040b50000803f000080bf0000803e0000803ee602003f17f981be0b2381b90000803f27719eb8e8bae9b8e3bae938472000b50000803f000080bf0000003f0000803e0000003f000000bf000000bf0000803fb88163b80000000000000000000000000000803f000080bf0000000000000000e000003f13f981be090000bf0000803fec677db8f3ffcbb6f3ffcb36eeba5d250000803f000080bf000000000000803e1301003f13f981be0a0080be0000803f76b67538f3ffcbb6f3ffcb36a7ff56a50000803f000080bf0000803e0000803ee000003f13f981be090000bf0000803f91995c38f3ff4bb7f3ff4b37000000000000803f000080bf000000000000803e0000003f00000000000000bf0000803f76b67538f3ffcbb6f3ffcb36a7ff56a50000803f000080bf000000000000003f0000003f00000000000080be0000803fad6987380000000000000000000000000000803f000080bf0000803e0000003fe602003f17f981be0b2381b90000803fc38590389078e0b89678e038438e37b50000803f000080bf0000003f0000803e1301003f13f981be0a0080be0000803fbf698738ddbae9b8e1bae938472000b50000803f000080bf0000803e0000803e0000003f00000000000080be0000803fc38590389078e0b89678e038438e37b50000803f000080bf0000803e0000003fae01003ff9bf6eb4fa2f81b90000803fc7a199384436d7b84d36d73846fc6eb50000803f000080bf0000003f0000003fae01003ff9bf6eb4fa2f81b90000803f0a837ab8a278e0b89c78e038478e37b50000803f000080bf0000003f0000003f0000003f00000000000080be0000803f510e62b85436d7b84d36d73846fc6eb50000803f000080bf0000803e0000003fab00003fcca6413e060080be0000803f0a837ab8a278e0b89c78e038478e37b50000803f000080bf0000803e0000403f7e02003fc4a6413e592881b90000803fe27b89b8f0bae9b8ecbae9384c2000b50000803f000080bf0000003f0000403f7800003fcca6413e060000bf0000803f735840b8f7ffcbb6f7ffcb367358c0240000803f000080bf000000000000403fab00003fcca6413e060080be0000803f0002ea37f7ffcbb6f7ffcb3600026aa40000803f000080bf0000803e0000403f0000003f0000003f000000bf0000803f0002ea37f7ffcbb6f7ffcb3600026aa40000803f000080bf000000000000803f0000003f0000003f000080be0000803f7c8209380000000000000000000000000000803f000080bf0000803e0000803f7e02003fc4a6413e592881b90000803ffe6218389678e0b89c78e0386428a0b50000803f000080bf0000003f0000403f0000003f0000003f000080be0000803ffe6218389678e0b89c78e0386428a0b50000803f000080bf0000803e0000803fae01003ff0ffff3efa2f81b90000803f6d4327384436d7b84e36d738542000b60000803f000080bf0000003f0000803f0000003f000000000000003f0000803f962856b8f092d838eb92d8b815353e350000803f000080bf0000803f0000003f7401003f6e1c2fb4f479843e0000803ffa7b89b895bdc0388fbdc0b8f87435350000803f000080bf0000403f0000003f4402003fc0a6413efb79843e0000803f962856b8f092d838eb92d8b815353e350000803f000080bf0000403f0000403f7400003fcca6413e0600003f0000803f385919b84a68f0384668f0b831f546350000803f000080bf0000803f0000403f7e02003fc4a6413e592881b90000803f724327388df25f3783f25fb7421d77b40000803f000080bf0000003f0000403fae01003ff0ffff3efa2f81b90000803f7043273882f25f3787f25fb7471df7330000803f000080bf0000003f0000803f7401003ff4ffff3ef479843e0000803f6e43273877f25f378bf25fb74b1df7340000803f000080bf0000403f0000803f0000003f0000003f0000003f0000803f5290ba378abdc0388fbdc0b839f5c6350000803f000080bf0000803f0000803f0000003f000000bf0000003f0000803f1b1587b8eb92d838e692d8b8e53715350000803f000080bf0000803f000000007401003f030000bff479843e0000803f3b719eb897bdc0388fbdc0b839f546350000803f000080bf0000403f00000000ac02003f16f981befc79843e0000803f1b1587b8eb92d838e692d8b8e53715350000803f000080bf0000403f0000803edc00003f13f981be0900003f0000803ff5715fb83f68f0383c68f0b829f5c6340000803f000080bf0000803f0000803eae01003f040000bffa2f81b90000803f2e719eb89ef25f378bf25fb74b1d77340000803f000080bf0000003f00000000e602003f17f981be0b2381b90000803f2f719eb896f25f3788f25fb7f55539340000803f000080bf0000003f0000803edc00003f13f981be0900003f0000803f40fb8238e292d838e692d8b8c5770c350000803f000080bf0000803f0000803eac02003f16f981befc79843e0000803fdaa199383868f0383c68f0b829f5c6340000803f000080bf0000403f0000803e7401003f6e1c2fb4f479843e0000803f40fb8238e292d838e692d8b8c5770c350000803f000080bf0000403f0000003f0000003f000000000000003f0000803f4ba958388bbdc03890bdc0b8f87435350000803f000080bf0000803f0000003f + m_DataSize: 12040 + _typelessdata: 00000000000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f000000001c837a3ff93e313e0000803e000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e000000001c837a3f02a17f3e0000803e000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803e98ea663f03a17f3e00000000000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803e99ea663ff83e313e0000803e000000bf0000003f11fe8fb51b4192b50000803f0efe7fbfe385fc3b70dc8eb5000080bf0000803e000000001c837a3f02a17f3e0000003f000000bf0000003f000000001b4112b60000803f000080bf0000000000000000000080bf00000000000000001c837a3f8a01a73edc00003f13f981be0900003f11fe8fb51b4192b50000803f0efe7fbfe385fc3b70dc8eb5000080bf000000000000803eea37673f1102a73e0000803e000080be0000003f11fe0fb6000000000000803f38f87fbf6f7e7c3cb1f90fb6000080bf0000803e0000803e98ea663f03a17f3e0000803e000080be0000003f8bce8db58bce8d350000803f0efe7fbfe385fc3b3ae58eb5000080bf0000803e0000803e98ea663f03a17f3edc00003f13f981be0900003f8bce0db68bce0d360000803f38f87fbf6f7e7c3cb1f90fb6000080bf000000000000803eea37673f1102a73e0000003f000000000000003f8bce8db58bce8d350000803f0efe7fbfe385fc3b3ae58eb5000080bf000000000000003f1452533f8a01a73e0000803e000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000003f1452533f04a17f3e00000000000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000003f1652533ff53e313e0000803e0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000403f91b93f3fffa07f3e000000000000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000403f92b93f3ff43e313e0000803e000000000000003fa4fe3fb514d17db50000803f701f7ebfc68ff73dd2e71fb5000080bf0000803e0000003f1452533f04a17f3e0000003f000000000000003f0000000014d1fdb50000803f000080bf0000000000000000000080bf000000000000003f1452533f8a01a73e7400003fcca6413e0600003fa4fe3fb514d17db50000803f701f7ebfc68ff73dd2e71fb5000080bf000000000000403f547f443fcf01a73e0000803e0000803e0000003fa4febfb5000000000000803fd7ba78bff74d723ecf8abab5000080bf0000803e0000403f91b93f3fffa07f3e0000803e0000803e0000003fb7641ab5b7641a350000803f701f7ebfc68ff73da0ec2bb5000080bf0000803e0000403f91b93f3fffa07f3e7400003fcca6413e0600003fb7649ab5b7649a350000803fd7ba78bff74d723ecf8abab5000080bf000000000000403f547f443fcf01a73e0000003f0000003f0000003fb7641ab5b7641a350000803f701f7ebfc68ff73da0ec2bb5000080bf000000000000803f0c212c3f8701a73e0000803e0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803f0d212c3ffda07f3e000000000000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803f0f212c3ff13e313e000000bf000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000003f1852533f0bd7a33c000080be000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000003f1752533fd5b9c53d000080be0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000403f93b93f3fd0b9c53d000000bf0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000403f94b93f3f0bd7a33c000080be0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803f10212c3fcab9c53d000000bf0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f10212c3f0bd7a33c000000bf000000bf0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000803f0000000020837a3f21d7a33c000080be000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f000000001e837a3fe0b9c53d000080be000080be0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000403f0000803e9aea663fd9b9c53de0feffbe9b1590be0300003f489a5b35489a5bb50000803f99007ebfd559ffbd1f823e35000080bf0000803f0000803ef960693f8ddca33c000080be000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803e9aea663fd9b9c53de0feffbe9b1590be0300003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000803f0000803ef960693f8ddca33c000080be000080be0000003fb0014035000000000000803f99007ebfd559ffbd1f823e35000080bf0000403f0000803e9aea663fd9b9c53d000080be000000000000003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000403f0000003f1752533fd5b9c53dae01003ff0ffff3efa2f81b9f80ee1350000803fa31a77b48bf67fbf5280e035732c8bbc000080bf000000000000003f0bd7a33c412b313e0000803e0000003f0000000048f9ff350000803f00000000f8ff7fbf40f9ff35922c813a000080bf0000803e0000003ff9bdc53d063f313e0000803e0000003f0000803ef80ee1350000803fa31a77b48bf67fbf5280e035732c8bbc000080bf0000803e0000803effbdc53d19a17f3e7401003ff4ffff3ef479843ea824c2350000803fa31af7b4f8d77fbf9eddbf35da240fbd000080bf000000000000803e67d9a33c6c2f813e0000803e0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803e0000003ff9bdc53d063f313e000000000000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000003f0000003f0841313e073f313e000000000000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803e0c41313e13a17f3e0000803e0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803effbdc53d19a17f3e000000000000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000003f000000000f41313e9101a73e0000803e0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803e0000000006bec53d9001a73e7401003ff4ffff3ef479843ea4fb3f350000803f39f546b5fdf57fbfb3793c3545378fbc000080bf000000000000803e67d9a33c6c2f813e0000803e0000003f0000803ea4fbbf350000803f00000000f8d77fbf9fddbf35da240fbd000080bf0000803e0000803effbdc53d19a17f3e0000803e0000003f0000003fa4fb3f350000803f39f546b5fdf57fbfb3793c3545378fbc000080bf0000803e0000000006bec53d9001a73e0000003f0000003f0000003f000000000000803f39f5c6b5000080bf0000000000000000000080bf0000000000000000c0e7a33c9201a73e0000003f0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000000000803f67e7a33c0bd7a33c0000803e0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803ff7bdc53d33d7a33c0000803e0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803e0000403ff7bdc53df3b9c53d0000003f0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf000000000000403f60e7a33cf1b9c53d000000000000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803f0641313e5ad7a33c000000000000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000003f0000403f0741313ef3b9c53d0000003f0000003f000080bef71c80350000803ff71c8035feff7fbfcd0c8035472e013a000080bf000000000000403f60e7a33cf1b9c53d0000803e0000003f00000000f71c80350000803ff71c8035feff7fbfcd0c8035472e013a000080bf0000803e0000003ff9bdc53d063f313eae01003ff0ffff3efa2f81b9f71c00360000803ff71c0036f8ff7fbf41f9ff35922c813a000080bf000000000000003f0bd7a33c412b313e000080be0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803f0ea37f3e2fd7a33c000080be0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000403f0000403f12a37f3eedb9c53d000000bf0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803f8c02a73e11d7a33c000000bf0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803f0000403f8d02a73ee8b9c53d000000bf0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803f0000003f8e02a73e083f313e000080be0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000403f0000003f14a37f3e063f313e000080be0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803e18a37f3e14a17f3e000000bf0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803e8f02a73e10a17f3e000000bf0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803f000000009102a73e9101a73e000080be0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000403f000000001aa37f3e9201a73e0000803e0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803e8d71d83e09a17f3e0000000000000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000003f96a2ff3efe3e313e000000000000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803e94a2ff3e0aa17f3e0000803e00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000003f9071d83efb3e313e0000803e0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e000000008c71d83e8901a73e000000000000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000000091a2ff3e8a01a73e0000003f0000003f000000bfb0641ab5b0641a35000080bf701f7ebfbe8ff73d98ec2b35000080bf00000000000000008740b13e8901a73e0000803e0000803e000000bfb0641ab5b0641a35000080bf701f7ebfbe8ff73d98ec2b35000080bf0000803e0000803e8d71d83e09a17f3e7800003fcca6413e060000bfb0649ab5b0649a35000080bfd8ba78bfe94d723ec58aba35000080bf000000000000803e3e40b13efa896c3e7800003fcca6413e060000bf98fe3fb514d17db5000080bf701f7ebfbe8ff73dc7e71f35000080bf000000000000803e3e40b13efa896c3e0000803e00000000000000bf98fe3fb514d17db5000080bf701f7ebfbe8ff73dc7e71f35000080bf0000803e0000003f9071d83efb3e313e0000803e0000803e000000bf98febfb500000000000080bfd8ba78bfe94d723ec48aba35000080bf0000803e0000803e8d71d83e09a17f3e0000003f00000000000000bf0000000014d1fdb5000080bf000080bf0000000000000000000080bf000000000000003f8840b13efb3e313e0000803e000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000403f9071d83ee2b9c53d00000000000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803f9ba2ff3e34d7a33c00000000000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000403f99a2ff3ee5b9c53d0000803e000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803f9571d83e10d7a33c0000003f00000000000000bf82ce8db582ce8d35000080bf0efe7fbfdb85fc3b31e58e35000080bf000000000000003f8840b13efb3e313e0000803e000080be000000bf82ce8db582ce8d35000080bf0efe7fbfdb85fc3b31e58e35000080bf0000803e0000403f9071d83ee2b9c53de000003f13f981be090000bf82ce0db682ce0d36000080bf38f87fbf607e7c3ca8f90f36000080bf000000000000403f0240b13e454fc33de000003f13f981be090000bf08fe8fb51b4192b5000080bf0efe7fbfdb85fc3b67dc8e35000080bf000000000000403f0240b13e454fc33d0000803e000000bf000000bf08fe8fb51b4192b5000080bf0efe7fbfdb85fc3b67dc8e35000080bf0000803e0000803f9571d83e10d7a33c0000803e000080be000000bf08fe0fb600000000000080bf38f87fbf607e7c3ca8f90f36000080bf0000803e0000403f9071d83ee2b9c53d0000003f000000bf000000bf000000001b4112b6000080bf000080bf0000000000000000000080bf000000000000803f8b40b13e0bd7a33c000080be000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000403fcf69133fe7b9c53d000000bf000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803f5302273f0bd7a33c000000bf000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000403f5402273fe5b9c53d000080be000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803fd069133f28d7a33c000080be00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000003fcf69133f003f313e000000bf00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000003f5202273f013f313e000080be0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803ece69133f0ea17f3e000000bf0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803e5202273f11a17f3e000080be0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f00000000cc69133f8b01a73e000000bf0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f000000005002273f8f01a73e0000803e000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803e0d69133f0c69133f0000003f000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000000009101273f8d01273f0000003f000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf000000000000803e0e69133f8f01273f0000803e000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803e000000008f01273f0c69133f0000803e000000bf00000000f71c00b5000080bff71c00b5feff7fbfcd0c0035472e013a000080bf0000803e0000003f15a1ff3e0c69133f0000003f000000bf000080bef71c00b5000080bff71c00b5feff7fbfcd0c0035472e013a000080bf000000000000803e0e69133f8f01273fae01003f040000bffa2f81b9f71c80b5000080bff71c80b5f8ff7fbf41f97f35922c813a000080bf000000000000003ffbaaff3e1402273f00000000000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000003f0000003f15a1ff3e10a1ff3e0000803e000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803e0000003f15a1ff3e0c69133f00000000000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803e0d69133f12a1ff3e00000000000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000003f000000008f01273f14a1ff3e0000803e000000bf0000803ef80e61b5000080bfa31af7338bf67fbf52806035732c8bbc000080bf0000803e0000403f1070d83e0c69133fae01003f040000bffa2f81b9f80e61b5000080bfa31af7338bf67fbf52806035732c8bbc000080bf000000000000003ffbaaff3e1402273f7401003f030000bff479843ea82442b5000080bfa31a7734f8d77fbf9edd3f35da240fbd000080bf000000000000403f2f11d73e0202273f0000803e000000bf0000000048f97fb5000080bf00000000f8ff7fbf40f97f35982c813a000080bf0000803e0000003f15a1ff3e0c69133f0000803e000000bf0000003fa4fbbfb4000080bf39f5c634fdf57fbfb379bc3445378fbc000080bf0000803e0000803f073fb13e0b69133f7401003f030000bff479843ea4fbbfb4000080bf39f5c634fdf57fbfb379bc3445378fbc000080bf000000000000403f2f11d73e0202273f0000003f000000bf0000003f00000000000080bf39f54635000080bf0000000000000000000080bf000000000000803f073fb13e9001273f0000803e000000bf0000803ea4fb3fb5000080bf00000000f8d77fbf9fdd3f35da240fbd000080bf0000803e0000403f1070d83e0c69133f00000000000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803f093fb13e0ea1ff3e0000803e000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000403f1070d83e0c69133f0000803e000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803f073fb13e0b69133f00000000000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000403f0f70d83e10a1ff3e000080be000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000403f0f70d83e0770d83e000080be000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000403f0000003f16a1ff3e0970d83e000080be000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803f093fb13e0870d83e000000bf000000bf0000003fb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000803f0000803f073fb13e033fb13e000080be000000bf0000803eb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000403f0000403f0f70d83e0770d83e5dffffbe010000bf40c5bb3eb723f034000080bfb723f034cdf467bff3f567b4a6a1d83e000080bf0000803f0000403f1023c63e323fb13e5dffffbe010000bf40c5bb3ea3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000803f0000403f1023c63e323fb13e000080be000000bf00000000a3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000403f0000003f16a1ff3e0970d83e000080be000000bf0000803ea3008034000080bf00000000cdf467bff4f567b4a6a1d83e000080bf0000403f0000403f0f70d83e0770d83e000000bf000000bf0000000000000000000080bfca822eb4000080bf0000000000000000000080bf0000803f0000003f16a1ff3e033fb13e000080be000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803e0d69133f0a70d83e000080be000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000403f000000009001273f0f70d83e000000bf000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803e0e69133f033fb13e000000bf000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803f000000009201273f083fb13e8cfeffbe9c1590be44c5bb3e000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000803e0000803e891d923e6d423d3f000000bf000000bf0000003f000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf00000000000000009201a73e49202c3fe0feffbe9b1590be0300003f000080bf12b22438f8959db7f3959d37732170b4000080bf000080bf000000000000803e9101a73e6e423d3f5dffffbe010000bf40c5bb3e000080bf9309ef3754e518b850e518387a21f0b4000080bf000080bf0000803e00000000891d923e49202c3f5dffffbe62553fb340c5bb3e000080bf78c2dcb746b0e7b74ab0e737e5c495b4000080bf000080bf0000803e0000003f861d923e4f51533f000000bf000000000000003f000080bfa9d9ffb74ee518b851e518381179b3b4000080bf000080bf000000000000003f8e01a73e4f51533f47ffffbe9b1590bef70b5032000080bf0650e137d2966e37ce966eb716e20234000080bf000080bf0000003f0000803e083f313e6e423d3f000000bf000000bf00000000000080bf8796d337923a5e378d3a5eb7ca822e34000080bf000080bf0000003f000000000a3f313e49202c3f5dffffbeffff7f3e40c5bb3e000080bf0000000050e518b850e518387a2170b4000080bf000080bf0000803e0000403f851d923ed2e9663f000000bf0000803e0000003f000080bf0000000050e518b850e518387a21f0b3000080bf000080bf000000000000403f8c01a73ed2e9663f000000bf0000003f0000803e000080bf50e598b750e598b750e598376484de2e000080bf000080bf0000803e0000803f14a17f3e55827a3f000000bf0000003f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f9001a73e53827a3f000000bf0000003f00000000000080bf000023b78e3ade368e3adeb61644562d000080bf000080bf0000003f0000803f0b3f313e56827a3f000000bf0000803e00000000000080bf000000008e3a5e378e3a5eb700000000000080bf000080bf0000003f0000403f073f313ed4e9663f000000bf0000803e000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000403ff3b9c53dd5e9663f000000bf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000003f0a3f313e5151533f000000bf00000000000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000003ff1b9c53d5251533f000000bf0000003f000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803ff5b9c53d57827a3f000000bf0000003f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3cd7a33c57827a3f000000bf0000803e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000403f60d7a33cd5e9663f000000bf00000000000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000003f61d7a33c5351533f7affffbe9b1590be030080be000080bf566cb637fbff4b36fbff4bb6566c36a3000080bf000080bf0000403f0000803ef0b9c53d6e423d3f000000bf000000bf000080be000080bf23429937000000000000000000000000000080bf000080bf0000403f00000000eeb9c53d4a202c3f000000bf00000000000000bf000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000803f0000003f61d7a33c5351533f7affffbe9b1590be030080be000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000403f0000803ef0b9c53d6e423d3f000000bf000080be000000bf000080bf000000000300863758f484b7a657ff3da2007ebf000080bf0000803f0000803e42d7a33ccfb83f3f000000bf000080be000000bf000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000803f0000803e42d7a33ccfb83f3f000000bf000000bf000080be000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000403f00000000eeb9c53d4a202c3f7affffbe9b1590be030080be000080bf274299372742993758f484b7a657ff3da2007ebf000080bf0000403f0000803ef0b9c53d6e423d3f000000bf000000bf000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000000bd7a33c4b202c3fae01003f040000bffa2f81b90000803f230c95b89f78e0b89878e038743040b50000803f000080bf0000003f00000000ce52313e033fb13e0000003f000000bf000080be0000803f1fa78bb85636d7b84d36d738542080b50000803f000080bf0000803e0000000014a17f3e063fb13e1301003f13f981be0a0080be0000803f230c95b89f78e0b89878e038743040b50000803f000080bf0000803e0000803e1aa17f3e67d5d73ee602003f17f981be0b2381b90000803f27719eb8e8bae9b8e3bae938472000b50000803f000080bf0000003f0000803ece52313e66d5d73e0000003f000000bf000000bf0000803fb88163b80000000000000000000000000000803f000080bf00000000000000009001a73e063fb13ee000003f13f981be090000bf0000803fec677db8f3ffcbb6f3ffcb36eeba5d250000803f000080bf000000000000803e9601a73e67d5d73e1301003f13f981be0a0080be0000803f76b67538f3ffcbb6f3ffcb36a7ff56a50000803f000080bf0000803e0000803e1aa17f3e67d5d73ee000003f13f981be090000bf0000803f91995c38f3ff4bb7f3ff4b37000000000000803f000080bf000000000000803e9601a73e67d5d73e0000003f00000000000000bf0000803f76b67538f3ffcbb6f3ffcb36a7ff56a50000803f000080bf000000000000003f9201a73e15a1ff3e0000003f00000000000080be0000803fad6987380000000000000000000000000000803f000080bf0000803e0000003f17a17f3e14a1ff3ee602003f17f981be0b2381b90000803fc38590389078e0b89678e038438e37b50000803f000080bf0000003f0000803ece52313e66d5d73e1301003f13f981be0a0080be0000803fbf698738ddbae9b8e1bae938472000b50000803f000080bf0000803e0000803e1aa17f3e67d5d73e0000003f00000000000080be0000803fc38590389078e0b89678e038438e37b50000803f000080bf0000803e0000003f17a17f3e14a1ff3eae01003ff9bf6eb4fa2f81b90000803fc7a199384436d7b84d36d73846fc6eb50000803f000080bf0000003f0000003fd252313e12a1ff3eae01003ff9bf6eb4fa2f81b90000803f0a837ab8a278e0b89c78e038478e37b50000803f000080bf0000003f0000003fd252313e12a1ff3e0000003f00000000000080be0000803f510e62b85436d7b84d36d73846fc6eb50000803f000080bf0000803e0000003f17a17f3e14a1ff3eab00003fcca6413e060080be0000803f0a837ab8a278e0b89c78e038478e37b50000803f000080bf0000803e0000403f1ba17f3e49a30e3f7e02003fc4a6413e592881b90000803fe27b89b8f0bae9b8ecbae9384c2000b50000803f000080bf0000003f0000403fd152313e48a30e3f7800003fcca6413e060000bf0000803f735840b8f7ffcbb6f7ffcb367358c0240000803f000080bf000000000000403f9501a73e4aa30e3fab00003fcca6413e060080be0000803f0002ea37f7ffcbb6f7ffcb3600026aa40000803f000080bf0000803e0000403f1ba17f3e49a30e3f0000003f0000003f000000bf0000803f0002ea37f7ffcbb6f7ffcb3600026aa40000803f000080bf000000000000803f9401a73e9001273f0000003f0000003f000080be0000803f7c8209380000000000000000000000000000803f000080bf0000803e0000803f1ca17f3e8f01273f7e02003fc4a6413e592881b90000803ffe6218389678e0b89c78e0386428a0b50000803f000080bf0000003f0000403fd152313e48a30e3f0000003f0000003f000080be0000803ffe6218389678e0b89c78e0386428a0b50000803f000080bf0000803e0000803f1ca17f3e8f01273fae01003ff0ffff3efa2f81b90000803f6d4327384436d7b84e36d738542000b60000803f000080bf0000003f0000803fd652313e8e01273f0000003f000000000000003f0000803f962856b8f092d838eb92d8b815353e350000803f000080bf0000803f0000003f69d7a33c16a1ff3e7401003f6e1c2fb4f479843e0000803ffa7b89b895bdc0388fbdc0b8f87435350000803f000080bf0000403f0000003f783ec03d14a1ff3e4402003fc0a6413efb79843e0000803f962856b8f092d838eb92d8b815353e350000803f000080bf0000403f0000403f793ec03d49a30e3f7400003fcca6413e0600003f0000803f385919b84a68f0384668f0b831f546350000803f000080bf0000803f0000403f52d7a33c4aa30e3f7e02003fc4a6413e592881b90000803f724327388df25f3783f25fb7421d77b40000803f000080bf0000003f0000403fd152313e48a30e3fae01003ff0ffff3efa2f81b90000803f7043273882f25f3787f25fb7471df7330000803f000080bf0000003f0000803fd652313e8e01273f7401003ff4ffff3ef479843e0000803f6e43273877f25f378bf25fb74b1df7340000803f000080bf0000403f0000803f883ec03d8f01273f0000003f0000003f0000003f0000803f5290ba378abdc0388fbdc0b839f5c6350000803f000080bf0000803f0000803fa6d7a33c9001273f0000003f000000bf0000003f0000803f1b1587b8eb92d838e692d8b8e53715350000803f000080bf0000803f0000000045d7a33c053fb13e7401003f030000bff479843e0000803f3b719eb897bdc0388fbdc0b839f546350000803f000080bf0000403f000000006d3ec03d033fb13eac02003f16f981befc79843e0000803f1b1587b8eb92d838e692d8b8e53715350000803f000080bf0000403f0000803e6a3ec03d66d5d73edc00003f13f981be0900003f0000803ff5715fb83f68f0383c68f0b829f5c6340000803f000080bf0000803f0000803e0bd7a33c67d5d73eae01003f040000bffa2f81b90000803f2e719eb89ef25f378bf25fb74b1d77340000803f000080bf0000003f00000000ce52313e033fb13ee602003f17f981be0b2381b90000803f2f719eb896f25f3788f25fb7f55539340000803f000080bf0000003f0000803ece52313e66d5d73edc00003f13f981be0900003f0000803f40fb8238e292d838e692d8b8c5770c350000803f000080bf0000803f0000803e0bd7a33c67d5d73eac02003f16f981befc79843e0000803fdaa199383868f0383c68f0b829f5c6340000803f000080bf0000403f0000803e6a3ec03d66d5d73e7401003f6e1c2fb4f479843e0000803f40fb8238e292d838e692d8b8c5770c350000803f000080bf0000403f0000003f783ec03d14a1ff3e0000003f000000000000003f0000803f4ba958388bbdc03890bdc0b8f87435350000803f000080bf0000803f0000003f69d7a33c16a1ff3e m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -20027,7 +20051,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23960 + m_Name: pb_Mesh35260 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21130,7 +21154,7 @@ Transform: - {fileID: 1620530528} - {fileID: 788326936} m_Father: {fileID: 45957245} - m_RootOrder: 12 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1481052597 PrefabInstance: @@ -22644,11 +22668,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 45957245} + m_TransformParent: {fileID: 1173886246} m_Modifications: - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_RootOrder - value: 22 + value: 14 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalScale.x @@ -22664,15 +22688,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.x - value: -7.029276 + value: -2.9756002 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.y - value: 7.223353 + value: -0.2909999 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.z - value: -9.655918 + value: 3.5009995 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalRotation.w @@ -22706,6 +22730,10 @@ PrefabInstance: propertyPath: m_Name value: WindowUK (1) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} --- !u!4 &1627809130 stripped @@ -23617,7 +23645,7 @@ Transform: - {fileID: 815680571} - {fileID: 2061626855} m_Father: {fileID: 45957245} - m_RootOrder: 13 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1695254330 PrefabInstance: @@ -23724,7 +23752,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 45957245} - m_RootOrder: 8 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1727196003 PrefabInstance: @@ -23977,7 +24005,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1757592331 Transform: @@ -26899,7 +26927,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 2 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -26925,7 +26953,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -27266,7 +27294,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 16 + value: 14 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -29613,7 +29641,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23930 + m_Name: pb_Mesh35230 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30240,7 +30268,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2039536873 Transform: @@ -33510,7 +33538,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24512 + m_Name: pb_Mesh35812 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33565,9 +33593,9 @@ Mesh: format: 0 dimension: 2 - stream: 0 - offset: 0 + offset: 48 format: 0 - dimension: 0 + dimension: 2 - stream: 0 offset: 0 format: 0 @@ -33600,8 +33628,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 9504 - _typelessdata: 00000000000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f000000000000803e000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e000000000000803e000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803e00000000000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803e0000803e000000bf0000003f20fe3fb52b4a6db50000803f9dd77ebf3e8ec23d179528b5000080bf0000803e000000000000003f000000bf0000003f000000002b4aedb50000803f000080bf0000000000000000000080bf0000000000000000a000003f2f6e98be0600003f20fe3fb52b4a6db50000803f9dd77ebf3e8ec23d179528b5000080bf000000000000803e0000803e000080be0000003f20febfb5000000000000803f0d767bbf81f83f3eb296bcb5000080bf0000803e0000803e0000803e000080be0000003ff73821b5f73821350000803f9dd77ebf3e8ec23d27cf2fb5000080bf0000803e0000803ea000003f2f6e98be0600003ff738a1b5f738a1350000803f0d767bbf81f83f3eb396bcb5000080bf000000000000803e0000003f000000000000003ff73821b5f73821350000803f9dd77ebf3e8ec23d27cf2fb5000080bf000000000000003f0000803e000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000003f00000000000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000003f0000803e0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000403f000000000000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000403f0000803e000000000000003f58ffbfb4e88328b50000803fca457abf7c64573e799e69b4000080bf0000803e0000003f0000003f000000000000003f00000000e883a8b50000803f000080bf0000000000000000000080bf000000000000003f3800003fa3d6113e0300003f58ffbfb4e88328b50000803fca457abf7c64573e799e69b4000080bf000000000000403f0000803e0000803e0000003f58ff3fb5000000000000803f11276bbfdf60ca3eb25c30b5000080bf0000803e0000403f0000803e0000803e0000003f0d3c86b40d3c86340000803fca457abf7c64573e85779fb4000080bf0000803e0000403f3800003fa3d6113e0300003f0d3c06b50d3c06350000803f11276bbfdf60ca3eb35c30b5000080bf000000000000403f0000003f0000003f0000003f0d3c86b40d3c86340000803fca457abf7c64573e85779fb4000080bf000000000000803f0000803e0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803f000000000000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803f000000bf000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000003f000080be000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000003f000080be0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000403f000000bf0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000403f000080be0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803f000000bf0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803f000000bf000000bf0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000803f00000000000080be000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f00000000000080be000080be0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000403f0000803ee0feffbe9b1590be0300003f489a5b35489a5bb50000803f99007ebfd559ffbd1f823e35000080bf0000803f0000803e000080be000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803ee0feffbe9b1590be0300003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000803f0000803e000080be000080be0000003fb0014035000000000000803f99007ebfd559ffbd1f823e35000080bf0000403f0000803e000080be000000000000003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000403f0000003fb000003ff8ffff3ea757ee3df6c15e350000803f8bb578b4fec666bfd6e52d355a9cddbe000080bf000000000000003f0000803e0000003f0000000040fd7f350000803f00000000511668bfd3136835e411d8be000080bf0000803e0000003f0000803e0000003f0000803ef6c15e350000803f8bb578b4fec666bfd6e52d355a9cddbe000080bf0000803e0000803e6000003ffcffff3e8c55bf3ead863d350000803f8bb5f8b4287365bfcf71e534ba0ee3be000080bf000000000000803e0000803e0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803e0000003f000000000000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000003f0000003f000000000000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803e0000803e0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803e000000000000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000003f000000000000803e0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803e000000006000003ffcffff3e8c55bf3e80fe7f340000803f355dfdb40b8278bfee9dfd3377eb75be000080bf000000000000803e0000803e0000003f0000803e80feff340000803f00000000287365bfd071e534ba0ee3be000080bf0000803e0000803e0000803e0000003f0000003f80fe7f340000803f355dfdb40b8278bfee9dfd3377eb75be000080bf0000803e000000000000003f0000003f0000003f000000000000803f355d7db5000080bf0000000000000000000080bf00000000000000000000003f0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000000000803f0000803e0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803f0000803e0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803e0000403f0000003f0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf000000000000403f000000000000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803f000000000000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000003f0000403f0000003f0000003f000080be8cadae340000803f8cadae34de5579bf80bad134f42168be000080bf000000000000403f0000803e0000003f000000008cadae340000803f8cadae34de5579bf80bad134f42168be000080bf0000803e0000003fb000003ff8ffff3ea757ee3d8cad2e350000803f8cad2e35511668bfd3136835e411d8be000080bf000000000000003f000080be0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803f000080be0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000403f0000403f000000bf0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803f000000bf0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803f0000403f000000bf0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803f0000003f000080be0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000403f0000003f000080be0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803e000000bf0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803e000000bf0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803f00000000000080be0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000403f000000000000803e0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803e0000000000000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000003f000000000000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803e0000803e00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000003f0000803e0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e00000000000000000000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f000000000000003f0000003f000000bf0a3c86b40a3c8634000080bfca457abf7764573e80779f34000080bf00000000000000000000803e0000803e000000bf0a3c86b40a3c8634000080bfca457abf7764573e80779f34000080bf0000803e0000803e3a00003fa3d6113e030000bf0a3c06b50a3c0635000080bf13276bbfd960ca3eae5c3035000080bf000000000000803e3a00003fa3d6113e030000bf52ffbfb4e88328b5000080bfca457abf7964573e6f9e6934000080bf000000000000803e0000803e00000000000000bf52ffbfb4e88328b5000080bfca457abf7964573e6f9e6934000080bf0000803e0000003f0000803e0000803e000000bf52ff3fb500000000000080bf12276bbfda60ca3eae5c3035000080bf0000803e0000803e0000003f00000000000000bf00000000e883a8b5000080bf000080bf0000000000000000000080bf000000000000003f0000803e000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000403f00000000000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803f00000000000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000403f0000803e000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803f0000003f00000000000000bff23821b5f2382135000080bf9dd77ebf3b8ec23d21cf2f35000080bf000000000000003f0000803e000080be000000bff23821b5f2382135000080bf9dd77ebf3b8ec23d21cf2f35000080bf0000803e0000403fa200003f2f6e98be060000bff238a1b5f238a135000080bf0d767bbf7bf83f3eac96bc35000080bf000000000000403fa200003f2f6e98be060000bf1afe3fb52b4a6db5000080bf9dd77ebf3b8ec23d11952835000080bf000000000000403f0000803e000000bf000000bf1afe3fb52b4a6db5000080bf9dd77ebf3b8ec23d11952835000080bf0000803e0000803f0000803e000080be000000bf1afebfb500000000000080bf0d767bbf7bf83f3eac96bc35000080bf0000803e0000403f0000003f000000bf000000bf000000002b4aedb5000080bf000080bf0000000000000000000080bf000000000000803f000080be000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000403f000000bf000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803f000000bf000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000403f000080be000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803f000080be00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000003f000000bf00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000003f000080be0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803e000000bf0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803e000080be0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f00000000000000bf0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f000000000000803e000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803e0000003f000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000000000000003f000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf000000000000803e0000803e000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803e000000000000803e000000bf000000008cad2eb4000080bf8cad2eb4de5579bf80ba5134f42168be000080bf0000803e0000003f0000003f000000bf000080be8cad2eb4000080bf8cad2eb4de5579bf80ba5134f42168be000080bf000000000000803eb000003f020000bfa757ee3d8cadaeb4000080bf8cadaeb4511668bfd313e834e411d8be000080bf000000000000003f00000000000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000003f0000003f0000803e000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803e0000003f00000000000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803e00000000000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000003f000000000000803e000000bf0000803ef6c1deb4000080bf8bb5f833fec666bfd6e5ad345a9cddbe000080bf0000803e0000403fb000003f020000bfa757ee3df6c1deb4000080bf8bb5f833fec666bfd6e5ad345a9cddbe000080bf000000000000003f6000003f010000bf8c55bf3ead86bdb4000080bf8bb57834287365bfcf716534ba0ee3be000080bf000000000000403f0000803e000000bf0000000040fdffb4000080bf00000000501668bfd213e834e411d8be000080bf0000803e0000003f0000803e000000bf0000003f80feffb3000080bf355d7d340b8278bfee9d7d3377eb75be000080bf0000803e0000803f6000003f010000bf8c55bf3e80feffb3000080bf355d7d340b8278bfee9d7d3377eb75be000080bf000000000000403f0000003f000000bf0000003f00000000000080bf355dfd34000080bf0000000000000000000080bf000000000000803f0000803e000000bf0000803e80fe7fb4000080bf00000000287365bfd0716534ba0ee3be000080bf0000803e0000403f00000000000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803f0000803e000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000403f0000803e000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803f00000000000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000403f000080be000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000403f000080be000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000403f0000003f000080be000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803f000000bf000000bf0000003fb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000803f0000803f000080be000000bf0000803eb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000403f0000403f5dffffbe010000bf40c5bb3eb723f034000080bfb723f034cdf467bff3f567b4a6a1d83e000080bf0000803f0000403f5dffffbe010000bf40c5bb3ea3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000803f0000403f000080be000000bf00000000a3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000403f0000003f000080be000000bf0000803ea3008034000080bf00000000cdf467bff4f567b4a6a1d83e000080bf0000403f0000403f000000bf000000bf0000000000000000000080bfca822eb4000080bf0000000000000000000080bf0000803f0000003f000080be000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803e000080be000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000403f00000000000000bf000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803e000000bf000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803f000000008cfeffbe9c1590be44c5bb3e000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000803e0000803e000000bf000000bf0000003f000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000000000000000e0feffbe9b1590be0300003f000080bf12b22438f8959db7f3959d37732170b4000080bf000080bf000000000000803e5dffffbe010000bf40c5bb3e000080bf9309ef3754e518b850e518387a21f0b4000080bf000080bf0000803e000000005dffffbe62553fb340c5bb3e000080bf78c2dcb746b0e7b74ab0e737e5c495b4000080bf000080bf0000803e0000003f000000bf000000000000003f000080bfa9d9ffb74ee518b851e518381179b3b4000080bf000080bf000000000000003f47ffffbe9b1590bef70b5032000080bf0650e137d2966e37ce966eb716e20234000080bf000080bf0000003f0000803e000000bf000000bf00000000000080bf8796d337923a5e378d3a5eb7ca822e34000080bf000080bf0000003f000000005dffffbeffff7f3e40c5bb3e000080bf0000000050e518b850e518387a2170b4000080bf000080bf0000803e0000403f000000bf0000803e0000003f000080bf0000000050e518b850e518387a21f0b3000080bf000080bf000000000000403f000000bf0000003f0000803e000080bf50e598b750e598b750e598376484de2e000080bf000080bf0000803e0000803f000000bf0000003f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f000000bf0000003f00000000000080bf000023b78e3ade368e3adeb61644562d000080bf000080bf0000003f0000803f000000bf0000803e00000000000080bf000000008e3a5e378e3a5eb700000000000080bf000080bf0000003f0000403f000000bf0000803e000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000403f000000bf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000003f000000bf00000000000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000003f000000bf0000003f000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803f000000bf0000003f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f000000bf0000803e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000403f000000bf00000000000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000003f7affffbe9b1590be030080be000080bf566cb637fbff4b36fbff4bb6566c36a3000080bf000080bf0000403f0000803e000000bf000000bf000080be000080bf23429937000000000000000000000000000080bf000080bf0000403f00000000000000bf00000000000000bf000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000803f0000003f7affffbe9b1590be030080be000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000403f0000803e000000bf000080be000000bf000080bf000000000300863758f484b7a657ff3da2007ebf000080bf0000803f0000803e000000bf000080be000000bf000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000803f0000803e000000bf000000bf000080be000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000403f000000007affffbe9b1590be030080be000080bf274299372742993758f484b7a657ff3da2007ebf000080bf0000403f0000803e000000bf000000bf000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000000b000003f020000bfa757ee3d0000803f4c1674b8bc84feb7b484fe371b0383b40000803f000080bf0000003f000000000000003f000000bf000080be0000803f461c67b86d30f0b76330f037d4aeaeb40000803f000080bf0000803e00000000bb00003f2f6e98be070080be0000803f4c1674b8bc84feb7b484fe371b0383b40000803f000080bf0000803e0000803e8001003f316e98beb357ee3d0000803f298880b8856c06b8826c0638caae2eb40000803f000080bf0000003f0000803e0000003f000000bf000000bf0000803f943648b80000000000000000000000000000803f000080bf0000000000000000a200003f2f6e98be060000bf0000803f6aa957b8f9ff47b6f9ff47366aa957240000803f000080bf000000000000803e0000003f00000000000000bf0000803f50881238f8ff47b6f8ff4736642a37a40000803f000080bf000000000000003f0000003f00000000000080be0000803f6f071d380000000000000000000000000000803f000080bf0000803e0000003f8001003f316e98beb357ee3d0000803fa2d82538ae84feb7b384fe37f9776fb40000803f000080bf0000003f0000803eb000003fc6f1deb3a757ee3d0000803fcea92e385d30f0b76330f037952098b40000803f000080bf0000003f0000003f5300003fa3d6113e030080be0000803f762024b8ba84feb7b784fe37942018b40000803f000080bf0000803e0000403f1801003fa3d6113ead57ee3d0000803fdb8e36b8866c06b8866c0638000000000000803f000080bf0000003f0000403f3a00003fa3d6113e030000bf0000803fbe81f7b7fcff47b6fcff4736be81f7220000803f000080bf000000000000403f0000003f0000003f000000bf0000803fae284537fcff47b6fcff4736ae2845a20000803f000080bf000000000000803f0000003f0000003f000080be0000803fba1d68370000000000000000000000000000803f000080bf0000803e0000803fb000003ff8ffff3ea757ee3d0000803f166c91375c30f0b76230f037d4ae2eb50000803f000080bf0000003f0000803f0000003f000000000000003f0000803ffe6d0cb862876d385e876db81d5ddd340000803f000080bf0000803f0000003f6000003f62553fb38c55bf3e0000803ff28e36b8ed053e38e9053eb80c5dbd340000803f000080bf0000403f0000003fc800003f9fd6113e9055bf3e0000803ffe6d0cb862876d385e876db81d5ddd340000803f000080bf0000403f0000403f3800003fa3d6113e0300003f0000803f139ac4b76b848e3869848eb82d5dfd340000803f000080bf0000803f0000403f6000003ffcffff3e8c55bf3e0000803f166c913792729b3796729bb758b7f8340000803f000080bf0000403f0000803f0000003f0000003f0000003f0000803fdd9b1c37e6053e38e8053eb8355d7d350000803f000080bf0000803f0000803f0000003f000000bf0000003f0000803f286763b85a876d3855876db8df05be340000803f000080bf0000803f000000006000003f010000bf8c55bf3e0000803f318880b8f1053e38e9053eb8355dfd340000803f000080bf0000403f000000003001003f306e98be9255bf3e0000803f286763b85a876d3855876db8df05be340000803f000080bf0000403f0000803ea000003f2f6e98be0600003f0000803fefbd45b862848e3860848eb81e5d7d340000803f000080bf0000803f0000803e + m_DataSize: 11088 + _typelessdata: 00000000000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f00000000d9202c3fe13f313e0000803e000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e00000000dc202c3f84bbc53d0000803e000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803e64b93f3f91bbc53d00000000000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803e62b93f3fe73f313e0000803e000000bf0000003f20fe3fb52b4a6db50000803f9dd77ebf3e8ec23d179528b5000080bf0000803e00000000dc202c3f84bbc53d0000003f000000bf0000003f000000002b4aedb50000803f000080bf0000000000000000000080bf0000000000000000dd202c3ffbdca33ca000003f2f6e98be0600003f20fe3fb52b4a6db50000803f9dd77ebf3e8ec23d179528b5000080bf000000000000803eeefb3b3f0bd7a33c0000803e000080be0000003f20febfb5000000000000803f0d767bbf81f83f3eb296bcb5000080bf0000803e0000803e64b93f3f91bbc53d0000803e000080be0000003ff73821b5f73821350000803f9dd77ebf3e8ec23d27cf2fb5000080bf0000803e0000803e64b93f3f91bbc53da000003f2f6e98be0600003ff738a1b5f738a1350000803f0d767bbf81f83f3eb396bcb5000080bf000000000000803eeefb3b3f0bd7a33c0000003f000000000000003ff73821b5f73821350000803f9dd77ebf3e8ec23d27cf2fb5000080bf000000000000003fee51533f50dda33c0000803e000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000003fed51533f9cbbc53d00000000000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000003feb51533fed3f313e0000803e0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000403f74ea663fa6bbc53d000000000000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000403f73ea663ff03f313e0000803e000000000000003f58ffbfb4e88328b50000803fca457abf7c64573e799e69b4000080bf0000803e0000003fed51533f9cbbc53d0000003f000000000000003f00000000e883a8b50000803f000080bf0000000000000000000080bf000000000000003fee51533f50dda33c3800003fa3d6113e0300003f58ffbfb4e88328b50000803fca457abf7c64573e799e69b4000080bf000000000000403fc17b5e3f67dba33c0000803e0000803e0000003f58ff3fb5000000000000803f11276bbfdf60ca3eb25c30b5000080bf0000803e0000403f74ea663fa6bbc53d0000803e0000803e0000003f0d3c86b40d3c86340000803fca457abf7c64573e85779fb4000080bf0000803e0000403f74ea663fa6bbc53d3800003fa3d6113e0300003f0d3c06b50d3c06350000803f11276bbfdf60ca3eb35c30b5000080bf000000000000403fc17b5e3f67dba33c0000003f0000003f0000003f0d3c86b40d3c86340000803fca457abf7c64573e85779fb4000080bf000000000000803ffe827a3fabdda33c0000803e0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803e0000803ffc827a3facbbc53d000000000000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000003f0000803ffa827a3ff33f313e000000bf000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000003fe851533f1602a73e000080be000000000000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000003fe951533f0ca27f3e000080be0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000403f73ea663f0fa27f3e000000bf0000803e0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000403f72ea663f1602a73e000080be0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803ff9827a3f10a27f3e000000bf0000003f0000003f00000000000000000000803f000080bf0000000000000000000080bf0000803f0000803ff9827a3f1602a73e000000bf000000bf0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000803f00000000d4202c3f1402a73e000080be000000bf0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f00000000d6202c3f03a27f3e000080be000080be0000003f489adb34489adbb40000803f077f7fbf956c80bd5c66cd34000080bf0000403f0000803e61b93f3f09a27f3ee0feffbe9b1590be0300003f489a5b35489a5bb50000803f99007ebfd559ffbd1f823e35000080bf0000803f0000803e00433d3fbd01a73e000080be000080be0000003f00000000000000000000803f000080bf0000000000000000000080bf0000403f0000803e61b93f3f09a27f3ee0feffbe9b1590be0300003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000803f0000803e00433d3fbd01a73e000080be000080be0000003fb0014035000000000000803f99007ebfd559ffbd1f823e35000080bf0000403f0000803e61b93f3f09a27f3e000080be000000000000003fb001c0341391aa340000803f077f7fbf956c80bd1053ca34000080bf0000403f0000003fe951533f0ca27f3eb000003ff8ffff3ea757ee3df6c15e350000803f8bb578b4fec666bfd6e52d355a9cddbe000080bf000000000000003f0bd7a33c39bc553e0000803e0000003f0000000040fd7f350000803f00000000511668bfd3136835e411d8be000080bf0000803e0000003fb1bbc53d2c3f313e0000803e0000003f0000803ef6c15e350000803f8bb578b4fec666bfd6e52d355a9cddbe000080bf0000803e0000803eb8bbc53d4ca17f3e6000003ffcffff3e8c55bf3ead863d350000803f8bb5f8b4287365bfcf71e534ba0ee3be000080bf000000000000803e44daa33cff34933e0000803e0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803e0000003fb1bbc53d2c3f313e000000000000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000003f0000003ff83f313e293f313e000000000000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803efc3f313e48a17f3e0000803e0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803eb8bbc53d4ca17f3e000000000000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000003f00000000fe3f313eb501a73e0000803e0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803e00000000c3bbc53db601a73e6000003ffcffff3e8c55bf3e80fe7f340000803f355dfdb40b8278bfee9dfd3377eb75be000080bf000000000000803e44daa33cff34933e0000803e0000003f0000803e80feff340000803f00000000287365bfd071e534ba0ee3be000080bf0000803e0000803eb8bbc53d4ca17f3e0000803e0000003f0000003f80fe7f340000803f355dfdb40b8278bfee9dfd3377eb75be000080bf0000803e00000000c3bbc53db601a73e0000003f0000003f0000003f000000000000803f355d7db5000080bf0000000000000000000080bf0000000000000000fedda33cb901a73e0000003f0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000000000803f6ddda33c4ed7a33c0000803e0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803e0000803fa4bbc53d52d7a33c0000803e0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803e0000403faabbc53d12bac53d0000003f0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf000000000000403f8bdda33c1abac53d000000000000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000003f0000803ff23f313e5cd7a33c000000000000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000003f0000403ff63f313e10bac53d0000003f0000003f000080be8cadae340000803f8cadae34de5579bf80bad134f42168be000080bf000000000000403f8bdda33c1abac53d0000803e0000003f000000008cadae340000803f8cadae34de5579bf80bad134f42168be000080bf0000803e0000003fb1bbc53d2c3f313eb000003ff8ffff3ea757ee3d8cad2e350000803f8cad2e35511668bfd3136835e411d8be000080bf000000000000003f0bd7a33c39bc553e000080be0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803f0fa27f3e33d7a33c000080be0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000403f0000403f14a27f3e06bac53d000000bf0000003f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803f1602a73e0bd7a33c000000bf0000003f000080be000000000000803f00000000000080bf0000000000000000000080bf0000803f0000403f1902a73efdb9c53d000000bf0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000803f0000003f1b02a73e263f313e000080be0000003f00000000000000000000803f00000000000080bf0000000000000000000080bf0000403f0000003f17a27f3e283f313e000080be0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000403f0000803e1ba27f3e4aa17f3e000000bf0000003f0000803e000000000000803f00000000000080bf0000000000000000000080bf0000803f0000803e1f02a73e45a17f3e000000bf0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000803f000000002202a73eb901a73e000080be0000003f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000403f000000001ba27f3eb701a73e0000803e0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803e0171d83e45a17f3e0000000000000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000003f15a2ff3e263f313e000000000000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803e13a2ff3e46a17f3e0000803e00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000003f0471d83e253f313e0000803e0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e000000000071d83eb101a73e000000000000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000000010a2ff3eb201a73e0000003f0000003f000000bf0a3c86b40a3c8634000080bfca457abf7764573e80779f34000080bf0000000000000000f13fb13eb101a73e0000803e0000803e000000bf0a3c86b40a3c8634000080bfca457abf7764573e80779f34000080bf0000803e0000803e0171d83e45a17f3e3a00003fa3d6113e030000bf0a3c06b50a3c0635000080bf13276bbfd960ca3eae5c3035000080bf000000000000803ecf3fb13e6ee65d3e3a00003fa3d6113e030000bf52ffbfb4e88328b5000080bfca457abf7964573e6f9e6934000080bf000000000000803ecf3fb13e6ee65d3e0000803e00000000000000bf52ffbfb4e88328b5000080bfca457abf7964573e6f9e6934000080bf0000803e0000003f0471d83e253f313e0000803e0000803e000000bf52ff3fb500000000000080bf12276bbfda60ca3eae5c3035000080bf0000803e0000803e0171d83e45a17f3e0000003f00000000000000bf00000000e883a8b5000080bf000080bf0000000000000000000080bf000000000000003ff33fb13e243f313e0000803e000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000403f0571d83e0cbac53d00000000000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000803f18a2ff3e47d7a33c00000000000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000003f0000403f16a2ff3e11bac53d0000803e000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803e0000803f0871d83e29d7a33c0000003f00000000000000bff23821b5f2382135000080bf9dd77ebf3b8ec23d21cf2f35000080bf000000000000003ff33fb13e243f313e0000803e000080be000000bff23821b5f2382135000080bf9dd77ebf3b8ec23d21cf2f35000080bf0000803e0000403f0571d83e0cbac53da200003f2f6e98be060000bff238a1b5f238a135000080bf0d767bbf7bf83f3eac96bc35000080bf000000000000403f923fb13e47cea73da200003f2f6e98be060000bf1afe3fb52b4a6db5000080bf9dd77ebf3b8ec23d11952835000080bf000000000000403f923fb13e47cea73d0000803e000000bf000000bf1afe3fb52b4a6db5000080bf9dd77ebf3b8ec23d11952835000080bf0000803e0000803f0871d83e29d7a33c0000803e000080be000000bf1afebfb500000000000080bf0d767bbf7bf83f3eac96bc35000080bf0000803e0000403f0571d83e0cbac53d0000003f000000bf000000bf000000002b4aedb5000080bf000080bf0000000000000000000080bf000000000000803ff63fb13e0bd7a33c000080be000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000403f9369133f14bac53d000000bf000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803f1b02273f26d7a33c000000bf000080be000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000403f1c02273f13bac53d000080be000000bf000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803f9369133f3bd7a33c000080be00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000003f9369133f283f313e000000bf00000000000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000003f1b02273f273f313e000080be0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f0000803e9269133f48a17f3e000000bf0000803e000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f0000803e1c02273f47a17f3e000080be0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000403f000000009169133fb301a73e000000bf0000003f000000bf0000000000000000000080bf000080bf0000000000000000000080bf0000803f000000001c02273fb301a73e0000803e000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803e3169133f2e69133f0000003f000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000000000000000b901273fb701273f0000003f000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf000000000000803e3169133fb801273f0000803e000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803e00000000b701273f2e69133f0000803e000000bf000000008cad2eb4000080bf8cad2eb4de5579bf80ba5134f42168be000080bf0000803e0000003f53a1ff3e2e69133f0000003f000000bf000080be8cad2eb4000080bf8cad2eb4de5579bf80ba5134f42168be000080bf000000000000803e3169133fb801273fb000003f020000bfa757ee3d8cadaeb4000080bf8cadaeb4511668bfd313e834e411d8be000080bf000000000000003fcd62ed3eed01273f00000000000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000003f0000003f53a1ff3e4ba1ff3e0000803e000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000803e0000003f53a1ff3e2e69133f00000000000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803e3169133f4da1ff3e00000000000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000003f00000000b801273f4fa1ff3e0000803e000000bf0000803ef6c1deb4000080bf8bb5f833fec666bfd6e5ad345a9cddbe000080bf0000803e0000403f4370d83e2e69133fb000003f020000bfa757ee3df6c1deb4000080bf8bb5f833fec666bfd6e5ad345a9cddbe000080bf000000000000003fcd62ed3eed01273f6000003f010000bf8c55bf3ead86bdb4000080bf8bb57834287365bfcf716534ba0ee3be000080bf000000000000403fe90bc53ed301273f0000803e000000bf0000000040fdffb4000080bf00000000501668bfd213e834e411d8be000080bf0000803e0000003f53a1ff3e2e69133f0000803e000000bf0000003f80feffb3000080bf355d7d340b8278bfee9d7d3377eb75be000080bf0000803e0000803f313fb13e2c69133f6000003f010000bf8c55bf3e80feffb3000080bf355d7d340b8278bfee9d7d3377eb75be000080bf000000000000403fe90bc53ed301273f0000003f000000bf0000003f00000000000080bf355dfd34000080bf0000000000000000000080bf000000000000803f2f3fb13eb601273f0000803e000000bf0000803e80fe7fb4000080bf00000000287365bfd0716534ba0ee3be000080bf0000803e0000403f4370d83e2e69133f00000000000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000803f333fb13e48a1ff3e0000803e000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000403f4370d83e2e69133f0000803e000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000803e0000803f313fb13e2c69133f00000000000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000003f0000403f4370d83e4aa1ff3e000080be000000bf0000803e00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000403f4370d83e3870d83e000080be000000bf0000000000000000000080bf00000000000080bf0000000000000000000080bf0000403f0000003f55a1ff3e3b70d83e000080be000000bf0000003f00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803f333fb13e3870d83e000000bf000000bf0000003fb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000803f0000803f313fb13e293fb13e000080be000000bf0000803eb7237034000080bfb7237034934b79bf274033b496d2683e000080bf0000403f0000403f4370d83e3870d83e5dffffbe010000bf40c5bb3eb723f034000080bfb723f034cdf467bff3f567b4a6a1d83e000080bf0000803f0000403f3f23c63e583fb13e5dffffbe010000bf40c5bb3ea3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000803f0000403f3f23c63e583fb13e000080be000000bf00000000a3000034000080bfca82aeb3934b79bf2b7d10b496d2683e000080bf0000403f0000003f55a1ff3e3b70d83e000080be000000bf0000803ea3008034000080bf00000000cdf467bff4f567b4a6a1d83e000080bf0000403f0000403f4370d83e3870d83e000000bf000000bf0000000000000000000080bfca822eb4000080bf0000000000000000000080bf0000803f0000003f55a1ff3e293fb13e000080be000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000403f0000803e3169133f3c70d83e000080be000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000403f00000000b801273f3e70d83e000000bf000000bf000080be00000000000080bf00000000000080bf0000000000000000000080bf0000803f0000803e3169133f293fb13e000000bf000000bf000000bf00000000000080bf00000000000080bf0000000000000000000080bf0000803f00000000b901273f2b3fb13e8cfeffbe9c1590be44c5bb3e000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000803e0000803ea91d923e98423d3f000000bf000000bf0000003f000080bf6e1b0e3850b0e7b74ab0e7371919b4b4000080bf000080bf0000000000000000b601a73e6f202c3fe0feffbe9b1590be0300003f000080bf12b22438f8959db7f3959d37732170b4000080bf000080bf000000000000803eb601a73e98423d3f5dffffbe010000bf40c5bb3e000080bf9309ef3754e518b850e518387a21f0b4000080bf000080bf0000803e00000000a91d923e6f202c3f5dffffbe62553fb340c5bb3e000080bf78c2dcb746b0e7b74ab0e737e5c495b4000080bf000080bf0000803e0000003fa71d923e7f51533f000000bf000000000000003f000080bfa9d9ffb74ee518b851e518381179b3b4000080bf000080bf000000000000003fb401a73e7f51533f47ffffbe9b1590bef70b5032000080bf0650e137d2966e37ce966eb716e20234000080bf000080bf0000003f0000803e2d3f313e98423d3f000000bf000000bf00000000000080bf8796d337923a5e378d3a5eb7ca822e34000080bf000080bf0000003f000000002f3f313e6f202c3f5dffffbeffff7f3e40c5bb3e000080bf0000000050e518b850e518387a2170b4000080bf000080bf0000803e0000403fa51d923e08ea663f000000bf0000803e0000003f000080bf0000000050e518b850e518387a21f0b3000080bf000080bf000000000000403fb301a73e08ea663f000000bf0000003f0000803e000080bf50e598b750e598b750e598376484de2e000080bf000080bf0000803e0000803f4ba17f3e8f827a3f000000bf0000003f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fb601a73e8e827a3f000000bf0000003f00000000000080bf000023b78e3ade368e3adeb61644562d000080bf000080bf0000003f0000803f2d3f313e90827a3f000000bf0000803e00000000000080bf000000008e3a5e378e3a5eb700000000000080bf000080bf0000003f0000403f2a3f313e09ea663f000000bf0000803e000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000403f10bac53d09ea663f000000bf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000003f0000003f2e3f313e8151533f000000bf00000000000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000003f0fbac53d8151533f000000bf0000003f000080be000080bf00000000000000000000000000000000000080bf000080bf0000403f0000803f10bac53d91827a3f000000bf0000003f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0bd7a33c91827a3f000000bf0000803e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000403f30d7a33c09ea663f000000bf00000000000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000003f52d7a33c8151533f7affffbe9b1590be030080be000080bf566cb637fbff4b36fbff4bb6566c36a3000080bf000080bf0000403f0000803e14bac53d98423d3f000000bf000000bf000080be000080bf23429937000000000000000000000000000080bf000080bf0000403f0000000016bac53d6f202c3f000000bf00000000000000bf000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000803f0000003f52d7a33c8151533f7affffbe9b1590be030080be000080bf2b15eeb60300063772330db7066c803d087f7fbf000080bf0000403f0000803e14bac53d98423d3f000000bf000080be000000bf000080bf000000000300863758f484b7a657ff3da2007ebf000080bf0000803f0000803e47d7a33cf9b83f3f000000bf000080be000000bf000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000803f0000803e47d7a33cf9b83f3f000000bf000000bf000080be000080bf2742193727421937b9580fb7066c803d087f7fbf000080bf0000403f0000000016bac53d6f202c3f7affffbe9b1590be030080be000080bf274299372742993758f484b7a657ff3da2007ebf000080bf0000403f0000803e14bac53d98423d3f000000bf000000bf000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000000042d7a33c70202c3fb000003f020000bfa757ee3d0000803f4c1674b8bc84feb7b484fe371b0383b40000803f000080bf0000003f000000001fc20c3e2b3fb13e0000003f000000bf000080be0000803f461c67b86d30f0b76330f037d4aeaeb40000803f000080bf0000803e000000004aa17f3e2a3fb13ebb00003f2f6e98be070080be0000803f4c1674b8bc84feb7b484fe371b0383b40000803f000080bf0000803e0000803e50a17f3e4bf5d03e8001003f316e98beb357ee3d0000803f298880b8856c06b8826c0638caae2eb40000803f000080bf0000003f0000803e1fc20c3e4bf5d03e0000003f000000bf000000bf0000803f943648b80000000000000000000000000000803f000080bf0000000000000000b501a73e293fb13ea200003f2f6e98be060000bf0000803f6aa957b8f9ff47b6f9ff47366aa957240000803f000080bf000000000000803eb901a73e4bf5d03e0000003f00000000000000bf0000803f50881238f8ff47b6f8ff4736642a37a40000803f000080bf000000000000003fb901a73e4aa1ff3e0000003f00000000000080be0000803f6f071d380000000000000000000000000000803f000080bf0000803e0000003f50a17f3e4aa1ff3e8001003f316e98beb357ee3d0000803fa2d82538ae84feb7b384fe37f9776fb40000803f000080bf0000003f0000803e1fc20c3e4bf5d03eb000003fc6f1deb3a757ee3d0000803fcea92e385d30f0b76330f037952098b40000803f000080bf0000003f0000003f26c20c3e4ba1ff3e5300003fa3d6113e030080be0000803f762024b8ba84feb7b784fe37942018b40000803f000080bf0000803e0000403f53a17f3e78fa0a3f1801003fa3d6113ead57ee3d0000803fdb8e36b8866c06b8866c0638000000000000803f000080bf0000003f0000403f26c20c3e79fa0a3f3a00003fa3d6113e030000bf0000803fbe81f7b7fcff47b6fcff4736be81f7220000803f000080bf000000000000403fbb01a73e78fa0a3f0000003f0000003f000000bf0000803fae284537fcff47b6fcff4736ae2845a20000803f000080bf000000000000803fbe01a73eb401273f0000003f0000003f000080be0000803fba1d68370000000000000000000000000000803f000080bf0000803e0000803f5aa17f3eb401273fb000003ff8ffff3ea757ee3d0000803f166c91375c30f0b76230f037d4ae2eb50000803f000080bf0000003f0000803f30c20c3eb501273f0000003f000000000000003f0000803ffe6d0cb862876d385e876db81d5ddd340000803f000080bf0000803f0000003f43d7a33c4da1ff3e6000003f62553fb38c55bf3e0000803ff28e36b8ed053e38e9053eb80c5dbd340000803f000080bf0000403f0000003f7051703d4ca1ff3ec800003f9fd6113e9055bf3e0000803ffe6d0cb862876d385e876db81d5ddd340000803f000080bf0000403f0000403f7151703d7afa0a3f3800003fa3d6113e0300003f0000803f139ac4b76b848e3869848eb82d5dfd340000803f000080bf0000803f0000403f34d7a33c79fa0a3f6000003ffcffff3e8c55bf3e0000803f166c913792729b3796729bb758b7f8340000803f000080bf0000403f0000803f9f51703db701273f0000003f0000003f0000003f0000803fdd9b1c37e6053e38e8053eb8355d7d350000803f000080bf0000803f0000803f9bd7a33cb701273f0000003f000000bf0000003f0000803f286763b85a876d3855876db8df05be340000803f000080bf0000803f0000000028d7a33c2b3fb13e6000003f010000bf8c55bf3e0000803f318880b8f1053e38e9053eb8355dfd340000803f000080bf0000403f000000006251703d2c3fb13e3001003f306e98be9255bf3e0000803f286763b85a876d3855876db8df05be340000803f000080bf0000403f0000803e6051703d4bf5d03ea000003f2f6e98be0600003f0000803fefbd45b862848e3860848eb81e5d7d340000803f000080bf0000803f0000803e0bd7a33c4bf5d03e m_CompressedMesh: m_Vertices: m_NumItems: 0 diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 5d6aa6d..abb7348 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -98,6 +98,11 @@ "key": "log.path", "value": "{\"m_Value\":\"ProBuilderLog.txt\"}" }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.materialPalettePath", + "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Material Palette.asset\"}" + }, { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "about.identifier", @@ -126,7 +131,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.lastMeshSelectMode", - "value": "{\"m_Value\":4}" + "value": "{\"m_Value\":8}" }, { "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -187,6 +192,11 @@ "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastRotation", "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}" + }, + { + "type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.extrudeMethod", + "value": "{\"m_Value\":2}" } ] } From d8197683bd8ea4365374d88c06329cb53e4eda52 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 15:15:04 +0100 Subject: [PATCH 4/9] fix wall placement --- Assets/Scenes/FabLab/FabLab.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 924a2f0..0632cc2 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -16452,7 +16452,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915677069} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.032, y: -0.003, z: -0.001} + m_LocalPosition: {x: 6.015, y: -0.003, z: -0.001} m_LocalScale: {x: 0.038434, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] @@ -16492,7 +16492,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: dc56e50f367c1ca43a1562b07d1cbfc5, type: 2} + - {fileID: 2100000, guid: a5290ed10ae30ac4985f699c2e7a149c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24015,7 +24015,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757592330} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523} - m_LocalPosition: {x: -6.082, y: -0.0029997826, z: -0} + m_LocalPosition: {x: -6.046, y: -0.0029997826, z: -0} m_LocalScale: {x: 0.12212861, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] @@ -26914,7 +26914,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: dc56e50f367c1ca43a1562b07d1cbfc5, type: 2} + - {fileID: 2100000, guid: a5290ed10ae30ac4985f699c2e7a149c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 From 5657cc14d57b188cf7bb77e1d7d735896fb1caa6 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 15:25:26 +0100 Subject: [PATCH 5/9] fix fablab floor --- Assets/Scenes/FabLab/FabLab.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 0632cc2..04866e6 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -14716,7 +14716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalPosition.x - value: -6.0029993 + value: -5.934 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} propertyPath: m_LocalPosition.y @@ -24015,7 +24015,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757592330} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523} - m_LocalPosition: {x: -6.046, y: -0.0029997826, z: -0} + m_LocalPosition: {x: -6.057, y: -0.0029997826, z: -0} m_LocalScale: {x: 0.12212861, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] From a458ca5f574b9f19f968b9556f7073293c68843a Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 15:58:22 +0100 Subject: [PATCH 6/9] Fix pivot points for furniture --- Assets/Models/IndoorPlant01.prefab | 7 ++++--- Assets/Models/IndoorPlant02.prefab | 3 ++- Assets/Models/Simple table.prefab | 8 ++++++-- Assets/Models/computer.prefab | 4 ++-- Assets/Models/smarttv.prefab | 2 +- Assets/Models/table double.prefab | 8 ++++---- Assets/Scenes/FabLab/FabLab.unity | 32 +++++++++++++++--------------- Assets/Scripts/FurnitureMover.cs | 15 +++++--------- Assets/Scripts/MovableFurniture.cs | 21 ++++++++++++++++---- 9 files changed, 57 insertions(+), 43 deletions(-) diff --git a/Assets/Models/IndoorPlant01.prefab b/Assets/Models/IndoorPlant01.prefab index c85e710..ef3c8be 100644 --- a/Assets/Models/IndoorPlant01.prefab +++ b/Assets/Models/IndoorPlant01.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 999207089627997314} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0.039, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -122,7 +122,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5022219494863929666} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.2239313, y: 1.046101, z: -0.024066806} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -146,6 +146,7 @@ MonoBehaviour: combinedBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &8294151951189356629 GameObject: m_ObjectHideFlags: 0 @@ -173,7 +174,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8294151951189356629} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0.039, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Models/IndoorPlant02.prefab b/Assets/Models/IndoorPlant02.prefab index 318f978..fce21d9 100644 --- a/Assets/Models/IndoorPlant02.prefab +++ b/Assets/Models/IndoorPlant02.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6502689968648656832} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.9697971, y: 1.0193512, z: -1.9544978} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: @@ -48,6 +48,7 @@ MonoBehaviour: combinedBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &743310008199716879 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Models/Simple table.prefab b/Assets/Models/Simple table.prefab index 10cbefa..3d9b1a7 100644 --- a/Assets/Models/Simple table.prefab +++ b/Assets/Models/Simple table.prefab @@ -72,8 +72,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2048859290140646716} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.0600014, y: 6.87, z: -3.75} - m_LocalScale: {x: 1, y: 0.94424, z: 1} + m_LocalPosition: {x: 5.0600014, y: 6.87, z: -3.9438} + m_LocalScale: {x: 1, y: 0.94424, z: 1.0554} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3674349604157782260} @@ -189,6 +189,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} m_Name: m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &6146061087085142095 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Models/computer.prefab b/Assets/Models/computer.prefab index 9690ac4..f1647e9 100644 --- a/Assets/Models/computer.prefab +++ b/Assets/Models/computer.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4699182198977620406} m_LocalRotation: {x: -0, y: -0, z: 0.70710576, w: 0.70710784} - m_LocalPosition: {x: -0.51733893, y: 1.621, z: -1.4194237} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -58,7 +58,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5078885061494400643} m_LocalRotation: {x: -0.00000005960465, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.62495, z: -0.25492} + m_LocalPosition: {x: 0.168, y: 0.113, z: -0.229} m_LocalScale: {x: -0.16656025, y: -0.16656025, z: -0.16656025} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Models/smarttv.prefab b/Assets/Models/smarttv.prefab index f58dd56..6e21529 100644 --- a/Assets/Models/smarttv.prefab +++ b/Assets/Models/smarttv.prefab @@ -86,7 +86,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1.36 objectReference: {fileID: 0} - target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Models/table double.prefab b/Assets/Models/table double.prefab index 4e22fc7..48cbc90 100644 --- a/Assets/Models/table double.prefab +++ b/Assets/Models/table double.prefab @@ -24,14 +24,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726151543146820464} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 2.6100001, y: 1.8444445, z: -0.12111112} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.11111112, y: 0.11111112, z: 0.11111112} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 726151543547972459} - {fileID: 726151544272545065} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &726151543547972456 GameObject: @@ -59,7 +59,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726151543547972456} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 2.73, y: 7.08, z: -3.48} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -142,7 +142,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726151544272545062} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 2.73, y: 7.08, z: -3.48} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 04866e6..2aa8462 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2392,26 +2392,26 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1705480523} + - {fileID: 808552922} - {fileID: 1329833008} - {fileID: 260182308} - {fileID: 765875807} - {fileID: 1290121936} - {fileID: 1527984575637916538} - - {fileID: 1705480523} - - {fileID: 808552922} - {fileID: 146814758} - {fileID: 896101879} - {fileID: 1455652491} - {fileID: 1672585692} - {fileID: 435302310} + - {fileID: 336078038} + - {fileID: 1173886246} - {fileID: 1821824934} - {fileID: 293073269} - {fileID: 1782748918} - - {fileID: 336078038} - {fileID: 60326086} - {fileID: 670219875} - {fileID: 373875250} - - {fileID: 1173886246} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6516,7 +6516,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.123 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -6912,7 +6912,7 @@ Transform: m_Children: - {fileID: 936418819} m_Father: {fileID: 45957245} - m_RootOrder: 15 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &360260901 PrefabInstance: @@ -11842,7 +11842,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.119 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -13405,7 +13405,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.12299919 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -15012,7 +15012,7 @@ Transform: - {fileID: 2128333932} - {fileID: 197140882} m_Father: {fileID: 45957245} - m_RootOrder: 6 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &815680570 PrefabInstance: @@ -15114,7 +15114,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.11899948 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -16555,7 +16555,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.11899948 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -17592,7 +17592,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.12299919 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -18672,7 +18672,7 @@ Transform: - {fileID: 804182423} - {fileID: 1043384080} m_Father: {fileID: 45957245} - m_RootOrder: 19 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -23752,7 +23752,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 45957245} - m_RootOrder: 5 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1727196003 PrefabInstance: @@ -23787,7 +23787,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.11899948 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -28128,7 +28128,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.04261017 + value: 0.12299919 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/FurnitureMover.cs b/Assets/Scripts/FurnitureMover.cs index 7135b6e..fb0dec1 100644 --- a/Assets/Scripts/FurnitureMover.cs +++ b/Assets/Scripts/FurnitureMover.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; using UnityEngine; -using UnityEngine.EventSystems; using Valve.VR; using Valve.VR.Extras; using Valve.VR.InteractionSystem; @@ -85,7 +83,7 @@ public class FurnitureMover : MonoBehaviour { Grabbing.SnapTo(SnapHit.point, AutoPlacementEnvironmentMask, transform.forward); } - + if (previousContact && previousContact != hit.transform) { PointerEventArgs args = new PointerEventArgs(); @@ -145,12 +143,9 @@ public class FurnitureMover : MonoBehaviour } pointer.transform.localPosition = new Vector3(0f, 0f, dist / 2f); - - - - if(Grabbing != null && snapLeftAction != null && snapRightAction != null && snapLeftAction.activeBinding && snapRightAction.activeBinding) + //Rotate Logic + if (Grabbing != null && snapLeftAction != null && snapRightAction != null && snapLeftAction.activeBinding && snapRightAction.activeBinding) { - bool leftHandTurnLeft = snapLeftAction.GetStateDown(hand.handType); bool rightHandTurnLeft = snapLeftAction.GetStateDown(hand.otherHand.handType); @@ -198,7 +193,7 @@ public class FurnitureMover : MonoBehaviour GrabFurniture(Grabbing.gameObject); /*Grabbing.transform.SetParent(this.transform);*/ } - + public void SetGrabbing(MovableFurniture furniture) { Grabbing = furniture; @@ -234,13 +229,13 @@ public class FurnitureMover : MonoBehaviour private void OnPointerIn(object sender, PointerEventArgs e) { + if (Grabbing != null) return; MovableFurniturePart pointerEnterHandler = e.target.GetComponent(); if (pointerEnterHandler == null) { return; } - pointerEnterHandler.OnPointerEnter(); } } \ No newline at end of file diff --git a/Assets/Scripts/MovableFurniture.cs b/Assets/Scripts/MovableFurniture.cs index 9305035..d541f70 100644 --- a/Assets/Scripts/MovableFurniture.cs +++ b/Assets/Scripts/MovableFurniture.cs @@ -96,6 +96,9 @@ public class MovableFurniture : Furniture { Vector3 previousPosition = transform.position; Vector3 offset = Vector3.zero; + + transform.position = position; + return; if (wallMount) { transform.position = position; @@ -149,21 +152,31 @@ public class MovableFurniture : Furniture void OnDrawGizmos() { // Draw a yellow sphere at the transform's position - Gizmos.color = Color.red; + /*Gizmos.color = Color.red; Gizmos.DrawWireCube(transform.position - centerOffset, combinedBounds.size); - Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0, 0, combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z))); + Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0, 0, combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z)));*/ } private void OnDisable() { - if(outlines != null && outlines.Count > 0) + if (outlines != null && outlines.Count > 0) { foreach (ObjectOutline outline in outlines) { outline.enabled = false; } } - + + } + + private void OnCollisionEnter(Collision collision) + { + Debug.Log("collisionEnter"); + } + + private void OnCollisionExit(Collision collision) + { + Debug.Log("collisionExit"); } } From 4f64ca28fdcef0e08bf14a0c5302db2c14c3404a Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Mon, 23 Jan 2023 16:59:00 +0100 Subject: [PATCH 7/9] Fix prefab pivot and advancing on furnitureMover --- Assets/Models/Simple table.prefab | 63 +++++++++++++++++++++++++ Assets/Models/chair.prefab | 65 ++++++++++++++++++++++++++ Assets/Models/shelf_empty.prefab | 64 +++++++++++++++++++++++++ Assets/Models/smarttv.prefab | 46 ++++++++++++++++++ Assets/Scenes/FabLab/FabLab.unity | 31 +++++++++++- Assets/Scripts/FurnitureMover.cs | 5 ++ Assets/Scripts/MovableFurniture.cs | 42 +++++++++++++---- Assets/Scripts/MovableFurniturePart.cs | 22 +++++++-- ProjectSettings/DynamicsManager.asset | 2 +- ProjectSettings/TagManager.asset | 3 +- 10 files changed, 326 insertions(+), 17 deletions(-) diff --git a/Assets/Models/Simple table.prefab b/Assets/Models/Simple table.prefab index 3d9b1a7..e22e91e 100644 --- a/Assets/Models/Simple table.prefab +++ b/Assets/Models/Simple table.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &392586589562003607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6114432350300135443} + - component: {fileID: 8817835740557246532} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6114432350300135443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392586589562003607} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3674349604157782260} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8817835740557246532 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392586589562003607} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 12.237078, y: 6.518132, z: 9.380431} + m_Center: {x: 0.1100985, y: 3.444804, z: -0.26158008} --- !u!1 &1253093426770874476 GameObject: m_ObjectHideFlags: 0 @@ -152,6 +197,7 @@ GameObject: m_Component: - component: {fileID: 3674349604157782260} - component: {fileID: 7152506842566364840} + - component: {fileID: 5516512649396120673} m_Layer: 0 m_Name: Simple table m_TagString: Untagged @@ -174,6 +220,7 @@ Transform: - {fileID: 7846351332623750186} - {fileID: 705425444331171642} - {fileID: 5160726694365660193} + - {fileID: 6114432350300135443} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -193,6 +240,22 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} wallMount: 0 +--- !u!54 &5516512649396120673 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158574887593288270} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &6146061087085142095 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Models/chair.prefab b/Assets/Models/chair.prefab index b3f14c2..795761b 100644 --- a/Assets/Models/chair.prefab +++ b/Assets/Models/chair.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3884115040606308642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6821231163936271320} + - component: {fileID: 6695299937866651750} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6821231163936271320 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884115040606308642} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5262755222010251265} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6695299937866651750 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884115040606308642} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4.568707, y: 7.746119, z: 5.480494} + m_Center: {x: -0.1474282, y: 4.3566036, z: -0.06824057} --- !u!1 &8231086993610971755 GameObject: m_ObjectHideFlags: 0 @@ -278,6 +323,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} m_Name: m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 +--- !u!54 &5577736131529907943 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4774624094512517819} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!4 &5035235579416466379 stripped Transform: m_CorrespondingSourceObject: {fileID: 820629935725706273, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} diff --git a/Assets/Models/shelf_empty.prefab b/Assets/Models/shelf_empty.prefab index d1ffb3d..361f2a8 100644 --- a/Assets/Models/shelf_empty.prefab +++ b/Assets/Models/shelf_empty.prefab @@ -260,6 +260,7 @@ GameObject: - component: {fileID: 2996515769384266075} - component: {fileID: 2709258200819239477} - component: {fileID: 6645681851711596344} + - component: {fileID: 1547886741423616364} m_Layer: 0 m_Name: shelf_empty m_TagString: Untagged @@ -288,6 +289,7 @@ Transform: - {fileID: 1696234186987782576} - {fileID: 2781697966167280641} - {fileID: 5613503160827514234} + - {fileID: 5878205338461874499} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} @@ -306,6 +308,7 @@ MonoBehaviour: combinedBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!65 &6645681851711596344 BoxCollider: m_ObjectHideFlags: 0 @@ -319,6 +322,22 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.017374, y: 1.4093293, z: 4.320848} m_Center: {x: -0.0065603256, y: 0.012041539, z: 2.1498158} +--- !u!54 &1547886741423616364 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2512467202128557025} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &2602268122132683364 GameObject: m_ObjectHideFlags: 0 @@ -568,6 +587,51 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4588887904168053738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5878205338461874499} + - component: {fileID: 9184669346505142783} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5878205338461874499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4588887904168053738} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2996515769384266075} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9184669346505142783 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4588887904168053738} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.9363493, y: 1.3597183, z: 4.2336807} + m_Center: {x: -0.016334474, y: 0.029815674, z: 2.1933994} --- !u!1 &4983300697117577925 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Models/smarttv.prefab b/Assets/Models/smarttv.prefab index 6e21529..a24142a 100644 --- a/Assets/Models/smarttv.prefab +++ b/Assets/Models/smarttv.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &451019611259114879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2833408188615038500} + - component: {fileID: 777966934955362417} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2833408188615038500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451019611259114879} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 589337997038399236} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &777966934955362417 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451019611259114879} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 40.602814, y: 20.834862, z: 1.929568} + m_Center: {x: 0.19675513, y: 8.908121, z: -1.2512306} --- !u!1 &2835658414891243653 GameObject: m_ObjectHideFlags: 0 @@ -30,6 +75,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6063464173187445548} + - {fileID: 2833408188615038500} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 2aa8462..d625510 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -14688,6 +14688,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 90 objectReference: {fileID: 0} + - target: {fileID: 9082827438125951081, guid: ab468a82ad445da4e9a084297505261f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.009 + objectReference: {fileID: 0} + - target: {fileID: 9082827438125951081, guid: ab468a82ad445da4e9a084297505261f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab468a82ad445da4e9a084297505261f, type: 3} --- !u!4 &802860442 stripped @@ -22509,6 +22517,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7304097665698855045, guid: 7520016a817d68f4685d157d457ebed1, type: 3} m_PrefabInstance: {fileID: 1569982188} m_PrefabAsset: {fileID: 0} +--- !u!1 &1573644873 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2835658414891243653, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} + m_PrefabInstance: {fileID: 1989420947} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1582617698 PrefabInstance: m_ObjectHideFlags: 0 @@ -28197,7 +28210,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1888977163} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.077, y: -0.821, z: 1.791} + m_LocalPosition: {x: 0.077, y: -0.821, z: 1.691} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -30181,6 +30194,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} m_PrefabInstance: {fileID: 1989420947} m_PrefabAsset: {fileID: 0} +--- !u!54 &1989420950 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573644873} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &2030655353 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FurnitureMover.cs b/Assets/Scripts/FurnitureMover.cs index fb0dec1..fe5ea23 100644 --- a/Assets/Scripts/FurnitureMover.cs +++ b/Assets/Scripts/FurnitureMover.cs @@ -77,6 +77,11 @@ public class FurnitureMover : MonoBehaviour Ray SnapRaycast = new Ray(transform.position, transform.forward); RaycastHit SnapHit; + //TODO Check if object is on walls + if (Grabbing.wallMount) + { + + } bool SnapbHit = Physics.Raycast(SnapRaycast, out SnapHit, 100f, AutoPlacementEnvironmentMask); if (SnapbHit && Grabbing != null) diff --git a/Assets/Scripts/MovableFurniture.cs b/Assets/Scripts/MovableFurniture.cs index d541f70..c470e95 100644 --- a/Assets/Scripts/MovableFurniture.cs +++ b/Assets/Scripts/MovableFurniture.cs @@ -8,6 +8,7 @@ public class MovableFurniture : Furniture private Rigidbody _rigidbody; public bool wallMount; + private bool isColliding = false; // Start is called before the first frame update new void Start() { @@ -22,7 +23,7 @@ public class MovableFurniture : Furniture var outline = child.gameObject.AddComponent(); if (!outline) continue; outlines.Add(outline); - outline.OutlineMode = ObjectOutline.Mode.OutlineAll; + outline.OutlineMode = ObjectOutline.Mode.OutlineVisible; outline.OutlineColor = Color.yellow; outline.OutlineWidth = 5f; outline.enabled = false; @@ -59,7 +60,7 @@ public class MovableFurniture : Furniture /*child.OutlineMode = ObjectOutline.Mode.OutlineAll; child.OutlineColor = Color.yellow; child.OutlineWidth = 5f;*/ - outline.enabled = true; + //outline.enabled = true; } } @@ -67,7 +68,7 @@ public class MovableFurniture : Furniture { foreach (ObjectOutline outline in outlines) { - outline.enabled = false; + //outline.enabled = false; } } @@ -96,7 +97,7 @@ public class MovableFurniture : Furniture { Vector3 previousPosition = transform.position; Vector3 offset = Vector3.zero; - + //if (isColliding) { return; } transform.position = position; return; if (wallMount) @@ -166,17 +167,40 @@ public class MovableFurniture : Furniture outline.enabled = false; } } - } - private void OnCollisionEnter(Collision collision) + + //Check if collision before moving an object + public void OnFurnitureCollisionEnter(Collider other) { - Debug.Log("collisionEnter"); + /*foreach (ObjectOutline outline in outlines) + { + outline.OutlineColor = Color.red; + outline.enabled = true; + } + isColliding = true;*/ } - private void OnCollisionExit(Collision collision) + public void OnFurnitureCollisionStay(Collider other) { - Debug.Log("collisionExit"); + //isColliding = true; } + public void OnFurnitureCollisionExit(Collider other) + { + //Run CheckFurnitureCollisions on next FixedUpdate loop. If no object is truly colliding, isColliding should be false inside CheckFurnitureCollisions + /*Invoke("CheckFurnitureCollisions", Time.fixedTime * 2); + isColliding = false;*/ + } + private void CheckFurnitureCollisions() + { + if (isColliding == true) return; + + foreach (ObjectOutline outline in outlines) + { + outline.OutlineColor = Color.yellow; + outline.enabled = false; + } + + } } diff --git a/Assets/Scripts/MovableFurniturePart.cs b/Assets/Scripts/MovableFurniturePart.cs index 761caf4..9c77937 100644 --- a/Assets/Scripts/MovableFurniturePart.cs +++ b/Assets/Scripts/MovableFurniturePart.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; -using UnityEngine.UI; public class MovableFurniturePart : MonoBehaviour { @@ -9,13 +6,13 @@ public class MovableFurniturePart : MonoBehaviour // Start is called before the first frame update void Start() { - + } // Update is called once per frame void Update() { - + } public void OnPointerClickDown() @@ -32,4 +29,19 @@ public class MovableFurniturePart : MonoBehaviour { parent.OnPointerExit(); } + + private void OnTriggerEnter(Collider other) + { + parent.OnFurnitureCollisionEnter(other); + } + + private void OnTriggerExit(Collider other) + { + parent.OnFurnitureCollisionExit(other); + } + + private void OnTriggerStay(Collider other) + { + parent.OnFurnitureCollisionStay(other); + } } diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index d617878..47f6a77 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: 7fffffff7fffffff7fffffffffffffff7fffffff7fffffff7fffffff88ffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff + m_LayerCollisionMatrix: 7ffdffff7ffdffff7ffdffffffffffff7ffdffff7ffdffff7ffdffff88fdff7fffffffff08ffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffdffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a5cc549..d5f28ab 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - SamplesInfoPanel - projectile - FxTemporaire + - FurnitureTrigger layers: - Default - TransparentFX @@ -17,7 +18,7 @@ TagManager: - Static Lighting - Teleport Area - Environment - - + - FurnitureTrigger - - - From af8a034898a0097eb3da5288e3f3d40ade957a8b Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Tue, 24 Jan 2023 09:32:07 +0100 Subject: [PATCH 8/9] Fix wall gap --- Assets/Scenes/FabLab/FabLab.unity | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index d625510..90f77a3 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -6325,7 +6325,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35080 + m_Name: pb_Mesh24354 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11189,7 +11189,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35706 + m_Name: pb_Mesh24982 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11353,7 +11353,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35658 + m_Name: pb_Mesh24934 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16461,7 +16461,7 @@ Transform: m_GameObject: {fileID: 915677069} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6.015, y: -0.003, z: -0.001} - m_LocalScale: {x: 0.038434, y: 4.022701, z: 7.1114306} + m_LocalScale: {x: 0.12749757, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -16629,7 +16629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.x - value: 1.5843244 + value: 1.505 objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.y @@ -17737,7 +17737,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35788 + m_Name: pb_Mesh25064 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19587,7 +19587,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35310 + m_Name: pb_Mesh24584 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19751,7 +19751,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35112 + m_Name: pb_Mesh24386 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20059,7 +20059,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35260 + m_Name: pb_Mesh24534 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29654,7 +29654,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35230 + m_Name: pb_Mesh24504 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30308,7 +30308,7 @@ Transform: m_GameObject: {fileID: 2039536872} m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071069} m_LocalPosition: {x: -0.044, y: -0.0029997826, z: 3.534} - m_LocalScale: {x: 0.038434, y: 4.022701, z: 12.063211} + m_LocalScale: {x: 0.038434, y: 4.022701, z: 12.070528} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -33567,7 +33567,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh35812 + m_Name: pb_Mesh25090 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 From a37b60f5a56cdfc5cd8623d18cf513e850f81884 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Tue, 24 Jan 2023 15:46:04 +0100 Subject: [PATCH 9/9] Catalog & Grab working --- Assets/Models/Simple table.prefab | 17 --- Assets/Models/chair.prefab | 16 -- Assets/Models/shelf_empty.prefab | 17 --- Assets/Scenes/FabLab/FabLab.unity | 235 ++++++++++++----------------- Assets/Scripts/Catalog.cs | 74 +++++++-- Assets/Scripts/CatalogElement.cs | 31 ++-- Assets/Scripts/FurnitureMover.cs | 28 +++- Assets/Scripts/MovableFurniture.cs | 29 +++- ProjectSettings/TagManager.asset | 3 +- 9 files changed, 219 insertions(+), 231 deletions(-) diff --git a/Assets/Models/Simple table.prefab b/Assets/Models/Simple table.prefab index e22e91e..32b60d1 100644 --- a/Assets/Models/Simple table.prefab +++ b/Assets/Models/Simple table.prefab @@ -197,7 +197,6 @@ GameObject: m_Component: - component: {fileID: 3674349604157782260} - component: {fileID: 7152506842566364840} - - component: {fileID: 5516512649396120673} m_Layer: 0 m_Name: Simple table m_TagString: Untagged @@ -240,22 +239,6 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} wallMount: 0 ---- !u!54 &5516512649396120673 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4158574887593288270} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1 &6146061087085142095 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Models/chair.prefab b/Assets/Models/chair.prefab index 795761b..4d7db02 100644 --- a/Assets/Models/chair.prefab +++ b/Assets/Models/chair.prefab @@ -327,22 +327,6 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} wallMount: 0 ---- !u!54 &5577736131529907943 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4774624094512517819} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!4 &5035235579416466379 stripped Transform: m_CorrespondingSourceObject: {fileID: 820629935725706273, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} diff --git a/Assets/Models/shelf_empty.prefab b/Assets/Models/shelf_empty.prefab index 361f2a8..4a6cfce 100644 --- a/Assets/Models/shelf_empty.prefab +++ b/Assets/Models/shelf_empty.prefab @@ -260,7 +260,6 @@ GameObject: - component: {fileID: 2996515769384266075} - component: {fileID: 2709258200819239477} - component: {fileID: 6645681851711596344} - - component: {fileID: 1547886741423616364} m_Layer: 0 m_Name: shelf_empty m_TagString: Untagged @@ -322,22 +321,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.017374, y: 1.4093293, z: 4.320848} m_Center: {x: -0.0065603256, y: 0.012041539, z: 2.1498158} ---- !u!54 &1547886741423616364 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2512467202128557025} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1 &2602268122132683364 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 90f77a3..75054cc 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2394,15 +2394,15 @@ Transform: m_Children: - {fileID: 1705480523} - {fileID: 808552922} + - {fileID: 146814758} + - {fileID: 896101879} + - {fileID: 1455652491} + - {fileID: 1672585692} - {fileID: 1329833008} - {fileID: 260182308} - {fileID: 765875807} - {fileID: 1290121936} - {fileID: 1527984575637916538} - - {fileID: 146814758} - - {fileID: 896101879} - - {fileID: 1455652491} - - {fileID: 1672585692} - {fileID: 435302310} - {fileID: 336078038} - {fileID: 1173886246} @@ -2432,7 +2432,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 18 + value: 21 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -5760,7 +5760,7 @@ Transform: - {fileID: 899232842} - {fileID: 497015422} m_Father: {fileID: 45957245} - m_RootOrder: 7 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &175085081 PrefabInstance: @@ -5903,7 +5903,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalScale.x @@ -5919,15 +5919,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.6129999 + value: 0.3080759 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.431 + value: 0.70722055 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z - value: 0.705 + value: 0.284626 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalRotation.w @@ -6043,7 +6043,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1888977164} + m_TransformParent: {fileID: 435302310} m_Modifications: - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_RootOrder @@ -6051,15 +6051,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalPosition.x - value: 0.0062946305 + value: 0.08329463 objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalPosition.y - value: 0.3921218 + value: -0.4288783 objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalPosition.z - value: 0.013928294 + value: 1.7049284 objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalRotation.w @@ -6170,7 +6170,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 475244, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} propertyPath: m_RootOrder - value: 3 + value: 7 objectReference: {fileID: 0} - target: {fileID: 475244, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} propertyPath: m_LocalPosition.x @@ -6261,7 +6261,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 15 + value: 19 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -7198,7 +7198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 20 + value: 23 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -7354,11 +7354,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.y - value: 1.4918169 + value: 0.32 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.z - value: -15.434761 + value: -9.03 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.w @@ -7504,7 +7504,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1888977164} + - {fileID: 1288997560} + - {fileID: 132577122} + - {fileID: 472164268} + - {fileID: 802860442} + - {fileID: 242326303} m_Father: {fileID: 45957245} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8124,7 +8128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1888977164} + m_TransformParent: {fileID: 435302310} m_Modifications: - target: {fileID: 2048859290140646716, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_StaticEditorFlags @@ -8140,15 +8144,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.x - value: -0.0024496093 + value: 0.07455039 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.y - value: -0.33978105 + value: -1.1607809 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: -0.010123134 + value: 1.6808767 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -8192,10 +8196,9 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &472164268 stripped Transform: @@ -12113,7 +12116,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 19 + value: 22 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -13458,7 +13461,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 4 + value: 8 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -14638,7 +14641,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1888977164} + m_TransformParent: {fileID: 435302310} m_Modifications: - target: {fileID: 4699182198977620406, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_Name @@ -14650,15 +14653,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.x - value: -1.6104125 + value: -1.5334125 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.y - value: -0.17465973 + value: -0.9956598 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.z - value: -0.014138341 + value: 1.6768618 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.w @@ -14996,6 +14999,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 808552922} + - component: {fileID: 808552923} m_Layer: 0 m_Name: Imprimantes 3D m_TagString: Untagged @@ -15011,17 +15015,33 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 808552921} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.991924, y: 6.67572, z: -12.824374} + m_LocalPosition: {x: -9.687, y: 5.5375, z: -12.404} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1317084064} - {fileID: 891532972} - {fileID: 2128333932} - {fileID: 197140882} + - {fileID: 1317084064} m_Father: {fileID: 45957245} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &808552923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808552921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &815680570 PrefabInstance: m_ObjectHideFlags: 0 @@ -16214,7 +16234,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalScale.x @@ -16230,15 +16250,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.613 + value: 0.3080759 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.431 + value: 0.70722055 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z - value: -0.304 + value: -0.7243738 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalRotation.w @@ -16349,7 +16369,7 @@ Transform: - {fileID: 193352390} - {fileID: 1967593823} m_Father: {fileID: 45957245} - m_RootOrder: 8 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &899232841 PrefabInstance: @@ -19445,7 +19465,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1888977164} + m_TransformParent: {fileID: 435302310} m_Modifications: - target: {fileID: -4025371315460726001, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: showLeftPreview @@ -19461,23 +19481,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalScale.y - value: 0.20531806 + value: 0.20531808 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalScale.z - value: 0.20531791 + value: 0.20531793 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.x - value: 0.4568998 + value: 0.5338998 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.y - value: 0.37300003 + value: -0.44799995 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.z - value: -0.23510015 + value: 1.4559002 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalRotation.w @@ -19531,7 +19551,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_RootOrder - value: 5 + value: 9 objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_LocalPosition.x @@ -19922,7 +19942,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_RootOrder - value: 0 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalScale.x @@ -19934,15 +19954,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.x - value: 1.3312488 + value: 0.026325226 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.y - value: -1.149927 + value: -0.011706829 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.3568 + value: -0.06357384 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -19984,7 +20004,12 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &1317084064 stripped Transform: @@ -20000,7 +20025,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 2 + value: 6 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -21162,7 +21187,7 @@ Transform: - {fileID: 1620530528} - {fileID: 788326936} m_Father: {fileID: 45957245} - m_RootOrder: 9 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1481052597 PrefabInstance: @@ -22132,7 +22157,7 @@ MonoBehaviour: needsReinit: 0 AutoPlacementEnvironmentMask: serializedVersion: 2 - m_Bits: 256 + m_Bits: 1280 pointer: {fileID: 0} Grabbing: {fileID: 0} color: {r: 0, g: 0, b: 0, a: 0} @@ -22517,11 +22542,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7304097665698855045, guid: 7520016a817d68f4685d157d457ebed1, type: 3} m_PrefabInstance: {fileID: 1569982188} m_PrefabAsset: {fileID: 0} ---- !u!1 &1573644873 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2835658414891243653, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} - m_PrefabInstance: {fileID: 1989420947} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1582617698 PrefabInstance: m_ObjectHideFlags: 0 @@ -23658,7 +23678,7 @@ Transform: - {fileID: 815680571} - {fileID: 2061626855} m_Father: {fileID: 45957245} - m_RootOrder: 10 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1695254330 PrefabInstance: @@ -24029,7 +24049,7 @@ Transform: m_GameObject: {fileID: 1757592330} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523} m_LocalPosition: {x: -6.057, y: -0.0029997826, z: -0} - m_LocalScale: {x: 0.12212861, y: 4.022701, z: 7.1114306} + m_LocalScale: {x: 0.14867938, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -26966,7 +26986,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 16 + value: 20 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -27307,7 +27327,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 14 + value: 18 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -28185,59 +28205,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} ---- !u!1 &1888977163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1888977164} - - component: {fileID: 1888977165} - m_Layer: 0 - m_Name: Computer Rig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1888977164 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888977163} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.077, y: -0.821, z: 1.691} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1288997560} - - {fileID: 132577122} - - {fileID: 472164268} - - {fileID: 802860442} - - {fileID: 242326303} - m_Father: {fileID: 435302310} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1888977165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888977163} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} - m_Name: - m_EditorClassIdentifier: - combinedBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - wallMount: 0 --- !u!4 &1889890278 stripped Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} @@ -30194,22 +30161,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} m_PrefabInstance: {fileID: 1989420947} m_PrefabAsset: {fileID: 0} ---- !u!54 &1989420950 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1573644873} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1001 &2030655353 PrefabInstance: m_ObjectHideFlags: 0 @@ -33839,7 +33790,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalScale.x @@ -33855,15 +33806,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.6129999 + value: 0.3080759 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.431 + value: 0.70722055 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z - value: 0.211 + value: -0.20937347 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalRotation.w @@ -34005,7 +33956,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} propertyPath: m_RootOrder - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} propertyPath: m_LocalPosition.x @@ -34079,7 +34030,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1888977164} + m_TransformParent: {fileID: 435302310} m_Modifications: - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_RootOrder @@ -34087,15 +34038,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.x - value: -0.24544963 + value: -0.16844964 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.y - value: 0.411 + value: -0.40999985 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.z - value: -0.19400012 + value: 1.4969997 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Catalog.cs b/Assets/Scripts/Catalog.cs index 1fa43a6..fb2d5cc 100644 --- a/Assets/Scripts/Catalog.cs +++ b/Assets/Scripts/Catalog.cs @@ -1,12 +1,7 @@ -using JetBrains.Annotations; -using System; using System.Collections; using System.Collections.Generic; -using System.Runtime.CompilerServices; -using UnityEditor; using UnityEngine; -using UnityEngine.ProBuilder.Shapes; -using UnityEngine.XR; +using Valve.VR; using Valve.VR.InteractionSystem; public class Catalog : MonoBehaviour @@ -22,6 +17,8 @@ public class Catalog : MonoBehaviour private GameObject currentSphere; public List Furnitures; private int maxShownObjects; + + private GameObject Trash; // Start is called before the first frame update void Start() { @@ -41,25 +38,68 @@ public class Catalog : MonoBehaviour // Update is called once per frame void Update() { + } + private void SpawnSphere(int index) + { + float radians = angle * Mathf.Deg2Rad; + float angleIncrement = radians / (maxShownObjects - 1); + if (index > Furnitures.Count - 1) + { + Debug.LogError("[Catalog] Sphere index out of bounds", this); + return; + } + var j = index * angleIncrement - radians / 2; + var sphere = Instantiate(spherePrefab); + sphere.transform.parent = transform; + sphere.transform.localScale = Vector3.one * objectScale; + sphere.transform.localPosition = new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance; + sphere.SetActive(true); + CatalogElement element = sphere.GetComponent(); + element.SetFurniture(Furnitures[index], objectScale); + element.index = index; + } + + public void SetTrash(MovableFurniture Grabbing) + { + Grabbing.gameObject.SetActive(false); + Trash.GetComponent().material.color = new Color(1, 0.5f, 0, 1); + } + + public void LeaveTrash(MovableFurniture Grabbing) + { + Grabbing.gameObject.SetActive(true); + CatalogElement element = Trash.GetComponent(); + element.ClearFurniture(); + Trash.GetComponent().material.color = new Color(1, 0, 0, 0.5f); + + } + private void SpawnTrash() + { + var sphere = Instantiate(spherePrefab); + sphere.transform.parent = transform; + sphere.transform.localScale = Vector3.one * objectScale; + sphere.transform.localPosition = new Vector3(0, 1, 1) * distance; + sphere.GetComponent().material.color = new Color(1, 0, 0, 0.5f); + sphere.GetComponent().enabled = false; + sphere.GetComponent().enabled = false; + sphere.SetActive(true); + sphere.tag = "Trash"; + sphere.layer = 10; + Trash = sphere; + } private void ShowCatalog() { gameObject.transform.SetParent(player.hands[0].transform); gameObject.transform.localPosition = Vector3.zero; - float radians = angle * Mathf.Deg2Rad; - float angleIncrement = radians / (maxShownObjects - 1); for (int i = 0; i < maxShownObjects; i++) { - var j = i * angleIncrement - radians / 2; - var sphere = Instantiate(spherePrefab); - sphere.transform.parent = transform; - sphere.transform.localScale = Vector3.one * objectScale; - sphere.transform.localPosition = new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance; - sphere.SetActive(true); - sphere.GetComponent().SetFurniture(Furnitures[i], objectScale); + SpawnSphere(i); } + SpawnTrash(); + StartCoroutine(CatalogCoroutine()); } @@ -107,18 +147,20 @@ public class Catalog : MonoBehaviour public void OnGrabSphere(CatalogElement sphere, Valve.VR.InteractionSystem.Hand hand) { + SpawnSphere(sphere.index); MovableFurniture grab = hand.GetComponent().Grabbing; if (grab != null) { return; } GameObject furniture = Instantiate(sphere.largeFurnitureModel); - MovableFurniture script = furniture.GetComponent() ; + MovableFurniture script = furniture.GetComponent(); if (!furniture.GetComponent()) { script = furniture.AddComponent(); } script.CalculateBounds(); + //script.OnPointerClickDown(); hand.GetComponent().Grabbing = script; } diff --git a/Assets/Scripts/CatalogElement.cs b/Assets/Scripts/CatalogElement.cs index 3ce80e6..2051730 100644 --- a/Assets/Scripts/CatalogElement.cs +++ b/Assets/Scripts/CatalogElement.cs @@ -1,13 +1,11 @@ using System.Collections; -using System.Collections.Generic; using UnityEngine; -using UnityEngine.Events; -using UnityEngine.ProBuilder.Shapes; using Valve.VR.InteractionSystem; public class CatalogElement : Throwable { public GameObject largeFurnitureModel; + public int index; private GameObject smallFurnitureModel; private Vector3 returnPosition; // Start is called before the first frame update @@ -19,7 +17,7 @@ public class CatalogElement : Throwable // Update is called once per frame void Update() { - + } protected override void OnAttachedToHand(Hand hand) @@ -42,7 +40,7 @@ public class CatalogElement : Throwable Catalog.Instance.OnGrabSphere(this, hand); //hand.GetComponent().Grabbing = largeFurnitureModel.GetComponent(); -} + } //------------------------------------------------- @@ -59,7 +57,7 @@ public class CatalogElement : Throwable Catalog.Instance.OnReleaseSphere(this, hand); Destroy(gameObject); } - + public void SetFurniture(GameObject furniture, float objectScale) { @@ -86,10 +84,16 @@ public class CatalogElement : Throwable }; float rescale = (objectScale / 1.4f) / objectBounds.combinedBounds.size.magnitude; smallFurnitureModel.transform.localScale *= rescale; - smallFurnitureModel.transform.localPosition = Vector3.down * 0.2f; + smallFurnitureModel.transform.localPosition = Vector3.down * 0.2f; StartCoroutine(KeepFurnitureAligned()); } + + public void ClearFurniture() + { + Destroy(smallFurnitureModel); + } + private IEnumerator ReturnSphere() { float time = 0; @@ -97,17 +101,24 @@ public class CatalogElement : Throwable while (time <= 1) { transform.localPosition = Vector3.Lerp(startPosition, returnPosition, time); - time += Time.deltaTime*4; + time += Time.deltaTime * 4; yield return null; } yield break; } - private IEnumerator KeepFurnitureAligned() { + private IEnumerator KeepFurnitureAligned() + { while (true) { - smallFurnitureModel.transform.eulerAngles = new Vector3(0, smallFurnitureModel.transform.eulerAngles.y-(20*Time.deltaTime), 0); + smallFurnitureModel.transform.eulerAngles = new Vector3(0, smallFurnitureModel.transform.eulerAngles.y - (20 * Time.deltaTime), 0); yield return null; } } + + + private void OnPointerEnter() + { + Debug.Log("enter"); + } } diff --git a/Assets/Scripts/FurnitureMover.cs b/Assets/Scripts/FurnitureMover.cs index fe5ea23..e78aa4c 100644 --- a/Assets/Scripts/FurnitureMover.cs +++ b/Assets/Scripts/FurnitureMover.cs @@ -25,6 +25,9 @@ public class FurnitureMover : MonoBehaviour private SnapTurn _snapturn; private Hand hand; + + public static FurnitureMover Instance; + private SnapTurn snapturn { get @@ -38,6 +41,7 @@ public class FurnitureMover : MonoBehaviour } private void Start() { + Instance = this; hand = GetComponent(); if (pose == null) pose = this.GetComponent(); @@ -77,16 +81,28 @@ public class FurnitureMover : MonoBehaviour Ray SnapRaycast = new Ray(transform.position, transform.forward); RaycastHit SnapHit; - //TODO Check if object is on walls - if (Grabbing.wallMount) - { - } + bool SnapbHit = Physics.Raycast(SnapRaycast, out SnapHit, 100f, AutoPlacementEnvironmentMask); if (SnapbHit && Grabbing != null) { - Grabbing.SnapTo(SnapHit.point, AutoPlacementEnvironmentMask, transform.forward); + //TODO Check if object is on walls + if (Grabbing.wallMount) + { + + } + if (SnapHit.collider.gameObject.tag == "Trash" && Grabbing.gameObject.activeInHierarchy) + { + Catalog.Instance.SetTrash(Grabbing); + } + else if (SnapHit.collider.gameObject.tag != "Trash") + { + Catalog.Instance.LeaveTrash(Grabbing); + Grabbing.gameObject.SetActive(true); + Grabbing.SnapTo(SnapHit.point, AutoPlacementEnvironmentMask, transform.forward); + } + } if (previousContact && previousContact != hit.transform) @@ -184,7 +200,7 @@ public class FurnitureMover : MonoBehaviour } private void OnPointerClickDown(object sender, PointerEventArgs e) { - if (Grabbing) + if (Grabbing != null) { return; } diff --git a/Assets/Scripts/MovableFurniture.cs b/Assets/Scripts/MovableFurniture.cs index c470e95..e1e3ba8 100644 --- a/Assets/Scripts/MovableFurniture.cs +++ b/Assets/Scripts/MovableFurniture.cs @@ -7,8 +7,8 @@ public class MovableFurniture : Furniture private List outlines; private Rigidbody _rigidbody; public bool wallMount; - private bool isColliding = false; + private bool isGrabbing = false; // Start is called before the first frame update new void Start() { @@ -38,17 +38,33 @@ public class MovableFurniture : Furniture public void OnPointerClickUp() { + isGrabbing = false; + foreach (ObjectOutline outline in outlines) + { + outline.enabled = false; + } if (_rigidbody != null) { _rigidbody.useGravity = true; + _rigidbody.isKinematic = false; } } + public void OnPointerClickDown() { + isGrabbing = true; + foreach (ObjectOutline outline in outlines) + { + outline.OutlineMode = ObjectOutline.Mode.OutlineAll; + outline.OutlineColor = Color.blue; + outline.OutlineWidth = 5f; + outline.enabled = true; + } if (_rigidbody != null) { _rigidbody.useGravity = false; + _rigidbody.isKinematic = true; } } @@ -57,18 +73,19 @@ public class MovableFurniture : Furniture { foreach (ObjectOutline outline in outlines) { - /*child.OutlineMode = ObjectOutline.Mode.OutlineAll; - child.OutlineColor = Color.yellow; - child.OutlineWidth = 5f;*/ - //outline.enabled = true; + outline.OutlineMode = ObjectOutline.Mode.OutlineAll; + outline.OutlineColor = Color.yellow; + outline.OutlineWidth = 5f; + outline.enabled = true; } } public void OnPointerExit() { + if (isGrabbing) { return; } foreach (ObjectOutline outline in outlines) { - //outline.enabled = false; + outline.enabled = false; } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d5f28ab..1001c23 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,6 +8,7 @@ TagManager: - projectile - FxTemporaire - FurnitureTrigger + - Trash layers: - Default - TransparentFX @@ -19,7 +20,7 @@ TagManager: - Teleport Area - Environment - FurnitureTrigger - - + - Trash - - -