Revert "레스토랑 스테이지 수정"

This reverts commit bae9a43ef7.
2025-08-26 20:17:28 +09:00 · 2025-08-26 20:17:28 +09:00 · 5bf5008e17
commit 5bf5008e17
parent ade5bc4cf4
8 changed files with 949 additions and 15764 deletions
--- a/Assets/_DDD/Common/Materials/Old/OpaqueUnlit.mat
+++ b/Assets/_DDD/Common/Materials/Old/OpaqueUnlit.mat
@ -21,15 +21,11 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: OpaqueUnlit
-  m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3}
-  m_Parent: {fileID: 2100000, guid: 094899c1afd763f459f6a1f461cba5c5, type: 2}
-  m_ModifiedSerializedProperties: 24
+  m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
  - _ALPHATEST_ON
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
-  - _OCCLUSIONMAP
-  - _PARALLAXMAP
  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@ -47,10 +43,97 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _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}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 1
+    - _AlphaToMask: 1
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BlendOp: 0
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
    - _Cull: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _SampleGI: 0
    - _Smoothness: 0.5
-    m_Colors: []
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, 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: []
  m_AllowLocking: 1
--- a/Assets/_DDD/Restaurant/Environments/Props/Fence/Fence.mat
+++ b/Assets/_DDD/Restaurant/Environments/Props/Fence/Fence.mat
@ -63,18 +63,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _Emiss:
-        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}
-    - _MOHS:
-        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}
@ -83,18 +75,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _Normal:
-        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}
-    - _OpacityMap:
-        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}
@ -120,7 +104,6 @@ Material:
    - _AddPrecomputedVelocity: 0
    - _AlphaClip: 1
    - _AlphaToMask: 1
-    - _ApplyGI: 1
    - _Blend: 0
    - _BlendModePreserveSpecular: 1
    - _BumpScale: 1
@ -135,7 +118,6 @@ Material:
    - _DstBlendAlpha: 0
    - _EMISSION: 0
    - _EnvironmentReflections: 1
-    - _GlobalIlluminationIntensity: 1
    - _GlossMapScale: 0
    - _Glossiness: 0
    - _GlossyReflections: 0
@ -149,13 +131,12 @@ Material:
    - _QueueControl: 0
    - _QueueOffset: 0
    - _ReceiveShadows: 1
-    - _Smoothness: 0
+    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _SrcBlendAlpha: 1
    - _Surface: 0
-    - _UseOpacityMask: 0
    - _WorkflowMode: 1
    - _XRMotionVectorsPass: 1
    - _ZTest: 4
--- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Fence01.prefab
+++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Fence01.prefab
@ -28,18 +28,6 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.x
      value: 30
      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 2
-      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
@ -52,10 +40,6 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
-      propertyPath: m_ConstrainProportionsScale
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
      propertyPath: m_Size.y
      value: 0.5
@ -72,10 +56,6 @@ PrefabInstance:
      propertyPath: m_Center.z
      value: 0.1
      objectReference: {fileID: 0}
-    - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
-      propertyPath: m_IsTrigger
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
      propertyPath: m_Sprite
      value: 
--- a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab
+++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab
@ -86,7 +86,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
      propertyPath: m_IsTrigger
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
--- a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard3/Prop_MenuBoard3.prefab
+++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard3/Prop_MenuBoard3.prefab
@ -74,7 +74,7 @@ PrefabInstance:
      objectReference: {fileID: 2100000, guid: 8735f3d63bc14e74da558970523bd1bd, type: 2}
    - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
      propertyPath: m_IsTrigger
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
--- a/Assets/_DDD/_Addressables/Scenes/Restaurant
+++ b/Assets/_DDD/_Addressables/Scenes/Restaurant
--- a/Assets/_DDD/_Addressables/Scenes/Restaurant
+++ b/Assets/_DDD/_Addressables/Scenes/Restaurant
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8936bf20d18634a4e8a39eea88675edd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity
+++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity