调整材质

Assets/Art/Material/Buildings/WaterPlane 1.mat

@@ -33,7 +33,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailNormal:
-        m_Texture: {fileID: 2800000, guid: 41edc6902cd6e654a9edc0275e92c3a2, type: 3}
+        m_Texture: {fileID: 2800000, guid: 7e6b97895101b5e439b8b80bef080be7, type: 3}
         m_Scale: {x: 10, y: 10}
         m_Offset: {x: 0, y: 0}
     - _DetailNormalMap:

Assets/Art/Material/Buildings/WaterPlane 2.mat

@@ -33,7 +33,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailNormal:
-        m_Texture: {fileID: 2800000, guid: 41edc6902cd6e654a9edc0275e92c3a2, type: 3}
+        m_Texture: {fileID: 2800000, guid: 7e6b97895101b5e439b8b80bef080be7, type: 3}
         m_Scale: {x: 10, y: 10}
         m_Offset: {x: 0, y: 0}
     - _DetailNormalMap:

Assets/Art/Material/Buildings/WaterPlane 3.mat

@@ -37,7 +37,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailNormal:
-        m_Texture: {fileID: 2800000, guid: 41edc6902cd6e654a9edc0275e92c3a2, type: 3}
+        m_Texture: {fileID: 2800000, guid: 7e6b97895101b5e439b8b80bef080be7, type: 3}
         m_Scale: {x: 100, y: 100}
         m_Offset: {x: 0, y: 0}
     - _DetailNormalMap:
@@ -86,7 +86,8 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.36832502, g: 0.6484611, b: 0.8773585, a: 1}
+    - _Color: {r: 0.026032407, g: 0.24533877, b: 0.42452827, a: 1}
+    - _Color2: {r: 0, g: 0.7356219, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _NormalSpeed1: {r: 1, g: 1, b: 1, a: 1}
     - _NormalSpeed2: {r: 2.87, g: 1, b: 3, a: 3}

Assets/Art/Material/Buildings/WaterPlane.mat

@@ -33,8 +33,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailNormal:
-        m_Texture: {fileID: 2800000, guid: 41edc6902cd6e654a9edc0275e92c3a2, type: 3}
-        m_Scale: {x: 100, y: 100}
+        m_Texture: {fileID: 2800000, guid: 7e6b97895101b5e439b8b80bef080be7, type: 3}
+        m_Scale: {x: 150, y: 150}
         m_Offset: {x: 0, y: 0}
     - _DetailNormalMap:
         m_Texture: {fileID: 0}
@@ -70,7 +70,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 1
     - _GlossyReflections: 1
-    - _Metallic: 0.03
+    - _Metallic: 0.321
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
@@ -80,7 +80,8 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.36832502, g: 0.6484611, b: 0.8773585, a: 1}
+    - _Color: {r: 0.026032407, g: 0.24533881, b: 0.4245283, a: 1}
+    - _Color2: {r: 0, g: 0.7356219, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _NormalSpeed1: {r: 1, g: 1, b: 1, a: 1}
     - _NormalSpeed2: {r: 2.87, g: 1, b: 3, a: 3}

Assets/Art/Shader/WaterPlane.shader

@@ -3,6 +3,7 @@ Shader "Custom/Water"
     Properties
     {
         _Color("Color", Color) = (1,1,1,1)
+         _Color2("Color2", Color) = (1,1,1,1)
         _MainTex("Albedo (RGB)", 2D) = "white" {}
         _NormalSpeed1("NormalSpeed1",Vector) = (1,1,2,0.5)
         _NormalSpeed2("NormalSpeed2",Vector) = (1,1,2,0.5)
@@ -51,7 +52,7 @@ Shader "Custom/Water"
         float _Depth;
         half _Glossiness;
         half _Metallic;
-        fixed4 _Color;
+        fixed4 _Color,_Color2;
         /* float _Wavelength, _WaveSpeed, _Amplitude;*/
          //float4 _Wave1, _Wave2, _Wave3;
          float4 _NormalSpeed1, _NormalSpeed2, _NormalSpeed3;
@@ -88,9 +89,9 @@ Shader "Custom/Water"
               o.Normal = normalize(o.Normal);
 
 
-              float FFactor = pow(1 - saturate(dot(o.Normal, normalize(IN.viewDir))),10);
-              FFactor = lerp(0.2, 2, FFactor);
-              o.Albedo = _Color.rgb * FFactor;
+              float FFactor = pow(1 - saturate(dot(o.Normal, normalize(IN.viewDir))),5);
+              //FFactor = lerp(0.2, 2, FFactor);
+              o.Albedo = lerp(_Color.rgb, _Color2.rgb, FFactor)/*_Color.rgb * FFactor*/;
 
               o.Albedo = lerp(bCol, o.Albedo, colfactor);
               o.Alpha = 1;

Assets/Art/Shader/WaterPlaneClip.shader

@@ -3,6 +3,7 @@ Shader "Custom/WaterClip"
     Properties
     {
         _Color("Color", Color) = (1,1,1,1)
+         _Color2("Color2", Color) = (1,1,1,1)
         _MainTex("Albedo (RGB)", 2D) = "white" {}
         _NormalSpeed1("NormalSpeed1",Vector) = (1,1,2,0.5)
         _NormalSpeed2("NormalSpeed2",Vector) = (1,1,2,0.5)
@@ -55,7 +56,7 @@ Shader "Custom/WaterClip"
         float _Depth;
         half _Glossiness;
         half _Metallic;
-        fixed4 _Color;
+        fixed4 _Color,_Color2;
         /* float _Wavelength, _WaveSpeed, _Amplitude;*/
          //float4 _Wave1, _Wave2, _Wave3;
          float4 _NormalSpeed1, _NormalSpeed2, _NormalSpeed3;
@@ -94,9 +95,9 @@ Shader "Custom/WaterClip"
               o.Normal = normalize(o.Normal);
 
 
-              float FFactor = pow(1 - saturate(dot(o.Normal, normalize(IN.viewDir))),10);
-              FFactor = lerp(0.2, 2, FFactor);
-              o.Albedo = _Color.rgb * FFactor;
+              float FFactor = pow(1 - saturate(dot(o.Normal, normalize(IN.viewDir))), 5);
+              //FFactor = lerp(0.2, 2, FFactor);
+              o.Albedo = lerp(_Color.rgb, _Color2.rgb, FFactor)/*_Color.rgb * FFactor*/;
 
               o.Albedo = lerp(bCol, o.Albedo, colfactor);
               o.Alpha = 1;

Assets/Art/Textrue/Buildings/Water 01 [Normal].png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 7e6b97895101b5e439b8b80bef080be7
+timeCreated: 1549712261
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: 2
+    aniso: 4
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Textrue/Buildings/Water [Normal].psd.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 26332f4582e5241cb852e58e42faac31
+timeCreated: 1525724616
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: 2
+    aniso: 4
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 512
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: