@gamelearn/arcade-components 2.4.3 → 2.5.0

package/dist/components/conversational-pro-component/components/ConversationalProComponent.js

@@ -185,7 +185,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     slots: !isVoiceOver ? currentLineData.slots : voiceOverSlots,
     flex: isFlex,
     pause: pause
-  }; // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
+  }; // Last line with slots
 
   var leftWithSlots = lines.slice(0, currentLine + 1).reverse().find(function (line) {
     return line.slots;
@@ -481,7 +481,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   });
 
   if (isDecision) {
-    return /*#__PURE__*/_react.default.createElement(_decisionComponent.default, decisionPayload); // todo cambiar el decision para indicar la decisión escogida
+    return /*#__PURE__*/_react.default.createElement(_decisionComponent.default, decisionPayload);
   }
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/dist/components/decision-component/components/DecisionBody.js

@@ -37,9 +37,9 @@ var DecisionBody = function DecisionBody(_ref) {
   var options = _ref.options,
       question = _ref.question,
       inherited = _ref.inherited,
+      branched = _ref.branched,
       changeOption = _ref.changeOption,
       onNext = _ref.onNext,
-      onBack = _ref.onBack,
       failed = _ref.failed,
       showingResults = _ref.showingResults,
       currentSelectedChoice = _ref.currentSelectedChoice,
@@ -68,7 +68,7 @@ var DecisionBody = function DecisionBody(_ref) {
   var optionsProps = {
     inherited: inherited,
     selectedChoice: selectedChoice,
-    selectChoice: failed ? choose : noop,
+    selectChoice: (!required || branched) && selectedChoice.id !== undefined || required && !failed ? noop : choose,
     options: options,
     showingResults: showingResults
   };
@@ -90,11 +90,11 @@ var DecisionBody = function DecisionBody(_ref) {
       dir: "auto"
     }, /*#__PURE__*/_react.default.createElement(_Options.default, optionsProps)), /*#__PURE__*/_react.default.createElement("div", {
       className: "popup--buttons"
-    }, !failed ? /*#__PURE__*/_react.default.createElement("button", {
+    }, (required ? !failed : selectedChoice.id !== undefined) ? /*#__PURE__*/_react.default.createElement("button", {
       type: "button",
       className: "gat--btn gat--btn__primary ".concat(selectedChoice.id !== undefined ? '' : 'disabled'),
       onClick: function onClick() {
-        return required && canNext ? onNext(selectedChoice) : onBack(selectedChoice);
+        return onNext(selectedChoice);
       }
     }, translate('screens.continue')) : null));
   };

package/dist/components/decision-component/components/DecisionComponent.js

@@ -119,22 +119,6 @@ var DecisionComponent = function DecisionComponent(_ref) {
       setResultChoice(option);
       selectView('options');
     },
-    onBack: function onBack(choice) {
-      playSound('click-ui');
-
-      if (failed) {
-        emitEvent({
-          type: 'addPoints',
-          payload: choice.rewards,
-          finish: false,
-          complex: true,
-          onFinish: function onFinish() {
-            setResultChoice({});
-            selectView('options');
-          }
-        });
-      }
-    },
     onNext: function onNext(choice) {
       playSound('click-ui');
 
@@ -186,14 +170,14 @@ var DecisionComponent = function DecisionComponent(_ref) {
             playSound('fail');
 
             if (!branched) {
-              emitEvent({
-                type: 'addPoints',
-                payload: choice.rewards,
-                finish: false,
-                complex: true
-              });
-
-              if (!required) {
+              if (inherited || required) {
+                emitEvent({
+                  type: 'addPoints',
+                  payload: choice.rewards,
+                  finish: false,
+                  complex: true
+                });
+              } else if (!required) {
                 setResultChoice({});
                 selectView('options');
               }

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

@@ -65,14 +65,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-// import { DeviceDetection } from '../../../helpers/deviceDetection';
-// Global
-// const isMobile = DeviceDetection();
 var crossFadeDuration = 0.2;
 var characterMs = 75;
 var minMs = 1400;
-var headSize = 2; // Mobile always zoom in?
-
+var headSize = 2;
 var raycast = new _three.Raycaster();
 var maxCharacterToSwitch = 70;
 raycast.firstHitOnly = true;
@@ -246,8 +242,7 @@ var DialogComponent = function DialogComponent(_ref) {
       return '';
     });
     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]); // Move to three core?
-
+  }, [actors]);
   var loadEmotion = (0, _react.useCallback)(function (slot, element) {
     var _slot$character2;
 
@@ -318,7 +313,8 @@ var DialogComponent = function DialogComponent(_ref) {
     }
 
     startTalking(false);
-  };
+  }; // Execute talking animation
+
 
   (0, _react.useEffect)(function () {
     var element = getCurrentVisible(talkingCharacter === null || talkingCharacter === void 0 ? void 0 : talkingCharacter.uid);
@@ -496,7 +492,7 @@ var DialogComponent = function DialogComponent(_ref) {
     var yDistance = zoomInActor ? 2.5 : 2;
     var xDistance = zoomInActor ? 1.2 : 1.5;
     target.translateY(staticDisplay || showArrowTop ? 0 : yDistance);
-    target.translateX(xDistance); // Detectar posicion de personaje a izq o derecha de pantalla
+    target.translateX(xDistance); // Check if character is left or right in the screen
 
     var vector = new _three.Vector3();
     vector.setFromMatrixPosition(head.matrixWorld);
@@ -708,7 +704,7 @@ var DialogComponent = function DialogComponent(_ref) {
           var objects = raycast.intersectObjects(scene.children, true);
           changedMats.current = objects.filter(function (o) {
             return o.distance < 10;
-          }); // TODO: CHECK IF OBJECT BETWEEN CAMERA AND TARGET
+          }); // Make objects invisible in front of the camera
 
           if (changedMats.current.length) {
             changedMats.current.forEach(function (o) {

package/package.json

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