Update YooAsset

This commit is contained in:
hevinci
2022-03-09 23:57:04 +08:00
parent 1c7b90806c
commit a00924bb54
39 changed files with 283 additions and 369 deletions
@@ -3,6 +3,16 @@ namespace YooAsset
{
internal abstract class AssetProviderBase : IAssetProvider
{
public enum EStatus
{
None = 0,
CheckBundle,
Loading,
Checking,
Success,
Fail,
}
protected bool IsWaitForAsyncComplete { private set; get; } = false;
public string AssetPath { private set; get; }
@@ -11,7 +21,7 @@ namespace YooAsset
public UnityEngine.Object AssetObject { protected set; get; }
public UnityEngine.Object[] AllAssets { protected set; get; }
public IAssetInstance AssetInstance { protected set; get; }
public EAssetStates States { protected set; get; }
public EStatus Status { protected set; get; }
public int RefCount { private set; get; }
public AssetOperationHandle Handle { private set; get; }
public System.Action<AssetOperationHandle> Callback { set; get; }
@@ -20,7 +30,7 @@ namespace YooAsset
{
get
{
return States == EAssetStates.Success || States == EAssetStates.Fail;
return Status == EStatus.Success || Status == EStatus.Fail;
}
}
public bool IsValid
@@ -44,7 +54,7 @@ namespace YooAsset
AssetPath = assetPath;
AssetName = System.IO.Path.GetFileName(assetPath);
AssetType = assetType;
States = EAssetStates.None;
Status = EStatus.None;
Handle = new AssetOperationHandle(this);
}
@@ -26,13 +26,13 @@ namespace YooAsset
if (IsDone)
return;
if (States == EAssetStates.None)
if (Status == EStatus.None)
{
States = EAssetStates.CheckBundle;
Status = EStatus.CheckBundle;
}
// 1. 检测资源包
if (States == EAssetStates.CheckBundle)
if (Status == EStatus.CheckBundle)
{
if (IsWaitForAsyncComplete)
{
@@ -47,17 +47,17 @@ namespace YooAsset
if (OwnerBundle.CacheBundle == null)
{
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
}
else
{
States = EAssetStates.Loading;
Status = EStatus.Loading;
}
}
// 2. 加载资源对象
if (States == EAssetStates.Loading)
if (Status == EStatus.Loading)
{
if (IsWaitForAsyncComplete)
{
@@ -73,11 +73,11 @@ namespace YooAsset
else
_cacheRequest = OwnerBundle.CacheBundle.LoadAssetAsync(AssetName, AssetType);
}
States = EAssetStates.Checking;
Status = EStatus.Checking;
}
// 3. 检测加载结果
if (States == EAssetStates.Checking)
if (Status == EStatus.Checking)
{
if (_cacheRequest != null)
{
@@ -95,8 +95,8 @@ namespace YooAsset
}
}
States = AssetObject == null ? EAssetStates.Fail : EAssetStates.Success;
if (States == EAssetStates.Fail)
Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
YooLogger.Warning($"Failed to load asset : {AssetName} from bundle : {OwnerBundle.BundleFileInfo.BundleName}");
InvokeCompletion();
}
@@ -42,7 +42,7 @@ namespace YooAsset
ownerInfo.BundleName = OwnerBundle.BundleFileInfo.BundleName;
ownerInfo.Version = OwnerBundle.BundleFileInfo.Version;
ownerInfo.RefCount = OwnerBundle.RefCount;
ownerInfo.States = (int)OwnerBundle.States;
ownerInfo.Status = (int)OwnerBundle.Status;
output.Add(ownerInfo);
DependBundles.GetBundleDebugInfos(output);
@@ -29,13 +29,13 @@ namespace YooAsset
if (IsDone)
return;
if (States == EAssetStates.None)
if (Status == EStatus.None)
{
States = EAssetStates.CheckBundle;
Status = EStatus.CheckBundle;
}
// 1. 检测资源包
if (States == EAssetStates.CheckBundle)
if (Status == EStatus.CheckBundle)
{
if (DependBundles.IsDone() == false)
return;
@@ -44,34 +44,34 @@ namespace YooAsset
if (OwnerBundle.CacheBundle == null)
{
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
}
else
{
States = EAssetStates.Loading;
Status = EStatus.Loading;
}
}
// 2. 加载场景
if (States == EAssetStates.Loading)
if (Status == EStatus.Loading)
{
_asyncOp = SceneManager.LoadSceneAsync(AssetName, _param.LoadMode);
if (_asyncOp != null)
{
_asyncOp.allowSceneActivation = true;
States = EAssetStates.Checking;
Status = EStatus.Checking;
}
else
{
YooLogger.Warning($"Failed to load scene : {AssetName}");
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
}
}
// 3. 检测加载结果
if (States == EAssetStates.Checking)
if (Status == EStatus.Checking)
{
if (_asyncOp.isDone)
{
@@ -81,7 +81,7 @@ namespace YooAsset
if (_param.ActivateOnLoad)
instance.Activate();
States = instance.Scene.IsValid() ? EAssetStates.Success : EAssetStates.Fail;
Status = instance.Scene.IsValid() ? EStatus.Success : EStatus.Fail;
InvokeCompletion();
}
}
@@ -26,13 +26,13 @@ namespace YooAsset
if (IsDone)
return;
if (States == EAssetStates.None)
if (Status == EStatus.None)
{
States = EAssetStates.CheckBundle;
Status = EStatus.CheckBundle;
}
// 1. 检测资源包
if (States == EAssetStates.CheckBundle)
if (Status == EStatus.CheckBundle)
{
if (IsWaitForAsyncComplete)
{
@@ -47,17 +47,17 @@ namespace YooAsset
if (OwnerBundle.CacheBundle == null)
{
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
}
else
{
States = EAssetStates.Loading;
Status = EStatus.Loading;
}
}
// 2. 加载资源对象
if (States == EAssetStates.Loading)
if (Status == EStatus.Loading)
{
if (IsWaitForAsyncComplete)
{
@@ -73,11 +73,11 @@ namespace YooAsset
else
_cacheRequest = OwnerBundle.CacheBundle.LoadAssetWithSubAssetsAsync(AssetName, AssetType);
}
States = EAssetStates.Checking;
Status = EStatus.Checking;
}
// 3. 检测加载结果
if (States == EAssetStates.Checking)
if (Status == EStatus.Checking)
{
if (_cacheRequest != null)
{
@@ -95,8 +95,8 @@ namespace YooAsset
}
}
States = AllAssets == null ? EAssetStates.Fail : EAssetStates.Success;
if (States == EAssetStates.Fail)
Status = AllAssets == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
YooLogger.Warning($"Failed to load sub assets : {AssetName} from bundle : {OwnerBundle.BundleFileInfo.BundleName}");
InvokeCompletion();
}
@@ -27,19 +27,19 @@ namespace YooAsset
if (IsDone)
return;
if (States == EAssetStates.None)
if (Status == EStatus.None)
{
// 检测资源文件是否存在
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(AssetPath);
if (string.IsNullOrEmpty(guid))
{
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
return;
}
else
{
States = EAssetStates.Loading;
Status = EStatus.Loading;
}
// 注意:模拟异步加载效果提前返回
@@ -48,17 +48,17 @@ namespace YooAsset
}
// 1. 加载资源对象
if (States == EAssetStates.Loading)
if (Status == EStatus.Loading)
{
AssetObject = UnityEditor.AssetDatabase.LoadAssetAtPath(AssetPath, AssetType);
States = EAssetStates.Checking;
Status = EStatus.Checking;
}
// 2. 检测加载结果
if (States == EAssetStates.Checking)
if (Status == EStatus.Checking)
{
States = AssetObject == null ? EAssetStates.Fail : EAssetStates.Success;
if (States == EAssetStates.Fail)
Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
YooLogger.Warning($"Failed to load asset object : {AssetPath}");
InvokeCompletion();
}
@@ -28,13 +28,13 @@ namespace YooAsset
if (IsDone)
return;
if (States == EAssetStates.None)
if (Status == EStatus.None)
{
States = EAssetStates.Loading;
Status = EStatus.Loading;
}
// 1. 加载资源对象
if (States == EAssetStates.Loading)
if (Status == EStatus.Loading)
{
LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
loadSceneParameters.loadSceneMode = _param.LoadMode;
@@ -42,18 +42,18 @@ namespace YooAsset
if (_asyncOp != null)
{
_asyncOp.allowSceneActivation = true;
States = EAssetStates.Checking;
Status = EStatus.Checking;
}
else
{
YooLogger.Warning($"Failed to load scene : {AssetName}");
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
}
}
// 2. 检测加载结果
if (States == EAssetStates.Checking)
if (Status == EStatus.Checking)
{
if (_asyncOp.isDone)
{
@@ -63,7 +63,7 @@ namespace YooAsset
if(_param.ActivateOnLoad)
instance.Activate();
States = instance.Scene.IsValid() ? EAssetStates.Success : EAssetStates.Fail;
Status = instance.Scene.IsValid() ? EStatus.Success : EStatus.Fail;
InvokeCompletion();
}
}
@@ -27,19 +27,19 @@ namespace YooAsset
if (IsDone)
return;
if (States == EAssetStates.None)
if (Status == EStatus.None)
{
// 检测资源文件是否存在
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(AssetPath);
if (string.IsNullOrEmpty(guid))
{
States = EAssetStates.Fail;
Status = EStatus.Fail;
InvokeCompletion();
return;
}
else
{
States = EAssetStates.Loading;
Status = EStatus.Loading;
}
// 注意:模拟异步加载效果提前返回
@@ -48,7 +48,7 @@ namespace YooAsset
}
// 1. 加载资源对象
if (States == EAssetStates.Loading)
if (Status == EStatus.Loading)
{
var findAssets = UnityEditor.AssetDatabase.LoadAllAssetsAtPath(AssetPath);
List<UnityEngine.Object> result = new List<Object>(findAssets.Length);
@@ -58,14 +58,14 @@ namespace YooAsset
result.Add(findObj);
}
AllAssets = result.ToArray();
States = EAssetStates.Checking;
Status = EStatus.Checking;
}
// 2. 检测加载结果
if (States == EAssetStates.Checking)
if (Status == EStatus.Checking)
{
States = AllAssets == null ? EAssetStates.Fail : EAssetStates.Success;
if (States == EAssetStates.Fail)
Status = AllAssets == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
YooLogger.Warning($"Failed to load all asset object : {AssetPath}");
InvokeCompletion();
}
@@ -1,16 +0,0 @@
namespace YooAsset
{
/// <summary>
/// 资源加载状态
/// </summary>
public enum EAssetStates
{
None = 0,
CheckBundle,
Loading,
Checking,
Success,
Fail,
}
}
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: aa6c0fe63326c604bb699be16747c1e2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -39,7 +39,7 @@ namespace YooAsset
/// <summary>
/// 当前的加载状态
/// </summary>
EAssetStates States { get; }
AssetProviderBase.EStatus Status { get; }
/// <summary>
/// 引用计数