From 6e472c769cbe3f56965b17dc817b679feabda25c Mon Sep 17 00:00:00 2001 From: hubourge Date: Thu, 26 Sep 2024 15:58:22 +0200 Subject: [PATCH] Game multi - Add fadeInGame when goal - Fix fadeOutGame after goalAnimation --- .../static/javascript/multiOnlineGame/Map.js | 25 +++++++++++++------ .../javascript/multiOnlineGame/Player.js | 12 ++++----- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js index 9551bd7..b08e71a 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js @@ -980,14 +980,25 @@ class Map } }; - updateScore(name, score) + updateScore(name, score) // document.getElementsByTagName('canvas')[0] Si fondu noir marche pas c'est la { - if (name == "player") - score.player++; - else if (name == "opponent") - score.opponent++; - drawScore(score); - textureTextScore.needsUpdate = true; + console.log("fadeIN"); + document.getElementsByTagName('canvas')[3].style.animation = 'fadeInGames 0.99s'; + document.getElementsByTagName('canvas')[3].style.filter = 'brightness(0)'; + + setTimeout(() => { + document.getElementsByTagName('canvas')[3].style.animation = 'fadeOutGames 0.99s'; + document.getElementsByTagName('canvas')[3].style.filter = 'brightness(1)'; + }, 200); + + setTimeout(() => { + if (name == "player") + score.player++; + else if (name == "opponent") + score.opponent++; + drawScore(score); + textureTextScore.needsUpdate = true; + }, 200); } reCreate(name) diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js index 3e088fc..601b591 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js @@ -161,9 +161,9 @@ class Player }, 10); setTimeout(() => { clearInterval(interval); - document.getElementsByTagName('canvas')[0].style.animation = null; - document.getElementsByTagName('canvas')[0].style.animation = 'fadeIn 0.19s'; - document.getElementsByTagName('canvas')[0].style.filter = 'brightness(0)'; + document.getElementsByTagName('canvas')[3].style.animation = null; + document.getElementsByTagName('canvas')[3].style.animation = 'fadeInGames 0.99s'; + document.getElementsByTagName('canvas')[3].style.filter = 'brightness(0)'; setTimeout(() => { this.camera = tmp; this.object.material.color.copy(startColor); @@ -176,9 +176,9 @@ class Player this.object.position.z + 1.5 ); } - document.getElementsByTagName('canvas')[0].style.animation = 'fadeOut 0.199s'; - document.getElementsByTagName('canvas')[0].style.filter = 'brightness(1)'; - }, 200); + document.getElementsByTagName('canvas')[3].style.animation = 'fadeOutGames 0.99s'; + document.getElementsByTagName('canvas')[3].style.filter = 'brightness(1)'; + }, 400); }, 4000); }, 200) }