From 2c81a66c18eafe27d96ce6a025fa9530e65ea5f7 Mon Sep 17 00:00:00 2001 From: nakjun Date: Fri, 26 Jun 2026 12:56:48 +0900 Subject: [PATCH] =?UTF-8?q?2026-06-26=20=EC=A0=9C=ED=8E=98=ED=86=A0?= =?UTF-8?q?=EB=A3=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Rooms/Gepto second.unity | 4 +-- Assets/04_Models/Room/Materials/Dirty.mat | 27 +++++++++++-------- Assets/04_Models/Room/Materials/Plaster.mat | 4 +-- Assets/04_Models/Room/Materials/Window.mat | 4 +-- .../04_Models/Room/Materials/WindowGlass.mat | 27 +++++++++++-------- Assets/04_Models/Room/Prefabs/Old_Room.prefab | 3 +++ ...xport.prefab.meta => Old_Room.prefab.meta} | 0 .../Room/Prefabs/Old_Room_Final_Export.prefab | 3 --- 8 files changed, 41 insertions(+), 31 deletions(-) create mode 100644 Assets/04_Models/Room/Prefabs/Old_Room.prefab rename Assets/04_Models/Room/Prefabs/{Old_Room_Final_Export.prefab.meta => Old_Room.prefab.meta} (100%) delete mode 100644 Assets/04_Models/Room/Prefabs/Old_Room_Final_Export.prefab diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity index 60f78369..de734e7e 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto second.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1446751c03ed14b81c4d23c071297e3d048bd9efba24ac0459e5bcc86111c110 -size 11581 +oid sha256:a0b8b3fd448f2850df3e388c960cece35c16e50d9649887cbd9b4c11eed969a2 +size 42182 diff --git a/Assets/04_Models/Room/Materials/Dirty.mat b/Assets/04_Models/Room/Materials/Dirty.mat index 8bbd3fbc..d601142b 100644 --- a/Assets/04_Models/Room/Materials/Dirty.mat +++ b/Assets/04_Models/Room/Materials/Dirty.mat @@ -24,16 +24,21 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SPECULAR_SETUP + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -108,8 +113,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,19 +125,19 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 0 + - _Surface: 1 - _UVSec: 0 - - _WorkflowMode: 1 + - _WorkflowMode: 0 - _XRMotionVectorsPass: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.8533271, g: 0.8466182, b: 0.7934311, a: 1} - - _Color: {r: 0.8533271, g: 0.8466182, b: 0.7934311, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/04_Models/Room/Materials/Plaster.mat b/Assets/04_Models/Room/Materials/Plaster.mat index d7af5da9..d9378476 100644 --- a/Assets/04_Models/Room/Materials/Plaster.mat +++ b/Assets/04_Models/Room/Materials/Plaster.mat @@ -118,8 +118,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + - _Color: {r: 0.6, g: 0.6, b: 0.6, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/04_Models/Room/Materials/Window.mat b/Assets/04_Models/Room/Materials/Window.mat index 83aaeb89..e75fd104 100644 --- a/Assets/04_Models/Room/Materials/Window.mat +++ b/Assets/04_Models/Room/Materials/Window.mat @@ -131,8 +131,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + - _Color: {r: 0.6, g: 0.6, b: 0.6, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/04_Models/Room/Materials/WindowGlass.mat b/Assets/04_Models/Room/Materials/WindowGlass.mat index 0f8197be..7aaed209 100644 --- a/Assets/04_Models/Room/Materials/WindowGlass.mat +++ b/Assets/04_Models/Room/Materials/WindowGlass.mat @@ -24,16 +24,21 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SPECULAR_SETUP + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -108,8 +113,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.59999996 @@ -120,19 +125,19 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.59999996 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 0 + - _Surface: 1 - _UVSec: 0 - - _WorkflowMode: 1 + - _WorkflowMode: 0 - _XRMotionVectorsPass: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 0} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/04_Models/Room/Prefabs/Old_Room.prefab b/Assets/04_Models/Room/Prefabs/Old_Room.prefab new file mode 100644 index 00000000..5e1595b9 --- /dev/null +++ b/Assets/04_Models/Room/Prefabs/Old_Room.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90d7d57f2b79964a93cc917cdaabd8b82a00ea347e4d5ea280bf80d313176033 +size 10735 diff --git a/Assets/04_Models/Room/Prefabs/Old_Room_Final_Export.prefab.meta b/Assets/04_Models/Room/Prefabs/Old_Room.prefab.meta similarity index 100% rename from Assets/04_Models/Room/Prefabs/Old_Room_Final_Export.prefab.meta rename to Assets/04_Models/Room/Prefabs/Old_Room.prefab.meta diff --git a/Assets/04_Models/Room/Prefabs/Old_Room_Final_Export.prefab b/Assets/04_Models/Room/Prefabs/Old_Room_Final_Export.prefab deleted file mode 100644 index 7cbe01eb..00000000 --- a/Assets/04_Models/Room/Prefabs/Old_Room_Final_Export.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a783755a74efe67965039e710687734d4935f1d6f1b5ec6762779deaf1c270fb -size 3080