From 5634394014e2abfdc698667755fe22b36bed01f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=23GEEK=23KingBurger=23kouyk4=20Ma=C3=ABl=23GEEK?= =?UTF-8?q?=23KingBurger=23kouyk4?= Date: Mon, 29 Mar 2021 22:36:37 +0200 Subject: [PATCH] BDD + --- Basket/BDD.db | Bin 81920 -> 81920 bytes Basket/basket.php | 6 +- Basket/rectest.js | 499 +++++++++++++++++++++++----------------------- 3 files changed, 252 insertions(+), 253 deletions(-) diff --git a/Basket/BDD.db b/Basket/BDD.db index 6fe9b75b1ee0dcfdb8d9d4ee372053348d0dc2e3..ff46deda92303be6e147b025c4499ee3b43c0098 100644 GIT binary patch delta 3572 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 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(); }