feat: sequential emotes

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset

@@ -72,6 +72,10 @@ MonoBehaviour:
     m_Address: VRMExporter
     m_ReadOnly: 0
     m_SerializedLabels: []
+  - m_GUID: fd6cf4a6f210c0b44945d9f5f646cd99
+    m_Address: EmoteAudioSource
+    m_ReadOnly: 0
+    m_SerializedLabels: []
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2}
   m_SchemaSet:

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

@@ -204,7 +204,7 @@ public async void ApplyModel(IParcelScene scene, IDCLEntity entity, PBAvatarShap
 
             // If the model contains a value for expressionTriggerId then we try it, if value doesn't exist, we skip
             if(model.HasExpressionTriggerId)
-                avatar.PlayEmote(model.ExpressionTriggerId, model.GetExpressionTriggerTimestamp());
+                avatar.GetEmotesController().PlayEmote(model.ExpressionTriggerId, model.GetExpressionTriggerTimestamp());
 
             UpdatePlayerStatus(entity, model);
 

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

@@ -48,7 +48,8 @@
         "GUID:ce5ce184029b7f34c9188d4ae2aeb3d7",
         "GUID:6c1761dc8f737004198eb333521bd665",
         "GUID:c8ea72e806cd2ab47b539b37895b86b7",
-        "GUID:9cccce9925d3495d8a5e4fa5b25f54a5"
+        "GUID:9cccce9925d3495d8a5e4fa5b25f54a5",
+        "GUID:2d39cc535b437e749965d4a8258f0c13"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -2,7 +2,6 @@
 using Cysharp.Threading.Tasks;
 using DCL.Controllers;
 using DCL.Emotes;
-using DCL.Helpers;
 using DCL.Models;
 using DCLServices.MapRendererV2;
 using NSubstitute;
@@ -21,6 +20,7 @@ public class AvatarShapeShould
         private IParcelScene scene;
         private AvatarShape avatarShape;
         private GameObject gameObject;
+        private IAvatarEmotesController emotesController;
 
         [SetUp]
         public void SetUp()
@@ -29,13 +29,15 @@ public void SetUp()
             entity = Substitute.For<IDCLEntity>();
             scene = Substitute.For<IParcelScene>();
             avatar = Substitute.For<IAvatar>();
+            emotesController = Substitute.For<IAvatarEmotesController>();
+            avatar.GetEmotesController().Returns(emotesController);
             avatarReporterController = Substitute.For<IAvatarReporterController>();
             movementController = Substitute.For<IAvatarMovementController>();
 
             Environment.Setup(InitializeServiceLocator());
 
             AvatarShape avatarShapePrefab = Resources.Load<AvatarShape>("NewAvatarShape");
-            avatarShape = GameObject.Instantiate(avatarShapePrefab);
+            avatarShape = Object.Instantiate(avatarShapePrefab);
             avatarShape.OnPoolGet();
             avatarShape.avatar = avatar;
             avatarShape.avatarReporterController = avatarReporterController;
@@ -70,8 +72,8 @@ private async UniTask<EmbeddedEmotesSO> GetEmbeddedEmotesSO()
         [TearDown]
         protected void TearDown()
         {
-            GameObject.Destroy(gameObject);
-            GameObject.Destroy(avatarShape.gameObject);
+            Helpers.Utils.SafeDestroy(gameObject);
+            Helpers.Utils.SafeDestroy(avatarShape.gameObject);
         }
 
         [Test]
@@ -84,11 +86,11 @@ public void ApplyModelCorrectly()
             avatarShape.ApplyModel(scene, entity, model);
 
             // Assert
-            Assert.AreEqual(entity,avatarShape.entity);
+            Assert.AreEqual(entity, avatarShape.entity);
             Assert.IsTrue(avatarShape.initializedPosition);
 
-            avatar.Received(1).PlayEmote(model.ExpressionTriggerId, model.ExpressionTriggerTimestamp);
-            movementController.Received(1).OnTransformChanged(Arg.Any<UnityEngine.Vector3>(), Arg.Any<Quaternion>(), Arg.Any<bool>());
+            emotesController.Received(1).PlayEmote(model.ExpressionTriggerId, model.ExpressionTriggerTimestamp);
+            movementController.Received(1).OnTransformChanged(Arg.Any<Vector3>(), Arg.Any<Quaternion>(), Arg.Any<bool>());
         }
 
         [Test]
@@ -101,12 +103,12 @@ public void UpdatePlayerStatusCorrectly()
             avatarShape.UpdatePlayerStatus(entity, model);
 
             // Assert
-            Assert.AreEqual(model.Id,avatarShape.player.id);
-            Assert.AreEqual(model.Name,avatarShape.player.name);
-            Assert.AreEqual(model.Talking,avatarShape.player.isTalking);
-            Assert.AreEqual(avatar,avatarShape.player.avatar);
+            Assert.AreEqual(model.Id, avatarShape.player.id);
+            Assert.AreEqual(model.Name, avatarShape.player.name);
+            Assert.AreEqual(model.Talking, avatarShape.player.isTalking);
+            Assert.AreEqual(avatar, avatarShape.player.avatar);
             Assert.AreEqual(avatarShape.avatarCollider, avatarShape.player.collider);
-            Assert.AreEqual(avatarShape.onPointerDown,avatarShape.player.onPointerDownCollider);
+            Assert.AreEqual(avatarShape.onPointerDown, avatarShape.player.onPointerDownCollider);
         }
 
         [Test]

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AvatarShape/Tests/DCL.ECSComponents.AvatarShape.Tests.asmdef

@@ -11,11 +11,9 @@
         "GUID:0acc523941302664db1f4e527237feb3",
         "GUID:a3ceb534947fac14da25035bc5c24788",
         "GUID:b308ae946900fa04080222d7daf47d9a",
-        "GUID:bf449696eeb8a48adb5d063bf6fb0d91",
         "GUID:97d8897529779cb49bebd400c7f402a6",
         "GUID:a881b57670b1d2747a6d7f9e32b63230",
         "GUID:1dd0780aa6be12b428c8005d0bee46b8",
-        "GUID:3c42479e53c24ab098ea7aa54c818b2e",
         "GUID:3f9bd7dfada994a3ca114055e53e2c1f",
         "GUID:f8a3a0af3ed28474c885e04c605a7962",
         "GUID:37d2c04574c1d480d8c817e2a7c578e7",
@@ -45,20 +43,19 @@
         "GUID:a871c50d0a774d2b8594d36cb4766e5e",
         "GUID:8796c22c84974ce385f8d79b1ae08e1b"
     ],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
         "nunit.framework.dll",
         "NSubstitute.dll",
-        "System.Threading.Tasks.Extensions.dll",
         "Google.Protobuf.dll"
     ],
     "autoReferenced": false,
-    "defineConstraints": [
-        "UNITY_INCLUDE_TESTS"
-    ],
+    "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
 }