Update AssetSystem

This commit is contained in:
hevinci
2022-03-22 20:15:59 +08:00
parent 578cd7ebb5
commit 8373df547b
10 changed files with 352 additions and 113 deletions
@@ -43,7 +43,7 @@ namespace YooAsset
/// <summary>
/// 获取的场景对象
/// </summary>
public UnityEngine.SceneManagement.Scene Scene { protected set; get; }
public UnityEngine.SceneManagement.Scene SceneObject { protected set; get; }
/// <summary>
@@ -108,6 +108,17 @@ namespace YooAsset
IsDestroyed = true;
}
/// <summary>
/// 是否可以销毁
/// </summary>
public bool CanDestroy()
{
if (IsDone == false)
return false;
return RefCount <= 0;
}
/// <summary>
/// 创建操作句柄
/// </summary>
@@ -120,6 +131,8 @@ namespace YooAsset
OperationHandleBase handle;
if (IsSceneProvider())
handle = new SceneOperationHandle(this);
else if (IsSubAssetsProvider())
handle = new SubAssetsOperationHandle(this);
else
handle = new AssetOperationHandle(this);
@@ -142,17 +155,6 @@ namespace YooAsset
RefCount--;
}
/// <summary>
/// 是否可以销毁
/// </summary>
public bool CanDestroy()
{
if (IsDone == false)
return false;
return RefCount <= 0;
}
/// <summary>
/// 是否为场景提供者
/// </summary>
@@ -164,6 +166,17 @@ namespace YooAsset
return false;
}
/// <summary>
/// 是否为子资源对象提供者
/// </summary>
public bool IsSubAssetsProvider()
{
if (this is BundledSubAssetsProvider || this is DatabaseSubAssetsProvider)
return true;
else
return false;
}
/// <summary>
/// 等待异步执行完毕
/// </summary>
@@ -7,8 +7,9 @@ namespace YooAsset
{
internal sealed class BundledSceneProvider : BundledProvider
{
private readonly LoadSceneMode _sceneMode;
public readonly LoadSceneMode SceneMode;
private readonly bool _activateOnLoad;
private readonly int _priority;
private AsyncOperation _asyncOp;
public override float Progress
{
@@ -20,11 +21,12 @@ namespace YooAsset
}
}
public BundledSceneProvider(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad)
public BundledSceneProvider(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
: base(scenePath, null)
{
_sceneMode = sceneMode;
SceneMode = sceneMode;
_activateOnLoad = activateOnLoad;
_priority = priority;
}
public override void Update()
{
@@ -58,10 +60,11 @@ namespace YooAsset
// 2. 加载场景
if (Status == EStatus.Loading)
{
_asyncOp = SceneManager.LoadSceneAsync(AssetName, _sceneMode);
_asyncOp = SceneManager.LoadSceneAsync(AssetName, SceneMode);
if (_asyncOp != null)
{
_asyncOp.allowSceneActivation = true;
_asyncOp.priority = _priority;
Status = EStatus.Checking;
}
else
@@ -77,25 +80,14 @@ namespace YooAsset
{
if (_asyncOp.isDone)
{
Scene = SceneManager.GetSceneByName(AssetName);
if (_activateOnLoad)
SceneManager.SetActiveScene(Scene);
SceneObject = SceneManager.GetSceneByName(AssetName);
if (SceneObject.IsValid() && _activateOnLoad)
SceneManager.SetActiveScene(SceneObject);
Status = Scene.IsValid() ? EStatus.Success : EStatus.Fail;
Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
InvokeCompletion();
}
}
}
public override void Destory()
{
base.Destory();
// 卸载附加场景(异步方式卸载)
if (_sceneMode == LoadSceneMode.Additive)
{
if (Scene.IsValid() && Scene.isLoaded)
SceneManager.UnloadSceneAsync(Scene);
}
}
}
}
@@ -5,8 +5,9 @@ namespace YooAsset
{
internal sealed class DatabaseSceneProvider : AssetProviderBase
{
private readonly LoadSceneMode _sceneMode;
public readonly LoadSceneMode SceneMode;
private readonly bool _activateOnLoad;
private readonly int _priority;
private AsyncOperation _asyncOp;
public override float Progress
{
@@ -18,11 +19,12 @@ namespace YooAsset
}
}
public DatabaseSceneProvider(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad)
public DatabaseSceneProvider(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
: base(scenePath, null)
{
_sceneMode = sceneMode;
SceneMode = sceneMode;
_activateOnLoad = activateOnLoad;
_priority = priority;
}
public override void Update()
{
@@ -39,11 +41,12 @@ namespace YooAsset
if (Status == EStatus.Loading)
{
LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
loadSceneParameters.loadSceneMode = _sceneMode;
loadSceneParameters.loadSceneMode = SceneMode;
_asyncOp = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(AssetPath, loadSceneParameters);
if (_asyncOp != null)
{
_asyncOp.allowSceneActivation = true;
_asyncOp.priority = _priority;
Status = EStatus.Checking;
}
else
@@ -59,27 +62,14 @@ namespace YooAsset
{
if (_asyncOp.isDone)
{
Scene = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
if (_activateOnLoad)
SceneManager.SetActiveScene(Scene);
SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
if (SceneObject.IsValid() && _activateOnLoad)
SceneManager.SetActiveScene(SceneObject);
Status = Scene.IsValid() ? EStatus.Success : EStatus.Fail;
Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
InvokeCompletion();
}
}
#endif
}
public override void Destory()
{
#if UNITY_EDITOR
base.Destory();
// 卸载附加场景(异步方式卸载)
if (_sceneMode == LoadSceneMode.Additive)
{
if (Scene.IsValid() && Scene.isLoaded)
SceneManager.UnloadSceneAsync(Scene);
}
#endif
}
}