1
0
mirror of https://github.com/Cardidi/dotween-upm-fork.git synced 2026-02-04 22:34:56 +08:00

Temporary fix for TweenManager.RemoveActiveTween setting negative indexes

This commit is contained in:
Demigiant 2015-11-26 21:33:26 +01:00
parent cbb566d6da
commit fd1cb57ddd
66 changed files with 407 additions and 25 deletions

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: c3ed210e88bf58b45994d711d3fcdc13
folderAsset: yes
timeCreated: 1448276279
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ec74bdce14071354292c329fa0dbf73f
timeCreated: 1448276279
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,20 @@
fileFormatVersion: 2
guid: 0e918bd09f1c1a54d96a3f043f563624
timeCreated: 1448276280
licenseType: Free
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Any:
enabled: 1
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 67d80e8a6a05c3f43957177331db8134
timeCreated: 1448276291
licenseType: Free
TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 335a6a8d750fde54299fe862d07f5578
folderAsset: yes
timeCreated: 1448276279
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d0caa488012e17f499e0e5fd1a33040f
timeCreated: 1448276279
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,20 @@
fileFormatVersion: 2
guid: 97579fca0722c314da63574d957b1212
timeCreated: 1448276284
licenseType: Free
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4,78 +4,78 @@
<name>DemiEditor</name>
</assembly>
<members>
<member name="T:DG.DemiEditor.DeFileUtils">
<member name="T:DG.DemiEditor.DeEditorFileUtils">
<summary>
File utils
</summary>
</member>
<member name="F:DG.DemiEditor.DeFileUtils.ADBPathSlash">
<member name="F:DG.DemiEditor.DeEditorFileUtils.ADBPathSlash">
<summary>Path slash for AssetDatabase format</summary>
</member>
<member name="F:DG.DemiEditor.DeFileUtils.ADBPathSlashToReplace">
<member name="F:DG.DemiEditor.DeEditorFileUtils.ADBPathSlashToReplace">
<summary>Path slash to replace for AssetDatabase format</summary>
</member>
<member name="F:DG.DemiEditor.DeFileUtils.PathSlash">
<member name="F:DG.DemiEditor.DeEditorFileUtils.PathSlash">
<summary>Current OS path slash</summary>
</member>
<member name="F:DG.DemiEditor.DeFileUtils.PathSlashToReplace">
<member name="F:DG.DemiEditor.DeEditorFileUtils.PathSlashToReplace">
<summary>Path slash to replace on current OS</summary>
</member>
<member name="P:DG.DemiEditor.DeFileUtils.projectPath">
<member name="P:DG.DemiEditor.DeEditorFileUtils.projectPath">
<summary>
Full path to project directory, without final slash.
</summary>
</member>
<member name="P:DG.DemiEditor.DeFileUtils.assetsPath">
<member name="P:DG.DemiEditor.DeEditorFileUtils.assetsPath">
<summary>
Full path to project's Assets directory, without final slash.
</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.ADBPathToFullPath(System.String)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.ADBPathToFullPath(System.String)">
<summary>
Converts the given project-relative path to a full path
</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.AssetExists(System.String)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.AssetExists(System.String)">
<summary>
Returns TRUE if the file/directory at the given path exists.
</summary>
<param name="adbPath">Path, relative to Unity's project folder</param>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.GUIDToExistingAssetPath(System.String)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.GUIDToExistingAssetPath(System.String)">
<summary>
Returns the asset path of the given GUID (relative to Unity project's folder),
or an empty string if either the GUID is invalid or the related path doesn't exist.
</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.MonoInstanceADBPath(UnityEngine.ScriptableObject)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.MonoInstanceADBPath(UnityEngine.ScriptableObject)">
<summary>Returns the adb path to the given ScriptableObject</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.MonoInstanceADBPath(UnityEngine.MonoBehaviour)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.MonoInstanceADBPath(UnityEngine.MonoBehaviour)">
<summary>Returns the adb path to the given MonoBehaviour</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.MonoInstanceADBDir(UnityEngine.ScriptableObject)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.MonoInstanceADBDir(UnityEngine.ScriptableObject)">
<summary>Returns the adb directory that contains the given ScriptableObject without final slash</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.MonoInstanceADBDir(UnityEngine.MonoBehaviour)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.MonoInstanceADBDir(UnityEngine.MonoBehaviour)">
<summary>Returns the adb directory that contains the given MonoBehaviour without final slash</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.SetScriptExecutionOrder(UnityEngine.MonoBehaviour,System.Int32)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.SetScriptExecutionOrder(UnityEngine.MonoBehaviour,System.Int32)">
<summary>
Sets the script execution order of the given MonoBehaviour
</summary>
</member>
<member name="M:DG.DemiEditor.DeFileUtils.GetScriptExecutionOrder(UnityEngine.MonoBehaviour)">
<member name="M:DG.DemiEditor.DeEditorFileUtils.GetScriptExecutionOrder(UnityEngine.MonoBehaviour)">
<summary>
Gets the script execution order of the given MonoBehaviour
</summary>
</member>
<member name="T:DG.DemiEditor.DePanelUtils">
<member name="T:DG.DemiEditor.DeEditorPanelUtils">
<summary>
Utilities for Editor Panels.
</summary>
</member>
<member name="M:DG.DemiEditor.DePanelUtils.ConnectToSourceAsset``1(System.String,System.Boolean)">
<member name="M:DG.DemiEditor.DeEditorPanelUtils.ConnectToSourceAsset``1(System.String,System.Boolean)">
<summary>
Connects to a <see cref="T:UnityEngine.ScriptableObject"/> asset.
If the asset already exists at the given path, loads it and returns it.
@ -91,6 +91,21 @@
and automatically returns the correct one when converted to GUIStyle
</summary>
</member>
<member name="M:DG.DemiEditor.DeEditorSoundUtils.Play(UnityEngine.AudioClip)">
<summary>
Plays the given clip in the Editor
</summary>
</member>
<member name="M:DG.DemiEditor.DeEditorSoundUtils.Stop(UnityEngine.AudioClip)">
<summary>
Stops playing the given clip.
</summary>
</member>
<member name="M:DG.DemiEditor.DeEditorSoundUtils.StopAll">
<summary>
Stops all clips playing.
</summary>
</member>
<member name="T:DG.DemiEditor.AssemblyExtensions">
<summary>
Assembly extensions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3623fbfbdde742643a94be536ab3eef9
timeCreated: 1448276291
licenseType: Free
TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: e6ee062670a16c74582e82e0164b78a4
folderAsset: yes
timeCreated: 1448276279
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: d3e15b806a8368742ba6f10e794d7b76
timeCreated: 1448306926
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 0
linearTexture: 1
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -3
maxTextureSize: 16
textureSettings:
filterMode: 0
aniso: 1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 2
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: 71879d62d511fa84ba1848adb0340f6d
timeCreated: 1448306926
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 0
linearTexture: 1
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -3
maxTextureSize: 16
textureSettings:
filterMode: 0
aniso: 1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 2
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: 65ae76e1fd9a0ee4293d12051496ed72
timeCreated: 1448306926
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 0
linearTexture: 1
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -3
maxTextureSize: 16
textureSettings:
filterMode: 0
aniso: 1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 2
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: ae107913aafb6a646847dd3fb4a82d01
timeCreated: 1448276291
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -65,6 +65,11 @@ namespace DG.Tweening.Core
LogWarning(string.Format("This material doesn't have a {0} property", propertyName));
}
public static void LogRemoveActiveTweenError(string propertyName)
{
Log(string.Format("Error in RemoveActiveTween.{0}. It's been taken care of so no problems, but Daniele (DOTween's author) is trying to pinpoint it and it would be awesome if you could reproduce this log in a sample project and send it to him. Or even just write him the complete log that was generated by this message. Fixing this would make DOTween slightly faster. Thanks.", propertyName));
}
public static void SetLogPriority(LogBehaviour logBehaviour)
{
switch (logBehaviour) {

View File

@ -833,19 +833,43 @@ namespace DG.Tweening.Core
_activeTweens[index] = null;
if (t.updateType == UpdateType.Normal) {
if (totActiveDefaultTweens > 0) {
totActiveDefaultTweens--;
hasActiveDefaultTweens = totActiveDefaultTweens > 0;
} 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");
}
}
totActiveTweens--;
hasActiveTweens = totActiveTweens > 0;
if (t.tweenType == TweenType.Tweener) totActiveTweeners--;
else totActiveSequences--;
if (totActiveTweens < 0) {
totActiveTweens = 0;
Debugger.LogRemoveActiveTweenError("totActiveTweens");
}
if (totActiveTweeners < 0) {
totActiveTweeners = 0;
Debugger.LogRemoveActiveTweenError("totActiveTweeners");
}
if (totActiveSequences < 0) {
totActiveSequences = 0;
Debugger.LogRemoveActiveTweenError("totActiveSequences");
}
}
static void ClearTweenArray(Tween[] tweens)

View File

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

View File

@ -46,6 +46,9 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEngine">

View File

@ -46,6 +46,9 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEngine">

View File

@ -44,6 +44,9 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEngine">

View File

@ -44,6 +44,9 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEngine">

View File

@ -46,6 +46,9 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEditor">

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.