diff --git a/Assets/YooAsset/Runtime/Compatibility/CompatibleHandles.cs b/Assets/YooAsset/Runtime/Compatibility/CompatibleHandles.cs index 8ad9d3a5..ac85c9d3 100644 --- a/Assets/YooAsset/Runtime/Compatibility/CompatibleHandles.cs +++ b/Assets/YooAsset/Runtime/Compatibility/CompatibleHandles.cs @@ -94,27 +94,27 @@ namespace YooAsset } #endregion - #region RawFileHandle -- GetRawFileData / GetRawFileText - public sealed partial class RawFileHandle + #region BundleFileHandle -- GetRawFileData / GetRawFileText + public sealed partial class BundleFileHandle { /// /// v2.3: rawFileHandle.GetRawFileData() /// - [Obsolete("Read file manually via GetRawFilePath().")] + [Obsolete("Read file manually via GetBundleFilePath().")] public byte[] GetRawFileData() { if (CheckValidWithWarning() == false) return null; - return System.IO.File.ReadAllBytes(GetRawFilePath()); + return System.IO.File.ReadAllBytes(GetBundleFilePath()); } /// /// v2.3: rawFileHandle.GetRawFileText() /// - [Obsolete("Read file manually via GetRawFilePath().")] + [Obsolete("Read file manually via GetBundleFilePath().")] public string GetRawFileText() { if (CheckValidWithWarning() == false) return null; - return System.IO.File.ReadAllText(GetRawFilePath()); + return System.IO.File.ReadAllText(GetBundleFilePath()); } } #endregion diff --git a/Assets/YooAsset/Runtime/ResourceManager/Handles/RawFileHandle.cs b/Assets/YooAsset/Runtime/ResourceManager/Handles/BundleFileHandle.cs similarity index 65% rename from Assets/YooAsset/Runtime/ResourceManager/Handles/RawFileHandle.cs rename to Assets/YooAsset/Runtime/ResourceManager/Handles/BundleFileHandle.cs index 6bc57dfc..00e759f8 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Handles/RawFileHandle.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Handles/BundleFileHandle.cs @@ -2,13 +2,13 @@ namespace YooAsset { /// - /// 原生文件句柄，用于访问未经 Unity 处理的原始文件。 + /// 资源包文件句柄，用于持有已加载的资源包引用。 /// - public sealed partial class RawFileHandle : HandleBase + public sealed partial class BundleFileHandle : HandleBase { - private System.Action _callback; + private System.Action _callback; - internal RawFileHandle(ProviderBase provider) : base(provider) + internal BundleFileHandle(ProviderBase provider) : base(provider) { } internal override void InvokeCallback() @@ -19,12 +19,12 @@ namespace YooAsset /// /// 当加载完成时触发 /// - public event System.Action Completed + public event System.Action Completed { add { if (CheckValidWithWarning() == false) - throw new YooHandleInvalidException($"{nameof(RawFileHandle)} is invalid. It may have been released or the provider was destroyed."); + throw new YooHandleInvalidException($"{nameof(BundleFileHandle)} is invalid. It may have been released or the provider was destroyed."); if (Provider.IsDone) value.Invoke(this); else @@ -33,7 +33,7 @@ namespace YooAsset remove { if (CheckValidWithWarning() == false) - throw new YooHandleInvalidException($"{nameof(RawFileHandle)} is invalid. It may have been released or the provider was destroyed."); + throw new YooHandleInvalidException($"{nameof(BundleFileHandle)} is invalid. It may have been released or the provider was destroyed."); _callback -= value; } } @@ -49,10 +49,10 @@ namespace YooAsset } /// - /// 获取原生文件的路径 + /// 获取资源包文件的路径 /// - /// 原生文件的磁盘路径 - public string GetRawFilePath() + /// 资源包文件的磁盘路径 + public string GetBundleFilePath() { if (CheckValidWithWarning() == false) return string.Empty; diff --git a/Assets/YooAsset/Runtime/ResourceManager/Handles/RawFileHandle.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handles/BundleFileHandle.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/ResourceManager/Handles/RawFileHandle.cs.meta rename to Assets/YooAsset/Runtime/ResourceManager/Handles/BundleFileHandle.cs.meta diff --git a/Assets/YooAsset/Runtime/ResourceManager/Handles/HandleFactory.cs b/Assets/YooAsset/Runtime/ResourceManager/Handles/HandleFactory.cs index e7fe73ac..6e0c2edd 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Handles/HandleFactory.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Handles/HandleFactory.cs @@ -14,7 +14,7 @@ namespace YooAsset { typeof(SceneHandle), op => new SceneHandle(op) }, { typeof(SubAssetsHandle), op => new SubAssetsHandle(op) }, { typeof(AllAssetsHandle), op => new AllAssetsHandle(op) }, - { typeof(RawFileHandle), op => new RawFileHandle(op) } + { typeof(BundleFileHandle), op => new BundleFileHandle(op) } }; /// diff --git a/Assets/YooAsset/Runtime/ResourceManager/Providers/BundleFileProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Providers/BundleFileProvider.cs new file mode 100644 index 00000000..e2b7699e --- /dev/null +++ b/Assets/YooAsset/Runtime/ResourceManager/Providers/BundleFileProvider.cs @@ -0,0 +1,17 @@ + +namespace YooAsset +{ + /// + /// 资源包文件提供者，负责加载资源包文件。 + /// + internal sealed class BundleFileProvider : ProviderBase + { + public BundleFileProvider(ResourceManager manager, string providerKey, AssetInfo assetInfo) : base(manager, providerKey, assetInfo) + { + } + protected override void InternalProcessBundleHandle() + { + SetSuccess(); + } + } +} \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/ResourceManager/Providers/RawFileProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Providers/BundleFileProvider.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/ResourceManager/Providers/RawFileProvider.cs.meta rename to Assets/YooAsset/Runtime/ResourceManager/Providers/BundleFileProvider.cs.meta diff --git a/Assets/YooAsset/Runtime/ResourceManager/Providers/RawFileProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Providers/RawFileProvider.cs deleted file mode 100644 index fd845fab..00000000 --- a/Assets/YooAsset/Runtime/ResourceManager/Providers/RawFileProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ - -namespace YooAsset -{ - /// - /// 原生文件提供者，负责加载原始文件资源。 - /// - internal sealed class RawFileProvider : ProviderBase - { - public RawFileProvider(ResourceManager manager, string providerKey, AssetInfo assetInfo) : base(manager, providerKey, assetInfo) - { - } - protected override void InternalProcessBundleHandle() - { - SetSuccess(); - } - } -} \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs b/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs index 78bbd57c..7bfd285c 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs @@ -305,12 +305,12 @@ namespace YooAsset } /// - /// 加载原生文件 + /// 加载资源包文件 /// /// 资源信息 /// 加载优先级 - /// 原生文件句柄 - public RawFileHandle LoadRawFileAsync(AssetInfo assetInfo, uint priority) + /// 资源包文件句柄 + public BundleFileHandle LoadBundleFileAsync(AssetInfo assetInfo, uint priority) { if (IsLoadingLocked) { @@ -318,29 +318,29 @@ namespace YooAsset YooLogger.LogError(error); ErrorProvider errorProvider = new ErrorProvider(this, assetInfo); errorProvider.SetCompletedWithError(error); - return errorProvider.CreateHandle(); + return errorProvider.CreateHandle(); } if (assetInfo.IsValid == false) { - YooLogger.LogError($"Failed to load raw file. Error: {assetInfo.Error}"); + YooLogger.LogError($"Failed to load bundle file. Error: {assetInfo.Error}"); ErrorProvider errorProvider = new ErrorProvider(this, assetInfo); errorProvider.SetCompletedWithError(assetInfo.Error); - return errorProvider.CreateHandle(); + return errorProvider.CreateHandle(); } - string providerKey = nameof(LoadRawFileAsync) + assetInfo.AssetKey; + string providerKey = nameof(LoadBundleFileAsync) + assetInfo.AssetKey; ProviderBase provider = GetAssetProvider(providerKey); if (provider == null) { - provider = new RawFileProvider(this, providerKey, assetInfo); + provider = new BundleFileProvider(this, providerKey, assetInfo); provider.InitProviderDebugInfo(); _providerDict.Add(providerKey, provider); AsyncOperationSystem.StartOperation(PackageName, provider); } provider.Priority = priority; - return provider.CreateHandle(); + return provider.CreateHandle(); } /// diff --git a/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs b/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs index 98796442..ff1bac29 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs @@ -32,9 +32,9 @@ namespace YooAsset LoadScene, /// - /// 加载原生文件 + /// 加载资源包文件 /// - LoadRawFile, + LoadBundleFile, } /// diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs index 265d3a0c..48a5e637 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs @@ -419,60 +419,60 @@ namespace YooAsset } #endregion - #region 原生文件 + #region 资源包文件 /// - /// 同步加载原生文件 + /// 同步加载资源包文件 /// /// 资源信息 - /// 返回原生文件操作句柄 - public RawFileHandle LoadRawFileSync(AssetInfo assetInfo) + /// 返回资源包文件操作句柄 + public BundleFileHandle LoadBundleFileSync(AssetInfo assetInfo) { CheckInitialized(); - return LoadRawFileInternal(assetInfo, true, 0); + return LoadBundleFileInternal(assetInfo, true, 0); } /// - /// 同步加载原生文件 + /// 同步加载资源包文件 /// /// 资源的定位地址 - /// 返回原生文件操作句柄 - public RawFileHandle LoadRawFileSync(string location) + /// 返回资源包文件操作句柄 + public BundleFileHandle LoadBundleFileSync(string location) { CheckInitialized(); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null); - return LoadRawFileInternal(assetInfo, true, 0); + return LoadBundleFileInternal(assetInfo, true, 0); } /// - /// 加载原生文件 + /// 异步加载资源包文件 /// /// 资源信息 /// 加载的优先级 - /// 返回原生文件操作句柄 - public RawFileHandle LoadRawFileAsync(AssetInfo assetInfo, uint priority = 0) + /// 返回资源包文件操作句柄 + public BundleFileHandle LoadBundleFileAsync(AssetInfo assetInfo, uint priority = 0) { CheckInitialized(); - return LoadRawFileInternal(assetInfo, false, priority); + return LoadBundleFileInternal(assetInfo, false, priority); } /// - /// 加载原生文件 + /// 异步加载资源包文件 /// /// 资源的定位地址 /// 加载的优先级 - /// 返回原生文件操作句柄 - public RawFileHandle LoadRawFileAsync(string location, uint priority = 0) + /// 返回资源包文件操作句柄 + public BundleFileHandle LoadBundleFileAsync(string location, uint priority = 0) { CheckInitialized(); AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null); - return LoadRawFileInternal(assetInfo, false, priority); + return LoadBundleFileInternal(assetInfo, false, priority); } - private RawFileHandle LoadRawFileInternal(AssetInfo assetInfo, bool waitForAsyncComplete, uint priority) + private BundleFileHandle LoadBundleFileInternal(AssetInfo assetInfo, bool waitForAsyncComplete, uint priority) { - assetInfo.LoadMethod = ELoadMethod.LoadRawFile; - var handle = _resourceManager.LoadRawFileAsync(assetInfo, priority); + assetInfo.LoadMethod = ELoadMethod.LoadBundleFile; + var handle = _resourceManager.LoadBundleFileAsync(assetInfo, priority); if (waitForAsyncComplete) handle.WaitForAsyncComplete(); return handle; diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestRawFileRelease.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestBundleFileRelease.cs similarity index 53% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestRawFileRelease.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestBundleFileRelease.cs index 91623348..a836e388 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestRawFileRelease.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestBundleFileRelease.cs @@ -6,29 +6,29 @@ using NUnit.Framework; using YooAsset; /// -/// 测试原生文件句柄释放与重新加载 +/// 测试 Bundle 文件句柄释放与重新加载 /// /// -/// 覆盖 API: LoadRawFileAsync / RawFileHandle.Release / UnloadUnusedAssetsAsync +/// 覆盖 API: LoadBundleFileAsync / BundleFileHandle.Release / UnloadUnusedAssetsAsync /// 测试内容: -/// 1. 异步加载原生文件，验证加载成功 -/// 2. 释放 RawFileHandle 引用，等待一帧 +/// 1. 异步加载 Bundle 文件，验证加载成功 +/// 2. 释放 BundleFileHandle 引用，等待一帧 /// 3. 调用 UnloadUnusedAssetsAsync 清理未使用资源 -/// 4. 再次加载同一原生文件，验证加载成功且文件路径有效 +/// 4. 再次加载同一 Bundle 文件，验证加载成功且文件路径有效 /// -public class TestRawFileRelease +public class TestBundleFileRelease { public IEnumerator RuntimeTester() { ResourcePackage package = YooAssets.GetPackage(TestConsts.RawBundlePackageName); Assert.IsNotNull(package); - var rawFileHandle = package.LoadRawFileAsync("raw_file_e"); - yield return rawFileHandle; - Assert.AreEqual(EOperationStatus.Succeeded, rawFileHandle.Status); + var bundleFileHandle = package.LoadBundleFileAsync("raw_file_e"); + yield return bundleFileHandle; + Assert.AreEqual(EOperationStatus.Succeeded, bundleFileHandle.Status); // 释放 - rawFileHandle.Release(); + bundleFileHandle.Release(); yield return new WaitForEndOfFrame(); var unloadOp = package.UnloadUnusedAssetsAsync(); @@ -36,10 +36,10 @@ public class TestRawFileRelease Assert.AreEqual(EOperationStatus.Succeeded, unloadOp.Status); // 再次加载 - var reloadHandle = package.LoadRawFileAsync("raw_file_e"); + var reloadHandle = package.LoadBundleFileAsync("raw_file_e"); yield return reloadHandle; Assert.AreEqual(EOperationStatus.Succeeded, reloadHandle.Status); - Assert.IsTrue(File.Exists(reloadHandle.GetRawFilePath())); + Assert.IsTrue(File.Exists(reloadHandle.GetBundleFilePath())); reloadHandle.Release(); } } diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestRawFileRelease.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestBundleFileRelease.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestRawFileRelease.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestBundleFileRelease.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFile.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs similarity index 73% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFile.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs index 38ffe162..bb779daf 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFile.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs @@ -7,17 +7,17 @@ using NUnit.Framework; using YooAsset; /// -/// 测试原生文件加载 +/// 测试 Bundle 文件加载 /// /// -/// 覆盖 API: LoadRawFileAsync / LoadRawFileSync / LoadAssetAsync(RawFileObject) / LoadAssetSync(RawFileObject) +/// 覆盖 API: LoadBundleFileAsync / LoadBundleFileSync / LoadAssetAsync(RawFileObject) / LoadAssetSync(RawFileObject) /// 测试内容: -/// 1. 异步加载原生文件，获取文件路径，验证文件存在且二进制数据非空（raw_file_a） -/// 2. 同步加载原生文件，获取文件路径，验证文件存在且二进制数据非空（raw_file_b） +/// 1. 异步加载 Bundle 文件，获取文件路径，验证文件存在且二进制数据非空（raw_file_a） +/// 2. 同步加载 Bundle 文件，获取文件路径，验证文件存在且二进制数据非空（raw_file_b） /// 3. 异步通过 RawFileObject 加载，验证 GetBytes() 和 GetText() 均返回有效数据（raw_file_c） /// 4. 同步通过 RawFileObject 加载，验证 GetBytes() 和 GetText() 均返回有效数据（raw_file_d） /// -public class TestLoadRawFile +public class TestLoadBundleFile { public IEnumerator RuntimeTester() { @@ -26,33 +26,33 @@ public class TestLoadRawFile // 测试异步加载 { - var rawFileHandle = package.LoadRawFileAsync("raw_file_a"); - yield return rawFileHandle; - Assert.AreEqual(EOperationStatus.Succeeded, rawFileHandle.Status); + var bundleFileHandle = package.LoadBundleFileAsync("raw_file_a"); + yield return bundleFileHandle; + Assert.AreEqual(EOperationStatus.Succeeded, bundleFileHandle.Status); - var filePath = rawFileHandle.GetRawFilePath(); + var filePath = bundleFileHandle.GetBundleFilePath(); Assert.IsNotNull(filePath); Assert.IsTrue(File.Exists(filePath)); byte[] fileBytes = File.ReadAllBytes(filePath); Assert.IsNotNull(fileBytes); Assert.Greater(fileBytes.Length, 0); - rawFileHandle.Release(); + bundleFileHandle.Release(); } // 测试同步加载 { - var rawFileHandle = package.LoadRawFileSync("raw_file_b"); - Assert.AreEqual(EOperationStatus.Succeeded, rawFileHandle.Status); + var bundleFileHandle = package.LoadBundleFileSync("raw_file_b"); + Assert.AreEqual(EOperationStatus.Succeeded, bundleFileHandle.Status); - var filePath = rawFileHandle.GetRawFilePath(); + var filePath = bundleFileHandle.GetBundleFilePath(); Assert.IsNotNull(filePath); Assert.IsTrue(File.Exists(filePath)); byte[] fileBytes = File.ReadAllBytes(filePath); Assert.IsNotNull(fileBytes); Assert.Greater(fileBytes.Length, 0); - rawFileHandle.Release(); + bundleFileHandle.Release(); } // 测试异步加载：通过 RawFileObject 获取二进制数据和文本数据 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFile.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFile.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs index 9bcccc57..b1bc4257 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs @@ -239,11 +239,11 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup var tester = new TestLoadScene(); yield return tester.RuntimeTester(); } - + [UnityTest] - public IEnumerator B10_TestLoadRawFile() + public IEnumerator B10_TestLoadBundleFile() { - var tester = new TestLoadRawFile(); + var tester = new TestLoadBundleFile(); yield return tester.RuntimeTester(); } @@ -304,9 +304,9 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup } [UnityTest] - public IEnumerator C07_TestRawFileRelease() + public IEnumerator C07_TestBundleFileRelease() { - var tester = new TestRawFileRelease(); + var tester = new TestBundleFileRelease(); yield return tester.RuntimeTester(); } diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs index f31fa7b8..e9f6c1f9 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs @@ -239,11 +239,11 @@ public class T2_TestBuiltinFileSystem : IPrebuildSetup, IPostBuildCleanup var tester = new TestLoadScene(); yield return tester.RuntimeTester(); } - + [UnityTest] - public IEnumerator B10_TestLoadRawFile() + public IEnumerator B10_TestLoadBundleFile() { - var tester = new TestLoadRawFile(); + var tester = new TestLoadBundleFile(); yield return tester.RuntimeTester(); } @@ -331,11 +331,11 @@ public class T2_TestBuiltinFileSystem : IPrebuildSetup, IPostBuildCleanup var tester = new TestHandleRelease(); yield return tester.RuntimeTester(); } - + [UnityTest] - public IEnumerator D07_TestRawFileRelease() + public IEnumerator D07_TestBundleFileRelease() { - var tester = new TestRawFileRelease(); + var tester = new TestBundleFileRelease(); yield return tester.RuntimeTester(); } diff --git a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs index 3a340bbc..5bdb69c8 100644 --- a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs +++ b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs @@ -101,8 +101,8 @@ namespace Cysharp.Threading.Tasks case SubAssetsHandle sub_asset_handle: sub_asset_handle.Completed += result.SubContinuation; break; - case RawFileHandle raw_file_handle: - raw_file_handle.Completed += result.RawFileContinuation; + case BundleFileHandle bundle_file_handle: + bundle_file_handle.Completed += result.BundleFileContinuation; break; case AllAssetsHandle all_assets_handle: all_assets_handle.Completed += result.AllAssetsContinuation; @@ -120,8 +120,8 @@ namespace Cysharp.Threading.Tasks case SubAssetsHandle sub_asset_handle: sub_asset_handle.Completed += result.completedCallback; break; - case RawFileHandle raw_file_handle: - raw_file_handle.Completed += result.completedCallback; + case BundleFileHandle bundle_file_handle: + bundle_file_handle.Completed += result.completedCallback; break; case AllAssetsHandle all_assets_handle: all_assets_handle.Completed += result.completedCallback; @@ -137,7 +137,7 @@ namespace Cysharp.Threading.Tasks void AssetContinuation(AssetHandle _) => HandleCompleted(null); void SceneContinuation(SceneHandle _) => HandleCompleted(null); void SubContinuation(SubAssetsHandle _) => HandleCompleted(null); - void RawFileContinuation(RawFileHandle _) => HandleCompleted(null); + void BundleFileContinuation(BundleFileHandle _) => HandleCompleted(null); void AllAssetsContinuation(AllAssetsHandle _) => HandleCompleted(null); #endif @@ -174,8 +174,8 @@ namespace Cysharp.Threading.Tasks case SubAssetsHandle sub_asset_handle: sub_asset_handle.Completed -= SubContinuation; break; - case RawFileHandle raw_file_handle: - raw_file_handle.Completed -= RawFileContinuation; + case BundleFileHandle bundle_file_handle: + bundle_file_handle.Completed -= BundleFileContinuation; break; case AllAssetsHandle all_assets_handle: all_assets_handle.Completed -= AllAssetsContinuation; @@ -193,8 +193,8 @@ namespace Cysharp.Threading.Tasks case SubAssetsHandle sub_asset_handle: sub_asset_handle.Completed -= completedCallback; break; - case RawFileHandle raw_file_handle: - raw_file_handle.Completed -= completedCallback; + case BundleFileHandle bundle_file_handle: + bundle_file_handle.Completed -= completedCallback; break; case AllAssetsHandle all_assets_handle: all_assets_handle.Completed -= completedCallback;