diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index 6a6e57e..d302515 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -59,39 +59,17 @@ switch(scene){ case 3: - fill("silver"); - setAlp(50); - - fRect(50, 50, 855, 100, "black"); - fText("美人投票ゲーム", 480, 100, 80, "white"); - fText("あなたの名前を入力してください", 480, 200, 50, "black"); - - fRect(200, 500, 560, 200, "black"); - sRect(200, 500, 560, 200, "blue"); - setAlp(100); - fText("ゲーム開始!", 480, 600, 50, "white"); - - setAlp(20); - fRect(100, 800, 760, 300, "black"); - setAlp(100); - fTextN("ルール1\nルール2\nルール3\nルール4", 480, 950, 200, 50, "white"); - - - if(tapC == 1){ - tapC ++; - - if(200 <= tapX && tapX <= 760 && 500 <= tapY && tapY <= 700){ - player.name = document.getElementById('textBox').value; - document.getElementById('textBox').style.display = 'none'; - scene = 1; - } - } - - + inputName(); break; case 1: - if(timer < 900){ + if(timer > TIME_LIMIT){ + player.choice = E; + postForm(player.choice) // 送信用 + checkAnswer(); + break; + } + else{ timer ++; } @@ -109,12 +87,10 @@ fRect(45, 880, (timer/900)*865, 40, "red"); setAlp(100); - fText("A.", 100, 425, 40, "white"); fText("B.", 550, 425, 40, "white"); fText("C.", 100, 725, 40, "white"); fText("D.", 550, 725, 40, "white"); - fText(player.name, 50, 50, 40, "white"); fText(question[round].question, 480, 100, 30, "white"); fText(question[round].choiceA, 275, 425, 25, "white"); @@ -185,10 +161,10 @@ else{ player.points[round] = WRONG; } - timer = 0; round ++; if(round < MAX_ROUND){ setQuestion(round); + timer = 0; } else{ scene = 2; @@ -218,7 +194,7 @@ var xhr = new XMLHttpRequest(); xhr.open('POST', '/form'); xhr.setRequestHeader('content-type', 'application/x-www-form-urlencoded;charset=UTF-8'); - xhr.send(player.choice); + xhr.send(value); } @@ -226,12 +202,14 @@ var MAX_ROUND = 10; var timer = 0; -var select = 0; +var TIME_LIMIT = 900; var A = 0; var B = 1; var C = 2; var D = 3; +var E = 4; + var CORRECT = 1; var WRONG = 0; diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js index 682ac7e..5d05a51 100644 --- a/flask/testapp/static/javascript/resultScreen.js +++ b/flask/testapp/static/javascript/resultScreen.js @@ -43,5 +43,34 @@ } function inputName(){ + fill("silver"); + + fRect(50, 50, 855, 100, "black"); + + + fText("美人投票ゲーム", 480, 100, 80, "white"); + setAlp(50); + fText("あなたの名前を入力してください", 480, 200, 50, "black"); + + fRect(200, 500, 560, 200, "black"); + sRect(200, 500, 560, 200, "blue"); + setAlp(100); + fText("ゲーム開始!", 480, 600, 50, "white"); + + setAlp(20); + fRect(100, 800, 760, 300, "black"); + setAlp(100); + fTextN("ルール1\nルール2\nルール3\nルール4", 480, 950, 200, 50, "white"); + + + if(tapC == 1){ + tapC ++; + + if(200 <= tapX && tapX <= 760 && 500 <= tapY && tapY <= 700){ + player.name = document.getElementById('textBox').value; + document.getElementById('textBox').style.display = 'none'; + scene = 1; + } + } } \ No newline at end of file