From fe47de01d3746ac8f5a5f9cb0d8ccd6c1abbc3cd Mon Sep 17 00:00:00 2001 From: hevinci Date: Tue, 27 Sep 2022 21:32:37 +0800 Subject: [PATCH] Update samples --- .../GameRes/Scene/GameScene1.unity | 156 +------------- .../GameScript/Runtime/BootScene.cs | 3 + .../AssetBundleBuilderSetting.asset | 4 +- .../AssetBundleCollectorConfig.xml | 44 ++-- .../AssetBundleCollectorSetting.asset | 198 +++++++++--------- .../Scripts/Editor/PatchCombineWindow.cs.meta | 11 - 6 files changed, 130 insertions(+), 286 deletions(-) delete mode 100644 Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs.meta diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity index 9dd3be2..b159896 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity +++ b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity @@ -823,7 +823,6 @@ RectTransform: - {fileID: 856012950} - {fileID: 1722199052} - {fileID: 851382668} - - {fileID: 1756455456} - {fileID: 1410518846} - {fileID: 2140485207} m_Father: {fileID: 0} @@ -1031,84 +1030,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482913471} m_CullTransparentMesh: 1 ---- !u!1 &544279671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 544279672} - - component: {fileID: 544279674} - - component: {fileID: 544279673} - m_Layer: 5 - m_Name: label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &544279672 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 544279671} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1756455456} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &544279673 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 544279671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 35204a17be9c96649b254d2bad80f4dd, type: 3} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: res version ---- !u!222 &544279674 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 544279671} - m_CullTransparentMesh: 1 --- !u!1 &748725809 GameObject: m_ObjectHideFlags: 0 @@ -2739,81 +2660,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1722199051} m_CullTransparentMesh: 1 ---- !u!1 &1756455455 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1756455456} - - component: {fileID: 1756455458} - - component: {fileID: 1756455457} - m_Layer: 5 - m_Name: res_version - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1756455456 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756455455} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 544279672} - m_Father: {fileID: 421995327} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -167.48999, y: 55} - m_SizeDelta: {x: 250, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1756455457 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756455455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.227451, g: 0.5176471, b: 0.5137255, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1756455458 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756455455} - m_CullTransparentMesh: 1 --- !u!1 &1905438978 GameObject: m_ObjectHideFlags: 0 @@ -2996,7 +2842,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 421995327} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/BootScene.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/BootScene.cs index 8dc2a60..e61c90b 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/BootScene.cs +++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/BootScene.cs @@ -41,6 +41,7 @@ public class BootScene : MonoBehaviour { var createParameters = new YooAssets.EditorSimulateModeParameters(); createParameters.LocationServices = new AddressLocationServices(); + createParameters.BuildinPackageName = "DefaultPackage"; //createParameters.SimulatePatchManifestPath = GetPatchManifestPath(); yield return YooAssets.InitializeAsync(createParameters); } @@ -50,6 +51,7 @@ public class BootScene : MonoBehaviour { var createParameters = new YooAssets.OfflinePlayModeParameters(); createParameters.LocationServices = new AddressLocationServices(); + createParameters.BuildinPackageName = "DefaultPackage"; yield return YooAssets.InitializeAsync(createParameters); } @@ -58,6 +60,7 @@ public class BootScene : MonoBehaviour { var createParameters = new YooAssets.HostPlayModeParameters(); createParameters.LocationServices = new AddressLocationServices(); + createParameters.BuildinPackageName = "DefaultPackage"; createParameters.DecryptionServices = null; createParameters.ClearCacheWhenDirty = false; createParameters.DefaultHostServer = GetHostServerURL(); diff --git a/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleBuilderSetting.asset b/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleBuilderSetting.asset index dc49b58..6b3d46b 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleBuilderSetting.asset +++ b/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleBuilderSetting.asset @@ -12,9 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 09788b4733bab2d4792fdd5d28e7653c, type: 3} m_Name: AssetBundleBuilderSetting m_EditorClassIdentifier: - BuildVersion: 100 BuildPipeline: 0 - BuildMode: 0 + BuildMode: 1 + BuildPackage: DefaultPackage BuildTags: buildin; CompressOption: 2 OutputNameStyle: 1 diff --git a/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorConfig.xml b/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorConfig.xml index 17a4293..b2460ae 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorConfig.xml +++ b/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorConfig.xml @@ -1,23 +1,25 @@  - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorSetting.asset b/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorSetting.asset index 03341e2..edf7336 100644 --- a/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorSetting.asset +++ b/Assets/YooAsset/Samples~/Basic Sample/YooAssetSetting/AssetBundleCollectorSetting.asset @@ -12,102 +12,106 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 185f6993d5150494d98da50e26cb1c25, type: 3} m_Name: AssetBundleCollectorSetting m_EditorClassIdentifier: + ShowPackageView: 0 EnableAddressable: 1 - Groups: - - GroupName: Level - GroupDesc: "\u5173\u5361\u8D44\u6E90" - AssetTags: level - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Entity/Level1 - CollectorGUID: 724066efe61192e43a0d7e59166b36a4 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackSeparately - FilterRuleName: CollectPrefab - AssetTags: level1 - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Entity/Level2 - CollectorGUID: 8045c1986f0ae964f8b1ea29e3522388 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackSeparately - FilterRuleName: CollectPrefab - AssetTags: level2 - - GroupName: Buildin - GroupDesc: "\u9996\u5305\u8D44\u6E90" - AssetTags: buildin - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Scene - CollectorGUID: f75e7d64104fb1a48b849b72b84ade4c - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackSeparately - FilterRuleName: CollectScene - AssetTags: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Config - CollectorGUID: 44774abdee2b91b45b42f9dadf8c17a4 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackRawFile - FilterRuleName: CollectAll - AssetTags: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Music - CollectorGUID: e05b02ee4d90ae84a99871ce75288ea2 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - - GroupName: Panel - GroupDesc: "\u9762\u677F\u8D44\u6E90" - AssetTags: panel - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Texture - CollectorGUID: 69b046f60ca75f647b2963e0113fd779 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackCollector - FilterRuleName: CollectAll - AssetTags: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/TpAtlas - CollectorGUID: 06e38aac2570d2b4a97c6a90223e5344 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/UIPanel - CollectorGUID: 926d3203fcefdb947881a7491496e039 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/UISprite - CollectorGUID: 29f27e4abf667c04b88a3996d8cdadfc - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - - GroupName: Art - GroupDesc: "\u7F8E\u672F\u8D44\u6E90" - AssetTags: - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameArt/ShaderVariants - CollectorGUID: 00781758c26692e40a9634ddeac838be - CollectorType: 1 - AddressRuleName: AddressByFileName - PackRuleName: PackShaderVariants - FilterRuleName: CollectAll - AssetTags: - - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameArt/UIFont - CollectorGUID: 464727a15e4a7dc4d895346374432399 - CollectorType: 2 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll + Packages: + - PackageName: DefaultPackage + PackageDesc: + Groups: + - GroupName: Level + GroupDesc: "\u5173\u5361\u8D44\u6E90" + AssetTags: level + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Entity/Level1 + CollectorGUID: 724066efe61192e43a0d7e59166b36a4 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackSeparately + FilterRuleName: CollectPrefab + AssetTags: level1 + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Entity/Level2 + CollectorGUID: 8045c1986f0ae964f8b1ea29e3522388 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackSeparately + FilterRuleName: CollectPrefab + AssetTags: level2 + - GroupName: Buildin + GroupDesc: "\u9996\u5305\u8D44\u6E90" + AssetTags: buildin + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Scene + CollectorGUID: f75e7d64104fb1a48b849b72b84ade4c + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackSeparately + FilterRuleName: CollectScene + AssetTags: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Config + CollectorGUID: 44774abdee2b91b45b42f9dadf8c17a4 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackRawFile + FilterRuleName: CollectAll + AssetTags: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Music + CollectorGUID: e05b02ee4d90ae84a99871ce75288ea2 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: + - GroupName: Panel + GroupDesc: "\u9762\u677F\u8D44\u6E90" + AssetTags: panel + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/Texture + CollectorGUID: 69b046f60ca75f647b2963e0113fd779 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackCollector + FilterRuleName: CollectAll + AssetTags: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/TpAtlas + CollectorGUID: 06e38aac2570d2b4a97c6a90223e5344 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/UIPanel + CollectorGUID: 926d3203fcefdb947881a7491496e039 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameRes/UISprite + CollectorGUID: 29f27e4abf667c04b88a3996d8cdadfc + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: + - GroupName: Art + GroupDesc: "\u7F8E\u672F\u8D44\u6E90" AssetTags: + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameArt/ShaderVariants + CollectorGUID: 00781758c26692e40a9634ddeac838be + CollectorType: 1 + AddressRuleName: AddressByFileName + PackRuleName: PackShaderVariants + FilterRuleName: CollectAll + AssetTags: + - CollectPath: Assets/YooAsset/Samples/Basic Sample/GameArt/UIFont + CollectorGUID: 464727a15e4a7dc4d895346374432399 + CollectorType: 2 + AddressRuleName: AddressByFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs.meta deleted file mode 100644 index 652158b..0000000 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PatchCombineWindow.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f4c94d5687e1d884d833f88928d048c9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: