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

fix #468

pull/469/head
何冠峰 2025-02-10 20:00:48 +08:00
parent 2d6488abf4
commit 6d216561f8
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs
View File

@ -113,12 +113,13 @@ namespace YooAsset
} }
public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param) public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
{ {
// 注意：业务层的解压下载器会依赖内置文件系统的下载方法
param.ImportFilePath = GetBuildinFileLoadPath(bundle); param.ImportFilePath = GetBuildinFileLoadPath(bundle);
return _unpackFileSystem.DownloadFileAsync(bundle, param); return _unpackFileSystem.DownloadFileAsync(bundle, param);
} }
public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle) public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
{ {
if (NeedUnpack(bundle)) if (IsUnpackBundleFile(bundle))
{ {
return _unpackFileSystem.LoadBundleFile(bundle); return _unpackFileSystem.LoadBundleFile(bundle);
} }
@ -216,11 +217,7 @@ namespace YooAsset
} }
public virtual bool NeedUnpack(PackageBundle bundle) public virtual bool NeedUnpack(PackageBundle bundle)
{ {
if (Belong(bundle) == false) if (IsUnpackBundleFile(bundle))
return false;
#if UNITY_ANDROID
if (bundle.BundleType == (int)EBuildBundleType.RawBundle || bundle.Encrypted)
{ {
return _unpackFileSystem.Exists(bundle) == false; return _unpackFileSystem.Exists(bundle) == false;
} }
@ -228,9 +225,6 @@ namespace YooAsset
{ {
return false; return false;
} }
#else
return false;
#endif
} }
public virtual bool NeedImport(PackageBundle bundle) public virtual bool NeedImport(PackageBundle bundle)
{ {
@ -239,14 +233,14 @@ namespace YooAsset
public virtual string GetBundleFilePath(PackageBundle bundle) public virtual string GetBundleFilePath(PackageBundle bundle)
{ {
if (NeedUnpack(bundle)) if (IsUnpackBundleFile(bundle))
return _unpackFileSystem.GetBundleFilePath(bundle); return _unpackFileSystem.GetBundleFilePath(bundle);
return GetBuildinFileLoadPath(bundle); return GetBuildinFileLoadPath(bundle);
} }
public virtual byte[] ReadBundleFileData(PackageBundle bundle) public virtual byte[] ReadBundleFileData(PackageBundle bundle)
{ {
if (NeedUnpack(bundle)) if (IsUnpackBundleFile(bundle))
return _unpackFileSystem.ReadBundleFileData(bundle); return _unpackFileSystem.ReadBundleFileData(bundle);
if (Exists(bundle) == false) if (Exists(bundle) == false)
@ -277,7 +271,7 @@ namespace YooAsset
} }
public virtual string ReadBundleFileText(PackageBundle bundle) public virtual string ReadBundleFileText(PackageBundle bundle)
{ {
if (NeedUnpack(bundle)) if (IsUnpackBundleFile(bundle))
return _unpackFileSystem.ReadBundleFileText(bundle); return _unpackFileSystem.ReadBundleFileText(bundle);
if (Exists(bundle) == false) if (Exists(bundle) == false)
@ -343,6 +337,24 @@ namespace YooAsset
return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName); return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
} }
/// <summary>
/// 是否属于解压资源包文件
/// </summary>
protected bool IsUnpackBundleFile(PackageBundle bundle)
{
if (Belong(bundle) == false)
return false;
#if UNITY_ANDROID
if (bundle.BundleType == (int)EBuildBundleType.RawBundle || bundle.Encrypted)
return true;
else
return false;
#else
return false;
#endif
}
/// <summary> /// <summary>
/// 记录文件信息 /// 记录文件信息
/// </summary> /// </summary>