UnityMirror/dotween-upm-fork
1
0
Fork 0
mirror of https://github.com/Cardidi/dotween-upm-fork.git synced 2025-12-20 01:06:02 +08:00
Code

Join now takes into consideration also interval insertion time

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML
View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param>
</member>
<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>
</member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

BIN
UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll
View File

Binary file not shown.

BIN
UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb
View File

Binary file not shown.

3
UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML
View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param>
</member>
<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>
</member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

BIN
UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll
View File

Binary file not shown.

BIN
UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb
View File

Binary file not shown.

3
UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML
View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param>
</member>
<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>
</member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

BIN
UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll
View File

Binary file not shown.

BIN
UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb
View File

Binary file not shown.

BIN
UnityTests.Unity5/Assets/Resources/DOTweenSettings.asset
View File

Binary file not shown.

2
_DOTween.Assembly/DOTween/DOTween.cs
View File

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

2
_DOTween.Assembly/DOTween/Sequence.cs
View File

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

3
_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs
View File

@ -427,7 +427,8 @@ namespace DG.Tweening
Sequence.DoPrepend(s, t);
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>
public static Sequence Join(this Sequence s, Tween t)
{

3
_DOTween.Assembly/bin/DOTween.XML
View File

@ -2083,7 +2083,8 @@
<param name="t">The tween to prepend</param>
</member>
<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>
</member>
<member name="M:DG.Tweening.TweenSettingsExtensions.Insert(DG.Tweening.Sequence,System.Single,DG.Tweening.Tween)">

BIN
_DOTween.Assembly/bin/DOTween.dll
View File

Binary file not shown.

BIN
_DOTween.Assembly/bin/DOTween.dll.mdb
View File

Binary file not shown.