pascal.lafourcade
/
swish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/palafour/swish

Browse Source
master
algolfier 4 years ago
parent bc62be1b7a 472a217907
commit 1717462b1b
5 changed files with 78 additions and 132 deletions
Show Stats Download Patch File Download Diff File

7
SwichGIT/src/css/PageDaccueil.css
Unescape View File

@ -332,19 +332,14 @@ label:active:after {
.bouttonvalider:hover { .bouttonvalider:hover {
box-shadow: 0 0 0 8px var(--lightsedonca); box-shadow: 0 0 0 8px var(--lightsedonca);
font-size: 99%; font-size: 100%;
position: relative; position: relative;
height: 93%;
width:95%;
top: 4%;
transition: box-shadow 0.2s ease; transition: box-shadow 0.2s ease;
} }
#bouttonvalider:hover { #bouttonvalider:hover {
box-shadow: 0 0 0 5px var(--lightsedonca); box-shadow: 0 0 0 5px var(--lightsedonca);
font-size: 120%;
position: relative; position: relative;
right: 5%;
} }
#pseudoenter { #pseudoenter {

20
SwichGIT/src/css/PartieGame.css
Unescape View File

@ -18,6 +18,26 @@
top:-60%; top:-60%;
} }
#affPoints {
position: absolute;
text-align: center;
font-family: Montserrat, impact, Arial Black;
font-size: 2.5vw;
margin-top: 1%;
margin-left: 28vw;
color: var(--lightsedonca);
}
#affSolution {
position: absolute;
text-align: center;
font-family: Montserrat, impact, Arial Black;
font-size: 2.5vw;
margin-top: 22.5vw;
margin-left: 25vw;
color: var(--lightsedonca);
}
#textjouer2 { #textjouer2 {
position: absolute; position: absolute;
text-align: center; text-align: center;

11
SwichGIT/src/css/desktops.css
Unescape View File

@ -26,7 +26,6 @@
.flex-item { .flex-item {
background: var(--lightsedonca); background: var(--lightsedonca);
width: 10vw; width: 10vw;
height: 13vw;
border-radius: 0.75vw; border-radius: 0.75vw;
padding-right: 0.15vw; padding-right: 0.15vw;
padding-left: 0.15vw; padding-left: 0.15vw;
@ -35,6 +34,7 @@
display: flex; display: flex;
margin-right: 0.4vw; margin-right: 0.4vw;
margin-left: 0.4vw; margin-left: 0.4vw;
margin-bottom: 1vw;
-webkit-flex-flow: row wrap; -webkit-flex-flow: row wrap;
justify-content: space-around; justify-content: space-around;
} }
@ -49,12 +49,11 @@
} }
.containcards { .containcards {
height: 87vh;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding-left: 3vw; padding-left: 5%;
padding-top: 2.5vw; padding-top: 7vw;
} }
.logop2 img { .logop2 img {
@ -94,7 +93,7 @@
position: absolute; position: absolute;
border-radius: 45px; border-radius: 45px;
left: 9.2vw; left: 9.2vw;
top: 5.5vw; top: 3.5vw;
height: 4vw; height: 4vw;
width: 12vw; width: 12vw;
background-color: var(--lightsedonca); background-color: var(--lightsedonca);
@ -127,8 +126,8 @@
position: absolute; position: absolute;
font-size: 2.5vw; font-size: 2.5vw;
margin-top: 0.2vw; margin-top: 0.2vw;
margin-left: 2.7vw;
color: var(--lightsedonca); color: var(--lightsedonca);
text-align:center; text-align:center;
width: inherit;
} }
} }

96
SwichGIT/src/index.html
Unescape View File

@ -559,11 +559,6 @@
<div id="containpseudo"> <div id="containpseudo">
<div id="pseudoenter">
<div id="fondinput">
<input onkeypress="ajouterplayer(event)" maxlength="12" id="inputpseudo" placeholder="Pseudo">
</div>
</div>
<a onclick="lancerpartie()"> <a onclick="lancerpartie()">
<div id="contourbuttonvalider"> <div id="contourbuttonvalider">
<div class="bouttonvalider" > <div class="bouttonvalider" >
@ -571,11 +566,6 @@
</div> </div>
</div> </div>
</a> </a>
<div id="buttonadd">
<a onclick="addplayer()">
<h2 id="textplus">+</h2>
</a>
</div>
</div> </div>
<div id="choosemode"> <div id="choosemode">
@ -590,7 +580,7 @@
</a> </a>
<div id="textdumode"> <div id="textdumode">
<h1 id="textmode">Modedddd</h1> <h1 id="textmode">Solo</h1>
</div> </div>
<a> <a>
<div id="modesuiv"> <div id="modesuiv">
@ -621,45 +611,51 @@
</div> </div>
<div id="pageGame"> <div id="pageGame">
<div class="menuhaut"> <div class="menuhaut">
<div id="Redistribution"> <div id="Redistribution">
<a onclick="redistribuer()" id="relancerbtn"> <a onclick="redistribuer()" id="relancerbtn">
<div id="contourbuttonvalider"> <div id="contourbuttonvalider">
<div class="bouttonvalider"> <div class="bouttonvalider">
<h1 id="textjouer2">RELANCER</h1> <h1 id="textjouer2">RELANCER</h1>
</div> </div>
</div> </div>
</a> </a>
</div> </div>
<div id="Redistribution2"> <div>
<a id="relancerbtn" onclick="testPourJeuClassique()"> <p id="affSolution"></p>
<div id="contourbuttonvalider"> </div>
<div class="bouttonvalider2"> <div>
<h1 id="btnvalider2">VALIDER</h1> <p id="affPoints">PTN : 0</p>
</div> </div>
</div> <div id="Redistribution2">
</a> <a id="relancerbtn" onclick="testPourJeuClassique()">
</div> <div id="contourbuttonvalider">
<div id="Redistribution3"> <div class="bouttonvalider2">
<a id="relancerbtn" onclick="chercheCombi2()"> <h1 id="btnvalider2">VALIDER</h1>
<div id="contourbuttonvalider"> </div>
<div class="bouttonvalider2"> </div>
<h1 id="btnvalider3">CHERCHER</h1> </a>
</div> </div>
</div> <div id="Redistribution3">
</a> <a id="relancerbtn" onclick="chercheCombi2()">
</div> <div id="contourbuttonvalider">
<div class="logop2"> <div class="bouttonvalider2">
<a onclick="journuit()"> <h1 id="btnvalider3">CHERCHER</h1>
<img src="imgs/swishjour.png" id="imglogo2"> </div>
</a> </div>
</div> </a>
<a class="retourstp" onclick="retour()"> </div>
<div class="buttonretour"> <div class="logop2">
<h1 class="txt">X</h1> <a onclick="journuit()">
</div> <img src="imgs/swishjour.png" id="imglogo2">
</a> </a>
</div> </div>
<a class="retourstp" onclick="retour()">
<div class="buttonretour">
<h1 class="txt">X</h1>
</div>
</a>
</div>
<div id="containcards" class="containcards"> <div id="containcards" class="containcards">

76
SwichGIT/src/js/main.js
Unescape View File

@ -11,6 +11,8 @@ var carteselect = [];
var deckPartie = []; //Ensemble des cartes affichees a l'ecran var deckPartie = []; //Ensemble des cartes affichees a l'ecran
var TasDuJEU = []; // Ensemble de toutes les cartes presente dans le jeu var TasDuJEU = []; // Ensemble de toutes les cartes presente dans le jeu
var lesPoints = 0; //Points du Joueur1
@ -260,20 +262,12 @@ function journuit() {
//changer logo swish //changer logo swish
document.getElementById("imglogo").src = "imgs/swishjour.png"; document.getElementById("imglogo").src = "imgs/swishjour.png";
document.getElementById("imglogo2").src = "imgs/swishjour.png"; document.getElementById("imglogo2").src = "imgs/swishjour.png";
/*
MESSAGE POUR CEUX QUI FONT LES TESTS ! Recommentez les lignes après ! Merci
*/
//document.getElementById("fondinput").style.backgroundColor = lightsedonca;
document.getElementById("contourbuttonvalider").style.backgroundColor = lightsedonca; document.getElementById("contourbuttonvalider").style.backgroundColor = lightsedonca;
//document.getElementById("textjouer").style.color = lightsedonca;
//document.getElementById("textplus").style.color = lightprima;
//changer montagnesfond //changer montagnesfond
document.getElementById("mount1").src = "imgs/mount1.png"; document.getElementById("mount1").src = "imgs/mount1.png";
document.getElementById("mount2").src = "imgs/mount2.png"; document.getElementById("mount2").src = "imgs/mount2.png";
//nuages //nuages
document.getElementById("cloud").src = "imgs/lightcloud.png"; document.getElementById("cloud").src = "imgs/lightcloud.png";
//changer background color
//document.getElementById("containplayers").style.color = lightsedonca;
//maj couleur principales //maj couleur principales
document.documentElement.style.setProperty('--lightprima', lightprima); document.documentElement.style.setProperty('--lightprima', lightprima);
document.documentElement.style.setProperty('--lightsedonca', lightsedonca); document.documentElement.style.setProperty('--lightsedonca', lightsedonca);
@ -284,18 +278,12 @@ function journuit() {
//changer logo swish //changer logo swish
document.getElementById("imglogo").src = "imgs/swishnuit.png"; document.getElementById("imglogo").src = "imgs/swishnuit.png";
document.getElementById("imglogo2").src = "imgs/swishnuit.png"; document.getElementById("imglogo2").src = "imgs/swishnuit.png";
//document.getElementById("fondinput").style.backgroundColor = darkseconda;
document.getElementById("contourbuttonvalider").style.backgroundColor = darkseconda; document.getElementById("contourbuttonvalider").style.backgroundColor = darkseconda;
//document.getElementById("textjouer").style.color = darkseconda;
//document.getElementById("textplus").style.color = darkprima;
//changer montagnesfond //changer montagnesfond
document.getElementById("mount1").src = "imgs/darkmount1.png"; document.getElementById("mount1").src = "imgs/darkmount1.png";
document.getElementById("mount2").src = "imgs/darkmount2.png"; document.getElementById("mount2").src = "imgs/darkmount2.png";
//nuages //nuages
document.getElementById("cloud").src = "imgs/darkcloud.png"; document.getElementById("cloud").src = "imgs/darkcloud.png";
//mode nuit
//document.getElementById("containplayers").style.color = darkseconda;
//maj couleur principales //maj couleur principales
document.documentElement.style.setProperty('--lightprima', darkprima); document.documentElement.style.setProperty('--lightprima', darkprima);
document.documentElement.style.setProperty('--lightsedonca', darkseconda); document.documentElement.style.setProperty('--lightsedonca', darkseconda);
@ -845,16 +833,17 @@ function testPourJeuClassique() {
for (var i = 0; i < tab.length; i++) { for (var i = 0; i < tab.length; i++) {
if (tab[i].code == carteselect.length) { if (tab[i].code == carteselect.length) {
solution = false; solution = false;
lesPoints += carteselect.length;
document.getElementById("affPoints").textContent = 'PTN : ' + lesPoints;
changerlesCartesDeTasDeJeu(); changerlesCartesDeTasDeJeu();
} }
} }
if (solution) { if (solution) {
window.alert("Rien trouve chef !!!"); document.getElementById("affSolution").textContent = 'Aucune solution trouvée...'
} }
if (!solution) { if (!solution) {
window.alert("J'ai une solution chef !!!!"); document.getElementById("affSolution").textContent = 'Assemblage de ' + copie.length + ' cartes trouvé ! Il reste encore ' + TasDuJEU.length + ' cartes !';
} }
window.alert(TasDuJEU.length)
} }
/*} catch (e) { /*} catch (e) {
window.alert(e); window.alert(e);
@ -1050,59 +1039,6 @@ function SommeDeCarte(CarteMere, CarteFille) {
function ChoisirPseudo() {
let nom = localStorage.getItem('nom');
if (nom == null) {
nom = "SWISH";
}
document.getElementById('inputpseudo').setAttribute('value', nom);
};
function EnvoyerNouveauNom() {
let pseudo = document.getElementById('inputpseudo').value;
localStorage.setItem('nom', pseudo);
document.location.reload(true);
};
function addplayer(){
//j'ai mis une limite de 6joueurs, mais c'est a voir
if(nbplayers < 7){
//creation de la div contenant le pseudo
var divpseudo = document.createElement('div');
divpseudo.id = 'pseudolist';
//reprise du pseudo entre par le joueur
var pseudo = document.getElementById("inputpseudo").value;
//verification si pseudo vide pour lui donner un pseudo du style "Joueur3"
if(pseudo == "")
{
pseudo = "Joueur " + nbplayers;
}
//creation du text-pseudo
var tag = document.createElement("p");
tag.className = "pseudojoueur";
var text = document.createTextNode(pseudo);
tag.appendChild(text);
//mise du text dans la division
divpseudo.appendChild(tag);
//insertion pseudo dans liste
document.getElementById("containplayers").appendChild(divpseudo);
//remise input vide ;)
document.getElementById("inputpseudo").value = "";
nbplayers = nbplayers +1;
}
}
function ajouterplayer(event){
if(event.keyCode == 13)
addplayer();
}
function doublonInterdit(uneCarte) { function doublonInterdit(uneCarte) {
var lesCoPetit = []; var lesCoPetit = [];

Write Preview
Loading…
Cancel
Save