Merge pull request #6405 from decentraland/release/2025-12-10

release: 2025-12-10

Author: anicalbano

Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset

@@ -15,6 +15,11 @@ MonoBehaviour:
   m_GroupName: Essentials
   m_GUID: 47f803e1e9c5079449bd106df98a0b7d
   m_SerializeEntries:
+  - m_GUID: 000895e935900fa43b53faf506ee15fa
+    m_Address: Assets/DCL/AvatarRendering/Emotes/SocialEmotesSettings.asset
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 00657accebbe6c348b5208e385e5ec73
     m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/Avatar_Facial_Features.mat
     m_ReadOnly: 0
@@ -140,6 +145,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 79f752bc43a65384bab431cb6a44d8bd
+    m_Address: Assets/DCL/AvatarRendering/Emotes/UI/SocialEmoteOutcomesContextMenuSettings.asset
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 7f09a2d0d9adc4e43b67879ab9cdf360
     m_Address: LightSourcePrefab
     m_ReadOnly: 0

Explorer/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-English (en).asset

@@ -93,6 +93,12 @@ MonoBehaviour:
     m_SerializedLabels:
     - Locale-en
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f1aad3eec061f4269aa7811d2c37283e
+    m_Address: FestiveTrail_LoadingScreen
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
   m_SchemaSet:

Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset

@@ -565,6 +565,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a0f8bf40b1a14c54384029def9ea0582
+    m_Address: SocialEmotePin
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: a1d5d4f99234041159f0c215eef3eff3
     m_Address: NewNotificationPanel
     m_ReadOnly: 0

Explorer/Assets/DCL/AssetsProvision/CodeResolver/JsCodeResolver.cs

@@ -1,9 +1,11 @@
 using AssetManagement;
 using CommunicationData.URLHelpers;
 using Cysharp.Threading.Tasks;
+using DCL.Utility.Types;
 using DCL.WebRequests;
 using System.Collections.Generic;
 using System.Threading;
+using DownloadedCodeContent = UnityEngine.Networking.DownloadHandler;
 
 namespace DCL.AssetsProvision.CodeResolver
 {
@@ -19,7 +21,8 @@ public JsCodeResolver(IWebRequestController webRequestController)
             };
         }
 
-        public UniTask<string> GetCodeContent(URLAddress contentUrl, CancellationToken ct) =>
+        public UniTask<Result<DownloadedCodeContent>> GetCodeContent(
+            URLAddress contentUrl, CancellationToken ct) =>
             providers[AssetSource.WEB].GetJsCodeAsync(contentUrl, ct);
     }
 }

Explorer/Assets/DCL/AssetsProvision/CodeResolver/WebJsCodeProvider.cs

@@ -1,8 +1,11 @@
 using CommunicationData.URLHelpers;
 using Cysharp.Threading.Tasks;
 using DCL.Diagnostics;
+using DCL.Utility.Types;
 using DCL.WebRequests;
+using System;
 using System.Threading;
+using DownloadedCodeContent = UnityEngine.Networking.DownloadHandler;
 
 namespace DCL.AssetsProvision.CodeResolver
 {
@@ -15,10 +18,26 @@ public WebJsCodeProvider(IWebRequestController webRequestController)
             this.webRequestController = webRequestController;
         }
 
-        public async UniTask<string> GetJsCodeAsync(URLAddress url, CancellationToken cancellationToken = default)
+        public async UniTask<Result<DownloadedCodeContent>> GetJsCodeAsync(
+            URLAddress url, CancellationToken cancellationToken = default)
         {
-            string text = await webRequestController.GetAsync(new CommonArguments(url), cancellationToken, ReportCategory.SCENE_LOADING).StoreTextAsync();
-            return text;
+            var request = webRequestController.GetAsync(
+                new CommonArguments(url), cancellationToken,
+                ReportCategory.SCENE_LOADING);
+
+            string? contentType = await request.GetResponseHeaderAsync(
+                "Content-Type");
+
+            if (contentType != null
+                && contentType.Contains("charset",
+                    StringComparison.InvariantCultureIgnoreCase)
+                && !contentType.Contains("utf-8",
+                    StringComparison.InvariantCultureIgnoreCase))
+                return Result<DownloadedCodeContent>.ErrorResult(
+                    $"Can't handle content type {contentType}");
+
+            return Result<DownloadedCodeContent>.SuccessResult(
+                await request.ExposeDownloadHandlerAsync());
         }
     }
 }