1
0
mirror of https://github.com/Cardidi/dotween-upm-fork.git synced 2026-02-14 02:58:46 +08:00

Made compatible with Unity 5.4 (removed OnLevelWasLoaded from DOTweenComponent)

This commit is contained in:
Demigiant 2016-03-18 13:08:52 +01:00
parent f3a549436b
commit 08b0f5a677
55 changed files with 32 additions and 13 deletions

3
.gitignore vendored
View File

@ -6,6 +6,7 @@ _DOTween.Assembly/*.suo
_DOTween.Assembly/*.user _DOTween.Assembly/*.user
_DOTween.Assembly/.gitignore _DOTween.Assembly/.gitignore
_DOTween.Assembly/.git _DOTween.Assembly/.git
ExternalPluginsTestsAndExamples* ExternalPluginsTestsAndExamples*
*.Unity*/_ReSharper* *.Unity*/_ReSharper*
*.Unity*/Library *.Unity*/Library
@ -31,3 +32,5 @@ zz builds
zz UnityTests* zz UnityTests*
*.tmp *.tmp
*.pdb *.pdb
UnityTests.Unity5BETA

View File

@ -356,7 +356,6 @@
<summary> <summary>
Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL) Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL)
and returns the total number of invalid tweens found and removed. and returns the total number of invalid tweens found and removed.
<para>Automatically called when loading a new scene if <see cref="F:DG.Tweening.DOTween.useSafeMode"/> is TRUE.</para>
BEWARE: this is a slightly expensive operation so use it with care BEWARE: this is a slightly expensive operation so use it with care
</summary> </summary>
</member> </member>

View File

@ -356,7 +356,6 @@
<summary> <summary>
Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL) Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL)
and returns the total number of invalid tweens found and removed. and returns the total number of invalid tweens found and removed.
<para>Automatically called when loading a new scene if <see cref="F:DG.Tweening.DOTween.useSafeMode"/> is TRUE.</para>
BEWARE: this is a slightly expensive operation so use it with care BEWARE: this is a slightly expensive operation so use it with care
</summary> </summary>
</member> </member>

View File

@ -356,7 +356,6 @@
<summary> <summary>
Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL) Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL)
and returns the total number of invalid tweens found and removed. and returns the total number of invalid tweens found and removed.
<para>Automatically called when loading a new scene if <see cref="F:DG.Tweening.DOTween.useSafeMode"/> is TRUE.</para>
BEWARE: this is a slightly expensive operation so use it with care BEWARE: this is a slightly expensive operation so use it with care
</summary> </summary>
</member> </member>

View File

@ -13,6 +13,10 @@ PluginImporter:
enabled: 1 enabled: 1
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -13,6 +13,10 @@ PluginImporter:
enabled: 1 enabled: 1
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -13,6 +13,10 @@ PluginImporter:
enabled: 0 enabled: 0
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -13,6 +13,10 @@ PluginImporter:
enabled: 1 enabled: 1
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -13,6 +13,10 @@ PluginImporter:
enabled: 0 enabled: 0
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -9,7 +9,7 @@ public class ShakeInverse : MonoBehaviour
IEnumerator Start() IEnumerator Start()
{ {
yield return new WaitForSeconds(0.6f); yield return new WaitForSeconds(0.6f);
Tween t = trans.DOShakePosition(4, 2).SetAutoKill(false); Tween t = trans.DOShakePosition(2, 1, 14).SetAutoKill(false);
t.Complete(); t.Complete();
t.PlayBackwards(); t.PlayBackwards();
} }

View File

@ -1,2 +1,2 @@
m_EditorVersion: 5.3.2f1 m_EditorVersion: 5.4.0b10
m_StandardAssetsVersion: 0 m_StandardAssetsVersion: 0

View File

@ -74,10 +74,11 @@ namespace DG.Tweening.Core
} }
} }
void OnLevelWasLoaded() // Removed to allow compatibility with Unity 5.4 and later
{ // void OnLevelWasLoaded()
if (DOTween.useSafeMode) DOTween.Validate(); // {
} // if (DOTween.useSafeMode) DOTween.Validate();
// }
void OnDrawGizmos() void OnDrawGizmos()
{ {

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.190"; public static readonly string Version = "1.1.200";
/////////////////////////////////////////////// ///////////////////////////////////////////////
// Options //////////////////////////////////// // Options ////////////////////////////////////
@ -253,7 +253,6 @@ namespace DG.Tweening
/// <summary> /// <summary>
/// Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL) /// Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL)
/// and returns the total number of invalid tweens found and removed. /// and returns the total number of invalid tweens found and removed.
/// <para>Automatically called when loading a new scene if <see cref="useSafeMode"/> is TRUE.</para>
/// BEWARE: this is a slightly expensive operation so use it with care /// BEWARE: this is a slightly expensive operation so use it with care
/// </summary> /// </summary>
public static int Validate() public static int Validate()

View File

@ -356,7 +356,6 @@
<summary> <summary>
Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL) Checks all active tweens to find and remove eventually invalid ones (usually because their targets became NULL)
and returns the total number of invalid tweens found and removed. and returns the total number of invalid tweens found and removed.
<para>Automatically called when loading a new scene if <see cref="F:DG.Tweening.DOTween.useSafeMode"/> is TRUE.</para>
BEWARE: this is a slightly expensive operation so use it with care BEWARE: this is a slightly expensive operation so use it with care
</summary> </summary>
</member> </member>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.