feat : add load scene sync method

Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs

@@ -37,6 +37,16 @@ namespace YooAsset
             }
         }
 
+        /// <summary>
+        /// 等待异步执行完毕
+        /// </summary>
+        internal void WaitForAsyncComplete()
+        {
+            if (IsValidWithWarning == false)
+                return;
+            Provider.WaitForAsyncComplete();
+        }
+
         /// <summary>
         /// 场景名称
         /// </summary>
@@ -171,5 +181,7 @@ namespace YooAsset
                 return operation;
             }
         }
+
+
     }
 }

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs

@@ -60,7 +60,15 @@ namespace YooAsset
             // 2. 加载场景
             if (_steps == ESteps.Loading)
             {
-                // 注意：如果场景不存在则返回NULL
+                if (IsWaitForAsyncComplete || IsForceDestroyComplete)
+                {
+                    LoadSceneParameters parameters = new LoadSceneParameters(SceneMode);
+                    SceneObject = SceneManager.LoadScene(MainAssetInfo.AssetPath, parameters);
+                }
+                else
+                {
+                    // 注意：如果场景不存在异步加载方法返回NULL
+                    // 注意：即使是异步加载也要在当帧获取到场景对象
                     _asyncOperation = SceneManager.LoadSceneAsync(MainAssetInfo.AssetPath, SceneMode);
                     if (_asyncOperation != null)
                     {
@@ -76,26 +84,38 @@ namespace YooAsset
                         InvokeCompletion(error, EOperationStatus.Failed);
                     }
                 }
+            }
 
             // 3. 检测加载结果
             if (_steps == ESteps.Checking)
             {
-                Progress = _asyncOperation.progress;
-                if (_asyncOperation.isDone)
+                if (_asyncOperation != null)
                 {
+                    if (IsWaitForAsyncComplete || IsForceDestroyComplete)
+                    {
+                        // 场景加载无法强制异步转同步
+                        YooLogger.Error("The scene is loading asyn !");
+                    }
+                    else
+                    {
+                        Progress = _asyncOperation.progress;
+                        if (_asyncOperation.isDone == false)
+                            return;
+                    }
+                }
+
                 if (SceneObject.IsValid())
                 {
                     InvokeCompletion(string.Empty, EOperationStatus.Succeed);
                 }
                 else
                 {
-                        string error = $"The load scene is invalid : {MainAssetInfo.AssetPath}";
+                    string error = $"The loaded scene is invalid : {MainAssetInfo.AssetPath}";
                     YooLogger.Error(error);
                     InvokeCompletion(error, EOperationStatus.Failed);
                 }
             }
         }
-        }
 
         /// <summary>
         /// 解除场景加载挂起操作

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs

@@ -57,8 +57,14 @@ namespace YooAsset
             // 2. 加载资源对象
             if (_steps == ESteps.Loading)
             {
-                LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
-                loadSceneParameters.loadSceneMode = SceneMode;
+                if (IsWaitForAsyncComplete || IsForceDestroyComplete)
+                {
+                    LoadSceneParameters loadSceneParameters = new LoadSceneParameters(SceneMode);
+                    SceneObject = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
+                }
+                else
+                {
+                    LoadSceneParameters loadSceneParameters = new LoadSceneParameters(SceneMode);
                     _asyncOperation = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
                     if (_asyncOperation != null)
                     {
@@ -74,13 +80,26 @@ namespace YooAsset
                         InvokeCompletion(error, EOperationStatus.Failed);
                     }
                 }
+            }
 
             // 3. 检测加载结果
             if (_steps == ESteps.Checking)
             {
-                Progress = _asyncOperation.progress;
-                if (_asyncOperation.isDone)
+                if (_asyncOperation != null)
                 {
+                    if (IsWaitForAsyncComplete || IsForceDestroyComplete)
+                    {
+                        // 场景加载无法强制异步转同步
+                        YooLogger.Error("The scene is loading asyn !");
+                    }
+                    else
+                    {
+                        Progress = _asyncOperation.progress;
+                        if (_asyncOperation.isDone == false)
+                            return;
+                    }
+                }
+
                 if (SceneObject.IsValid())
                 {
                     InvokeCompletion(string.Empty, EOperationStatus.Succeed);
@@ -92,7 +111,6 @@ namespace YooAsset
                     InvokeCompletion(error, EOperationStatus.Failed);
                 }
             }
-            }
 #endif
         }
 

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -602,6 +602,29 @@ namespace YooAsset
         #endregion
 
         #region 场景加载
+        /// <summary>
+        /// 同步加载场景
+        /// </summary>
+        /// <param name="location">场景的定位地址</param>
+        /// <param name="sceneMode">场景加载模式</param>
+        public SceneHandle LoadSceneSync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single)
+        {
+            DebugCheckInitialize();
+            AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
+            return LoadSceneInternal(assetInfo, true, sceneMode, false, 0);
+        }
+
+        /// <summary>
+        /// 同步加载场景
+        /// </summary>
+        /// <param name="assetInfo">场景的资源信息</param>
+        /// <param name="sceneMode">场景加载模式</param>
+        public SceneHandle LoadSceneSync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single)
+        {
+            DebugCheckInitialize();
+            return LoadSceneInternal(assetInfo, true, sceneMode, false, 0);
+        }
+
         /// <summary>
         /// 异步加载场景
         /// </summary>
@@ -613,8 +636,7 @@ namespace YooAsset
         {
             DebugCheckInitialize();
             AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
-            var handle = _resourceMgr.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
-            return handle;
+            return LoadSceneInternal(assetInfo, false, sceneMode, suspendLoad, priority);
         }
 
         /// <summary>
@@ -627,7 +649,16 @@ namespace YooAsset
         public SceneHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, uint priority = 0)
         {
             DebugCheckInitialize();
+            return LoadSceneInternal(assetInfo, false, sceneMode, suspendLoad, priority);
+        }
+
+        private SceneHandle LoadSceneInternal(AssetInfo assetInfo, bool waitForAsyncComplete, LoadSceneMode sceneMode, bool suspendLoad, uint priority)
+        {
+            DebugCheckAssetLoadMethod(nameof(LoadAssetAsync));
+            DebugCheckAssetLoadType(assetInfo.AssetType);
             var handle = _resourceMgr.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
+            if (waitForAsyncComplete)
+                handle.WaitForAsyncComplete();
             return handle;
         }
         #endregion