Merge pull request #5991 from decentraland/release/release-20231204

Release: 20231204

.github/workflows/set-rollout-by-path-manual.yaml

@@ -0,0 +1,46 @@
+name: Set rollout by path - Manual
+
+on:
+  workflow_dispatch:
+    inputs:
+      packageVersion:
+        description: "NPM Version of the release (@dcl/explorer)"
+        required: true
+        default: ""
+      rolloutPercentage:
+        description: "Percentage of users getting this version"
+        required: true
+        default: "0"
+      deploymentEnvironment:
+        type: "choice"
+        description: "Deployment environment"
+        required: true
+        default: "zone"
+        options:
+          - zone
+          - today
+          - org
+
+jobs:
+  set-manual-by-path-rollout:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: hmarr/debug-action@v2
+      - name: Set Rollout
+        uses: decentraland/set-rollout-action@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Repo deployment info
+          ref: ${{ github.event.ref }}
+          sha: ${{ github.sha }}
+
+          # CDN information
+          packageName: "@dcl/explorer"
+          packageVersion: ${{ github.event.inputs.packageVersion }}
+
+          # Rollout information
+          deploymentPath: "play"
+          deploymentEnvironment: ${{ github.event.inputs.deploymentEnvironment }}
+          deploymentName: "@dcl/explorer"
+          percentage: ${{ github.event.inputs.rolloutPercentage }}

.github/workflows/set-rollout-by-path.yaml

@@ -0,0 +1,74 @@
+# This pipeline is triggered after the CDN has succeed uploading a built package
+
+name: Set rollout by path
+
+on: [deployment_status]
+
+jobs:
+  set-rollouts:
+    if: ${{ github.event.deployment.task == 'upload-to-cdn' && github.event.deployment_status.state == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: hmarr/debug-action@v2
+      # Dev
+      - name: Set Rollout - Zone
+        if: ${{ github.event.deployment.payload.packageTag == 'next' }}
+        uses: decentraland/set-rollout-action@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Repo deployment info
+          ref: ${{ github.event.deployment.ref }}
+          sha: ${{ github.event.deployment.sha }}
+
+          # CDN information
+          packageName: ${{ github.event.deployment.payload.packageName }}
+          packageVersion: ${{ github.event.deployment.payload.packageVersion }}
+
+          # Rollout information
+          deploymentPath: "play"
+          deploymentEnvironment: "zone"
+          deploymentName: "@dcl/explorer"
+          percentage: 100
+
+      # Stg
+      - name: Set Rollout - Today
+        if: ${{ github.event.deployment.payload.packageTag == 'next' }}
+        uses: decentraland/set-rollout-action@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Repo deployment info
+          ref: ${{ github.event.deployment.ref }}
+          sha: ${{ github.event.deployment.sha }}
+
+          # CDN information
+          packageName: ${{ github.event.deployment.payload.packageName }}
+          packageVersion: ${{ github.event.deployment.payload.packageVersion }}
+
+          # Rollout information
+          deploymentPath: "play"
+          deploymentEnvironment: "today"
+          deploymentName: "@dcl/explorer"
+          percentage: 100
+
+      # Prod
+      - name: Set Rollout - Org
+        if: ${{ github.event.deployment.payload.packageTag == 'latest' }}
+        uses: decentraland/set-rollout-action@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Repo deployment info
+          ref: ${{ github.event.deployment.ref }}
+          sha: ${{ github.event.deployment.sha }}
+
+          # CDN information
+          packageName: ${{ github.event.deployment.payload.packageName }}
+          packageVersion: ${{ github.event.deployment.payload.packageVersion }}
+
+          # Rollout information
+          deploymentPath: "play"
+          deploymentEnvironment: "org"
+          deploymentName: "@dcl/explorer"
+          percentage: 0

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AvatarShape/AvatarShape.cs

@@ -89,6 +89,13 @@ public class AvatarShape : MonoBehaviour, IHideAvatarAreaHandler, IPoolableObjec
         private Service<IEmotesCatalogService> emotesCatalog;
         private IAvatarEmotesController emotesController;
         private AvatarSceneEmoteHandler sceneEmoteHandler;
+        private IBaseAvatarReferences baseAvatarReferences;
+        private readonly OnPointerEvent.Model viewProfilePointerModel = new ()
+        {
+            type = OnPointerDown.NAME,
+            button = WebInterface.ACTION_BUTTON.POINTER.ToString(),
+            hoverText = "View Profile",
+        };
         public IAvatar internalAvatar => avatar;
 
         private void Awake()
@@ -108,16 +115,15 @@ private void Awake()
 
 
             //Ensure base avatar references
-            var baseAvatarReferences = baseAvatarContainer.GetComponentInChildren<IBaseAvatarReferences>() ?? Instantiate(baseAvatarReferencesPrefab, baseAvatarContainer);
+            baseAvatarReferences = baseAvatarContainer.GetComponentInChildren<IBaseAvatarReferences>() ?? Instantiate(baseAvatarReferencesPrefab, baseAvatarContainer);
 
             avatar = avatarFactory.Ref.CreateAvatarWithHologram(avatarContainer, new BaseAvatar(baseAvatarReferences), animator, avatarLOD, visibility);
 
             emotesController = avatar.GetEmotesController();
 
             sceneEmoteHandler = new AvatarSceneEmoteHandler(
                 emotesController,
-                Environment.i.serviceLocator.Get<IEmotesService>(),
-                new UserProfileWebInterfaceBridge());
+                Environment.i.serviceLocator.Get<IEmotesService>());
 
             avatarReporterController ??= new AvatarReporterController(Environment.i.world.state);
 
@@ -222,16 +228,11 @@ public async void ApplyModel(IParcelScene scene, IDCLEntity entity, PBAvatarShap
             UpdatePlayerStatus(entity, model);
 
             onPointerDown.Initialize(
-                new OnPointerEvent.Model()
-                {
-                    type = OnPointerDown.NAME,
-                    button = WebInterface.ACTION_BUTTON.POINTER.ToString(),
-                    hoverText = "View Profile"
-                },
+                viewProfilePointerModel,
                 entity, player
             );
 
-            outlineOnHover.Initialize(new OnPointerEvent.Model(), entity, player.avatar);
+            outlineOnHover.Initialize(entity, player.avatar);
 
             avatarCollider.gameObject.SetActive(true);
 
@@ -342,7 +343,7 @@ internal void UpdatePlayerStatus(IDCLEntity entity, PBAvatarShape model)
 
             float height = AvatarSystemUtils.AVATAR_Y_OFFSET + avatar.extents.y;
 
-            anchorPoints.Prepare(avatarContainer.transform, avatar.GetBones(), height);
+            anchorPoints.Prepare(avatarContainer.transform, baseAvatarReferences.Anchors, height);
 
             player.playerName.SetIsTalking(model.Talking);
             player.playerName.SetYOffset(Mathf.Max(MINIMUM_PLAYERNAME_HEIGHT, height));

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/GltfContainer/DCL.ECSComponents.GltfContainer.asmdef

@@ -22,7 +22,8 @@
         "GUID:1e6b57fe78f7b724e9567f29f6a40c2c",
         "GUID:2995626b54c60644988f134a69a77450",
         "GUID:ac62e852826a4b36aeb22931dad73edb",
-        "GUID:46951180f4d84b25a1619640aa317e5b"
+        "GUID:46951180f4d84b25a1619640aa317e5b",
+        "GUID:0b3e983b6c2fed54ebecf9d146c251ba"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/GltfContainer/GltfContainerCollidersHandler.cs

@@ -101,7 +101,7 @@ public IReadOnlyList<Collider> GetVisibleMeshesColliders()
             return visibleMeshesColliders;
         }
 
-        public IReadOnlyList<Collider> GetInVisibleMeshesColliders()
+        public IReadOnlyList<Collider> GetInvisibleMeshesColliders()
         {
             return invisibleMeshesColliders;
         }