Skip to content

Commit 1e5c616

Browse files
committed
Attach input to button clicks
1 parent 678bf29 commit 1e5c616

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

UnityPomodoro/Assets/AdrianMiasik/Scenes/Main.unity

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,17 @@ MonoBehaviour:
572572
m_EditorClassIdentifier:
573573
m_AspectMode: 3
574574
m_AspectRatio: 1
575+
--- !u!114 &74629570 stripped
576+
MonoBehaviour:
577+
m_CorrespondingSourceObject: {fileID: 1830320757405263119, guid: 01ce964053042544a908dbc2b7805528, type: 3}
578+
m_PrefabInstance: {fileID: 1830320758431363088}
579+
m_PrefabAsset: {fileID: 0}
580+
m_GameObject: {fileID: 0}
581+
m_Enabled: 1
582+
m_EditorHideFlags: 0
583+
m_Script: {fileID: 11500000, guid: 984ef3fea536ce04d8d2611e6164a61d, type: 3}
584+
m_Name:
585+
m_EditorClassIdentifier:
575586
--- !u!1 &167431530
576587
GameObject:
577588
m_ObjectHideFlags: 0
@@ -2245,6 +2256,17 @@ Transform:
22452256
m_Father: {fileID: 0}
22462257
m_RootOrder: 2
22472258
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2259+
--- !u!114 &810166524 stripped
2260+
MonoBehaviour:
2261+
m_CorrespondingSourceObject: {fileID: 1830320757405263119, guid: 01ce964053042544a908dbc2b7805528, type: 3}
2262+
m_PrefabInstance: {fileID: 1050340279}
2263+
m_PrefabAsset: {fileID: 0}
2264+
m_GameObject: {fileID: 0}
2265+
m_Enabled: 1
2266+
m_EditorHideFlags: 0
2267+
m_Script: {fileID: 11500000, guid: 984ef3fea536ce04d8d2611e6164a61d, type: 3}
2268+
m_Name:
2269+
m_EditorClassIdentifier:
22482270
--- !u!1 &837249547
22492271
GameObject:
22502272
m_ObjectHideFlags: 0
@@ -4599,6 +4621,8 @@ MonoBehaviour:
45994621
secondDigits: {fileID: 2096418338}
46004622
text: {fileID: 650676969}
46014623
infoToggle: {fileID: 1617491758}
4624+
leftButtonClick: {fileID: 74629570}
4625+
rightButtonClick: {fileID: 810166524}
46024626
rightButton: {fileID: 1430356801}
46034627
breakSlider: {fileID: 1276951607}
46044628
creditsBubble: {fileID: 929885561}
@@ -4671,10 +4695,6 @@ MonoBehaviour:
46714695
xmlToast: {fileID: 4900000, guid: d3141a8c2f6b4f3bbd2831a62f225996, type: 3}
46724696
hotkeyDetector: {fileID: 1601903659}
46734697
selectedDigits: []
4674-
tabElements:
4675-
- {fileID: 1524052414}
4676-
- {fileID: 429705704}
4677-
- {fileID: 2096418338}
46784698
_fadeDuration: 0.1
46794699
_pauseHoldDuration: 0.75
46804700
--- !u!82 &1601903657

UnityPomodoro/Assets/AdrianMiasik/Scripts/PomodoroTimer.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public enum States
6363

6464
[Header("Buttons")]
6565
[SerializeField] private BooleanToggle infoToggle;
66+
[SerializeField] private ClickButton leftButtonClick;
67+
[SerializeField] private ClickButton rightButtonClick;
6668
[SerializeField] private RightButton rightButton;
6769
[SerializeField] private BooleanSlider breakSlider;
6870
[SerializeField] private CreditsBubble creditsBubble;
@@ -301,7 +303,8 @@ private void Update()
301303
digit.Lock();
302304
}
303305

304-
rightButton.OnClick();
306+
// Animate button in
307+
rightButtonClick.OnPointerClick(null);
305308
}
306309

307310
// Restart timer
@@ -313,7 +316,7 @@ private void Update()
313316
}
314317
else
315318
{
316-
Restart(state == States.COMPLETE);
319+
leftButtonClick.OnPointerClick(null);
317320
}
318321
}
319322

0 commit comments

Comments
 (0)