@gamelearn/arcade-components 1.20.1 → 1.21.1

package/dist/components/animation-component/components/AnimationComponent.js

@@ -31,6 +31,8 @@ var AnimationComponent = function AnimationComponent(_ref) {
   var animation = _ref.animation,
       loopTimes = _ref.loopTimes,
       resource = _ref.resource,
+      enableInteraction = _ref.enableInteraction,
+      makeDefault = _ref.makeDefault,
       emitEvent = _ref.emitEvent;
 
   var _useState = (0, _react.useState)(false),
@@ -46,7 +48,7 @@ var AnimationComponent = function AnimationComponent(_ref) {
   }, []);
   (0, _react.useEffect)(function () {
     setMounted(false);
-  }, [resource.elementUid, animation.url]);
+  }, [resource.uid, animation.url]);
   (0, _react.useEffect)(function () {
     if (!mounted) {
       var object;
@@ -57,6 +59,10 @@ var AnimationComponent = function AnimationComponent(_ref) {
       });
 
       if (object) {
+        var canInteract = enableInteraction;
+        if (canInteract) emitEvent({
+          type: 'success'
+        });
         loader.load(animation.url, function (gltf) {
           var mixer = object.userData.mixer;
           var defaultAnim = object.userData.defaultAnim;
@@ -68,7 +74,18 @@ var AnimationComponent = function AnimationComponent(_ref) {
 
           var finishCallback = function finishCallback() {
             (0, _helpers.executeCrossFade)(currentAction, oldAction, 0.5);
-            emitEvent({
+
+            if (makeDefault) {
+              emitEvent({
+                type: 'saveAnimation',
+                payload: {
+                  uid: resource.uid,
+                  animation: animation.id
+                }
+              });
+            }
+
+            if (!canInteract) emitEvent({
               type: 'success'
             });
             mixer.removeEventListener('finished', finishCallback);
@@ -83,7 +100,7 @@ var AnimationComponent = function AnimationComponent(_ref) {
         });
       }
     }
-  }, [scene, animation.url, loopTimes, emitEvent, mounted, loader, resource.uid]);
+  }, [scene, animation.url, loopTimes, emitEvent, mounted, loader, resource.uid, makeDefault, animation, resource, enableInteraction]);
   return null;
 };
 

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

@@ -300,6 +300,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   };
 
   var autoplayCond = automatic && !isDecision;
+  var disableBackButton = currentLine === 0 || currentLine > 0 && (lastLine === null || lastLine === void 0 ? void 0 : lastLine.decision);
   var stopEkho = (0, _useEkho.default)({
     audioType: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType,
     voice: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.voice,
@@ -332,7 +333,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     return function () {
       stop();
     };
-  }, [currentMessage, start, stop, handleClickNext, currentLineData.audioType, autoplayCond, audioFailed]);
+  }, [currentMessage, start, stop, handleClickNext, currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType, autoplayCond, audioFailed]);
 
   var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
     required: !isBranched,
@@ -368,8 +369,8 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   }) : null, /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--controls"
   }, /*#__PURE__*/_react.default.createElement("button", {
-    className: "gat--btn__round ".concat(currentLine > 0 && (!lastLine.decision || isBranched) ? '' : 'disabled'),
-    disabled: currentLine > 0 && (!lastLine.decision || isBranched) ? '' : true,
+    className: "gat--btn__round ".concat(disableBackButton ? 'disabled' : ''),
+    disabled: disableBackButton ? true : '',
     type: "button",
     onClick: manualClickBack
   }, /*#__PURE__*/_react.default.createElement("span", {

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

@@ -200,14 +200,16 @@ var DialogComponent = function DialogComponent(_ref) {
     var defaultAction = mixer.clipAction(element.userData.defaultAnim, element);
 
     if (element.userData.currentEmotion !== defaultAction) {
-      mixer.stopAllAction();
-      (0, _helpers.executeCrossFade)(startAction, defaultAction, crossFadeDuration);
+      setTimeout(function () {
+        mixer.stopAllAction();
+        (0, _helpers.executeCrossFade)(startAction, defaultAction, crossFadeDuration / Math.floor(Math.random() * 3));
 
-      if (element.userData.currentEmotion) {
-        element.userData.lastEmotion = element.userData.currentEmotion;
-      }
+        if (element.userData.currentEmotion) {
+          element.userData.lastEmotion = element.userData.currentEmotion;
+        }
 
-      element.userData.currentEmotion = defaultAction;
+        element.userData.currentEmotion = defaultAction;
+      }, Math.floor(Math.random() * 3) * 500);
     }
   }; // Reset currentEmotion to defaultAnim
 
@@ -359,12 +361,14 @@ var DialogComponent = function DialogComponent(_ref) {
 
         if (element) {
           loadEmotion(slot, element, function (mixer, action, defaultAction) {
-            var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
+            setTimeout(function () {
+              var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
 
-            if (startAction && action && startAction !== action) {
-              mixer.stopAllAction();
-              (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
-            }
+              if (startAction && action && startAction !== action) {
+                mixer.stopAllAction();
+                (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration / Math.floor(Math.random() * 3));
+              }
+            }, Math.floor(Math.random() * 3) * 500);
           });
         }
       }); // Talking element logic
@@ -586,6 +590,7 @@ var DialogComponent = function DialogComponent(_ref) {
     height: '100vh',
     position: 'static'
   };
+  var disableBackButton = line === 0 || line > 0 && (lastLine === null || lastLine === void 0 ? void 0 : lastLine.decision);
 
   if (isDecision) {
     var decisionPayload = _objectSpread(_objectSpread({}, currentLine.payload), {}, {
@@ -601,7 +606,7 @@ var DialogComponent = function DialogComponent(_ref) {
     });
 
     return /*#__PURE__*/_react.default.createElement(_arcadeThreeCore.HtmlPro, {
-      zIndexRange: [3, 3],
+      zIndexRange: [6, 6],
       style: cleanStyle,
       calculatePosition: function calculatePosition() {
         return [0, 0];
@@ -630,7 +635,7 @@ var DialogComponent = function DialogComponent(_ref) {
       width: '100vw',
       height: '100vh'
     },
-    zIndexRange: [3, 3],
+    zIndexRange: [6, 6],
     onOcclude: function onOcclude() {},
     calculatePosition: function calculatePosition() {
       return [0, 0];
@@ -639,10 +644,10 @@ var DialogComponent = function DialogComponent(_ref) {
     dir: (0, _LangIsRtl.default)() ? 'rtl' : 'ltr',
     className: "dialog-component-controls"
   }, /*#__PURE__*/_react.default.createElement("button", {
-    disabled: line <= 0 || (lastLine === null || lastLine === void 0 ? void 0 : lastLine.decision) || isBranched,
+    disabled: disableBackButton,
     type: "button",
     onClick: manualBackLine,
-    className: "gat--btn__round ".concat(line <= 0 || lastLine !== null && lastLine !== void 0 && lastLine.decision || isBranched ? 'disabled' : '')
+    className: "gat--btn__round ".concat(disableBackButton ? 'disabled' : '')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _LangIsRtl.default)() ? 'icon-next' : 'icon-back'
   })), /*#__PURE__*/_react.default.createElement("button", {

package/package.json

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