@@ -25,12 +25,12 @@ public class CharacterPointSystem : Command
25
25
[ SerializeField ] protected float maxValueOf ;
26
26
[ SerializeField ] protected Slider slider ;
27
27
[ SerializeField ] protected bool useTextUI = false ;
28
+ [ SerializeField ] protected bool slowMode = true ;
28
29
[ Tooltip ( "If Text component is used, Slider component will be ignored" ) ]
29
30
[ SerializeField ] protected Text textComponent ;
30
31
#region Public members
31
32
public override void OnEnter ( )
32
- {
33
-
33
+ {
34
34
if ( variable != null )
35
35
{
36
36
key = variable . name ;
@@ -49,13 +49,22 @@ public override void OnEnter()
49
49
if ( variableType == typeof ( IntegerVariable ) )
50
50
{
51
51
//Safe check
52
- if ( LeanTween . isTweening ( textComponent . gameObject ) )
53
- {
54
- LeanTween . cancel ( textComponent . gameObject ) ;
55
- }
56
- else if ( LeanTween . isTweening ( slider . gameObject ) )
52
+ if ( slowMode == true )
57
53
{
58
- LeanTween . cancel ( slider . gameObject ) ;
54
+ if ( textComponent != null )
55
+ {
56
+ if ( LeanTween . isTweening ( textComponent . gameObject ) )
57
+ {
58
+ LeanTween . cancel ( textComponent . gameObject ) ;
59
+ }
60
+ }
61
+ if ( slider != null )
62
+ {
63
+ if ( LeanTween . isTweening ( slider . gameObject ) )
64
+ {
65
+ LeanTween . cancel ( slider . gameObject ) ;
66
+ }
67
+ }
59
68
}
60
69
61
70
IntegerVariable integerVariable = variable as IntegerVariable ;
@@ -72,22 +81,39 @@ public override void OnEnter()
72
81
var tmpfinttofloat = slider . GetComponent < Slider > ( ) . value ;
73
82
//Debug.Log(tmpfinttofloat);
74
83
//float animfloat =
75
- LeanTween . value ( slider . gameObject , tmpfinttofloat , ( float ) integerVariable . Value , 0.3f ) . setEaseInOutQuad ( ) . setOnUpdate ( ( float val ) =>
84
+ if ( slowMode == true )
76
85
{
77
- slider . value = val ;
78
- } ) ;
86
+ LeanTween . value ( slider . gameObject , tmpfinttofloat , ( float ) integerVariable . Value , 0.3f ) . setEaseInOutQuad ( ) . setOnUpdate ( ( float val ) =>
87
+ {
88
+ slider . value = val ;
89
+ } ) ;
90
+ }
91
+ else
92
+ {
93
+ slider . value = ( float ) integerVariable . Value ;
94
+ }
79
95
}
80
96
}
81
97
else if ( variableType == typeof ( FloatVariable ) )
82
98
{
83
99
//Safe check
84
- if ( LeanTween . isTweening ( textComponent . gameObject ) )
85
- {
86
- LeanTween . cancel ( textComponent . gameObject ) ;
87
- }
88
- else if ( LeanTween . isTweening ( slider . gameObject ) )
100
+ if ( slowMode == true )
89
101
{
90
- LeanTween . cancel ( slider . gameObject ) ;
102
+ if ( textComponent != null )
103
+ {
104
+ if ( LeanTween . isTweening ( textComponent . gameObject ) )
105
+ {
106
+ LeanTween . cancel ( textComponent . gameObject ) ;
107
+ }
108
+ }
109
+ if ( slider != null )
110
+ {
111
+ if ( LeanTween . isTweening ( slider . gameObject ) )
112
+ {
113
+ LeanTween . cancel ( slider . gameObject ) ;
114
+ }
115
+ }
116
+
91
117
}
92
118
93
119
FloatVariable floatVariable = variable as FloatVariable ;
@@ -100,16 +126,21 @@ public override void OnEnter()
100
126
slider . maxValue = maxValueOf ;
101
127
slider . wholeNumbers = true ;
102
128
var tmpfinttofloat = slider . GetComponent < Slider > ( ) . value ;
103
- LeanTween . value ( slider . gameObject , tmpfinttofloat , floatVariable . Value , 0.3f ) . setEaseInOutQuad ( ) . setOnUpdate ( ( float val ) =>
129
+ if ( slowMode == true )
130
+ {
131
+ LeanTween . value ( slider . gameObject , tmpfinttofloat , floatVariable . Value , 0.3f ) . setEaseInOutQuad ( ) . setOnUpdate ( ( float val ) =>
132
+ {
133
+ slider . value = val ;
134
+ } ) ;
135
+ }
136
+ else
104
137
{
105
- slider . value = val ;
106
- } ) ;
107
- //Debug.Log(floatVariable.Value);
138
+ slider . value = floatVariable . Value ;
139
+ }
108
140
}
109
141
}
110
142
}
111
143
Continue ( ) ;
112
-
113
144
}
114
145
public override string GetSummary ( )
115
146
{
@@ -125,7 +156,7 @@ public override string GetSummary()
125
156
{
126
157
return "Error: No Slider component available" ;
127
158
}
128
- return "'" + variable . Key ;
159
+ return variable . Key ;
129
160
}
130
161
131
162
public override Color GetButtonColor ( )
0 commit comments