升级水插件

2026-01-08 22:30:55 +08:00
parent febff82d24
commit ca68084264
415 changed files with 18138 additions and 7134 deletions
--- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Examples_Scenes.prefab
+++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Examples_Scenes.prefab
@@ -314,12 +314,14 @@ MonoBehaviour:
  _Spectrum: {fileID: 11400000, guid: e13a1902b10e34e9fb08e1d09e39b5d4, type: 2}
  _EvaluateSpectrumAtRunTimeEveryFrame: 0
  _RespectShallowWaterAttenuation: 1
+  _OverrideGlobalWindDirection: 1
  _WaveDirectionHeadingAngle: 0
  _OverrideGlobalWindSpeed: 0
  _WindSpeed: 20
  _Resolution: 32
  _DrawSlicesInEditor: 0
  _AlphaSource: 0
+  _OverrideGlobalWindTurbulence: 1
  _WindTurbulence: 0.35
  _WindAlignment: 0
  _TimeLoopLength: Infinity
@@ -329,7 +331,7 @@ MonoBehaviour:
  _TimeResolution: 4
  _SmallestWavelengthRequired: 2
  _BakedTimeLoopLength: 32
-  _Version: 1
+  _Version: 2
  references:
    version: 2
    RefIds:
@@ -1365,27 +1367,37 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e64c239f69eea46778ded6dcc3427a34, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _Version: 0
-  _Camera: {fileID: 0}
-  _TimeProvider: {fileID: 0}
-  _OverrideRenderHDR: 0
-  _RenderHDR: 1
-  _WindSpeed: 10
-  _OverrideGravity: 0
-  _GravityOverride: -9.8
-  _GravityMultiplier: 1
-  _PrimaryLight: {fileID: 0}
  _Layer: 4
  _Material: {fileID: 2100000, guid: d82d92d8d8f214cd0b8bf7c185b2c341, type: 2}
  _VolumeMaterial: {fileID: 0}
  _ChunkTemplate: {fileID: 0}
  _CastShadows: 0
-  _WriteMotionVectors: 1
-  _WriteToDepthTexture: 1
  _WaterBodyCulling: 1
  _TimeSliceBoundsUpdateFrameCount: 1
  _SurfaceSelfIntersectionFixMode: 4
  _AllowRenderQueueSorting: 0
+  _Version: 1
+  _Camera: {fileID: 0}
+  _TimeProvider: {fileID: 0}
+  _WindZone: {fileID: 0}
+  _OverrideWindZoneWindSpeed: 0
+  _WindSpeed: 10
+  _OverrideWindZoneWindDirection: 0
+  _WindDirection: 0
+  _OverrideWindZoneWindTurbulence: 0
+  _WindTurbulence: 0.145
+  _OverrideGravity: 0
+  _GravityOverride: -9.8
+  _GravityMultiplier: 1
+  _PrimaryLight: {fileID: 0}
+  _InjectionPoint: 0
+  _WriteToColorTexture: 1
+  _WriteToDepthTexture: 1
+  _WriteMotionVectors: 1
+  _OverrideRenderHDR: 0
+  _RenderHDR: 1
+  _Surface:
+    rid: 1013
  _ScaleRange: {x: 8, y: 8}
  _DropDetailHeightBasedOnWaves: 0.081
  _Slices: 7
@@ -1393,6 +1405,7 @@ MonoBehaviour:
  _GeometryDownSampleFactor: 2
  _ExtentsSizeMultiplier: 100
  _Viewpoint: {fileID: 2613380069347621712}
+  _CenterOfDetailDisplacementCorrection: 1
  _SampleTerrainHeightForScale: 1
  _ForceScaleChangeSmoothing: 0
  _TeleportThreshold: 10
@@ -1422,6 +1435,8 @@ MonoBehaviour:
    rid: 1009
  _Underwater:
    rid: 1010
+  _Meniscus:
+    rid: 1014
  _Portals:
    rid: 1011
  _ShowWaterProxyPlane: 0
@@ -1433,15 +1448,11 @@ MonoBehaviour:
    _ShowHiddenObjects: 0
    _DisableFollowViewpoint: 0
    _DestroyResourcesInOnDisable: 0
-    _DisableChunks: 0
-    _UniformTiles: 0
-    _DisableSkirt: 0
    _DrawLodOutline: 0
    _ShowDebugInformation: 0
    _LogScaleChange: 0
    _PauseOnScaleChange: 0
    _IgnoreWavesForScaleChange: 0
-    _ForceBatchMode: 0
    _ForceNoGraphics: 0
  _Resources: {fileID: 11400000, guid: 0817af17dea584e5382e6216db162d4a, type: 2}
  references:
@@ -1467,6 +1478,7 @@ MonoBehaviour:
        _Resolution: 256
        _TextureFormatMode: 100
        _TextureFormat: 46
+        _IncludeTerrainHeight: 0
        _EnableSignedDistanceFields: 1
    - rid: 1002
      type: {class: LevelLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
@@ -1514,6 +1526,7 @@ MonoBehaviour:
        _Resolution: 256
        _TextureFormatMode: 100
        _TextureFormat: 6
+        _SimulationFrequency: 60
        _DynamicSoftShadows: 1
        _SoftJitterExtinctionFactor: 0.75
        _JitterDiameterSoft: 15
@@ -1584,10 +1597,6 @@ MonoBehaviour:
        _EnvironmentalLightingEnable: 0
        _EnvironmentalLightingWeight: 1
        _EnvironmentalLightingVolumeProfile: {fileID: 0}
-        _EnableShaderAPI: 0
-        _TransparentObjectLayers:
-          serializedVersion: 2
-          m_Bits: 0
        _AllCameras: 0
        _CopyWaterMaterialParametersEachFrame: 1
        _FarPlaneMultiplier: 0.68
@@ -1618,6 +1627,29 @@ MonoBehaviour:
        _ShorelineColor: {r: 0, g: 0.588, b: 1.2, a: 6}
        _ShorelineColorMaximumDistance: 10
        _ShorelineColorFalloff: 2
+    - rid: 1013
+      type: {class: SurfaceRenderer, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
+      data:
+        _Version: 0
+        _Enabled: 1
+        _Layer: 4
+        _Material: {fileID: 2100000, guid: d82d92d8d8f214cd0b8bf7c185b2c341, type: 2}
+        _VolumeMaterial: {fileID: 0}
+        _ChunkTemplate: {fileID: 0}
+        _CastShadows: 0
+        _WaterBodyCulling: 1
+        _TimeSliceBoundsUpdateFrameCount: 1
+        _SurfaceSelfIntersectionFixMode: 4
+        _AllowRenderQueueSorting: 0
+        _Debug:
+          _UniformTiles: 0
+          _DisableSkirt: 0
+    - rid: 1014
+      type: {class: Meniscus, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
+      data:
+        _Enabled: 1
+        _Layer: 4
+        _Material: {fileID: 2100000, guid: 238e45299a5ec46308e9bf99ddf67963, type: 2}
    - rid: 5163698739167625228
      type: {class: AnimatedWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
      data:
--- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_OverrideGlobalWaves.prefab
+++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_OverrideGlobalWaves.prefab
@@ -56,12 +56,14 @@ MonoBehaviour:
  _Spectrum: {fileID: 0}
  _EvaluateSpectrumAtRunTimeEveryFrame: 0
  _RespectShallowWaterAttenuation: 1
+  _OverrideGlobalWindDirection: 1
  _WaveDirectionHeadingAngle: 0
  _OverrideGlobalWindSpeed: 1
  _WindSpeed: 3
  _Resolution: 128
  _DrawSlicesInEditor: 0
  _AlphaSource: 0
+  _OverrideGlobalWindTurbulence: 1
  _WindTurbulence: 0.145
  _WindAlignment: 0
  _TimeLoopLength: Infinity
@@ -71,7 +73,7 @@ MonoBehaviour:
  _TimeResolution: 4
  _SmallestWavelengthRequired: 2
  _BakedTimeLoopLength: 32
-  _Version: 1
+  _Version: 2
  references:
    version: 2
    RefIds:
@@ -80,6 +82,7 @@ MonoBehaviour:
      data:
        _Input: {fileID: 5261791568129114886}
        _Texture: {fileID: 2800000, guid: b922f588948724e039eadd46288af89d, type: 3}
+        _Multiplier: {x: 1, y: 1, z: 1, w: 1}
        _NegativeValues: 1
 --- !u!1001 &5419066683695935889
 PrefabInstance:
--- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_ShaderGraphInput.prefab
+++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_ShaderGraphInput.prefab
@@ -179,51 +179,6 @@ PrefabInstance:
      propertyPath: m_AnchorMin.x
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 8893367339784545046}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: SetActive
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: UnityEngine.GameObject, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5628891711212661418, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-        type: 3}
-      propertyPath: _OnHighDefinitionPipeline.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
    - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -299,9 +254,3 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 7420766973803980796}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &8893367339784545046 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2130284292857808106, guid: 8b98a14ae91dd498d8f577f0f8f4aff1,
-    type: 3}
-  m_PrefabInstance: {fileID: 7420766973803980796}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_TrochoidalWaves.prefab
+++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_TrochoidalWaves.prefab
@@ -56,16 +56,19 @@ MonoBehaviour:
  _Spectrum: {fileID: 11400000, guid: 6b50b5218dbe2488fb5d00db49d15dae, type: 2}
  _EvaluateSpectrumAtRunTimeEveryFrame: 0
  _RespectShallowWaterAttenuation: 1
+  _OverrideGlobalWindDirection: 1
  _WaveDirectionHeadingAngle: 0
  _OverrideGlobalWindSpeed: 1
  _WindSpeed: 150
  _Resolution: 128
  _DrawSlicesInEditor: 0
  _AlphaSource: 0
+  _Swell: 0
  _ReverseWaveWeight: 0
  _ComponentsPerOctave: 8
  _RandomSeed: 0
-  _Version: 1
+  _ManualGeneration: 0
+  _Version: 2
  references:
    version: 2
    RefIds:
--- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_WaveComparison.prefab
+++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_WaveComparison.prefab
@@ -212,16 +212,19 @@ MonoBehaviour:
  _Spectrum: {fileID: 11400000, guid: e13a1902b10e34e9fb08e1d09e39b5d4, type: 2}
  _EvaluateSpectrumAtRunTimeEveryFrame: 0
  _RespectShallowWaterAttenuation: 1
+  _OverrideGlobalWindDirection: 1
  _WaveDirectionHeadingAngle: -58.00273
  _OverrideGlobalWindSpeed: 0
  _WindSpeed: 20
  _Resolution: 128
  _DrawSlicesInEditor: 0
  _AlphaSource: 0
+  _Swell: 0
  _ReverseWaveWeight: 0.5
  _ComponentsPerOctave: 8
  _RandomSeed: 0
-  _Version: 1
+  _ManualGeneration: 0
+  _Version: 2
  references:
    version: 2
    RefIds:
@@ -422,12 +425,14 @@ MonoBehaviour:
  _Spectrum: {fileID: 11400000, guid: e13a1902b10e34e9fb08e1d09e39b5d4, type: 2}
  _EvaluateSpectrumAtRunTimeEveryFrame: 0
  _RespectShallowWaterAttenuation: 1
+  _OverrideGlobalWindDirection: 1
  _WaveDirectionHeadingAngle: 0
  _OverrideGlobalWindSpeed: 0
  _WindSpeed: 20
  _Resolution: 128
  _DrawSlicesInEditor: 0
  _AlphaSource: 0
+  _OverrideGlobalWindTurbulence: 1
  _WindTurbulence: 0.145
  _WindAlignment: 0
  _TimeLoopLength: Infinity
@@ -437,7 +442,7 @@ MonoBehaviour:
  _TimeResolution: 4
  _SmallestWavelengthRequired: 2
  _BakedTimeLoopLength: 32
-  _Version: 1
+  _Version: 2
  references:
    version: 2
    RefIds:
--- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_WavePatch.prefab
+++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_WavePatch.prefab
@@ -58,12 +58,14 @@ MonoBehaviour:
  _Spectrum: {fileID: 0}
  _EvaluateSpectrumAtRunTimeEveryFrame: 0
  _RespectShallowWaterAttenuation: 1
+  _OverrideGlobalWindDirection: 1
  _WaveDirectionHeadingAngle: 0
  _OverrideGlobalWindSpeed: 0
  _WindSpeed: 20
  _Resolution: 32
  _DrawSlicesInEditor: 0
  _AlphaSource: 0
+  _OverrideGlobalWindTurbulence: 1
  _WindTurbulence: 0.145
  _WindAlignment: 0
  _TimeLoopLength: Infinity
@@ -73,7 +75,7 @@ MonoBehaviour:
  _TimeResolution: 4
  _SmallestWavelengthRequired: 2
  _BakedTimeLoopLength: 32
-  _Version: 1
+  _Version: 2
  references:
    version: 2
    RefIds: