diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T0_InitYooAssets/T0_InitYooAssets.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T0_InitYooAssets/T0_InitYooAssets.cs index b82ea406..3d4e5980 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/T0_InitYooAssets/T0_InitYooAssets.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T0_InitYooAssets/T0_InitYooAssets.cs @@ -168,14 +168,14 @@ public class T0_InitYooAssets : IPrebuildSetup, IPostBuildCleanup collector1.CollectPath = ""; collector1.CollectorGUID = "e082d492b9da65e499cee3495be3645d"; //TestRes3/music目录 collector1.CollectorType = YooAsset.Editor.ECollectorType.MainAssetCollector; - collector1.PackRuleName = nameof(YooAsset.Editor.PackDirectory); + collector1.PackRuleName = nameof(YooAsset.Editor.PackSeparately); YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(referenceGroup, collector1); var collector2 = new YooAsset.Editor.AssetBundleCollector(); collector2.CollectPath = ""; collector2.CollectorGUID = "8c5a1726d94498e4cbe30f5f510cc796"; //TestRes3/prefab目录 collector2.CollectorType = YooAsset.Editor.ECollectorType.MainAssetCollector; - collector2.PackRuleName = nameof(YooAsset.Editor.PackDirectory); + collector2.PackRuleName = nameof(YooAsset.Editor.PackSeparately); YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(referenceGroup, collector2); } } diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestBundleEncryption.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestBundleEncryption.cs index bb297e5c..e79d870b 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestBundleEncryption.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestBundleEncryption.cs @@ -13,9 +13,22 @@ public class TestBundleEncryption ResourcePackage package = YooAssets.GetPackage(TestDefine.AssetBundlePackageName); Assert.IsNotNull(package); - // 加载音乐播放预制体 + // 异步加载音乐播放预制体 { - var assetHandle = package.LoadAssetAsync("prefab_audio"); + var assetHandle = package.LoadAssetAsync("prefab_audioA"); + yield return assetHandle; + Assert.AreEqual(EOperationStatus.Succeed, assetHandle.Status); + + var go = assetHandle.InstantiateSync(Vector3.zero, Quaternion.identity); + Assert.IsNotNull(go); + + var audioSource = go.GetComponent(); + Assert.IsNotNull(audioSource.clip); + } + + // 同步加载音乐播放预制体 + { + var assetHandle = package.LoadAssetSync("prefab_audioB"); yield return assetHandle; Assert.AreEqual(EOperationStatus.Succeed, assetHandle.Status); diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encrypt.wav b/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptA.wav similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encrypt.wav rename to Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptA.wav diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encrypt.wav.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptA.wav.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encrypt.wav.meta rename to Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptA.wav.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav b/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav new file mode 100644 index 00000000..0f66dd53 Binary files /dev/null and b/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav differ diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav.meta new file mode 100644 index 00000000..fa9b8891 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 502e4faa60c5fc441a6a8ae9a61fbf35 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 1: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + 4: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + 13: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 2 + sampleRateOverride: 44100 + compressionFormat: 7 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audio.prefab b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioA.prefab similarity index 99% rename from Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audio.prefab rename to Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioA.prefab index 60345b15..0a871f83 100644 --- a/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audio.prefab +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioA.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8364371343008149393} - component: {fileID: 7423861191467597400} m_Layer: 0 - m_Name: prefab_audio + m_Name: prefab_audioA m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audio.prefab.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioA.prefab.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audio.prefab.meta rename to Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioA.prefab.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab new file mode 100644 index 00000000..2cd614d8 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3749121449083481702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1740794871874781600} + - component: {fileID: 8364371343008149393} + - component: {fileID: 7423861191467597400} + m_Layer: 0 + m_Name: prefab_audioB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1740794871874781600 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749121449083481702} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.5441012, y: -1.4355755, z: -5.0895267} + 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} +--- !u!82 &8364371343008149393 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749121449083481702} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 502e4faa60c5fc441a6a8ae9a61fbf35, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!81 &7423861191467597400 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749121449083481702} + m_Enabled: 1 diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab.meta b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab.meta new file mode 100644 index 00000000..f4e6f314 --- /dev/null +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea7f727cf3cd1b7499c5431e766891c3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: