@gamelearn/arcade-components 2.25.1 → 2.26.0

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

@@ -11,7 +11,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var FeedBack = function FeedBack(_ref) {
   var choice = _ref.choice,
-      inherited = _ref.inherited;
+      inherited = _ref.inherited,
+      question = _ref.question;
 
   var Wrapper = function Wrapper(_ref2) {
     var children = _ref2.children;
@@ -34,7 +35,7 @@ var FeedBack = function FeedBack(_ref) {
   if (!choice.feedback) return null;
   return /*#__PURE__*/_react.default.createElement(Wrapper, null, choice.feedback ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--feedback__title"
-  }, "Feedback"), /*#__PURE__*/_react.default.createElement("div", {
+  }, question), /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--feedback__text",
     dir: "auto"
   }, choice.right ? /*#__PURE__*/_react.default.createElement("span", {

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

@@ -295,7 +295,7 @@ var DialogComponent = function DialogComponent(_ref) {
         onLoadAnim(mixer, emotionAction, defaultAction);
       });
     } else {
-      onLoadAnim();
+      onLoadAnim(mixer);
     }
   }, [loader]); // Force default animation without transition
 
@@ -696,9 +696,17 @@ var DialogComponent = function DialogComponent(_ref) {
           var element = getCurrentVisible(slot.uid);
 
           if (element) {
-            loadEmotion(slot, element, function (_, action, defaultAction) {
+            loadEmotion(slot, element, function (mixer, action, defaultAction) {
               var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
-              (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
+
+              if (startAction !== action && action) {
+                var clip = action.getClip();
+                var actionS = mixer.existingAction(clip, element);
+
+                if (!actionS.isRunning()) {
+                  (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
+                }
+              }
             });
           }
         });
@@ -712,8 +720,13 @@ var DialogComponent = function DialogComponent(_ref) {
             var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
 
             if (startAction && action && startAction !== action) {
-              (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
-              element.userData.defaultAnim = action.getClip();
+              var clip = action.getClip();
+              var actionS = mixer.existingAction(clip, element);
+
+              if (!actionS.isRunning()) {
+                (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
+                element.userData.defaultAnim = action.getClip();
+              }
             }
 
             setTimeout(function () {

package/dist/helpers/index.js

@@ -185,7 +185,6 @@ var executeCrossFade = function executeCrossFade(startAction, endAction) {
   startAction.play();
   startAction.reset();
   endAction.reset();
-  endAction.time = 0;
   setWeight(endAction, 1);
   endAction.crossFadeFrom(startAction, crossFadeDuration, true);
   endAction.play();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "2.25.1",
+  "version": "2.26.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@gamelearn/arcade-styles": "2.17.2",
+    "@gamelearn/arcade-styles": "2.18.0",
     "@gamelearn/arcade-three-core": "1.24.3",
     "@react-three/a11y": "^3.0.0",
     "@react-three/drei": "9.4.3",