From 4ecfedcf26b9a71071afb76327d767e9a2f8e4f1 Mon Sep 17 00:00:00 2001 From: readhame Date: Wed, 8 Jul 2020 19:30:01 +0200 Subject: [PATCH] hyperset 4x4 et compteur Set 3x4 --- HyperSet/.idea/workspace.xml | 6 +- HyperSet/vues/css/style.css | 12 +- HyperSet/vues/js/set.js | 5592 ++++++++++++++++++++++++++++++++-- 3 files changed, 5329 insertions(+), 281 deletions(-) diff --git a/HyperSet/.idea/workspace.xml b/HyperSet/.idea/workspace.xml index 5e793e1..3d00627 100644 --- a/HyperSet/.idea/workspace.xml +++ b/HyperSet/.idea/workspace.xml @@ -111,6 +111,8 @@ + + @@ -154,10 +156,10 @@ - + - + diff --git a/HyperSet/vues/css/style.css b/HyperSet/vues/css/style.css index 6f49e38..f681a90 100644 --- a/HyperSet/vues/css/style.css +++ b/HyperSet/vues/css/style.css @@ -56,10 +56,10 @@ h1 { } .game-board { - margin-top: 1%; - margin-left: 13%; + margin-top: -5%; + margin-left: 22%; height: 700px; - width: 800px; + width: 600px; transform: rotate(90deg); } @@ -87,7 +87,7 @@ h1 { transform: rotate(90deg); } .game-boardHS1 { - margin-top: -5%; + margin-top: -4.5%; margin-left: 50%; height: 800px; width: 800px; @@ -102,12 +102,10 @@ h1 { -webkit-mask-repeat: no-repeat; -webkit-mask-position: 15px; margin-top: 22%; - - - } + .diamond { transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40); width: 38px; diff --git a/HyperSet/vues/js/set.js b/HyperSet/vues/js/set.js index e6d93b6..9349234 100644 --- a/HyperSet/vues/js/set.js +++ b/HyperSet/vues/js/set.js @@ -3,7 +3,7 @@ var Game = { cards: [], selected: [], score: 0, - set: 0, + set: 1, $board: $('[data-display="game-board"]'), $score: $('[data-display="score"]'), $nbSets: $('[data-display="nbSets"]'), @@ -124,10 +124,10 @@ var Game = { dataType: 'json', success: function (data) { self.cards = data; - //self.existingSet(); + self.existingSet(); self.displayCards.call(self); self.setCardListeners(); - self.setPageListeners(); + //self.setPageListeners(); } }); @@ -141,7 +141,7 @@ var Game = { //self.existingSet1(); self.displayCards1.call(self); self.setCardListeners1(); - self.setPageListeners1(); + //self.setPageListeners1(); } }); @@ -155,7 +155,7 @@ var Game = { self.displayCards2.call(self); //self.existingSet2(); self.setCardListeners2(); - self.setPageListeners2(); + //self.setPageListeners2(); } }); @@ -168,7 +168,7 @@ var Game = { self.displayCards3.call(self); //self.existingSet3(); self.setCardListeners3(); - self.setPageListeners3(); + //self.setPageListeners3(); } }); @@ -181,7 +181,7 @@ var Game = { self.displayCards4.call(self); //self.existingSet4(); self.setCardListeners4(); - self.setPageListeners4(); + //self.setPageListeners4(); } }); @@ -193,7 +193,7 @@ var Game = { self.cards0 = data; self.displayCards0.call(self); self.setCardListeners0(); - self.setPageListeners0(); + //self.setPageListeners0(); } }); @@ -206,7 +206,7 @@ var Game = { self.cardsHS = data; self.displayCardsHS.call(self); self.setCardListenersHS(); - self.setPageListenersHS(); + //self.setPageListenersHS(); } }); @@ -218,7 +218,7 @@ var Game = { self.cardsHS0 = data; self.displayCardsHS0.call(self); self.setCardListenersHS0(); - self.setPageListenersHS0(); + //self.setPageListenersHS0(); } }); @@ -230,7 +230,7 @@ var Game = { self.cardsHS1 = data; self.displayCardsHS1.call(self); self.setCardListenersHS1(); - self.setPageListenersHS1(); + //self.setPageListenersHS1(); } }); dealRequestHS2= $.ajax({ @@ -241,7 +241,7 @@ var Game = { self.cardsHS2 = data; self.displayCardsHS2.call(self); self.setCardListenersHS2(); - self.setPageListenersHS2(); + //self.setPageListenersHS2(); } }); @@ -597,6 +597,7 @@ var Game = { }); }, + displayCardsHS2: function() { var self = this; if (self.cardsHS2.length == 0) { @@ -627,7 +628,7 @@ var Game = { self.$boardHS2.append(cardNode); // display 4 cards per row - if ((index+1) % 4 === 0) { + if ((index+1) % 5 === 0) { self.$boardHS2.append($('
')); } @@ -651,7 +652,8 @@ var Game = { - +// PARLER SUR CET ALGO SUR LE RAPPORT + /* existingSet: function() { var colors = []; @@ -708,318 +710,193 @@ var Game = { } } this.$nbSets.html(self.set); - }, + },*/ - existingSet1: function() { - var colors = []; - var shapes =[]; - var fills= []; - var borders = []; - var numbers= []; + existingSet: function() { + var colors1 = []; + var shapes1 =[]; + var fills1= []; + var numbers1= []; var valid; var self = this; - var cartes = self.cards1; + var cartes = self.cards; var cartes1 = cartes; - var cartes2 = cartes; var carte1; var carte2; - var carte3; - - var i, j, k; - + var carte3 = []; - for(i=0; i