pengtaihao
/
YooAsset
mirror of https://github.com/tuyoogame/YooAsset
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimized asset system and patch system framework 

优化了资源定位不正确导致的错误报告方式。
YooAssets.ProcessOperation()重命名为YooAssets.StartOperation()
YooAssets.GetBundleInfo()已经移除方法。
YooAssets.IsNeedDownloadFromRemote()新增加方法。
pull/11/head
hevinci 2022-05-11 16:48:17 +08:00
parent 67eeae31c7
commit 4cad587609
34 changed files with 726 additions and 573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
@ -12,16 +11,8 @@ namespace YooAsset
private static readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000); private static readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000);
private static readonly List<ProviderBase> _providers = new List<ProviderBase>(1000); private static readonly List<ProviderBase> _providers = new List<ProviderBase>(1000);
private static readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100); private static readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
private static bool _simulationOnEditor;
/// <summary> private static int _loadingMaxNumber;
/// 在编辑器下模拟运行
/// </summary>
public static bool SimulationOnEditor { private set; get; }
/// <summary>
/// 运行时的最大加载个数
/// </summary>
public static int AssetLoadingMaxNumber { private set; get; }
public static IDecryptionServices DecryptionServices { private set; get; } public static IDecryptionServices DecryptionServices { private set; get; }
public static IBundleServices BundleServices { private set; get; } public static IBundleServices BundleServices { private set; get; }
@ -31,10 +22,10 @@ namespace YooAsset
/// 初始化资源系统 /// 初始化资源系统
/// 注意：在使用AssetSystem之前需要初始化 /// 注意：在使用AssetSystem之前需要初始化
/// </summary> /// </summary>
public static void Initialize(bool simulationOnEditor, int assetLoadingMaxNumber, IDecryptionServices decryptionServices, IBundleServices bundleServices) public static void Initialize(bool simulationOnEditor, int loadingMaxNumber, IDecryptionServices decryptionServices, IBundleServices bundleServices)
{ {
SimulationOnEditor = simulationOnEditor; _simulationOnEditor = simulationOnEditor;
AssetLoadingMaxNumber = assetLoadingMaxNumber; _loadingMaxNumber = loadingMaxNumber;
DecryptionServices = decryptionServices; DecryptionServices = decryptionServices;
BundleServices = bundleServices; BundleServices = bundleServices;
} }
@ -63,7 +54,7 @@ namespace YooAsset
} }
else else
{ {
if (loadingCount < AssetLoadingMaxNumber) if (loadingCount < _loadingMaxNumber)
provider.Update(); provider.Update();
if (provider.IsDone == false) if (provider.IsDone == false)
@ -77,7 +68,7 @@ namespace YooAsset
/// </summary> /// </summary>
public static void UnloadUnusedAssets() public static void UnloadUnusedAssets()
{ {
if (SimulationOnEditor) if (_simulationOnEditor)
{ {
for (int i = _providers.Count - 1; i >= 0; i--) for (int i = _providers.Count - 1; i >= 0; i--)
{ {
@ -128,15 +119,21 @@ namespace YooAsset
Resources.UnloadUnusedAssets(); Resources.UnloadUnusedAssets();
} }
/// <summary> /// <summary>
/// 加载场景 /// 加载场景
/// </summary> /// </summary>
public static SceneOperationHandle LoadSceneAsync(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad, int priority) public static SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
{ {
if (assetInfo.IsInvalid)
{
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
return completedProvider.CreateHandle<SceneOperationHandle>();
}
// 注意：场景句柄永远保持唯一 // 注意：场景句柄永远保持唯一
if (_sceneHandles.ContainsKey(scenePath)) string providerGUID = assetInfo.ProviderGUID;
return _sceneHandles[scenePath]; if (_sceneHandles.ContainsKey(providerGUID))
return _sceneHandles[providerGUID];
// 如果加载的是主场景，则卸载所有缓存的场景 // 如果加载的是主场景，则卸载所有缓存的场景
if (sceneMode == LoadSceneMode.Single) if (sceneMode == LoadSceneMode.Single)
@ -144,68 +141,79 @@ namespace YooAsset
UnloadAllScene(); UnloadAllScene();
} }
ProviderBase provider = TryGetProvider(scenePath); ProviderBase provider = TryGetProvider(providerGUID);
if (provider == null) if (provider == null)
{ {
if (SimulationOnEditor) if (_simulationOnEditor)
provider = new DatabaseSceneProvider(scenePath, sceneMode, activateOnLoad, priority); provider = new DatabaseSceneProvider(assetInfo, sceneMode, activateOnLoad, priority);
else else
provider = new BundledSceneProvider(scenePath, sceneMode, activateOnLoad, priority); provider = new BundledSceneProvider(assetInfo, sceneMode, activateOnLoad, priority);
provider.InitSpawnDebugInfo(); provider.InitSpawnDebugInfo();
_providers.Add(provider); _providers.Add(provider);
} }
var handle = provider.CreateHandle() as SceneOperationHandle; var handle = provider.CreateHandle<SceneOperationHandle>();
_sceneHandles.Add(scenePath, handle); _sceneHandles.Add(providerGUID, handle);
return handle; return handle;
} }
/// <summary> /// <summary>
/// 加载资源对象 /// 加载资源对象
/// </summary> /// </summary>
public static AssetOperationHandle LoadAssetAsync(string assetPath, System.Type assetType) public static AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
{ {
ProviderBase provider = TryGetProvider(assetPath); if (assetInfo.IsInvalid)
{
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
return completedProvider.CreateHandle<AssetOperationHandle>();
}
ProviderBase provider = TryGetProvider(assetInfo.ProviderGUID);
if (provider == null) if (provider == null)
{ {
if (SimulationOnEditor) if (_simulationOnEditor)
provider = new DatabaseAssetProvider(assetPath, assetType); provider = new DatabaseAssetProvider(assetInfo);
else else
provider = new BundledAssetProvider(assetPath, assetType); provider = new BundledAssetProvider(assetInfo);
provider.InitSpawnDebugInfo(); provider.InitSpawnDebugInfo();
_providers.Add(provider); _providers.Add(provider);
} }
return provider.CreateHandle() as AssetOperationHandle; return provider.CreateHandle<AssetOperationHandle>();
} }
/// <summary> /// <summary>
/// 加载子资源对象 /// 加载子资源对象
/// </summary> /// </summary>
public static SubAssetsOperationHandle LoadSubAssetsAsync(string assetPath, System.Type assetType) public static SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
{ {
ProviderBase provider = TryGetProvider(assetPath); if (assetInfo.IsInvalid)
{
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
return completedProvider.CreateHandle<SubAssetsOperationHandle>();
}
ProviderBase provider = TryGetProvider(assetInfo.ProviderGUID);
if (provider == null) if (provider == null)
{ {
if (SimulationOnEditor) if (_simulationOnEditor)
provider = new DatabaseSubAssetsProvider(assetPath, assetType); provider = new DatabaseSubAssetsProvider(assetInfo);
else else
provider = new BundledSubAssetsProvider(assetPath, assetType); provider = new BundledSubAssetsProvider(assetInfo);
provider.InitSpawnDebugInfo(); provider.InitSpawnDebugInfo();
_providers.Add(provider); _providers.Add(provider);
} }
return provider.CreateHandle() as SubAssetsOperationHandle; return provider.CreateHandle<SubAssetsOperationHandle>();
} }
internal static void UnloadSubScene(ProviderBase provider) internal static void UnloadSubScene(ProviderBase provider)
{ {
string scenePath = provider.AssetPath; string providerGUID = provider.MainAssetInfo.ProviderGUID;
if (_sceneHandles.ContainsKey(scenePath) == false) if (_sceneHandles.ContainsKey(providerGUID) == false)
throw new Exception("Should never get here !"); throw new Exception("Should never get here !");
// 释放子场景句柄 // 释放子场景句柄
_sceneHandles[scenePath].ReleaseInternal(); _sceneHandles[providerGUID].ReleaseInternal();
_sceneHandles.Remove(scenePath); _sceneHandles.Remove(providerGUID);
// 卸载未被使用的资源（包括场景） // 卸载未被使用的资源（包括场景）
AssetSystem.UnloadUnusedAssets(); AssetSystem.UnloadUnusedAssets();
@ -239,24 +247,19 @@ namespace YooAsset
} }
} }
internal static AssetBundleLoaderBase CreateOwnerAssetBundleLoader(string assetPath) internal static AssetBundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
{ {
string bundleName = BundleServices.GetBundleName(assetPath); BundleInfo bundleInfo = BundleServices.GetBundleInfo(assetInfo);
BundleInfo bundleInfo = BundleServices.GetBundleInfo(bundleName);
return CreateAssetBundleLoaderInternal(bundleInfo); return CreateAssetBundleLoaderInternal(bundleInfo);
} }
internal static List<AssetBundleLoaderBase> CreateDependAssetBundleLoaders(string assetPath) internal static List<AssetBundleLoaderBase> CreateDependAssetBundleLoaders(AssetInfo assetInfo)
{ {
List<AssetBundleLoaderBase> result = new List<AssetBundleLoaderBase>(); BundleInfo[] depends = BundleServices.GetAllDependBundleInfos(assetInfo);
string[] depends = BundleServices.GetAllDependencies(assetPath); List<AssetBundleLoaderBase> result = new List<AssetBundleLoaderBase>(depends.Length);
if (depends != null) foreach (var bundleInfo in depends)
{ {
foreach (var dependBundleName in depends) AssetBundleLoaderBase dependLoader = CreateAssetBundleLoaderInternal(bundleInfo);
{ result.Add(dependLoader);
BundleInfo dependBundleInfo = BundleServices.GetBundleInfo(dependBundleName);
AssetBundleLoaderBase dependLoader = CreateAssetBundleLoaderInternal(dependBundleInfo);
result.Add(dependLoader);
}
} }
return result; return result;
} }
@ -291,7 +294,7 @@ namespace YooAsset
for (int i = 0; i < _loaders.Count; i++) for (int i = 0; i < _loaders.Count; i++)
{ {
AssetBundleLoaderBase temp = _loaders[i]; AssetBundleLoaderBase temp = _loaders[i];
if (temp.BundleFileInfo.BundleName.Equals(bundleName)) if (temp.MainBundleInfo.BundleName.Equals(bundleName))
{ {
loader = temp; loader = temp;
break; break;
@ -299,13 +302,13 @@ namespace YooAsset
} }
return loader; return loader;
} }
private static ProviderBase TryGetProvider(string assetPath) private static ProviderBase TryGetProvider(string providerGUID)
{ {
ProviderBase provider = null; ProviderBase provider = null;
for (int i = 0; i < _providers.Count; i++) for (int i = 0; i < _providers.Count; i++)
{ {
ProviderBase temp = _providers[i]; ProviderBase temp = _providers[i];
if (temp.AssetPath.Equals(assetPath)) if (temp.MainAssetInfo.ProviderGUID.Equals(providerGUID))
{ {
provider = temp; provider = temp;
break; break;
@ -314,7 +317,6 @@ namespace YooAsset
return provider; return provider;
} }
#region 调试专属方法 #region 调试专属方法
internal static void GetDebugReport(DebugReport report) internal static void GetDebugReport(DebugReport report)
{ {
@ -325,7 +327,7 @@ namespace YooAsset
foreach (var provider in _providers) foreach (var provider in _providers)
{ {
DebugProviderInfo providerInfo = new DebugProviderInfo(); DebugProviderInfo providerInfo = new DebugProviderInfo();
providerInfo.AssetPath = provider.AssetPath; providerInfo.AssetPath = provider.MainAssetInfo.AssetPath;
providerInfo.SpawnScene = provider.SpawnScene; providerInfo.SpawnScene = provider.SpawnScene;
providerInfo.SpawnTime = provider.SpawnTime; providerInfo.SpawnTime = provider.SpawnTime;
providerInfo.RefCount = provider.RefCount; providerInfo.RefCount = provider.RefCount;

2
Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs
View File

@ -135,7 +135,7 @@ namespace YooAsset
private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation) private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
{ {
InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation); InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
} }

8
Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs
View File

@ -4,13 +4,13 @@ namespace YooAsset
{ {
public abstract class OperationHandleBase : IEnumerator public abstract class OperationHandleBase : IEnumerator
{ {
private readonly string _cachedAssetPath; private readonly AssetInfo _assetInfo;
internal ProviderBase Provider { private set; get; } internal ProviderBase Provider { private set; get; }
internal OperationHandleBase(ProviderBase provider) internal OperationHandleBase(ProviderBase provider)
{ {
Provider = provider; Provider = provider;
_cachedAssetPath = provider.AssetPath; _assetInfo = provider.MainAssetInfo;
} }
internal abstract void InvokeCallback(); internal abstract void InvokeCallback();
@ -85,9 +85,9 @@ namespace YooAsset
else else
{ {
if (Provider == null) if (Provider == null)
YooLogger.Warning($"Operation handle is released : {_cachedAssetPath}"); YooLogger.Warning($"Operation handle is released : {_assetInfo.AssetPath}");
else if (Provider.IsDestroyed) else if (Provider.IsDestroyed)
YooLogger.Warning($"Provider is destroyed : {_cachedAssetPath}"); YooLogger.Warning($"Provider is destroyed : {_assetInfo.AssetPath}");
return false; return false;
} }
} }

6
Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs
View File

@ -102,7 +102,7 @@ namespace YooAsset
{ {
string error = $"{nameof(SceneOperationHandle)} is invalid."; string error = $"{nameof(SceneOperationHandle)} is invalid.";
var operation = new UnloadSceneOperation(error); var operation = new UnloadSceneOperation(error);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -112,7 +112,7 @@ namespace YooAsset
string error = $"Cannot unload main scene. Use {nameof(YooAssets.LoadSceneAsync)} method to change the main scene !"; string error = $"Cannot unload main scene. Use {nameof(YooAssets.LoadSceneAsync)} method to change the main scene !";
YooLogger.Error(error); YooLogger.Error(error);
var operation = new UnloadSceneOperation(error); var operation = new UnloadSceneOperation(error);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -121,7 +121,7 @@ namespace YooAsset
AssetSystem.UnloadSubScene(Provider); AssetSystem.UnloadSubScene(Provider);
{ {
var operation = new UnloadSceneOperation(sceneObject); var operation = new UnloadSceneOperation(sceneObject);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
} }

32
Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs
View File

@ -39,31 +39,33 @@ namespace YooAsset
if (_steps == ESteps.None) if (_steps == ESteps.None)
{ {
if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.None) if(MainBundleInfo.IsInvalid)
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EStatus.Failed; Status = EStatus.Failed;
LastError = $"Invalid load mode : {BundleFileInfo.BundleName}"; LastError = $"The bundle info is invalid : {MainBundleInfo.BundleName}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
return;
} }
else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
{ {
_steps = ESteps.Download; _steps = ESteps.Download;
_fileLoadPath = BundleFileInfo.GetCacheLoadPath(); _fileLoadPath = MainBundleInfo.GetCacheLoadPath();
} }
else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming) else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{ {
_steps = ESteps.LoadFile; _steps = ESteps.LoadFile;
_fileLoadPath = BundleFileInfo.GetStreamingLoadPath(); _fileLoadPath = MainBundleInfo.GetStreamingLoadPath();
} }
else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache) else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
{ {
_steps = ESteps.LoadFile; _steps = ESteps.LoadFile;
_fileLoadPath = BundleFileInfo.GetCacheLoadPath(); _fileLoadPath = MainBundleInfo.GetCacheLoadPath();
} }
else else
{ {
throw new System.NotImplementedException(BundleFileInfo.LoadMode.ToString()); throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
} }
} }
@ -71,7 +73,7 @@ namespace YooAsset
if (_steps == ESteps.Download) if (_steps == ESteps.Download)
{ {
int failedTryAgain = int.MaxValue; int failedTryAgain = int.MaxValue;
_downloader = DownloadSystem.BeginDownload(BundleFileInfo, failedTryAgain); _downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
_steps = ESteps.CheckDownload; _steps = ESteps.CheckDownload;
} }
@ -109,12 +111,12 @@ namespace YooAsset
#endif #endif
// Load assetBundle file // Load assetBundle file
if (BundleFileInfo.IsEncrypted) if (MainBundleInfo.IsEncrypted)
{ {
if (AssetSystem.DecryptionServices == null) if (AssetSystem.DecryptionServices == null)
throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {BundleFileInfo.BundleName}"); throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {MainBundleInfo.BundleName}");
ulong offset = AssetSystem.DecryptionServices.GetFileOffset(BundleFileInfo); ulong offset = AssetSystem.DecryptionServices.GetFileOffset();
if (_isWaitForAsyncComplete) if (_isWaitForAsyncComplete)
CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath, 0, offset); CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath, 0, offset);
else else
@ -154,7 +156,7 @@ namespace YooAsset
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EStatus.Failed; Status = EStatus.Failed;
LastError = $"Failed to load assetBundle : {BundleFileInfo.BundleName}"; LastError = $"Failed to load assetBundle : {MainBundleInfo.BundleName}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
else else
@ -183,7 +185,7 @@ namespace YooAsset
if (_isShowWaitForAsyncError == false) if (_isShowWaitForAsyncError == false)
{ {
_isShowWaitForAsyncError = true; _isShowWaitForAsyncError = true;
YooLogger.Error($"WaitForAsyncComplete failed ! BundleName : {BundleFileInfo.BundleName} States : {Status}"); YooLogger.Error($"WaitForAsyncComplete failed ! BundleName : {MainBundleInfo.BundleName} States : {Status}");
} }
break; break;
} }

8
Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleLoaderBase.cs
View File

@ -17,7 +17,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 资源包文件信息 /// 资源包文件信息
/// </summary> /// </summary>
public BundleInfo BundleFileInfo { private set; get; } public BundleInfo MainBundleInfo { private set; get; }
/// <summary> /// <summary>
/// 引用计数 /// 引用计数
@ -45,7 +45,7 @@ namespace YooAsset
public AssetBundleLoaderBase(BundleInfo bundleInfo) public AssetBundleLoaderBase(BundleInfo bundleInfo)
{ {
BundleFileInfo = bundleInfo; MainBundleInfo = bundleInfo;
RefCount = 0; RefCount = 0;
Status = EStatus.None; Status = EStatus.None;
} }
@ -91,9 +91,9 @@ namespace YooAsset
if (forceDestroy == false) if (forceDestroy == false)
{ {
if (RefCount > 0) if (RefCount > 0)
throw new Exception($"Bundle file loader ref is not zero : {BundleFileInfo.BundleName}"); throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.BundleName}");
if (IsDone() == false) if (IsDone() == false)
throw new Exception($"Bundle file loader is not done : {BundleFileInfo.BundleName}"); throw new Exception($"Bundle file loader is not done : {MainBundleInfo.BundleName}");
} }
if (CacheBundle != null) if (CacheBundle != null)

16
Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs
View File

@ -37,28 +37,30 @@ namespace YooAsset
if (_steps == ESteps.None) if (_steps == ESteps.None)
{ {
if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.None) if (MainBundleInfo.IsInvalid)
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EStatus.Failed; Status = EStatus.Failed;
LastError = $"Invalid load mode : {BundleFileInfo.BundleName}"; LastError = $"The bundle info is invalid : {MainBundleInfo.BundleName}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
return;
} }
else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{ {
_steps = ESteps.LoadFile; _steps = ESteps.LoadFile;
_webURL = BundleFileInfo.GetStreamingLoadPath(); _webURL = MainBundleInfo.GetStreamingLoadPath();
} }
else else
{ {
throw new System.NotImplementedException(BundleFileInfo.LoadMode.ToString()); throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
} }
} }
// 1. 从服务器或缓存中获取AssetBundle文件 // 1. 从服务器或缓存中获取AssetBundle文件
if (_steps == ESteps.LoadFile) if (_steps == ESteps.LoadFile)
{ {
string hash = StringUtility.RemoveExtension(BundleFileInfo.Hash); string hash = StringUtility.RemoveExtension(MainBundleInfo.Hash);
_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_webURL, Hash128.Parse(hash)); _webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_webURL, Hash128.Parse(hash));
_webRequest.SendWebRequest(); _webRequest.SendWebRequest();
_steps = ESteps.CheckFile; _steps = ESteps.CheckFile;
@ -87,7 +89,7 @@ namespace YooAsset
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EStatus.Failed; Status = EStatus.Failed;
LastError = $"AssetBundle file is invalid : {BundleFileInfo.BundleName}"; LastError = $"AssetBundle file is invalid : {MainBundleInfo.BundleName}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
else else

6
Assets/YooAsset/Runtime/AssetSystem/Loader/DependAssetBundleGrouper.cs
View File

@ -12,9 +12,9 @@ namespace YooAsset
private readonly List<AssetBundleLoaderBase> _dependBundles; private readonly List<AssetBundleLoaderBase> _dependBundles;
public DependAssetBundleGroup(string assetPath) public DependAssetBundleGroup(List<AssetBundleLoaderBase> dpendBundles)
{ {
_dependBundles = AssetSystem.CreateDependAssetBundleLoaders(assetPath); _dependBundles = dpendBundles;
} }
/// <summary> /// <summary>
@ -102,7 +102,7 @@ namespace YooAsset
foreach (var loader in _dependBundles) foreach (var loader in _dependBundles)
{ {
var bundleInfo = new DebugBundleInfo(); var bundleInfo = new DebugBundleInfo();
bundleInfo.BundleName = loader.BundleFileInfo.BundleName; bundleInfo.BundleName = loader.MainBundleInfo.BundleName;
bundleInfo.RefCount = loader.RefCount; bundleInfo.RefCount = loader.RefCount;
bundleInfo.Status = loader.Status; bundleInfo.Status = loader.Status;
output.Add(bundleInfo); output.Add(bundleInfo);

30
Assets/YooAsset/Runtime/AssetSystem/Operations/RawFileOperation.cs
View File

@ -7,7 +7,7 @@ namespace YooAsset
/// </summary> /// </summary>
public abstract class RawFileOperation : AsyncOperationBase public abstract class RawFileOperation : AsyncOperationBase
{ {
protected readonly BundleInfo _bundleInfo; internal readonly BundleInfo _bundleInfo;
/// <summary> /// <summary>
/// 原生文件的拷贝路径 /// 原生文件的拷贝路径
@ -49,6 +49,34 @@ namespace YooAsset
} }
} }
/// <summary>
/// 发生错误的原生文件操作
/// </summary>
internal sealed class CompletedRawFileOperation : RawFileOperation
{
private readonly string _error;
internal CompletedRawFileOperation(string error, string copyPath) : base(null, copyPath)
{
_error = error;
}
internal override void Start()
{
Status = EOperationStatus.Failed;
Error = _error;
}
internal override void Update()
{
}
/// <summary>
/// 原生文件的缓存路径
/// </summary>
public override string GetCachePath()
{
return string.Empty;
}
}
/// <summary> /// <summary>
/// 编辑器下模拟运行的原生文件操作 /// 编辑器下模拟运行的原生文件操作
/// </summary> /// </summary>

29
Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs
View File

@ -17,8 +17,7 @@ namespace YooAsset
} }
} }
public BundledAssetProvider(string assetPath, System.Type assetType) public BundledAssetProvider(AssetInfo assetInfo) : base(assetInfo)
: base(assetPath, assetType)
{ {
} }
public override void Update() public override void Update()
@ -36,19 +35,19 @@ namespace YooAsset
{ {
if (IsWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
DependBundles.WaitForAsyncComplete(); DependBundleGroup.WaitForAsyncComplete();
OwnerBundle.WaitForAsyncComplete(); OwnerBundle.WaitForAsyncComplete();
} }
if (DependBundles.IsDone() == false) if (DependBundleGroup.IsDone() == false)
return; return;
if (OwnerBundle.IsDone() == false) if (OwnerBundle.IsDone() == false)
return; return;
if (DependBundles.IsSucceed() == false) if (DependBundleGroup.IsSucceed() == false)
{ {
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = DependBundles.GetLastError(); LastError = DependBundleGroup.GetLastError();
InvokeCompletion(); InvokeCompletion();
return; return;
} }
@ -69,17 +68,17 @@ namespace YooAsset
{ {
if (IsWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
AssetObject = OwnerBundle.CacheBundle.LoadAsset(AssetName); AssetObject = OwnerBundle.CacheBundle.LoadAsset(MainAssetInfo.AssetName);
else else
AssetObject = OwnerBundle.CacheBundle.LoadAsset(AssetName, AssetType); AssetObject = OwnerBundle.CacheBundle.LoadAsset(MainAssetInfo.AssetName, MainAssetInfo.AssetType);
} }
else else
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
_cacheRequest = OwnerBundle.CacheBundle.LoadAssetAsync(AssetName); _cacheRequest = OwnerBundle.CacheBundle.LoadAssetAsync(MainAssetInfo.AssetName);
else else
_cacheRequest = OwnerBundle.CacheBundle.LoadAssetAsync(AssetName, AssetType); _cacheRequest = OwnerBundle.CacheBundle.LoadAssetAsync(MainAssetInfo.AssetName, MainAssetInfo.AssetType);
} }
Status = EStatus.Checking; Status = EStatus.Checking;
} }
@ -106,10 +105,10 @@ namespace YooAsset
Status = AssetObject == null ? EStatus.Fail : EStatus.Success; Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail) if (Status == EStatus.Fail)
{ {
if(AssetType == null) if(MainAssetInfo.AssetType == null)
LastError = $"Failed to load asset : {AssetName} AssetType : null AssetBundle : {OwnerBundle.BundleFileInfo.BundleName}"; LastError = $"Failed to load asset : {MainAssetInfo.AssetName} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
else else
LastError = $"Failed to load asset : {AssetName} AssetType : {AssetType} AssetBundle : {OwnerBundle.BundleFileInfo.BundleName}"; LastError = $"Failed to load asset : {MainAssetInfo.AssetName} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
InvokeCompletion(); InvokeCompletion();

22
Assets/YooAsset/Runtime/AssetSystem/Provider/BundledProvider.cs
View File

@ -6,15 +6,17 @@ namespace YooAsset
internal abstract class BundledProvider : ProviderBase internal abstract class BundledProvider : ProviderBase
{ {
protected AssetBundleLoaderBase OwnerBundle { private set; get; } protected AssetBundleLoaderBase OwnerBundle { private set; get; }
protected DependAssetBundleGroup DependBundles { private set; get; } protected DependAssetBundleGroup DependBundleGroup { private set; get; }
public BundledProvider(string assetPath, System.Type assetType) : base(assetPath, assetType) public BundledProvider(AssetInfo assetInfo) : base(assetInfo)
{ {
OwnerBundle = AssetSystem.CreateOwnerAssetBundleLoader(assetPath); OwnerBundle = AssetSystem.CreateOwnerAssetBundleLoader(assetInfo);
OwnerBundle.Reference(); OwnerBundle.Reference();
OwnerBundle.AddProvider(this); OwnerBundle.AddProvider(this);
DependBundles = new DependAssetBundleGroup(assetPath);
DependBundles.Reference(); var dependBundles = AssetSystem.CreateDependAssetBundleLoaders(assetInfo);
DependBundleGroup = new DependAssetBundleGroup(dependBundles);
DependBundleGroup.Reference();
} }
public override void Destroy() public override void Destroy()
{ {
@ -26,10 +28,10 @@ namespace YooAsset
OwnerBundle.Release(); OwnerBundle.Release();
OwnerBundle = null; OwnerBundle = null;
} }
if (DependBundles != null) if (DependBundleGroup != null)
{ {
DependBundles.Release(); DependBundleGroup.Release();
DependBundles = null; DependBundleGroup = null;
} }
} }
@ -39,12 +41,12 @@ namespace YooAsset
internal void GetBundleDebugInfos(List<DebugBundleInfo> output) internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
{ {
var bundleInfo = new DebugBundleInfo(); var bundleInfo = new DebugBundleInfo();
bundleInfo.BundleName = OwnerBundle.BundleFileInfo.BundleName; bundleInfo.BundleName = OwnerBundle.MainBundleInfo.BundleName;
bundleInfo.RefCount = OwnerBundle.RefCount; bundleInfo.RefCount = OwnerBundle.RefCount;
bundleInfo.Status = OwnerBundle.Status; bundleInfo.Status = OwnerBundle.Status;
output.Add(bundleInfo); output.Add(bundleInfo);
DependBundles.GetBundleDebugInfos(output); DependBundleGroup.GetBundleDebugInfos(output);
} }
} }
} }

14
Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs
View File

@ -1,5 +1,6 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
@ -22,11 +23,10 @@ namespace YooAsset
} }
} }
public BundledSceneProvider(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad, int priority) public BundledSceneProvider(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(assetInfo)
: base(scenePath, null)
{ {
SceneMode = sceneMode; SceneMode = sceneMode;
_sceneName = System.IO.Path.GetFileNameWithoutExtension(scenePath); _sceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
_activateOnLoad = activateOnLoad; _activateOnLoad = activateOnLoad;
_priority = priority; _priority = priority;
} }
@ -43,15 +43,15 @@ namespace YooAsset
// 1. 检测资源包 // 1. 检测资源包
if (Status == EStatus.CheckBundle) if (Status == EStatus.CheckBundle)
{ {
if (DependBundles.IsDone() == false) if (DependBundleGroup.IsDone() == false)
return; return;
if (OwnerBundle.IsDone() == false) if (OwnerBundle.IsDone() == false)
return; return;
if (DependBundles.IsSucceed() == false) if (DependBundleGroup.IsSucceed() == false)
{ {
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = DependBundles.GetLastError(); LastError = DependBundleGroup.GetLastError();
InvokeCompletion(); InvokeCompletion();
return; return;
} }
@ -98,7 +98,7 @@ namespace YooAsset
Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail; Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
if(Status == EStatus.Fail) if(Status == EStatus.Fail)
{ {
LastError = $"The load scene is invalid : {AssetPath}"; LastError = $"The load scene is invalid : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
InvokeCompletion(); InvokeCompletion();

29
Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs
View File

@ -17,8 +17,7 @@ namespace YooAsset
} }
} }
public BundledSubAssetsProvider(string assetPath, System.Type assetType) public BundledSubAssetsProvider(AssetInfo assetInfo) : base(assetInfo)
: base(assetPath, assetType)
{ {
} }
public override void Update() public override void Update()
@ -36,19 +35,19 @@ namespace YooAsset
{ {
if (IsWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
DependBundles.WaitForAsyncComplete(); DependBundleGroup.WaitForAsyncComplete();
OwnerBundle.WaitForAsyncComplete(); OwnerBundle.WaitForAsyncComplete();
} }
if (DependBundles.IsDone() == false) if (DependBundleGroup.IsDone() == false)
return; return;
if (OwnerBundle.IsDone() == false) if (OwnerBundle.IsDone() == false)
return; return;
if (DependBundles.IsSucceed() == false) if (DependBundleGroup.IsSucceed() == false)
{ {
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = DependBundles.GetLastError(); LastError = DependBundleGroup.GetLastError();
InvokeCompletion(); InvokeCompletion();
return; return;
} }
@ -69,17 +68,17 @@ namespace YooAsset
{ {
if (IsWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
AllAssetObjects = OwnerBundle.CacheBundle.LoadAssetWithSubAssets(AssetName); AllAssetObjects = OwnerBundle.CacheBundle.LoadAssetWithSubAssets(MainAssetInfo.AssetName);
else else
AllAssetObjects = OwnerBundle.CacheBundle.LoadAssetWithSubAssets(AssetName, AssetType); AllAssetObjects = OwnerBundle.CacheBundle.LoadAssetWithSubAssets(MainAssetInfo.AssetName, MainAssetInfo.AssetType);
} }
else else
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
_cacheRequest = OwnerBundle.CacheBundle.LoadAssetWithSubAssetsAsync(AssetName); _cacheRequest = OwnerBundle.CacheBundle.LoadAssetWithSubAssetsAsync(MainAssetInfo.AssetName);
else else
_cacheRequest = OwnerBundle.CacheBundle.LoadAssetWithSubAssetsAsync(AssetName, AssetType); _cacheRequest = OwnerBundle.CacheBundle.LoadAssetWithSubAssetsAsync(MainAssetInfo.AssetName, MainAssetInfo.AssetType);
} }
Status = EStatus.Checking; Status = EStatus.Checking;
} }
@ -106,10 +105,10 @@ namespace YooAsset
Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success; Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail) if (Status == EStatus.Fail)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load sub assets : {AssetName} AssetType : null AssetBundle : {OwnerBundle.BundleFileInfo.BundleName}"; LastError = $"Failed to load sub assets : {MainAssetInfo.AssetName} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
else else
LastError = $"Failed to load sub assets : {AssetName} AssetType : {AssetType} AssetBundle : {OwnerBundle.BundleFileInfo.BundleName}"; LastError = $"Failed to load sub assets : {MainAssetInfo.AssetName} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
InvokeCompletion(); InvokeCompletion();

33
Assets/YooAsset/Runtime/AssetSystem/Provider/CompletedProvider.cs Normal file
View File

@ -0,0 +1,33 @@

namespace YooAsset
{
internal sealed class CompletedProvider : ProviderBase
{
public override float Progress
{
get
{
if (IsDone)
return 1f;
else
return 0;
}
}
public CompletedProvider(AssetInfo assetInfo) : base(assetInfo)
{
}
public override void Update()
{
if (IsDone)
return;
if (Status == EStatus.None)
{
Status = EStatus.Fail;
LastError = MainAssetInfo.Error;
InvokeCompletion();
}
}
}
}

11
Assets/YooAsset/Runtime/AssetSystem/Provider/CompletedProvider.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8e64fd2ee771f7d498838ebf375a9531
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

21
Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs
View File

@ -17,8 +17,7 @@ namespace YooAsset
} }
} }
public DatabaseAssetProvider(string assetPath, System.Type assetType) public DatabaseAssetProvider(AssetInfo assetInfo) : base(assetInfo)
: base(assetPath, assetType)
{ {
} }
public override void Update() public override void Update()
@ -30,11 +29,11 @@ namespace YooAsset
if (Status == EStatus.None) if (Status == EStatus.None)
{ {
// 检测资源文件是否存在 // 检测资源文件是否存在
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(AssetPath); string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
if (string.IsNullOrEmpty(guid)) if (string.IsNullOrEmpty(guid))
{ {
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = $"Not found asset : {AssetPath}"; LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
InvokeCompletion(); InvokeCompletion();
return; return;
@ -50,10 +49,10 @@ namespace YooAsset
// 1. 加载资源对象 // 1. 加载资源对象
if (Status == EStatus.Loading) if (Status == EStatus.Loading)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
AssetObject = UnityEditor.AssetDatabase.LoadMainAssetAtPath(AssetPath); AssetObject = UnityEditor.AssetDatabase.LoadMainAssetAtPath(MainAssetInfo.AssetPath);
else else
AssetObject = UnityEditor.AssetDatabase.LoadAssetAtPath(AssetPath, AssetType); AssetObject = UnityEditor.AssetDatabase.LoadAssetAtPath(MainAssetInfo.AssetPath, MainAssetInfo.AssetType);
Status = EStatus.Checking; Status = EStatus.Checking;
} }
@ -66,7 +65,7 @@ namespace YooAsset
{ {
AssetObject = null; AssetObject = null;
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = $"The loaded asset object is not main asset : {AssetPath} AssetType : {AssetType}"; LastError = $"The loaded asset object is not main asset : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
InvokeCompletion(); InvokeCompletion();
return; return;
@ -76,10 +75,10 @@ namespace YooAsset
Status = AssetObject == null ? EStatus.Fail : EStatus.Success; Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail) if (Status == EStatus.Fail)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load asset object : {AssetPath} AssetType : null"; LastError = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : null";
else else
LastError = $"Failed to load asset object : {AssetPath} AssetType : {AssetType}"; LastError = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
InvokeCompletion(); InvokeCompletion();

9
Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs
View File

@ -19,8 +19,7 @@ namespace YooAsset
} }
} }
public DatabaseSceneProvider(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad, int priority) public DatabaseSceneProvider(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(assetInfo)
: base(scenePath, null)
{ {
SceneMode = sceneMode; SceneMode = sceneMode;
_activateOnLoad = activateOnLoad; _activateOnLoad = activateOnLoad;
@ -42,7 +41,7 @@ namespace YooAsset
{ {
LoadSceneParameters loadSceneParameters = new LoadSceneParameters(); LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
loadSceneParameters.loadSceneMode = SceneMode; loadSceneParameters.loadSceneMode = SceneMode;
_asyncOp = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(AssetPath, loadSceneParameters); _asyncOp = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
if (_asyncOp != null) if (_asyncOp != null)
{ {
_asyncOp.allowSceneActivation = true; _asyncOp.allowSceneActivation = true;
@ -52,7 +51,7 @@ namespace YooAsset
else else
{ {
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = $"Failed to load scene : {AssetPath}"; LastError = $"Failed to load scene : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
InvokeCompletion(); InvokeCompletion();
} }
@ -70,7 +69,7 @@ namespace YooAsset
Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail; Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
if (Status == EStatus.Fail) if (Status == EStatus.Fail)
{ {
LastError = $"The loaded scene is invalid : {AssetPath}"; LastError = $"The loaded scene is invalid : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
InvokeCompletion(); InvokeCompletion();

21
Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs
View File

@ -17,8 +17,7 @@ namespace YooAsset
} }
} }
public DatabaseSubAssetsProvider(string assetPath, System.Type assetType) public DatabaseSubAssetsProvider(AssetInfo assetInfo) : base(assetInfo)
: base(assetPath, assetType)
{ {
} }
public override void Update() public override void Update()
@ -30,11 +29,11 @@ namespace YooAsset
if (Status == EStatus.None) if (Status == EStatus.None)
{ {
// 检测资源文件是否存在 // 检测资源文件是否存在
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(AssetPath); string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
if (string.IsNullOrEmpty(guid)) if (string.IsNullOrEmpty(guid))
{ {
Status = EStatus.Fail; Status = EStatus.Fail;
LastError = $"Not found asset : {AssetPath}"; LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
InvokeCompletion(); InvokeCompletion();
return; return;
@ -50,17 +49,17 @@ namespace YooAsset
// 1. 加载资源对象 // 1. 加载资源对象
if (Status == EStatus.Loading) if (Status == EStatus.Loading)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
{ {
AllAssetObjects = UnityEditor.AssetDatabase.LoadAllAssetRepresentationsAtPath(AssetPath); AllAssetObjects = UnityEditor.AssetDatabase.LoadAllAssetRepresentationsAtPath(MainAssetInfo.AssetPath);
} }
else else
{ {
UnityEngine.Object[] findAssets = UnityEditor.AssetDatabase.LoadAllAssetRepresentationsAtPath(AssetPath); UnityEngine.Object[] findAssets = UnityEditor.AssetDatabase.LoadAllAssetRepresentationsAtPath(MainAssetInfo.AssetPath);
List<UnityEngine.Object> result = new List<Object>(findAssets.Length); List<UnityEngine.Object> result = new List<Object>(findAssets.Length);
foreach (var findAsset in findAssets) foreach (var findAsset in findAssets)
{ {
if (AssetType.IsAssignableFrom(findAsset.GetType())) if (MainAssetInfo.AssetType.IsAssignableFrom(findAsset.GetType()))
result.Add(findAsset); result.Add(findAsset);
} }
AllAssetObjects = result.ToArray(); AllAssetObjects = result.ToArray();
@ -74,10 +73,10 @@ namespace YooAsset
Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success; Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail) if (Status == EStatus.Fail)
{ {
if (AssetType == null) if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load sub assets : {AssetPath} AssetType : null"; LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null";
else else
LastError = $"Failed to load sub assets : {AssetPath} AssetType : {AssetType}"; LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
YooLogger.Error(LastError); YooLogger.Error(LastError);
} }
InvokeCompletion(); InvokeCompletion();

60
Assets/YooAsset/Runtime/AssetSystem/Provider/ProviderBase.cs
View File

@ -18,19 +18,9 @@ namespace YooAsset
} }
/// <summary> /// <summary>
/// 资源路径 /// 资源信息
/// </summary> /// </summary>
public string AssetPath { private set; get; } public AssetInfo MainAssetInfo { private set; get; }
/// <summary>
/// 资源对象的名称
/// </summary>
public string AssetName { private set; get; }
/// <summary>
/// 资源对象的类型
/// </summary>
public System.Type AssetType { private set; get; }
/// <summary> /// <summary>
/// 获取的资源对象 /// 获取的资源对象
@ -95,11 +85,9 @@ namespace YooAsset
private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>(); private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
public ProviderBase(string assetPath, System.Type assetType) public ProviderBase(AssetInfo assetInfo)
{ {
AssetPath = assetPath; MainAssetInfo = assetInfo;
AssetName = System.IO.Path.GetFileName(assetPath);
AssetType = assetType;
} }
/// <summary> /// <summary>
@ -126,25 +114,38 @@ namespace YooAsset
return RefCount <= 0; return RefCount <= 0;
} }
/// <summary>
/// 是否为场景提供者
/// </summary>
public bool IsSceneProvider()
{
if (this is BundledSceneProvider || this is DatabaseSceneProvider)
return true;
else
return false;
}
/// <summary> /// <summary>
/// 创建操作句柄 /// 创建操作句柄
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public OperationHandleBase CreateHandle() public T CreateHandle<T>() where T : OperationHandleBase
{ {
// 引用计数增加 // 引用计数增加
RefCount++; RefCount++;
OperationHandleBase handle; OperationHandleBase handle;
if (IsSceneProvider()) if (typeof(T) == typeof(AssetOperationHandle))
handle = new AssetOperationHandle(this);
else if (typeof(T) == typeof(SceneOperationHandle))
handle = new SceneOperationHandle(this); handle = new SceneOperationHandle(this);
else if (IsSubAssetsProvider()) else if (typeof(T) == typeof(SubAssetsOperationHandle))
handle = new SubAssetsOperationHandle(this); handle = new SubAssetsOperationHandle(this);
else else
handle = new AssetOperationHandle(this); throw new System.NotImplementedException();
_handles.Add(handle); _handles.Add(handle);
return handle; return handle as T;
} }
/// <summary> /// <summary>
@ -175,7 +176,7 @@ namespace YooAsset
// 验证结果 // 验证结果
if (IsDone == false) if (IsDone == false)
{ {
YooLogger.Warning($"WaitForAsyncComplete failed to loading : {AssetPath}"); YooLogger.Warning($"WaitForAsyncComplete failed to loading : {MainAssetInfo.AssetPath}");
} }
} }
@ -196,21 +197,6 @@ namespace YooAsset
} }
} }
public bool IsSceneProvider()
{
if (this is BundledSceneProvider || this is DatabaseSceneProvider)
return true;
else
return false;
}
public bool IsSubAssetsProvider()
{
if (this is BundledSubAssetsProvider || this is DatabaseSubAssetsProvider)
return true;
else
return false;
}
#region 异步编程相关 #region 异步编程相关
private TaskCompletionSource<object> _taskCompletionSource; private TaskCompletionSource<object> _taskCompletionSource;
protected void InvokeCompletion() protected void InvokeCompletion()

2
Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs
View File

@ -15,7 +15,7 @@ namespace YooAsset
private static readonly Dictionary<string, DownloaderBase> _downloaderDic = new Dictionary<string, DownloaderBase>(); private static readonly Dictionary<string, DownloaderBase> _downloaderDic = new Dictionary<string, DownloaderBase>();
private static readonly List<string> _removeList = new List<string>(100); private static readonly List<string> _removeList = new List<string>(100);
private static readonly Dictionary<string, string> _cachedHashList = new Dictionary<string, string>(1000); private static readonly Dictionary<string, string> _cachedHashList = new Dictionary<string, string>(1000);
private static int _breakpointResumeFileSize; private static int _breakpointResumeFileSize = int.MaxValue;
/// <summary> /// <summary>
/// 初始化 /// 初始化

2
Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs
View File

@ -48,7 +48,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 开始处理异步操作类 /// 开始处理异步操作类
/// </summary> /// </summary>
public static void ProcessOperaiton(AsyncOperationBase operationBase) public static void StartOperaiton(AsyncOperationBase operationBase)
{ {
_operations.Add(operationBase); _operations.Add(operationBase);
operationBase.Start(); operationBase.Start();

79
Assets/YooAsset/Runtime/PatchSystem/AssetInfo.cs
View File

@ -1,8 +1,35 @@
 using System.IO;
namespace YooAsset namespace YooAsset
{ {
public class AssetInfo public class AssetInfo
{ {
private readonly PatchAsset _patchAsset;
private string _providerGUID;
/// <summary>
/// 资源提供者唯一标识符
/// </summary>
internal string ProviderGUID
{
get
{
if (string.IsNullOrEmpty(_providerGUID) == false)
return _providerGUID;
if (AssetType == null)
_providerGUID = $"{AssetPath}[null]";
else
_providerGUID = $"{AssetPath}[{AssetType.Name}]";
return _providerGUID;
}
}
/// <summary>
/// 资源对象名称
/// </summary>
public string AssetName { private set; get; }
/// <summary> /// <summary>
/// 资源路径 /// 资源路径
/// </summary> /// </summary>
@ -13,15 +40,55 @@ namespace YooAsset
/// </summary> /// </summary>
public System.Type AssetType { private set; get; } public System.Type AssetType { private set; get; }
public AssetInfo(string assetPath, System.Type assetType) /// <summary>
/// 身份是否无效
/// </summary>
public bool IsInvalid
{ {
AssetPath = assetPath; get
AssetType = assetType; {
return _patchAsset == null;
}
} }
public AssetInfo(string assetPath)
/// <summary>
/// 错误信息
/// </summary>
public string Error { private set; get; }
private AssetInfo()
{ {
AssetPath = assetPath; }
internal AssetInfo(PatchAsset patchAsset, System.Type assetType)
{
if (patchAsset == null)
throw new System.Exception("Should never get here !");
_patchAsset = patchAsset;
AssetType = assetType;
AssetPath = patchAsset.AssetPath;
AssetName = Path.GetFileName(patchAsset.AssetPath);
Error = string.Empty;
}
internal AssetInfo(PatchAsset patchAsset)
{
if (patchAsset == null)
throw new System.Exception("Should never get here !");
_patchAsset = patchAsset;
AssetType = null; AssetType = null;
AssetPath = patchAsset.AssetPath;
AssetName = Path.GetFileName(patchAsset.AssetPath);
Error = string.Empty;
}
internal AssetInfo(string error)
{
_patchAsset = null;
AssetType = null;
AssetPath = string.Empty;
AssetName = string.Empty;
Error = error;
} }
} }
} }

63
Assets/YooAsset/Runtime/PatchSystem/BundleInfo.cs
View File

@ -1,9 +1,9 @@
 
namespace YooAsset namespace YooAsset
{ {
public class BundleInfo internal class BundleInfo
{ {
internal enum ELoadMode public enum ELoadMode
{ {
None, None,
LoadFromStreaming, LoadFromStreaming,
@ -13,7 +13,7 @@ namespace YooAsset
} }
private readonly PatchBundle _patchBundle; private readonly PatchBundle _patchBundle;
internal readonly ELoadMode LoadMode; public readonly ELoadMode LoadMode;
private string _streamingPath; private string _streamingPath;
private string _cachePath; private string _cachePath;
@ -26,17 +26,17 @@ namespace YooAsset
/// <summary> /// <summary>
/// 远端下载地址 /// 远端下载地址
/// </summary> /// </summary>
internal string RemoteMainURL { private set; get; } public string RemoteMainURL { private set; get; }
/// <summary> /// <summary>
/// 远端下载备用地址 /// 远端下载备用地址
/// </summary> /// </summary>
internal string RemoteFallbackURL { private set; get; } public string RemoteFallbackURL { private set; get; }
/// <summary> /// <summary>
/// 编辑器资源路径 /// 编辑器资源路径
/// </summary> /// </summary>
internal string EditorAssetPath { private set; get; } public string EditorAssetPath { private set; get; }
/// <summary> /// <summary>
/// 文件哈希值 /// 文件哈希值
@ -108,11 +108,27 @@ namespace YooAsset
} }
} }
/// <summary>
/// 身份是否无效
/// </summary>
public bool IsInvalid
{
get
{
return _patchBundle == null;
}
}
/// <summary>
/// 错误信息
/// </summary>
public string Error { private set; get; }
private BundleInfo() private BundleInfo()
{ {
} }
internal BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string mainURL, string fallbackURL) public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string mainURL, string fallbackURL)
{ {
_patchBundle = patchBundle; _patchBundle = patchBundle;
LoadMode = loadMode; LoadMode = loadMode;
@ -120,8 +136,9 @@ namespace YooAsset
RemoteMainURL = mainURL; RemoteMainURL = mainURL;
RemoteFallbackURL = fallbackURL; RemoteFallbackURL = fallbackURL;
EditorAssetPath = string.Empty; EditorAssetPath = string.Empty;
Error = string.Empty;
} }
internal BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string editorAssetPath) public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string editorAssetPath)
{ {
_patchBundle = patchBundle; _patchBundle = patchBundle;
LoadMode = loadMode; LoadMode = loadMode;
@ -129,8 +146,9 @@ namespace YooAsset
RemoteMainURL = string.Empty; RemoteMainURL = string.Empty;
RemoteFallbackURL = string.Empty; RemoteFallbackURL = string.Empty;
EditorAssetPath = editorAssetPath; EditorAssetPath = editorAssetPath;
Error = string.Empty;
} }
internal BundleInfo(PatchBundle patchBundle, ELoadMode loadMode) public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode)
{ {
_patchBundle = patchBundle; _patchBundle = patchBundle;
LoadMode = loadMode; LoadMode = loadMode;
@ -138,37 +156,23 @@ namespace YooAsset
RemoteMainURL = string.Empty; RemoteMainURL = string.Empty;
RemoteFallbackURL = string.Empty; RemoteFallbackURL = string.Empty;
EditorAssetPath = string.Empty; EditorAssetPath = string.Empty;
Error = string.Empty;
} }
internal BundleInfo(string bundleName) public BundleInfo(string error)
{ {
_patchBundle = null; _patchBundle = null;
LoadMode = ELoadMode.None; LoadMode = ELoadMode.None;
BundleName = bundleName; BundleName = string.Empty;
RemoteMainURL = string.Empty; RemoteMainURL = string.Empty;
RemoteFallbackURL = string.Empty; RemoteFallbackURL = string.Empty;
EditorAssetPath = string.Empty; EditorAssetPath = string.Empty;
} Error = error;
/// <summary>
/// 资源包是否有效
/// </summary>
public bool IsValid()
{
return _patchBundle != null;
}
/// <summary>
/// 资源包文件是否在云端
/// </summary>
public bool InCloud()
{
return LoadMode == ELoadMode.LoadFromRemote;
} }
/// <summary> /// <summary>
/// 获取流文件夹的加载路径 /// 获取流文件夹的加载路径
/// </summary> /// </summary>
internal string GetStreamingLoadPath() public string GetStreamingLoadPath()
{ {
if (_patchBundle == null) if (_patchBundle == null)
return string.Empty; return string.Empty;
@ -181,7 +185,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 获取缓存文件夹的加载路径 /// 获取缓存文件夹的加载路径
/// </summary> /// </summary>
internal string GetCacheLoadPath() public string GetCacheLoadPath()
{ {
if (_patchBundle == null) if (_patchBundle == null)
return string.Empty; return string.Empty;
@ -191,7 +195,6 @@ namespace YooAsset
return _cachePath; return _cachePath;
} }
/// <summary> /// <summary>
/// 是否为JAR包内文件 /// 是否为JAR包内文件
/// </summary> /// </summary>

2
Assets/YooAsset/Runtime/PatchSystem/Operations/DownloaderOperation.cs
View File

@ -192,7 +192,7 @@ namespace YooAsset
{ {
if (_steps == ESteps.None) if (_steps == ESteps.None)
{ {
OperationSystem.ProcessOperaiton(this); OperationSystem.StartOperaiton(this);
} }
} }
} }

146
Assets/YooAsset/Runtime/PatchSystem/PatchManifest.cs
View File

@ -61,90 +61,6 @@ namespace YooAsset
private bool _locationToLower = false; private bool _locationToLower = false;
/// <summary>
/// 获取内置资源标签列表
/// </summary>
public string[] GetBuildinTags()
{
return StringUtility.StringToStringList(BuildinTags, ';').ToArray();
}
/// <summary>
/// 获取资源依赖列表
/// </summary>
public string[] GetAllDependencies(string assetPath)
{
if (Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
{
List<string> result = new List<string>(patchAsset.DependIDs.Length);
foreach (var dependID in patchAsset.DependIDs)
{
if (dependID >= 0 && dependID < BundleList.Count)
{
var dependPatchBundle = BundleList[dependID];
result.Add(dependPatchBundle.BundleName);
}
else
{
throw new Exception($"Invalid bundle id : {dependID} Asset path : {assetPath}");
}
}
return result.ToArray();
}
else
{
YooLogger.Warning($"Not found asset path in patch manifest : {assetPath}");
return new string[] { };
}
}
/// <summary>
/// 获取资源包名称
/// </summary>
public string GetBundleName(string assetPath)
{
if (Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
{
int bundleID = patchAsset.BundleID;
if (bundleID >= 0 && bundleID < BundleList.Count)
{
var patchBundle = BundleList[bundleID];
return patchBundle.BundleName;
}
else
{
throw new Exception($"Invalid bundle id : {bundleID} Asset path : {assetPath}");
}
}
else
{
YooLogger.Warning($"Not found asset path in patch manifest : {assetPath}");
return string.Empty;
}
}
/// <summary>
/// 尝试获取资源包的主资源路径
/// </summary>
public string TryGetBundleMainAssetPath(string bundleName)
{
foreach (var patchAsset in AssetList)
{
int bundleID = patchAsset.BundleID;
if (bundleID >= 0 && bundleID < BundleList.Count)
{
var patchBundle = BundleList[bundleID];
if (patchBundle.BundleName == bundleName)
return patchAsset.AssetPath;
}
else
{
throw new Exception($"Invalid bundle id : {bundleID} Asset path : {patchAsset.AssetPath}");
}
}
return string.Empty;
}
/// <summary> /// <summary>
/// 初始化资源路径映射 /// 初始化资源路径映射
/// </summary> /// </summary>
@ -201,6 +117,12 @@ namespace YooAsset
/// </summary> /// </summary>
public string MappingToAssetPath(string location) public string MappingToAssetPath(string location)
{ {
if(string.IsNullOrEmpty(location))
{
YooLogger.Error("Failed to mapping location to asset path, The location is null or empty.");
return string.Empty;
}
if (_locationToLower) if (_locationToLower)
location = location.ToLower(); location = location.ToLower();
@ -210,11 +132,65 @@ namespace YooAsset
} }
else else
{ {
YooLogger.Error($"Failed to mapping location to asset path : {location}"); YooLogger.Warning($"Failed to mapping location to asset path : {location}");
return string.Empty; return string.Empty;
} }
} }
/// <summary>
/// 获取资源包名称
/// 注意：传入的资源路径一定合法有效！
/// </summary>
public string GetBundleName(string assetPath)
{
if (Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
{
int bundleID = patchAsset.BundleID;
if (bundleID >= 0 && bundleID < BundleList.Count)
{
var patchBundle = BundleList[bundleID];
return patchBundle.BundleName;
}
else
{
throw new Exception($"Invalid bundle id : {bundleID} Asset path : {assetPath}");
}
}
else
{
throw new Exception("Should never get here !");
}
}
/// <summary>
/// 获取资源依赖列表
/// 注意：传入的资源路径一定合法有效！
/// </summary>
public string[] GetAllDependencies(string assetPath)
{
if (Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
{
List<string> result = new List<string>(patchAsset.DependIDs.Length);
foreach (var dependID in patchAsset.DependIDs)
{
if (dependID >= 0 && dependID < BundleList.Count)
{
var dependPatchBundle = BundleList[dependID];
result.Add(dependPatchBundle.BundleName);
}
else
{
throw new Exception($"Invalid bundle id : {dependID} Asset path : {assetPath}");
}
}
return result.ToArray();
}
else
{
throw new Exception("Should never get here !");
}
}
/// <summary> /// <summary>
/// 序列化 /// 序列化

35
Assets/YooAsset/Runtime/PatchSystem/PlayMode/EditorSimulateModeImpl.cs
View File

@ -16,7 +16,7 @@ namespace YooAsset
{ {
_locationToLower = locationToLower; _locationToLower = locationToLower;
var operation = new EditorSimulateModeInitializationOperation(this, simulatePatchManifestPath); var operation = new EditorSimulateModeInitializationOperation(this, simulatePatchManifestPath);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -38,44 +38,41 @@ namespace YooAsset
} }
#region IBundleServices接口 #region IBundleServices接口
BundleInfo IBundleServices.GetBundleInfo(string bundleName) BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
{ {
if (string.IsNullOrEmpty(bundleName)) if(assetInfo.IsInvalid)
return new BundleInfo(string.Empty); throw new Exception("Should never get here !");
string bundleName = _simulatePatchManifest.GetBundleName(assetInfo.AssetPath);
if (_simulatePatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle patchBundle)) if (_simulatePatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle patchBundle))
{ {
string mainAssetPath = _simulatePatchManifest.TryGetBundleMainAssetPath(bundleName); BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromEditor, assetInfo.AssetPath);
BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromEditor, mainAssetPath);
return bundleInfo; return bundleInfo;
} }
else else
{ {
YooLogger.Warning($"Not found bundle in patch manifest : {bundleName}"); throw new Exception("Should never get here !");
BundleInfo bundleInfo = new BundleInfo(bundleName);
return bundleInfo;
} }
} }
AssetInfo[] IBundleServices.GetAssetInfos(string bundleName) BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
{ {
return PatchHelper.GetAssetsInfoByBundleName(_simulatePatchManifest, bundleName); throw new NotImplementedException();
} }
AssetInfo[] IBundleServices.GetAssetInfos(string[] tags) AssetInfo[] IBundleServices.GetAssetInfos(string[] tags)
{ {
return PatchHelper.GetAssetsInfoByTags(_simulatePatchManifest, tags); return PatchHelper.GetAssetsInfoByTags(_simulatePatchManifest, tags);
} }
PatchAsset IBundleServices.TryGetPatchAsset(string assetPath)
{
if (_simulatePatchManifest.Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
return patchAsset;
else
return null;
}
string IBundleServices.MappingToAssetPath(string location) string IBundleServices.MappingToAssetPath(string location)
{ {
return _simulatePatchManifest.MappingToAssetPath(location); return _simulatePatchManifest.MappingToAssetPath(location);
} }
string IBundleServices.GetBundleName(string assetPath)
{
return _simulatePatchManifest.GetBundleName(assetPath);
}
string[] IBundleServices.GetAllDependencies(string assetPath)
{
return _simulatePatchManifest.GetAllDependencies(assetPath);
}
#endregion #endregion
} }
} }

87
Assets/YooAsset/Runtime/PatchSystem/PlayMode/HostPlayModeImpl.cs
View File

@ -28,7 +28,7 @@ namespace YooAsset
_fallbackHostServer = fallbackHostServer; _fallbackHostServer = fallbackHostServer;
var operation = new HostPlayModeInitializationOperation(this); var operation = new HostPlayModeInitializationOperation(this);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -38,7 +38,7 @@ namespace YooAsset
public UpdateStaticVersionOperation UpdateStaticVersionAsync(int timeout) public UpdateStaticVersionOperation UpdateStaticVersionAsync(int timeout)
{ {
var operation = new HostPlayModeUpdateStaticVersionOperation(this, timeout); var operation = new HostPlayModeUpdateStaticVersionOperation(this, timeout);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -48,7 +48,7 @@ namespace YooAsset
public UpdateManifestOperation UpdatePatchManifestAsync(int resourceVersion, int timeout) public UpdateManifestOperation UpdatePatchManifestAsync(int resourceVersion, int timeout)
{ {
var operation = new HostPlayModeUpdateManifestOperation(this, resourceVersion, timeout); var operation = new HostPlayModeUpdateManifestOperation(this, resourceVersion, timeout);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -58,7 +58,7 @@ namespace YooAsset
public UpdatePackageOperation UpdatePackageAsync(int resourceVersion, int timeout) public UpdatePackageOperation UpdatePackageAsync(int resourceVersion, int timeout)
{ {
var operation = new HostPlayModeUpdatePackageOperation(this, resourceVersion, timeout); var operation = new HostPlayModeUpdatePackageOperation(this, resourceVersion, timeout);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -182,29 +182,32 @@ namespace YooAsset
/// <summary> /// <summary>
/// 创建下载器 /// 创建下载器
/// </summary> /// </summary>
public PatchDownloaderOperation CreatePatchDownloaderByPaths(List<string> assetPaths, int fileLoadingMaxNumber, int failedTryAgain) public PatchDownloaderOperation CreatePatchDownloaderByPaths(AssetInfo[] assetInfos, int fileLoadingMaxNumber, int failedTryAgain)
{ {
List<BundleInfo> downloadList = GetDownloadListByPaths(assetPaths); List<BundleInfo> downloadList = GetDownloadListByPaths(assetInfos);
var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain); var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain);
return operation; return operation;
} }
private List<BundleInfo> GetDownloadListByPaths(List<string> assetPaths) private List<BundleInfo> GetDownloadListByPaths(AssetInfo[] assetInfos)
{ {
// 获取资源对象的资源包和所有依赖资源包 // 获取资源对象的资源包和所有依赖资源包
List<PatchBundle> checkList = new List<PatchBundle>(); List<PatchBundle> checkList = new List<PatchBundle>();
foreach (var assetPath in assetPaths) foreach (var assetInfo in assetInfos)
{ {
string mainBundleName = LocalPatchManifest.GetBundleName(assetPath); if (assetInfo.IsInvalid)
if (string.IsNullOrEmpty(mainBundleName) == false)
{ {
if (LocalPatchManifest.Bundles.TryGetValue(mainBundleName, out PatchBundle mainBundle)) YooLogger.Warning(assetInfo.Error);
{ continue;
if (checkList.Contains(mainBundle) == false)
checkList.Add(mainBundle);
}
} }
string[] dependBundleNames = LocalPatchManifest.GetAllDependencies(assetPath); string mainBundleName = LocalPatchManifest.GetBundleName(assetInfo.AssetPath);
if (LocalPatchManifest.Bundles.TryGetValue(mainBundleName, out PatchBundle mainBundle))
{
if (checkList.Contains(mainBundle) == false)
checkList.Add(mainBundle);
}
string[] dependBundleNames = LocalPatchManifest.GetAllDependencies(assetInfo.AssetPath);
foreach (var dependBundleName in dependBundleNames) foreach (var dependBundleName in dependBundleNames)
{ {
if (LocalPatchManifest.Bundles.TryGetValue(dependBundleName, out PatchBundle dependBundle)) if (LocalPatchManifest.Bundles.TryGetValue(dependBundleName, out PatchBundle dependBundle))
@ -245,6 +248,12 @@ namespace YooAsset
var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain); var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain);
return operation; return operation;
} }
public PatchUnpackerOperation CreatePatchUnpackerByAll(int fileUpackingMaxNumber, int failedTryAgain)
{
List<BundleInfo> unpcakList = PatchHelper.GetUnpackListByAll(AppPatchManifest);
var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain);
return operation;
}
// WEB相关 // WEB相关
public string GetPatchDownloadMainURL(string fileName) public string GetPatchDownloadMainURL(string fileName)
@ -288,11 +297,8 @@ namespace YooAsset
} }
#region IBundleServices接口 #region IBundleServices接口
BundleInfo IBundleServices.GetBundleInfo(string bundleName) private BundleInfo CreateBundleInfo(string bundleName)
{ {
if (string.IsNullOrEmpty(bundleName))
return new BundleInfo(string.Empty);
if (LocalPatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle patchBundle)) if (LocalPatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle patchBundle))
{ {
// 查询沙盒资源 // 查询沙盒资源
@ -317,31 +323,46 @@ namespace YooAsset
} }
else else
{ {
YooLogger.Warning($"Not found bundle in patch manifest : {bundleName}"); throw new Exception("Should never get here !");
BundleInfo bundleInfo = new BundleInfo(bundleName);
return bundleInfo;
} }
} }
AssetInfo[] IBundleServices.GetAssetInfos(string bundleName) BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
{ {
return PatchHelper.GetAssetsInfoByBundleName(LocalPatchManifest, bundleName); if (assetInfo.IsInvalid)
throw new Exception("Should never get here !");
string bundleName = LocalPatchManifest.GetBundleName(assetInfo.AssetPath);
return CreateBundleInfo(bundleName);
}
BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
{
if (assetInfo.IsInvalid)
throw new Exception("Should never get here !");
var depends = LocalPatchManifest.GetAllDependencies(assetInfo.AssetPath);
List<BundleInfo> result = new List<BundleInfo>(depends.Length);
foreach (var bundleName in depends)
{
BundleInfo bundleInfo = CreateBundleInfo(bundleName);
result.Add(bundleInfo);
}
return result.ToArray();
} }
AssetInfo[] IBundleServices.GetAssetInfos(string[] tags) AssetInfo[] IBundleServices.GetAssetInfos(string[] tags)
{ {
return PatchHelper.GetAssetsInfoByTags(LocalPatchManifest, tags); return PatchHelper.GetAssetsInfoByTags(LocalPatchManifest, tags);
} }
PatchAsset IBundleServices.TryGetPatchAsset(string assetPath)
{
if (LocalPatchManifest.Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
return patchAsset;
else
return null;
}
string IBundleServices.MappingToAssetPath(string location) string IBundleServices.MappingToAssetPath(string location)
{ {
return LocalPatchManifest.MappingToAssetPath(location); return LocalPatchManifest.MappingToAssetPath(location);
} }
string IBundleServices.GetBundleName(string assetPath)
{
return LocalPatchManifest.GetBundleName(assetPath);
}
string[] IBundleServices.GetAllDependencies(string assetPath)
{
return LocalPatchManifest.GetAllDependencies(assetPath);
}
#endregion #endregion
} }
} }

54
Assets/YooAsset/Runtime/PatchSystem/PlayMode/OfflinePlayModeImpl.cs
View File

@ -16,7 +16,7 @@ namespace YooAsset
{ {
_locationToLower = locationToLower; _locationToLower = locationToLower;
var operation = new OfflinePlayModeInitializationOperation(this); var operation = new OfflinePlayModeInitializationOperation(this);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
@ -39,6 +39,12 @@ namespace YooAsset
var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain); var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain);
return operation; return operation;
} }
public PatchUnpackerOperation CreatePatchUnpackerByAll(int fileUpackingMaxNumber, int failedTryAgain)
{
List<BundleInfo> unpcakList = PatchHelper.GetUnpackListByAll(_appPatchManifest);
var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain);
return operation;
}
// 设置资源清单 // 设置资源清单
internal void SetAppPatchManifest(PatchManifest patchManifest) internal void SetAppPatchManifest(PatchManifest patchManifest)
@ -48,11 +54,8 @@ namespace YooAsset
} }
#region IBundleServices接口 #region IBundleServices接口
BundleInfo IBundleServices.GetBundleInfo(string bundleName) private BundleInfo CreateBundleInfo(string bundleName)
{ {
if (string.IsNullOrEmpty(bundleName))
return new BundleInfo(string.Empty);
if (_appPatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle patchBundle)) if (_appPatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle patchBundle))
{ {
BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromStreaming); BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromStreaming);
@ -60,31 +63,46 @@ namespace YooAsset
} }
else else
{ {
YooLogger.Warning($"Not found bundle in patch manifest : {bundleName}"); throw new Exception("Should never get here !");
BundleInfo bundleInfo = new BundleInfo(bundleName);
return bundleInfo;
} }
} }
AssetInfo[] IBundleServices.GetAssetInfos(string bundleName) BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
{ {
return PatchHelper.GetAssetsInfoByBundleName(_appPatchManifest, bundleName); if (assetInfo.IsInvalid)
throw new Exception("Should never get here !");
string bundleName = _appPatchManifest.GetBundleName(assetInfo.AssetPath);
return CreateBundleInfo(bundleName);
}
BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
{
if (assetInfo.IsInvalid)
throw new Exception("Should never get here !");
var depends = _appPatchManifest.GetAllDependencies(assetInfo.AssetPath);
List<BundleInfo> result = new List<BundleInfo>(depends.Length);
foreach (var bundleName in depends)
{
BundleInfo bundleInfo = CreateBundleInfo(bundleName);
result.Add(bundleInfo);
}
return result.ToArray();
} }
AssetInfo[] IBundleServices.GetAssetInfos(string[] tags) AssetInfo[] IBundleServices.GetAssetInfos(string[] tags)
{ {
return PatchHelper.GetAssetsInfoByTags(_appPatchManifest, tags); return PatchHelper.GetAssetsInfoByTags(_appPatchManifest, tags);
} }
PatchAsset IBundleServices.TryGetPatchAsset(string assetPath)
{
if (_appPatchManifest.Assets.TryGetValue(assetPath, out PatchAsset patchAsset))
return patchAsset;
else
return null;
}
string IBundleServices.MappingToAssetPath(string location) string IBundleServices.MappingToAssetPath(string location)
{ {
return _appPatchManifest.MappingToAssetPath(location); return _appPatchManifest.MappingToAssetPath(location);
} }
string IBundleServices.GetBundleName(string assetPath)
{
return _appPatchManifest.GetBundleName(assetPath);
}
string[] IBundleServices.GetAllDependencies(string assetPath)
{
return _appPatchManifest.GetAllDependencies(assetPath);
}
#endregion #endregion
} }
} }

21
Assets/YooAsset/Runtime/Services/IBundleServices.cs
View File

@ -6,31 +6,26 @@ namespace YooAsset
/// <summary> /// <summary>
/// 获取资源包信息 /// 获取资源包信息
/// </summary> /// </summary>
BundleInfo GetBundleInfo(string bundleName); BundleInfo GetBundleInfo(AssetInfo assetInfo);
/// <summary> /// <summary>
/// 获取资源信息列表 /// 获取依赖的资源包信息集合
/// </summary> /// </summary>
AssetInfo[] GetAssetInfos(string bundleName); BundleInfo[] GetAllDependBundleInfos(AssetInfo assetPath);
/// <summary> /// <summary>
/// 获取资源信息列表 /// 获取资源信息列表
/// </summary> /// </summary>
AssetInfo[] GetAssetInfos(string[] tags); AssetInfo[] GetAssetInfos(string[] tags);
/// <summary>
/// 尝试获取补丁资源
/// </summary>
PatchAsset TryGetPatchAsset(string assetPath);
/// <summary> /// <summary>
/// 映射为资源路径 /// 映射为资源路径
/// </summary> /// </summary>
string MappingToAssetPath(string location); string MappingToAssetPath(string location);
/// <summary>
/// 获取资源所属的资源包名称
/// </summary>
string GetBundleName(string assetPath);
/// <summary>
/// 获取资源依赖的所有AssetBundle列表
/// </summary>
string[] GetAllDependencies(string assetPath);
} }
} }

2
Assets/YooAsset/Runtime/Services/IDecryptionServices.cs
View File

@ -6,6 +6,6 @@ namespace YooAsset
/// <summary> /// <summary>
/// 获取加密文件的数据偏移量 /// 获取加密文件的数据偏移量
/// </summary> /// </summary>
ulong GetFileOffset(BundleInfo bundleInfo); ulong GetFileOffset();
} }
} }

2
Assets/YooAsset/Runtime/Services/LocationServices/AddressLocationServices.cs
View File

@ -3,7 +3,7 @@ namespace YooAsset
{ {
public class AddressLocationServices : ILocationServices public class AddressLocationServices : ILocationServices
{ {
public string ConvertLocationToAssetPath(string location) string ILocationServices.ConvertLocationToAssetPath(string location)
{ {
return YooAssets.MappingToAssetPath(location); return YooAssets.MappingToAssetPath(location);
} }

2
Assets/YooAsset/Runtime/Services/LocationServices/DefaultLocationServices.cs
View File

@ -11,7 +11,7 @@ namespace YooAsset
_resourceRoot = PathHelper.GetRegularPath(resourceRoot); _resourceRoot = PathHelper.GetRegularPath(resourceRoot);
} }
public string ConvertLocationToAssetPath(string location) string ILocationServices.ConvertLocationToAssetPath(string location)
{ {
if (string.IsNullOrEmpty(_resourceRoot)) if (string.IsNullOrEmpty(_resourceRoot))
{ {

44
Assets/YooAsset/Runtime/Utility/YooHelper.cs
View File

@ -151,6 +151,26 @@ namespace YooAsset
return ConvertToUnpackList(downloadList); return ConvertToUnpackList(downloadList);
} }
public static List<BundleInfo> GetUnpackListByAll(PatchManifest appPatchManifest)
{
// 注意：离线运行模式也依赖下面逻辑，所以判断沙盒内文件是否存在不能通过缓存系统去验证。
List<PatchBundle> downloadList = new List<PatchBundle>(1000);
foreach (var patchBundle in appPatchManifest.BundleList)
{
// 如果已经在沙盒内
string filePath = SandboxHelper.MakeCacheFilePath(patchBundle.Hash);
if (System.IO.File.Exists(filePath))
continue;
// 如果不是内置资源
if (patchBundle.IsBuildin == false)
continue;
downloadList.Add(patchBundle);
}
return ConvertToUnpackList(downloadList);
}
private static List<BundleInfo> ConvertToUnpackList(List<PatchBundle> unpackList) private static List<BundleInfo> ConvertToUnpackList(List<PatchBundle> unpackList)
{ {
List<BundleInfo> result = new List<BundleInfo>(unpackList.Count); List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
@ -178,31 +198,13 @@ namespace YooAsset
List<AssetInfo> result = new List<AssetInfo>(100); List<AssetInfo> result = new List<AssetInfo>(100);
foreach (var patchAsset in patchManifest.AssetList) foreach (var patchAsset in patchManifest.AssetList)
{ {
string bundleName = patchManifest.GetBundleName(patchAsset.AssetPath); if(patchAsset.HasTag(tags))
if(patchManifest.Bundles.TryGetValue(bundleName, out PatchBundle bundle))
{ {
if(bundle.HasTag(tags)) AssetInfo assetInfo = new AssetInfo(patchAsset);
{ result.Add(assetInfo);
result.Add(new AssetInfo(patchAsset.AssetPath));
}
} }
} }
return result.ToArray(); return result.ToArray();
} }
/// <summary>
/// 获取资源信息列表
/// </summary>
public static AssetInfo[] GetAssetsInfoByBundleName(PatchManifest patchManifest, string bundleName)
{
List<AssetInfo> result = new List<AssetInfo>(100);
foreach (var patchAsset in patchManifest.AssetList)
{
string tempName = patchManifest.GetBundleName(patchAsset.AssetPath);
if (tempName == bundleName)
result.Add(new AssetInfo(patchAsset.AssetPath));
}
return result.ToArray();
}
} }
} }

273
Assets/YooAsset/Runtime/YooAssets.cs
View File

@ -149,19 +149,19 @@ namespace YooAsset
throw new Exception("YooAsset is initialized yet."); throw new Exception("YooAsset is initialized yet.");
} }
// 检测参数范围
if (parameters.AssetLoadingMaxNumber < 1) if (parameters.AssetLoadingMaxNumber < 1)
{ {
parameters.AssetLoadingMaxNumber = 1; parameters.AssetLoadingMaxNumber = 1;
YooLogger.Warning($"{nameof(parameters.AssetLoadingMaxNumber)} minimum value is 1"); YooLogger.Warning($"{nameof(parameters.AssetLoadingMaxNumber)} minimum value is 1");
} }
if (parameters.OperationSystemMaxTimeSlice < 30) if (parameters.OperationSystemMaxTimeSlice < 30)
{ {
parameters.OperationSystemMaxTimeSlice = 30; parameters.OperationSystemMaxTimeSlice = 30;
YooLogger.Warning($"{nameof(parameters.OperationSystemMaxTimeSlice)} minimum value is 33 milliseconds"); YooLogger.Warning($"{nameof(parameters.OperationSystemMaxTimeSlice)} minimum value is 30 milliseconds");
} }
// 运行模式 // 鉴定运行模式
if (parameters is EditorSimulateModeParameters) if (parameters is EditorSimulateModeParameters)
_playMode = EPlayMode.EditorSimulateMode; _playMode = EPlayMode.EditorSimulateMode;
else if (parameters is OfflinePlayModeParameters) else if (parameters is OfflinePlayModeParameters)
@ -241,19 +241,17 @@ namespace YooAsset
if (_playMode == EPlayMode.EditorSimulateMode) if (_playMode == EPlayMode.EditorSimulateMode)
{ {
var operation = new EditorPlayModeUpdateStaticVersionOperation(); var operation = new EditorPlayModeUpdateStaticVersionOperation();
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.OfflinePlayMode) else if (_playMode == EPlayMode.OfflinePlayMode)
{ {
var operation = new OfflinePlayModeUpdateStaticVersionOperation(); var operation = new OfflinePlayModeUpdateStaticVersionOperation();
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.UpdateStaticVersionAsync(timeout); return _hostPlayModeImpl.UpdateStaticVersionAsync(timeout);
} }
else else
@ -273,19 +271,17 @@ namespace YooAsset
if (_playMode == EPlayMode.EditorSimulateMode) if (_playMode == EPlayMode.EditorSimulateMode)
{ {
var operation = new EditorPlayModeUpdateManifestOperation(); var operation = new EditorPlayModeUpdateManifestOperation();
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.OfflinePlayMode) else if (_playMode == EPlayMode.OfflinePlayMode)
{ {
var operation = new OfflinePlayModeUpdateManifestOperation(); var operation = new OfflinePlayModeUpdateManifestOperation();
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.UpdatePatchManifestAsync(resourceVersion, timeout); return _hostPlayModeImpl.UpdatePatchManifestAsync(resourceVersion, timeout);
} }
else else
@ -298,9 +294,9 @@ namespace YooAsset
/// 开启一个异步操作 /// 开启一个异步操作
/// </summary> /// </summary>
/// <param name="operation">异步操作对象</param> /// <param name="operation">异步操作对象</param>
public static void ProcessOperaiton(GameAsyncOperation operation) public static void StartOperaiton(GameAsyncOperation operation)
{ {
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
} }
/// <summary> /// <summary>
@ -311,20 +307,14 @@ namespace YooAsset
DebugCheckInitialize(); DebugCheckInitialize();
if (_playMode == EPlayMode.EditorSimulateMode) if (_playMode == EPlayMode.EditorSimulateMode)
{ {
if (_editorSimulateModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _editorSimulateModeImpl.GetResourceVersion(); return _editorSimulateModeImpl.GetResourceVersion();
} }
else if (_playMode == EPlayMode.OfflinePlayMode) else if (_playMode == EPlayMode.OfflinePlayMode)
{ {
if (_offlinePlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _offlinePlayModeImpl.GetResourceVersion(); return _offlinePlayModeImpl.GetResourceVersion();
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.GetResourceVersion(); return _hostPlayModeImpl.GetResourceVersion();
} }
else else
@ -338,8 +328,11 @@ namespace YooAsset
/// </summary> /// </summary>
public static void UnloadUnusedAssets() public static void UnloadUnusedAssets()
{ {
AssetSystem.Update(); if (_isInitialize)
AssetSystem.UnloadUnusedAssets(); {
AssetSystem.Update();
AssetSystem.UnloadUnusedAssets();
}
} }
/// <summary> /// <summary>
@ -347,52 +340,30 @@ namespace YooAsset
/// </summary> /// </summary>
public static void ForceUnloadAllAssets() public static void ForceUnloadAllAssets()
{ {
AssetSystem.ForceUnloadAllAssets(); if (_isInitialize)
{
AssetSystem.ForceUnloadAllAssets();
}
} }
/// <summary>
/// 获取调试信息
/// </summary>
internal static void GetDebugReport(DebugReport report)
{
if (report == null)
YooLogger.Error($"{nameof(DebugReport)} is null");
AssetSystem.GetDebugReport(report);
}
#region 资源信息 #region 资源信息
/// <summary> /// <summary>
/// 获取资源包信息 /// 是否需要从远端更新下载
/// </summary> /// </summary>
/// <param name="location">资源的定位地址</param> /// <param name="location">资源的定位地址</param>
public static BundleInfo GetBundleInfo(string location) public static bool IsNeedDownloadFromRemote(string location)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
string bundleName = _bundleServices.GetBundleName(assetPath); if (assetInfo.IsInvalid)
return _bundleServices.GetBundleInfo(bundleName); return false;
}
/// <summary> BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
/// 获取资源包信息 if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
/// </summary> return true;
/// <param name="assetInfo">资源信息</param> else
public static BundleInfo GetBundleInfo(AssetInfo assetInfo) return false;
{
DebugCheckInitialize();
string bundleName = _bundleServices.GetBundleName(assetInfo.AssetPath);
return _bundleServices.GetBundleInfo(bundleName);
}
/// <summary>
/// 获取资源信息列表
/// </summary>
/// <param name="bundleInfo">资源包信息</param>
public static AssetInfo[] GetAssetInfos(BundleInfo bundleInfo)
{
DebugCheckInitialize();
return _bundleServices.GetAssetInfos(bundleInfo.BundleName);
} }
/// <summary> /// <summary>
@ -428,8 +399,8 @@ namespace YooAsset
public static SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100) public static SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string scenePath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
var handle = AssetSystem.LoadSceneAsync(scenePath, sceneMode, activateOnLoad, priority); var handle = AssetSystem.LoadSceneAsync(assetInfo, sceneMode, activateOnLoad, priority);
return handle; return handle;
} }
@ -443,8 +414,7 @@ namespace YooAsset
public static SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100) public static SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string scenePath = assetInfo.AssetPath; var handle = AssetSystem.LoadSceneAsync(assetInfo, sceneMode, activateOnLoad, priority);
var handle = AssetSystem.LoadSceneAsync(scenePath, sceneMode, activateOnLoad, priority);
return handle; return handle;
} }
#endregion #endregion
@ -458,8 +428,8 @@ namespace YooAsset
public static RawFileOperation GetRawFileAsync(string location, string copyPath = null) public static RawFileOperation GetRawFileAsync(string location, string copyPath = null)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
return GetRawFileInternal(assetPath, copyPath); return GetRawFileInternal(assetInfo, copyPath);
} }
/// <summary> /// <summary>
@ -470,31 +440,36 @@ namespace YooAsset
public static RawFileOperation GetRawFileAsync(AssetInfo assetInfo, string copyPath = null) public static RawFileOperation GetRawFileAsync(AssetInfo assetInfo, string copyPath = null)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
return GetRawFileInternal(assetInfo.AssetPath, copyPath); return GetRawFileInternal(assetInfo, copyPath);
} }
private static RawFileOperation GetRawFileInternal(string assetPath, string copyPath) private static RawFileOperation GetRawFileInternal(AssetInfo assetInfo, string copyPath)
{ {
string bundleName = _bundleServices.GetBundleName(assetPath); if (assetInfo.IsInvalid)
BundleInfo bundleInfo = _bundleServices.GetBundleInfo(bundleName); {
RawFileOperation operation = new CompletedRawFileOperation(assetInfo.Error, copyPath);
OperationSystem.StartOperaiton(operation);
return operation;
}
BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
if (_playMode == EPlayMode.EditorSimulateMode) if (_playMode == EPlayMode.EditorSimulateMode)
{ {
RawFileOperation operation = new EditorPlayModeRawFileOperation(bundleInfo, copyPath); RawFileOperation operation = new EditorPlayModeRawFileOperation(bundleInfo, copyPath);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.OfflinePlayMode) else if (_playMode == EPlayMode.OfflinePlayMode)
{ {
RawFileOperation operation = new OfflinePlayModeRawFileOperation(bundleInfo, copyPath); RawFileOperation operation = new OfflinePlayModeRawFileOperation(bundleInfo, copyPath);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
RawFileOperation operation = new HostPlayModeRawFileOperation(bundleInfo, copyPath); RawFileOperation operation = new HostPlayModeRawFileOperation(bundleInfo, copyPath);
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else else
@ -512,7 +487,7 @@ namespace YooAsset
public static AssetOperationHandle LoadAssetSync(AssetInfo assetInfo) public static AssetOperationHandle LoadAssetSync(AssetInfo assetInfo)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
return LoadAssetInternal(assetInfo.AssetPath, assetInfo.AssetType, true); return LoadAssetInternal(assetInfo, true);
} }
/// <summary> /// <summary>
@ -523,8 +498,8 @@ namespace YooAsset
public static AssetOperationHandle LoadAssetSync<TObject>(string location) where TObject : class public static AssetOperationHandle LoadAssetSync<TObject>(string location) where TObject : class
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
return LoadAssetInternal(assetPath, typeof(TObject), true); return LoadAssetInternal(assetInfo, true);
} }
/// <summary> /// <summary>
@ -535,8 +510,8 @@ namespace YooAsset
public static AssetOperationHandle LoadAssetSync(string location, System.Type type) public static AssetOperationHandle LoadAssetSync(string location, System.Type type)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
return LoadAssetInternal(assetPath, type, true); return LoadAssetInternal(assetInfo, true);
} }
@ -547,7 +522,7 @@ namespace YooAsset
public static AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo) public static AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
return LoadAssetInternal(assetInfo.AssetPath, assetInfo.AssetType, false); return LoadAssetInternal(assetInfo, false);
} }
/// <summary> /// <summary>
@ -558,8 +533,8 @@ namespace YooAsset
public static AssetOperationHandle LoadAssetAsync<TObject>(string location) public static AssetOperationHandle LoadAssetAsync<TObject>(string location)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
return LoadAssetInternal(assetPath, typeof(TObject), false); return LoadAssetInternal(assetInfo, false);
} }
/// <summary> /// <summary>
@ -570,14 +545,14 @@ namespace YooAsset
public static AssetOperationHandle LoadAssetAsync(string location, System.Type type) public static AssetOperationHandle LoadAssetAsync(string location, System.Type type)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
return LoadAssetInternal(assetPath, type, false); return LoadAssetInternal(assetInfo, false);
} }
private static AssetOperationHandle LoadAssetInternal(string assetPath, System.Type assetType, bool waitForAsyncComplete) private static AssetOperationHandle LoadAssetInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
{ {
var handle = AssetSystem.LoadAssetAsync(assetPath, assetType); var handle = AssetSystem.LoadAssetAsync(assetInfo);
if (waitForAsyncComplete) if (waitForAsyncComplete)
handle.WaitForAsyncComplete(); handle.WaitForAsyncComplete();
return handle; return handle;
@ -592,7 +567,7 @@ namespace YooAsset
public static SubAssetsOperationHandle LoadSubAssetsSync(AssetInfo assetInfo) public static SubAssetsOperationHandle LoadSubAssetsSync(AssetInfo assetInfo)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
return LoadSubAssetsInternal(assetInfo.AssetPath, assetInfo.AssetType, true); return LoadSubAssetsInternal(assetInfo, true);
} }
/// <summary> /// <summary>
@ -603,8 +578,8 @@ namespace YooAsset
public static SubAssetsOperationHandle LoadSubAssetsSync<TObject>(string location) public static SubAssetsOperationHandle LoadSubAssetsSync<TObject>(string location)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
return LoadSubAssetsInternal(assetPath, typeof(TObject), true); return LoadSubAssetsInternal(assetInfo, true);
} }
/// <summary> /// <summary>
@ -615,8 +590,8 @@ namespace YooAsset
public static SubAssetsOperationHandle LoadSubAssetsSync(string location, System.Type type) public static SubAssetsOperationHandle LoadSubAssetsSync(string location, System.Type type)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
return LoadSubAssetsInternal(assetPath, type, true); return LoadSubAssetsInternal(assetInfo, true);
} }
@ -627,7 +602,7 @@ namespace YooAsset
public static SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo) public static SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
return LoadSubAssetsInternal(assetInfo.AssetPath, assetInfo.AssetType, false); return LoadSubAssetsInternal(assetInfo, false);
} }
/// <summary> /// <summary>
@ -638,8 +613,8 @@ namespace YooAsset
public static SubAssetsOperationHandle LoadSubAssetsAsync<TObject>(string location) public static SubAssetsOperationHandle LoadSubAssetsAsync<TObject>(string location)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
return LoadSubAssetsInternal(assetPath, typeof(TObject), false); return LoadSubAssetsInternal(assetInfo, false);
} }
/// <summary> /// <summary>
@ -650,14 +625,14 @@ namespace YooAsset
public static SubAssetsOperationHandle LoadSubAssetsAsync(string location, System.Type type) public static SubAssetsOperationHandle LoadSubAssetsAsync(string location, System.Type type)
{ {
DebugCheckInitialize(); DebugCheckInitialize();
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
return LoadSubAssetsInternal(assetPath, type, false); return LoadSubAssetsInternal(assetInfo, false);
} }
private static SubAssetsOperationHandle LoadSubAssetsInternal(string assetPath, System.Type assetType, bool waitForAsyncComplete) private static SubAssetsOperationHandle LoadSubAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
{ {
var handle = AssetSystem.LoadSubAssetsAsync(assetPath, assetType); var handle = AssetSystem.LoadSubAssetsAsync(assetInfo);
if (waitForAsyncComplete) if (waitForAsyncComplete)
handle.WaitForAsyncComplete(); handle.WaitForAsyncComplete();
return handle; return handle;
@ -694,8 +669,6 @@ namespace YooAsset
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.CreatePatchDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain); return _hostPlayModeImpl.CreatePatchDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain);
} }
else else
@ -720,8 +693,6 @@ namespace YooAsset
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.CreatePatchDownloaderByAll(downloadingMaxNumber, failedTryAgain); return _hostPlayModeImpl.CreatePatchDownloaderByAll(downloadingMaxNumber, failedTryAgain);
} }
else else
@ -748,16 +719,13 @@ namespace YooAsset
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null) List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
throw new Exception("YooAsset is not initialized.");
List<string> assetPaths = new List<string>(locations.Length);
foreach (var location in locations) foreach (var location in locations)
{ {
string assetPath = _locationServices.ConvertLocationToAssetPath(location); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
assetPaths.Add(assetPath); assetInfos.Add(assetInfo);
} }
return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetPaths, downloadingMaxNumber, failedTryAgain); return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos.ToArray(), downloadingMaxNumber, failedTryAgain);
} }
else else
{ {
@ -782,15 +750,7 @@ namespace YooAsset
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null) return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain);
throw new Exception("YooAsset is not initialized.");
List<string> assetPaths = new List<string>(assetInfos.Length);
foreach (var assetInfo in assetInfos)
{
assetPaths.Add(assetInfo.AssetPath);
}
return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetPaths, downloadingMaxNumber, failedTryAgain);
} }
else else
{ {
@ -829,14 +789,10 @@ namespace YooAsset
} }
else if (_playMode == EPlayMode.OfflinePlayMode) else if (_playMode == EPlayMode.OfflinePlayMode)
{ {
if (_offlinePlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _offlinePlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain); return _offlinePlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain);
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain); return _hostPlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain);
} }
else else
@ -844,6 +800,34 @@ namespace YooAsset
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
/// <summary>
/// 创建补丁解压器
/// </summary>
/// <param name="unpackingMaxNumber">同时解压的最大文件数</param>
/// <param name="failedTryAgain">解压失败的重试次数</param>
public static PatchUnpackerOperation CreatePatchUnpacker(int unpackingMaxNumber, int failedTryAgain)
{
DebugCheckInitialize();
if (_playMode == EPlayMode.EditorSimulateMode)
{
List<BundleInfo> downloadList = new List<BundleInfo>();
var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain);
return operation;
}
else if (_playMode == EPlayMode.OfflinePlayMode)
{
return _offlinePlayModeImpl.CreatePatchUnpackerByAll(unpackingMaxNumber, failedTryAgain);
}
else if (_playMode == EPlayMode.HostPlayMode)
{
return _hostPlayModeImpl.CreatePatchUnpackerByAll(unpackingMaxNumber, failedTryAgain);
}
else
{
throw new NotImplementedException();
}
}
#endregion #endregion
#region 包裹更新 #region 包裹更新
@ -858,19 +842,17 @@ namespace YooAsset
if (_playMode == EPlayMode.EditorSimulateMode) if (_playMode == EPlayMode.EditorSimulateMode)
{ {
var operation = new EditorPlayModeUpdatePackageOperation(); var operation = new EditorPlayModeUpdatePackageOperation();
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.OfflinePlayMode) else if (_playMode == EPlayMode.OfflinePlayMode)
{ {
var operation = new OfflinePlayModeUpdatePackageOperation(); var operation = new OfflinePlayModeUpdatePackageOperation();
OperationSystem.ProcessOperaiton(operation); OperationSystem.StartOperaiton(operation);
return operation; return operation;
} }
else if (_playMode == EPlayMode.HostPlayMode) else if (_playMode == EPlayMode.HostPlayMode)
{ {
if (_hostPlayModeImpl == null)
throw new Exception("YooAsset is not initialized.");
return _hostPlayModeImpl.UpdatePackageAsync(resourceVersion, timeout); return _hostPlayModeImpl.UpdatePackageAsync(resourceVersion, timeout);
} }
else else
@ -918,22 +900,32 @@ namespace YooAsset
#region 内部方法 #region 内部方法
internal static void InternalUpdate() internal static void InternalUpdate()
{ {
// 更新异步请求操作 // 更新异步操作系统
OperationSystem.Update(); OperationSystem.Update();
// 更新下载管理系统 // 更新下载管理系统
DownloadSystem.Update(); DownloadSystem.Update();
// 轮询更新资源系统 // 更新资源系统
AssetSystem.Update(); AssetSystem.Update();
} }
/// <summary>
/// 获取调试信息
/// </summary>
internal static void GetDebugReport(DebugReport report)
{
if (report == null)
YooLogger.Error($"{nameof(DebugReport)} is null");
AssetSystem.GetDebugReport(report);
}
/// <summary> /// <summary>
/// 资源定位地址转换为资源完整路径 /// 资源定位地址转换为资源完整路径
/// </summary> /// </summary>
internal static string MappingToAssetPath(string location) internal static string MappingToAssetPath(string location)
{ {
DebugCheckLocation(location);
return _bundleServices.MappingToAssetPath(location); return _bundleServices.MappingToAssetPath(location);
} }
#endregion #endregion
@ -951,11 +943,7 @@ namespace YooAsset
[Conditional("DEBUG")] [Conditional("DEBUG")]
private static void DebugCheckLocation(string location) private static void DebugCheckLocation(string location)
{ {
if (string.IsNullOrEmpty(location)) if (string.IsNullOrEmpty(location) == false)
{
YooLogger.Error("location param is null or empty!");
}
else
{ {
// 检查路径末尾是否有空格 // 检查路径末尾是否有空格
int index = location.LastIndexOf(" "); int index = location.LastIndexOf(" ");
@ -970,5 +958,30 @@ namespace YooAsset
} }
} }
#endregion #endregion
#region 私有方法
private static AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
{
DebugCheckLocation(location);
string assetPath = _locationServices.ConvertLocationToAssetPath(location);
PatchAsset patchAsset = _bundleServices.TryGetPatchAsset(assetPath);
if (patchAsset != null)
{
AssetInfo assetInfo = new AssetInfo(patchAsset, assetType);
return assetInfo;
}
else
{
string error;
if (string.IsNullOrEmpty(location))
error = $"The location is null or empty !";
else
error = $"The location is invalid : {location}";
YooLogger.Error(error);
AssetInfo assetInfo = new AssetInfo(error);
return assetInfo;
}
}
#endregion
} }
} }