Skip to content

Commit

Permalink
Fix quick operation
Browse files Browse the repository at this point in the history
  • Loading branch information
ls9512 committed Jun 11, 2021
1 parent bd37173 commit 21edc88
Show file tree
Hide file tree
Showing 23 changed files with 180 additions and 185 deletions.
5 changes: 0 additions & 5 deletions Core/Script/Editor/TweenAnimationEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ public SerializedProperty TweenParamSerializedProperty
{
if (_tweenParamSerializedObject == null)
{
if (Target.Param == null)
{
Target.Param = new TweenParam();
}

_tweenParamSerializedObject = serializedObject.FindProperty(TweenKey.Param);
}

Expand Down
10 changes: 5 additions & 5 deletions Core/Script/_Base/Tween/Tweener.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
//
// Script : Tweener.cs
// Info : 插值类基类
Expand Down Expand Up @@ -960,31 +960,31 @@ public virtual void ResetParameters()
/// <summary>
/// 设置当前状态值到 From
/// </summary>
public virtual void SetCurrent2From()
internal virtual void SetCurrent2From()
{

}

/// <summary>
/// 设置当前状态值到 To
/// </summary>
public virtual void SetCurrent2To()
internal virtual void SetCurrent2To()
{

}

/// <summary>
/// 设置 From 值到当前状态
/// </summary>
public virtual void SetFrom2Current()
internal virtual void SetFrom2Current()
{

}

/// <summary>
/// 设置 To 值到当前状态
/// </summary>
public virtual void SetTo2Current()
internal virtual void SetTo2Current()
{

}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenColor/TweenColor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,24 @@ protected override void SetValue(Color value)
_setValue(value);
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = _getValue();
TweenAnimation.FromColor = _getValue();
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = _getValue();
TweenAnimation.ToColor = _getValue();
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
_setValue(From);
_setValue(TweenAnimation.FromColor);
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
_setValue(To);
_setValue(TweenAnimation.ToColor);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenColor/TweenColorBlock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,24 @@ protected override void SetValue(Color value)
_setValue(value);
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = _getValue();
TweenAnimation.FromColor = _getValue();
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = _getValue();
TweenAnimation.ToColor = _getValue();
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
_setValue(From);
_setValue(TweenAnimation.FromColor);
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
_setValue(To);
_setValue(TweenAnimation.ToColor);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenComponent/TweenTransform.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,24 @@ public override void TweenUpdate()
SetValue(factor);
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
CopyTrans(From, Transform, WorldSpace);
CopyTrans(TweenAnimation.FromTransform, Transform, WorldSpace);
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
CopyTrans(To, Transform, WorldSpace);
CopyTrans(TweenAnimation.ToTransform, Transform, WorldSpace);
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
CopyTrans(Transform, From, WorldSpace);
CopyTrans(Transform, TweenAnimation.FromTransform, WorldSpace);
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
CopyTrans(Transform, To, WorldSpace);
CopyTrans(Transform, TweenAnimation.ToTransform, WorldSpace);
}

protected static Vector3 Clerp(Vector3 start, Vector3 end, float delta)
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenAlpha.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,24 +89,24 @@ protected override void SetValue(float value)
_setValue(value);
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = _getValue();
TweenAnimation.FromFloat = _getValue();
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = _getValue();
TweenAnimation.ToFloat = _getValue();
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
_setValue(From);
_setValue(TweenAnimation.FromFloat);
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
_setValue(To);
_setValue(TweenAnimation.ToFloat);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenCanvasGroupAlpha.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ protected override void SetValue(float value)
Component.alpha = value;
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = Component.alpha;
TweenAnimation.FromFloat = Component.alpha;
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = Component.alpha;
TweenAnimation.ToFloat = Component.alpha;
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
Component.alpha = From;
Component.alpha = TweenAnimation.FromFloat;
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
Component.alpha = To;
Component.alpha = TweenAnimation.ToFloat;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenHeight.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ protected override void SetValue(float value)
Component.sizeDelta = new Vector2(Component.sizeDelta.x, value);
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = Component.sizeDelta.y;
TweenAnimation.FromFloat = Component.sizeDelta.y;
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = Component.sizeDelta.y;
TweenAnimation.ToFloat = Component.sizeDelta.y;
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
Component.sizeDelta = new Vector2(Component.sizeDelta.x, From);
Component.sizeDelta = new Vector2(Component.sizeDelta.x, TweenAnimation.FromFloat);
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
Component.sizeDelta = new Vector2(Component.sizeDelta.x, To);
Component.sizeDelta = new Vector2(Component.sizeDelta.x, TweenAnimation.ToFloat);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenScrollbar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ protected override void SetValue(float value)
Component.value = value;
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = Component.value;
TweenAnimation.FromFloat = Component.value;
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = Component.value;
TweenAnimation.ToFloat = Component.value;
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
Component.value = From;
Component.value = TweenAnimation.FromFloat;
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
Component.value = To;
Component.value = TweenAnimation.ToFloat;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenSlider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ protected override void SetValue(float value)
Component.value = value;
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = Component.value;
TweenAnimation.FromFloat = Component.value;
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = Component.value;
TweenAnimation.ToFloat = Component.value;
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
Component.value = From;
Component.value = TweenAnimation.FromFloat;
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
Component.value = To;
Component.value = TweenAnimation.ToFloat;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenVolume.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ protected override void SetValue(float value)
Component.volume = value;
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = Component.volume;
TweenAnimation.FromFloat = Component.volume;
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = Component.volume;
TweenAnimation.ToFloat = Component.volume;
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
Component.volume = From;
Component.volume = TweenAnimation.FromFloat;
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
Component.volume = To;
Component.volume = TweenAnimation.ToFloat;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Core/Script/_TweenFloat/TweenWidth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ protected override void SetValue(float value)
Component.sizeDelta = new Vector2(value, Component.sizeDelta.y);
}

public override void SetCurrent2From()
internal override void SetCurrent2From()
{
From = Component.sizeDelta.x;
TweenAnimation.FromFloat = Component.sizeDelta.x;
}

public override void SetCurrent2To()
internal override void SetCurrent2To()
{
To = Component.sizeDelta.x;
TweenAnimation.ToFloat = Component.sizeDelta.x;
}

public override void SetFrom2Current()
internal override void SetFrom2Current()
{
Component.sizeDelta = new Vector2(From, Component.sizeDelta.y);
Component.sizeDelta = new Vector2(TweenAnimation.FromFloat, Component.sizeDelta.y);
}

public override void SetTo2Current()
internal override void SetTo2Current()
{
Component.sizeDelta = new Vector2(To, Component.sizeDelta.y);
Component.sizeDelta = new Vector2(TweenAnimation.ToFloat, Component.sizeDelta.y);
}
}
}
Expand Down
Loading

0 comments on commit 21edc88

Please sign in to comment.