From 707036af3d7eb223b64358614dc732f99ed55f2c Mon Sep 17 00:00:00 2001 From: adplantade Date: Wed, 19 Aug 2020 11:56:56 +0200 Subject: [PATCH] ajout temps survie correct --- code/selecteur.js | 1 + code/timer.js | 10 ++++++++++ code/vitraux.js | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/selecteur.js b/code/selecteur.js index fa341aa..fc0dd21 100644 --- a/code/selecteur.js +++ b/code/selecteur.js @@ -37,6 +37,7 @@ if(document.getElementById("canvasTotal")!=null) { objPts=null; tpsRem=[0,1,0]; + tpsPlus=[0,parseInt(get['mode'].substring(0,get['mode'].length-1),10),0]; document.getElementById("chronotime").style.display="none"; } } diff --git a/code/timer.js b/code/timer.js index 4524d4c..849f77c 100644 --- a/code/timer.js +++ b/code/timer.js @@ -48,9 +48,19 @@ function resume_clock(){ pausedC = false; // update the deadline to preserve the amount of time remaining + console.log("tl"+time_left); deadline = new Date(Date.parse(new Date()) + time_left); + console.log("dl"+deadline); // start the clock run_clock('timer',deadline); } } + +function addTime(sec) +{ + console.log(deadline); + deadline.setSeconds(deadline.getSeconds() + sec); + + console.log(deadline); +} \ No newline at end of file diff --git a/code/vitraux.js b/code/vitraux.js index 9ef3146..70fb105 100644 --- a/code/vitraux.js +++ b/code/vitraux.js @@ -549,12 +549,12 @@ function checkAllOK(justChecking=false){ { var audio = new Audio('ress/Jewel4.mp3'); audio.play(); + handleScore(1); if(pause) { chronoStop(); pause_clock(); } - handleScore(1); won=true; } else if(justChecking) @@ -598,9 +598,9 @@ function handleScore(modif) var pts = diff.getSeconds()+ (diff.getMinutes()*60) + ((diff.getHours()-1)*3600); window.location.replace("./score.php?pts="+pts+"&mode="+get['mode']+"&diff="+get['diff']+"&pseudo="+get['pseudo']); } - else if(get['mode']=="surv") + else if(get['mode'].includes("s")) { - addTime(30); + addTime(tpsPlus[1]); } }