diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index a9caaed..92ee671 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -342,8 +342,8 @@ var round = 0; //変更 var MAX_ROUND = 10; var CHOICE_NUMBER = 5; -var max_player = 0; // 最大のplayer数(変更不要) -var current_player = 0; +var max_player = " "; // 最大のplayer数(変更不要) +var current_player = " "; var sent_player = " "; // 各ラウンドで、答えを送信した人数 var round_player = " "; // 各ラウンドでの参加人数 diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js index 862596d..14a844c 100644 --- a/flask/testapp/static/javascript/resultScreen.js +++ b/flask/testapp/static/javascript/resultScreen.js @@ -25,14 +25,14 @@ } setAlp(100); - fText("Q.", 90, 100, 40, "white"); + fText("Q.", 110, 100, 40, "white"); - fText("A.", 95, 425, 40, "white"); - fText("B.", 545, 425, 40, "white"); - fText("C.", 95, 725, 40, "white"); - fText("D.", 545, 725, 40, "white"); + fText("A.", 100, 425, 40, "white"); + fText("B.", 550, 425, 40, "white"); + fText("C.", 100, 725, 40, "white"); + fText("D.", 550, 725, 40, "white"); - fTextN(question[round].question, 480, 100, 50, 30, "white"); + fText(question[round].question, 480, 100, 30, "white"); fText(question[round].choiceA, 275, 425, 25, "white"); fText(question[round].choiceB, 725, 425, 25, "white"); fText(question[round].choiceC, 275, 725, 25, "white"); @@ -82,7 +82,7 @@ } else{ fText("Counting..." , 500, 540, 50, "white"); - fText(sent_player + "of" + round_player + "sent", 500, 610, 50, "white"); + fText(sent_player + " "+ "of" + " " + round_player + " " + "sent", 500, 610, 50, "white"); } } } @@ -104,16 +104,6 @@ fText("Beauty Vote", 480, 100, 80, "white"); fTextN("Rule Explanation\n\n・Please choose your favorite option\n・If the chosen option is the majority,\nyou get high points!\n・The time limit is 30 seconds\n・No mid-term participation or withdrawal", 480, 950, 230, 35, "black"); } - - 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'; - sendName(); - } - } if(scene == START_SCENE){ fRect(200, 500, 560, 200, "black"); @@ -212,12 +202,12 @@ setAlp(100); - fText("Q.", 90, 100, 40, "white"); + fText("Q.", 110, 100, 40, "white"); - fText("A.", 95, 425, 40, "white"); - fText("B.", 545, 425, 40, "white"); - fText("C.", 95, 725, 40, "white"); - fText("D.", 545, 725, 40, "white"); + 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(question[show_click_round].question, 480, 100, 30, "white"); fText(question[show_click_round].choiceA, 275, 425, 25, "white");