Compare commits
No commits in common. "257f59c96edad845a927367d8823c9118159c245" and "ac0b71fe09eeeb955817ada4720745fda8be57c7" have entirely different histories.
257f59c96e
...
ac0b71fe09
@ -120,11 +120,9 @@
|
|||||||
|
|
||||||
for (var j = 0; j < round.allResults.length; ++j) {
|
for (var j = 0; j < round.allResults.length; ++j) {
|
||||||
var result = round.allResults[j];
|
var result = round.allResults[j];
|
||||||
if (result.guessPosition) {
|
|
||||||
Game.addGuessPositionToResultMap(result.guessPosition, result, true);
|
Game.addGuessPositionToResultMap(result.guessPosition, result, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
|
document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
|
||||||
document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
|
document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
|
||||||
@ -332,7 +330,6 @@
|
|||||||
scoreInfo.children[0].style.display = null;
|
scoreInfo.children[0].style.display = null;
|
||||||
scoreInfo.children[1].style.display = null;
|
scoreInfo.children[1].style.display = null;
|
||||||
document.getElementById('continueButton').style.display = null;
|
document.getElementById('continueButton').style.display = null;
|
||||||
document.getElementById('showSummaryButton').style.display = null;
|
|
||||||
document.getElementById('startNewGameButton').style.display = null;
|
document.getElementById('startNewGameButton').style.display = null;
|
||||||
|
|
||||||
document.getElementById('showGuessButton').style.visibility = null;
|
document.getElementById('showGuessButton').style.visibility = null;
|
||||||
@ -437,12 +434,10 @@
|
|||||||
if (allResults) {
|
if (allResults) {
|
||||||
for (var i = 0; i < allResults.length; ++i) {
|
for (var i = 0; i < allResults.length; ++i) {
|
||||||
var currentResult = allResults[i];
|
var currentResult = allResults[i];
|
||||||
if (currentResult.guessPosition) {
|
|
||||||
Game.addGuessPositionToResultMap(currentResult.guessPosition, currentResult);
|
Game.addGuessPositionToResultMap(currentResult.guessPosition, currentResult);
|
||||||
resultBounds.extend(currentResult.guessPosition);
|
resultBounds.extend(currentResult.guessPosition);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Game.showResultMap(result, resultBounds);
|
Game.showResultMap(result, resultBounds);
|
||||||
},
|
},
|
||||||
@ -740,16 +735,15 @@
|
|||||||
clearInterval(Game.countdownHandler);
|
clearInterval(Game.countdownHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
Game.countdownElement = document.getElementById('countdown');
|
|
||||||
Game.countdownTimeElement = document.getElementById('countdownTime');
|
|
||||||
|
|
||||||
Game.setCountdownTime(Math.round(timeout / 1000));
|
|
||||||
|
|
||||||
if (timeout <= 0) {
|
if (timeout <= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Game.timeoutEnd = new Date(new Date().getTime() + timeout);
|
Game.timeoutEnd = new Date(new Date().getTime() + timeout);
|
||||||
|
Game.countdownElement = document.getElementById('countdown');
|
||||||
|
Game.countdownTimeElement = document.getElementById('countdownTime');
|
||||||
|
|
||||||
|
Game.setCountdownTime(Math.round(timeout / 1000));
|
||||||
|
|
||||||
Game.countdownHandler = setInterval(function () {
|
Game.countdownHandler = setInterval(function () {
|
||||||
var timeLeft = Math.round((Game.timeoutEnd - new Date()) / 1000);
|
var timeLeft = Math.round((Game.timeoutEnd - new Date()) / 1000);
|
||||||
|
Loading…
Reference in New Issue
Block a user