From 2cead7d4fc5fe9771a00641ce7ea1c12b3e56a0d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Mar 2024 11:08:40 +0800 Subject: [PATCH] add remote url packageName --- .../Operation/Internal/DownloadManifestOperation.cs | 10 +++++----- .../Operation/Internal/LoadRemoteManifestOperation.cs | 8 ++++---- .../Internal/QueryRemotePackageHashOperation.cs | 8 ++++---- .../Internal/QueryRemotePackageVersionOperation.cs | 8 ++++---- .../ResourcePackage/PlayMode/HostPlayModeImpl.cs | 4 ++-- .../ResourcePackage/PlayMode/WebPlayModeImpl.cs | 4 ++-- Assets/YooAsset/Runtime/Services/IRemoteServices.cs | 8 +++++--- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs index d0454b19..e1cdb33a 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs @@ -43,7 +43,7 @@ namespace YooAsset { string savePath = _persistent.GetSandboxPackageHashFilePath(_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}"); _downloader1 = new UnityWebFileRequester(); _downloader1.SendRequest(webURL, savePath, _timeout); @@ -74,7 +74,7 @@ namespace YooAsset { string savePath = _persistent.GetSandboxPackageManifestFilePath(_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}"); _downloader2 = new UnityWebFileRequester(); _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) - return _remoteServices.GetRemoteMainURL(fileName); + return _remoteServices.GetRemoteMainURL(packageName, fileName); else - return _remoteServices.GetRemoteFallbackURL(fileName); + return _remoteServices.GetRemoteFallbackURL(packageName, fileName); } } } \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs index 7cd168d6..e1e17bbe 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs @@ -75,7 +75,7 @@ namespace YooAsset if (_downloader == null) { string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion); - string webURL = GetDownloadRequestURL(fileName); + string webURL = GetDownloadRequestURL(_packageName, fileName); YooLogger.Log($"Beginning to download manifest file : {webURL}"); _downloader = new UnityWebDataRequester(); _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) - return _remoteServices.GetRemoteMainURL(fileName); + return _remoteServices.GetRemoteMainURL(packageName, fileName); else - return _remoteServices.GetRemoteFallbackURL(fileName); + return _remoteServices.GetRemoteFallbackURL(packageName, fileName); } } } \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs index 7ce2b8e7..711d644e 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs @@ -46,7 +46,7 @@ namespace YooAsset if (_downloader == null) { string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion); - string webURL = GetPackageHashRequestURL(fileName); + string webURL = GetPackageHashRequestURL(_packageName, fileName); YooLogger.Log($"Beginning to request package hash : {webURL}"); _downloader = new UnityWebDataRequester(); _downloader.SendRequest(webURL, _timeout); @@ -84,15 +84,15 @@ namespace YooAsset } } - private string GetPackageHashRequestURL(string fileName) + private string GetPackageHashRequestURL(string packageName, string fileName) { string url; // 轮流返回请求地址 if (_requestCount % 2 == 0) - url = _remoteServices.GetRemoteMainURL(fileName); + url = _remoteServices.GetRemoteMainURL(packageName, fileName); else - url = _remoteServices.GetRemoteFallbackURL(fileName); + url = _remoteServices.GetRemoteFallbackURL(packageName, fileName); return url; } diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs index 47c0faff..933fd465 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs @@ -46,7 +46,7 @@ namespace YooAsset if (_downloader == null) { string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName); - string webURL = GetPackageVersionRequestURL(fileName); + string webURL = GetPackageVersionRequestURL(_packageName, fileName); YooLogger.Log($"Beginning to request package version : {webURL}"); _downloader = new UnityWebDataRequester(); _downloader.SendRequest(webURL, _timeout); @@ -84,15 +84,15 @@ namespace YooAsset } } - private string GetPackageVersionRequestURL(string fileName) + private string GetPackageVersionRequestURL(string packageName, string fileName) { string url; // 轮流返回请求地址 if (_requestCount % 2 == 0) - url = _remoteServices.GetRemoteMainURL(fileName); + url = _remoteServices.GetRemoteMainURL(packageName, fileName); else - url = _remoteServices.GetRemoteFallbackURL(fileName); + url = _remoteServices.GetRemoteFallbackURL(packageName, fileName); // 在URL末尾添加时间戳 if (_appendTimeTicks) diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs index 601f61ec..0b987081 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs @@ -64,8 +64,8 @@ namespace YooAsset } private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle) { - string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName); - string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName); + string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.PackageName, packageBundle.FileName); + string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.PackageName, packageBundle.FileName); BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL); return bundleInfo; } diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs index de073072..3aa4b575 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs @@ -48,8 +48,8 @@ namespace YooAsset // 下载相关 private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle) { - string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName); - string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName); + string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.PackageName, packageBundle.FileName); + string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.PackageName, packageBundle.FileName); BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL); return bundleInfo; } diff --git a/Assets/YooAsset/Runtime/Services/IRemoteServices.cs b/Assets/YooAsset/Runtime/Services/IRemoteServices.cs index 041b206f..33b54f38 100644 --- a/Assets/YooAsset/Runtime/Services/IRemoteServices.cs +++ b/Assets/YooAsset/Runtime/Services/IRemoteServices.cs @@ -5,14 +5,16 @@ namespace YooAsset { /// /// 获取主资源站的资源地址 - /// + /// 请求的文件所在package名称 /// 请求的文件名称 - string GetRemoteMainURL(string fileName); + /// + string GetRemoteMainURL(string packageName, string fileName); /// /// 获取备用资源站的资源地址 /// + /// 请求的文件所在package名称 /// 请求的文件名称 - string GetRemoteFallbackURL(string fileName); + string GetRemoteFallbackURL(string packageName, string fileName); } } \ No newline at end of file