diff --git a/Basket/BDD.db b/Basket/BDD.db index 6fe9b75..ff46ded 100644 Binary files a/Basket/BDD.db and b/Basket/BDD.db differ diff --git a/Basket/basket.php b/Basket/basket.php index 889f7e5..94c047d 100644 --- a/Basket/basket.php +++ b/Basket/basket.php @@ -805,7 +805,7 @@ $sedeplace=$_POST['sedeplace'.$i]; $tiring=$_POST['tiring'.$i]; $isDragging=$_POST['isDragging'.$i]; - $dribb=$_POST['dribb'.$i]; + $dribb=$_POST['dribbb'.$i]; $statement = $db->query('INSERT INTO JOUEUR (numero,posX,posY,rayon,couleur,gottheball,setball,sedeplace,tiring,isDragging,appartient,dribbb) VALUES ("'.$numero.'","'.$posX.'","'.$posY.'","'.$rayon.'","'.$couleur.'","'.$gottheball.'","'.$setball.'","'.$sedeplace.'","'.$tiring.'","'.$isDragging.'","'.$appar.'","'.$dribb.'");'); @@ -983,7 +983,7 @@ $sedeplace=$_POST['sedeplace'.$i]; $tiring=$_POST['tiring'.$i]; $isDragging=$_POST['isDragging'.$i]; - $dribb=$_POST['dribb'.$i]; + $dribb=$_POST['dribbb'.$i]; $statement = $db->query('INSERT INTO JOUEUR (numero,posX,posY,rayon,couleur,gottheball,setball,sedeplace,tiring,isDragging,appartient,dribbb) VALUES ("'.$numero.'","'.$posX.'","'.$posY.'","'.$rayon.'","'.$couleur.'","'.$gottheball.'","'.$setball.'","'.$sedeplace.'","'.$tiring.'","'.$isDragging.'","'.$idPlanCharge.'","'.$dribb.'");'); @@ -1106,7 +1106,7 @@ $zonedit=$_POST['zonedit'.$j]; $state = $db->query('INSERT INTO ZONE (X,Y,rayon,isDragging,edit,appartient,numero) - VALUES ("'.$zonX.'","'.$zonY.'","'.$zonrayon.'","'.$zonisDragging.'","'.$zonedit.'","'.$idPlanCharge.'","'.$zonenum.'");'); + VALUES ("'.$zonX.'","'.$zonY.'","'.$zonrayon.'","'.$zonisDragging.'","'.$zonedit.'","'.$appar.'","'.$zonenum.'");'); } echo "ok"; diff --git a/Basket/rectest.js b/Basket/rectest.js index cca8438..3896d82 100644 --- a/Basket/rectest.js +++ b/Basket/rectest.js @@ -234,9 +234,9 @@ function draw() { dribdeu(); } if(dribblement.length%4 == 0 && dribblement.length>0){ - dribblage(); - } - if(currentdep == 1 || deple.length > 0){ + dribblage(); + } + if(currentdep == 1 || deple.length > 0){ deplacer(); } if(nbzone == 1){ @@ -264,10 +264,10 @@ for (var i = 0; i < adversaire.length; i++) { if(r.setball == true){ r.fill = "green"; } - tx = r.a + r.rayon*Math.cos(r.angle); - ty = r.b+ r.rayon *Math.sin(r.angle); - px = r.a + r.rayon*Math.cos(r.inverse); - py = r.b+ r.rayon *Math.sin(r.inverse); + tx = r.x + r.rayon*Math.cos(r.angle); + ty = r.y+ r.rayon *Math.sin(r.angle); + px = r.x + r.rayon*Math.cos(r.inverse); + py = r.y+ r.rayon *Math.sin(r.inverse); rx = tx + r.rretour *Math.cos(r.rangle); ry = ty+ r.rretour *Math.sin(r.rangle); ox = px + r.rretour*Math.cos(r.rangle); @@ -323,15 +323,15 @@ function myDown(e) { untoggleDonner(); } else - window.alert("Un seul ballon sur le terrain"); - ball = false; - draw(); - } - } - untoggleDonner(); - ball = false; - } - if(edit == true){ + window.alert("Un seul ballon sur le terrain"); + ball = false; + draw(); + } + } + untoggleDonner(); + ball = false; + } + if(edit == true){ dragok = false; for (var i = 0; i < zone.length; i++) { var r = zone[i]; @@ -437,22 +437,22 @@ function myDown(e) { for(h = 0;h< (nbptsdep/4);h++){ var r = deple[3+h*4]; if (mx > r.x - 2*r.rayon && mx < r.x + 2*r.rayon && my > r.y - 2*r.rayon && my < r.y + 2*r.rayon) { - r.ec = true; - ecra = false; - untoggleecran(); - draw(); - } - } - - for(h = 0;h< (nbdepdeu/2);h++){ + r.ec = true; + ecra = false; + untoggleecran(); + draw(); + } + } + + for(h = 0;h< (nbdepdeu/2);h++){ var r = depdeu[1+h*2]; if (mx > r.x - 2*r.rayon && mx < r.x + 2*r.rayon && my > r.y - 2*r.rayon && my < r.y + 2*r.rayon) { - r.ec = true; - ecra = false; - untoggleecran(); - draw(); - } - } + r.ec = true; + ecra = false; + untoggleecran(); + draw(); + } + } } @@ -689,7 +689,7 @@ if(passable == true ){ } } if(tirable == true){ - for (var i = 0; i < joueurs.length; i++) { + for (var i = 0; i < joueurs.length; i++) { var r = joueurs[i]; if (mx > r.x - r.rayon && mx < r.x + r.rayon && my > r.y - r.rayon && my < r.y + r.rayon) { if(r.gottheball == true){ @@ -845,35 +845,36 @@ function myMove(e) { r.x += dx; r.y += dy; if(r.sedeplace == true){ - var a = deple.length/4; - for(var h = 0;h2){ - - nbzone=1; - nbpoints=taillezone; - console.log(zone); - console.log(nbzone); + var zoneedit= document.getElementById('zoneedit'+i).value; + if (zoneedit == 'true'){ + zoneedit = true; + }else{ + zoneedit = false; } - draw(); + zone.push({ + + x : zX, + y : zY, + edit : zoneedit, + rayon : zrayon, + isDragging : zoneisDragging, + }); +} +if(taillezone>2){ + + nbzone=1; + nbpoints=taillezone; + console.log(zone); + console.log(nbzone); +} +draw(); }