Merge pull request #6149 from decentraland/release/2025-11-11

release: 2025-11-11

Author: anicalbano

.github/workflows/test.yml

@@ -25,7 +25,7 @@ env:
   UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
   UNITY_LICENSE: ${{ secrets.UNITY_PERSONAL_LICENSE }}
   UNITY_IMAGE_FLAVOR: linux-il2cpp
-  UNITY_IMAGE_VERSION: 3.1.0
+  UNITY_IMAGE_VERSION: 3.2.0
   GHCR_IMAGE_NAME: unityci-editor
 
 concurrency:

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

@@ -15,6 +15,12 @@ MonoBehaviour:
   m_GroupName: Localization-Assets-English (en)
   m_GUID: bbf196456d6041d4e9cb25f216e21f0c
   m_SerializeEntries:
+  - m_GUID: 210b7be0b68974749a69a635945ff9f2
+    m_Address: MusicFestival
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 2475d2ea34b451047936aaecb0ef9ad3
     m_Address: Assets/DCL/SceneLoadingScreens/Assets/Textures/BringYourVibe.png
     m_ReadOnly: 1

Explorer/Assets/DCL/Audio/Systems/LandscapeAudioCullingSystem.cs

@@ -26,7 +26,6 @@ namespace DCL.Audio.Systems
     /// </summary>
     [LogCategory(ReportCategory.AUDIO)]
     [UpdateInGroup(typeof(PresentationSystemGroup))]
-    [UpdateAfter(typeof(LandscapeTerrainCullingSystem))]
     public partial class LandscapeAudioCullingSystem : BaseUnityLoopSystem
     {
         private readonly TerrainGenerator terrainGenerator;

Explorer/Assets/DCL/AuthenticationScreenFlow/AuthenticationScreenController.cs

@@ -16,6 +16,7 @@
 using DCL.SceneLoadingScreens.SplashScreen;
 using DCL.Settings.Utils;
 using DCL.UI;
+using Global.AppArgs;
 using DCL.Utilities;
 using DCL.Web3;
 using DCL.Web3.Authenticators;
@@ -61,9 +62,6 @@ private enum ViewState
         }
 
         private const int ANIMATION_DELAY = 300;
-        private const float WINDOWED_RESOLUTION_RESIZE_COEFFICIENT = .75f;
-        private const int MAX_WINDOWED_WIDTH = 2560;
-        private const FullScreenMode DEFAULT_SCREEN_MODE = FullScreenMode.FullScreenWindow;
 
         private const string REQUEST_BETA_ACCESS_LINK = "https://68zbqa0m12c.typeform.com/to/y9fZeNWm";
 
@@ -81,6 +79,7 @@ private enum ViewState
         private readonly List<Resolution> possibleResolutions = new ();
         private readonly AudioClipConfig backgroundMusic;
         private readonly SentryTransactionManager sentryTransactionManager;
+        private readonly IAppArgs appArgs;
 
         private const string LOADING_TRANSACTION_NAME = "loading_process";
 
@@ -112,7 +111,8 @@ public AuthenticationScreenController(
             AuthScreenEmotesSettings emotesSettings,
             IInputBlock inputBlock,
             AudioClipConfig backgroundMusic,
-            SentryTransactionManager sentryTransactionManager)
+            SentryTransactionManager sentryTransactionManager,
+            IAppArgs appArgs)
             : base(viewFactory)
         {
             this.web3Authenticator = web3Authenticator;
@@ -129,6 +129,7 @@ public AuthenticationScreenController(
             this.inputBlock = inputBlock;
             this.backgroundMusic = backgroundMusic;
             this.sentryTransactionManager = sentryTransactionManager;
+            this.appArgs = appArgs;
 
             possibleResolutions.AddRange(ResolutionUtils.GetAvailableResolutions());
         }
@@ -319,7 +320,7 @@ private void StartLoginFlowUntilEnd()
 
             // Checks the current screen mode because it could have been overridden with Alt+Enter
             if (Screen.fullScreenMode != FullScreenMode.Windowed)
-                ForceResolutionAndWindowedMode();
+                WindowModeUtils.ApplyWindowedMode();
 
             loginCancellationToken = new CancellationTokenSource();
             StartLoginFlowUntilEndAsync(loginCancellationToken.Token).Forget();
@@ -593,66 +594,13 @@ private static void ResetAnimator(Animator animator)
             animator.gameObject.SetActive(false);
         }
 
-        private void ForceResolutionAndWindowedMode()
-        {
-            Resolution current = Screen.currentResolution;
-
-            // To avoid ultra-wide window on ultra-wide screens
-            int targetWidth = Mathf.Min((int)(current.width * WINDOWED_RESOLUTION_RESIZE_COEFFICIENT), MAX_WINDOWED_WIDTH);
-            int targetHeight = (int)(current.height * WINDOWED_RESOLUTION_RESIZE_COEFFICIENT);
-
-            Screen.SetResolution(targetWidth, targetHeight, FullScreenMode.Windowed, current.refreshRateRatio);
-        }
-
         private void RestoreResolutionAndScreenMode()
         {
-            Resolution targetResolution = GetTargetResolution();
-            FullScreenMode targetScreenMode = GetTargetScreenMode();
+            Resolution targetResolution = WindowModeUtils.GetTargetResolution(possibleResolutions);
+            FullScreenMode targetScreenMode = WindowModeUtils.GetTargetScreenMode(appArgs.HasFlag(AppArgsFlags.WINDOWED_MODE));
             Screen.SetResolution(targetResolution.width, targetResolution.height, targetScreenMode, targetResolution.refreshRateRatio);
         }
 
-        private Resolution GetTargetResolution()
-        {
-            return DCLPlayerPrefs.HasKey(DCLPrefKeys.SETTINGS_RESOLUTION)
-                ? GetSavedResolution()
-                : GetDefaultResolution();
-
-            Resolution GetSavedResolution()
-            {
-                int index = DCLPlayerPrefs.GetInt(DCLPrefKeys.SETTINGS_RESOLUTION);
-                return possibleResolutions[index];
-            }
-
-            Resolution GetDefaultResolution()
-            {
-                int defaultIndex = 0;
-
-                for (var index = 0; index < possibleResolutions.Count; index++)
-                {
-                    Resolution resolution = possibleResolutions[index];
-
-                    if (!ResolutionUtils.IsDefaultResolution(resolution))
-                        continue;
-
-                    defaultIndex = index;
-                    break;
-                }
-
-                return possibleResolutions[defaultIndex];
-            }
-        }
-
-        private FullScreenMode GetTargetScreenMode()
-        {
-            return DCLPlayerPrefs.HasKey(DCLPrefKeys.SETTINGS_WINDOW_MODE) ? GetSavedScreenMode() : DEFAULT_SCREEN_MODE;
-
-            FullScreenMode GetSavedScreenMode()
-            {
-                int index = DCLPlayerPrefs.GetInt(DCLPrefKeys.SETTINGS_WINDOW_MODE);
-                return FullscreenModeUtils.Modes[index];
-            }
-        }
-
         private void CancelLoginProcess()
         {
             loginCancellationToken?.SafeCancelAndDispose();

Explorer/Assets/DCL/AuthenticationScreenFlow/AuthenticationScreenFlow.asmdef

@@ -36,7 +36,8 @@
         "GUID:1d75b3d8691c845b1a51082e81433dfc",
         "GUID:54d33bbd50a28174e8ba0110106203c2",
         "GUID:d28a7e4beeca475418c15757abf1b6f1",
-        "GUID:4794e238ed0f65142a4aea5848b513e5"
+        "GUID:4794e238ed0f65142a4aea5848b513e5",
+        "GUID:8baf705856414dad9a73b3f382f1bc8b"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Explorer/Assets/DCL/AvatarRendering/AvatarShape/Systems/AvatarShapeVisibilitySystem.cs

@@ -54,11 +54,13 @@ protected override void Update(float t)
             AddPlayerCachedVisibilityComponentQuery(World, camera.GetCameraComponent(World));
             AddOthersCachedVisibilityComponentQuery(World);
 
+            UpdateMainPlayerVisibilityStateQuery(World, camera.GetCameraComponent(World));
             UpdateMainPlayerAvatarVisibilityOnCameraDistanceQuery(World);
             UpdateNonPlayerAvatarVisibilityOnCameraDistanceQuery(World);
             BlockAvatarsQuery(World);
             BanAvatarsQuery(World);
             UpdateAvatarsVisibilityStateQuery(World);
+            UpdateMainPlayerAvatarVisibilityStateQuery(World, camera.GetCameraComponent(World));
             GetAvatarsVisibleWithOutlineQuery(World);
         }
 
@@ -178,6 +180,43 @@ private void SetHiddenComponent(Entity entity, bool hiddenValue, HiddenPlayerCom
         }
 
         [Query]
+        private void UpdateMainPlayerVisibilityState([Data] in CameraComponent cameraComponent, ref AvatarShapeComponent avatarShape, in PlayerComponent playerComponent, ref AvatarCachedVisibilityComponent avatarCachedVisibility)
+        {
+            bool shouldBeHidden = false;
+
+            if (cameraComponent.Mode == CameraMode.FirstPerson)
+            {
+                if (cameraComponent.IsTransitioningToFirstPerson)
+                {
+                    float currentDistance = (playerComponent.CameraFocus.position - playerCamera.transform.position).magnitude;
+                    shouldBeHidden = currentDistance < startFadeDithering;
+                }
+                else
+                {
+                    shouldBeHidden = true;
+                }
+            }
+            else
+            {
+                float currentDistance = (playerComponent.CameraFocus.position - playerCamera.transform.position).magnitude;
+                shouldBeHidden = currentDistance < startFadeDithering;
+            }
+
+            UpdateVisibilityState(ref avatarShape, ref avatarCachedVisibility, shouldBeHidden);
+        }
+
+        [Query]
+        [All(typeof(PlayerComponent))]
+        private void UpdateMainPlayerAvatarVisibilityState([Data] in CameraComponent cameraComponent, in Entity entity, ref AvatarShapeComponent avatarShape, ref AvatarCachedVisibilityComponent avatarCachedVisibility)
+        {
+            if (cameraComponent.Mode == CameraMode.FirstPerson) return;
+
+            bool shouldBeHidden = avatarShape.HiddenByModifierArea || World.Has<HiddenPlayerComponent>(entity);
+            UpdateVisibilityState(ref avatarShape, ref avatarCachedVisibility, shouldBeHidden);
+        }
+
+        [Query]
+        [None(typeof(PlayerComponent))]
         private void UpdateAvatarsVisibilityState(in Entity entity, ref AvatarShapeComponent avatarShape, ref AvatarCachedVisibilityComponent avatarCachedVisibility)
         {
             bool shouldBeHidden = avatarShape.HiddenByModifierArea || World.Has<HiddenPlayerComponent>(entity);

Explorer/Assets/DCL/AvatarRendering/Emotes/Helpers/IEmoteStorage.cs

@@ -1,5 +1,6 @@
 using CommunicationData.URLHelpers;
 using DCL.AvatarRendering.Loading;
+using System;
 using System.Collections.Generic;
 
 namespace DCL.AvatarRendering.Emotes
@@ -8,5 +9,6 @@ public interface IEmoteStorage : IAvatarElementStorage<IEmote, EmoteDTO>
     {
         List<URN> EmbededURNs { get; }
         void AddEmbeded(URN urn, IEmote emote);
+        bool TryGetLatestTransferredAt(URN nftUrn, out DateTime latestTransferredAt);
     }
 }

Explorer/Assets/DCL/AvatarRendering/Emotes/Helpers/MemoryEmotesStorage.cs

@@ -4,6 +4,7 @@
 using DCL.Optimization.PerformanceBudgeting;
 using ECS.StreamableLoading.AudioClips;
 using ECS.StreamableLoading.Common.Components;
+using System;
 using System.Collections.Generic;
 using Utility.Multithreading;
 
@@ -122,6 +123,31 @@ public void ClearOwnedNftRegistry()
             }
         }
 
+        public bool TryGetLatestTransferredAt(URN nftUrn, out DateTime latestTransferredAt)
+        {
+            lock (lockObject)
+            {
+                if (!ownedNftsRegistry.TryGetValue(nftUrn, out Dictionary<URN, NftBlockchainOperationEntry> registry) || registry.Count == 0)
+                {
+                    latestTransferredAt = default;
+                    return false;
+                }
+
+                DateTime latestDate = DateTime.MinValue;
+                
+                foreach (var entry in registry.Values)
+                {
+                    if (entry.TransferredAt > latestDate)
+                    {
+                        latestDate = entry.TransferredAt;
+                    }
+                }
+                
+                latestTransferredAt = latestDate;
+                return true;
+            }
+        }
+
         private IEmote AddEmote(URN urn, IEmote wearable, bool qualifiedForUnloading)
         {
             emotes.Add(urn, wearable);

Explorer/Assets/DCL/AvatarRendering/Emotes/Tests/FinalizeEmoteLoadingSystemShould.cs

@@ -572,6 +572,11 @@ public void ClearOwnedNftRegistry()
             {
                 throw new NotImplementedException();
             }
+
+            public bool TryGetLatestTransferredAt(URN nftUrn, out DateTime latestTransferredAt)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         public class MockEmote : IEmote

Explorer/Assets/DCL/AvatarRendering/Wearables/Helpers/IWearableStorage.cs

@@ -1,5 +1,7 @@
-using DCL.AvatarRendering.Loading;
+using CommunicationData.URLHelpers;
+using DCL.AvatarRendering.Loading;
 using DCL.AvatarRendering.Wearables.Components;
+using System;
 
 namespace DCL.AvatarRendering.Wearables.Helpers
 {
@@ -8,5 +10,6 @@ namespace DCL.AvatarRendering.Wearables.Helpers
     /// </summary>
     public interface IWearableStorage : IAvatarElementStorage<IWearable, WearableDTO>
     {
+        bool TryGetLatestTransferredAt(URN nftUrn, out DateTime latestTransferredAt);
     }
 }