diff --git a/beautyVote.js b/beautyVote.js
index d25814a..ab9ffc4 100644
--- a/beautyVote.js
+++ b/beautyVote.js
@@ -47,7 +47,6 @@
}
}
-var player = new Player();
function setup(){
@@ -59,33 +58,39 @@
}
-
-
-
-
-
function mainloop(){
-
+ if(timer < 900){
+ timer ++;
+ }
fill("silver");
setAlp(50);
fRect(50, 50, 855, 100, "black");
fText("Q.", 110, 100, 50, "white");
fRect(45, 295, 865, 560, "white");
fRect(50, 300, 400, 250, "black");
- fText("A.", 100, 425, 50, "white");
fRect(500, 300, 400, 250, "black");
- fText("B.", 550, 425, 50, "white");
fRect(50, 600, 400, 250, "black");
- fText("C.", 100, 725, 50, "white");
fRect(500, 600, 400, 250, "black");
- fText("D.", 550, 725, 50, "white");
+
+ sRect(45, 880, 865, 40, "black");
+ fRect(45, 880, (timer/900)*865, 40, "red");
+ setAlp(100);
+
+ fText("A.", 100, 425, 50, "white");
+ fText("B.", 550, 425, 50, "white");
+ fText("C.", 100, 725, 50, "white");
+ fText("D.", 550, 725, 50, "white");
+
fText(question[round].question, 480, 100, 30, "white");
fText(question[round].choiceA, 275, 425, 30, "white");
fText(question[round].choiceB, 725, 425, 30, "white");
fText(question[round].choiceC, 275, 725, 30, "white");
fText(question[round].choiceD, 725, 725, 30, "white");
+ fText(int(timer/30), 900, 1100, 50, "red");
+
+ setAlp(50);
fText((round+1) + "回戦", 100, 1000, 50, "red");
for(var i = 0; i < MAX_ROUND; i ++){
@@ -143,7 +148,7 @@
else{
player.points[round] = WRONG;
}
-
+ timer = 0;
round ++;
if(round < MAX_ROUND){
setQuestion(round);
@@ -169,6 +174,8 @@
question[i] = new Question();
}
+var player = new Player();
+
var questions = ["「にっこり」の対義語は?",
"もっとも年齢が高いのは?",
diff --git a/index.html b/index.html
index 14e49e6..2adfaa3 100644
--- a/index.html
+++ b/index.html
@@ -6,15 +6,6 @@
-
-
-
-
-
-
-
-
-