@gamelearn/arcade-components 2.12.4 → 2.12.5

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

@@ -296,7 +296,7 @@ var DialogComponent = function DialogComponent(_ref) {
     if (zoomInActor) setAnimationRunning(true);
   }, [zoomInActor]);
 
-  var restTalkingAnimation = function restTalkingAnimation() {
+  var resetTalkingAnimation = function resetTalkingAnimation() {
     var element = getCurrentVisible(talkingCharacter === null || talkingCharacter === void 0 ? void 0 : talkingCharacter.uid);
 
     if (!element) {
@@ -323,16 +323,16 @@ var DialogComponent = function DialogComponent(_ref) {
   (0, _react.useEffect)(function () {
     var element = getCurrentVisible(talkingCharacter === null || talkingCharacter === void 0 ? void 0 : talkingCharacter.uid);
 
-    if (element) {
+    if (element && currentMessage.show) {
       if (talking) {
         var _talkingCharacter$cha, _talkingCharacter$cha2, _talkingCharacter$cha3, _talkingCharacter$cha4;
 
         (0, _helpers.executeTalkingAnimation)(element, talkingCharacter === null || talkingCharacter === void 0 ? void 0 : (_talkingCharacter$cha = talkingCharacter.character) === null || _talkingCharacter$cha === void 0 ? void 0 : (_talkingCharacter$cha2 = _talkingCharacter$cha.resource) === null || _talkingCharacter$cha2 === void 0 ? void 0 : (_talkingCharacter$cha3 = _talkingCharacter$cha2.animations) === null || _talkingCharacter$cha3 === void 0 ? void 0 : (_talkingCharacter$cha4 = _talkingCharacter$cha3.talking) === null || _talkingCharacter$cha4 === void 0 ? void 0 : _talkingCharacter$cha4.url);
       } else {
-        restTalkingAnimation();
+        resetTalkingAnimation();
       }
     }
-  }, [talkingCharacter, talking]);
+  }, [talkingCharacter, talking, currentMessage.show]);
   var finishConversation = (0, _react.useCallback)(function () {
     lastSet.current = true;
     changeLine(0);
@@ -404,7 +404,7 @@ var DialogComponent = function DialogComponent(_ref) {
     }
   }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.id, edges, finishConversation, lines]);
   var backLine = (0, _react.useCallback)(function () {
-    restTalkingAnimation();
+    resetTalkingAnimation();
     setAudioFailed(false);
 
     if (isBranched) {
@@ -417,7 +417,7 @@ var DialogComponent = function DialogComponent(_ref) {
     }
   }, [handleBranchDirection, isBranched, lastLine, line]);
   var nextLine = (0, _react.useCallback)(function (choice, reset) {
-    restTalkingAnimation();
+    resetTalkingAnimation();
     setEdgesHistory([].concat(_toConsumableArray(edgesHistory), [currentLineData.id]));
     setAudioFailed(false);
 

package/dist/helpers/index.js

@@ -23,6 +23,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); }
+
 var xAxis = new _three.Vector3(1, 0, 0);
 exports.xAxis = xAxis;
 var yAxis = new _three.Vector3(0, 1, 0);
@@ -202,30 +204,38 @@ var executeTalkingAnimation = function executeTalkingAnimation(target, talkingUR
     var cloned = defaultAnim.clone();
 
     var onLoad = function onLoad(anim) {
-      var _cloned$tracks;
+      var talkingClip = anim === null || anim === void 0 ? void 0 : anim.animations[0];
+
+      if (talkingClip) {
+        var _cloned$tracks;
 
-      if (anim) {
-        tracks.push.apply(tracks, _toConsumableArray(anim.animations[0].tracks.filter(function (track) {
+        talkingClip.tracks.filter(function (track) {
           return bones.find(function (bone) {
             return track.name.includes(bone);
           });
-        })));
-      }
-
-      cloned.tracks = cloned.tracks.filter(function (track) {
-        return !bones.find(function (bone) {
-          return track.name.includes(bone);
+        }), _readOnlyError("tracks");
+        cloned.tracks = cloned.tracks.filter(function (track) {
+          return !bones.find(function (bone) {
+            return track.name.includes(bone);
+          });
         });
-      });
 
-      (_cloned$tracks = cloned.tracks).push.apply(_cloned$tracks, tracks);
+        (_cloned$tracks = cloned.tracks).push.apply(_cloned$tracks, _toConsumableArray(tracks));
+
+        target.userData.emotionClip = cloned;
+        cloned.resetDuration();
+        var talkingSubClip = cloned;
 
-      target.userData.emotionClip = cloned;
-      var defaultAction = mixer.clipAction(defaultAnim, target);
-      var emotionAction = mixer.clipAction(cloned, target);
-      emotionAction.loop = _three.LoopPingPong;
-      mixer.stopAllAction();
-      executeCrossFade(defaultAction, emotionAction, crossFadeDuration);
+        if (cloned.duration > 4) {
+          talkingSubClip = _three.AnimationUtils.subclip(cloned, 'shortTalking', 0, 120, 30);
+        }
+
+        var defaultAction = mixer.clipAction(defaultAnim, target);
+        var emotionAction = mixer.clipAction(talkingSubClip, target);
+        emotionAction.loop = _three.LoopPingPong;
+        mixer.stopAllAction();
+        executeCrossFade(defaultAction, emotionAction, crossFadeDuration);
+      }
     };
 
     loader.load(talkingURL, function (anim) {

package/package.json

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