_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
_Bastler 2021-06-24 15:42:47 +02:00
commit 3cb877cee0
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/src/Phaser/Game/GameScene.ts
View File

@ -498,12 +498,6 @@ export class GameScene extends DirtyScene {
this.openChatIcon = new OpenChatIcon(this, 2, this.game.renderer.height - 2) this.openChatIcon = new OpenChatIcon(this, 2, this.game.renderer.height - 2)
// FIXME: change this to use the UserInputManager class for input
// FIXME: Comment this feature because when user write M key in report input, the layout change.
/*this.input.keyboard.on('keyup-M', () => {
this.switchLayoutMode();
});*/
this.reposition(); this.reposition();
// From now, this game scene will be notified of reposition events // From now, this game scene will be notified of reposition events
@ -1189,7 +1183,6 @@ ${escapedMessage}
createCollisionWithPlayer() { createCollisionWithPlayer() {
//add collision layer //add collision layer
for (const phaserLayer of this.gameMap.phaserLayers) { for (const phaserLayer of this.gameMap.phaserLayers) {
if (phaserLayer.type == "tilelayer") {
this.physics.add.collider(this.CurrentPlayer, phaserLayer, (object1: GameObject, object2: GameObject) => { this.physics.add.collider(this.CurrentPlayer, phaserLayer, (object1: GameObject, object2: GameObject) => {
//this.CurrentPlayer.say("Collision with layer : "+ (object2 as Tile).layer.name) //this.CurrentPlayer.say("Collision with layer : "+ (object2 as Tile).layer.name)
}); });
@ -1205,7 +1198,6 @@ ${escapedMessage}
//}); //});
} }
} }
}
createCurrentPlayer() { createCurrentPlayer() {
//TODO create animation moving between exit and start //TODO create animation moving between exit and start

2
front/src/Phaser/Menu/MenuScene.ts
View File

@ -112,8 +112,8 @@ export class MenuScene extends Phaser.Scene {
this.gameReportElement = new ReportMenu(this, connectionManager.getConnexionType === GameConnexionTypes.anonymous); this.gameReportElement = new ReportMenu(this, connectionManager.getConnexionType === GameConnexionTypes.anonymous);
showReportScreenStore.subscribe((user) => { showReportScreenStore.subscribe((user) => {
this.closeAll();
if (user !== null) { if (user !== null) {
this.closeAll();
this.gameReportElement.open(user.userId, user.userName); this.gameReportElement.open(user.userId, user.userName);
} }
}); });