From 935239598775ec621b9eb84d9a3fb961beeb1fec Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 13:03:32 +0200 Subject: [PATCH 1/2] Level blocking --- Assets/Materials/Adena Character Variant.mat | 8 +- .../Adventure Cat Character Variant.mat | 10 +- .../Materials/Amadeus Character Variant.mat | 8 +- Assets/Materials/Character.mat | 14 +- Assets/Materials/Derk Character Variant.mat | 8 +- Assets/Materials/Objects.meta | 8 + Assets/Materials/Objects/Floor.mat | 83 ++ Assets/Materials/Objects/Floor.mat.meta | 8 + Assets/Materials/Objects/Roof.mat | 83 ++ Assets/Materials/Objects/Roof.mat.meta | 8 + Assets/Materials/Objects/Wall.mat | 83 ++ Assets/Materials/Objects/Wall.mat.meta | 8 + Assets/Materials/Objects/Wood.mat | 83 ++ Assets/Materials/Objects/Wood.mat.meta | 8 + Assets/Materials/Rufus Character Variant.mat | 10 +- Assets/Prefabs/Adventurers/Adena.prefab | 8 +- Assets/Prefabs/Adventurers/El Gato.prefab | 8 +- Assets/Prefabs/Adventurers/Rufus.prefab | 8 +- Assets/Scenes/Main.unity | 793 +++++++++++++++++- 19 files changed, 1174 insertions(+), 73 deletions(-) create mode 100644 Assets/Materials/Objects.meta create mode 100644 Assets/Materials/Objects/Floor.mat create mode 100644 Assets/Materials/Objects/Floor.mat.meta create mode 100644 Assets/Materials/Objects/Roof.mat create mode 100644 Assets/Materials/Objects/Roof.mat.meta create mode 100644 Assets/Materials/Objects/Wall.mat create mode 100644 Assets/Materials/Objects/Wall.mat.meta create mode 100644 Assets/Materials/Objects/Wood.mat create mode 100644 Assets/Materials/Objects/Wood.mat.meta diff --git a/Assets/Materials/Adena Character Variant.mat b/Assets/Materials/Adena Character Variant.mat index bed2c28..87c064c 100644 --- a/Assets/Materials/Adena Character Variant.mat +++ b/Assets/Materials/Adena Character Variant.mat @@ -8,16 +8,18 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Adena Character Variant - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 2100000, guid: 0fd304c7a800a6b42b0ec7c79b4df005, type: 2} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHATEST_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/Assets/Materials/Adventure Cat Character Variant.mat b/Assets/Materials/Adventure Cat Character Variant.mat index 6b7da50..f0bc2b8 100644 --- a/Assets/Materials/Adventure Cat Character Variant.mat +++ b/Assets/Materials/Adventure Cat Character Variant.mat @@ -8,23 +8,25 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Adventure Cat Character Variant - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 2100000, guid: 0fd304c7a800a6b42b0ec7c79b4df005, type: 2} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHATEST_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3} + m_Texture: {fileID: 2800000, guid: d5f28e2cddfc37b4995f83eb64cde850, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/Materials/Amadeus Character Variant.mat b/Assets/Materials/Amadeus Character Variant.mat index baecc7a..6369615 100644 --- a/Assets/Materials/Amadeus Character Variant.mat +++ b/Assets/Materials/Amadeus Character Variant.mat @@ -8,16 +8,18 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Amadeus Character Variant - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 2100000, guid: 0fd304c7a800a6b42b0ec7c79b4df005, type: 2} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHATEST_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/Assets/Materials/Character.mat b/Assets/Materials/Character.mat index 90912b6..9c77e19 100644 --- a/Assets/Materials/Character.mat +++ b/Assets/Materials/Character.mat @@ -8,16 +8,18 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Character - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHATEST_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -66,10 +68,10 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 diff --git a/Assets/Materials/Derk Character Variant.mat b/Assets/Materials/Derk Character Variant.mat index 7b09d35..6d9c942 100644 --- a/Assets/Materials/Derk Character Variant.mat +++ b/Assets/Materials/Derk Character Variant.mat @@ -8,16 +8,18 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Derk Character Variant - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 2100000, guid: 0fd304c7a800a6b42b0ec7c79b4df005, type: 2} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHATEST_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/Assets/Materials/Objects.meta b/Assets/Materials/Objects.meta new file mode 100644 index 0000000..e9594a4 --- /dev/null +++ b/Assets/Materials/Objects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8555a7250e0d6214fad6aef70a12ce7a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Objects/Floor.mat b/Assets/Materials/Objects/Floor.mat new file mode 100644 index 0000000..a638959 --- /dev/null +++ b/Assets/Materials/Objects/Floor.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Floor + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.14633523, g: 0.08947429, b: 0.2735849, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Objects/Floor.mat.meta b/Assets/Materials/Objects/Floor.mat.meta new file mode 100644 index 0000000..f70ae35 --- /dev/null +++ b/Assets/Materials/Objects/Floor.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afeba9e99e2f2374c9b7f1e2be7f8b9d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Objects/Roof.mat b/Assets/Materials/Objects/Roof.mat new file mode 100644 index 0000000..0bac226 --- /dev/null +++ b/Assets/Materials/Objects/Roof.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Roof + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.09238997, g: 0.08736795, b: 0.2924528, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Objects/Roof.mat.meta b/Assets/Materials/Objects/Roof.mat.meta new file mode 100644 index 0000000..19d49e0 --- /dev/null +++ b/Assets/Materials/Objects/Roof.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0e139e29ede11b44928a20e1bed9da0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Objects/Wall.mat b/Assets/Materials/Objects/Wall.mat new file mode 100644 index 0000000..636b046 --- /dev/null +++ b/Assets/Materials/Objects/Wall.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wall + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.031565197, g: 0.037986033, b: 0.1792453, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Objects/Wall.mat.meta b/Assets/Materials/Objects/Wall.mat.meta new file mode 100644 index 0000000..5d44c62 --- /dev/null +++ b/Assets/Materials/Objects/Wall.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6f94681db448664d9a1d5bf4651cfdf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Objects/Wood.mat b/Assets/Materials/Objects/Wood.mat new file mode 100644 index 0000000..71af8d6 --- /dev/null +++ b/Assets/Materials/Objects/Wood.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wood + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.4433962, g: 0.24376865, b: 0.06135037, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Objects/Wood.mat.meta b/Assets/Materials/Objects/Wood.mat.meta new file mode 100644 index 0000000..e0e0d6b --- /dev/null +++ b/Assets/Materials/Objects/Wood.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bf63608f6e906a4ead7bbae5af32272 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Rufus Character Variant.mat b/Assets/Materials/Rufus Character Variant.mat index 2ebded5..d36ccfb 100644 --- a/Assets/Materials/Rufus Character Variant.mat +++ b/Assets/Materials/Rufus Character Variant.mat @@ -8,23 +8,25 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Rufus Character Variant - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 2100000, guid: 0fd304c7a800a6b42b0ec7c79b4df005, type: 2} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHATEST_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3} + m_Texture: {fileID: 2800000, guid: 163dab4ae579fb74d93cc5f5543537c2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/Prefabs/Adventurers/Adena.prefab b/Assets/Prefabs/Adventurers/Adena.prefab index 52dff14..d5c7f25 100644 --- a/Assets/Prefabs/Adventurers/Adena.prefab +++ b/Assets/Prefabs/Adventurers/Adena.prefab @@ -26,19 +26,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -2.6193154 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 2.13 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.7618141 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Prefabs/Adventurers/El Gato.prefab b/Assets/Prefabs/Adventurers/El Gato.prefab index dfb3407..dc45c86 100644 --- a/Assets/Prefabs/Adventurers/El Gato.prefab +++ b/Assets/Prefabs/Adventurers/El Gato.prefab @@ -26,19 +26,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.x - value: 0.27032554 + value: 3.32 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.y - value: 2.375 + value: 1.6103325 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.z - value: -0.8072376 + value: -1.2 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Prefabs/Adventurers/Rufus.prefab b/Assets/Prefabs/Adventurers/Rufus.prefab index c1d3d1b..8d3b17e 100644 --- a/Assets/Prefabs/Adventurers/Rufus.prefab +++ b/Assets/Prefabs/Adventurers/Rufus.prefab @@ -26,19 +26,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.18752909 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 2.27 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.7125578 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index b1c582d..95d69c5 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -23,7 +23,7 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 2.05 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} @@ -35,10 +35,10 @@ RenderSettings: m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 + m_ReflectionIntensity: 0 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -261,7 +261,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: 0bf63608f6e906a4ead7bbae5af32272, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -578,7 +578,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: c6f94681db448664d9a1d5bf4651cfdf, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1047,7 +1047,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: 0bf63608f6e906a4ead7bbae5af32272, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1092,6 +1092,111 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 70, z: 0} +--- !u!1 &242937961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 242937965} + - component: {fileID: 242937964} + - component: {fileID: 242937963} + - component: {fileID: 242937962} + m_Layer: 0 + m_Name: Cube (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &242937962 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242937961} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &242937963 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242937961} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a0e139e29ede11b44928a20e1bed9da0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &242937964 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242937961} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &242937965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242937961} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.2774, y: 10.29, z: 5.6294} + m_LocalScale: {x: 25.73, y: 30.460999, z: 0.97} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 22 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &243041992 GameObject: m_ObjectHideFlags: 0 @@ -1206,7 +1311,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243041992} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.1217937, y: 1.6103325, z: -0.7882118} + m_LocalPosition: {x: 0.61, y: 1.6103325, z: -0.7882118} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1483,6 +1588,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 270949401} m_CullTransparentMesh: 1 +--- !u!1 &300035346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 300035348} + - component: {fileID: 300035347} + m_Layer: 0 + m_Name: Area Light (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &300035347 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300035346} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 6.83 + m_Range: 10.616289 + m_SpotAngle: 74.99203 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &300035348 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300035346} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.31, y: 8.29, z: 16.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 26 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &340478446 GameObject: m_ObjectHideFlags: 0 @@ -1723,7 +1922,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: c6f94681db448664d9a1d5bf4651cfdf, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2075,6 +2274,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424163796} m_CullTransparentMesh: 1 +--- !u!1 &449813250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 449813252} + - component: {fileID: 449813251} + m_Layer: 0 + m_Name: Area Light (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &449813251 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449813250} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 6.83 + m_Range: 10.616289 + m_SpotAngle: 74.99203 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &449813252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449813250} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -4.5229464, y: 8.29, z: 16.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 25 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &463546252 GameObject: m_ObjectHideFlags: 0 @@ -2135,7 +2428,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: 0bf63608f6e906a4ead7bbae5af32272, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2180,6 +2473,100 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &497202864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 497202866} + - component: {fileID: 497202865} + m_Layer: 0 + m_Name: Area Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &497202865 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497202864} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 6.83 + m_Range: 10.616289 + m_SpotAngle: 74.99203 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &497202866 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497202864} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.31, y: 8.29, z: -1.85} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &523992348 GameObject: m_ObjectHideFlags: 0 @@ -2242,7 +2629,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: afeba9e99e2f2374c9b7f1e2be7f8b9d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2315,9 +2702,21 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalScale.x + value: 2.7875812 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalScale.y + value: 3.7572165 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalScale.z + value: 3.0134284 + objectReference: {fileID: 0} - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} propertyPath: m_LocalPosition.x - value: 1.6384237 + value: -5.08 objectReference: {fileID: 0} - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} propertyPath: m_LocalPosition.y @@ -2325,7 +2724,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} propertyPath: m_LocalPosition.z - value: -0.7413459 + value: 1.89 objectReference: {fileID: 0} - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} propertyPath: m_LocalRotation.w @@ -2668,7 +3067,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616716901} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.0482602, y: 2.31, z: -4.24} + m_LocalPosition: {x: -1.0482602, y: 2.8, z: -4.24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2898,17 +3297,29 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalScale.x + value: 1.1309425 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalScale.y + value: 1.5243309 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalScale.z + value: 1.2225704 + objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.x - value: 3.32 + value: -2.13 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.y - value: 1.6103325 + value: 2.33 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.z - value: -1.2 + value: -0.42 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalRotation.w @@ -2942,10 +3353,6 @@ PrefabInstance: propertyPath: m_Name value: El Gato objectReference: {fileID: 0} - - target: {fileID: 6753687320438571134, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3413,17 +3820,29 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalScale.x + value: 2.2496367 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalScale.y + value: 3.0321527 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalScale.z + value: 2.4319 + objectReference: {fileID: 0} - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} propertyPath: m_LocalPosition.x - value: 0.18752909 + value: 4.93 objectReference: {fileID: 0} - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} propertyPath: m_LocalPosition.y - value: 2.27 + value: 2.97 objectReference: {fileID: 0} - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} propertyPath: m_LocalPosition.z - value: -0.7125578 + value: 7.75 objectReference: {fileID: 0} - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} propertyPath: m_LocalRotation.w @@ -3457,10 +3876,6 @@ PrefabInstance: propertyPath: m_Name value: Rufus objectReference: {fileID: 0} - - target: {fileID: 6096406778207906987, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3862,17 +4277,29 @@ PrefabInstance: propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalScale.x + value: 2.237133 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalScale.y + value: 3.9057329 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalScale.z + value: 2.6529 + objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.x - value: -4.1400595 + value: 4.24 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.y - value: 2.2634118 + value: 2.3761 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalPosition.z - value: -1.9082265 + value: 0.41 objectReference: {fileID: 0} - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} propertyPath: m_LocalRotation.w @@ -3907,6 +4334,100 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} +--- !u!1 &1315335440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1315335442} + - component: {fileID: 1315335441} + m_Layer: 0 + m_Name: Area Light (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1315335441 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315335440} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 6.83 + m_Range: 10.616289 + m_SpotAngle: 74.99203 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1315335442 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315335440} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.31, y: 8.29, z: 8.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 28 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1341305957 GameObject: m_ObjectHideFlags: 0 @@ -4177,6 +4698,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345526463} m_CullTransparentMesh: 1 +--- !u!1 &1346520898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1346520900} + - component: {fileID: 1346520899} + m_Layer: 0 + m_Name: Area Light (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1346520899 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346520898} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 6.83 + m_Range: 10.616289 + m_SpotAngle: 74.99203 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1346520900 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346520898} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -4.5229464, y: 8.29, z: 8.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 27 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1374039712 GameObject: m_ObjectHideFlags: 0 @@ -4736,17 +5351,29 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalScale.x + value: 2.3612 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalScale.y + value: 4.310349 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalScale.z + value: 2.3612 + objectReference: {fileID: 0} - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} propertyPath: m_LocalPosition.x - value: -2.6193154 + value: 0.55 objectReference: {fileID: 0} - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} propertyPath: m_LocalPosition.y - value: 2.13 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} propertyPath: m_LocalPosition.z - value: -0.7618141 + value: 2.67 objectReference: {fileID: 0} - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} propertyPath: m_LocalRotation.w @@ -4780,10 +5407,6 @@ PrefabInstance: propertyPath: m_Name value: Adena objectReference: {fileID: 0} - - target: {fileID: 8709160301237413648, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6061,7 +6684,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b117b53d07bebc64d842860f5829a22d, type: 2} + - {fileID: 2100000, guid: c6f94681db448664d9a1d5bf4651cfdf, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6106,6 +6729,100 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!1 &1883679566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1883679568} + - component: {fileID: 1883679567} + m_Layer: 0 + m_Name: Area Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1883679567 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1883679566} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 6.83 + m_Range: 10.616289 + m_SpotAngle: 74.99203 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1883679568 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1883679566} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -4.5229464, y: 8.29, z: -1.85} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &2002200564 GameObject: m_ObjectHideFlags: 0 From e9f3edd5fb51a7c435837b029ccffda1e64f1a74 Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 13:24:59 +0200 Subject: [PATCH 2/2] Add Tables --- Assets/Materials/Objects/Metal.mat | 83 +++++ Assets/Materials/Objects/Metal.mat.meta | 8 + Assets/Prefabs/Table.prefab | 353 +++++++++++++++++++++ Assets/Prefabs/Table.prefab.meta | 7 + Assets/Scenes/Main.unity | 392 +++++++++++++++++++++++- 5 files changed, 830 insertions(+), 13 deletions(-) create mode 100644 Assets/Materials/Objects/Metal.mat create mode 100644 Assets/Materials/Objects/Metal.mat.meta create mode 100644 Assets/Prefabs/Table.prefab create mode 100644 Assets/Prefabs/Table.prefab.meta diff --git a/Assets/Materials/Objects/Metal.mat b/Assets/Materials/Objects/Metal.mat new file mode 100644 index 0000000..388e809 --- /dev/null +++ b/Assets/Materials/Objects/Metal.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Metal + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.793 + - _GlossyReflections: 1 + - _Metallic: 0.398 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Objects/Metal.mat.meta b/Assets/Materials/Objects/Metal.mat.meta new file mode 100644 index 0000000..2d4d263 --- /dev/null +++ b/Assets/Materials/Objects/Metal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77e95edb55af4ca4dab587de239d227f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Table.prefab b/Assets/Prefabs/Table.prefab new file mode 100644 index 0000000..8740736 --- /dev/null +++ b/Assets/Prefabs/Table.prefab @@ -0,0 +1,353 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &870198608619948701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8516599570459735691} + - component: {fileID: 5922749137842040419} + - component: {fileID: 454340988189777592} + - component: {fileID: 6050551046293224926} + m_Layer: 0 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8516599570459735691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870198608619948701} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.518, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4604124058226138657} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5922749137842040419 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870198608619948701} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &454340988189777592 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870198608619948701} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0bf63608f6e906a4ead7bbae5af32272, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6050551046293224926 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870198608619948701} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2693706693661312332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3172037565899275159} + - component: {fileID: 3980056798056382546} + - component: {fileID: 638340321236990498} + - component: {fileID: 3731839433813238815} + m_Layer: 0 + m_Name: Foot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3172037565899275159 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693706693661312332} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.7, z: 0} + m_LocalScale: {x: 1, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4604124058226138657} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3980056798056382546 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693706693661312332} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &638340321236990498 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693706693661312332} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0bf63608f6e906a4ead7bbae5af32272, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &3731839433813238815 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693706693661312332} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6096328705421132486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4604124058226138657} + m_Layer: 0 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4604124058226138657 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6096328705421132486} + m_LocalRotation: {x: 1, y: -0, z: -0, w: 0} + m_LocalPosition: {x: 4.64, y: 1.36, z: 7.62} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8516599570459735691} + - {fileID: 8342849253444037452} + - {fileID: 3172037565899275159} + m_Father: {fileID: 0} + m_RootOrder: 28 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8822758566461344847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8342849253444037452} + - component: {fileID: 8421448183063329776} + - component: {fileID: 5253339124982472885} + - component: {fileID: 7943975232395509767} + m_Layer: 0 + m_Name: Pole + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8342849253444037452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822758566461344847} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.5, z: 0.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4604124058226138657} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &8421448183063329776 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822758566461344847} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5253339124982472885 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822758566461344847} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 77e95edb55af4ca4dab587de239d227f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &7943975232395509767 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822758566461344847} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} diff --git a/Assets/Prefabs/Table.prefab.meta b/Assets/Prefabs/Table.prefab.meta new file mode 100644 index 0000000..a82414a --- /dev/null +++ b/Assets/Prefabs/Table.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 990ba563317ff3644935f1e084f5118a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 95d69c5..3528991 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -299,8 +299,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33219120} m_LocalRotation: {x: 0, y: -0.5735764, z: 0, w: 0.8191521} - m_LocalPosition: {x: -4.98, y: 0.92, z: -3.6} - m_LocalScale: {x: 6.29, y: 1.44, z: 1} + m_LocalPosition: {x: -4.98, y: 1.4196678, z: -3.6} + m_LocalScale: {x: 6.29, y: 2.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -1085,8 +1085,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221607115} m_LocalRotation: {x: 0, y: 0.5735764, z: 0, w: 0.8191521} - m_LocalPosition: {x: 2.76, y: 0.92, z: -3.62} - m_LocalScale: {x: 6.29, y: 1.44, z: 1} + m_LocalPosition: {x: 2.76, y: 1.4196678, z: -3.62} + m_LocalScale: {x: 6.29, y: 2.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -1311,7 +1311,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243041992} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.61, y: 1.6103325, z: -0.7882118} + m_LocalPosition: {x: 0.61, y: 2.5003324, z: -0.7882118} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2274,6 +2274,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424163796} m_CullTransparentMesh: 1 +--- !u!1001 &427656313 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.x + value: 3.44 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.z + value: 16.45 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096328705421132486, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_Name + value: Table (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 990ba563317ff3644935f1e084f5118a, type: 3} --- !u!1 &449813250 GameObject: m_ObjectHideFlags: 0 @@ -2466,8 +2527,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 463546252} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.0053811, y: 0.8903322, z: -0.76} - m_LocalScale: {x: 6.29, y: 1.44, z: 1} + m_LocalPosition: {x: -1.0053811, y: 1.39, z: -0.76} + m_LocalScale: {x: 6.29, y: 2.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -2759,6 +2820,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 599cc90e543b1e245b6343415a04da55, type: 3} +--- !u!1001 &565598069 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_RootOrder + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.x + value: -1.52 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.z + value: 16.45 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096328705421132486, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_Name + value: Table (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 990ba563317ff3644935f1e084f5118a, type: 3} --- !u!1 &582177624 GameObject: m_ObjectHideFlags: 0 @@ -3067,7 +3189,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616716901} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.0482602, y: 2.8, z: -4.24} + m_LocalPosition: {x: -1.0482602, y: 3.54, z: -4.24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3315,11 +3437,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.y - value: 2.33 + value: 3.284 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.z - value: -0.42 + value: -0.659 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalRotation.w @@ -3358,6 +3480,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} +--- !u!1001 &714649350 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_RootOrder + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.x + value: -6.44 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.z + value: 16.48 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096328705421132486, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_Name + value: Table (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 990ba563317ff3644935f1e084f5118a, type: 3} --- !u!1 &731093319 GameObject: m_ObjectHideFlags: 0 @@ -3838,7 +4021,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} propertyPath: m_LocalPosition.y - value: 2.97 + value: 3.6 objectReference: {fileID: 0} - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} propertyPath: m_LocalPosition.z @@ -4426,7 +4609,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1341305957 GameObject: @@ -5412,6 +5595,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} +--- !u!1001 &1514206700 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_RootOrder + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.x + value: -1.52 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.z + value: 16.45 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096328705421132486, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_Name + value: Table (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 990ba563317ff3644935f1e084f5118a, type: 3} --- !u!1001 &1543225912 PrefabInstance: m_ObjectHideFlags: 0 @@ -5795,6 +6039,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604646670} m_CullTransparentMesh: 1 +--- !u!1001 &1671838676 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_RootOrder + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.x + value: 4.7 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.z + value: 11.76 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096328705421132486, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_Name + value: Table (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 990ba563317ff3644935f1e084f5118a, type: 3} --- !u!1 &1676075837 GameObject: m_ObjectHideFlags: 0 @@ -5881,7 +6186,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1676075837} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.51, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7410,3 +7715,64 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132596730} m_CullTransparentMesh: 1 +--- !u!1001 &441684020739657604 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_RootOrder + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.x + value: 4.64 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalPosition.z + value: 7.62 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604124058226138657, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096328705421132486, guid: 990ba563317ff3644935f1e084f5118a, type: 3} + propertyPath: m_Name + value: Table + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 990ba563317ff3644935f1e084f5118a, type: 3}