Skip to content

Commit edb1b80

Browse files
author
David Arutiunian
committed
🔥 Prune dead code
1 parent 5693638 commit edb1b80

8 files changed

+0
-172
lines changed

‎Assets/Scripts/GameController.cs

-54
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ void Start()
8383
GameEvents.instance.OnLoose += DoOnLoose;
8484
GameEvents.instance.OnLooseEnd += DoOnLooseEnd;
8585

86-
// GameEvents.instance.OnRemember += DoOnRemember;
87-
// GameEvents.instance.OnRememberEnd += DoOnRememberEnd;
88-
89-
// GameEvents.instance.OnRepeat += DoOnRepeat;
90-
// GameEvents.instance.OnRepeatEnd += DoOnRepeatEnd;
91-
9286
GameEvents.instance.OnHelp += DoOnHelp;
9387

9488
DoOnMenu();
@@ -125,30 +119,6 @@ private void DoOnMenu()
125119
SwitchTo(menu);
126120
}
127121

128-
/* #################### Remember State #################### */
129-
130-
// private void DoOnRemember()
131-
// {
132-
// GameStore.instance.ResetAfterRemember();
133-
134-
// prepare.Start();
135-
// prepare.Unbind();
136-
137-
// states.ForEach(state => state.Unbind());
138-
// states.Add(prepare);
139-
// states.Add(remember);
140-
// states.ForEach(state => state.Start());
141-
142-
// GameEvents.instance.TriggerCountRestart();
143-
// GameStore.instance.LockLevel();
144-
// }
145-
146-
// private void DoOnRememberEnd()
147-
// {
148-
// GameStore.instance.ResetAfterRememberEnd();
149-
// GameEvents.instance.TriggerPrepare();
150-
// }
151-
152122
/* #################### Prepare State #################### */
153123

154124
private void DoOnPrepare()
@@ -194,30 +164,6 @@ public void DoOnHelp()
194164
GameEvents.instance.TriggerCountRestart();
195165
}
196166

197-
/* #################### Repeat State #################### */
198-
199-
// private void DoOnRepeat()
200-
// {
201-
// GameStore.instance.ResetAfterRepeat();
202-
203-
// state.Unbind();
204-
// state = repeat;
205-
// state.Start();
206-
207-
// GameEvents.instance.TriggerCountRestart();
208-
// }
209-
210-
// private void DoOnRepeatEnd()
211-
// {
212-
// GameStore.instance.ResetAfterRepeatEnd();
213-
214-
// state.Unbind();
215-
// state = playing;
216-
// state.Start();
217-
218-
// GameEvents.instance.TriggerCountRestart();
219-
// }
220-
221167
/* #################### Win State #################### */
222168

223169
private void DoOnWin()

‎Assets/Scripts/GameEvents.cs

-44
Original file line numberDiff line numberDiff line change
@@ -138,50 +138,6 @@ public void TriggerPrepareEnd()
138138
}
139139
}
140140

141-
/* #################### Remember Events #################### */
142-
143-
// public event Action OnRemember;
144-
145-
// public void TriggerRemember()
146-
// {
147-
// if (OnRemember != null)
148-
// {
149-
// OnRemember();
150-
// }
151-
// }
152-
153-
// public event Action OnRememberEnd;
154-
155-
// public void TriggerRememberEnd()
156-
// {
157-
// if (OnRememberEnd != null)
158-
// {
159-
// OnRememberEnd();
160-
// }
161-
// }
162-
163-
/* #################### Repeat Events #################### */
164-
165-
// public event Action OnRepeat;
166-
167-
// public void TriggerRepeat()
168-
// {
169-
// if (OnRepeat != null)
170-
// {
171-
// OnRepeat();
172-
// }
173-
// }
174-
175-
// public event Action OnRepeatEnd;
176-
177-
// public void TriggerRepeatEnd()
178-
// {
179-
// if (OnRepeatEnd != null)
180-
// {
181-
// OnRepeatEnd();
182-
// }
183-
// }
184-
185141
/* #################### Help Events #################### */
186142

187143
public event Action OnHelp;

‎Assets/Scripts/GameStore.cs

-24
Original file line numberDiff line numberDiff line change
@@ -101,30 +101,6 @@ public void ResetAfterWinEnd()
101101
NextScore();
102102
}
103103

104-
/* #################### Remember State #################### */
105-
106-
// public void ResetAfterRemember()
107-
// {
108-
// timer = REMEMBER_DELAY;
109-
// }
110-
111-
// public void ResetAfterRememberEnd()
112-
// {
113-
// ResetTimer();
114-
// }
115-
116-
/* #################### Repeat State #################### */
117-
118-
// public void ResetAfterRepeat()
119-
// {
120-
// timer = REPEAT_DELAY;
121-
// }
122-
123-
// public void ResetAfterRepeatEnd()
124-
// {
125-
// ResetTimer();
126-
// }
127-
128104
/* #################### Fail State #################### */
129105

130106
public void ResetAfterLoose()

‎Assets/Scripts/RememberState.cs

-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public override void Unbind()
1111
game.RememberOverlay.SetActive(false);
1212
game.GameOverlay.SetActive(false);
1313
game.HelpButton.SetActive(true);
14-
// GameEvents.instance.OnCountEnd -= DoOnCountEnd;
1514

1615
}
1716

@@ -20,17 +19,11 @@ protected override void DoOnStart()
2019
game.RememberOverlay.SetActive(true);
2120
game.GameOverlay.SetActive(true);
2221
game.HelpButton.SetActive(false);
23-
// GameEvents.instance.OnCountEnd += DoOnCountEnd;
2422

2523
LogUtils.LogState(GetType().Name);
2624
}
2725

2826
protected override void DoOnUpdate()
2927
{
3028
}
31-
32-
// private void DoOnCountEnd()
33-
// {
34-
// GameEvents.instance.TriggerRememberEnd();
35-
// }
3629
}

‎Assets/Scripts/RepeatState.cs

-7
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,17 @@ public override void Unbind()
1010
{
1111
game.RepeatOverlay.SetActive(false);
1212
game.GameOverlay.SetActive(false);
13-
// GameEvents.instance.OnCountEnd -= DoOnCountEnd;
1413
}
1514

1615
protected override void DoOnStart()
1716
{
1817
game.RepeatOverlay.SetActive(true);
1918
game.GameOverlay.SetActive(true);
20-
// GameEvents.instance.OnCountEnd += DoOnCountEnd;
2119

2220
LogUtils.LogState(GetType().Name);
2321
}
2422

2523
protected override void DoOnUpdate()
2624
{
2725
}
28-
29-
// private void DoOnCountEnd()
30-
// {
31-
// GameEvents.instance.TriggerRepeatEnd();
32-
// }
3326
}

‎Assets/Scripts/ReplayHandler.cs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ void Update()
1414

1515
public void HandleClick()
1616
{
17-
// GameEvents.instance.TriggerRemember();
1817
GameEvents.instance.TriggerPrepare();
1918
}
2019
}

‎Assets/Scripts/StartHandler.cs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ void Update()
1414

1515
public void HandleClick()
1616
{
17-
// GameEvents.instance.TriggerRemember();
1817
GameEvents.instance.TriggerPrepare();
1918
}
2019
}

‎Assets/Scripts/ToolbarController.cs

-34
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ public class ToolbarController : MonoBehaviour
77
private static readonly char DASH = '–';
88
private static readonly float FPS = 60f;
99

10-
// public bool active = true;
1110
private int current = 0;
12-
// private int prev = 0;
1311

1412
public GameObject RadialTimer;
15-
// public Text display;
1613
public Text score;
1714
public Text level;
1815

@@ -34,7 +31,6 @@ void Update()
3431

3532
private void Restart()
3633
{
37-
// SetActive();
3834
ResetTimerFill();
3935
StartCoroutine(CountdownStart());
4036
StartCoroutine(RadialTimerStart());
@@ -47,7 +43,6 @@ private float GetTimerStep()
4743

4844
private void DoOnCountRestart()
4945
{
50-
// Show();
5146
StopAllCoroutines();
5247
ResetTimer();
5348
Restart();
@@ -59,10 +54,6 @@ private IEnumerator RadialTimerStart()
5954
{
6055
while (IsRunning())
6156
{
62-
// if (!active)
63-
// {
64-
// yield break;
65-
// }
6657
RadialTimer.GetComponent<Image>().fillAmount += GetTimerStep();
6758
yield return new WaitForFixedUpdate();
6859
}
@@ -72,21 +63,14 @@ private IEnumerator CountdownStart()
7263
{
7364
while (IsRunning())
7465
{
75-
// if (!active)
76-
// {
77-
// yield break;
78-
// }
79-
// UpdateText();
8066
yield return new WaitForSeconds(1f);
8167
DecrementTimer();
8268
}
83-
// UpdateText();
8469
GameEvents.instance.TriggerCountEnd();
8570
}
8671

8772
private void ResetTimer()
8873
{
89-
// prev = current;
9074
current = GameStore.instance.timer;
9175
}
9276

@@ -102,14 +86,6 @@ private bool IsRunning()
10286

10387
private void UpdateScoreText()
10488
{
105-
// if (GameStore.instance.win || GameStore.instance.loose)
106-
// {
107-
// display.text = prev.ToString();
108-
// }
109-
// else
110-
// {
111-
// display.text = current.ToString();
112-
// }
11389
score.text = GameStore.instance.score.ToString();
11490
}
11591

@@ -120,16 +96,6 @@ private void UpdateLevelText()
12096
level.text = $"{weight}{DASH}{step}";
12197
}
12298

123-
// private void SetActive()
124-
// {
125-
// active = true;
126-
// }
127-
128-
// private void SetInactive()
129-
// {
130-
// active = false;
131-
// }
132-
13399
public void HideTimer()
134100
{
135101
RadialTimer.SetActive(false);

0 commit comments

Comments
 (0)