From e358bbf46cac6d1c7149fa1e658914e3ae485526 Mon Sep 17 00:00:00 2001 From: hevinci Date: Thu, 21 Sep 2023 17:23:31 +0800 Subject: [PATCH] update yooasset2.0 --- .../Scripts/Editor/PackageCompareWindow.cs | 2 +- .../AssetBundleCollectorConfig.xml | 7 +-- .../AssetBundleCollectorSetting.asset | 24 +--------- .../Samples~/Space Shooter/Boot.unity | 45 +------------------ 4 files changed, 5 insertions(+), 73 deletions(-) diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs index 81bf6f4..aec6750 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs @@ -115,7 +115,7 @@ namespace YooAsset.Editor // 拷贝文件列表 foreach (var bundle2 in manifest2.BundleList) { - if (manifest1.TryGetPackageBundle(bundle2.BundleName, out PackageBundle bundle1)) + if (manifest1.TryGetPackageBundleByBundleName(bundle2.BundleName, out PackageBundle bundle1)) { if (bundle2.FileHash != bundle1.FileHash) { diff --git a/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorConfig.xml b/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorConfig.xml index 41f8d2c..dae661b 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorConfig.xml +++ b/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorConfig.xml @@ -1,6 +1,6 @@  - + @@ -19,9 +19,4 @@ - - - - - \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorSetting.asset b/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorSetting.asset index b108e26..4693032 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorSetting.asset +++ b/Assets/YooAsset/Samples~/Space Shooter/AssetSetting/AssetBundleCollectorSetting.asset @@ -12,9 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 185f6993d5150494d98da50e26cb1c25, type: 3} m_Name: AssetBundleCollectorSetting m_EditorClassIdentifier: - ShowPackageView: 1 + ShowPackageView: 0 ShowEditorAlias: 0 - UniqueBundleName: 1 + UniqueBundleName: 0 Packages: - PackageName: DefaultPackage PackageDesc: @@ -107,23 +107,3 @@ MonoBehaviour: FilterRuleName: CollectAll AssetTags: UserData: - - PackageName: RawPackage - PackageDesc: - EnableAddressable: 1 - LocationToLower: 0 - IncludeAssetGUID: 0 - IgnoreDefaultType: 0 - Groups: - - GroupName: config - GroupDesc: "\u914D\u8868" - AssetTags: - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/Samples/Space Shooter/GameRes/Config - CollectorGUID: 1894d23646ddbf8479e579cc03261dde - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackRawFile - FilterRuleName: CollectAll - AssetTags: - UserData: diff --git a/Assets/YooAsset/Samples~/Space Shooter/Boot.unity b/Assets/YooAsset/Samples~/Space Shooter/Boot.unity index d39fb7a..60686d6 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/Boot.unity +++ b/Assets/YooAsset/Samples~/Space Shooter/Boot.unity @@ -184,49 +184,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 ---- !u!1 &1096367106 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1096367108} - - component: {fileID: 1096367107} - m_Layer: 0 - m_Name: Application - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1096367107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1096367106} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3cbcea01819f3d94ba5162624ad9c75f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1096367108 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1096367106} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8017086, y: 0, z: 16.699955} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1281760859 GameObject: m_ObjectHideFlags: 0 @@ -269,7 +226,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6920458660802423023 GameObject: