diff --git a/flask/server.py b/flask/server.py index 562a19f..497b313 100644 --- a/flask/server.py +++ b/flask/server.py @@ -2,3 +2,4 @@ if __name__ == "__main__": app.run() + diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index 9c0e218..20ab9e8 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -56,7 +56,7 @@ case WAIT_START: WaitStart(); - if(timer > 5){ + if(timer > 30){ timer = 0; CheckStart();// 他のプレイヤーが名前を書き終わるのを待機 } @@ -250,6 +250,21 @@ } } +//ユーザーネームをサーバーに送信する処理 +function sendStart(){ + xhr.open('POST', '/form'); + xhr.setRequestHeader('content-type', 'application/x-www-form-urlencoded;charset=UTF-8'); + //ユーザーネームを送信 + xhr.send('start=' + "GAMESTART"); + //識別番号を受信 + xhr.onreadystatechange = function() { + if (xhr.readyState === 4 && xhr.status === 200) { + console.log("参加人数:" + xhr.responseText); + } + } +} + + //参加するプレイヤーが揃ったか確認(nemoto追記) function CheckStart(){ xhr.open('POST', '/form'); diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js index d7035f7..605ccde 100644 --- a/flask/testapp/static/javascript/resultScreen.js +++ b/flask/testapp/static/javascript/resultScreen.js @@ -55,7 +55,7 @@ fRect(200, 500, 560, 200, "black"); sRect(200, 500, 560, 200, "blue"); setAlp(100); - fText("ゲーム開始!", 480, 600, 50, "white"); + fText("ゲームに参加", 480, 600, 50, "white"); setAlp(20); fRect(100, 800, 760, 300, "black"); @@ -91,7 +91,20 @@ setAlp(100); fText("参加予定者:" + max_player + "人", 480, 300, 50, "black"); fText("現在の参加者:" + current_player + "人", 480, 400, 50, "black"); - fText("参加者が揃うまでお待ちください...", 480, 600, 50, "red"); + fText("参加者が揃うまでお待ちください...", 480, 500, 50, "red"); + if(player.number == 0){ + fRect(200, 580, 560, 200, "black"); + sRect(200, 580, 560, 200, "blue"); + setAlp(100); + fText("ゲーム開始!", 480, 680, 50, "white"); + if(tapC > 1){ + tapC ++; + if(200 <= tapX && tapX <= 760 && 580 <= tapY && tapY <= 780){ + sendStart(); + console.log("START"); + } + } + } setAlp(20); fRect(100, 800, 760, 300, "black"); diff --git a/flask/testapp/views.py b/flask/testapp/views.py index 028b5ef..5142476 100644 --- a/flask/testapp/views.py +++ b/flask/testapp/views.py @@ -32,6 +32,7 @@ order_table = "" most_common_option = 0 +start_flag = False @app.route("/form", methods=["GET", "POST"]) @@ -58,11 +59,21 @@ # 他のplayerが揃うのを待機(nemoto追記) if request.form.get("checkStart"): + if user_number >= MAX_PLAYER or startFlag: + return "START" + # 全員のデータが集まった場合は,ゲーム開始 + else: + return str(MAX_PLAYER) + " " + str(user_number) + + # 他のplayerが揃うのを待機(nemoto追記) + if request.form.get("start"): + print(request.form.get("start")) if user_number < MAX_PLAYER: return str(MAX_PLAYER) + " " + str(user_number) # 全員のデータが集まった場合は,ゲーム開始 else: return "START" + # ゲーム中に選択肢を取得し,集計する if request.form.get("choice"):