From 67b830b50fbf3795b38d2acf47dce692612bbfce Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 26 Feb 2026 14:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=86=E7=BB=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetSettings.asset | 3 +- .../AssetGroups/Art Resources.asset | 15 ----- .../AssetGroups/Default Local Group.asset | 5 -- .../AssetGroups/Prefabs.asset | 5 -- ...维修相关资源_BundledAssetGroupSchema.asset | 45 +++++++++++++++ ...关资源_BundledAssetGroupSchema.asset.meta | 8 +++ ...修相关资源_ContentUpdateGroupSchema.asset | 16 ++++++ ...关资源_ContentUpdateGroupSchema.asset.meta | 8 +++ .../AssetGroups/石头维修相关资源.asset | 55 +++++++++++++++++++ .../AssetGroups/石头维修相关资源.asset.meta | 8 +++ Assets/Scenes/网格测试.unity | 10 ++++ .../TimelineKit/DirectorHandler.cs | 3 +- Assets/Scripts/Utility/ConstRef.cs | 2 +- 13 files changed, 155 insertions(+), 28 deletions(-) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset.meta diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 436e533c2..75932cf58 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 09546aca93a801441859af2a811fe53b m_currentHash: serializedVersion: 2 - Hash: 23f8c5ccd7cce25d443750000db64bc9 + Hash: f270334dbf79a5d6a4822a71d1081ac2 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_BundleLocalCatalog: 0 @@ -50,6 +50,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 6ea418572850f5a4496b8bf2ea95ea43, type: 2} - {fileID: 11400000, guid: 2bd43310d2c9f7147948458ae24b7969, type: 2} - {fileID: 11400000, guid: cda52eeaeb664b94996e70b2b0e9ef69, type: 2} + - {fileID: 11400000, guid: 020f1b79a3ad37e49bbc8a07d1632736, type: 2} - {fileID: 11400000, guid: 1e521cfc13b314642b1e682e3be7ea17, type: 2} - {fileID: 11400000, guid: 62a92c74b9bd5bd439690727c1831500, type: 2} - {fileID: 11400000, guid: b593dc98ea11a484995123de77d9bf1a, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset b/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset index 073ed0558..a477477f0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset @@ -87,21 +87,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: f55dac113f9a76c44b13c06b35a5f1e8 - m_Address: "BlockPuzzle/\u65B9\u5757\u4E34\u65F6" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: b25fe1d421793884083136ddf2350717 - m_Address: "BlockPuzzle/\u8BE6\u60C5\u7F29\u7565\u56FE" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 87f269c468ac5a143a2f1a8275a34b1f - m_Address: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 57cac31cb..a3d3c00d1 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -72,11 +72,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 0519c41f06740d64390437a889eee2d9 - m_Address: "BlockPuzzle/\u6309\u94AE\u7F29\u7565\u56FE" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset b/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset index 792a5bf57..f89c19fed 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset @@ -82,11 +82,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 03e5e9a1437535042ae48b2ba034dd93 - m_Address: BlockShape - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 89fde357592cf2e44a0b73131b150869 m_Address: ActorAnimaEx m_ReadOnly: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..a9abfed35 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: "\u77F3\u5934\u7EF4\u4FEE\u76F8\u5173\u8D44\u6E90_BundledAssetGroupSchema" + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 020f1b79a3ad37e49bbc8a07d1632736, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5 + m_LoadPath: + m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..6a2291617 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4db165dddd4bb9a48a5513b1ad4cf27e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..308cf87dd --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: "\u77F3\u5934\u7EF4\u4FEE\u76F8\u5173\u8D44\u6E90_ContentUpdateGroupSchema" + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 020f1b79a3ad37e49bbc8a07d1632736, type: 2} + m_StaticContent: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..9e98da7b1 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/石头维修相关资源_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7d89a96df9ab914d93698de64734737 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset b/Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset new file mode 100644 index 000000000..06edba259 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset @@ -0,0 +1,55 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: "\u77F3\u5934\u7EF4\u4FEE\u76F8\u5173\u8D44\u6E90" + m_EditorClassIdentifier: + m_GroupName: "\u77F3\u5934\u7EF4\u4FEE\u76F8\u5173\u8D44\u6E90" + m_Data: + m_SerializedData: [] + m_GUID: 0617a1203ee702d4bad4ee95c5a5f484 + m_SerializeEntries: + - m_GUID: a541678fe3c38c645b11bb878371e602 + m_Address: "Timeline/\u5361\u6263\u9501\u5B9A" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3bd393f446c1ad24bb37d23570d508fd + m_Address: "Timeline/\u5361\u6263\u89E3\u9501" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: b25fe1d421793884083136ddf2350717 + m_Address: "BlockPuzzle/\u8BE6\u60C5\u7F29\u7565\u56FE" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 87f269c468ac5a143a2f1a8275a34b1f + m_Address: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 0519c41f06740d64390437a889eee2d9 + m_Address: "BlockPuzzle/\u6309\u94AE\u7F29\u7565\u56FE" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 03e5e9a1437535042ae48b2ba034dd93 + m_Address: BlockShape + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 4db165dddd4bb9a48a5513b1ad4cf27e, type: 2} + - {fileID: 11400000, guid: a7d89a96df9ab914d93698de64734737, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset.meta b/Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset.meta new file mode 100644 index 000000000..0ccbd1855 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/石头维修相关资源.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 020f1b79a3ad37e49bbc8a07d1632736 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/网格测试.unity b/Assets/Scenes/网格测试.unity index 716ab38ba..8bf882013 100644 --- a/Assets/Scenes/网格测试.unity +++ b/Assets/Scenes/网格测试.unity @@ -5353,6 +5353,7 @@ MonoBehaviour: m_EditorClassIdentifier: timelineName: "\u7EF4\u4FEE\u9762\u677F" director: {fileID: 1492619800} + timelineList: [] --- !u!1 &1532984430 GameObject: m_ObjectHideFlags: 0 @@ -7583,6 +7584,15 @@ MonoBehaviour: m_EditorClassIdentifier: timelineName: "\u5361\u6263\u5F00\u542F" director: {fileID: 9213599469519215930} + timelineList: + - m_AssetGUID: + m_SubObjectName: + m_SubObjectType: + m_EditorAssetChanged: 0 + - m_AssetGUID: + m_SubObjectName: + m_SubObjectType: + m_EditorAssetChanged: 0 --- !u!320 &9213599469519215930 PlayableDirector: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs b/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs index 8d12d3608..962fcda19 100644 --- a/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs +++ b/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.Playables; +using UnityEngine.AddressableAssets; namespace AibisDream { @@ -11,7 +12,7 @@ namespace AibisDream public string timelineName; [SerializeField] private PlayableDirector director; [Header("多条Timeline")] - [SerializeField] private PlayableAsset[] timelineList; + [SerializeField] private AssetReference[] timelineList; private Dictionary _timelineDict = new(); private Action _onCompleteCallback; diff --git a/Assets/Scripts/Utility/ConstRef.cs b/Assets/Scripts/Utility/ConstRef.cs index c43e24aa7..c8375a81e 100644 --- a/Assets/Scripts/Utility/ConstRef.cs +++ b/Assets/Scripts/Utility/ConstRef.cs @@ -68,7 +68,7 @@ namespace AibisDream.Utility public const string RecordPrefab = "RecordItem"; - public const string BlockShapePrefab = "BlockShape"; + public const string BlockShapePrefab = "BlockPuzzle/BlockShape"; #endregion