diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index 95a5b74..f3b8c9a 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -170,12 +170,7 @@ //WAITコードを受信 xhr.onreadystatechange = function() { if (xhr.readyState === 4 && xhr.status === 200) { - if(xhr.responseText!="Data received successfully"){ console.log(xhr.responseText); - } - else{ - console.log(xhr.responseText); - } } } } @@ -191,12 +186,7 @@ //WAITコードを受信 xhr.onreadystatechange = function() { if (xhr.readyState === 4 && xhr.status === 200) { - if(xhr.responseText!="Data received successfully"){ console.log(xhr.responseText); - } - else{ - console.log(xhr.responseText); - } } } } @@ -210,13 +200,8 @@ //識別番号を受信 xhr.onreadystatechange = function() { if (xhr.readyState === 4 && xhr.status === 200) { - if(xhr.responseText!="Data received successfully"){ - console.log("識別番号:" + xhr.responseText); - player.number = xhr.responseText; - } - else{ - console.log(xhr.responseText); - } + console.log("識別番号:" + xhr.responseText); + player.number = xhr.responseText; } } } @@ -313,8 +298,8 @@ var round = 0; //変更 -var MAX_ROUND = 1; -var max_player = 0; // 最大のplayer数 +var MAX_ROUND = 2; +var max_player = 0; // 最大のplayer数(変更不要) var timer = 0; var TIME_LIMIT = 900; @@ -388,9 +373,4 @@ ["ハサミの刃", "貝の殻", "栗の実", "両手"], ["そら豆", "えんどう豆", "いんげん豆", "ひよこ豆"], ["エレファント", "ホエール", "ダイナソー", "メガ"], - ["カニ", "ナマコ", "タコ", "ホタテ"]]; - - -// 送信用 -// var form = document.createElement('form'); -// var request = document.createElement('input'); \ No newline at end of file + ["カニ", "ナマコ", "タコ", "ホタテ"]]; \ No newline at end of file diff --git a/flask/testapp/views.py b/flask/testapp/views.py index b391f49..6483d94 100644 --- a/flask/testapp/views.py +++ b/flask/testapp/views.py @@ -6,7 +6,7 @@ user_score = {} # playerの数 -MAX_PLAYER = 2 +MAX_PLAYER = 3 # 何位まで表示するか(nemoto) max_order = 5