From faef66e02dc6fc27ecc646720b211a3406aa73eb Mon Sep 17 00:00:00 2001 From: theo Date: Wed, 10 Mar 2021 16:34:10 +0100 Subject: [PATCH] multi propre --- SwichGIT/MultiFinal/index.php | 6 ++- SwichGIT/MultiFinal/js/main.js | 85 ++++++++++++++++++++++++------ SwichGIT/MultiFinal/mysqlitedb.db | Bin 327680 -> 344064 bytes 3 files changed, 72 insertions(+), 19 deletions(-) diff --git a/SwichGIT/MultiFinal/index.php b/SwichGIT/MultiFinal/index.php index 4b40382..7e5c61e 100644 --- a/SwichGIT/MultiFinal/index.php +++ b/SwichGIT/MultiFinal/index.php @@ -712,14 +712,16 @@ require("ConnexionBDD.php");

Identifiant partie : $idpartie

diff --git a/SwichGIT/MultiFinal/js/main.js b/SwichGIT/MultiFinal/js/main.js index c119db6..285e5f0 100644 --- a/SwichGIT/MultiFinal/js/main.js +++ b/SwichGIT/MultiFinal/js/main.js @@ -129,7 +129,7 @@ class Carte { } } } - console.log("cartesPOS: ",carteselectPos); + //console.log("cartesPOS: ",carteselectPos); var laCarte; for (var i = 0; i < deckPartie.length; i++) { if (this.id == deckPartie[i].identifiant) { @@ -439,7 +439,7 @@ function lancerGameMulti() { for (var i = 0; i < deckPartie.length; i++) { var ajt = deckPartie[i].getMatrice[0] + deckPartie[i].getMatrice[1] + deckPartie[i].getMatrice[2]; listecartes.push(ajt); - console.log(ajt); + //console.log(ajt); } $(document).ready(function () { @@ -487,7 +487,7 @@ function convertCarteToData() { ajt = uneMatrice[0] + '' + uneMatrice[1] + '' + uneMatrice[2];//une fois matrice vierge complétée on transforme ça en data listecartes.push(ajt); - console.log(ajt); + //console.log(ajt); } $(document).ready(function () { @@ -541,7 +541,7 @@ function ConvertUneCarte(carte){ function ConvertInttoCarte(ListeDesCartes){ - console.log("LC",ListeDesCartes); + //console.log("LC",ListeDesCartes); if(ListeDesCartes.length==0){ console.log("Vide"); } @@ -555,21 +555,21 @@ function ConvertInttoCarte(ListeDesCartes){ if(ListeDesCartes[j][i]==1){ var premierefigure= new Figure(TypeFigure.Petit,FormeFigure.Rond,Math.floor(i/4),(i%4)); lesfigure.push(premierefigure); - console.log("cc1",j," ",i); + //console.log("cc1",j," ",i); } else if(ListeDesCartes[j][i]==2){ var deuxiemefigure = new Figure(TypeFigure.Moyen,FormeFigure.Rond,Math.floor(i/4),(i%4)); lesfigure.push(deuxiemefigure); - console.log("cc2",j," ",i); + //console.log("cc2",j," ",i); } } //pb? var carte= new Carte(lescartes.length,lesfigure,4,3); - console.log("MAMAN2",j," ",carte); + //console.log("MAMAN2",j," ",carte); lescartes.push(carte); } - console.log("LC2",lescartes); + //console.log("LC2",lescartes); deckPartie = lescartes; afficherCartes(deckPartie); console.log("--Conversion réussie--"); @@ -583,8 +583,8 @@ function reselectCartes() { carteselectPos.forEach((pos) => { var lacarte = "card"+pos; var numeroCarte = pos; - console.log("lacarte: ",lacarte); - console.log(deckPartie[numeroCarte].get); + //console.log("lacarte: ",lacarte); + //console.log(deckPartie[numeroCarte].get); document.getElementById(lacarte).style.boxShadow = "0 0 1vw red, 0 0 1vw red"; }); } @@ -592,8 +592,8 @@ function reselectCartes() { for (var i=0; i 16) { + //On prend une autre carte aléatoire dans tas du jeu + var index2 = getRandom(0, TasDuJEU.length - 1) + //var dejaPresente = false; + //Permet de savoir si la carte est deja dans la liste + // for (var j = 0; j < deckPartie.length; j++) { + // if (TasDuJEU[index2].identifiant == deckPartie[j].identifiant) { + // dejaPresente = true; + // } + // } + + deckPartie[carteselectPos[0]]=TasDuJEU[index2]; + TasDuJEU.splice(index2,1); + + //on recommmence jusqu'à obtenri une carte pas dans le tas de jeu + // while (dejaPresente == true) { + // index2 = getRandom(0, TasDuJEU.length - 1) + // dejaPresente = false;//Permet de savoir si la carte est deja dans la liste + // for (var j = 0; j < deckPartie.length; j++) { + // if (TasDuJEU[index2].identifiant == deckPartie[j].identifiant) { + // dejaPresente = true; + // } + // } + // } + + // unIndex = deckPartie.indexOf(carteselect[0]); + // deckPartie[unIndex] = TasDuJEU[index2]; + // new2cartes.push(TasDuJEU[index2]); + } else { + // si il y a moins de 16 cartes on enlève juste + deckPartie.splice(carteselect[0],1); + // unIndex = deckPartie.indexOf(carteselect[0]); + // deckPartie.splice(unIndex, 1); + } + carteselectPos.shift(); + carteselect.shift(); + } + afficherCartes(deckPartie); + return new2cartes; +} function changerlesCartes() { while (carteselect.length != 0) { @@ -966,7 +1016,7 @@ function creaMatriceVierge(row, column) { myMatrice2[i][j] = 0; } } - console.log("BUG1 ",myMatrice2); + //console.log("BUG1 ",myMatrice2); //var cartecopie = copieMatrice(myMatrice,myMatrice.length,myMatrice[0].length) return myMatrice2; } @@ -1335,13 +1385,14 @@ function testerCartesMulti() { for (var i = 0; i < tab.length; i++) { tabCode.push(tab[i].code); } + for (var i = 0; i < tab.length; i++) { if (tab[i].code == carteselect.length) { solution = false; cpt = cpt + 20 * copie.length; lesPoints += carteselect.length; document.getElementById("affPoints").textContent = 'Score : ' + lesPoints; - var new2Cartes=changerlesCartesDeTasDeJeu(); + var new2Cartes=changerlesCartesDeTasDeJeuMulti(); } } if (solution) { @@ -1385,7 +1436,7 @@ function testerCartesMulti() { ajt = uneMatrice[0]+uneMatrice[1]+uneMatrice[2];//une fois matrice vierge complétée on transforme ça en data listecartes.push(ajt); - console.log(ajt); + //console.log(ajt); } //console.log("LISTE BUG1: ",listecartes); diff --git a/SwichGIT/MultiFinal/mysqlitedb.db b/SwichGIT/MultiFinal/mysqlitedb.db index 47125b2019f4c213554350c768f8ff4d9133edd6..08b69b9deb4e009a7c3ef0f760f4577cbe1352d3 100644 GIT binary patch delta 10929 zcmeI2dyrJsoyYs!d;2y0zC8~Fl^FsfXadvo9zL^eQm zDXBmej8{DFCWTHSMoog?+t z9*n6~N?lW9({Nk+(3*AZDg50y)ZNtF(bCmD!hVRqYuj3D*ETh^G_|oO@pp57e{)NH zO-*+fd&2!a+|t&tqI=~q`vI^0Ncp5PHPo?osIh15U@dzFTXZ%y^wq3Mb*9?c128T& zU-_}}YGP; zJJ+|eQ~0~1d2nTKXHUmaH#>>HyEL?6_Lav||(MfTAs%RG2!(mgAG92ikgv`%?{_EzHExR@Ak1uq>bXiBh{{sAf%PdZ4?bvzI-MEk^2ETbo)N>Q|-M3Fiil zJ-*UF!5x}9xkJ;Ay`Vnmi*o-N?VtIa{mT5)2R_sG z#k2LkDws$Qy;3||=OUWVc(&F>G^O!u%0=|<@obHYI;ST(o?YZ38j*N*p^I?(_qp>Q z&wj;av;^YWFT03VK|Fhdi)c9G+3Q8C=@lE#E^rZzSv))6MYL1m+3OJP^LS{t#Ix0I zGuklm>^v9IfXB0QT}0a`p8e8gba^MmvvXY3H$5})Y?X^>a^jPRey;7Ap&n*?C;jI& zKhu@JRlck2RJxT)_9=UfonU);WnSAb`TS>EhE4wVf>s)dlw9x(vr13N^Cd@1w(x7u zvZK7GQqyZA8P99s8^TKH?a-;v!O*Q$Y}TwUOAS%p4v*A+bXBEH3TnJYXqsgxz>P2B0L3gVnh&w!CRS61rru-Vec#`x$C z1r^UFN%`L}wv%Ij&~~s#&TE=BtUTl~Mo*RVYnQX9u8#G@8e?-}(HOka%g%$-?&7&+ zYDLly~+p=eNTaF}q}erys!%oidLYnOEV7R?0kVWbOyvA@dMVEWsPJ%L326j5k;z z^Ps_g2^VUUc|gott1S3=<`B-$a#`>hnL}{rWimHdu0l7L%9y84;1at@<|@x@VQ`%# zvcS(j4)>jB-snyO4YrZ^D|nv8Zu^3>-xzxhc#F(qZu@4LM|tMgxP+TzA;R-vTwjf{ z5a#T5Twe{c5Hd2K1BYmhr#d}S33A|1s(RoM?2CES82>(Si1@`EX8~6>g#BWH=j(CsAofc< zy-EQN2B4T52gYIazyuWIAkROF*9R+5Eb!cIxO2b{6mvh%&%k9-DGNR^sRw~hXQZup6NlE$2i-jmM6@BBpC7SrMzZ`0;A!Vq*XjW7Z;~b z=3##31KinOSqM2HD`{%70B6$?7!FnD5KvTDBgz##y$y_*$z<-wFpxAoGKbUY3#~%m zCvz`Pjli0k_?9fd;dBIrzmx@)=RaiS@rk{~0+0Vfxk{h7-<<{;ZgH7!x~<91p`nJ$ z?~%D{=K_(EEuJA(=`og%R`A(p*^# z5M0wvLew~LYq@TT9Z5Noap0+nq$M^U;Rr5n-4ff2IL~*%Bv@kq5DyyTL*=EG*d)aL zaDKn4B+F{5EwLd;^SZ{%5(}RM71yh7iFHin2BYSV3f&URm@rQ-hIzKcDlXuuYw%gc z5+)9Z3dUVatYH$u#@H_4VhIxu;c2N`Vg(cD`LE#(#0n-JAII3VL+;=P zSKSl|U_pocS+ycz-X(S5qnjAanaKYNnvXBW^G;-c#0|C^-fNqC6{=0}saJ6v?vOb+ z{ZR~+TV(;J0Fn~j+#(A+_c|Wsn`It0s#0*Fugg4Sr0U>0Uz0f>-GT@6CYgi5K?7~x zE(`89NSc2k3w~p)7CLN{xsPWI3@*3Hf)`^*(!5pXny?4A$b#cDb#sHvd15zC!dKn1 zoJRYhlW_Uj@B$)qd^#gh9SPe+9;$4e$HVd#lN)ZEM< z#gAmzZ{#kyIu#DoFISsu<=gz9&Y~@0e<|j{4uvhDTf+X5;2e{daKD6Ap70L$P(@Qjwo zDM;W`Z@{5siKK#fkh7I|C6QE+5HPATz=ct#SQ|I;u;nb_$caad%m=`Q@g^R|;-78_ zcTF68AskDVaL>d8M&>TKj&RAuMGeIgZkPlO(jt6iVS7p7k1vMw$`Y=(fS+n*WshuR z+SQ%f2~X@??4~^+_EoRlM8vPb~NBAwOefu6dSyl?% zwOhm$oa(ZDv6H@cs~B`8C7!U+gcY$^!o~?GV$p<+uB?bf5;jgq5ep}5bZJE_l(2Dv zJhv3yxFlhtZ7XUROxQSMMJxaheVxSo)wZy2^dep({j0KM?4inc7WR#B00Uss7VeF>Q#wxC!o3lPu!S{BOSm@@pmtn~yHxl$ z5@7LT$h3rmBSCd)<4H?cI1&`7ES4s#twxweD1%T0`EMf&?63MOI$&JkXBI%!+^Uns zActKBy=rBFkNz6XcS`2Q_%=8WM9GMr3Wnqm4#^_9y(k%3qGUupG@keX>g<*%8IfRQ zeg=0C6(hnhATL99Y>9Fa32r&Zy57Aros5_=!5b`)xtkfym$8#bC9UgZ{y%=W>y~hG z^ns0!p2JrYPOgBbt1)pAPL4QyP??Emuds3?fSFDjXE(sg5N3{~fSc}G!pxBX<#SA@ zE#c-!fHm+g3c}5iaCr>~J4b>B6%Xhj+#GS$v3a^B>>LR^KL~zto+bPo32tU73>|%T z8oU};pu4g%UFHr zJ8<Yz;}!n@R63w0wnprLt&XL zc#WEI;7et$8RJg_ze(m$r-JVWy0t_W+&Q?>or8k0#t&lFVz)INlwb*wx5zw(AFFh$ zS>`-lf~QH7%;7|Y_tLE@S134f$6vyQRVj0)+EEsd_%?dlwTq6GL&L`7m29?g)9Ce0 zJA>W9%D{@i%)qDqslaRgUj$D09}DdDHTz=zUEcTo{obGY=XxLZeeS)}_e*b^?`iK< zzWv(8(+4(c$!c4i{PedBd z+(_rSui~SLC`LSjOHQ{%B0}6a{{=J`=>}ma`@u@I#S9aNnk=|}TV!O!Maj<=sTT>V z^U=m}#^7SeOF~uSLoh^+6)qB>hzDQol8*N+5<*Uu)v>xoJSaM#-z^d#GfI_x2`q5D z(DYW@B2}Vi;rUZwbsVQ&bO9r8!q|vRiJCi^QqnQvMa|&@^*K0cY*8zv4t}ioByEu@ z5r-TD@SpVGz(oQ@%{BKkfGx_ZB!Gup3WXqBWL6{?t+nu8BC#sK_?h$nef&u8pUcOi zZN1+;q{-l8n9;3ox~rD{oC-g%C9OR&j)}OsTNaGeKSKNaWDIfg9dvxVWP#^iz%yEu zVd=i`cNh344%Rp14v)VN3HLFcopwNvH+$3=)TEL|Tya>7^9q%|tH_qoAvhs@nF zY|^@07Qi$@EzS~USh@q4MmT+SYrEWmk5-@$y3?Hj>fn4O)2(f8d-9U-Hy0T9?vQ!R Y*=I>>t1N(Fbd2v7S%6Q?kE&(=1rm)?z5oCK delta 723 zcmZ9IZ%C6-6vp3s?|Jt+=Y6k#m$XS}o6De9Et%7)TYm(VNh3k*4_QJIqO=e- zL{QUl14{$3pdizIc#)Dq3kjm~lLe7Ys0lKd?`L(a!;D7 zaa<4tcdy=x8^_1I{n@EbTWMk5NvEyAE&LFpo?WhvPQl$5XX=U(m&I4&UGZw*o@s>g z_|I7ED=te?MSWL5*IHxksIelY#)=2WHdzqoaw&xOWyp`@J93xYEMJs8a;a>UjdHro z=mtroD|DW|qtEFm9pYz0xP(6mVPi~e3Z9A;)oXkyg!gi77(2K(j1OgrT2TdS@D1i* z2HQY^2f*PbT!T8O00$g|Oh_X((2zg;Sr}*Zc31J-pLkVYobPhDPM94wCu(QJfD0{o zC8qM6!khxswz+frFMOX*6Jq2DNN!w_qx^u`d8(k)f@t6D?qucSD!#4RISKWGlpQnA z!qOQQRCTjiHpK#LnDw(Ze;KJwr4hOa8}uW6EzQ#j`j8I9xL}BO`QH<*f02|a`H1wQ zv7S$;qaKJ-58!`F8l+Axy@0P{HwINo=L|HZl2*K|NMArgiOhrM*?yMJG;#zTMwuv+ z>x1Cozk}dT!c{_&K^<*6-)<>)*^2DPi+Rd=v;^jXH~hjn>;cvW!+df}J%%P;x&YnE z@&Y7NDK1NJ2@!!CO`s!7>S_N`w2M?rX1^CDbDs&+(pwmT7C6l>d&!RLb@&L@vJY$& zEwgs?l2xMtW=0K6gNoz@q?adzh}