Merge branch 'main' into DamianBranch

2025-11-27 16:22:53 +01:00
parent ce2b5738a9 a915e6af3c
commit 47b04ceebc
761 changed files with 47622 additions and 2646 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
  m_Name: AddressableAssetGroupSortSettings
  m_EditorClassIdentifier: 
  sortOrder:
+  - b58f7c15a2ffcbc4483cb2bd0a0dee90
  - 21420e71d44619f468badaed8efc42a7
  - 0d5d36d6da388314b92b9c6967d23f39
  - 75e1f68b7bf77f34f8ad4aeab74d4244
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_BundledAssetGroupSchema.asset
@@ -0,0 +1,48 @@
+%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: StatueDecorations_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: fd8b6934620e3a54a818495e62a103e0, 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_StripDownloadOptions: 0
+  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: c258e2bcd3e8ac742ba98f152c0e6322
+  m_LoadPath:
+    m_Id: 88323bf0b2ef98446961cedd6232bd47
+  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_UseDefaultSchemaSettings: 0
+  m_SelectedPathPairIndex: 0
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_BundledAssetGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5acac321571c9e84f8b97709b80b77ea
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_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: StatueDecorations_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: fd8b6934620e3a54a818495e62a103e0, type: 2}
+  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/StatueDecorations_ContentUpdateGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 17c82ac3ce25c6b4e90e5e7e0e3cc941
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/StatueDecorations.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/StatueDecorations.asset
@@ -0,0 +1,83 @@
+%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: StatueDecorations
+  m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
+  m_GroupName: StatueDecorations
+  m_GUID: b58f7c15a2ffcbc4483cb2bd0a0dee90
+  m_SerializeEntries:
+  - m_GUID: 2ea75de9ff6dbfb4b8c246a654868479
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 4101d48e428899d409df02f24c83571f
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 7.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 5efa934e009bc234e920904b05db3c2f
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 2.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8819ec8b1f4910a4494755cf043636d1
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 3.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8838477f768600848813a215ab6a46fe
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 5.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a5d493c2c7c9cf74cab038023b401273
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 9.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b01ee8334ee052b4784225337e9a5ece
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 8.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b09b79db8ef15144bb2138ec59f26a9c
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 4.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ca949a6208ce5b5488e90ea3e2eed6df
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 1.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f0df83df3cff9d84ba9fd4895e5d1b58
+    m_Address: Assets/Data/Minigames/StatueDressup/TestDecorationData 6.asset
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - StatueDecorations
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 11da9bb90d9dd5848b4f7629415a6937, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 5acac321571c9e84f8b97709b80b77ea, type: 2}
+    - {fileID: 11400000, guid: 17c82ac3ce25c6b4e90e5e7e0e3cc941, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/StatueDecorations.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/StatueDecorations.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd8b6934620e3a54a818495e62a103e0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: