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

add remote url packageName

pull/252/head
unknown 2024-03-12 11:08:40 +08:00
parent ef8229981e
commit 2cead7d4fc
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs
View File

@ -43,7 +43,7 @@ namespace YooAsset
{ {
string savePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion); string savePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
string fileName = YooAssetSettingsData.GetPackageHashFileName(_persistent.PackageName, _packageVersion); string fileName = YooAssetSettingsData.GetPackageHashFileName(_persistent.PackageName, _packageVersion);
string webURL = GetDownloadRequestURL(fileName); string webURL = GetDownloadRequestURL(_persistent.PackageName, fileName);
YooLogger.Log($"Beginning to download package hash file : {webURL}"); YooLogger.Log($"Beginning to download package hash file : {webURL}");
_downloader1 = new UnityWebFileRequester(); _downloader1 = new UnityWebFileRequester();
_downloader1.SendRequest(webURL, savePath, _timeout); _downloader1.SendRequest(webURL, savePath, _timeout);
@ -74,7 +74,7 @@ namespace YooAsset
{ {
string savePath = _persistent.GetSandboxPackageManifestFilePath(_packageVersion); string savePath = _persistent.GetSandboxPackageManifestFilePath(_packageVersion);
string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_persistent.PackageName, _packageVersion); string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_persistent.PackageName, _packageVersion);
string webURL = GetDownloadRequestURL(fileName); string webURL = GetDownloadRequestURL(_persistent.PackageName, fileName);
YooLogger.Log($"Beginning to download package manifest file : {webURL}"); YooLogger.Log($"Beginning to download package manifest file : {webURL}");
_downloader2 = new UnityWebFileRequester(); _downloader2 = new UnityWebFileRequester();
_downloader2.SendRequest(webURL, savePath, _timeout); _downloader2.SendRequest(webURL, savePath, _timeout);
@ -101,13 +101,13 @@ namespace YooAsset
} }
} }
private string GetDownloadRequestURL(string fileName) private string GetDownloadRequestURL(string packageName, string fileName)
{ {
// 轮流返回请求地址 // 轮流返回请求地址
if (_requestCount % 2 == 0) if (_requestCount % 2 == 0)
return _remoteServices.GetRemoteMainURL(fileName); return _remoteServices.GetRemoteMainURL(packageName, fileName);
else else
return _remoteServices.GetRemoteFallbackURL(fileName); return _remoteServices.GetRemoteFallbackURL(packageName, fileName);
} }
} }
} }

8
Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs
View File

@ -75,7 +75,7 @@ namespace YooAsset
if (_downloader == null) if (_downloader == null)
{ {
string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion); string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
string webURL = GetDownloadRequestURL(fileName); string webURL = GetDownloadRequestURL(_packageName, fileName);
YooLogger.Log($"Beginning to download manifest file : {webURL}"); YooLogger.Log($"Beginning to download manifest file : {webURL}");
_downloader = new UnityWebDataRequester(); _downloader = new UnityWebDataRequester();
_downloader.SendRequest(webURL, _timeout); _downloader.SendRequest(webURL, _timeout);
@ -139,13 +139,13 @@ namespace YooAsset
} }
} }
private string GetDownloadRequestURL(string fileName) private string GetDownloadRequestURL(string packageName, string fileName)
{ {
// 轮流返回请求地址 // 轮流返回请求地址
if (_requestCount % 2 == 0) if (_requestCount % 2 == 0)
return _remoteServices.GetRemoteMainURL(fileName); return _remoteServices.GetRemoteMainURL(packageName, fileName);
else else
return _remoteServices.GetRemoteFallbackURL(fileName); return _remoteServices.GetRemoteFallbackURL(packageName, fileName);
} }
} }
} }

8
Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs
View File

@ -46,7 +46,7 @@ namespace YooAsset
if (_downloader == null) if (_downloader == null)
{ {
string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion); string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
string webURL = GetPackageHashRequestURL(fileName); string webURL = GetPackageHashRequestURL(_packageName, fileName);
YooLogger.Log($"Beginning to request package hash : {webURL}"); YooLogger.Log($"Beginning to request package hash : {webURL}");
_downloader = new UnityWebDataRequester(); _downloader = new UnityWebDataRequester();
_downloader.SendRequest(webURL, _timeout); _downloader.SendRequest(webURL, _timeout);
@ -84,15 +84,15 @@ namespace YooAsset
} }
} }
private string GetPackageHashRequestURL(string fileName) private string GetPackageHashRequestURL(string packageName, string fileName)
{ {
string url; string url;
// 轮流返回请求地址 // 轮流返回请求地址
if (_requestCount % 2 == 0) if (_requestCount % 2 == 0)
url = _remoteServices.GetRemoteMainURL(fileName); url = _remoteServices.GetRemoteMainURL(packageName, fileName);
else else
url = _remoteServices.GetRemoteFallbackURL(fileName); url = _remoteServices.GetRemoteFallbackURL(packageName, fileName);
return url; return url;
} }

8
Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs
View File

@ -46,7 +46,7 @@ namespace YooAsset
if (_downloader == null) if (_downloader == null)
{ {
string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName); string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
string webURL = GetPackageVersionRequestURL(fileName); string webURL = GetPackageVersionRequestURL(_packageName, fileName);
YooLogger.Log($"Beginning to request package version : {webURL}"); YooLogger.Log($"Beginning to request package version : {webURL}");
_downloader = new UnityWebDataRequester(); _downloader = new UnityWebDataRequester();
_downloader.SendRequest(webURL, _timeout); _downloader.SendRequest(webURL, _timeout);
@ -84,15 +84,15 @@ namespace YooAsset
} }
} }
private string GetPackageVersionRequestURL(string fileName) private string GetPackageVersionRequestURL(string packageName, string fileName)
{ {
string url; string url;
// 轮流返回请求地址 // 轮流返回请求地址
if (_requestCount % 2 == 0) if (_requestCount % 2 == 0)
url = _remoteServices.GetRemoteMainURL(fileName); url = _remoteServices.GetRemoteMainURL(packageName, fileName);
else else
url = _remoteServices.GetRemoteFallbackURL(fileName); url = _remoteServices.GetRemoteFallbackURL(packageName, fileName);
// 在URL末尾添加时间戳 // 在URL末尾添加时间戳
if (_appendTimeTicks) if (_appendTimeTicks)

4
Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs
View File

@ -64,8 +64,8 @@ namespace YooAsset
} }
private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle) private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle)
{ {
string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName); string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.PackageName, packageBundle.FileName);
string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName); string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.PackageName, packageBundle.FileName);
BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL); BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
return bundleInfo; return bundleInfo;
} }

4
Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs
View File

@ -48,8 +48,8 @@ namespace YooAsset
// 下载相关 // 下载相关
private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle) private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle)
{ {
string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName); string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.PackageName, packageBundle.FileName);
string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName); string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.PackageName, packageBundle.FileName);
BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL); BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
return bundleInfo; return bundleInfo;
} }

8
Assets/YooAsset/Runtime/Services/IRemoteServices.cs
View File

@ -5,14 +5,16 @@ namespace YooAsset
{ {
/// <summary> /// <summary>
/// 获取主资源站的资源地址 /// 获取主资源站的资源地址
/// </summary> /// <param name="packageName">请求的文件所在package名称</param>
/// <param name="fileName">请求的文件名称</param> /// <param name="fileName">请求的文件名称</param>
string GetRemoteMainURL(string fileName); /// </summary>
string GetRemoteMainURL(string packageName, string fileName);
/// <summary> /// <summary>
/// 获取备用资源站的资源地址 /// 获取备用资源站的资源地址
/// </summary> /// </summary>
/// <param name="packageName">请求的文件所在package名称</param>
/// <param name="fileName">请求的文件名称</param> /// <param name="fileName">请求的文件名称</param>
string GetRemoteFallbackURL(string fileName); string GetRemoteFallbackURL(string packageName, string fileName);
} }
} }