felix/workadventure
1
0
Fork 0
Code 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
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 createPromiseResolve!: (value?: void | PromiseLike<void>) => void;
private iframeSubscriptionList!: Array<Subscription>; private iframeSubscriptionList!: Array<Subscription>;
private peerStoreUnsubscribe!: () => void; private peerStoreUnsubscribe!: () => void;
private biggestAvailableAreaStoreUnsubscribe!: () => void;
MapUrlFile: string; MapUrlFile: string;
RoomId: string; RoomId: string;
instance: string; instance: string;
@ -498,16 +499,10 @@ 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
biggestAvailableAreaStore.subscribe((box) => this.updateCameraOffset(box)); this.biggestAvailableAreaStoreUnsubscribe = biggestAvailableAreaStore.subscribe((box) => this.updateCameraOffset(box));
this.triggerOnMapLayerPropertyChange(); this.triggerOnMapLayerPropertyChange();
this.listenToIframeEvents(); this.listenToIframeEvents();
@ -1035,6 +1030,7 @@ ${escapedMessage}
this.pinchManager?.destroy(); this.pinchManager?.destroy();
this.emoteManager.destroy(); this.emoteManager.destroy();
this.peerStoreUnsubscribe(); this.peerStoreUnsubscribe();
this.biggestAvailableAreaStoreUnsubscribe();
mediaManager.hideGameOverlay(); 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); 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);
} }
}); });