AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-07 16:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

SceneModule增加UniTask的LoadScene方法

Browse Source
This commit is contained in:
Alex-Rachel
2025-03-18 14:39:08 +08:00
parent 515d55e19a
commit 52ac77d5e4
2 changed files with 85 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
UnityProject/Assets/TEngine/Runtime/Module/SceneModule/ISceneModule.cs
View File

@@ -1,4 +1,5 @@
using System;
using Cysharp.Threading.Tasks;
using UnityEngine.SceneManagement;
namespace TEngine
@@ -10,6 +11,18 @@ namespace TEngine
/// </summary>
public string CurrentMainSceneName { get; }
/// <summary>
/// 加载场景。
/// </summary>
/// <param name="location">场景的定位地址</param>
/// <param name="sceneMode">场景加载模式</param>
/// <param name="suspendLoad">加载完毕时是否主动挂起</param>
/// <param name="priority">优先级</param>
/// <param name="gcCollect">加载主场景是否回收垃圾。</param>
/// <param name="progressCallBack">加载进度回调。</param>
public UniTask<Scene> LoadScene(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, uint priority = 100, bool gcCollect = true,
Action<float> progressCallBack = null);
/// <summary>
/// 加载场景。
/// </summary>
@@ -20,7 +33,7 @@ namespace TEngine
/// <param name="callBack">加载回调。</param>
/// <param name="gcCollect">加载主场景是否回收垃圾。</param>
/// <param name="progressCallBack">加载进度回调。</param>
public Scene LoadScene(string location,
public void LoadScene(string location,
LoadSceneMode sceneMode = LoadSceneMode.Single,
bool suspendLoad = false,
uint priority = 100,

78
UnityProject/Assets/TEngine/Runtime/Module/SceneModule/SceneModule.cs
View File

@@ -42,6 +42,74 @@ namespace TEngine
_currentMainSceneName = string.Empty;
}
/// <summary>
/// 加载场景。
/// </summary>
/// <param name="location">场景的定位地址</param>
/// <param name="sceneMode">场景加载模式</param>
/// <param name="suspendLoad">加载完毕时是否主动挂起</param>
/// <param name="priority">优先级</param>
/// <param name="gcCollect">加载主场景是否回收垃圾。</param>
/// <param name="progressCallBack">加载进度回调。</param>
public async UniTask<Scene> LoadScene(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, uint priority = 100, bool gcCollect = true, Action<float> progressCallBack = null)
{
if (sceneMode == LoadSceneMode.Additive)
{
if (_subScenes.TryGetValue(location, out SceneHandle subScene))
{
throw new Exception($"Could not load subScene while already loaded. Scene: {location}");
}
subScene = YooAssets.LoadSceneAsync(location, sceneMode, LocalPhysicsMode.None, suspendLoad, priority);
if (progressCallBack != null)
{
while (!subScene.IsDone && subScene.IsValid)
{
progressCallBack.Invoke(subScene.Progress);
await UniTask.Yield();
}
}
else
{
await subScene.ToUniTask();
}
_subScenes.Add(location, subScene);
return subScene.SceneObject;
}
else
{
if (_currentMainScene is { IsDone: false })
{
throw new Exception($"Could not load MainScene while loading. CurrentMainScene: {_currentMainSceneName}.");
}
_currentMainSceneName = location;
_currentMainScene = YooAssets.LoadSceneAsync(location, sceneMode, LocalPhysicsMode.None, suspendLoad, priority);
if (progressCallBack != null)
{
while (!_currentMainScene.IsDone && _currentMainScene.IsValid)
{
progressCallBack.Invoke(_currentMainScene.Progress);
await UniTask.Yield();
}
}
else
{
await _currentMainScene.ToUniTask();
}
ModuleSystem.GetModule<IResourceModule>().ForceUnloadUnusedAssets(gcCollect);
return _currentMainScene.SceneObject;
}
}
/// <summary>
/// 加载场景。
/// </summary>
@@ -52,7 +120,7 @@ namespace TEngine
/// <param name="callBack">加载回调。</param>
/// <param name="gcCollect">加载主场景是否回收垃圾。</param>
/// <param name="progressCallBack">加载进度回调。</param>
public Scene LoadScene(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, uint priority = 100,
public void LoadScene(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, uint priority = 100,
Action<Scene> callBack = null,
bool gcCollect = true, Action<float> progressCallBack = null)
{
@@ -61,7 +129,7 @@ namespace TEngine
if (_subScenes.TryGetValue(location, out SceneHandle subScene))
{
Log.Warning($"Could not load subScene while already loaded. Scene: {location}");
return default;
return;
}
subScene = YooAssets.LoadSceneAsync(location, sceneMode, LocalPhysicsMode.None, suspendLoad, priority);
@@ -77,15 +145,13 @@ namespace TEngine
}
_subScenes.Add(location, subScene);
return default;
}
else
{
if (_currentMainScene is { IsDone: false })
{
Log.Warning($"Could not load MainScene while loading. CurrentMainScene: {_currentMainSceneName}.");
return default;
return;
}
_currentMainSceneName = location;
@@ -103,8 +169,6 @@ namespace TEngine
}
ModuleSystem.GetModule<IResourceModule>().ForceUnloadUnusedAssets(gcCollect);
return _currentMainScene.SceneObject;
}
}