diff --git a/BlueWater/Assets/01.Scenes/02.Tycoon.unity b/BlueWater/Assets/01.Scenes/02.Tycoon.unity
index 0311f743e..7d55cabae 100644
--- a/BlueWater/Assets/01.Scenes/02.Tycoon.unity
+++ b/BlueWater/Assets/01.Scenes/02.Tycoon.unity
@@ -233,6 +233,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: TycconNpc
       objectReference: {fileID: 0}
+    - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -573,7 +578,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 107368052}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -0, w: 0.92387956}
+  m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -1e-45, w: 0.92387956}
   m_LocalPosition: {x: 6.89, y: 11.1380005, z: -5.88}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3310,7 +3315,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 501722143}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.38268343, y: 1e-45, z: 0, w: 0.92387956}
+  m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -1e-45, w: 0.92387956}
   m_LocalPosition: {x: 6.89, y: 11.1380005, z: -5.88}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -5736,6 +5741,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: TycconNpc (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
diff --git a/BlueWater/Assets/02.Scripts/Npc/Guest/FindTableState.cs b/BlueWater/Assets/02.Scripts/Npc/Guest/FindTableState.cs
index 97f7773ca..17891b98b 100644
--- a/BlueWater/Assets/02.Scripts/Npc/Guest/FindTableState.cs
+++ b/BlueWater/Assets/02.Scripts/Npc/Guest/FindTableState.cs
@@ -43,6 +43,7 @@ namespace BlueWaterProject
 
         private void CheckAndUpdateTables()
         {
+            if (npc.DoSeat) return;
             foreach (var table in tables)
             {
                 foreach (var seat in table.SeatPoints)
@@ -60,11 +61,11 @@ namespace BlueWaterProject
         {
             npc.Agent.SetDestination(seat.transform.position);
 
-            if (npc.AssignedSeat != null)
-            {
-                npc.AssignedSeat.IsUsing = false;
-                npc.AssignedSeat.IsDirty = true;
-            }
+            // if (npc.AssignedSeat != null)
+            // {
+            //     npc.AssignedSeat.IsUsing = false;
+            //     npc.AssignedSeat.IsDirty = true;
+            // }
 
             npc.AssignedSeat = seat;
             npc.AssignedSeat.IsUsing = true;
diff --git a/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat
index 4102a9b92..8ebbdde92 100644
--- a/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat	
+++ b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat	
@@ -19,7 +19,6 @@ Material:
   - _NORMALMAP
   - _REFRACTION
   - _TRANSLUCENCY
-  - _WAVES
   m_InvalidKeywords:
   - _DEPTHEXP_ON
   - _ZCLIP_ON
@@ -30,7 +29,7 @@ Material:
   m_CustomRenderQueue: 3000
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: _Cull
+  m_LockedProperties: _Cull _WavesOn
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -278,7 +277,7 @@ Material:
     - _WaveSpeed: 2
     - _WaveSteepness: 0.64
     - _WaveTint: 0
-    - _WavesOn: 1
+    - _WavesOn: 0
     - _WorkflowMode: 1
     - _WorldSpaceUV: 1
     - _ZClip: 1
diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat
old mode 100755
new mode 100644
index 5a304f40f..6ce44b75c
--- a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat	
+++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat	
@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Fog
   m_Shader: {fileID: 4800000, guid: 6490db4c7a37d8349b85b261b7ff5cea, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -17,6 +19,7 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -171,3 +174,4 @@ Material:
     - _SunDirection1: {r: 0, g: 0, b: 0, a: 0}
     - _VariationWindDirection: {r: 1, g: 0, b: 5, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Skybox.mat b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Skybox.mat
old mode 100755
new mode 100644
index 323b850f9..e85157f15
--- a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Skybox.mat	
+++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Skybox.mat	
@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Skybox
   m_Shader: {fileID: 4800000, guid: 2a61d1fe99ca7e74b986c801b0920c8d, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 2
@@ -17,6 +19,7 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -241,3 +244,4 @@ Material:
     - _SunFlareColor: {r: 0.52377915, g: 0.43413693, b: 0.32312402, a: 1}
     - _ZenithColor: {r: 0.008499811, g: 0.047379583, b: 0.11567971, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat
old mode 100755
new mode 100644
index a1a24314a..7d168362a
--- a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat	
+++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat	
@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Stylized Clouds
   m_Shader: {fileID: 4800000, guid: 1a6791d1617850b49b130b523f5ebf5c, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 0
@@ -17,6 +19,7 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -348,3 +351,4 @@ Material:
     - _TexturePanDirection: {r: 0.1, g: 1, b: 0.1, a: 0}
     - _Vector0: {r: 0.12, g: 1.5, b: 0, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1