Skip to content

Commit 284f18b

Browse files
committed
Update CharacterPointSystem.cs
1 parent a60723f commit 284f18b

File tree

1 file changed

+54
-23
lines changed

1 file changed

+54
-23
lines changed

CharacterPointSystem.cs

Lines changed: 54 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public class CharacterPointSystem : Command
2525
[SerializeField] protected float maxValueOf;
2626
[SerializeField] protected Slider slider;
2727
[SerializeField] protected bool useTextUI = false;
28+
[SerializeField] protected bool slowMode = true;
2829
[Tooltip("If Text component is used, Slider component will be ignored")]
2930
[SerializeField] protected Text textComponent;
3031
#region Public members
3132
public override void OnEnter()
32-
{
33-
33+
{
3434
if(variable != null)
3535
{
3636
key = variable.name;
@@ -49,13 +49,22 @@ public override void OnEnter()
4949
if (variableType == typeof(IntegerVariable))
5050
{
5151
//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)
5753
{
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+
}
5968
}
6069

6170
IntegerVariable integerVariable = variable as IntegerVariable;
@@ -72,22 +81,39 @@ public override void OnEnter()
7281
var tmpfinttofloat = slider.GetComponent<Slider>().value;
7382
//Debug.Log(tmpfinttofloat);
7483
//float animfloat =
75-
LeanTween.value(slider.gameObject, tmpfinttofloat, (float)integerVariable.Value, 0.3f).setEaseInOutQuad().setOnUpdate((float val) =>
84+
if(slowMode == true)
7685
{
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+
}
7995
}
8096
}
8197
else if (variableType == typeof(FloatVariable))
8298
{
8399
//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)
89101
{
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+
91117
}
92118

93119
FloatVariable floatVariable = variable as FloatVariable;
@@ -100,16 +126,21 @@ public override void OnEnter()
100126
slider.maxValue = maxValueOf;
101127
slider.wholeNumbers = true;
102128
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
104137
{
105-
slider.value = val;
106-
});
107-
//Debug.Log(floatVariable.Value);
138+
slider.value = floatVariable.Value;
139+
}
108140
}
109141
}
110142
}
111143
Continue();
112-
113144
}
114145
public override string GetSummary()
115146
{
@@ -125,7 +156,7 @@ public override string GetSummary()
125156
{
126157
return "Error: No Slider component available";
127158
}
128-
return "'" + variable.Key;
159+
return variable.Key;
129160
}
130161

131162
public override Color GetButtonColor()

0 commit comments

Comments
 (0)