npm - @gamelearn/arcade-components - Versions diffs - 2.31.2 → 2.31.4 - Mend

@gamelearn/arcade-components 2.31.2 → 2.31.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

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

@@ -381,6 +381,7 @@ var DialogComponent = function DialogComponent(_ref) {
   var backLine = (0, _react.useCallback)(function () {
     lastTalking.current = _objectSpread({}, talkingCharacter);
     setAudioFailed(false);
+    resetTalkingAnimation();
     if (isBranched) {
       handleBranchDirection(false);
     } else if (!previousLineWasDecision()) {
@@ -439,6 +440,7 @@ var DialogComponent = function DialogComponent(_ref) {
     lastTalking.current = _objectSpread({}, talkingCharacter);
     setEdgesHistory([].concat(_toConsumableArray(edgesHistory), [currentLineData.id]));
     setAudioFailed(false);
+    resetTalkingAnimation();
     if (isBranched) {
       if (choice) {
         handleDecisionBranch(choice, reset);
@@ -577,11 +579,15 @@ var DialogComponent = function DialogComponent(_ref) {
         if (element && !lastSet.current) {
           setTimeout(function () {
             if (talkingCharacter.uid === element.uid) {
+              var _userData$active, _userData$active2;
               moveBubble(element);
-              var isSeated = element.isSeated;
+              var isSeated = element.isSeated,
+                userData = element.userData;
               var emotion = talkingCharacter.emotion;
               var includesSeated = emotion.includes('seated');
-              startAnimation(talkingCharacter.uid, isSeated && !includesSeated ? "".concat(emotion, "-seated") : emotion);
+              if (!((_userData$active = userData.active) !== null && _userData$active !== void 0 && _userData$active.includes('talking')) && !((_userData$active2 = userData.active) !== null && _userData$active2 !== void 0 && _userData$active2.includes(emotion))) {
+                startAnimation(talkingCharacter.uid, isSeated && !includesSeated ? "".concat(emotion, "-seated") : emotion);
+              }
               var setMessage = function setMessage() {
                 var _talkingCharacter$cha;
                 setCurrentMessage({

package/dist/helpers/useStateMachine.js CHANGED Viewed

@@ -53,21 +53,20 @@ function useStateMachine(lines) {
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _slot$character3, _slot$character5;
+            var _slot$character;
             var slot = _step2.value;
             if (!slot.uid) continue;
+            var animations = (_slot$character = slot.character) === null || _slot$character === void 0 ? void 0 : _slot$character.resource.animations;
             if (!urls[slot.uid]) {
-              var _slot$character;
-              urls[slot.uid] = _defineProperty({}, slot.emotion, (_slot$character = slot.character) === null || _slot$character === void 0 ? void 0 : _slot$character.resource.animations[slot.emotion].url);
+              urls[slot.uid] = _defineProperty({}, slot.emotion, animations[slot.emotion].url);
             } else {
-              var _slot$character2;
-              urls[slot.uid] = _objectSpread(_objectSpread({}, urls[slot.uid]), {}, _defineProperty({}, slot.emotion, (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[slot.emotion].url));
+              urls[slot.uid] = _objectSpread(_objectSpread({}, urls[slot.uid]), {}, _defineProperty({}, slot.emotion, animations[slot.emotion].url));
             }
-            if (!slot.emotion.includes('seated') && (_slot$character3 = slot.character) !== null && _slot$character3 !== void 0 && _slot$character3.resource.animations["".concat(slot.emotion, "-seated")]) {
-              var _slot$character4;
-              urls[slot.uid] = _objectSpread(_objectSpread({}, urls[slot.uid]), {}, _defineProperty({}, "".concat(slot.emotion, "-seated"), (_slot$character4 = slot.character) === null || _slot$character4 === void 0 ? void 0 : _slot$character4.resource.animations["".concat(slot.emotion, "-seated")].url));
+            if (!slot.emotion.includes('seated')) {
+              var _animations;
+              urls[slot.uid] = _objectSpread(_objectSpread({}, urls[slot.uid]), {}, _defineProperty({}, "".concat(slot.emotion, "-seated"), ((_animations = animations["".concat(slot.emotion, "-seated")]) === null || _animations === void 0 ? void 0 : _animations.url) || animations['idle-seated'].url));
             }
-            urls[slot.uid].talking = (_slot$character5 = slot.character) === null || _slot$character5 === void 0 ? void 0 : _slot$character5.resource.animations.talking.url;
+            urls[slot.uid].talking = animations.talking.url;
           }
         } catch (err) {
           _iterator2.e(err);
@@ -200,6 +199,7 @@ function useStateMachine(lines) {
                               if (emotion !== 'talking' && actionList.talking) {
                                 clone = clip.clone();
                                 clone.name = "".concat(emotion, "_talking");
+                                actionList.talking.reset();
                                 talkingClip = actionList.talking.getClip();
                                 _action = (0, _.mixWithTalkingClip)(root, talkingClip, clone);
                                 (0, _.activateAction)(_action, 0);

package/package.json CHANGED Viewed

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