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

Renamed DOMixedMove to DOBlendableMove

Browse Source
This commit is contained in:
Daniele Giardini 2015-03-23 18:24:52 +01:00
parent a7458f0445
commit f2dd1a44d9
15 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1021,17 +1021,17 @@
<param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's position BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOLocalMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableLocalMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's localPosition BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>

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.

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

@ -1021,17 +1021,17 @@
<param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's position BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOLocalMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableLocalMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's localPosition BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>

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.

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

@ -1021,17 +1021,17 @@
<param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's position BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOLocalMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableLocalMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's localPosition BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>

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.

25
UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs
View File

@ -5,30 +5,11 @@ using System.Collections;
public class Temp : BrainBase public class Temp : BrainBase
{ {
public Image img;
Sequence _seq;
void Start() void Start()
{ {
Debug.Log("START"); Debug.Log("Creating empty sequences");
_seq = DOTween.Sequence().SetId("SEQ"); for (int i = 0; i < 100; ++i) {
_seq.Append(img.DOFade(1, 0.5f)); DOTween.Sequence();
_seq.AppendInterval(3f);
_seq.Append(img.DOFade(0, 0.5f));
_seq.AppendCallback(BalloonComplete);
// _seq.OnComplete(BalloonComplete);
} }
void BalloonComplete()
{
Debug.Log("Complete");
_seq.Rewind();
Debug.Log("Rewind called");
}
public void Goforit()
{
Debug.Log("GO");
_seq.Restart();
} }
} }

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

@ -21,7 +21,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.0.335"; public static readonly string Version = "1.0.336";
/////////////////////////////////////////////// ///////////////////////////////////////////////
// Options //////////////////////////////////// // Options ////////////////////////////////////

12
_DOTween.Assembly/DOTween/ShortcutExtensions.cs
View File

@ -379,13 +379,13 @@ namespace DG.Tweening
.SetOptions(AxisConstraint.Z, snapping).SetTarget(target); .SetOptions(AxisConstraint.Z, snapping).SetTarget(target);
} }
/// <summary>Tweens a Transform's position BY the given value (as if it was set to relative), /// <summary>EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative),
/// in a way that allows other DOMixedMoveBy tweens to work together on the same target, /// in a way that allows other DOBlendableMove tweens to work together on the same target,
/// instead than fight each other as multiple DOMove would do. /// instead than fight each other as multiple DOMove would do.
/// Also stores the transform as the tween's target so it can be used for filtered operations</summary> /// Also stores the transform as the tween's target so it can be used for filtered operations</summary>
/// <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> /// <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> /// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
public static Tweener DOMixedMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) public static Tweener DOBlendableMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false)
{ {
Vector3 to = Vector3.zero; Vector3 to = Vector3.zero;
return DOTween.To(() => to, x => { return DOTween.To(() => to, x => {
@ -396,13 +396,13 @@ namespace DG.Tweening
.SetOptions(snapping).SetTarget(target); .SetOptions(snapping).SetTarget(target);
} }
/// <summary>Tweens a Transform's localPosition BY the given value (as if it was set to relative), /// <summary>EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative),
/// in a way that allows other DOMixedMoveBy tweens to work together on the same target, /// in a way that allows other DOBlendableMove tweens to work together on the same target,
/// instead than fight each other as multiple DOMove would do. /// instead than fight each other as multiple DOMove would do.
/// Also stores the transform as the tween's target so it can be used for filtered operations</summary> /// Also stores the transform as the tween's target so it can be used for filtered operations</summary>
/// <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> /// <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> /// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
public static Tweener DOLocalMixedMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) public static Tweener DOBlendableLocalMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false)
{ {
Vector3 to = Vector3.zero; Vector3 to = Vector3.zero;
return DOTween.To(() => to, x => { return DOTween.To(() => to, x => {

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

@ -1021,17 +1021,17 @@
<param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's position BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>
<param name="snapping">If TRUE the tween will smoothly snap all values to integers</param> <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
</member> </member>
<member name="M:DG.Tweening.ShortcutExtensions.DOLocalMixedMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)"> <member name="M:DG.Tweening.ShortcutExtensions.DOBlendableLocalMoveBy(UnityEngine.Transform,UnityEngine.Vector3,System.Single,System.Boolean)">
<summary>Tweens a Transform's localPosition BY the given value (as if it was set to relative), <summary>EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative),
in a way that allows other DOMixedMoveBy tweens to work together on the same target, in a way that allows other DOBlendableMove tweens to work together on the same target,
instead than fight each other as multiple DOMove would do. instead than fight each other as multiple DOMove would do.
Also stores the transform as the tween's target so it can be used for filtered operations</summary> Also stores the transform as the tween's target so it can be used for filtered operations</summary>
<param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param> <param name="byValue">The end value to reach</param><param name="duration">The duration of the tween</param>

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.