Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2021-09-20 15:17:30 +02:00
10 changed files with 60 additions and 51 deletions
+12 -14
View File
@@ -300,20 +300,18 @@ export abstract class Character extends Container {
}
private createStartTransition(emoteY: number) {
if (this.emote) {
this.emoteTween = this.scene?.tweens.add({
targets: this.emote,
props: {
alpha: 1,
y: emoteY,
},
ease: "Power2",
duration: 500,
onComplete: () => {
this.startPulseTransition(emoteY);
},
});
}
this.emoteTween = this.scene?.tweens.add({
targets: this.emote,
props: {
alpha: 1,
y: emoteY,
},
ease: "Power2",
duration: 500,
onComplete: () => {
this.startPulseTransition(emoteY);
},
});
}
private startPulseTransition(emoteY: number) {
+3 -3
View File
@@ -644,9 +644,9 @@ export class GameScene extends DirtyScene {
} else {
this.userInputManager.restoreControls();
}
})
});
Promise.all([ this.connectionAnswerPromise as Promise<unknown>, ...scriptPromises ]).then(() => {
Promise.all([this.connectionAnswerPromise as Promise<unknown>, ...scriptPromises]).then(() => {
this.scene.wake();
});
}
@@ -1511,7 +1511,7 @@ export class GameScene extends DirtyScene {
} else {
emoteMenuStore.openEmoteMenu();
}
})
});
this.CurrentPlayer.on(requestEmoteEventName, (emoteKey: string) => {
this.connection?.emitEmoteEvent(emoteKey);
analyticsClient.launchEmote(emoteKey);
-1
View File
@@ -84,5 +84,4 @@ export class Player extends Character {
public isMoving(): boolean {
return this.wasMoving;
}
}