Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

# Conflicts: # Assets/My project/Fonts/Pretendard-Black SDF.asset
2026-06-25 17:40:53 +09:00
parent e8f67c0609 6ef3b0d401
commit 35b22836fe
156 changed files with 11832 additions and 168 deletions
--- a/3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer
+++ b/3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer
@@ -20,3 +20,4 @@ TerrainLayer:
  m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
  m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
  m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
+  m_SmoothnessSource: 1
--- a/3/_Demo/DemoAssets/Terrain/SW3
+++ b/3/_Demo/DemoAssets/Terrain/SW3