diff --git a/Assets/Materials/Glass.mat b/Assets/Materials/Glass.mat new file mode 100644 index 0000000..2fae058 --- /dev/null +++ b/Assets/Materials/Glass.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Glass + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + 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_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.02 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 0.19607843} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Glass.mat.meta b/Assets/Materials/Glass.mat.meta new file mode 100644 index 0000000..47dc3f4 --- /dev/null +++ b/Assets/Materials/Glass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d02b5e657d523ea498a1c023be819ab8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Wood.mat b/Assets/Materials/Wood.mat new file mode 100644 index 0000000..34ce8a6 --- /dev/null +++ b/Assets/Materials/Wood.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + 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_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + 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_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.2 + - _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.5849056, g: 0.3715845, b: 0.0744927, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Wood.mat.meta b/Assets/Materials/Wood.mat.meta new file mode 100644 index 0000000..818de52 --- /dev/null +++ b/Assets/Materials/Wood.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bc61038c4e1fe94799eff24c6fed154 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/lanterd.blend b/Assets/Models/lanterd.blend index ddecfb5..efba7e5 100644 Binary files a/Assets/Models/lanterd.blend and b/Assets/Models/lanterd.blend differ diff --git a/Assets/Scenes/PlayScene.unity b/Assets/Scenes/PlayScene.unity index ce6f40c..caf9342 100644 --- a/Assets/Scenes/PlayScene.unity +++ b/Assets/Scenes/PlayScene.unity @@ -1437,6 +1437,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.1 objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: a20f14621725df742ad2c1028ff4f453, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d02b5e657d523ea498a1c023be819ab8, type: 2} + - target: {fileID: -1504981713932161579, guid: a20f14621725df742ad2c1028ff4f453, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: a20f14621725df742ad2c1028ff4f453, type: 3} propertyPath: m_Name @@ -6514,6 +6524,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.08 objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 01af5eaeb15b4cf469b3d5c80775fd22, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5bc61038c4e1fe94799eff24c6fed154, type: 2} - target: {fileID: -927199367670048503, guid: 01af5eaeb15b4cf469b3d5c80775fd22, type: 3} propertyPath: m_Name @@ -8377,13 +8392,18 @@ PrefabInstance: - target: {fileID: 2481870090095308759, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: m_LocalPosition.y - value: 22.96 + value: 27.8 objectReference: {fileID: 0} - target: {fileID: 2481870090095308759, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: m_LocalPosition.z value: -0.3 objectReference: {fileID: 0} + - target: {fileID: 2481870090095308759, guid: 5322794fa1699704b8e50a14cef106b1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.18 + objectReference: {fileID: 0} - target: {fileID: 2481870090228344316, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: m_StaticEditorFlags