diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index 103dfd1..9732288 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -163,24 +163,23 @@ function checkAnswer(){ - var j = 0;// 選択した人数が同じ数の場合と,未選択の人が多かった場合のpoint調整変数 + var j = 0;// 選択した人数が同じ数のpoint調整変数 for(var i = 0; i < CHOICE_NUMBER; i ++){ - if(player.choice == question[round].answer[i] && player.choice!=E){ - player.points[round] = String(4-i+j); - // 選択した人数が同じ数の場合のpoint調整 - if (i>=1){ - if(question[round].people[i]==question[round].people[i-1]){ - j ++; - player.points[round] = String(4-i+j); - break; - } - break; + if (i>=1){ + if(question[round].people[i]==question[round].people[i-1]){ + j ++; } } - // 未選択の場合 - else{ - player.points[round] = String(0); - j++; + if(player.choice == question[round].answer[i]){ + // 未選択を選んだ場合 + if(player.choice == E){ + player.points[round] = String(0); + break; + } + else{ + player.points[round] = String(4-i+j); + } + break; } } /*