Merge branch 'master' of github.com:coderDarren/UnityCore

coderDarren · coderDarren · commit 0cf7da7f5cf2 · 2020-02-03T19:41:01.000-05:00
diff --git a/Data/DataController.cs b/Data/DataController.cs
@@ -28,6 +28,11 @@ public int Score {
                     return GetInt(DATA_SCORE);
                 }
                 set {
+                    // soft clamp value at 0
+                    if (value < 0) {
+                        value = 0;
+                    }
+                    
                     SaveInt(DATA_SCORE, value);
                     int _score = this.Score;
                     if (_score > this.Highscore) {
diff --git a/Menu/PageController.cs b/Menu/PageController.cs
@@ -67,7 +67,7 @@ public void TurnPageOff(PageType _off, PageType _on=PageType.None, bool _waitFor
                     _offPage.Animate(false);
                 }
 
-                if (_waitForExit) {
+                if (_waitForExit && _offPage.useAnimation) {
                     Page _onPage = GetPage(_on);
                     StopCoroutine("WaitForPageExit");
                     StartCoroutine(WaitForPageExit(_onPage, _offPage));

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void TurnPageOff(PageType _off, PageType _on=PageType.None, bool _waitFor`
`67`	`67`	`_offPage.Animate(false);`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (_waitForExit) {`
	`70`	`+ if (_waitForExit && _offPage.useAnimation) {`
`71`	`71`	`Page _onPage = GetPage(_on);`
`72`	`72`	`StopCoroutine("WaitForPageExit");`
`73`	`73`	`StartCoroutine(WaitForPageExit(_onPage, _offPage));`