QiJing
/
YooAsset
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update runtime code

mlyDevMerge1.5.7
hevinci 2023-06-26 10:42:56 +08:00 committed by QiJing
parent df154a10d5
commit c10ac0b41c
6 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ namespace YooAsset
if (_steps == ESteps.Unpack)
{
int failedTryAgain = Impl.DownloadFailedTryAgain;
var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
_steps = ESteps.CheckUnpack;
}

2
Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs
View File

@ -92,7 +92,7 @@ namespace YooAsset
if (_steps == ESteps.Unpack)
{
int failedTryAgain = Impl.DownloadFailedTryAgain;
var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
_steps = ESteps.CheckUnpack;
}

2
Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs
View File

@ -90,7 +90,7 @@ namespace YooAsset
if (_steps == ESteps.Website)
{
int failedTryAgain = Impl.DownloadFailedTryAgain;
var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
_website = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
_steps = ESteps.CheckWebsite;
}

19
Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs
View File

@ -8,7 +8,6 @@ namespace YooAsset
{
internal static class ManifestTools
{
#if UNITY_EDITOR
/// <summary>
/// 序列化（JSON文件）
@ -188,14 +187,28 @@ namespace YooAsset
}
/// <summary>
/// 获取解压BundleInfo
/// 转换为解压BundleInfo
/// </summary>
public static BundleInfo GetUnpackInfo(PackageBundle packageBundle)
public static BundleInfo ConvertToUnpackInfo(PackageBundle packageBundle)
{
// 注意：我们把流加载路径指定为远端下载地址
string streamingPath = PersistentTools.ConvertToWWWPath(packageBundle.StreamingFilePath);
BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming, streamingPath, streamingPath);
return bundleInfo;
}
/// <summary>
/// 批量转换解压为BundleInfo
/// </summary>
public static List<BundleInfo> ConvertToUnpackInfos(List<PackageBundle> unpackList)
{
List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
foreach (var packageBundle in unpackList)
{
var bundleInfo = ConvertToUnpackInfo(packageBundle);
result.Add(bundleInfo);
}
return result;
}
}
}

20
Assets/YooAsset/Runtime/PackageSystem/PlayMode/HostPlayModeImpl.cs
View File

@ -50,22 +50,6 @@ namespace YooAsset
return bundleInfo;
}
// 解压相关
private List<BundleInfo> ConvertToUnpackList(List<PackageBundle> unpackList)
{
List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
foreach (var packageBundle in unpackList)
{
var bundleInfo = ConvertToUnpackInfo(packageBundle);
result.Add(bundleInfo);
}
return result;
}
private BundleInfo ConvertToUnpackInfo(PackageBundle packageBundle)
{
return ManifestTools.GetUnpackInfo(packageBundle);
}
#region IRemoteServices接口
public string GetRemoteMainURL(string fileName)
{
@ -256,7 +240,7 @@ namespace YooAsset
}
}
return ConvertToUnpackList(downloadList);
return ManifestTools.ConvertToUnpackInfos(downloadList);
}
ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
@ -284,7 +268,7 @@ namespace YooAsset
}
}
return ConvertToUnpackList(downloadList);
return ManifestTools.ConvertToUnpackInfos(downloadList);
}
#endregion

20
Assets/YooAsset/Runtime/PackageSystem/PlayMode/OfflinePlayModeImpl.cs
View File

@ -20,22 +20,6 @@ namespace YooAsset
return operation;
}
// 解压相关
private List<BundleInfo> ConvertToUnpackList(List<PackageBundle> unpackList)
{
List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
foreach (var packageBundle in unpackList)
{
var bundleInfo = ConvertToUnpackInfo(packageBundle);
result.Add(bundleInfo);
}
return result;
}
private BundleInfo ConvertToUnpackInfo(PackageBundle packageBundle)
{
return ManifestTools.GetUnpackInfo(packageBundle);
}
#region IPlayModeServices接口
public PackageManifest ActiveManifest
{
@ -108,7 +92,7 @@ namespace YooAsset
downloadList.Add(packageBundle);
}
return ConvertToUnpackList(downloadList);
return ManifestTools.ConvertToUnpackInfos(downloadList);
}
ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
@ -133,7 +117,7 @@ namespace YooAsset
}
}
return ConvertToUnpackList(downloadList);
return ManifestTools.ConvertToUnpackInfos(downloadList);
}
#endregion