diff --git a/flask/testapp/static/image/image1.jpg b/flask/testapp/static/image/image1.jpg index c1ee3c4..be7a2e7 100644 --- a/flask/testapp/static/image/image1.jpg +++ b/flask/testapp/static/image/image1.jpg Binary files differ diff --git a/flask/testapp/static/image/image2.jpg b/flask/testapp/static/image/image2.jpg index 8fd6c8c..c15435e 100644 --- a/flask/testapp/static/image/image2.jpg +++ b/flask/testapp/static/image/image2.jpg Binary files differ diff --git a/flask/testapp/static/image/image3.jpg b/flask/testapp/static/image/image3.jpg index e6557b7..eee76cd 100644 --- a/flask/testapp/static/image/image3.jpg +++ b/flask/testapp/static/image/image3.jpg Binary files differ diff --git a/flask/testapp/static/image/image4.jpg b/flask/testapp/static/image/image4.jpg index 216b9cf..4ac55e4 100644 --- a/flask/testapp/static/image/image4.jpg +++ b/flask/testapp/static/image/image4.jpg Binary files differ diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index e079349..2059d5c 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -46,7 +46,7 @@ player.name = username; player.number = userNumber; for(var i = 0; i < 4; i ++){ - + loadImg(i, "static/image/image" + String(i+1) + ".jpg"); } console.log(language); } @@ -360,7 +360,7 @@ var D = 3; var E = 4; -var string = ["A", "B", "C", "D"]; +var string = ["A", "B", "C", "D", "E"]; var CORRECT = 1; var WRONG = 0; @@ -390,29 +390,7 @@ var player = new Player(); -/* -var questions = ["「にっこり」の対義語は?", - "もっとも年齢が高いのは?", - "中国語で「勉強」意味は?", - "焼き肉の「テッポウ」はどこの部位？", - "アフリカ大陸でもっとも面積が大きい国は?", - "実在する生き物は?", - "カスタネットの名前の由来となったものは?", - "名前が人物に由来しているのは?", - "ジンベイザメは英語で何シャーク?", - "心臓がない生き物は?", - "What is the antonym of 'smile' in Japanese?", - "Who is the oldest?", - "What does 'study' mean in Chinese?", - "What part of the animal is 'Teppou' in Yakiniku?", - "Which is the largest country in Africa by area?", - "Which is a real creature?", - "What is the origin of the name of the castanets?", - "Which is named after a person?", - "What kind of shark is a 'Jinbei' in English?", - "Which creature does not have a heart?"]; -*/ - +//当日用の問題 var questions = ["好きな季節は？", "千葉県の産出額が全国１位でない農林水産物は？", "中口先生の出身都道府県は？", @@ -455,7 +433,29 @@ ["Freshman and Sophomore", "Junior and Senior", "Master's course", "Doctoral course"], ["Yamada Rui 53rd", "Sugi-chan", "Masahiro Hamada", "Nakayama Kin'nikun"]]; +//テスト用の問題 /* +var questions = ["「にっこり」の対義語は?", + "もっとも年齢が高いのは?", + "中国語で「勉強」意味は?", + "焼き肉の「テッポウ」はどこの部位？", + "アフリカ大陸でもっとも面積が大きい国は?", + "実在する生き物は?", + "カスタネットの名前の由来となったものは?", + "名前が人物に由来しているのは?", + "ジンベイザメは英語で何シャーク?", + "心臓がない生き物は?", + "What is the antonym of 'smile' in Japanese?", + "Who is the oldest?", + "What does 'study' mean in Chinese?", + "What part of the animal is 'Teppou' in Yakiniku?", + "Which is the largest country in Africa by area?", + "Which is a real creature?", + "What is the origin of the name of the castanets?", + "Which is named after a person?", + "What kind of shark is a 'Jinbei' in English?", + "Which creature does not have a heart?"]; + var choices = [["がっくり", "げっそり", "むっつり", "しっとり"], ["ドナルド・トランプ", "ボリス・ジョンソン", "ウラジーミル・プーチン", "アンゲラ・メルケル"], @@ -480,6 +480,6 @@ */ -var realAnswer = [C,A,B,B,C,C,C,C,B,B]; +var realAnswer = [E,D,A,E,A,E,D,B,E,A]; var view_result = 0; \ No newline at end of file diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js index 862596d..b14970e 100644 --- a/flask/testapp/static/javascript/resultScreen.js +++ b/flask/testapp/static/javascript/resultScreen.js @@ -38,6 +38,15 @@ fText(question[round].choiceC, 275, 725, 25, "white"); fText(question[round].choiceD, 725, 725, 25, "white"); + if(round == 9){ + setAlp(30) + drawImg(A, 50, 300); + drawImg(B, 500, 300); + drawImg(C, 50, 600); + drawImg(D, 500, 600); + setAlp(100); + } + if(language==JPN){ fText((round+1) + "回戦", 100, 1000, 50, "red"); fText("現在の点数： " + player.score + " Pt", 700, 1000, 50, "black"); @@ -63,11 +72,13 @@ fText(checkOrder(C, round) + "Pt", 400, 800, 50, "white"); fText(CheckPeople(D, round)+"人", 850, 640, 50, "white"); fText(checkOrder(D, round) + "Pt", 850, 800, 50, "white"); - if(language==JPN){ - fText("正解："+string[question[round].realAnswer], 800, 900, 50, "black"); - } - else{ - fText("Answer : "+string[question[round].realAnswer], 780, 900, 50, "black"); + if(question[round].realAnswer != E){ + if(language==JPN){ + fText("正解："+string[question[round].realAnswer], 800, 900, 50, "black"); + } + else{ + fText("Answer : "+string[question[round].realAnswer], 780, 900, 50, "black"); + } } } @@ -105,16 +116,6 @@ 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"); sRect(200, 500, 560, 200, "blue");