升级6.4.升级水,升级天气
This commit is contained in:
@@ -12,11 +12,6 @@ namespace WaveHarmonic.Crest
|
||||
[@HelpURL("Manual/TimeProviders.html#supporting-pause")]
|
||||
public sealed partial class CustomTimeProvider : TimeProvider
|
||||
{
|
||||
[SerializeField, HideInInspector]
|
||||
#pragma warning disable 414
|
||||
int _Version = 0;
|
||||
#pragma warning restore 414
|
||||
|
||||
[Tooltip("Freeze progression of time. Only works properly in Play mode.")]
|
||||
[@GenerateAPI]
|
||||
[SerializeField]
|
||||
@@ -24,22 +19,24 @@ namespace WaveHarmonic.Crest
|
||||
|
||||
[Tooltip("Whether to override the water simulation time.")]
|
||||
[@GenerateAPI]
|
||||
[SerializeField]
|
||||
[@InlineToggle]
|
||||
[@SerializeField]
|
||||
bool _OverrideTime = false;
|
||||
|
||||
[Tooltip("The time override value.")]
|
||||
[@Predicated(nameof(_OverrideTime))]
|
||||
[@Enable(nameof(_OverrideTime))]
|
||||
[@GenerateAPI(name: "TimeOverride")]
|
||||
[@DecoratedField, SerializeField]
|
||||
float _Time = 0f;
|
||||
|
||||
[Tooltip("Whether to override the water simulation time.\n\nThis in particular affects dynamic elements of the simulation like the foam simulation and the ripple simulation.")]
|
||||
[@GenerateAPI]
|
||||
[SerializeField]
|
||||
[@InlineToggle]
|
||||
[@SerializeField]
|
||||
bool _OverrideDeltaTime = false;
|
||||
|
||||
[Tooltip("The delta time override value.")]
|
||||
[@Predicated(nameof(_OverrideDeltaTime))]
|
||||
[@Enable(nameof(_OverrideDeltaTime))]
|
||||
[@GenerateAPI]
|
||||
[@DecoratedField, SerializeField]
|
||||
float _DeltaTime = 0f;
|
||||
|
||||
@@ -13,11 +13,6 @@ namespace WaveHarmonic.Crest
|
||||
[@HelpURL("Manual/TimeProviders.html#timelines-and-cutscenes")]
|
||||
public sealed partial class CutsceneTimeProvider : TimeProvider
|
||||
{
|
||||
[SerializeField, HideInInspector]
|
||||
#pragma warning disable 414
|
||||
int _Version = 0;
|
||||
#pragma warning restore 414
|
||||
|
||||
#if d_ModuleUnityDirector
|
||||
[Tooltip("Playable Director to take time from.")]
|
||||
[@GenerateAPI(symbol: "d_ModuleUnityDirector")]
|
||||
|
||||
@@ -8,44 +8,7 @@ namespace WaveHarmonic.Crest
|
||||
/// </summary>
|
||||
sealed class DefaultTimeProvider : ITimeProvider
|
||||
{
|
||||
public float Time
|
||||
{
|
||||
get
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
if (UnityEngine.Application.isPlaying)
|
||||
{
|
||||
return UnityEngine.Time.time;
|
||||
}
|
||||
else
|
||||
{
|
||||
return WaterRenderer.EditorTime;
|
||||
}
|
||||
#else
|
||||
return UnityEngine.Time.time;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
public float Delta
|
||||
{
|
||||
get
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
if (UnityEngine.Application.isPlaying)
|
||||
{
|
||||
return UnityEngine.Time.deltaTime;
|
||||
}
|
||||
else
|
||||
{
|
||||
return WaterRenderer.EditorDeltaTime;
|
||||
}
|
||||
#else
|
||||
return UnityEngine.Time.deltaTime;
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
||||
}
|
||||
public float Time => UnityEngine.Time.time;
|
||||
public float Delta => UnityEngine.Time.deltaTime;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,11 +17,6 @@ namespace WaveHarmonic.Crest
|
||||
[@HelpURL("Manual/TimeProviders.html#network-synchronisation")]
|
||||
public sealed class NetworkedTimeProvider : TimeProvider
|
||||
{
|
||||
[SerializeField, HideInInspector]
|
||||
#pragma warning disable 414
|
||||
int _Version = 0;
|
||||
#pragma warning restore 414
|
||||
|
||||
/// <summary>
|
||||
/// If Time.time on this client is 1.5s ahead of the shared/server Time.time, set
|
||||
/// this field to -1.5.
|
||||
|
||||
Reference in New Issue
Block a user