Update YooAssets

This commit is contained in:
hevinci
2022-03-07 21:20:58 +08:00
parent 050c962587
commit 33ad0713fe
20 changed files with 139 additions and 119 deletions
@@ -44,7 +44,7 @@ namespace YooAsset
/// 开始下载资源文件
/// 注意:只有第一次请求的参数才是有效的
/// </summary>
public static FileDownloader BeginDownload(AssetBundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
public static FileDownloader BeginDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
{
// 查询存在的下载器
if (_downloaderDic.TryGetValue(bundleInfo.Hash, out var downloader))
@@ -119,7 +119,7 @@ namespace YooAsset
}
// 验证文件完整性
public static bool CheckContentIntegrity(AssetBundleInfo bundleInfo)
public static bool CheckContentIntegrity(BundleInfo bundleInfo)
{
return CheckContentIntegrity(bundleInfo.LocalPath, bundleInfo.SizeBytes, bundleInfo.CRC);
}
@@ -19,7 +19,7 @@ namespace YooAsset
Failed,
}
public AssetBundleInfo BundleInfo { private set; get; }
private readonly BundleInfo _bundleInfo;
private UnityWebRequest _webRequest;
private UnityWebRequestAsyncOperation _operationHandle;
@@ -48,13 +48,13 @@ namespace YooAsset
public ulong DownloadedBytes { private set; get; }
internal FileDownloader(AssetBundleInfo bundleInfo)
internal FileDownloader(BundleInfo bundleInfo)
{
BundleInfo = bundleInfo;
_bundleInfo = bundleInfo;
}
internal void SendRequest(int failedTryAgain, int timeout)
{
if (string.IsNullOrEmpty(BundleInfo.LocalPath))
if (string.IsNullOrEmpty(_bundleInfo.LocalPath))
throw new ArgumentNullException();
if (_steps == ESteps.None)
@@ -85,7 +85,7 @@ namespace YooAsset
_requestCount++;
_requestURL = GetRequestURL();
_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
DownloadHandlerFile handler = new DownloadHandlerFile(BundleInfo.LocalPath);
DownloadHandlerFile handler = new DownloadHandlerFile(_bundleInfo.LocalPath);
handler.removeFileOnAbort = true;
_webRequest.downloadHandler = handler;
_webRequest.disposeDownloadHandlerOnDispose = true;
@@ -124,12 +124,12 @@ namespace YooAsset
if (isError == false)
{
// 注意:如果文件验证失败需要删除文件
if (DownloadSystem.CheckContentIntegrity(BundleInfo) == false)
if (DownloadSystem.CheckContentIntegrity(_bundleInfo) == false)
{
isError = true;
_lastError = $"Verification failed";
if (File.Exists(BundleInfo.LocalPath))
File.Delete(BundleInfo.LocalPath);
if (File.Exists(_bundleInfo.LocalPath))
File.Delete(_bundleInfo.LocalPath);
}
}
@@ -144,7 +144,7 @@ namespace YooAsset
else
{
_steps = ESteps.Succeed;
DownloadSystem.CacheVerifyFile(BundleInfo.Hash, BundleInfo.BundleName);
DownloadSystem.CacheVerifyFile(_bundleInfo.Hash, _bundleInfo.BundleName);
}
// 释放下载器
@@ -172,9 +172,9 @@ namespace YooAsset
{
// 轮流返回请求地址
if (_requestCount % 2 == 0)
return BundleInfo.RemoteFallbackURL;
return _bundleInfo.RemoteFallbackURL;
else
return BundleInfo.RemoteMainURL;
return _bundleInfo.RemoteMainURL;
}
private void CheckTimeout()
{
@@ -206,6 +206,14 @@ namespace YooAsset
}
}
/// <summary>
/// 获取资源包信息
/// </summary>
public BundleInfo GetBundleInfo()
{
return _bundleInfo;
}
/// <summary>
/// 检测下载器是否已经完成(无论成功或失败)
/// </summary>
@@ -19,7 +19,7 @@ namespace YooAsset
Failed,
}
public AssetBundleInfo BundleInfo { private set; get; }
private readonly BundleInfo _bundleInfo;
private ESteps _steps = ESteps.None;
// 线程
@@ -61,6 +61,10 @@ namespace YooAsset
}
internal HttpDownloader(BundleInfo bundleInfo)
{
_bundleInfo = bundleInfo;
}
internal void SendRequest(int failedTryAgain, int timeout)
{
_failedTryAgain = failedTryAgain;
@@ -102,7 +106,7 @@ namespace YooAsset
_downloadError = _threadError;
if (_threadResult)
{
DownloadSystem.CacheVerifyFile(BundleInfo.Hash, BundleInfo.BundleName);
DownloadSystem.CacheVerifyFile(_bundleInfo.Hash, _bundleInfo.BundleName);
_steps = ESteps.Succeed;
}
else
@@ -125,6 +129,14 @@ namespace YooAsset
_steps = ESteps.Succeed;
}
/// <summary>
/// 获取资源包信息
/// </summary>
public BundleInfo GetBundleInfo()
{
return _bundleInfo;
}
/// <summary>
/// 检测下载器是否已经完成(无论成功或失败)
/// </summary>
@@ -155,8 +167,8 @@ namespace YooAsset
private void ThreadRun()
{
string url = GetRequestURL();
string savePath = BundleInfo.LocalPath;
long fileTotalSize = BundleInfo.SizeBytes;
string savePath = _bundleInfo.LocalPath;
long fileTotalSize = _bundleInfo.SizeBytes;
FileStream fileStream = null;
Stream webStream = null;
@@ -202,7 +214,7 @@ namespace YooAsset
}
// 验证下载文件完整性
bool verfiyResult = DownloadSystem.CheckContentIntegrity(savePath, BundleInfo.SizeBytes, BundleInfo.CRC);
bool verfiyResult = DownloadSystem.CheckContentIntegrity(savePath, _bundleInfo.SizeBytes, _bundleInfo.CRC);
if(verfiyResult)
{
_threadResult = true;
@@ -210,7 +222,7 @@ namespace YooAsset
else
{
_threadResult = false;
_threadError = $"Verify file content failed : {BundleInfo.Hash}";
_threadError = $"Verify file content failed : {_bundleInfo.Hash}";
}
}
catch (Exception e)
@@ -245,9 +257,9 @@ namespace YooAsset
// 轮流返回请求地址
_requestCount++;
if (_requestCount % 2 == 0)
return BundleInfo.RemoteFallbackURL;
return _bundleInfo.RemoteFallbackURL;
else
return BundleInfo.RemoteMainURL;
return _bundleInfo.RemoteMainURL;
}
#endregion
}