sundowndev
/
Detank
mirror of https://github.com/sundowndev/Detank.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update js

master
sundowndev 2017-12-09 04:30:04 +01:00
parent a691c6324f 06b61e58d2
commit 46ef071b34
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/style.css
View File

@ -66,6 +66,8 @@ body{
padding-top: 150px; padding-top: 150px;
background: rgba(155, 0, 0, 0.85); background: rgba(155, 0, 0, 0.85);
box-shadow: inset 0px 0px 60px 0px rgba(0,0,0,0.75); box-shadow: inset 0px 0px 60px 0px rgba(0,0,0,0.75);
display: none;
z-index: 4;
} }

10
assets/js/script.js
View File

@ -112,7 +112,6 @@ function move(event) {
} }
} }
<<<<<<< Updated upstream
setInterval(function(){ setInterval(function(){
console.log('test'); console.log('test');
if(bulletX == 0 || bulletY == 0){ if(bulletX == 0 || bulletY == 0){
@ -193,9 +192,6 @@ setInterval(function(){
grid.style.background = 'url(./assets/img/bg_bullet.png) no-repeat'; grid.style.background = 'url(./assets/img/bg_bullet.png) no-repeat';
grid.style.backgroundPosition = bulletDir; grid.style.backgroundPosition = bulletDir;
}, 32.12); }, 32.12);
=======
document.addEventListener('keydown', move, false);
>>>>>>> Stashed changes
var ntm = setInterval(function(){ var ntm = setInterval(function(){
x2 = Math.floor(Math.random() * 11); x2 = Math.floor(Math.random() * 11);
@ -218,6 +214,7 @@ var ntm = setInterval(function(){
emplacement = document.querySelector(".line-"+ciblex+" .col-"+cibley); emplacement = document.querySelector(".line-"+ciblex+" .col-"+cibley);
emplacement.classList.add('cible'); emplacement.classList.add('cible');
cibleValue = cibleValue + 1; cibleValue = cibleValue + 1;
<<<<<<< HEAD
if (cibleValue>=4){ if (cibleValue>=4){
// game over // game over
console.log("TAS PERDU"); console.log("TAS PERDU");
@ -227,8 +224,3 @@ var ntm = setInterval(function(){
document.addEventListener('keydown', move, false); document.addEventListener('keydown', move, false);
setPosition(x, y, direction); setPosition(x, y, direction);
=======
}, 3000);
>>>>>>> Stashed changes