diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs index eda69dc0..5326a3f5 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs @@ -101,8 +101,7 @@ namespace YooAsset /// /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain) { if (Status != EOperationStatus.Succeed) { @@ -121,8 +120,7 @@ namespace YooAsset /// 资源标签 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain) { if (Status != EOperationStatus.Succeed) { @@ -141,8 +139,7 @@ namespace YooAsset /// 资源标签列表 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain) { if (Status != EOperationStatus.Succeed) { @@ -161,8 +158,7 @@ namespace YooAsset /// 资源定位地址 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain) { if (Status != EOperationStatus.Succeed) { @@ -185,8 +181,7 @@ namespace YooAsset /// 资源定位地址列表 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain) { if (Status != EOperationStatus.Succeed) { diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs index 53cc733c..452893c5 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs @@ -966,8 +966,7 @@ namespace YooAsset /// /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); return _playModeImpl.CreateResourceDownloaderByAll(downloadingMaxNumber, failedTryAgain); @@ -979,8 +978,7 @@ namespace YooAsset /// 资源标签 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); return _playModeImpl.CreateResourceDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain); @@ -992,8 +990,7 @@ namespace YooAsset /// 资源标签列表 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); return _playModeImpl.CreateResourceDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain); @@ -1006,15 +1003,14 @@ namespace YooAsset /// 下载资源对象所属资源包内所有资源对象依赖的资源包 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); var assetInfo = ConvertLocationToAssetInfo(location, null); AssetInfo[] assetInfos = new AssetInfo[] { assetInfo }; return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain); } - public ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain) { return CreateBundleDownloader(location, false, downloadingMaxNumber, failedTryAgain); } @@ -1026,8 +1022,7 @@ namespace YooAsset /// 下载资源对象所属资源包内所有资源对象依赖的资源包 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); List assetInfos = new List(locations.Length); @@ -1038,7 +1033,7 @@ namespace YooAsset } return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos.ToArray(), recursiveDownload, downloadingMaxNumber, failedTryAgain); } - public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain) { return CreateBundleDownloader(locations, false, downloadingMaxNumber, failedTryAgain); } @@ -1050,14 +1045,13 @@ namespace YooAsset /// 下载资源对象所属资源包内所有资源对象依赖的资源包 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); AssetInfo[] assetInfos = new AssetInfo[] { assetInfo }; return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain); } - public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, int downloadingMaxNumber, int failedTryAgain) { return CreateBundleDownloader(assetInfo, false, downloadingMaxNumber, failedTryAgain); } @@ -1069,13 +1063,12 @@ namespace YooAsset /// 下载资源对象所属资源包内所有资源对象依赖的资源包 /// 同时下载的最大文件数 /// 下载失败的重试次数 - /// 超时时间 - public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain) { DebugCheckInitialize(); return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain); } - public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout = 60) + public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain) { return CreateBundleDownloader(assetInfos, false, downloadingMaxNumber, failedTryAgain); }