diff --git a/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs b/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs index adaa03b3..636566c5 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs @@ -15,17 +15,22 @@ public static class TestPackageBuilder if (buildPipelineName == EBuildPipeline.EditorSimulateBuildPipeline.ToString()) { + string projectPath = EditorTools.GetProjectPath(); + string outputRoot = $"{projectPath}/Bundles/Tester_ESBP"; + var buildParameters = new EditorSimulateBuildParameters(); - buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); + buildParameters.BuildOutputRoot = outputRoot; buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = EBuildPipeline.EditorSimulateBuildPipeline.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle; buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget; buildParameters.PackageName = packageName; - buildParameters.PackageVersion = "ESBP_Simulate"; + buildParameters.PackageVersion = "TestVersion"; buildParameters.FileNameStyle = EFileNameStyle.HashName; buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None; buildParameters.BuildinFileCopyParams = string.Empty; + buildParameters.ClearBuildCacheFiles = true; + buildParameters.UseAssetDependencyDB = true; var pipeline = new EditorSimulateBuildPipeline(); BuildResult buildResult = pipeline.Run(buildParameters, false); @@ -43,16 +48,20 @@ public static class TestPackageBuilder } else if (buildPipelineName == EBuildPipeline.ScriptableBuildPipeline.ToString()) { + string projectPath = EditorTools.GetProjectPath(); + string outputRoot = $"{projectPath}/Bundles/Tester_SBP"; + // 内置着色器资源包名称 var builtinShaderBundleName = GetBuiltinShaderBundleName(packageName); var buildParameters = new ScriptableBuildParameters(); - buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); + + buildParameters.BuildOutputRoot = outputRoot; buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = EBuildPipeline.ScriptableBuildPipeline.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle; buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget; buildParameters.PackageName = packageName; - buildParameters.PackageVersion = "SBP_Simulate"; + buildParameters.PackageVersion = "TestVersion"; buildParameters.EnableSharePackRule = true; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = EFileNameStyle.HashName; @@ -79,14 +88,17 @@ public static class TestPackageBuilder } else if (buildPipelineName == EBuildPipeline.BuiltinBuildPipeline.ToString()) { + string projectPath = EditorTools.GetProjectPath(); + string outputRoot = $"{projectPath}/Bundles/Tester_BBP"; + var buildParameters = new BuiltinBuildParameters(); - buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); + buildParameters.BuildOutputRoot = outputRoot; buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = EBuildPipeline.ScriptableBuildPipeline.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle; buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget; buildParameters.PackageName = packageName; - buildParameters.PackageVersion = "BBP_Simulate"; + buildParameters.PackageVersion = "TestVersion"; buildParameters.EnableSharePackRule = true; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = EFileNameStyle.HashName; @@ -112,14 +124,17 @@ public static class TestPackageBuilder } else if (buildPipelineName == EBuildPipeline.RawFileBuildPipeline.ToString()) { + string projectPath = EditorTools.GetProjectPath(); + string outputRoot = $"{projectPath}/Bundles/Tester_RFBP"; + var buildParameters = new RawFileBuildParameters(); - buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); + buildParameters.BuildOutputRoot = outputRoot; buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = EBuildPipeline.RawFileBuildPipeline.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.RawBundle; buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget; buildParameters.PackageName = packageName; - buildParameters.PackageVersion = "RFBP_Simulate"; + buildParameters.PackageVersion = "TestVersion"; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = EFileNameStyle.HashName; buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None; diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorDefine.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorDefine.cs index 11cce93d..c20e4b75 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorDefine.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorDefine.cs @@ -1,6 +1,6 @@  public class AssetBundleCollectorDefine { - public const string TestPackageName = "TestPackage"; - public const string RawPackageName = "RawPackage"; + public const string AssetBundlePackageName = "AssetBundlePackage"; + public const string RawBundlePackageName = "RawBundlePackage"; } \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorMaker.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorMaker.cs index 188ef797..826593c9 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorMaker.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/AssetBundleCollectorMaker.cs @@ -1,11 +1,4 @@ -using System; -using System.IO; -using System.Text; -using System.Collections; -using UnityEngine; -using UnityEngine.TestTools; -using YooAsset; - + public static class AssetBundleCollectorMaker { public static void MakeCollectorSettingData() @@ -14,8 +7,20 @@ public static class AssetBundleCollectorMaker // 清空旧数据 YooAsset.Editor.AssetBundleCollectorSettingData.ClearAll(); - // 创建正常文件Package - var testPackage = YooAsset.Editor.AssetBundleCollectorSettingData.CreatePackage(AssetBundleCollectorDefine.TestPackageName); + // 创建包裹配置 + CreateAssetBundlePackageCollector(); + CreateRawBundlePackageCollector(); + + // 修正配置路径为空导致的错误 + YooAsset.Editor.AssetBundleCollectorSettingData.FixFile(); +#endif + } + +#if UNITY_EDITOR + private static void CreateAssetBundlePackageCollector() + { + // 创建AssetBundlePackage + var testPackage = YooAsset.Editor.AssetBundleCollectorSettingData.CreatePackage(AssetBundleCollectorDefine.AssetBundlePackageName); testPackage.EnableAddressable = true; testPackage.AutoCollectShaders = true; testPackage.IgnoreRuleName = "NormalIgnoreRule"; @@ -103,9 +108,11 @@ public static class AssetBundleCollectorMaker collector1.PackRuleName = nameof(YooAsset.Editor.PackSeparately); YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(scriptableObjectGroup, collector1); } - - // 创建原生文件Package - var rawPackage = YooAsset.Editor.AssetBundleCollectorSettingData.CreatePackage(AssetBundleCollectorDefine.RawPackageName); + } + private static void CreateRawBundlePackageCollector() + { + // 创建RawBundlePackage + var rawPackage = YooAsset.Editor.AssetBundleCollectorSettingData.CreatePackage(AssetBundleCollectorDefine.RawBundlePackageName); rawPackage.EnableAddressable = true; rawPackage.AutoCollectShaders = true; rawPackage.IgnoreRuleName = "RawFileIgnoreRule"; @@ -131,9 +138,6 @@ public static class AssetBundleCollectorMaker collector1.PackRuleName = nameof(YooAsset.Editor.PackVideoFile); YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(videoFileGroup, collector1); } - - // 修正配置路径为空导致的错误 - YooAsset.Editor.AssetBundleCollectorSettingData.FixFile(); -#endif } +#endif } \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem.meta new file mode 100644 index 00000000..b8604bde --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4496f16afadc9b418cbbb8128272c44 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs similarity index 80% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs index 738f9455..ec69bf84 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs @@ -9,34 +9,34 @@ using UnityEngine.TestTools; using NUnit.Framework; using YooAsset; -public class EditorFileSystemTester : IPrebuildSetup, IPostBuildCleanup +public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup { - private const string EFS_TEST_PACKAGE_ROOT_KEY = "EFS_TEST_PACKAGE_ROOT_KEY"; - private const string EFS_RAW_PACKAGE_ROOT_KEY = "EFS_RAW_PACKAGE_ROOT_KEY"; + private const string ASSET_BUNDLE_PACKAGE_ROOT_KEY = "T1_ASSET_BUNDLE_PACKAGE_ROOT_KEY"; + private const string RAW_BUNDLE_PACKAGE_ROOT_KEY = "T1_RAW_BUNDLE_PACKAGE_ROOT_KEY"; void IPrebuildSetup.Setup() { #if UNITY_EDITOR - // 构建TestPackage + // 构建资源包 { - var simulateParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.TestPackageName); + var simulateParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.AssetBundlePackageName); simulateParams.BuildPipelineName = "EditorSimulateBuildPipeline"; simulateParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; simulateParams.InvokeClassFullName = "TestPackageBuilder"; simulateParams.InvokeMethodName = "BuildPackage"; var simulateResult = PakcageInvokeBuilder.InvokeBuilder(simulateParams); - UnityEditor.EditorPrefs.SetString(EFS_TEST_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); + UnityEditor.EditorPrefs.SetString(ASSET_BUNDLE_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } - // 构建RawPackage + // 构建资源包 { - var simulateParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.RawPackageName); + var simulateParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.RawBundlePackageName); simulateParams.BuildPipelineName = "EditorSimulateBuildPipeline"; simulateParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; simulateParams.InvokeClassFullName = "TestPackageBuilder"; simulateParams.InvokeMethodName = "BuildPackage"; var simulateResult = PakcageInvokeBuilder.InvokeBuilder(simulateParams); - UnityEditor.EditorPrefs.SetString(EFS_RAW_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); + UnityEditor.EditorPrefs.SetString(RAW_BUNDLE_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } #endif } @@ -45,48 +45,18 @@ public class EditorFileSystemTester : IPrebuildSetup, IPostBuildCleanup } [UnityTest] - public IEnumerator DestroyPackage() + public IEnumerator A_InitializePackage() { - // 销毁旧资源包 - { - var package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); - var destroyOp = package.DestroyAsync(); - yield return destroyOp; - if (destroyOp.Status != EOperationStatus.Succeed) - Debug.LogError(destroyOp.Error); - Assert.AreEqual(EOperationStatus.Succeed, destroyOp.Status); - - bool result = YooAssets.RemovePackage(AssetBundleCollectorDefine.TestPackageName); - Assert.IsTrue(result); - } - - // 销毁旧资源包 - { - var package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawPackageName); - var destroyOp = package.DestroyAsync(); - yield return destroyOp; - if (destroyOp.Status != EOperationStatus.Succeed) - Debug.LogError(destroyOp.Error); - Assert.AreEqual(EOperationStatus.Succeed, destroyOp.Status); - - bool result = YooAssets.RemovePackage(AssetBundleCollectorDefine.RawPackageName); - Assert.IsTrue(result); - } - } - - [UnityTest] - public IEnumerator InitializePackage() - { - // 初始化TestPackage + // 初始化资源包 { string packageRoot = string.Empty; #if UNITY_EDITOR - packageRoot = UnityEditor.EditorPrefs.GetString(EFS_TEST_PACKAGE_ROOT_KEY); + packageRoot = UnityEditor.EditorPrefs.GetString(ASSET_BUNDLE_PACKAGE_ROOT_KEY); #endif if (Directory.Exists(packageRoot) == false) throw new Exception($"Not found package root : {packageRoot}"); - var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.TestPackageName); + var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.AssetBundlePackageName); // 初始化资源包 var initParams = new EditorSimulateModeParameters(); @@ -112,16 +82,16 @@ public class EditorFileSystemTester : IPrebuildSetup, IPostBuildCleanup Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); } - // 初始化RawPackage + // 初始化资源包 { string packageRoot = string.Empty; #if UNITY_EDITOR - packageRoot = UnityEditor.EditorPrefs.GetString(EFS_RAW_PACKAGE_ROOT_KEY); + packageRoot = UnityEditor.EditorPrefs.GetString(RAW_BUNDLE_PACKAGE_ROOT_KEY); #endif if (Directory.Exists(packageRoot) == false) throw new Exception($"Not found package root : {packageRoot}"); - var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.RawPackageName); + var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.RawBundlePackageName); // 初始化资源包 var initParams = new EditorSimulateModeParameters(); @@ -149,65 +119,95 @@ public class EditorFileSystemTester : IPrebuildSetup, IPostBuildCleanup } [UnityTest] - public IEnumerator TestLoadAsyncTask() + public IEnumerator B_TestLoadAsyncTask() { var tester = new TestLoadPanel(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadAudio() + public IEnumerator B_TestLoadAudio() { var tester = new TestLoadAudio(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadImage() + public IEnumerator B_TestLoadImage() { var tester = new TestLoadImage(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadPrefab() + public IEnumerator B_TestLoadPrefab() { var tester = new TestLoadPrefab(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadScene() + public IEnumerator B_TestLoadScene() { var tester = new TestLoadScene(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadScriptableObject() + public IEnumerator B_TestLoadScriptableObject() { var tester = new TestLoadScriptableObject(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadSpriteAtlas() + public IEnumerator B_TestLoadSpriteAtlas() { var tester = new TestLoadSpriteAtlas(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadRawFile() + public IEnumerator B_TestLoadRawFile() { var tester = new TestLoadRawFile(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadVideo() + public IEnumerator B_TestLoadVideo() { var tester = new TestLoadVideo(); yield return tester.RuntimeTester(); } + + [UnityTest] + public IEnumerator C_DestroyPackage() + { + // 销毁旧资源包 + { + var package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); + var destroyOp = package.DestroyAsync(); + yield return destroyOp; + if (destroyOp.Status != EOperationStatus.Succeed) + Debug.LogError(destroyOp.Error); + Assert.AreEqual(EOperationStatus.Succeed, destroyOp.Status); + + bool result = YooAssets.RemovePackage(AssetBundleCollectorDefine.AssetBundlePackageName); + Assert.IsTrue(result); + } + + // 销毁旧资源包 + { + var package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawBundlePackageName); + var destroyOp = package.DestroyAsync(); + yield return destroyOp; + if (destroyOp.Status != EOperationStatus.Succeed) + Debug.LogError(destroyOp.Error); + Assert.AreEqual(EOperationStatus.Succeed, destroyOp.Status); + + bool result = YooAssets.RemovePackage(AssetBundleCollectorDefine.RawBundlePackageName); + Assert.IsTrue(result); + } + } } \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem.meta new file mode 100644 index 00000000..094ab1d9 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c31d2ca48714ce4882e877397f638b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/T2_TestBuldinFileSystem.cs similarity index 68% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/T2_TestBuldinFileSystem.cs index 165cba77..4a2fd2bc 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/T2_TestBuldinFileSystem.cs @@ -9,54 +9,54 @@ using UnityEngine.TestTools; using NUnit.Framework; using YooAsset; -public class BuildinFileSystemTester : IPrebuildSetup, IPostBuildCleanup +public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup { - private const string BFS_TEST_PACKAGE_ROOT_KEY = "BFS_TEST_PACKAGE_ROOT_KEY"; - private const string BFS_RAW_PACKAGE_ROOT_KEY = "BFS_RAW_PACKAGE_ROOT_KEY"; + private const string ASSET_BUNDLE_PACKAGE_ROOT_KEY = "T2_ASSET_BUNDLE_PACKAGE_ROOT_KEY"; + private const string RAW_BUNDLE_PACKAGE_ROOT_KEY = "T2_RAW_BUNDLE_PACKAGE_ROOT_KEY"; void IPrebuildSetup.Setup() { #if UNITY_EDITOR - // 构建TestPackage + // 构建AssetBundlePackage { - var buildParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.TestPackageName); + var buildParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.AssetBundlePackageName); buildParams.BuildPipelineName = "ScriptableBuildPipeline"; buildParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; buildParams.InvokeClassFullName = "TestPackageBuilder"; buildParams.InvokeMethodName = "BuildPackage"; var simulateResult = PakcageInvokeBuilder.InvokeBuilder(buildParams); - UnityEditor.EditorPrefs.SetString(BFS_TEST_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); + UnityEditor.EditorPrefs.SetString(ASSET_BUNDLE_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } - // 构建RawPackage + // 构建RawBundlePackage { - var buildParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.RawPackageName); + var buildParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.RawBundlePackageName); buildParams.BuildPipelineName = "RawFileBuildPipeline"; buildParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; buildParams.InvokeClassFullName = "TestPackageBuilder"; buildParams.InvokeMethodName = "BuildPackage"; var simulateResult = PakcageInvokeBuilder.InvokeBuilder(buildParams); - UnityEditor.EditorPrefs.SetString(BFS_RAW_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); + UnityEditor.EditorPrefs.SetString(RAW_BUNDLE_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } #endif } void IPostBuildCleanup.Cleanup() { } - + [UnityTest] - public IEnumerator InitializePackage() + public IEnumerator A_InitializePackage() { - // 初始化TestPackage + // 初始化资源包 { string packageRoot = string.Empty; #if UNITY_EDITOR - packageRoot = UnityEditor.EditorPrefs.GetString(BFS_TEST_PACKAGE_ROOT_KEY); + packageRoot = UnityEditor.EditorPrefs.GetString(ASSET_BUNDLE_PACKAGE_ROOT_KEY); #endif if (Directory.Exists(packageRoot) == false) throw new Exception($"Not found package root : {packageRoot}"); - var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.TestPackageName); + var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.AssetBundlePackageName); // 初始化资源包 var initParams = new OfflinePlayModeParameters(); @@ -82,16 +82,16 @@ public class BuildinFileSystemTester : IPrebuildSetup, IPostBuildCleanup Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); } - // 初始化RawPackage + // 初始化资源包 { string packageRoot = string.Empty; #if UNITY_EDITOR - packageRoot = UnityEditor.EditorPrefs.GetString(BFS_RAW_PACKAGE_ROOT_KEY); + packageRoot = UnityEditor.EditorPrefs.GetString(RAW_BUNDLE_PACKAGE_ROOT_KEY); #endif if (Directory.Exists(packageRoot) == false) throw new Exception($"Not found package root : {packageRoot}"); - var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.RawPackageName); + var package = YooAssets.CreatePackage(AssetBundleCollectorDefine.RawBundlePackageName); // 初始化资源包 var initParams = new OfflinePlayModeParameters(); @@ -120,65 +120,95 @@ public class BuildinFileSystemTester : IPrebuildSetup, IPostBuildCleanup } [UnityTest] - public IEnumerator TestLoadAsyncTask() + public IEnumerator B_TestLoadAsyncTask() { var tester = new TestLoadPanel(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadAudio() + public IEnumerator B_TestLoadAudio() { var tester = new TestLoadAudio(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadImage() + public IEnumerator B_TestLoadImage() { var tester = new TestLoadImage(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadPrefab() + public IEnumerator B_TestLoadPrefab() { var tester = new TestLoadPrefab(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadScene() + public IEnumerator B_TestLoadScene() { var tester = new TestLoadScene(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadScriptableObject() + public IEnumerator B_TestLoadScriptableObject() { var tester = new TestLoadScriptableObject(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadSpriteAtlas() + public IEnumerator B_TestLoadSpriteAtlas() { var tester = new TestLoadSpriteAtlas(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadRawFile() + public IEnumerator B_TestLoadRawFile() { var tester = new TestLoadRawFile(); yield return tester.RuntimeTester(); } [UnityTest] - public IEnumerator TestLoadVideo() + public IEnumerator B_TestLoadVideo() { var tester = new TestLoadVideo(); yield return tester.RuntimeTester(); } + + [UnityTest] + public IEnumerator C_DestroyPackage() + { + // 销毁旧资源包 + { + var package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); + var destroyOp = package.DestroyAsync(); + yield return destroyOp; + if (destroyOp.Status != EOperationStatus.Succeed) + Debug.LogError(destroyOp.Error); + Assert.AreEqual(EOperationStatus.Succeed, destroyOp.Status); + + bool result = YooAssets.RemovePackage(AssetBundleCollectorDefine.AssetBundlePackageName); + Assert.IsTrue(result); + } + + // 销毁旧资源包 + { + var package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawBundlePackageName); + var destroyOp = package.DestroyAsync(); + yield return destroyOp; + if (destroyOp.Status != EOperationStatus.Succeed) + Debug.LogError(destroyOp.Error); + Assert.AreEqual(EOperationStatus.Succeed, destroyOp.Status); + + bool result = YooAssets.RemovePackage(AssetBundleCollectorDefine.RawBundlePackageName); + Assert.IsTrue(result); + } + } } \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/T2_TestBuldinFileSystem.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/T2_TestBuldinFileSystem.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem.meta new file mode 100644 index 00000000..43b5f5b3 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 967f41aa15e95ec4ebf41cbac0f0aafb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CacheFileSystemTester.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem/T3_TestCacheFileSystem.cs similarity index 80% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/CacheFileSystemTester.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem/T3_TestCacheFileSystem.cs index b2cd6116..d3529e39 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/CacheFileSystemTester.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem/T3_TestCacheFileSystem.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.TestTools; using YooAsset; -public class CacheFileSystemTester : IPrebuildSetup, IPostBuildCleanup +public class T3_TestCacheFileSystem : IPrebuildSetup, IPostBuildCleanup { public void Setup() { diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CacheFileSystemTester.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem/T3_TestCacheFileSystem.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/CacheFileSystemTester.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/T3_TestCacheFileSystem/T3_TestCacheFileSystem.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.meta new file mode 100644 index 00000000..862d8bdd --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4fe5a148d03f71e49bd1ce0b9faf81a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption/TestEncryption.cs similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption/TestEncryption.cs diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption/TestEncryption.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestEncryption/TestEncryption.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset.meta new file mode 100644 index 00000000..61b48928 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fcd7851bb8b7d34eb3684c8dbdd99f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAudio.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadAudio.cs similarity index 97% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAudio.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadAudio.cs index 5c513e28..23563d7c 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAudio.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadAudio.cs @@ -13,7 +13,7 @@ public class TestLoadAudio { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); // 音乐异步加载 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAudio.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadAudio.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAudio.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadAudio.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadImage.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadImage.cs similarity index 96% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadImage.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadImage.cs index f3ee3684..2ff37de1 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadImage.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadImage.cs @@ -13,7 +13,7 @@ public class TestLoadImage { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); // 异步加载子对象 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadImage.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadImage.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadImage.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadImage.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPanel.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPanel.cs similarity index 96% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPanel.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPanel.cs index bdb48a42..3e966883 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPanel.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPanel.cs @@ -14,7 +14,7 @@ public class TestLoadPanel { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); // 异步加载面板 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPanel.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPanel.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPanel.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPanel.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPrefab.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPrefab.cs similarity index 97% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPrefab.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPrefab.cs index ad8ebe12..55afc807 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPrefab.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPrefab.cs @@ -13,7 +13,7 @@ public class TestLoadPrefab { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); // 异步加载所有预制体 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPrefab.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPrefab.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadPrefab.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadPrefab.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadRawFile.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadRawFile.cs similarity index 97% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadRawFile.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadRawFile.cs index 8770d432..97d70b93 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadRawFile.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadRawFile.cs @@ -13,7 +13,7 @@ public class TestLoadRawFile { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawBundlePackageName); Assert.IsNotNull(package); // 测试异步加载 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadRawFile.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadRawFile.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadRawFile.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadRawFile.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScene.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScene.cs similarity index 97% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScene.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScene.cs index d8e42eee..1e009389 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScene.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScene.cs @@ -14,7 +14,7 @@ public class TestLoadScene { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); // 异步加载主场景 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScene.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScene.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScene.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScene.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScriptableObject.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScriptableObject.cs similarity index 96% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScriptableObject.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScriptableObject.cs index 475f24b3..30aed136 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScriptableObject.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScriptableObject.cs @@ -13,7 +13,7 @@ public class TestLoadScriptableObject { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); // 异步加载序列化对象 diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScriptableObject.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScriptableObject.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadScriptableObject.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadScriptableObject.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadSpriteAtlas.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadSpriteAtlas.cs similarity index 95% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadSpriteAtlas.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadSpriteAtlas.cs index a1142ea1..6515fac3 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadSpriteAtlas.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadSpriteAtlas.cs @@ -13,7 +13,7 @@ public class TestLoadSpriteAtlas { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.TestPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.AssetBundlePackageName); Assert.IsNotNull(package); var assetHandle = package.LoadAssetAsync("atlas_icon"); diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadSpriteAtlas.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadSpriteAtlas.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadSpriteAtlas.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadSpriteAtlas.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadVideo.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadVideo.cs similarity index 96% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadVideo.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadVideo.cs index 807d02bc..700088b9 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadVideo.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadVideo.cs @@ -14,7 +14,7 @@ public class TestLoadVideo { public IEnumerator RuntimeTester() { - ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawPackageName); + ResourcePackage package = YooAssets.GetPackage(AssetBundleCollectorDefine.RawBundlePackageName); Assert.IsNotNull(package); var rawFileHandle = package.LoadRawFileAsync("video_logo"); diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadVideo.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadVideo.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadVideo.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestLoadVideo.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestScriptableObject.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestScriptableObject.cs similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestScriptableObject.cs rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestScriptableObject.cs diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/TestScriptableObject.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestScriptableObject.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Runtime/TestScriptableObject.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Runtime/TestLoadAsset/TestScriptableObject.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2.meta new file mode 100644 index 00000000..f21d843e --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4c74c63688b77743b853b255a5fb853 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA.meta new file mode 100644 index 00000000..6e36c4bf --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26b9f7e0454f2bc4a84b44a018075d8f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA/PanelA.prefab b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA/PanelA.prefab new file mode 100644 index 00000000..f369723d --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA/PanelA.prefab @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4681025877766398847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 803375445599620493} + - component: {fileID: 5200708881923248931} + - component: {fileID: 6178648831511584876} + m_Layer: 0 + m_Name: PanelA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &803375445599620493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681025877766398847} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5.186572} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.1263859, y: -1.2676215} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5200708881923248931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681025877766398847} + m_CullTransparentMesh: 1 +--- !u!114 &6178648831511584876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681025877766398847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 5b64055494366334a84ebd727ead0d35, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA/PanelA.prefab.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA/PanelA.prefab.meta new file mode 100644 index 00000000..8d074737 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelA/PanelA.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c63a6c560454b9b40bff09c244180d51 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage.meta new file mode 100644 index 00000000..6bc54049 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa7f70ef09d60844ba62f85ff2414a9c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage/panel_a_image.png b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage/panel_a_image.png new file mode 100644 index 00000000..801fe7d9 Binary files /dev/null and b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage/panel_a_image.png differ diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage/panel_a_image.png.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage/panel_a_image.png.meta new file mode 100644 index 00000000..88896579 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelAImage/panel_a_image.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 64d0e9fc6f94191429df4f295bdbb7f1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB.meta new file mode 100644 index 00000000..148ee0c8 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5cace4be4d008e408c0738f157708a0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB/PanelB.prefab b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB/PanelB.prefab new file mode 100644 index 00000000..0382e201 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB/PanelB.prefab @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4681025877766398847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 803375445599620493} + - component: {fileID: 9119719132009767594} + - component: {fileID: 8951156678157791856} + m_Layer: 0 + m_Name: PanelB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &803375445599620493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681025877766398847} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5.186572} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.1263859, y: -1.2676215} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9119719132009767594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681025877766398847} + m_CullTransparentMesh: 1 +--- !u!114 &8951156678157791856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681025877766398847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 98e7bdd86b945194a818097dd192453c, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB/PanelB.prefab.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB/PanelB.prefab.meta new file mode 100644 index 00000000..ce4ada81 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelB/PanelB.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8d758e0d9489eee47ab6ec8eb6dcb0cc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage.meta new file mode 100644 index 00000000..594454c0 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96d800f068cc69c4dbd20ffdcec40920 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage/panel_b_image.png b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage/panel_b_image.png new file mode 100644 index 00000000..c3079672 Binary files /dev/null and b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage/panel_b_image.png differ diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage/panel_b_image.png.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage/panel_b_image.png.meta new file mode 100644 index 00000000..c709e03a --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelBImage/panel_b_image.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 2e73ddc5cb79dce449188644f88ea6df +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat.meta new file mode 100644 index 00000000..32ce863f --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4264f3aa222d7f548a028d6c3411b1b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_a_mat.mat b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_a_mat.mat new file mode 100644 index 00000000..96ed8be4 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_a_mat.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: panel_a_mat + m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 64d0e9fc6f94191429df4f295bdbb7f1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_a_mat.mat.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_a_mat.mat.meta new file mode 100644 index 00000000..13ddb608 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_a_mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b64055494366334a84ebd727ead0d35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_b_mat.mat b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_b_mat.mat new file mode 100644 index 00000000..61315ad6 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_b_mat.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: panel_b_mat + m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2e73ddc5cb79dce449188644f88ea6df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_b_mat.mat.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_b_mat.mat.meta new file mode 100644 index 00000000..f062d61c --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes2/PanelMat/panel_b_mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98e7bdd86b945194a818097dd192453c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: