@gamelearn/arcade-components 2.12.13 → 2.13.1

package/dist/components/conversational-pro-component/components/scene/Panel.js

@@ -69,7 +69,11 @@ function Panel(_ref) {
   var defaultClip = (0, _react.useRef)();
   var emotion = (0, _react.useMemo)(function () {
     if (isCharacter) {
-      var _character$resource, _character$resource$a, _character$resource$a2, _character$resource3, _character$resource3$;
+      var _character$animation, _character$resource, _character$resource$a, _character$resource$a2, _character$resource3, _character$resource3$;
+
+      if (character.animationId && (_character$animation = character.animation) !== null && _character$animation !== void 0 && _character$animation.url) {
+        return character.animation;
+      }
 
       if (character !== null && character !== void 0 && (_character$resource = character.resource) !== null && _character$resource !== void 0 && (_character$resource$a = _character$resource.animations) !== null && _character$resource$a !== void 0 && (_character$resource$a2 = _character$resource$a[character.emotion]) !== null && _character$resource$a2 !== void 0 && _character$resource$a2.url) {
         var _character$resource2, _character$resource2$;
@@ -81,7 +85,7 @@ function Panel(_ref) {
     }
 
     return {};
-  }, [character.emotion, character === null || character === void 0 ? void 0 : (_character$resource4 = character.resource) === null || _character$resource4 === void 0 ? void 0 : _character$resource4.animations, isCharacter]);
+  }, [character.emotion, character === null || character === void 0 ? void 0 : character.animationId, character === null || character === void 0 ? void 0 : character.animation, character === null || character === void 0 ? void 0 : (_character$resource4 = character.resource) === null || _character$resource4 === void 0 ? void 0 : _character$resource4.animations, isCharacter]);
   var resetAnimation = (0, _react.useCallback)(function () {
     var _model$current$userDa = model.current.userData,
         mixer = _model$current$userDa.mixer,
@@ -121,9 +125,9 @@ function Panel(_ref) {
       cameraRef.current.rotation.set(0, 0, 0);
       cameraRef.current.updateProjectionMatrix();
       cameraRef.current.layers.enableAll();
+      var defaultAnim = object.userData.defaultAnim;
 
-      if (character.type === 'character') {
-        var defaultAnim = object.userData.defaultAnim;
+      if (character.type === 'character' && defaultAnim) {
         model.current = object;
         defaultClip.current = defaultAnim.clone();
         cameraRef.current.position.setY(size.y - 1.5 * 1.3); // Retro compatible with resources without eye bone
@@ -135,7 +139,7 @@ function Panel(_ref) {
           }
         });
         cameraRef.current.zoom = 1.85;
-      } else if (character.type === 'object') {
+      } else if (character.type === 'object' || !defaultAnim) {
         (0, _helpers.cameraFitAnyObject)(object, cameraRef.current);
         cameraRef.current.zoom = 1;
       }

package/dist/components/dialog-component/components/DialogComponent.js

@@ -248,10 +248,19 @@ var DialogComponent = function DialogComponent(_ref) {
     return (slot === null || slot === void 0 ? void 0 : (_slot$character = slot.character) === null || _slot$character === void 0 ? void 0 : (_slot$character$resou = _slot$character.resource) === null || _slot$character$resou === void 0 ? void 0 : _slot$character$resou.url) || (object === null || object === void 0 ? void 0 : object.completeUrl) || '';
   }, [actors]);
   var loadEmotion = (0, _react.useCallback)(function (slot, element) {
-    var _slot$character2;
+    var _slot$animation;
 
     var onLoadAnim = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
-    var animation = (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[element.isSeated ? "".concat(slot.emotion, "-seated") : slot.emotion];
+    var animation;
+
+    if (slot !== null && slot !== void 0 && slot.animationId && slot !== null && slot !== void 0 && (_slot$animation = slot.animation) !== null && _slot$animation !== void 0 && _slot$animation.url) {
+      animation = slot.animation;
+    } else {
+      var _slot$character2;
+
+      animation = (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[element.isSeated ? "".concat(slot.emotion, "-seated") : slot.emotion];
+    }
+
     var mixer = element.userData.mixer;
 
     if (animation && animation.url) {
@@ -304,6 +313,10 @@ var DialogComponent = function DialogComponent(_ref) {
       return;
     }
 
+    if (!element.isTalking) {
+      return;
+    }
+
     var _element$userData = element.userData,
         mixer = _element$userData.mixer,
         defaultAnim = _element$userData.defaultAnim,
@@ -314,6 +327,7 @@ var DialogComponent = function DialogComponent(_ref) {
       var defaultAction = mixer.clipAction(defaultAnim, element);
       mixer.stopAllAction();
       (0, _helpers.executeCrossFade)(emotionAction, defaultAction, crossFadeDuration);
+      element.isTalking = false;
     }
 
     startTalking(false);

package/dist/helpers/index.js

@@ -232,6 +232,7 @@ var executeTalkingAnimation = function executeTalkingAnimation(target, talkingUR
         var emotionAction = mixer.clipAction(talkingSubClip, target);
         emotionAction.loop = _three.LoopPingPong;
         mixer.stopAllAction();
+        target.isTalking = true;
         executeCrossFade(defaultAction, emotionAction, crossFadeDuration);
       }
     };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "2.12.13",
+  "version": "2.13.1",
   "main": "dist/index.js",
   "files": [
     "dist",