diff --git a/client/src/scenes/home.instances.js b/client/src/scenes/home.instances.js index 34a88773..2d3bf5cb 100644 --- a/client/src/scenes/home.instances.js +++ b/client/src/scenes/home.instances.js @@ -15,20 +15,19 @@ class HomeRankings extends Phaser.Scene { this.add.text(X, Y, 'Instances Scene', TEXT.HEADER); const playerList = this.registry.get('playerList'); const addInstance = (player, i) => { - const joinNormal = this.add - .rectangle(X, Y + HEIGHT * 0.15 * (i + 1), WIDTH * 0.5, HEIGHT * 0.1, 0x888888) - .setInteractive() - .setOrigin(0) - .on('pointerdown', () => { - this.game.events.emit('SET_PLAYER', player); - }); - this.add - .text(joinNormal.getCenter().x, joinNormal.getCenter().y, `${player.instance}`, TEXT.NORMAL) - .setOrigin(0.5, 0.5); + const joinNormal = this.add + .rectangle(X, Y + HEIGHT * 0.15 * (i + 1), WIDTH * 0.5, HEIGHT * 0.1, 0x888888) + .setInteractive() + .setOrigin(0) + .on('pointerdown', () => { + this.game.events.emit('SET_PLAYER', player); + }); + this.add + .text(joinNormal.getCenter().x, joinNormal.getCenter().y, `${player.instance}`, TEXT.NORMAL) + .setOrigin(0.5, 0.5); }; playerList.forEach(addInstance); - } cleanUp() { diff --git a/client/src/scenes/home.js b/client/src/scenes/home.js index a8bd51eb..2f7789a3 100644 --- a/client/src/scenes/home.js +++ b/client/src/scenes/home.js @@ -26,6 +26,8 @@ class Home extends Phaser.Scene { } create() { + this.registry.get('ws').sendAccountPlayers(); + this.registry.events.on('changedata', this.updateData, this); this.registry.events.on('setdata', this.updateData, this); this.scene.manager.add('HomeCryps', HomeCryps, true); diff --git a/client/src/scenes/menu.navigation.js b/client/src/scenes/menu.navigation.js index 39b09617..b6f72656 100644 --- a/client/src/scenes/menu.navigation.js +++ b/client/src/scenes/menu.navigation.js @@ -28,7 +28,6 @@ class MenuNavigation extends Phaser.Scene { .text(ready.getCenter().x, ready.getCenter().y, 'Ready', TEXT.HEADER) .setOrigin(0.5, 0.5); ready.on('pointerdown', () => { - console.log(player); ws.sendInstanceReady(player.instance); }); diff --git a/client/src/socket.js b/client/src/socket.js index 0db1d72f..37f18af7 100644 --- a/client/src/socket.js +++ b/client/src/socket.js @@ -157,7 +157,6 @@ function createSocket(events) { account = login; events.setAccount(login); sendAccountCryps(); - sendAccountPlayers(); } function accountPlayerList(res) {