Merge pull request #5467 from decentraland/hotfix/ab-system-ordering

hotfix: Asset Bundle System Ordering

Author: dalkia

Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/Load/LoadWearablesByParamSystem.cs

@@ -11,13 +11,14 @@
 using DCL.Diagnostics;
 using DCL.WebRequests;
 using ECS;
+using ECS.Groups;
 using ECS.StreamableLoading.Cache;
 using System;
 using System.Collections.Generic;
 
 namespace DCL.AvatarRendering.Wearables.Systems.Load
 {
-    [UpdateInGroup(typeof(PresentationSystemGroup))]
+    [UpdateInGroup(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.WEARABLE)]
     public partial class LoadWearablesByParamSystem : LoadElementsByIntentionSystem<WearablesResponse, GetWearableByParamIntention, IWearable, WearableDTO>
     {

Explorer/Assets/DCL/AvatarRendering/Wearables/Systems/Load/LoadWearablesDTOByPointersSystem.cs

@@ -7,11 +7,12 @@
 using DCL.AvatarRendering.Wearables.Helpers;
 using DCL.Diagnostics;
 using DCL.WebRequests;
+using ECS.Groups;
 using ECS.StreamableLoading.Cache;
 
 namespace DCL.AvatarRendering.Wearables.Systems.Load
 {
-    [UpdateInGroup(typeof(PresentationSystemGroup))]
+    [UpdateInGroup(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.WEARABLE)]
     public partial class LoadWearablesDTOByPointersSystem : LoadElementsByPointersSystem<WearablesDTOList, GetWearableDTOByPointersIntention, WearableDTO>
     {

Explorer/Assets/DCL/ECS/GlobalPartitioning/GlobalDeferredLoadingSystem.cs

@@ -5,22 +5,18 @@
 using DCL.AvatarRendering.Wearables.Components;
 using DCL.AvatarRendering.Wearables.Components.Intentions;
 using DCL.AvatarRendering.Wearables.Helpers;
-using DCL.CharacterMotion.Components;
 using DCL.Ipfs;
 using DCL.Optimization.PerformanceBudgeting;
+using ECS.Groups;
 using ECS.SceneLifeCycle;
 using ECS.SceneLifeCycle.Components;
 using ECS.SceneLifeCycle.SceneDefinition;
-using ECS.SceneLifeCycle.Systems;
 using ECS.StreamableLoading.AssetBundles;
 using ECS.StreamableLoading.AudioClips;
 using ECS.StreamableLoading.DeferredLoading;
 using ECS.StreamableLoading.GLTF;
 using ECS.StreamableLoading.Textures;
 using SceneRunner.Scene;
-using UnityEngine;
-using LoadWearablesByParamSystem = DCL.AvatarRendering.Wearables.Systems.Load.LoadWearablesByParamSystem;
-using LoadWearablesDTOByPointersSystem = DCL.AvatarRendering.Wearables.Systems.Load.LoadWearablesDTOByPointersSystem;
 
 namespace DCL.GlobalPartitioning
 {
@@ -29,13 +25,7 @@ namespace DCL.GlobalPartitioning
     /// </summary>
     [UpdateInGroup(typeof(PresentationSystemGroup))]
     [UpdateAfter(typeof(PrepareGlobalAssetBundleLoadingParametersSystem))]
-    [UpdateBefore(typeof(LoadSceneDefinitionListSystem))]
-    [UpdateBefore(typeof(LoadSceneSystem))]
-    [UpdateBefore(typeof(LoadSceneDefinitionSystem))]
-    [UpdateBefore(typeof(LoadAssetBundleManifestSystem))]
-    [UpdateBefore(typeof(LoadGlobalAssetBundleSystem))]
-    [UpdateBefore(typeof(LoadWearablesDTOByPointersSystem))]
-    [UpdateBefore(typeof(LoadWearablesByParamSystem))]
+    [UpdateBefore(typeof(LoadGlobalSystemGroup))]
     public partial class GlobalDeferredLoadingSystem : DeferredLoadingSystem
     {
         private static readonly QueryDescription[] COMPONENT_HANDLERS_SCENES_ASSETS;

Explorer/Assets/DCL/Infrastructure/ECS/Groups/LoadGlobalSystemGroup.cs

@@ -0,0 +1,8 @@
+using Arch.SystemGroups;
+using Arch.SystemGroups.DefaultSystemGroups;
+
+namespace ECS.Groups
+{
+    [UpdateInGroup(typeof(PresentationSystemGroup))]
+    public partial class LoadGlobalSystemGroup { }
+}

Explorer/Assets/DCL/Infrastructure/ECS/Groups/LoadGlobalSystemGroup.cs.meta

@@ -6,18 +6,17 @@
 using DCL.DebugUtilities.UIBindings;
 using DCL.Diagnostics;
 using ECS.Abstract;
+using ECS.Groups;
 using ECS.SceneLifeCycle.Components;
-using ECS.SceneLifeCycle.Systems;
 using ECS.StreamableLoading.Common.Components;
 using SceneRunner.Scene;
 using System;
-using System.Linq;
 using UnityEngine;
 
 namespace ECS.SceneLifeCycle.Debug
 {
     [UpdateInGroup(typeof(PresentationSystemGroup))]
-    [UpdateBefore(typeof(LoadSceneSystem))]
+    [UpdateBefore(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.DEBUG)]
     public partial class AbortSceneLoadingDebugSystem : BaseUnityLoopSystem
     {

Explorer/Assets/DCL/Infrastructure/ECS/SceneLifeCycle/Debug/Systems/AbortSceneLoadingDebugSystem.cs

@@ -7,6 +7,7 @@
 using DCL.Ipfs;
 using DCL.Utilities;
 using DCL.WebRequests;
+using ECS.Groups;
 using ECS.Prioritization.Components;
 using ECS.StreamableLoading.AssetBundles;
 using ECS.StreamableLoading.Cache;
@@ -31,7 +32,7 @@ namespace ECS.SceneLifeCycle.SceneDefinition
     /// <summary>
     ///     Loads a scene list originated from pointers
     /// </summary>
-    [UpdateInGroup(typeof(PresentationSystemGroup))]
+    [UpdateInGroup(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.SCENE_LOADING)]
     public partial class LoadSceneDefinitionListSystem : LoadSystemBase<SceneDefinitions, GetSceneDefinitionList>
     {

Explorer/Assets/DCL/Infrastructure/ECS/SceneLifeCycle/SceneDefinition/Systems/LoadSceneDefinitionListSystem.cs

@@ -6,6 +6,7 @@
 using DCL.Diagnostics;
 using DCL.Ipfs;
 using DCL.WebRequests;
+using ECS.Groups;
 using ECS.Prioritization.Components;
 using ECS.StreamableLoading.AssetBundles;
 using ECS.StreamableLoading.Cache;
@@ -18,7 +19,7 @@ namespace ECS.SceneLifeCycle.SceneDefinition
     /// <summary>
     ///     Loads a single scene definition from URN
     /// </summary>
-    [UpdateInGroup(typeof(PresentationSystemGroup))]
+    [UpdateInGroup(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.SCENE_LOADING)]
     public partial class LoadSceneDefinitionSystem : LoadSystemBase<SceneEntityDefinition, GetSceneDefinition>
     {

Explorer/Assets/DCL/Infrastructure/ECS/SceneLifeCycle/SceneDefinition/Systems/LoadSceneDefinitionSystem.cs

@@ -4,6 +4,7 @@
 using Cysharp.Threading.Tasks;
 using DCL.Diagnostics;
 using DCL.Optimization.PerformanceBudgeting;
+using ECS.Groups;
 using ECS.Prioritization.Components;
 using ECS.SceneLifeCycle.Components;
 using ECS.StreamableLoading.Cache;
@@ -18,7 +19,7 @@ namespace ECS.SceneLifeCycle.Systems
     /// <summary>
     ///     Loads a scene from scene and realm definitions
     /// </summary>
-    [UpdateInGroup(typeof(PresentationSystemGroup))]
+    [UpdateInGroup(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.SCENE_LOADING)]
     public partial class LoadSceneSystem : LoadSystemBase<ISceneFacade, GetSceneFacadeIntention>
     {

Explorer/Assets/DCL/Infrastructure/ECS/SceneLifeCycle/SceneFacade/Systems/LoadSceneSystem.cs

@@ -6,6 +6,7 @@
 using DCL.Optimization.Pools;
 using DCL.Platforms;
 using DCL.WebRequests;
+using ECS.Groups;
 using ECS.Prioritization.Components;
 using ECS.StreamableLoading.Cache;
 using ECS.StreamableLoading.Common.Components;
@@ -18,7 +19,7 @@
 
 namespace ECS.StreamableLoading.AssetBundles
 {
-    [UpdateInGroup(typeof(StreamableLoadingGroup))]
+    [UpdateInGroup(typeof(LoadGlobalSystemGroup))]
     [LogCategory(ReportCategory.ASSET_BUNDLES)]
     public partial class LoadAssetBundleManifestSystem : LoadSystemBase<SceneAssetBundleManifest, GetAssetBundleManifestIntention>
     {