diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index b750ccb..b0cb652 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -372,6 +372,13 @@ BEWARE: this is a slightly expensive operation so use it with care + + + Updates all tweens that are set to . + + Manual deltaTime + Unscaled delta time (used with tweens set as timeScaleIndependent) + Tweens a property or field to the given value using default plugins A getter for the field or property to tween. @@ -2515,5 +2522,8 @@ Updates using FixedUpdate calls + + Updates using manual update calls + diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 3db2189..7f5b09f 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb index 5ea7b96..0f08834 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll index e4f3544..2c3766d 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb index c89a0d5..440d4e7 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll index db10609..0801fcb 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 3d14cd7..cd171c2 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll index 652fe75..8e40d36 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 6d6066a..38d4608 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 9c5d3a4..c3946fe 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index fa4ced6..1c1c358 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index b750ccb..b0cb652 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -372,6 +372,13 @@ BEWARE: this is a slightly expensive operation so use it with care + + + Updates all tweens that are set to . + + Manual deltaTime + Unscaled delta time (used with tweens set as timeScaleIndependent) + Tweens a property or field to the given value using default plugins A getter for the field or property to tween. @@ -2515,5 +2522,8 @@ Updates using FixedUpdate calls + + Updates using manual update calls + diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 3db2189..7f5b09f 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb index 5ea7b96..0f08834 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll index e4f3544..2c3766d 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb index c89a0d5..440d4e7 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll index db10609..0801fcb 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 3d14cd7..cd171c2 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll index 652fe75..8e40d36 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 6d6066a..38d4608 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 9c5d3a4..c3946fe 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index fa4ced6..1c1c358 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index b750ccb..b0cb652 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -372,6 +372,13 @@ BEWARE: this is a slightly expensive operation so use it with care + + + Updates all tweens that are set to . + + Manual deltaTime + Unscaled delta time (used with tweens set as timeScaleIndependent) + Tweens a property or field to the given value using default plugins A getter for the field or property to tween. @@ -2515,5 +2522,8 @@ Updates using FixedUpdate calls + + Updates using manual update calls + diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 3db2189..7f5b09f 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb index 5ea7b96..0f08834 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index e4f3544..2c3766d 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb index c89a0d5..440d4e7 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index db10609..0801fcb 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 3d14cd7..cd171c2 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index 652fe75..8e40d36 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 6d6066a..38d4608 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 9c5d3a4..c3946fe 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index fa4ced6..1c1c358 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/_Tests/UpdateTypes.cs b/UnityTests.Unity5/Assets/_Tests/UpdateTypes.cs index daef8cb..28afbd9 100644 --- a/UnityTests.Unity5/Assets/_Tests/UpdateTypes.cs +++ b/UnityTests.Unity5/Assets/_Tests/UpdateTypes.cs @@ -8,6 +8,8 @@ public class UpdateTypes : BrainBase public bool independentUpdate; public float timeScale = 1; + bool runningManual = false; + void Start() { Time.timeScale = timeScale; @@ -16,5 +18,23 @@ public class UpdateTypes : BrainBase targets[1].DOMoveX(5, 2).SetUpdate(UpdateType.Late, independentUpdate).SetLoops(-1, LoopType.Yoyo); targets[2].DOMoveX(5, 2).SetUpdate(UpdateType.Fixed, independentUpdate).SetLoops(-1, LoopType.Yoyo); targets[3].GetComponent().DOMoveX(5, 2).SetUpdate(UpdateType.Fixed, independentUpdate).SetLoops(-1, LoopType.Yoyo); + targets[4].DOMoveX(5, 2).SetUpdate(UpdateType.Manual, independentUpdate).SetLoops(-1, LoopType.Yoyo); } + + void Update() + { + if (Input.GetKeyDown(KeyCode.Space)) { + runningManual = !runningManual; + if (runningManual) this.StartCoroutine(CO_ManualUpdate()); + else this.StopAllCoroutines(); + } + } + + IEnumerator CO_ManualUpdate() + { + while (true) { + yield return null; + DOTween.ManualUpdate(Time.deltaTime, Time.unscaledDeltaTime); + } + } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/UpdateTypes.unity b/UnityTests.Unity5/Assets/_Tests/UpdateTypes.unity index 928db79..32c42c6 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/UpdateTypes.unity and b/UnityTests.Unity5/Assets/_Tests/UpdateTypes.unity differ diff --git a/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs b/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs index 5e1243e..65d2d6f 100644 --- a/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs +++ b/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs @@ -75,6 +75,13 @@ namespace DG.Tweening.Core } } + internal void ManualUpdate(float deltaTime, float unscaledDeltaTime) + { + if (TweenManager.hasActiveManualTweens) { + TweenManager.Update(UpdateType.Manual, deltaTime * DOTween.timeScale, unscaledDeltaTime * DOTween.timeScale); + } + } + // Removed to allow compatibility with Unity 5.4 and later // void OnLevelWasLoaded() // { diff --git a/_DOTween.Assembly/DOTween/Core/TweenManager.cs b/_DOTween.Assembly/DOTween/Core/TweenManager.cs index b5dcf29..ae015ac 100644 --- a/_DOTween.Assembly/DOTween/Core/TweenManager.cs +++ b/_DOTween.Assembly/DOTween/Core/TweenManager.cs @@ -21,8 +21,8 @@ namespace DG.Tweening.Core internal static int maxActive = _DefaultMaxTweeners + _DefaultMaxSequences; // Always equal to maxTweeners + maxSequences internal static int maxTweeners = _DefaultMaxTweeners; // Always >= maxSequences internal static int maxSequences = _DefaultMaxSequences; // Always <= maxTweeners - internal static bool hasActiveTweens, hasActiveDefaultTweens, hasActiveLateTweens, hasActiveFixedTweens; - internal static int totActiveTweens, totActiveDefaultTweens, totActiveLateTweens, totActiveFixedTweens; + internal static bool hasActiveTweens, hasActiveDefaultTweens, hasActiveLateTweens, hasActiveFixedTweens, hasActiveManualTweens; + internal static int totActiveTweens, totActiveDefaultTweens, totActiveLateTweens, totActiveFixedTweens, totActiveManualTweens; internal static int totActiveTweeners, totActiveSequences; internal static int totPooledTweeners, totPooledSequences; internal static int totTweeners, totSequences; // Both active and pooled @@ -141,12 +141,21 @@ namespace DG.Tweening.Core if (t.updateType == UpdateType.Normal) { totActiveDefaultTweens--; hasActiveDefaultTweens = totActiveDefaultTweens > 0; - } else if (t.updateType == UpdateType.Fixed) { - totActiveFixedTweens--; - hasActiveFixedTweens = totActiveFixedTweens > 0; } else { - totActiveLateTweens--; - hasActiveLateTweens = totActiveLateTweens > 0; + switch (t.updateType) { + case UpdateType.Fixed: + totActiveFixedTweens--; + hasActiveFixedTweens = totActiveFixedTweens > 0; + break; + case UpdateType.Late: + totActiveLateTweens--; + hasActiveLateTweens = totActiveLateTweens > 0; + break; + default: // Manual + totActiveManualTweens--; + hasActiveManualTweens = totActiveManualTweens > 0; + break; + } } // Assign new one t.updateType = updateType; @@ -154,12 +163,21 @@ namespace DG.Tweening.Core if (updateType == UpdateType.Normal) { totActiveDefaultTweens++; hasActiveDefaultTweens = true; - } else if (updateType == UpdateType.Fixed) { - totActiveFixedTweens++; - hasActiveFixedTweens = true; } else { - totActiveLateTweens++; - hasActiveLateTweens = true; + switch (updateType) { + case UpdateType.Fixed: + totActiveFixedTweens++; + hasActiveFixedTweens = true; + break; + case UpdateType.Late: + totActiveLateTweens++; + hasActiveLateTweens = true; + break; + default: // Manual + totActiveManualTweens++; + hasActiveManualTweens = true; + break; + } } } @@ -178,8 +196,8 @@ namespace DG.Tweening.Core if (t != null) Despawn(t, false); } ClearTweenArray(_activeTweens); - hasActiveTweens = hasActiveDefaultTweens = hasActiveLateTweens = hasActiveFixedTweens = false; - totActiveTweens = totActiveDefaultTweens = totActiveLateTweens = totActiveFixedTweens = 0; + hasActiveTweens = hasActiveDefaultTweens = hasActiveLateTweens = hasActiveFixedTweens = hasActiveManualTweens = false; + totActiveTweens = totActiveDefaultTweens = totActiveLateTweens = totActiveFixedTweens = totActiveManualTweens = 0; totActiveTweeners = totActiveSequences = 0; _maxActiveLookupId = _reorganizeFromId = -1; _requiresActiveReorganization = false; @@ -263,8 +281,8 @@ namespace DG.Tweening.Core } ClearTweenArray(_activeTweens); - hasActiveTweens = hasActiveDefaultTweens = hasActiveLateTweens = hasActiveFixedTweens = false; - totActiveTweens = totActiveDefaultTweens = totActiveLateTweens = totActiveFixedTweens = 0; + hasActiveTweens = hasActiveDefaultTweens = hasActiveLateTweens = hasActiveFixedTweens = hasActiveManualTweens = false; + totActiveTweens = totActiveDefaultTweens = totActiveLateTweens = totActiveFixedTweens = totActiveManualTweens = 0; totActiveTweeners = totActiveSequences = 0; _maxActiveLookupId = _reorganizeFromId = -1; _requiresActiveReorganization = false; @@ -801,12 +819,21 @@ namespace DG.Tweening.Core if (t.updateType == UpdateType.Normal) { totActiveDefaultTweens++; hasActiveDefaultTweens = true; - } else if (t.updateType == UpdateType.Fixed) { - totActiveFixedTweens++; - hasActiveFixedTweens = true; } else { - totActiveLateTweens++; - hasActiveLateTweens = true; + switch (t.updateType) { + case UpdateType.Fixed: + totActiveFixedTweens++; + hasActiveFixedTweens = true; + break; + case UpdateType.Late: + totActiveLateTweens++; + hasActiveLateTweens = true; + break; + default: + totActiveManualTweens++; + hasActiveManualTweens = true; + break; + } } totActiveTweens++; @@ -870,19 +897,32 @@ namespace DG.Tweening.Core } else { Debugger.LogRemoveActiveTweenError("totActiveDefaultTweens"); } - } else if (t.updateType == UpdateType.Fixed) { - if (totActiveFixedTweens > 0) { - totActiveFixedTweens--; - hasActiveFixedTweens = totActiveFixedTweens > 0; - } else { - Debugger.LogRemoveActiveTweenError("totActiveFixedTweens"); - } } else { - if (totActiveLateTweens > 0) { - totActiveLateTweens--; - hasActiveLateTweens = totActiveLateTweens > 0; - } else { - Debugger.LogRemoveActiveTweenError("totActiveLateTweens"); + switch (t.updateType) { + case UpdateType.Fixed: + if (totActiveFixedTweens > 0) { + totActiveFixedTweens--; + hasActiveFixedTweens = totActiveFixedTweens > 0; + } else { + Debugger.LogRemoveActiveTweenError("totActiveFixedTweens"); + } + break; + case UpdateType.Late: + if (totActiveLateTweens > 0) { + totActiveLateTweens--; + hasActiveLateTweens = totActiveLateTweens > 0; + } else { + Debugger.LogRemoveActiveTweenError("totActiveLateTweens"); + } + break; + default: + if (totActiveManualTweens > 0) { + totActiveManualTweens--; + hasActiveManualTweens = totActiveManualTweens > 0; + } else { + Debugger.LogRemoveActiveTweenError("totActiveManualTweens"); + } + break; } } totActiveTweens--; diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 88a44c7..c186159 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -32,7 +32,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.1.625"; + public static readonly string Version = "1.1.640"; /////////////////////////////////////////////// // Options //////////////////////////////////// @@ -267,6 +267,17 @@ namespace DG.Tweening return TweenManager.Validate(); } + /// + /// Updates all tweens that are set to . + /// + /// Manual deltaTime + /// Unscaled delta time (used with tweens set as timeScaleIndependent) + public static void ManualUpdate(float deltaTime, float unscaledDeltaTime) + { + InitCheck(); + instance.ManualUpdate(deltaTime, unscaledDeltaTime); + } + #endregion // =================================================================================== diff --git a/_DOTween.Assembly/DOTween/UpdateType.cs b/_DOTween.Assembly/DOTween/UpdateType.cs index 1bc7143..b5ea712 100644 --- a/_DOTween.Assembly/DOTween/UpdateType.cs +++ b/_DOTween.Assembly/DOTween/UpdateType.cs @@ -16,6 +16,8 @@ namespace DG.Tweening /// Updates every frame during LateUpdate calls Late, /// Updates using FixedUpdate calls - Fixed + Fixed, + /// Updates using manual update calls + Manual } } \ No newline at end of file diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index b750ccb..b0cb652 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -372,6 +372,13 @@ BEWARE: this is a slightly expensive operation so use it with care + + + Updates all tweens that are set to . + + Manual deltaTime + Unscaled delta time (used with tweens set as timeScaleIndependent) + Tweens a property or field to the given value using default plugins A getter for the field or property to tween. @@ -2515,5 +2522,8 @@ Updates using FixedUpdate calls + + Updates using manual update calls + diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 3db2189..7f5b09f 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll and b/_DOTween.Assembly/bin/DOTween.dll differ diff --git a/_DOTween.Assembly/bin/DOTween.dll.mdb b/_DOTween.Assembly/bin/DOTween.dll.mdb index 5ea7b96..0f08834 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll b/_DOTween.Assembly/bin/DOTween43.dll index e4f3544..2c3766d 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll and b/_DOTween.Assembly/bin/DOTween43.dll differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll.mdb b/_DOTween.Assembly/bin/DOTween43.dll.mdb index c89a0d5..440d4e7 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll.mdb and b/_DOTween.Assembly/bin/DOTween43.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll b/_DOTween.Assembly/bin/DOTween46.dll index db10609..0801fcb 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll and b/_DOTween.Assembly/bin/DOTween46.dll differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll.mdb b/_DOTween.Assembly/bin/DOTween46.dll.mdb index 3d14cd7..cd171c2 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll.mdb and b/_DOTween.Assembly/bin/DOTween46.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll b/_DOTween.Assembly/bin/DOTween50.dll index 652fe75..8e40d36 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll and b/_DOTween.Assembly/bin/DOTween50.dll differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll.mdb b/_DOTween.Assembly/bin/DOTween50.dll.mdb index 6d6066a..38d4608 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll.mdb and b/_DOTween.Assembly/bin/DOTween50.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll index 9c5d3a4..c3946fe 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb index fa4ced6..1c1c358 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ