xevion/Boids
1
0
Fork 0
mirror of https://github.com/Xevion/Boids.git synced 2025-12-13 04:11:01 -06:00
Code Issues Packages Projects Releases 1 Wiki Activity

added UILock function (locking/unlocking when tweens complete), added check for stance already active

Browse Source
This commit is contained in:
Xevion
2020-05-22 20:31:05 -05:00
parent 75f11766a4
commit 2c70ce7f70
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Boids/Assets/Scripts/UIController.cs
View File

@@ -92,9 +92,19 @@ public class UIController : MonoBehaviour {
ChangeStance(UIStance.Title); ChangeStance(UIStance.Title);
} }
private void UnlockStanceChange() {
Debug.Log("Unlocking stance changes");
_UILock = false;
}
private void LockStanceChange() {
Debug.Log("Locking stance changes");
_UILock = true;
}
private void ChangeStance(UIStance stance) { private void ChangeStance(UIStance stance) {
// Quit early if UI is currently "locked" due to an active tween // Quit early if UI is currently "locked" due to an active tween
if (_UILock) if (_UILock || stance == _currentUI)
return; return;
Debug.Log($"UI Transition: {_currentUI} -> {stance}"); Debug.Log($"UI Transition: {_currentUI} -> {stance}");
@@ -148,6 +158,9 @@ public class UIController : MonoBehaviour {
} }
private void MoveElements(UIGroup group, bool away) { private void MoveElements(UIGroup group, bool away) {
// Disable changing of stances until all tweens are complete
LockStanceChange();
switch (group) { switch (group) {
case UIGroup.TitleScreen: case UIGroup.TitleScreen:
// Main Title and Start/Settings Buttons // Main Title and Start/Settings Buttons
@@ -155,7 +168,8 @@ public class UIController : MonoBehaviour {
LeanTween LeanTween
.move(element, element.transform.position + _titleDiff * (away ? 1 : -1), away ? 0.65f : 1.15f) .move(element, element.transform.position + _titleDiff * (away ? 1 : -1), away ? 0.65f : 1.15f)
.setDelay(away ? 0f : 0.35f) .setDelay(away ? 0f : 0.35f)
.setEase(away ? LeanTweenType.easeInCubic : LeanTweenType.easeOutCubic); .setEase(away ? LeanTweenType.easeInCubic : LeanTweenType.easeOutCubic)
.setOnComplete(UnlockStanceChange);
} }
// Bottom Right About Button // Bottom Right About Button
@@ -170,21 +184,24 @@ public class UIController : MonoBehaviour {
.move((adjPanelGo = adjPanel.gameObject), .move((adjPanelGo = adjPanel.gameObject),
adjPanelGo.transform.position + _adjustmentsDiff * (away ? 1 : -1), 1.15f) adjPanelGo.transform.position + _adjustmentsDiff * (away ? 1 : -1), 1.15f)
.setDelay(away ? 0f : 0.15f) .setDelay(away ? 0f : 0.15f)
.setEase(LeanTweenType.easeInOutCubic); .setEase(LeanTweenType.easeInOutCubic)
.setOnComplete(UnlockStanceChange);
break; break;
case UIGroup.AboutScreen: case UIGroup.AboutScreen:
LeanTween LeanTween
.move(aboutPanel.gameObject, aboutPanel.transform.position + _aboutDiff * (away ? 1 : -1), .move(aboutPanel.gameObject, aboutPanel.transform.position + _aboutDiff * (away ? 1 : -1),
away ? 0.6f : 1f) away ? 0.6f : 1f)
.setDelay(away ? 0f : 0.40f) .setDelay(away ? 0f : 0.40f)
.setEase(away ? LeanTweenType.easeInCubic : LeanTweenType.easeOutCubic); .setEase(away ? LeanTweenType.easeInCubic : LeanTweenType.easeOutCubic)
.setOnComplete(UnlockStanceChange);
break; break;
case UIGroup.SettingsScreen: case UIGroup.SettingsScreen:
LeanTween LeanTween
.move(settingsPanel.gameObject, settingsPanel.transform.position + _settingsDiff * (away ? 1 : -1), .move(settingsPanel.gameObject, settingsPanel.transform.position + _settingsDiff * (away ? 1 : -1),
away ? 0.7f : 1.1f) away ? 0.7f : 1.1f)
.setDelay(away ? 0.05f : 0.15f) .setDelay(away ? 0.05f : 0.15f)
.setEase(away ? LeanTweenType.easeInCubic : LeanTweenType.easeOutCubic); .setEase(away ? LeanTweenType.easeInCubic : LeanTweenType.easeOutCubic)
.setOnComplete(UnlockStanceChange);
break; break;
default: default:
throw new ArgumentOutOfRangeException(nameof(@group), @group, null); throw new ArgumentOutOfRangeException(nameof(@group), @group, null);