chore: upgrade to Unity 6000.5.4f1

Explorer/Assets/DCL/AuthenticationScreenFlow/AuthenticationScreenAudio.cs

@@ -62,7 +62,7 @@ private void OnMuteButtonClicked()
 
         private void OnContinuousAudioStarted(AudioClipConfig audioClipConfig)
         {
-            if (audioClipConfig.GetInstanceID() != backgroundMusic.GetInstanceID())
+            if (audioClipConfig != backgroundMusic)
                 return;
 
             UIAudioEventsBus.Instance.PlayContinuousUIAudioEvent -= OnContinuousAudioStarted;

Explorer/Assets/DCL/AvatarRendering/AvatarShape/Assets/DestinationMarker/DestinationMarker.prefab

@@ -79,26 +79,5 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 312425904299399983, guid: 762878a7bf3715b44ac918395f691db6, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 4300024751230198601}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: -4161369568681901532, guid: 762878a7bf3715b44ac918395f691db6, type: 3}
---- !u!1 &5359736345899209765 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 312425904299399983, guid: 762878a7bf3715b44ac918395f691db6, type: 3}
-  m_PrefabInstance: {fileID: 5635250509909053194}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &4300024751230198601
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5359736345899209765}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 81dc589d86f21784c8568883bd01920c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: AvatarShape::DCL.AvatarRendering.AvatarShape.DestinationMarkerView
-  rainbowSpeed: 2

Explorer/Assets/DCL/Chat/_Refactor/ChatServices/FallbackFontsProvider.cs

@@ -5,6 +5,7 @@
 using DCL.AssetsProvision;
 using DCL.Diagnostics;
 using TMPro;
+using UnityEngine;
 using UnityEngine.AddressableAssets;
 
 namespace DCL.Chat.ChatServices
@@ -13,12 +14,7 @@ public class FallbackFontsProvider : IDisposable
     {
         private readonly List<ProvidedAsset<TMP_FontAsset>> providedAssets = new();
 
-        public FallbackFontsProvider(IAssetsProvisioner assetsProvisioner, List<AssetReferenceT<TMP_FontAsset>> fallbackFonts, CancellationToken ct)
-        {
-            LoadAndApplyFallbacksAsync(assetsProvisioner, fallbackFonts, ct).Forget();
-        }
-
-        private async UniTask LoadAndApplyFallbacksAsync(IAssetsProvisioner assetsProvisioner, List<AssetReferenceT<TMP_FontAsset>> fallbackFonts, CancellationToken ct)
+        public async UniTask LoadAndApplyFallbacksAsync(IAssetsProvisioner assetsProvisioner, List<AssetReferenceT<TMP_FontAsset>> fallbackFonts, CancellationToken ct)
         {
             try
             {
@@ -28,12 +24,19 @@ private async UniTask LoadAndApplyFallbacksAsync(IAssetsProvisioner assetsProvis
                 if (ct.IsCancellationRequested) return;
 
                 List<TMP_FontAsset> fallbackList = TMP_Settings.fallbackFontAssets ?? new List<TMP_FontAsset>();
+                bool addedAny = false;
 
                 foreach (ProvidedAsset<TMP_FontAsset> font in providedAssets)
                     if (font.Value != null && !fallbackList.Contains(font.Value))
+                    {
                         fallbackList.Add(font.Value);
+                        addedAny = true;
+                    }
 
                 TMP_Settings.fallbackFontAssets = fallbackList;
+
+                if (addedAny)
+                    RefreshLiveTexts();
             }
             catch (Exception ex)
             {
@@ -43,6 +46,18 @@ private async UniTask LoadAndApplyFallbacksAsync(IAssetsProvisioner assetsProvis
             }
         }
 
+        /// <summary>
+        ///     Text generated before the fallbacks finished loading resolved missing glyphs to spaces
+        ///     and never regenerates on its own; force those meshes to rebuild against the new chain.
+        /// </summary>
+        private static void RefreshLiveTexts()
+        {
+            TMP_Text[] liveTexts = UnityEngine.Object.FindObjectsByType<TMP_Text>(FindObjectsInactive.Exclude, FindObjectsSortMode.None);
+
+            foreach (TMP_Text text in liveTexts)
+                text.ForceMeshUpdate(false, true);
+        }
+
         public void Dispose()
         {
             foreach (ProvidedAsset<TMP_FontAsset> asset in providedAssets)

Explorer/Assets/DCL/Infrastructure/ECS/Unity/GLTFContainer/Systems/ConfigureGltfContainerColliders.cs

@@ -93,7 +93,7 @@ private static void TryInstantiateVisibleMeshesColliders(GltfContainerAsset asse
                     MeshCollider newCollider = go.AddComponent<MeshCollider>();
 
                     // TODO Jobify: can be invoked from a worker thread
-                    Physics.BakeMesh(mesh.GetInstanceID(), false);
+                    Physics.BakeMesh(mesh.GetEntityId(), false);
 
                     newCollider.sharedMesh = mesh;
 

Explorer/Assets/DCL/Infrastructure/ECS/Unity/GLTFContainer/Utils.cs

@@ -41,7 +41,7 @@ private static void CreateAndAddMeshCollider(List<SDKCollider> result, GameObjec
 
         private static MeshCollider AddMeshCollider(MeshFilter meshFilter, GameObject go)
         {
-            Physics.BakeMesh(meshFilter.sharedMesh.GetInstanceID(), false);
+            Physics.BakeMesh(meshFilter.sharedMesh.GetEntityId(), false);
             MeshCollider newCollider = go.AddComponent<MeshCollider>();
             var renderer = go.GetComponent<MeshRenderer>();
 

Explorer/Assets/DCL/Landscape/Jobs/BakeColliderMeshes.cs

@@ -8,7 +8,7 @@ namespace DCL.Landscape.Jobs
     [BurstCompile]
     public struct BakeColliderMeshes : IJobParallelFor
     {
-        [ReadOnly, DeallocateOnJobCompletion] public NativeArray<int> Meshes;
+        [ReadOnly, DeallocateOnJobCompletion] public NativeArray<EntityId> Meshes;
 
         public void Execute(int index) =>
             Physics.BakeMesh(Meshes[index], false, MeshColliderCookingOptions.UseFastMidphase);

Explorer/Assets/DCL/Landscape/Shaders/MountainLitInput.hlsl

@@ -38,7 +38,7 @@ UNITY_DOTS_INSTANCING_START(MaterialPropertyMetadata)
     UNITY_DOTS_INSTANCED_PROP(float , _Cutoff)
     UNITY_DOTS_INSTANCED_PROP(float , _Surface)
     UNITY_DOTS_INSTANCED_PROP(float , _terrainScale)
-    UNITY_DOTS_INSTANCED_PROP(float , _TerrainBounds)
+    UNITY_DOTS_INSTANCED_PROP(float4, _TerrainBounds)
     UNITY_DOTS_INSTANCED_PROP(int ,   _octaves)
     UNITY_DOTS_INSTANCED_PROP(float , _frequency)
     UNITY_DOTS_INSTANCED_PROP(float4, _TerrainMaskMap_ST)

Explorer/Assets/DCL/Landscape/Systems/CollideTerrainSystem.cs

@@ -137,11 +137,11 @@ protected override void Update(float t)
 
             vertices.Dispose();
 
-            var meshes = new NativeArray<int>(dirtyParcels.Count, Allocator.TempJob,
+            var meshes = new NativeArray<EntityId>(dirtyParcels.Count, Allocator.TempJob,
                 NativeArrayOptions.UninitializedMemory);
 
             for (int i = 0; i < dirtyParcels.Count; i++)
-                meshes[i] = dirtyParcels[i].Mesh.GetInstanceID();
+                meshes[i] = dirtyParcels[i].Mesh.GetEntityId();
 
             var bakeColliderMeshesJob = new BakeColliderMeshes() { Meshes = meshes };
             bakeColliderMeshesJob.Schedule(meshes.Length, 1).Complete();

Explorer/Assets/DCL/MapRenderer/Addressables/FavoriteMarkerObject.prefab

@@ -36,6 +36,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &3130431528363719345
 SpriteRenderer:
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -51,6 +52,11 @@ SpriteRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -72,9 +78,11 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -84,8 +92,8 @@ SpriteRenderer:
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+  m_BlendShapeWeights: []
 --- !u!1 &280034560474106658
 GameObject:
   m_ObjectHideFlags: 0
@@ -140,6 +148,11 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -161,9 +174,11 @@ MeshRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &4613185049253147113
 MonoBehaviour:
@@ -223,6 +238,7 @@ MonoBehaviour:
   m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -268,7 +284,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 401758791842004506}
-  - component: {fileID: 1894883864601518316}
   m_Layer: 27
   m_Name: FavoriteMarkerObject
   m_TagString: Untagged
@@ -293,23 +308,6 @@ Transform:
   - {fileID: 8034716064584399077}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1894883864601518316
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5678877870475829863}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15bb272396a884ff0a10daf59b896ce1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  <pivot>k__BackingField: {x: 0.5, y: 0.5}
-  <title>k__BackingField: {fileID: 4613185049253147113}
-  <renderers>k__BackingField:
-  - {fileID: 6567910634216501126}
-  - {fileID: 7726644933239631887}
 --- !u!1 &6487472922783259709
 GameObject:
   m_ObjectHideFlags: 0
@@ -344,6 +342,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &7726644933239631887
 SpriteRenderer:
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -359,6 +358,11 @@ SpriteRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -380,9 +384,11 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_Sprite: {fileID: 21300000, guid: 832e2146c0b634ff78a73d0557cbd54a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -392,8 +398,8 @@ SpriteRenderer:
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+  m_BlendShapeWeights: []
 --- !u!1 &7304045418454136099
 GameObject:
   m_ObjectHideFlags: 0
@@ -428,6 +434,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6567910634216501126
 SpriteRenderer:
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -443,6 +450,11 @@ SpriteRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -464,9 +476,11 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -476,5 +490,5 @@ SpriteRenderer:
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+  m_BlendShapeWeights: []

Explorer/Assets/DCL/MapRenderer/MapLayers/HomeMarker/HomeMarkerController.cs

@@ -183,7 +183,7 @@ public bool TryHighlightObject(GameObject gameObject, out IMapRendererMarker? ma
 		{
 			mapMarker = null;
 
-			if (gameObject.GetInstanceID() != homeMarker.MarkerObject.gameObject.GetInstanceID())
+			if (gameObject != homeMarker.MarkerObject.gameObject)
 				return false;
 
 			mapMarker = homeMarker;
@@ -194,7 +194,7 @@ public bool TryHighlightObject(GameObject gameObject, out IMapRendererMarker? ma
 
 		public bool TryDeHighlightObject(GameObject gameObject)
 		{
-			if (gameObject.GetInstanceID() != homeMarker.MarkerObject.gameObject.GetInstanceID())
+			if (gameObject != homeMarker.MarkerObject.gameObject)
 				return false;
 
 			deHighlightCt = deHighlightCt.SafeRestart();
@@ -206,7 +206,7 @@ public bool TryClickObject(GameObject gameObject, CancellationTokenSource cts, o
 		{
 			mapRenderMarker = null;
 
-			if (gameObject.GetInstanceID() != homeMarker.MarkerObject.gameObject.GetInstanceID())
+			if (gameObject != homeMarker.MarkerObject.gameObject)
 				return false;
 
 			DisplayPlacesInfoPanelAsync(CurrentCoordinates).Forget();