Skip to content

Commit 21edc88

Browse files
ls9512ls9512
committed
Fix quick operation
1 parent bd37173 commit 21edc88

23 files changed

+180
-185
lines changed

‎Core/Script/Editor/TweenAnimationEditor.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ public SerializedProperty TweenParamSerializedProperty
2626
{
2727
if (_tweenParamSerializedObject == null)
2828
{
29-
if (Target.Param == null)
30-
{
31-
Target.Param = new TweenParam();
32-
}
33-
3429
_tweenParamSerializedObject = serializedObject.FindProperty(TweenKey.Param);
3530
}
3631

‎Core/Script/_Base/Tween/Tweener.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
\/////////////////////////////////////////////////////////////////////////////
1+
/////////////////////////////////////////////////////////////////////////////
22
//
33
// Script : Tweener.cs
44
// Info : 插值类基类
@@ -960,31 +960,31 @@ public virtual void ResetParameters()
960960
/// <summary>
961961
/// 设置当前状态值到 From
962962
/// </summary>
963-
public virtual void SetCurrent2From()
963+
internal virtual void SetCurrent2From()
964964
{
965965

966966
}
967967

968968
/// <summary>
969969
/// 设置当前状态值到 To
970970
/// </summary>
971-
public virtual void SetCurrent2To()
971+
internal virtual void SetCurrent2To()
972972
{
973973

974974
}
975975

976976
/// <summary>
977977
/// 设置 From 值到当前状态
978978
/// </summary>
979-
public virtual void SetFrom2Current()
979+
internal virtual void SetFrom2Current()
980980
{
981981

982982
}
983983

984984
/// <summary>
985985
/// 设置 To 值到当前状态
986986
/// </summary>
987-
public virtual void SetTo2Current()
987+
internal virtual void SetTo2Current()
988988
{
989989

990990
}

‎Core/Script/_TweenColor/TweenColor.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,24 @@ protected override void SetValue(Color value)
7272
_setValue(value);
7373
}
7474

75-
public override void SetCurrent2From()
75+
internal override void SetCurrent2From()
7676
{
77-
From = _getValue();
77+
TweenAnimation.FromColor = _getValue();
7878
}
7979

80-
public override void SetCurrent2To()
80+
internal override void SetCurrent2To()
8181
{
82-
To = _getValue();
82+
TweenAnimation.ToColor = _getValue();
8383
}
8484

85-
public override void SetFrom2Current()
85+
internal override void SetFrom2Current()
8686
{
87-
_setValue(From);
87+
_setValue(TweenAnimation.FromColor);
8888
}
8989

90-
public override void SetTo2Current()
90+
internal override void SetTo2Current()
9191
{
92-
_setValue(To);
92+
_setValue(TweenAnimation.ToColor);
9393
}
9494
}
9595
}

‎Core/Script/_TweenColor/TweenColorBlock.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,24 @@ protected override void SetValue(Color value)
8383
_setValue(value);
8484
}
8585

86-
public override void SetCurrent2From()
86+
internal override void SetCurrent2From()
8787
{
88-
From = _getValue();
88+
TweenAnimation.FromColor = _getValue();
8989
}
9090

91-
public override void SetCurrent2To()
91+
internal override void SetCurrent2To()
9292
{
93-
To = _getValue();
93+
TweenAnimation.ToColor = _getValue();
9494
}
9595

96-
public override void SetFrom2Current()
96+
internal override void SetFrom2Current()
9797
{
98-
_setValue(From);
98+
_setValue(TweenAnimation.FromColor);
9999
}
100100

101-
public override void SetTo2Current()
101+
internal override void SetTo2Current()
102102
{
103-
_setValue(To);
103+
_setValue(TweenAnimation.ToColor);
104104
}
105105
}
106106
}

‎Core/Script/_TweenComponent/TweenTransform.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,24 @@ public override void TweenUpdate()
7070
SetValue(factor);
7171
}
7272

73-
public override void SetCurrent2From()
73+
internal override void SetCurrent2From()
7474
{
75-
CopyTrans(From, Transform, WorldSpace);
75+
CopyTrans(TweenAnimation.FromTransform, Transform, WorldSpace);
7676
}
7777

78-
public override void SetCurrent2To()
78+
internal override void SetCurrent2To()
7979
{
80-
CopyTrans(To, Transform, WorldSpace);
80+
CopyTrans(TweenAnimation.ToTransform, Transform, WorldSpace);
8181
}
8282

83-
public override void SetFrom2Current()
83+
internal override void SetFrom2Current()
8484
{
85-
CopyTrans(Transform, From, WorldSpace);
85+
CopyTrans(Transform, TweenAnimation.FromTransform, WorldSpace);
8686
}
8787

88-
public override void SetTo2Current()
88+
internal override void SetTo2Current()
8989
{
90-
CopyTrans(Transform, To, WorldSpace);
90+
CopyTrans(Transform, TweenAnimation.ToTransform, WorldSpace);
9191
}
9292

9393
protected static Vector3 Clerp(Vector3 start, Vector3 end, float delta)

‎Core/Script/_TweenFloat/TweenAlpha.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,24 @@ protected override void SetValue(float value)
8989
_setValue(value);
9090
}
9191

92-
public override void SetCurrent2From()
92+
internal override void SetCurrent2From()
9393
{
94-
From = _getValue();
94+
TweenAnimation.FromFloat = _getValue();
9595
}
9696

97-
public override void SetCurrent2To()
97+
internal override void SetCurrent2To()
9898
{
99-
To = _getValue();
99+
TweenAnimation.ToFloat = _getValue();
100100
}
101101

102-
public override void SetFrom2Current()
102+
internal override void SetFrom2Current()
103103
{
104-
_setValue(From);
104+
_setValue(TweenAnimation.FromFloat);
105105
}
106106

107-
public override void SetTo2Current()
107+
internal override void SetTo2Current()
108108
{
109-
_setValue(To);
109+
_setValue(TweenAnimation.ToFloat);
110110
}
111111
}
112112
}

‎Core/Script/_TweenFloat/TweenCanvasGroupAlpha.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ protected override void SetValue(float value)
2121
Component.alpha = value;
2222
}
2323

24-
public override void SetCurrent2From()
24+
internal override void SetCurrent2From()
2525
{
26-
From = Component.alpha;
26+
TweenAnimation.FromFloat = Component.alpha;
2727
}
2828

29-
public override void SetCurrent2To()
29+
internal override void SetCurrent2To()
3030
{
31-
To = Component.alpha;
31+
TweenAnimation.ToFloat = Component.alpha;
3232
}
3333

34-
public override void SetFrom2Current()
34+
internal override void SetFrom2Current()
3535
{
36-
Component.alpha = From;
36+
Component.alpha = TweenAnimation.FromFloat;
3737
}
3838

39-
public override void SetTo2Current()
39+
internal override void SetTo2Current()
4040
{
41-
Component.alpha = To;
41+
Component.alpha = TweenAnimation.ToFloat;
4242
}
4343
}
4444
}

‎Core/Script/_TweenFloat/TweenHeight.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ protected override void SetValue(float value)
2121
Component.sizeDelta = new Vector2(Component.sizeDelta.x, value);
2222
}
2323

24-
public override void SetCurrent2From()
24+
internal override void SetCurrent2From()
2525
{
26-
From = Component.sizeDelta.y;
26+
TweenAnimation.FromFloat = Component.sizeDelta.y;
2727
}
2828

29-
public override void SetCurrent2To()
29+
internal override void SetCurrent2To()
3030
{
31-
To = Component.sizeDelta.y;
31+
TweenAnimation.ToFloat = Component.sizeDelta.y;
3232
}
3333

34-
public override void SetFrom2Current()
34+
internal override void SetFrom2Current()
3535
{
36-
Component.sizeDelta = new Vector2(Component.sizeDelta.x, From);
36+
Component.sizeDelta = new Vector2(Component.sizeDelta.x, TweenAnimation.FromFloat);
3737
}
3838

39-
public override void SetTo2Current()
39+
internal override void SetTo2Current()
4040
{
41-
Component.sizeDelta = new Vector2(Component.sizeDelta.x, To);
41+
Component.sizeDelta = new Vector2(Component.sizeDelta.x, TweenAnimation.ToFloat);
4242
}
4343
}
4444
}

‎Core/Script/_TweenFloat/TweenScrollbar.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ protected override void SetValue(float value)
2323
Component.value = value;
2424
}
2525

26-
public override void SetCurrent2From()
26+
internal override void SetCurrent2From()
2727
{
28-
From = Component.value;
28+
TweenAnimation.FromFloat = Component.value;
2929
}
3030

31-
public override void SetCurrent2To()
31+
internal override void SetCurrent2To()
3232
{
33-
To = Component.value;
33+
TweenAnimation.ToFloat = Component.value;
3434
}
3535

36-
public override void SetFrom2Current()
36+
internal override void SetFrom2Current()
3737
{
38-
Component.value = From;
38+
Component.value = TweenAnimation.FromFloat;
3939
}
4040

41-
public override void SetTo2Current()
41+
internal override void SetTo2Current()
4242
{
43-
Component.value = To;
43+
Component.value = TweenAnimation.ToFloat;
4444
}
4545
}
4646
}

‎Core/Script/_TweenFloat/TweenSlider.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ protected override void SetValue(float value)
2323
Component.value = value;
2424
}
2525

26-
public override void SetCurrent2From()
26+
internal override void SetCurrent2From()
2727
{
28-
From = Component.value;
28+
TweenAnimation.FromFloat = Component.value;
2929
}
3030

31-
public override void SetCurrent2To()
31+
internal override void SetCurrent2To()
3232
{
33-
To = Component.value;
33+
TweenAnimation.ToFloat = Component.value;
3434
}
3535

36-
public override void SetFrom2Current()
36+
internal override void SetFrom2Current()
3737
{
38-
Component.value = From;
38+
Component.value = TweenAnimation.FromFloat;
3939
}
4040

41-
public override void SetTo2Current()
41+
internal override void SetTo2Current()
4242
{
43-
Component.value = To;
43+
Component.value = TweenAnimation.ToFloat;
4444
}
4545
}
4646
}

‎Core/Script/_TweenFloat/TweenVolume.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ protected override void SetValue(float value)
2121
Component.volume = value;
2222
}
2323

24-
public override void SetCurrent2From()
24+
internal override void SetCurrent2From()
2525
{
26-
From = Component.volume;
26+
TweenAnimation.FromFloat = Component.volume;
2727
}
2828

29-
public override void SetCurrent2To()
29+
internal override void SetCurrent2To()
3030
{
31-
To = Component.volume;
31+
TweenAnimation.ToFloat = Component.volume;
3232
}
3333

34-
public override void SetFrom2Current()
34+
internal override void SetFrom2Current()
3535
{
36-
Component.volume = From;
36+
Component.volume = TweenAnimation.FromFloat;
3737
}
3838

39-
public override void SetTo2Current()
39+
internal override void SetTo2Current()
4040
{
41-
Component.volume = To;
41+
Component.volume = TweenAnimation.ToFloat;
4242
}
4343
}
4444
}

‎Core/Script/_TweenFloat/TweenWidth.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ protected override void SetValue(float value)
2121
Component.sizeDelta = new Vector2(value, Component.sizeDelta.y);
2222
}
2323

24-
public override void SetCurrent2From()
24+
internal override void SetCurrent2From()
2525
{
26-
From = Component.sizeDelta.x;
26+
TweenAnimation.FromFloat = Component.sizeDelta.x;
2727
}
2828

29-
public override void SetCurrent2To()
29+
internal override void SetCurrent2To()
3030
{
31-
To = Component.sizeDelta.x;
31+
TweenAnimation.ToFloat = Component.sizeDelta.x;
3232
}
3333

34-
public override void SetFrom2Current()
34+
internal override void SetFrom2Current()
3535
{
36-
Component.sizeDelta = new Vector2(From, Component.sizeDelta.y);
36+
Component.sizeDelta = new Vector2(TweenAnimation.FromFloat, Component.sizeDelta.y);
3737
}
3838

39-
public override void SetTo2Current()
39+
internal override void SetTo2Current()
4040
{
41-
Component.sizeDelta = new Vector2(To, Component.sizeDelta.y);
41+
Component.sizeDelta = new Vector2(TweenAnimation.ToFloat, Component.sizeDelta.y);
4242
}
4343
}
4444
}

0 commit comments

Comments
 (0)