Merge remote-tracking branch 'origin/YuYang'

SteelBall/Assets/0C3_Materials/BG03.mat

@@ -73,5 +73,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.5058824, g: 0.8862745, b: 0.6027043, a: 1}
+    - _Color: {r: 0.2509804, g: 0.87843144, b: 0.81568635, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

SteelBall/Assets/0D1_Effects/LowPolyWater/Demo/Materials/WavesHighQualityDemo.mat

@@ -30,11 +30,11 @@ Material:
     m_Floats:
     - _Direction: 180
     - _EdgeBlend: 1
-    - _Gloss: 1
+    - _Gloss: 0.668
     - _Height: 1
     - _Height_: 1
     - _Length: 3.3
-    - _Opacity: 1
+    - _Opacity: 0.832
     - _RHeight: 0.2
     - _RHeight_: 0.2
     - _RSpeed: 1
@@ -44,7 +44,7 @@ Material:
     - _ShoreDistance: 0.68
     - _ShoreIntensity: -0.108
     - _Smoothness: 0.096
-    - _Specular: 2.2
+    - _Specular: 1.72
     - _Speed: 0.5
     - _Speed_: 0.5
     - _Steepness: 0.5
@@ -59,8 +59,8 @@ Material:
     - __Speed: 0.5
     - __TexSize: 64
     m_Colors:
-    - _Color: {r: 0.25943398, g: 0.7978894, b: 1, a: 1}
+    - _Color: {r: 0.2509804, g: 0.87843144, b: 0.81568635, a: 0.6862745}
     - _Direction_: {r: -1, g: -0.00000008742278, b: -1.65, a: -0.00000014424758}
     - _ShoreColor: {r: 1, g: 1, b: 1, a: 1}
-    - _SpecColor: {r: 1, g: 0.9263692, b: 0.5147059, a: 1}
+    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
     - __Direction: {r: -1, g: -0.00000008742278, b: -1.65, a: -0.00000014424758}

SteelBall/Assets/Res/Prefabs/Levels/Level01.prefab

@@ -1166,7 +1166,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 7f0094c25dcc0e84581f71c1fdcccbd8, type: 2}
+  - {fileID: 2100000, guid: 9b86f21d715a15f49b87be3214333563, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

SteelBall/Assets/Res/Prefabs/Levels/Level03.prefab

@@ -1485,7 +1485,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e18417553bea15643b1c8301345de2f2, type: 2}
+  - {fileID: 2100000, guid: 9b86f21d715a15f49b87be3214333563, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

SteelBall/Assets/Res/Prefabs/Levels/Level04.prefab

@@ -1610,7 +1610,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e18417553bea15643b1c8301345de2f2, type: 2}
+  - {fileID: 2100000, guid: 9b86f21d715a15f49b87be3214333563, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

SteelBall/Assets/Res/Prefabs/Levels/Level06.prefab

@@ -4416,7 +4416,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.14901961, g: 0.5137255, b: 0.7686275, a: 1}
+  m_BackGroundColor: {r: 0.2509804, g: 0.87843144, b: 0.81568635, a: 1}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0