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

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset

Assets/Stylized Water 3/Materials/StylizedWater3_Ocean.mat

@@ -40,7 +40,7 @@ Material:
   - _ZCLIP_ON
   - _ZWRITE_ON
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

Assets/Stylized Water 3/Materials/StylizedWater3_Toon.mat

@@ -38,7 +38,7 @@ Material:
   - _WORLDSPACEUV_ON
   - _ZCLIP_ON
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
@@ -185,6 +185,7 @@ Material:
     - _FoamBubblesSpread: 1
     - _FoamBubblesStrength: 0.217
     - _FoamClipping: 0.5
+    - _FoamClippingDynamic: 0
     - _FoamDistanceOn: 1
     - _FoamDistortion: 0.34
     - _FoamOn: 1
@@ -238,6 +239,7 @@ Material:
     - _PlanarReflectionsParams: 0
     - _PointSpotLightReflectionDistortion: 0.5
     - _PointSpotLightReflectionExp: 64
+    - _PointSpotLightReflectionSharp: 0
     - _PointSpotLightReflectionSize: 0
     - _PointSpotLightReflectionStrength: 10
     - _QueueOffset: 0
@@ -282,6 +284,7 @@ Material:
     - _SrcBlend: 1
     - _SunReflectionDistortion: 0.49
     - _SunReflectionPerturbance: 1
+    - _SunReflectionSharp: 0
     - _SunReflectionSize: 0.122
     - _SunReflectionStrength: 0
     - _Surface: 0
@@ -295,6 +298,7 @@ Material:
     - _TranslucencyReflectionMask: 0
     - _TranslucencyStrength: 1
     - _TranslucencyStrengthDirect: 0.05
+    - _UnderwaterReflectionStrength: 0.5
     - _UnderwaterRefractionOffset: 0.2
     - _UnderwaterSurfaceSmoothness: 0.8
     - _VertexColorFoam: 0