Merge remote-tracking branch 'refs/remotes/origin/main' into chore/an…

…alytics-login-flow-extension
decentraland · Aug 27, 2024 · fd74519 · fd74519
2 parents 8e14ec2 + 5446349
commit fd74519
Show file tree

Hide file tree

Showing 16 changed files with 206 additions and 88 deletions.
diff --git a/Explorer/Assets/DCL/AvatarRendering/DemoScripts/Systems/InstantiateRandomAvatarsSystem.cs b/Explorer/Assets/DCL/AvatarRendering/DemoScripts/Systems/InstantiateRandomAvatarsSystem.cs
@@ -299,7 +299,9 @@ private void CreateAvatar(ICharacterControllerSettings characterControllerSettin
 
             transformComp.Transform.name = $"RANDOM_AVATAR_{avatarIndex}";
 
-            CharacterController characterController = transformComp.Transform.gameObject.AddComponent<CharacterController>();
+            CharacterController characterController = transformComp.Transform.TryGetComponent<CharacterController>(out var component)
+                ? component
+                : transformComp.Transform.gameObject.AddComponent<CharacterController>();
             characterController.radius = 0.4f;
             characterController.height = 2;
             characterController.center = Vector3.up;

diff --git a/Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab b/Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab
@@ -1699,23 +1699,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 85.770004
       objectReference: {fileID: 0}
     - target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 452888844655872247, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
@@ -2383,19 +2383,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 24
       objectReference: {fileID: 0}
     - target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 4392543827313620798, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_PresetInfoIsWorld
@@ -2623,23 +2623,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 32.11
       objectReference: {fileID: 0}
     - target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 113.825005
       objectReference: {fileID: 0}
     - target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 6206568137154906387, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
@@ -2839,23 +2839,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 68.770004
       objectReference: {fileID: 0}
     - target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 7879708898242044120, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
@@ -2971,23 +2971,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 35.77
       objectReference: {fileID: 0}
     - target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 26
       objectReference: {fileID: 0}
     - target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 9086857670890158988, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
       propertyPath: m_AnchorMax.x

diff --git a/Explorer/Assets/DCL/MapRenderer/Addressables/HotUserMarkerObject.prefab b/Explorer/Assets/DCL/MapRenderer/Addressables/HotUserMarkerObject.prefab
@@ -23,6 +23,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4175020263976144273}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -31,7 +32,6 @@ Transform:
   - {fileID: 3972535992487305214}
   - {fileID: 1882238951119396974}
   m_Father: {fileID: 6490643975463183000}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6634102564137692517
 GameObject:
@@ -57,14 +57,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6634102564137692517}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8293322612040113748}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6723780352267149330
 MonoBehaviour:
@@ -79,7 +79,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   <pivot>k__BackingField: {x: 0.5, y: 0.5}
-  <spriteRenderers>k__BackingField:
+  spriteRenderers:
   - {fileID: 6574531059262994368}
   - {fileID: 6527134346746202169}
 --- !u!1 &8549977302113203150
@@ -106,13 +106,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8549977302113203150}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.45, y: 0.45, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8293322612040113748}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6574531059262994368
 SpriteRenderer:
@@ -190,13 +190,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9041844299909259778}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.026}
   m_LocalScale: {x: 0.38, y: 0.38, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8293322612040113748}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6527134346746202169
 SpriteRenderer:

diff --git a/Explorer/Assets/DCL/MapRenderer/Addressables/PinMarkerObject.prefab b/Explorer/Assets/DCL/MapRenderer/Addressables/PinMarkerObject.prefab
@@ -193,7 +193,7 @@ Transform:
   m_GameObject: {fileID: 3043011415193787519}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.6, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

diff --git a/Explorer/Assets/DCL/MapRenderer/ComponentsFactory/HotUsersMarkersInstaller.cs b/Explorer/Assets/DCL/MapRenderer/ComponentsFactory/HotUsersMarkersInstaller.cs
@@ -4,6 +4,7 @@
 using DCL.MapRenderer.Culling;
 using DCL.MapRenderer.MapLayers;
 using DCL.MapRenderer.MapLayers.Users;
+using DCL.MapRenderer.MapLayers.UsersMarker;
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
@@ -50,10 +51,7 @@ IHotUserMarker CreateWrap() =>
         private static HotUserMarkerObject CreatePoolMethod(MapRendererConfiguration configuration, HotUserMarkerObject prefab, ICoordsUtils coordsUtils)
         {
             HotUserMarkerObject markerObject = Object.Instantiate(prefab, configuration.HotUserMarkersRoot);
-
-            for (var i = 0; i < markerObject.spriteRenderers.Length; i++)
-                markerObject.spriteRenderers[i].sortingOrder = MapRendererDrawOrder.HOT_USER_MARKERS;
-
+            markerObject.UpdateSortOrder(MapRendererDrawOrder.HOT_USER_MARKERS);
             coordsUtils.SetObjectScale(markerObject);
             return markerObject;
         }

diff --git a/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp b/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp
@@ -0,0 +1 @@
+-nullable:enable
diff --git a/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp.meta b/Explorer/Assets/DCL/MapRenderer/ConsumerUtils/csc.rsp.meta
diff --git a/Explorer/Assets/DCL/MapRenderer/IMapRendererSettings.cs b/Explorer/Assets/DCL/MapRenderer/IMapRendererSettings.cs
@@ -7,6 +7,7 @@
 using DCL.MapRenderer.MapLayers.PlayerMarker;
 using DCL.MapRenderer.MapLayers.PointsOfInterest;
 using DCL.MapRenderer.MapLayers.Users;
+using DCL.MapRenderer.MapLayers.UsersMarker;
 using System;
 using UnityEngine;
 

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/Pins/PinMarker.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/Pins/PinMarker.cs
@@ -18,7 +18,7 @@ internal class PinMarker : IPinMarker
         private readonly IMapCullingController cullingController;
 
         private MapMarkerPoolableBehavior<PinMarkerObject> poolableBehavior;
-        private float currentNewScale;
+        private float currentNewScale = MINIMAP_MIN_SIZE_FOR_PIN;
         private CancellationTokenSource pulseCancellationTokenSource;
         private CancellationTokenSource selectionCancellationTokenSource;
 

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/Pins/PinMarkerObject.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/Pins/PinMarkerObject.cs
@@ -8,6 +8,7 @@ namespace DCL.MapRenderer.MapLayers.Pins
     public class PinMarkerObject : MapRendererMarkerBase
     {
         private const int SPRITE_SIZE = 36;
+        private static readonly Vector3 setAsDestinationPosition = new (0,0.6f,0);
         [field: SerializeField] internal SpriteRenderer mapPinIcon { get; private set; }
         [field: SerializeField] internal SpriteRenderer mapPinIconOutline { get; private set; }
         [field: SerializeField] internal SpriteRenderer[] renderers { get; private set; }
@@ -16,6 +17,7 @@ public class PinMarkerObject : MapRendererMarkerBase
         [field: SerializeField] internal Transform selectionScalingParent { get; private set; }
         [field: SerializeField] internal Transform pulseScalingParent { get; private set; }
 
+
         public void SetScale(float newScale)
         {
             transform.localScale = new Vector3(newScale, newScale, 1f);
@@ -28,6 +30,7 @@ public void SetTexture(Texture2D texture)
 
         public void SetAsDestination(bool isDestination)
         {
+            pulseScalingParent.localPosition = isDestination ? setAsDestinationPosition : Vector3.zero;
             destinationBackground.SetActive(isDestination);
             destinationAnimationElipse.SetActive(isDestination);
         }

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarker.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarker.cs
@@ -1,8 +1,6 @@
-using Cysharp.Threading.Tasks;
-using DCL.MapRenderer.CommonBehavior;
+using DCL.MapRenderer.CommonBehavior;
 using DCL.MapRenderer.CoordsUtils;
-using DCL.MapRenderer.Culling;
-using System.Threading;
+using DCL.MapRenderer.MapLayers.UsersMarker;
 using UnityEngine;
 using UnityEngine.Pool;
 using Utility;

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarkerObject.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/HotUserMarkerObject.cs
@@ -1,10 +1,17 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
-namespace DCL.MapRenderer.MapLayers.Users
+namespace DCL.MapRenderer.MapLayers.UsersMarker
 {
     public class HotUserMarkerObject : MapRendererMarkerBase
     {
         [field: SerializeField]
-        internal SpriteRenderer[] spriteRenderers { get; private set; }
+        private SpriteRenderer[] spriteRenderers = Array.Empty<SpriteRenderer>();
+
+        public void UpdateSortOrder(int sortingOrder)
+        {
+            for (var i = 0; i < spriteRenderers.Length; i++)
+                spriteRenderers[i].sortingOrder = sortingOrder;
+        }
     }
 }
diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/UsersMarkersHotAreaController.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/UsersMarker/UsersMarkersHotAreaController.cs
@@ -8,6 +8,8 @@
 using DCL.CharacterPreview.Components;
 using DCL.MapRenderer.CoordsUtils;
 using DCL.MapRenderer.Culling;
+using DCL.MapRenderer.MapLayers.UsersMarker;
+using ECS.Groups;
 using ECS.LifeCycle.Components;
 using MVC;
 using System.Collections.Generic;
@@ -55,15 +57,14 @@ public void CreateSystems(ref ArchSystemsWorldBuilder<World> builder)
             untrackSystem.Activate();
         }
 
-        [All(typeof(CharacterTransform))]
-        [None(typeof(PlayerComponent), typeof(CharacterPreviewComponent))]
         [Query]
+        [None(typeof(PlayerComponent), typeof(CharacterPreviewComponent), typeof(DeleteEntityIntention))]
         private void SetPlayerMarker(in CharacterTransform transformComponent, in AvatarShapeComponent avatarShape)
         {
             if (!isEnabled)
                 return;
 
-            if(markers.TryGetValue(avatarShape.ID, out var marker))
+            if (markers.TryGetValue(avatarShape.ID, out var marker))
             {
                 marker.UpdateMarkerPosition(avatarShape.ID, transformComponent.Transform.position);
                 mapCullingController.SetTrackedObjectPositionDirty(marker);
@@ -77,7 +78,8 @@ private void SetPlayerMarker(in CharacterTransform transformComponent, in Avatar
         }
 
         [Query]
-        private void RemoveMarker(in AvatarShapeComponent avatarShape, in DeleteEntityIntention deleteEntityIntention)
+        [All(typeof(DeleteEntityIntention))]
+        private void RemoveMarker(in AvatarShapeComponent avatarShape)
         {
             if (markers.TryGetValue(avatarShape.ID, out var marker))
             {
@@ -115,6 +117,7 @@ public partial class TrackPlayersPositionSystem : ControllerECSBridgeSystem
         internal TrackPlayersPositionSystem(World world) : base(world) { }
     }
 
+    [UpdateAfter(typeof(TrackPlayersPositionSystem))]
     [UpdateInGroup(typeof(PresentationSystemGroup))]
     public partial class RemovedTrackedPlayersPositionSystem : ControllerECSBridgeSystem
     {