diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index f66b235..f48b218 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -257,7 +257,10 @@ } //他の参加者が集まるまで待機 else{ - max_player = xhr.responseText + var max_current_player = xhr.responseText + let splitplayer = max_current_player.split(" "); + max_player = splitplayer[0] + current_player = splitplayer[1] console.log(max_player); } } @@ -341,6 +344,7 @@ var round = 0; //変更 var MAX_ROUND = 2; var max_player = 0; // 最大のplayer数(変更不要) +var current_player = 0; var timer = 0; var TIME_LIMIT = 900; diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js index 57e1007..950dff9 100644 --- a/flask/testapp/static/javascript/resultScreen.js +++ b/flask/testapp/static/javascript/resultScreen.js @@ -90,8 +90,7 @@ setAlp(100); fText("参加予定者:" + max_player + "人", 480, 300, 50, "black"); - current_participants = int(player.number) + 1 - fText("現在の参加者:" + str(current_participants) + "人", 480, 400, 50, "black"); + fText("現在の参加者:" + current_player + "人", 480, 400, 50, "black"); fText("参加者が揃うまでお待ちください...", 480, 600, 50, "red"); setAlp(20); @@ -151,7 +150,7 @@ fText(arr[0], 150, 480+60*i, 50, "#8c4841"); } else{ - fText((i+1)+"位", 100, 480+60*i, 50, "black"); + fText((i+1)+"位", 150, 480+60*i, 50, "black"); } fText(arr[1], 390, 480+60*i, 50, "black"); fText(arr[2], 730, 480+60*i, 50, "black"); diff --git a/flask/testapp/views.py b/flask/testapp/views.py index e4594e4..6293cfc 100644 --- a/flask/testapp/views.py +++ b/flask/testapp/views.py @@ -6,7 +6,7 @@ user_score = {} # playerの数 -MAX_PLAYER = 1 +MAX_PLAYER = 4 # 何位まで表示するか(nemoto) max_order = 5 @@ -54,7 +54,7 @@ # 他のplayerが揃うのを待機(nemoto追記) if request.form.get("checkStart"): if user_number < MAX_PLAYER: - return str(MAX_PLAYER) + return str(MAX_PLAYER) + " " + str(user_number) # 全員のデータが集まった場合は,ゲーム開始 else: return "START" @@ -76,7 +76,6 @@ return "WAIT" # 全員のデータが集まった場合は,多数派を計算 else: - print(frequent_table) return frequent_table # ゲーム終了時,識別番号とスコアを受け取る