ajout timer tout les modes et gestion des interfaces

master
readhame 5 years ago
parent 92e8e1c042
commit ac6805ae34

@ -148,6 +148,7 @@
<workItem from="1596107383639" duration="8696000" />
<workItem from="1596194794026" duration="1862000" />
<workItem from="1596457928722" duration="7449000" />
<workItem from="1596543087374" duration="9515000" />
</task>
<servers />
</component>
@ -191,10 +192,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1595243925469" />
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1596457952056">
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1596543909078">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1596457952056" />
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1596543909078" />
<state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
<screen x="0" y="0" width="1920" height="1040" />
</state>

@ -1,39 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="initial-scale=1">
<title>Set</title>
<link rel="stylesheet" href="vues/css/style.css" />
</head>
<body>
<div class="custom-select ">
<h2 id="daltoSettings">RÉGLAGES COULEURS 0</h2>
<select id="color-selector">
<option class="text" id="normal" value="normal" onclick="changeColorMode()">Normale</option>
<option class="text" id="Daltonien" value="Daltonien" onclick="changeColorMode()">Daltonien</option>
</select>
</div>
<div class="wrapper">
<h1>(TEST) Set</h1>
<p>Find sets.</p>
<p>Sets found: <span data-display="score" class="score">0</span></p>
<p>Number of Sets: <span data-display="nbSets" class="nbSets"></span></p>
<div class="game-board" data-display="game-board" style="display: block;" ></div>
</div>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="vues/js/Settings.js"></script>
<script src="vues/js/set.js"></script>
</body>
</html>

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="vues/css/style-page.css" />
<title>Title</title>
</head>
<body>
<div data-display="game-board"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="vues/js/set.js"></script>
</body>
</html>

@ -462,7 +462,7 @@ input:checked + .slider .on {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
line-height: 22px;
width: 0;
background-color: LightBlue;
box-sizing: border-box;
@ -470,3 +470,202 @@ input:checked + .slider .on {
#progressBar0 div {
box-sizing: border-box;
}
#progressBar1 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBar1 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px;
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBar1 div {
box-sizing: border-box;
}
#progressBar2 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBar2 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px;
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBar2 div {
box-sizing: border-box;
}
#progressBar3 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBar3 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px;
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBar3 div {
box-sizing: border-box;
}
#progressBar4 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBar4 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px;
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBar4 div {
box-sizing: border-box;
}
#progressBarHS {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBarHS div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBarHS div {
box-sizing: border-box;
}
#progressBarHS0 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBarHS0 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBarHS0 div {
box-sizing: border-box;
}
#progressBarHS1 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBarHS1 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBarHS1 div {
box-sizing: border-box;
}
#progressBarHS2 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBarHS2 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBarHS2 div {
box-sizing: border-box;
}
#progressBarHS3 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBarHS3 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBarHS3 div {
box-sizing: border-box;
}
#progressBarHS4 {
width: 90%;
margin: 10px auto;
height: 22px;
background-color: Blue;
}
#progressBarHS4 div {
height: 100%;
text-align: right;
padding: 0 10px;
line-height: 22px; /* same as #progressBar height if we want text middle aligned */
width: 0;
background-color: LightBlue;
box-sizing: border-box;
}
#progressBarHS4 div {
box-sizing: border-box;
}

@ -83,9 +83,9 @@
<div id='game0' class="wrapper" style="display: none;">
<h1>Set 3x3 OK</h1>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtn0" onclick="goSelectMode0()" src="vues/images/previous.png">
<img class="small-btn" id="previousBtn0" onclick="goSelectMode()" src="vues/images/previous.png">
</div>
<p id="countdown0" class = 'count' >5 : 00</p>
<p id="countdown0" class = 'count' >3 : 00</p>
<div id="progressBar0">
<div></div>
</div>
@ -97,13 +97,12 @@
</div>
<div id='game' class="wrapper" style="display: none;">
<h1>Set 3x4 OK </h1>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtn1" onclick="goSelectMode()" src="vues/images/previous.png">
</div>
<p id="countdown" class = 'count' >10 : 00</p>
<p id="countdown" class = 'count' >8 : 00</p>
<div id="progressBar">
<div></div>
</div>
@ -116,7 +115,11 @@
<div id='game1' class="wrapper" style="display: none;">
<h1>Set 3x5 OK </h1>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtn2" onclick="goSelectMode1()" src="vues/images/previous.png">
<img class="small-btn" id="previousBtn2" onclick="goSelectMode()" src="vues/images/previous.png">
</div>
<p id="countdown1" class = 'count' >12 : 00</p>
<div id="progressBar1">
<div></div>
</div>
<p>Nombre de carte = 3; Nombre de critères = 5</p>
<p>Sets found: <span data-display="score1" class="score">0</span></p>
@ -129,7 +132,11 @@
<div id='game2' class="wrapper" style="display: none;">
<h1>Set 4x4 OK</h1>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtn3" onclick="goSelectMode2()" src="vues/images/previous.png">
<img class="small-btn" id="previousBtn3" onclick="goSelectMode()" src="vues/images/previous.png">
</div>
<p id="countdown2" class = 'count' >16 : 00</p>
<div id="progressBar2">
<div></div>
</div>
<p>Nombre de carte = 4; Nombre de critères = 4</p>
<p>Sets found: <span data-display="score2" class="score">0</span></p>
@ -140,7 +147,11 @@
<div id='game3' class="wrapper" style="display: none;">
<h1>Set 4x5 Bordures + à regler les images</h1>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtn4" onclick="goSelectMode3()" src="vues/images/previous.png">
<img class="small-btn" id="previousBtn4" onclick="goSelectMode()" src="vues/images/previous.png">
</div>
<p id="countdown3" class = 'count' >20 : 00</p>
<div id="progressBar3">
<div></div>
</div>
<p>Nombre de carte = 4; Nombre de critères = 5</p>
<p>Paramètres: 1.Couleur, 2.Forme, 3.Remplissage 4.Bordure 5.Nombre</p>
@ -152,7 +163,11 @@
<div id='game4' class="wrapper" style="display: none;">
<h1>Set 5x5 Bordures + à tester+ compteur + à regler les images </h1>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtn5" onclick="goSelectMode4()" src="vues/images/previous.png">
<img class="small-btn" id="previousBtn5" onclick="goSelectMode()" src="vues/images/previous.png">
</div>
<p id="countdown4" class = 'count' >30 : 00</p>
<div id="progressBar4">
<div></div>
</div>
<p>Nombre de carte = 5; Nombre de critères = 5</p>
<p>Paramètres: 1.Couleur, 2.Forme, 3.Remplissage 4.Bordure 5.Nombre</p>
@ -177,6 +192,11 @@
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p id="countdownHS" class = 'count' >9 : 00</p>
<div id="progressBarHS">
<div></div>
</div>
<p>Nombre de carte = 4; Nombre de critères = 4</p>
<p>HyperSets found: <span data-display="scoreHS" class="score">0</span></p>
<p>Number of HyperSets: <span data-display="nbSetsHS" class="nbSets"></span></p>
@ -188,7 +208,11 @@
<div id='gameHS0' class="wrapper" style="display: none;">
<h1>HyperSet 3x3 OK </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet0()" src="vues/images/previous.png">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p id="countdownHS0" class = 'count' >4 : 00</p>
<div id="progressBarHS0">
<div></div>
</div>
<p>Nombre de carte = 4; Nombre de critères = 3</p>
<p>HyperSets found: <span data-display="scoreHS0" class="score">0</span></p>
@ -199,7 +223,11 @@
<div id='gameHS1' class="wrapper" style="display: none;">
<h1>HyperSet 3x5 OK</h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet1()" src="vues/images/previous.png">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p id="countdownHS1" class = 'count' >15 : 00</p>
<div id="progressBarHS1">
<div></div>
</div>
<p>Nombre de carte = 4; Nombre de critères = 5</p>
<p>HyperSets found: <span data-display="scoreHS1" class="score">0</span></p>
@ -211,7 +239,11 @@
<div id='gameHS2' class="wrapper" style="display: none;">
<h1>HyperSet 4x4 OK </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet2()" src="vues/images/previous.png">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p id="countdownHS2" class = 'count' >18 : 00</p>
<div id="progressBarHS2">
<div></div>
</div>
<p>Nombre de carte = 6; Nombre de critères = 4</p>
<p>HyperSets found: <span data-display="scoreHS2" class="score">0</span></p>
@ -223,7 +255,11 @@
<div id='gameHS3' class="wrapper" style="display: none;">
<h1>HyperSet 4x5 à tester + compteur+ images </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet3()" src="vues/images/previous.png">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p id="countdownHS3" class = 'count' >22 : 00</p>
<div id="progressBarHS3">
<div></div>
</div>
<p>Nombre de carte = 6; Nombre de critères = 5</p>
<p>HyperSets found: <span data-display="scoreHS3" class="score">0</span></p>
@ -235,7 +271,11 @@
<div id='gameHS4' class="wrapper" style="display: none;">
<h1>HyperSet 5x5 à tester + compteur+ images </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet4()" src="vues/images/previous.png">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p id="countdownHS4" class = 'count' >45 : 00</p>
<div id="progressBarHS4">
<div></div>
</div>
<p>Nombre de carte = 8; Nombre de critères = 5</p>
<p>HyperSets found: <span data-display="scoreHS4" class="score">0</span></p>
@ -332,6 +372,26 @@
<div id='GameOver' class="popup" style="display: none;">
<div class="popup-content">
<div class="popup-header">
<span class="close" onclick="closeGame();">×</span>
<h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">GAME OVER !</h1>
</div>
</div>
</div>
<div id='GameOver2' class="popup" style="display: none;">
<div class="popup-content">
<div class="popup-header">
<span class="close" onclick="closeGame();">×</span>
<h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">GAME OVER! Il n'y a plus de SET possible</h1>
</div>
</div>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="vues/js/Settings.js"></script>

@ -171,7 +171,9 @@ function showModeGame1(){
function closeGame(){
window.location.reload();
}
function showModeGames(){
@ -237,65 +239,9 @@ function goSelect1(){
function goSelectMode(){
window.location.reload();
}
function goSelectMode1(){
document.getElementById('selectModeSet').style.display='block';
document.getElementById('game1').style.display='none';
document.getElementById('carte1').innerHTML = "";
}
function goSelectMode2(){
document.getElementById('selectModeSet').style.display='block';
document.getElementById('game2').style.display='none';
document.getElementById('carte2').innerHTML = "";
}
function goSelectMode3(){
document.getElementById('selectModeSet').style.display='block';
document.getElementById('game3').style.display='none';
document.getElementById('carte3').innerHTML = "";
}
function goSelectMode4(){
document.getElementById('selectModeSet').style.display='block';
document.getElementById('game4').style.display='none';
document.getElementById('carte4').innerHTML = "";
}
function goSelectMode0(){
window.location.reload();
}
function goSelectModeHyperSet(){
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('gameHS').style.display='none';
document.getElementById('carteHS').innerHTML = "";
window.location.reload();
}
function goSelectModeHyperSet0(){
document.getElementById('gameHS0').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('carteHS0').innerHTML = "";
}
function goSelectModeHyperSet1(){
document.getElementById('gameHS1').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('carteHS1').innerHTML = "";
}
function goSelectModeHyperSet2(){
document.getElementById('gameHS2').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('carteHS2').innerHTML = "";
}
function goSelectModeHyperSet3(){
document.getElementById('gameHS3').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('carteHS3').innerHTML = "";
}
function goSelectModeHyperSet4(){
document.getElementById('gameHS4').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('carteHS4').innerHTML = "";
}

@ -140,9 +140,9 @@ var Game = {
}
}
progress(601, 601, $('#progressBar'));
progress(481, 481, $('#progressBar'));
const startingMinutes = 10;
const startingMinutes = 8;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdown');
@ -195,6 +195,43 @@ var Game = {
self.displayCards1.call(self);
self.setCardListeners1();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(720, 720, $('#progressBar1'));
const startingMinutes = 12;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdown1');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
@ -221,6 +258,42 @@ var Game = {
self.displayCards2.call(self);
self.existingSet2();
self.setCardListeners2();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(961, 961, $('#progressBar2'));
const startingMinutes = 16;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdown2');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
@ -245,6 +318,43 @@ var Game = {
self.displayCards3.call(self);
self.existingSet3();
self.setCardListeners3();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(1201, 1201, $('#progressBar3'));
const startingMinutes = 20;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdown3');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
},
@ -268,6 +378,43 @@ var Game = {
self.displayCards4.call(self);
self.existingSet4();
self.setCardListeners4();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(1801, 1801, $('#progressBar4'));
const startingMinutes = 30;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdown4');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
@ -291,6 +438,7 @@ var Game = {
self.cards0 = data;
self.displayCards0.call(self);
self.existingSet0();
self.setCardListeners0();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
@ -302,9 +450,9 @@ var Game = {
}
}
progress(301, 301, $('#progressBar0'));
progress(180, 180, $('#progressBar0'));
const startingMinutes = 5;
const startingMinutes = 3;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdown0');
@ -321,14 +469,14 @@ var Game = {
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if( time === -2){
window.location.reload();
}
time--;
if(time === -2){
document.getElementById('GameOver').style.display='block';;
}
time--;
}
}
});
@ -353,6 +501,43 @@ var Game = {
self.existingHyperSet();
self.displayCardsHS.call(self);
self.setCardListenersHS();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(540, 540, $('#progressBarHS'));
const startingMinutes = 9;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdownHS');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
@ -376,6 +561,43 @@ var Game = {
self.existingHyperSet0();
self.displayCardsHS0.call(self);
self.setCardListenersHS0();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(240, 240, $('#progressBarHS0'));
const startingMinutes = 4;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdownHS0');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
},
@ -398,6 +620,43 @@ var Game = {
self.existingHyperSet1();
self.displayCardsHS1.call(self);
self.setCardListenersHS1();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(900, 900, $('#progressBarHS1'));
const startingMinutes = 15;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdownHS1');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
},
@ -422,6 +681,43 @@ var Game = {
self.existingHyperSet2();
self.displayCardsHS2.call(self);
self.setCardListenersHS2();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(1080, 1080, $('#progressBarHS2'));
const startingMinutes = 18;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdownHS2');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
},
@ -445,6 +741,43 @@ var Game = {
self.existingHyperSet3();
self.displayCardsHS3.call(self);
self.setCardListenersHS3();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(1380, 1380, $('#progressBarHS3'));
const startingMinutes = 23;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdownHS3');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
@ -469,6 +802,42 @@ var Game = {
self.existingHyperSet4();
self.displayCardsHS4.call(self);
self.setCardListenersHS4();
function progress(timeleft, timetotal, $element) {
var progressBarWidth = timeleft * $element.width() / timetotal;
$element.find('div').animate({ width: progressBarWidth }, timeleft == timetotal ? 0 : 1000, "linear");
if(timeleft > 0) {
setTimeout(function() {
progress(timeleft - 1, timetotal, $element);
}, 1000);
}
}
progress(2700, 2700, $('#progressBarHS'));
const startingMinutes = 45;
let time = startingMinutes *60;
const countdownEl = document.getElementById('countdownHS');
setInterval(updateCountDown,1000);
function updateCountDown() {
const minutes = Math.floor(time / 60);
let seconds = time % 60;
seconds = seconds < 10 ? '0' + seconds : seconds;
if(time > 0 ) {
countdownEl.innerHTML = minutes + ' : ' + seconds;
}
if(time === -1 ){
countdownEl.innerHTML = ' TIME OVER !';
}
if(time === -2){
document.getElementById('GameOver').style.display='block';
}
time--;
}
}
});
@ -490,6 +859,8 @@ var Game = {
return false;
}
this.$score.html(this.score);
$.each(self.cards, function(index, card){
var cardNode = $('<div>', {
@ -3946,6 +4317,7 @@ var Game = {
for (var w = 0; w < pCards2.length; w++) {
tCardsDGE[2] = pCards2[w][0];
carte6[w] = this.generateVirtualCard44(tCardsDGE);
console.log('carte5 :', tCardsDGE[2]);
}
@ -3958,7 +4330,6 @@ var Game = {
for (a = k + 1; a < self.cardsHS2.length; a++) {
if (carte6[x][0].color !== undefined && carte6[x][0].shape !== undefined && carte6[x][0].fill !== undefined && carte6[x][0].number !== undefined) {
if (carte6[x][0].shape === shapesall[a] && carte6[x][0].color === colorsall[a] && carte6[x][0].fill === fillsall[a] && carte6[x][0].number === numbersall[a]) {
console.log('carte5 :', tCardsDGE[2]);
console.log('carte6 :', carte6[x][0]);
//console.log('ab');
//console.log(carte6[x][0].shape, carte6[x][0].color, carte6[x][0].fill, carte6[x][0].number);
@ -4091,6 +4462,7 @@ var Game = {
for (var w = 0; w < pCards2.length; w++) {
tCardsDGE[2] = pCards2[w][0];
console.log('carte5 :', tCardsDGE[2]);
carte6[w] = this.generateVirtualCard45(tCardsDGE);
}
@ -4105,7 +4477,6 @@ var Game = {
for (a = k + 1; a < self.cardsHS3.length; a++) {
if (carte6[x][0].color !== undefined && carte6[x][0].shape !== undefined && carte6[x][0].fill !== undefined && carte6[x][0].border !== undefined && carte6[x][0].number !== undefined) {
if (carte6[x][0].shape === shapesall[a] && carte6[x][0].color === colorsall[a] && carte6[x][0].fill === fillsall[a] && carte6[x][0].border === bordersall[a] && carte6[x][0].number === numbersall[a]) {
console.log('carte5 :', tCardsDGE[2]);
console.log('carte6 :', carte6[x][0]);
//console.log('ab');
//console.log(carte6[x][0].shape, carte6[x][0].color, carte6[x][0].fill, carte6[x][0].number);
@ -8141,6 +8512,9 @@ var Game = {
//self.updateCards(data);
self.existingSet0();
self.increaseScore0();
if (self.cards0.length !== 0 && self.set0 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8171,6 +8545,9 @@ var Game = {
//self.updateCards(data);
self.existingSet();
self.increaseScore();
if (self.cards.length !== 0 && self.set === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8200,6 +8577,9 @@ var Game = {
//self.updateCards1(data);
self.existingSet1();
self.increaseScore1();
if (self.cards1.length !== 0 && self.set1 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8231,6 +8611,9 @@ var Game = {
//self.updateCards2(data);
self.existingSet2();
self.increaseScore2();
if (self.cards2.length !== 0 && self.set2 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8261,6 +8644,9 @@ var Game = {
//self.updateCards3(data);
self.existingSet3();
self.increaseScore3();
if (self.cards3.length !== 0 && self.set3 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8293,6 +8679,9 @@ var Game = {
//self.updateCards4(data);
self.existingSet4();
self.increaseScore4();
if (self.cards4.length !== 0 && self.set4 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8326,6 +8715,9 @@ var Game = {
//self.updateCards(data);
self.existingHyperSet();
self.increaseScoreHS();
if (self.cardsHS.length !== 0 && self.setHS === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8358,6 +8750,9 @@ var Game = {
//self.updateCards(data);
self.existingHyperSet0();
self.increaseScoreHS0();
if (self.cardsHS0.length !== 0 && self.setHS0 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8389,6 +8784,9 @@ var Game = {
//self.updateCards(data);
self.existingHyperSet1();
self.increaseScoreHS1();
if (self.cardsHS1.length !== 0 && self.setHS1 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8419,6 +8817,9 @@ var Game = {
//self.updateCards(data);
self.existingHyperSet2();
self.increaseScoreHS2();
if (self.cardsHS2.length !== 0 && self.setHS2 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8449,6 +8850,9 @@ var Game = {
//self.updateCards(data);
self.existingHyperSet3();
self.increaseScoreHS3();
if (self.cardsHS3.length !== 0 && self.setHS3 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}
@ -8478,8 +8882,11 @@ var Game = {
if (!data.gameComplete) {
self.setHS4 = 0;
//self.updateCards(data);
//self.existingSet0();
self.existingHyperSet4();
self.increaseScoreHS4();
if (self.cardsHS4.length !== 0 && self.setHS4 === 0){
document.getElementById('GameOver2').style.display='block';
}
} else {
self.gameWon();
}

Loading…
Cancel
Save