mirror of
https://github.com/Cardidi/dotween-upm-fork.git
synced 2025-12-20 09:16:02 +08:00
Fixed ChangeEnd/Start/Values not working correctly in hyper-compatible version
This commit is contained in:
parent
f7debfed70
commit
a2dd1818c6
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -6,7 +6,7 @@
|
||||
<members>
|
||||
<member name="F:DG.DemiLib.Core.GUIUtils.isProSkin">
|
||||
<summary>
|
||||
Set when calling <code>DeGUIManage.BeginGUI</code>
|
||||
Set when calling <code>DeGUI.BeginGUI</code>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:DG.DemiLib.DeColorPalette">
|
||||
|
||||
@ -46,6 +46,131 @@
|
||||
(or resets them to the default ones if NULL)
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:DG.DemiEditor.GUIStyleExtensions">
|
||||
<summary>
|
||||
GUI extension methods
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Clone(UnityEngine.GUIStyle,System.Object[])">
|
||||
<summary>
|
||||
Clones the style and adds the given formats to it
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Add(UnityEngine.GUIStyle,System.Object[])">
|
||||
<summary>
|
||||
Adds the given formats to the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Border(UnityEngine.GUIStyle,UnityEngine.RectOffset)">
|
||||
<summary>
|
||||
Sets the border of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Border(UnityEngine.GUIStyle,System.Int32,System.Int32,System.Int32,System.Int32)">
|
||||
<summary>
|
||||
Sets the border of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Background(UnityEngine.GUIStyle,UnityEngine.Texture2D)">
|
||||
<summary>
|
||||
Sets the background of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.ContentOffset(UnityEngine.GUIStyle,UnityEngine.Vector2)">
|
||||
<summary>
|
||||
Sets the contentOffset of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.ContentOffsetX(UnityEngine.GUIStyle,System.Single)">
|
||||
<summary>
|
||||
Sets the X contentOffset of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.ContentOffsetY(UnityEngine.GUIStyle,System.Single)">
|
||||
<summary>
|
||||
Sets the Y contentOffset of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Margin(UnityEngine.GUIStyle,UnityEngine.RectOffset)">
|
||||
<summary>
|
||||
Sets the margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Margin(UnityEngine.GUIStyle,System.Int32,System.Int32,System.Int32,System.Int32)">
|
||||
<summary>
|
||||
Sets the margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.MarginLeft(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the left margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.MarginRight(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the right margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.MarginTop(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the top margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.MarginBottom(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the bottom margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Padding(UnityEngine.GUIStyle,UnityEngine.RectOffset)">
|
||||
<summary>
|
||||
Sets the padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Padding(UnityEngine.GUIStyle,System.Int32,System.Int32,System.Int32,System.Int32)">
|
||||
<summary>
|
||||
Sets the padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.PaddingLeft(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the left padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.PaddingRight(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the right padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.PaddingTop(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the top padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.PaddingBottom(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the bottom padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Width(UnityEngine.GUIStyle,System.Single)">
|
||||
<summary>
|
||||
Sets the Y fixedWidth of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.Height(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the fixedHeight of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.StretchHeight(UnityEngine.GUIStyle,System.Boolean)">
|
||||
<summary>
|
||||
Sets the stretchHeight property of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.GUIStyleExtensions.StretchWidth(UnityEngine.GUIStyle,System.Boolean)">
|
||||
<summary>
|
||||
Sets the stretchWidth property of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:DG.DemiEditor.AssemblyExtensions">
|
||||
<summary>
|
||||
Assembly extensions
|
||||
@ -114,131 +239,6 @@
|
||||
Needs to be overridden in order to initialize new styles added from inherited classes
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:DG.DemiEditor.DeGUIExtensions">
|
||||
<summary>
|
||||
GUI extension methods
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Clone(UnityEngine.GUIStyle,System.Object[])">
|
||||
<summary>
|
||||
Clones the style and adds the given formats to it
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Add(UnityEngine.GUIStyle,System.Object[])">
|
||||
<summary>
|
||||
Adds the given formats to the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Border(UnityEngine.GUIStyle,UnityEngine.RectOffset)">
|
||||
<summary>
|
||||
Sets the border of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Border(UnityEngine.GUIStyle,System.Int32,System.Int32,System.Int32,System.Int32)">
|
||||
<summary>
|
||||
Sets the border of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Background(UnityEngine.GUIStyle,UnityEngine.Texture2D)">
|
||||
<summary>
|
||||
Sets the background of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.ContentOffset(UnityEngine.GUIStyle,UnityEngine.Vector2)">
|
||||
<summary>
|
||||
Sets the contentOffset of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.ContentOffsetX(UnityEngine.GUIStyle,System.Single)">
|
||||
<summary>
|
||||
Sets the X contentOffset of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.ContentOffsetY(UnityEngine.GUIStyle,System.Single)">
|
||||
<summary>
|
||||
Sets the Y contentOffset of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Margin(UnityEngine.GUIStyle,UnityEngine.RectOffset)">
|
||||
<summary>
|
||||
Sets the margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Margin(UnityEngine.GUIStyle,System.Int32,System.Int32,System.Int32,System.Int32)">
|
||||
<summary>
|
||||
Sets the margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.MarginLeft(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the left margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.MarginRight(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the right margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.MarginTop(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the top margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.MarginBottom(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the bottom margin of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Padding(UnityEngine.GUIStyle,UnityEngine.RectOffset)">
|
||||
<summary>
|
||||
Sets the padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Padding(UnityEngine.GUIStyle,System.Int32,System.Int32,System.Int32,System.Int32)">
|
||||
<summary>
|
||||
Sets the padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.PaddingLeft(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the left padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.PaddingRight(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the right padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.PaddingTop(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the top padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.PaddingBottom(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the bottom padding of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Width(UnityEngine.GUIStyle,System.Single)">
|
||||
<summary>
|
||||
Sets the Y fixedWidth of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.Height(UnityEngine.GUIStyle,System.Int32)">
|
||||
<summary>
|
||||
Sets the fixedHeight of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.StretchHeight(UnityEngine.GUIStyle,System.Boolean)">
|
||||
<summary>
|
||||
Sets the stretchHeight property of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:DG.DemiEditor.DeGUIExtensions.StretchWidth(UnityEngine.GUIStyle,System.Boolean)">
|
||||
<summary>
|
||||
Sets the stretchWidth property of the style
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:DG.DemiEditor.DeGUILayout">
|
||||
<summary>
|
||||
GUILayout methods
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
UnityTests.Unity5/Assets/_Tests PRO/SerializationTests.unity
Normal file
BIN
UnityTests.Unity5/Assets/_Tests PRO/SerializationTests.unity
Normal file
Binary file not shown.
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ac9cda89bbc523e45824df51703d91e6
|
||||
timeCreated: 1430923802
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -4,6 +4,9 @@
|
||||
// License Copyright (c) Daniele Giardini.
|
||||
// This work is subject to the terms at http://dotween.demigiant.com/license.php
|
||||
|
||||
#if COMPATIBLE
|
||||
using DG.Tweening.Core.Surrogates;
|
||||
#endif
|
||||
using System;
|
||||
using DG.Tweening.Core.Enums;
|
||||
using DG.Tweening.Plugins.Core;
|
||||
@ -51,6 +54,9 @@ namespace DG.Tweening.Core
|
||||
if (Debugger.logPriority >= 1) Debugger.LogWarning(_TxtCantChangeSequencedValues);
|
||||
return this;
|
||||
}
|
||||
#if COMPATIBLE
|
||||
ConvertToWrapper(ref newStartValue);
|
||||
#endif
|
||||
Type valT = newStartValue.GetType();
|
||||
if (valT != typeofT2) {
|
||||
if (Debugger.logPriority >= 1) Debugger.LogWarning("ChangeStartValue: incorrect newStartValue type (is " + valT + ", should be " + typeofT2 + ")");
|
||||
@ -69,6 +75,9 @@ namespace DG.Tweening.Core
|
||||
if (Debugger.logPriority >= 1) Debugger.LogWarning(_TxtCantChangeSequencedValues);
|
||||
return this;
|
||||
}
|
||||
#if COMPATIBLE
|
||||
ConvertToWrapper(ref newEndValue);
|
||||
#endif
|
||||
Type valT = newEndValue.GetType();
|
||||
if (valT != typeofT2) {
|
||||
if (Debugger.logPriority >= 1) Debugger.LogWarning("ChangeEndValue: incorrect newEndValue type (is " + valT + ", should be " + typeofT2 + ")");
|
||||
@ -84,6 +93,10 @@ namespace DG.Tweening.Core
|
||||
if (Debugger.logPriority >= 1) Debugger.LogWarning(_TxtCantChangeSequencedValues);
|
||||
return this;
|
||||
}
|
||||
#if COMPATIBLE
|
||||
ConvertToWrapper(ref newStartValue);
|
||||
ConvertToWrapper(ref newEndValue);
|
||||
#endif
|
||||
Type valT0 = newStartValue.GetType();
|
||||
Type valT1 = newEndValue.GetType();
|
||||
if (valT0 != typeofT2) {
|
||||
@ -169,5 +182,20 @@ namespace DG.Tweening.Core
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#if COMPATIBLE
|
||||
|
||||
// Eventually converts a Unity struct to the correct wrapper
|
||||
static void ConvertToWrapper(ref object value)
|
||||
{
|
||||
Type t = value.GetType();
|
||||
if (t == typeof(Vector3)) value = (Vector3Wrapper)((Vector3)value);
|
||||
else if (t == typeof(Vector2)) value = (Vector2Wrapper)((Vector2)value);
|
||||
else if (t == typeof(Quaternion)) value = (QuaternionWrapper)((Quaternion)value);
|
||||
else if (t == typeof(Color)) value = (ColorWrapper)((Color)value);
|
||||
else if (t == typeof(Vector4)) value = (Vector4Wrapper)((Vector4)value);
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -32,7 +32,7 @@ namespace DG.Tweening
|
||||
public class DOTween
|
||||
{
|
||||
/// <summary>DOTween's version</summary>
|
||||
public static readonly string Version = "1.0.675";
|
||||
public static readonly string Version = "1.0.685";
|
||||
|
||||
///////////////////////////////////////////////
|
||||
// Options ////////////////////////////////////
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user