Merge pull request #27 from coryleach/dev

Custom CanTween override and NRE fix merge

Author: coryleach

README.md

@@ -22,15 +22,15 @@ Includes a SRP shader for blurring the background of UI panels.
 #### Using UnityPackageManager (for Unity 2019.3 or later)
 Open the package manager window (menu: Window > Package Manager)<br/>
 Select "Add package from git URL...", fill in the pop-up with the following link:<br/>
-https://github.com/coryleach/UnityGUI.git#3.0.10<br/>
+https://github.com/coryleach/UnityGUI.git#3.0.11<br/>
 
 #### Using UnityPackageManager (for Unity 2019.1 or later)
 
 Find the manifest.json file in the Packages folder of your project and edit it to look like this:
 ```js
 {
   "dependencies": {
-    "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.10",
+    "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.11",
     ...
   },
 }

Runtime/Tween/TweenExtensions.cs

@@ -11,9 +11,21 @@ public static class TweenExtensions
         private static CancellationTokenSource _cancellationTokenSource;
         private static Dictionary<int, TweenData> _tweenDict;
 
-        private static CancellationToken CancellationToken => _cancellationTokenSource.Token;
+        private static CancellationToken CancellationToken => (_cancellationTokenSource != null) ? _cancellationTokenSource.Token : CancellationToken.None;
 
-        private static bool CanTween => Application.isPlaying && !CancellationToken.IsCancellationRequested;
+        private static bool CanTween => CanTweenPredicate.Invoke();
+
+        private static Func<bool> _canTweenPredicate = DefaultCanTweenPredicate;
+        public static Func<bool> CanTweenPredicate
+        {
+            get => _canTweenPredicate;
+            set => _canTweenPredicate = value ?? DefaultCanTweenPredicate;
+        }
+
+        private static bool DefaultCanTweenPredicate()
+        {
+            return Application.isPlaying && !CancellationToken.IsCancellationRequested;
+        }
 
         [RuntimeInitializeOnLoadMethod]
         public static void Initialize()
@@ -81,10 +93,16 @@ public static Task DoPunchTweenAsync(int id, float duration, CancellationToken c
 
         public static async Task DoTweenAsyncWithLerp(Func<float,float,float,float> lerpMethod, int id, float duration, CancellationToken cancellationToken, Action<float> action, Easing easeType = Easing.Linear, AnimationCurve customCurve = null)
         {
+            if (!CanTween)
+            {
+                return;
+            }
+
             var instanceCancellationToken = StartTween(id);
 
             float t = 0;
             var ease = easeType != Easing.CustomCurve ? EaseFunctions.Get(easeType) : customCurve.Evaluate;
+
             action?.Invoke(ease.Invoke(0));
 
             while (t < duration && CanTween)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.gameframe.gui",
   "displayName": "Gameframe.GUI",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "This is a library of GUI helpers for UGUI  \r\nIncludes a panel system that implements a navigation stack.  \r\nIncludes a scene transition system.  \r\nIncludes a SRP shader for blurring the background of UI panels.",
   "keywords": [],
   "author": {