diff --git a/Assets/Test/UnderWater/underwater.unity b/Assets/Test/UnderWater/underwater.unity index 3c42cb3..5050f72 100644 --- a/Assets/Test/UnderWater/underwater.unity +++ b/Assets/Test/UnderWater/underwater.unity @@ -297,7 +297,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65ac35274b604b168f0b6ec6085ba2e, type: 2} + - {fileID: 2100000, guid: 2194e0d71139943b4bd966de690495f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -380,7 +380,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65ac35274b604b168f0b6ec6085ba2e, type: 2} + - {fileID: 2100000, guid: 2194e0d71139943b4bd966de690495f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -463,7 +463,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65ac35274b604b168f0b6ec6085ba2e, type: 2} + - {fileID: 2100000, guid: 2194e0d71139943b4bd966de690495f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -546,7 +546,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65ac35274b604b168f0b6ec6085ba2e, type: 2} + - {fileID: 2100000, guid: 2194e0d71139943b4bd966de690495f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -585,7 +585,7 @@ Transform: m_GameObject: {fileID: 1621975248} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.16, y: 0, z: -0.159} + m_LocalPosition: {x: -0.16, y: 0.158, z: -0.159} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -629,7 +629,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65ac35274b604b168f0b6ec6085ba2e, type: 2} + - {fileID: 2100000, guid: 2194e0d71139943b4bd966de690495f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -691,7 +691,7 @@ Transform: m_GameObject: {fileID: 3198155167939134613} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.034, y: 0, z: -0.038} + m_LocalPosition: {x: 0.47, y: 0.019, z: -0.038} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -735,7 +735,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65ac35274b604b168f0b6ec6085ba2e, type: 2} + - {fileID: 2100000, guid: 2194e0d71139943b4bd966de690495f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Packages/zzwater/Mats/WaterPlantG.mat b/Packages/zzwater/Mats/WaterPlantG.mat index 2dcb309..1576c5b 100644 --- a/Packages/zzwater/Mats/WaterPlantG.mat +++ b/Packages/zzwater/Mats/WaterPlantG.mat @@ -8,7 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: WaterPlantG - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 746c94d4092dee3428d2f89537482562, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,8 +18,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -68,6 +68,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Tex: + m_Texture: {fileID: 2800000, guid: 5b6ebc13703cb474f9e95eaf1d90d1d6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -96,12 +100,15 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 + - _Freq: 1.25 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 + - _Intensity: 0.118 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -117,6 +124,8 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _Tine: {r: 1, g: 1, b: 1, a: 0} + - _WaterDIr: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!114 &7309648709844754497 MonoBehaviour: diff --git a/Packages/zzwater/Mats/water_plant.mat b/Packages/zzwater/Mats/water_plant.mat index cf7279b..22b1eac 100644 --- a/Packages/zzwater/Mats/water_plant.mat +++ b/Packages/zzwater/Mats/water_plant.mat @@ -48,7 +48,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 016ab36f33e35487bb91a3712c78b36e, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: