From c9d263c60d50178f2ab5f033a4faa42458f47e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E4=BC=BC=E9=94=A6?= <7997747+suxf@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:38:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=BE=AE=E4=BF=A1=E5=B0=8F=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E7=BC=93=E5=AD=98=E6=96=87=E4=BB=B6=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=BA=E5=88=B6=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/RecordWechatCacheFilesOperation.cs | 16 +++++++++------- .../WechatFileSystem/WechatFileSystem.cs | 4 +++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RecordWechatCacheFilesOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RecordWechatCacheFilesOperation.cs index d05c34db..45d39b98 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RecordWechatCacheFilesOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RecordWechatCacheFilesOperation.cs @@ -34,24 +34,26 @@ internal class RecordWechatCacheFilesOperation : AsyncOperationBase _steps = ESteps.WaitResponse; var fileSystemMgr = _fileSystem.GetFileSystemMgr(); - var getSavedFileListOption = new GetSavedFileListOption(); - getSavedFileListOption.success = (GetSavedFileListSuccessCallbackResult response) => + var statOption = new WXStatOption(); + statOption.path = _fileSystem.FileRoot; + statOption.recursive = true; + statOption.success = (WXStatResponse response) => { _steps = ESteps.Done; Status = EOperationStatus.Succeed; - foreach (var fileInfo in response.fileList) + foreach (var fileStat in response.stats) { //TODO 需要确认存储文件为Bundle文件 - _fileSystem.RecordBundleFile(fileInfo.filePath); + _fileSystem.RecordBundleFile(_fileSystem.FileRoot + fileStat.path); } }; - getSavedFileListOption.fail = (FileError fileError) => + statOption.fail = (WXStatResponse response) => { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = fileError.errMsg; + Error = response.errMsg; }; - fileSystemMgr.GetSavedFileList(getSavedFileListOption); + fileSystemMgr.Stat(statOption); } } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs index c1059b22..2c72df3d 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs @@ -62,6 +62,8 @@ internal class WechatFileSystem : IFileSystem /// 包裹名称 /// public string PackageName { private set; get; } + + private readonly string _packageRoot = YooAssetSettingsData.Setting.DefaultYooFolderName; /// /// 文件根目录 @@ -255,7 +257,7 @@ internal class WechatFileSystem : IFileSystem { if (_cacheFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false) { - filePath = PathUtility.Combine(_wxCacheRoot, bundle.FileName); + filePath = PathUtility.Combine(_wxCacheRoot, "__GAME_FILE_CACHE", _packageRoot, bundle.FileName); _cacheFilePaths.Add(bundle.BundleGUID, filePath); } return filePath;