lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

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

Browse source
This commit is contained in:
GRL 2021-06-28 12:01:08 +02:00
parent b182a08ca2 63d4c99d15
commit ed84dacb9c
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
front/src/Phaser/Game/GameScene.ts
View file

@ -161,6 +161,7 @@ export class GameScene extends DirtyScene {
private createPromiseResolve!: (value?: void | PromiseLike<void>) => void;
private iframeSubscriptionList!: Array<Subscription>;
private peerStoreUnsubscribe!: () => void;
private biggestAvailableAreaStoreUnsubscribe!: () => void;
MapUrlFile: string;
RoomId: string;
instance: string;
@ -498,16 +499,10 @@ export class GameScene extends DirtyScene {
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();
// From now, this game scene will be notified of reposition events
biggestAvailableAreaStore.subscribe((box) => this.updateCameraOffset(box));
this.biggestAvailableAreaStoreUnsubscribe = biggestAvailableAreaStore.subscribe((box) => this.updateCameraOffset(box));
this.triggerOnMapLayerPropertyChange();
this.listenToIframeEvents();
@ -1035,6 +1030,7 @@ ${escapedMessage}
this.pinchManager?.destroy();
this.emoteManager.destroy();
this.peerStoreUnsubscribe();
this.biggestAvailableAreaStoreUnsubscribe();
mediaManager.hideGameOverlay();

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);
showReportScreenStore.subscribe((user) => {
this.closeAll();
if (user !== null) {
this.closeAll();
this.gameReportElement.open(user.userId, user.userName);
}
});