Merge pull request #23 from coryleach/dev

MultiSceneTransitionTask bugfix

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.6<br/>
+https://github.com/coryleach/UnityGUI.git#3.0.7<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.6",
+    "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.7",
     ...
   },
 }

Runtime/TransitionSystem/SceneTransitionTask.cs

@@ -18,12 +18,12 @@ public async Task ExecuteAsync()
 
             //Start Loads
             var loadOperation = SceneManager.LoadSceneAsync(SceneName, Mode);
-            
+
             if (loadOperation == null)
             {
                 return;
             }
-            
+
             //Allow them all to load till 90% complete
             loadOperation.allowSceneActivation = false;
 
@@ -34,13 +34,13 @@ public async Task ExecuteAsync()
             }
 
             loadOperation.allowSceneActivation = true;
-            
+
             while (!loadOperation.isDone)
             {
                 Progress = loadOperation.progress;
                 await Task.Yield();
             }
-            
+
             ListPool<AsyncOperation>.Release(loadTasks);
 
             //Load should now be complete
@@ -50,7 +50,7 @@ public async Task ExecuteAsync()
             await Task.Yield();
         }
     }
-    
+
     public class MultiSceneTransitionTask : ITransitionTask
     {
         public string[] UnloadScenes { get; set; }
@@ -62,11 +62,11 @@ public async Task ExecuteAsync()
         {
             var unloadTasks = ListPool<AsyncOperation>.Get();
             var loadTasks = ListPool<AsyncOperation>.Get();
-            
+
             Progress = 0;
-            
+
             int totalScenes = UnloadScenes.Length + LoadScenes.Length;
-            
+
             //Start Unloads
             for (var index = 0; index < UnloadScenes.Length; index++)
             {
@@ -100,13 +100,15 @@ public async Task ExecuteAsync()
             }
 
             var waiting = false;
-            
+
             do
             {
                 await Task.Yield();
 
                 float sumProgress = 0;
 
+                waiting = false;
+
                 for (var index = 0; index < unloadTasks.Count; index++)
                 {
                     var unload = unloadTasks[index];
@@ -147,9 +149,9 @@ public async Task ExecuteAsync()
 
             //Load should now be complete
             Progress = 1f;
-            
+
             //Yielding one last time to let the 100% progress to be handled by presenter
             await Task.Yield();
         }
     }
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.gameframe.gui",
   "displayName": "Gameframe.GUI",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "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": {