@gamelearn/arcade-components 0.24.8 → 0.24.10

package/dist/components/arcade-render/scene/ConfigController.js

@@ -50,6 +50,7 @@ var ConfigController = function ConfigController(_ref) {
 
   (0, _react.useEffect)(function () {
     gl.shadowMap.enabled = current.shadows;
+    gl.shadowMap.needsUpdate = true;
 
     if (!current.animate) {
       invalidate();

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

@@ -27,6 +27,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 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."); }
@@ -59,21 +63,24 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       playSound = _soundActions[0],
       stop = _soundActions[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      finished = _useState4[0],
+      setFinished = _useState4[1];
+
   var backgroundImage = (background === null || background === void 0 ? void 0 : (_background$img = background.img) === null || _background$img === void 0 ? void 0 : _background$img.url) || null;
   var currentLineData = lines[currentLine];
   var voiceOverSlots = [];
   var voiceOver = currentLineData.voiceOver,
       decision = currentLineData.decision;
   var isFlex = currentLineData.flex;
-
-  var translate = function translate(id) {
+  var translate = (0, _react.useCallback)(function (id) {
     return emitEvent({
       type: 'translate',
       payload: id
     });
-  };
-
-  var getCurrentMessage = function getCurrentMessage() {
+  }, [emitEvent]);
+  var getCurrentMessage = (0, _react.useCallback)(function () {
     if (voiceOver) {
       return currentLineData;
     }
@@ -90,9 +97,65 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     return currentLineData.slots.find(function (slot) {
       return slot.uid && slot.text;
     });
-  };
+  }, [currentLineData, voiceOver]);
+  var getVoice = (0, _react.useCallback)(function (_ref2) {
+    var id = _ref2.id,
+        _ref2$type = _ref2.type,
+        type = _ref2$type === void 0 ? 'base' : _ref2$type;
+    var usedVoices = translate('usedVoices');
+    var gameChars = translate('gameCharacters');
+
+    if (type === 'base') {
+      return usedVoices === null || usedVoices === void 0 ? void 0 : usedVoices[id];
+    } else if (type === 'character') {
+      var _gameChars$id;
+
+      return gameChars === null || gameChars === void 0 ? void 0 : (_gameChars$id = gameChars[id]) === null || _gameChars$id === void 0 ? void 0 : _gameChars$id.voiceId;
+    }
 
-  var currentMessage = !decision ? getCurrentMessage() : {}; // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
+    return null;
+  }, [translate]);
+  var currentMessage = (0, _react.useMemo)(function () {
+    return !decision ? getCurrentMessage() : {};
+  }, [getCurrentMessage, decision]);
+  var playSpeech = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var payload, speechUrl;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!currentLineData.voice.id) {
+              _context.next = 7;
+              break;
+            }
+
+            payload = {
+              voiceId: getVoice(currentLineData.voice),
+              text: currentMessage.text
+            };
+
+            if (!(payload.voiceId && payload.text)) {
+              _context.next = 7;
+              break;
+            }
+
+            _context.next = 5;
+            return emitEvent({
+              type: 'playSpeech',
+              payload: payload
+            });
+
+          case 5:
+            speechUrl = _context.sent;
+            playSound(speechUrl);
+
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })), [currentLineData.voice, getVoice, currentMessage, emitEvent, playSound]); // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
 
   var leftWithSlots = lines.slice(0, currentLine + 1).reverse().find(function (line) {
     return line.slots;
@@ -177,6 +240,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     if (line + 1 <= maxLine) {
       setCurrentLine(line + 1);
     } else {
+      setFinished(true);
       emitEvent({
         type: 'success'
       });
@@ -192,13 +256,20 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   };
 
   (0, _react.useEffect)(function () {
-    var _lines$currentLine, _lines$currentLine$au;
+    var _currentLineData$audi;
+
+    if ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'voice' && !finished) {
+      playSpeech();
+    } else if (currentLineData !== null && currentLineData !== void 0 && (_currentLineData$audi = currentLineData.audio) !== null && _currentLineData$audi !== void 0 && _currentLineData$audi.url) {
+      var _currentLineData$audi2;
+
+      playSound(currentLineData === null || currentLineData === void 0 ? void 0 : (_currentLineData$audi2 = currentLineData.audio) === null || _currentLineData$audi2 === void 0 ? void 0 : _currentLineData$audi2.url);
+    }
 
-    playSound((_lines$currentLine = lines[currentLine]) === null || _lines$currentLine === void 0 ? void 0 : (_lines$currentLine$au = _lines$currentLine.audio) === null || _lines$currentLine$au === void 0 ? void 0 : _lines$currentLine$au.url);
     return function () {
       stop();
     };
-  }, [currentLine, lines, playSound, stop]);
+  }, [currentLineData, currentMessage, finished, lines, playSound, playSpeech, stop]);
 
   var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
     onFinish: handleClickNext,

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

@@ -45,12 +45,14 @@ var SlotList = function SlotList(_ref) {
     if (current.character) {
       char.name = current.alias || current.character.name;
       char.resource = char.character.resource;
+      char.position = char.position >= 0 ? char.position : -1;
       delete char.character;
       char.type = 'character';
       acc.push(char);
     } else if (actor) {
       var resource = actor.resource;
       char.name = current.alias || current.name;
+      char.position = char.position >= 0 ? char.position : -1;
       char.resource = resource;
       char.type = actor.type;
       acc.push(char);
@@ -83,7 +85,7 @@ var SlotList = function SlotList(_ref) {
           key: character.uid + index
         }, characterProps({
           character: character,
-          active: character.talking,
+          active: currentMessage.position === character.position,
           slot: index
         })));
       });

package/dist/components/conversational-pro-component/mocks/mockForStory.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.conversationPropsLodSettings = exports.conversationPropsNoFeedbackNoRewards = exports.withoutBackground = exports.voiceOverProps = exports.conversationProps = exports.converOld = void 0;
+exports.textToSpeechProps = exports.conversationPropsLodSettings = exports.conversationPropsNoFeedbackNoRewards = exports.withoutBackground = exports.voiceOverProps = exports.conversationProps = exports.converOld = void 0;
 
 var _mocker = require("helpers/mocker");
 
@@ -1131,4 +1131,104 @@ var conversationPropsLodSettings = {
     uid: 'kjTHqx'
   }]
 };
-exports.conversationPropsLodSettings = conversationPropsLodSettings;
+exports.conversationPropsLodSettings = conversationPropsLodSettings;
+var textToSpeechProps = {
+  "actors": [],
+  "background": {},
+  "lines": [{
+    "audioId_labelId": "audioId_0_u8GqjXR4",
+    "audioType": "voice",
+    "flex": false,
+    "hasAlias": true,
+    "slots": [{
+      "alias": "alias_0_0_u8GqgZXt",
+      "alias_labelId": "alias_0_0_u8GqgZXt",
+      "emotion": "neutral",
+      "talking": true,
+      "text": "text_0_0_u8Gqfb0d",
+      "text_labelId": "text_0_0_u8Gqfb0d",
+      "uid": "OxVPqm"
+    }, {
+      "alias_labelId": "alias_0_1_u8GqgVBv",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_1_u8GqgH0e",
+      "uid": null
+    }, {
+      "alias_labelId": "alias_0_2_u8GqgGOU",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_2_u8GqgCxs",
+      "uid": null
+    }, {
+      "alias_labelId": "alias_0_3_u8Gqhwkb",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_3_u8GqhLmZ",
+      "uid": null
+    }, {
+      "alias_labelId": "alias_0_4_u8GqhHJG",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_4_u8Gqh68W",
+      "uid": null
+    }],
+    "text_labelId": "text_0_u8Gqjbqa",
+    "voice": {
+      type: "character",
+      id: "OxVPqm"
+    }
+  }, {
+    "audioId_labelId": "audioId_0_u8GqjXR4",
+    "audioType": "voice",
+    "flex": false,
+    "hasAlias": true,
+    "slots": [{
+      "alias": "alias_0_0_u8GqgZXt",
+      "alias_labelId": "alias_0_0_u8GqgZXt",
+      "emotion": "neutral",
+      "talking": true,
+      "text": "text_0_0_u8Gqfb0d",
+      "text_labelId": "text_0_0_u8Gqfb0d",
+      "uid": "OxVPqm"
+    }, {
+      "alias_labelId": "alias_0_1_u8GqgVBv",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_1_u8GqgH0e",
+      "uid": null
+    }, {
+      "alias_labelId": "alias_0_2_u8GqgGOU",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_2_u8GqgCxs",
+      "uid": null
+    }, {
+      "alias_labelId": "alias_0_3_u8Gqhwkb",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_3_u8GqhLmZ",
+      "uid": null
+    }, {
+      "alias_labelId": "alias_0_4_u8GqhHJG",
+      "emotion": "neutral",
+      "talking": false,
+      "text": "",
+      "text_labelId": "text_0_4_u8Gqh68W",
+      "uid": null
+    }],
+    "text_labelId": "text_0_u8Gqjbqa",
+    voice: {
+      type: "base",
+      id: "female_01"
+    }
+  }]
+};
+exports.textToSpeechProps = textToSpeechProps;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.24.8",
+  "version": "0.24.10",
   "main": "dist/index.js",
   "files": [
     "dist",