@gamelearn/arcade-components 1.4.23 → 1.4.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -227,7 +227,7 @@ var DialogComponent = function DialogComponent(_ref) {
|
|
|
227
227
|
var animation = (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[slot.emotion];
|
|
228
228
|
var mixer = element.userData.mixer;
|
|
229
229
|
|
|
230
|
-
if (animation && animation.url) {
|
|
230
|
+
if (animation && animation.url && !element.isSeated) {
|
|
231
231
|
loader.load(animation.url, function (anim) {
|
|
232
232
|
var emotionClip = anim.animations[0];
|
|
233
233
|
var defaultClip = element.userData.defaultAnim;
|
|
@@ -327,17 +327,15 @@ var DialogComponent = function DialogComponent(_ref) {
|
|
|
327
327
|
return parseInt(edge.fromPointIndex) === currentId;
|
|
328
328
|
});
|
|
329
329
|
var destinationEdge = lines.findIndex(function (l) {
|
|
330
|
-
return l.id === currentEdge.toId;
|
|
330
|
+
return l.id === (currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.toId);
|
|
331
331
|
});
|
|
332
332
|
|
|
333
|
-
if (destinationEdge) {
|
|
334
|
-
if (currentEdge.fromId === currentEdge.toId) {
|
|
333
|
+
if (destinationEdge >= 0) {
|
|
334
|
+
if ((currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.fromId) === (currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.toId)) {
|
|
335
335
|
reset();
|
|
336
|
-
} else
|
|
336
|
+
} else {
|
|
337
337
|
setCurrentMessage({});
|
|
338
338
|
changeLine(destinationEdge);
|
|
339
|
-
} else {
|
|
340
|
-
finishConversation();
|
|
341
339
|
}
|
|
342
340
|
} else {
|
|
343
341
|
finishConversation();
|