Skip to content

Commit e9c15a7

Browse files
committed
fix: Timer changes
1 parent e2d8804 commit e9c15a7

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

Runtime/Utils/Timer.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ public bool complete {
1717
get { return elapsed >= setTime; }
1818
}
1919

20-
public float reverseElaped{
20+
public float reverseElapsed{
2121
get {return setTime - elapsed; }
2222
}
2323

24-
public Timer(float _set, bool looping = false) {
24+
public Timer(float _set, bool looping = false, Action _complete = null) {
2525
setTime = _set;
2626
this.looping = looping;
27+
if(_complete != null)OnComplete += _complete;
2728
}
2829

2930
public void Update() {
30-
if(paused)return;
31+
if(paused || complete)return;
3132
elapsed += Time.deltaTime;
3233

3334
if (elapsed >= setTime) {

Tests/Runtime/EntityExample.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,30 @@ public class EntityExample : MonoBehaviour
1111
[SerializeField] Entity entityToSpawn;
1212
List<Entity> entitysOnExample = new List<Entity>();
1313
float lootTableTimer = 0;
14+
Timer timerTest, repeatTimerTest, noActionTimerTest;
1415
private void Start() {
1516
CameraManager.Instance.OnTargetChange.AddListener((target)=>{
1617
Debug.Log(target);
1718
});
1819
CameraManager.Instance.OnCameraShake.AddListener((d,m)=>{
1920
Debug.Log(d+m);
2021
});
22+
23+
timerTest = new Timer(2f, false, ()=>{
24+
Debug.Log("Test!!");
25+
});
26+
27+
repeatTimerTest = new Timer(1f, true, ()=>{
28+
Debug.Log("Repeating");
29+
});
30+
31+
noActionTimerTest = new Timer(2f, true);
2132
}
2233
private void Update() {
34+
timerTest.Update();
35+
repeatTimerTest.Update();
36+
noActionTimerTest.Update();
37+
2338
if(BGameInput.Instance.GetKeyPress("Interaction")){
2439
var e = Instantiate(entityToSpawn);
2540
e.transform.position = new Vector2(Random.Range(-13, 13), Random.Range(-8, 8));

0 commit comments

Comments
 (0)