From ea4ad61cab38d7beeb47284d8f310366b9e002c6 Mon Sep 17 00:00:00 2001
From: "julien.bouin.etu" <julien.bouin.etu@univ-lille.fr>
Date: Fri, 5 Apr 2024 10:05:20 +0200
Subject: [PATCH] #36 Deconnexion de l'avatar et ajout d'une limite
---
client/src/main.js | 8 ++++-
server/index.js | 82 ++++++++++++++++++++++++----------------------
2 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/client/src/main.js b/client/src/main.js
index 86f200f..590aa6d 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -121,7 +121,9 @@ function render() {
if (avatars[i] != undefined) {
context.fillStyle = colors[i - 1];
const x = 10 + i * 100;
- context.fillText(avatars[i].score, x, 50);
+ if (avatars[i].score != undefined) {
+ context.fillText(avatars[i].score, x, 50);
+ }
imageCoeur.src = `/images/heart${i}.webp`;
console.log(imageCoeur.src);
for (let j = 0; j < avatars[i].vies; j++) {
@@ -200,6 +202,10 @@ function render() {
let avatars = [];
+socket.on('disconnectEvent', id => {
+ avatars[id] = {};
+});
+
socket.on('newAvatar', data => {
avatars[data.id] = { x: data.x, y: data.y };
});
diff --git a/server/index.js b/server/index.js
index b075ad7..c3f5e1e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -23,12 +23,6 @@ const fileOptions = { root: process.cwd() };
addWebpackMiddleware(app);
const io = new IOServer(httpServer);
-io.on('connection', socket => {
- console.log(`Nouvelle connexion du client ${socket.id}`);
- socket.on('disconnect', () => {
- console.log(`Déconnexion du client ${socket.id}`);
- });
-});
app.use(express.static('client/public'));
@@ -52,45 +46,53 @@ let LVL2start = false;
io.on('connection', socket => {
cpt++;
- console.log(cpt);
- const avatar = new Avatar(`${socket.id}`, cpt);
- console.log('Connexion du client' + socket.id);
- io.emit('newAvatar', { id: cpt, x: avatar.getX(), y: avatar.getY() });
- avatars.push(avatar);
- socket.on('disconnect', () => {
- console.log(`Déconnexion du client ${socket.id}`);
- });
+ if (cpt <= 4) {
+ const avatar = new Avatar(`${socket.id}`, cpt);
+ io.emit('newAvatar', { id: cpt, x: avatar.getX(), y: avatar.getY() });
+ avatars.push(avatar);
+
+ socket.on('disconnect', () => {
+ avatars.forEach(avatar => {
+ if (avatar.nom == socket.id) {
+ console.log('taille du tableau : ' + avatars.length);
+ io.emit('disconnectEvent', avatar.id);
+ avatars.splice(avatars.indexOf(avatar), 1);
+ console.log('taille du tableau : ' + avatars.length);
+ }
+ });
+ console.log(`Déconnexion du client ${socket.id}`);
+ });
- socket.on('clickEvent', clickEvent => {
- const playerAvatar = avatars.find(avatar => avatar.nom === clickEvent.id);
- if (playerAvatar) {
- playerAvatar.click[clickEvent.key] = clickEvent.pressed;
- } else {
- console.log(`Aucun avatar trouvé avec le nom ${clickEvent.id}`);
- }
- });
+ socket.on('clickEvent', clickEvent => {
+ const playerAvatar = avatars.find(avatar => avatar.nom === clickEvent.id);
+ if (playerAvatar) {
+ playerAvatar.click[clickEvent.key] = clickEvent.pressed;
+ } else {
+ console.log(`Aucun avatar trouvé avec le nom ${clickEvent.id}`);
+ }
+ });
- socket.on('shoot', shoot => {
- const playerAvatar = avatars.find(avatar => avatar.nom === shoot.id);
+ socket.on('shoot', shoot => {
+ const playerAvatar = avatars.find(avatar => avatar.nom === shoot.id);
- if (canShoot) {
- playerAvatar.tirer();
- canShoot = false;
- setTimeout(function () {
- canShoot = true;
- }, 100);
- }
- });
+ if (canShoot) {
+ playerAvatar.tirer();
+ canShoot = false;
+ setTimeout(function () {
+ canShoot = true;
+ }, 100);
+ }
+ });
- socket.on('LVL2', LVL2start => {
- LVL2start = true;
- //console.log(LVL2start);
- });
+ socket.on('LVL2', LVL2start => {
+ LVL2start = true;
+ });
- socket.on('canvasSize', canvasSize => {
- console.log(canvasSize);
- canvasSize = canvasSize;
- });
+ socket.on('canvasSize', canvasSize => {
+ console.log(canvasSize);
+ canvasSize = canvasSize;
+ });
+ }
});
let spawnIntervalLV1 = setInterval(() => {
--
GitLab