Merge pull request #5639 from decentraland/release/release-20230828

Release 2023-08-28

Author: popuz

unity-renderer/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -59,6 +59,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: d004c5b62f4364cddbf08486300adc75, type: 2}
   - {fileID: 11400000, guid: ca9e28a3bdf76514a971ee4dab74607c, type: 2}
   - {fileID: 11400000, guid: 90968b9c92a084c9c8a44c744ce97b08, type: 2}
+  - {fileID: 11400000, guid: 5b335e2b63a3fce4da2bd4f9c6045770, type: 2}
+  - {fileID: 11400000, guid: 888bff1f4e4860648a92ed3de601e6da, type: 2}
   m_BuildSettings:
     m_CompileScriptsInVirtualMode: 0
     m_CleanupStreamingAssetsAfterBuilds: 1

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Duplicate Asset Isolation1.asset

@@ -433,10 +433,6 @@ MonoBehaviour:
     m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/MustacheIcon.png
     m_ReadOnly: 0
     m_SerializedLabels: []
-  - m_GUID: feb17d16b84e84e55a6dc530923024ef
-    m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/Silhouette004.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
   - m_GUID: 09fd8686734544b9eb4a37d61ec2890c
     m_Address: Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Textures/ContainerCard.png
     m_ReadOnly: 0
@@ -497,10 +493,6 @@ MonoBehaviour:
     m_Address: Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Textures/CellNFTUniqueframe.png
     m_ReadOnly: 0
     m_SerializedLabels: []
-  - m_GUID: f57d8e78f64d542e098dbaf497a8b139
-    m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/Silhouette001.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
   - m_GUID: 48d5dd980b244494b9f9d9fc540e0b01
     m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/TopIcon.png
     m_ReadOnly: 0
@@ -573,10 +565,6 @@ MonoBehaviour:
     m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/ShoesIcon.png
     m_ReadOnly: 0
     m_SerializedLabels: []
-  - m_GUID: 566238cb65c3147e192bcfd9e1aa7198
-    m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/OutfitEmpty.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
   - m_GUID: 2d93daeb29e2746d8a0c30203496d9c7
     m_Address: Assets/Textures/UI/BackpackV2/BackpackTextures/CommonThumbnail.png
     m_ReadOnly: 0

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Duplicate Asset Isolation2.asset

@@ -0,0 +1,53 @@
+%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: Duplicate Asset Isolation2
+  m_EditorClassIdentifier: 
+  m_GroupName: Duplicate Asset Isolation2
+  m_Data:
+    m_SerializedData: []
+  m_GUID: b8d5903a8d30d2c4da68f67f1659b93f
+  m_SerializeEntries:
+  - m_GUID: 7d0f2d70494277a42b52e83bc500f6ec
+    m_Address: Assets/Rendering/Shaders/UIDefaultZTest.shader
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 4f17c4c0f7b1c414f8c8113a665a1cae
+    m_Address: Assets/DCLServices/ScreencaptureCamera/UI/Textures/Atlas/CameraReelImg.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 3eaaafb2f8b1644f28e7327602f7cfcc
+    m_Address: Assets/DCLServices/ScreencaptureCamera/UI/Textures/InWorldCameraAtlas.spriteatlas
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 9400c5d3cfd556444a0754ee1caaf7c5
+    m_Address: Assets/DCLServices/ScreencaptureCamera/UI/Textures/Atlas/KeyboardIcn.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 842fd51cf401e4651a850e7cb508ca88
+    m_Address: Assets/DCLServices/ScreencaptureCamera/UI/Textures/Atlas/ShootIcn.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 4182681c6cdabf94eaa4d78d69628883
+    m_Address: Assets/DCLServices/ScreencaptureCamera/UI/Textures/Atlas/CameraReelIcn.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: a08c897d9ace246a9bd29b9e89b04c70
+    m_Address: Assets/DCLServices/ScreencaptureCamera/UI/Textures/Atlas/WearablesIcn.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 4d8bcdf7de5bdbb4495bb53a976a64d6, type: 2}
+    - {fileID: 11400000, guid: 2be4591ca04acca41ac8f489d4c63d04, type: 2}

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Duplicate Asset Isolation2.asset.meta

@@ -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: Duplicate Asset Isolation2_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 888bff1f4e4860648a92ed3de601e6da, 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: 0f0c8053dfdfc8948bf4fe3581dcae4b
+  m_LoadPath:
+    m_Id: 1d7a2f926c51ab64086dffd3ec97813b
+  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

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Schemas/Duplicate Asset Isolation2_BundledAssetGroupSchema.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: Duplicate Asset Isolation2_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 888bff1f4e4860648a92ed3de601e6da, type: 2}
+  m_StaticContent: 1

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Schemas/Duplicate Asset Isolation2_BundledAssetGroupSchema.asset.meta

@@ -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: ScreecaptureCamera_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 5b335e2b63a3fce4da2bd4f9c6045770, 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: 0f0c8053dfdfc8948bf4fe3581dcae4b
+  m_LoadPath:
+    m_Id: 1d7a2f926c51ab64086dffd3ec97813b
+  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