1
0
mirror of https://github.com/Cardidi/dotween-upm-fork.git synced 2025-12-20 09:16:02 +08:00

Join now takes into consideration also interval insertion time

This commit is contained in:
Demigiant 2015-10-11 12:39:19 +02:00
parent aea9d19754
commit 47ee71f52e
16 changed files with 13 additions and 6 deletions

View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param> <param name="t">The tween to prepend</param>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)">
<summary>Inserts the given tween at the same time position of the last tween or callback added to the Sequence. <summary>Inserts the given tween at the same time position of the last tween, callback or intervale added to the Sequence.
Note that, in case of a Join after an interval, the insertion time will be the time where the interval starts, not where it finishes.
Has no effect if the Sequence has already started</summary> Has no effect if the Sequence has already started</summary>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param> <param name="t">The tween to prepend</param>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)">
<summary>Inserts the given tween at the same time position of the last tween or callback added to the Sequence. <summary>Inserts the given tween at the same time position of the last tween, callback or intervale added to the Sequence.
Note that, in case of a Join after an interval, the insertion time will be the time where the interval starts, not where it finishes.
Has no effect if the Sequence has already started</summary> Has no effect if the Sequence has already started</summary>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param> <param name="t">The tween to prepend</param>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)">
<summary>Inserts the given tween at the same time position of the last tween or callback added to the Sequence. <summary>Inserts the given tween at the same time position of the last tween, callback or intervale added to the Sequence.
Note that, in case of a Join after an interval, the insertion time will be the time where the interval starts, not where it finishes.
Has no effect if the Sequence has already started</summary> Has no effect if the Sequence has already started</summary>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

View File

@ -32,7 +32,7 @@ namespace DG.Tweening
public class DOTween public class DOTween
{ {
/// <summary>DOTween's version</summary> /// <summary>DOTween's version</summary>
public static readonly string Version = "1.1.005"; public static readonly string Version = "1.1.010";
/////////////////////////////////////////////// ///////////////////////////////////////////////
// Options //////////////////////////////////// // Options ////////////////////////////////////

View File

@ -80,12 +80,14 @@ namespace DG.Tweening
internal static Sequence DoAppendInterval(Sequence inSequence, float interval) internal static Sequence DoAppendInterval(Sequence inSequence, float interval)
{ {
inSequence.lastTweenInsertTime = inSequence.duration;
inSequence.duration += interval; inSequence.duration += interval;
return inSequence; return inSequence;
} }
internal static Sequence DoPrependInterval(Sequence inSequence, float interval) internal static Sequence DoPrependInterval(Sequence inSequence, float interval)
{ {
inSequence.lastTweenInsertTime = 0;
inSequence.duration += interval; inSequence.duration += interval;
int len = inSequence._sequencedObjs.Count; int len = inSequence._sequencedObjs.Count;
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {

View File

@ -427,7 +427,8 @@ namespace DG.Tweening
Sequence.DoPrepend(s, t); Sequence.DoPrepend(s, t);
return s; return s;
} }
/// <summary>Inserts the given tween at the same time position of the last tween or callback added to the Sequence. /// <summary>Inserts the given tween at the same time position of the last tween, callback or intervale added to the Sequence.
/// Note that, in case of a Join after an interval, the insertion time will be the time where the interval starts, not where it finishes.
/// Has no effect if the Sequence has already started</summary> /// Has no effect if the Sequence has already started</summary>
public static Sequence Join(this Sequence s, Tween t) public static Sequence Join(this Sequence s, Tween t)
{ {

View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param> <param name="t">The tween to prepend</param>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Join(DG.Tweening.Sequence,DG.Tweening.Tween)">
<summary>Inserts the given tween at the same time position of the last tween or callback added to the Sequence. <summary>Inserts the given tween at the same time position of the last tween, callback or intervale added to the Sequence.
Note that, in case of a Join after an interval, the insertion time will be the time where the interval starts, not where it finishes.
Has no effect if the Sequence has already started</summary> Has no effect if the Sequence has already started</summary>
</member> </member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)"> <member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

Binary file not shown.