diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Opponent.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Opponent.js index 7d2d94a..65d283a 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Opponent.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Opponent.js @@ -6,7 +6,7 @@ /* By: edbernar { + thisClass.object.position.y += thisClass.speed / 40; + if (thisClass.object.position.y >= thisClass.limits.up) + { + clearInterval(thisClass.interval); + thisClass.interval = null; + } + }, 5); + } + else if (!content.up && thisClass.object.position.y > thisClass.limits.down) + { + if (this.interval) + clearInterval(this.interval); + this.interval = setInterval(() => { + thisClass.object.position.y -= thisClass.speed / 40; + if (thisClass.object.position.y <= thisClass.limits.down) + { + clearInterval(thisClass.interval); + thisClass.interval = null; + thisClass.object.position.y = thisClass.limits.down; + } + }, 5); + } } } diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js index 639d3ce..07d7f93 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js @@ -6,7 +6,7 @@ /* By: edbernar { @@ -222,6 +224,7 @@ class Player } if (pressedButton[i] == 's' && this.object.position.y > this.limits.down) { + this.isUp = false; if (this.interval) clearInterval(this.interval); this.interval = setInterval(() => { diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js index 9d31291..d86294e 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js @@ -6,11 +6,12 @@ /* By: edbernar { + sendRequest('game', {action: 3, pos: player.object.position.x, up: player.isUp}); + }, 1000 / 20); } static dispose() @@ -160,8 +166,9 @@ function changeBarColor(bar, color) function loop() { player.update(); + opponent.update(); map.update(ball); renderer.render(scene, player.camera); } -export { MultiOnlineGamePage }; +export { MultiOnlineGamePage, opponent }; diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js index 9ef89ad..94c879e 100644 --- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js +++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js @@ -6,21 +6,29 @@ /* By: edbernar