@gamelearn/arcade-components 1.4.23 → 1.4.26

package/dist/components/cards-selector-puzzle-component/components/Board/index.js

@@ -17,14 +17,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -46,19 +38,21 @@ var Board = function Board(_ref) {
       feedbackIsShown = _ref.feedbackIsShown,
       resolvePuzzle = _ref.resolvePuzzle,
       soundActions = _ref.soundActions,
-      handleSuccess = _ref.handleSuccess;
+      handleSuccess = _ref.handleSuccess,
+      setForceFlipCard = _ref.setForceFlipCard,
+      forceFlipCard = _ref.forceFlipCard;
 
-  var _useState = (0, _react.useState)(_toConsumableArray(Array(cards.length)).fill(false)),
+  var _useState = (0, _react.useState)(Array(cards.length).fill(false)),
       _useState2 = _slicedToArray(_useState, 2),
       flipped = _useState2[0],
       setFlipped = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(_toConsumableArray(Array(cards.length)).fill(false)),
+  var _useState3 = (0, _react.useState)(Array(cards.length).fill(false)),
       _useState4 = _slicedToArray(_useState3, 2),
       wrongOrder = _useState4[0],
       setWrongOrder = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(1),
+  var _useState5 = (0, _react.useState)(0),
       _useState6 = _slicedToArray(_useState5, 2),
       correctCards = _useState6[0],
       setCorrectCards = _useState6[1];
@@ -72,17 +66,24 @@ var Board = function Board(_ref) {
   var isOrderBased = cards.filter(function (card) {
     return card.order;
   }).length > 0;
+  var flipTimer;
+  (0, _react.useEffect)(function () {
+    if (forceFlipCard) {
+      setForceFlipCard(false);
+      reset();
+      clearTimeout(flipTimer);
+    }
+  }, [flipTimer, forceFlipCard, reset, setForceFlipCard]);
+  var reset = (0, _react.useCallback)(function () {
+    setFlipped(Array(cards.length).fill(false)); // reset it to the original length
 
-  var reset = function reset() {
-    setFlipped(_toConsumableArray(Array(cards.length)).fill(false)); // reset it to the original length
-
-    setWrongOrder(_toConsumableArray(Array(cards.length)).fill(false));
-    setCorrectCards(1);
+    setWrongOrder(Array(cards.length).fill(false));
+    setCorrectCards(0);
     setCurrentOrder(1);
-  };
+  }, [cards.length, setCurrentOrder]);
 
   var timedReset = function timedReset() {
-    setTimeout(function () {
+    flipTimer = setTimeout(function () {
       reset();
     }, 3000);
   };
@@ -113,15 +114,17 @@ var Board = function Board(_ref) {
       flipAllCorrect();
     }
   }, [flipAllCorrect, resolvePuzzle]);
+  (0, _react.useEffect)(function () {
+    if (correctCards === numberOfCorrectCards) {
+      endPuzzle();
+      setCorrectCards(0);
+    }
+  }, [correctCards, endPuzzle, numberOfCorrectCards]);
 
   var handleCorrect = function handleCorrect(index) {
     flipACard(index);
     handleSuccess(cards[index].id || null);
     setCorrectCards(correctCards + 1);
-
-    if (correctCards === numberOfCorrectCards) {
-      endPuzzle();
-    }
   };
 
   var _handleClick = function handleClick(index) {

package/dist/components/cards-selector-puzzle-component/components/CardsSelectorPuzzleComponent.js

@@ -92,6 +92,11 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
 
+  var _useState17 = (0, _react.useState)(false),
+      _useState18 = _slicedToArray(_useState17, 2),
+      forceFlipCard = _useState18[0],
+      setForceFlipCard = _useState18[1];
+
   var translate = function translate(id) {
     return emitEvent({
       type: 'translate',
@@ -115,6 +120,8 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
   }, [emitEvent]);
 
   var endPuzzle = function endPuzzle() {
+    var _info$solution, _specificFeedbacks$co;
+
     emitEvent({
       type: 'hidePuzzleButtons',
       payload: true
@@ -125,33 +132,27 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
       setFeedbackResult(true);
       setFeedbackIsShown(true);
     } else {
-      var _info$solution, _specificFeedbacks$co;
-
       setFeedbackResult(true);
       setFeedbackIsShown(true);
       setFinished(true);
+    }
 
-      var _info$solution$right = info === null || info === void 0 ? void 0 : (_info$solution = info.solution) === null || _info$solution === void 0 ? void 0 : _info$solution.right,
-          rewards = _info$solution$right.rewards;
+    var _info$solution$right = info === null || info === void 0 ? void 0 : (_info$solution = info.solution) === null || _info$solution === void 0 ? void 0 : _info$solution.right,
+        rewards = _info$solution$right.rewards;
 
-      var specificRewards = (specificFeedbacks === null || specificFeedbacks === void 0 ? void 0 : (_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) === null || _specificFeedbacks$co === void 0 ? void 0 : _specificFeedbacks$co.map(function (spReward) {
-        return spReward.rewards;
-      }).flat()) || [];
-      var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(rewards), _toConsumableArray(specificRewards));
-      setTimeout(function () {
-        playSound('score');
-        closeFeedbackAndShowPoints(rewardsData);
-      }, 3000);
-    }
+    var specificRewards = (specificFeedbacks === null || specificFeedbacks === void 0 ? void 0 : (_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) === null || _specificFeedbacks$co === void 0 ? void 0 : _specificFeedbacks$co.map(function (spReward) {
+      return spReward.rewards;
+    }).flat()) || [];
+    var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(rewards), _toConsumableArray(specificRewards));
+    setTimeout(function () {
+      playSound('score');
+      closeFeedbackAndShowPoints(rewardsData);
+    }, 3000);
   };
 
   var handleFeedbackFuncionOnClose = function handleFeedbackFuncionOnClose() {
     if (feedbackResult) {
-      setFinished(true);
-      var rewards = info.solution.right.rewards;
-      var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(rewards));
-      playSound('score');
-      closeFeedbackAndShowPoints(rewardsData);
+      endPuzzle();
     } else {
       setFeedbackResult(false);
       disableExit(false);
@@ -163,6 +164,10 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
     }
 
     setFeedBackText('');
+
+    if (!feedbackResult && !rightPick) {
+      setForceFlipCard(true);
+    }
   };
 
   var handleSuccessPick = function handleSuccessPick(cardId) {
@@ -205,7 +210,6 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
       if (failedCard !== null && failedCard !== void 0 && failedCard.desc) {
         setFeedBackText(failedCard.desc);
         setFeedbackIsShown(true);
-        setRewards([].concat(_toConsumableArray(accRewards), _toConsumableArray(failedCard === null || failedCard === void 0 ? void 0 : failedCard.rewards)));
       } else {
         setFeedbackIsShown(true);
         setTimeout(function () {
@@ -216,6 +220,8 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
           });
         }, 2000);
       }
+
+      setRewards([].concat(_toConsumableArray(accRewards), _toConsumableArray((failedCard === null || failedCard === void 0 ? void 0 : failedCard.rewards) || [])));
     } // si hay feedback definido
     else if (info.solution.wrong.desc) {
       setFeedBackText(info.solution.wrong.desc);
@@ -279,7 +285,9 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
     feedbackIsShown: feedbackIsShown,
     resolvePuzzle: resolvePuzzle,
     soundActions: soundActions,
-    handleSuccess: handleSuccessPick
+    handleSuccess: handleSuccessPick,
+    forceFlipCard: forceFlipCard,
+    setForceFlipCard: setForceFlipCard
   })), feedbackIsShown && /*#__PURE__*/_react.default.createElement(_feedbackComponent.default, {
     success: feedbackResult || rightPick,
     text: feedBackText,

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

@@ -227,7 +227,7 @@ var DialogComponent = function DialogComponent(_ref) {
     var animation = (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[slot.emotion];
     var mixer = element.userData.mixer;
 
-    if (animation && animation.url) {
+    if (animation && animation.url && !element.isSeated) {
       loader.load(animation.url, function (anim) {
         var emotionClip = anim.animations[0];
         var defaultClip = element.userData.defaultAnim;
@@ -327,17 +327,15 @@ var DialogComponent = function DialogComponent(_ref) {
       return parseInt(edge.fromPointIndex) === currentId;
     });
     var destinationEdge = lines.findIndex(function (l) {
-      return l.id === currentEdge.toId;
+      return l.id === (currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.toId);
     });
 
-    if (destinationEdge) {
-      if (currentEdge.fromId === currentEdge.toId) {
+    if (destinationEdge >= 0) {
+      if ((currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.fromId) === (currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.toId)) {
         reset();
-      } else if (destinationEdge >= 0) {
+      } else {
         setCurrentMessage({});
         changeLine(destinationEdge);
-      } else {
-        finishConversation();
       }
     } else {
       finishConversation();

package/package.json

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