')
def gameanno(id):
if (id != "radioresult"):
@@ -111,11 +111,10 @@ def getRadioData():
idm.write_csv(annotationPath, [ip, ipRecent[0], ipRecent[1], result["fun"]])
if idm.getTimes(ip):
- return redirect(url_for("gameplay2",id=ip))
+ return redirect(url_for("gameplay2", id=ip))
else:
idm.addTimes(ip)
- return redirect(url_for("gameplay",id=ip))
-
+ return redirect(url_for("gameplay", id=ip))
@app.route('/gameplay2')
@@ -150,7 +149,7 @@ def gameanno2(id):
if id != "result":
print("anno " + id)
gamelevels = idm.getRecent(id)
- #gamelevels = idm.getTypeLevels(id)
+ # gamelevels = idm.getTypeLevels(id)
level1 = gamelevels[0]
level2 = gamelevels[1]
level3 = gamelevels[2]
@@ -168,7 +167,8 @@ def gameannoresult2(id):
print(resultList)
idm.write_csv(annotationPath2,
- [request.remote_addr, resultList[0], resultList[1], resultList[2], levelList[0], levelList[1], levelList[2],
+ [request.remote_addr, resultList[0], resultList[1], resultList[2], levelList[0], levelList[1],
+ levelList[2],
""])
if idm.getTimes(id):
@@ -180,13 +180,13 @@ def gameannoresult2(id):
@app.route("/gameover")
def over():
- # finish = idm.getTimes(request.remote_addr)
+ finish = idm.getTimes(request.remote_addr)
# print("finish %d",finish)
# if finish:
# idm.setTimes(request.remote_addr)
# else:
# idm.addTimes(request.remote_addr)
- return render_template("GameOver.html")
+ return render_template("GameOver.html", finish=1, stage=1)
def saveFile(path, filename, content):
diff --git a/templates/GameAnnotation2.html b/templates/GameAnnotation2.html
index d7fd1e1..a5c74fb 100644
--- a/templates/GameAnnotation2.html
+++ b/templates/GameAnnotation2.html
@@ -33,7 +33,7 @@
.popwindow {
width:500px;
- height:550px;
+ height:580px;
border:3px solid #ff928e;
visibility: hidden;
position: absolute;
diff --git a/templates/GameOver.html b/templates/GameOver.html
index 81ae676..5338c44 100644
--- a/templates/GameOver.html
+++ b/templates/GameOver.html
@@ -152,9 +152,9 @@
fini.style.visibility = "visible";
if('{{stage}}' == '2'){
fini.innerText = "Finish"
- }else{
- fini.innerText = "Go to Phase II"
- }
+ }else{
+ fini.innerText = "Go to Phase II"
+ }
}else{
fini.style.visibility = "hidden";
@@ -171,8 +171,8 @@
Do you want to play another round?
- Yes
- No
+ Yes
+ No
Keep Playing!
+ " style="visibility: hidden">Keep Playing!
Finish!
+ " style="visibility: hidden">Finish!
diff --git a/templates/GameWelcome.html b/templates/GameWelcome.html
index 1802c8b..34e0e47 100644
--- a/templates/GameWelcome.html
+++ b/templates/GameWelcome.html
@@ -224,7 +224,7 @@
justify-content: center;
min-width: fit-content;
">
-
@@ -238,7 +238,8 @@
This experiment consists of two phases, In each phase you will first be asked to play a number of Super Mario Bros games
and then will be asked some questions about the levels you just played.
- It takes about 15 minutes in total to complete the experiment. You will play the tutorial level and 2 + 2 + 3 = 7 levels of game during the experiment. It takes about 15 minutes in total to complete the experiment. Have Fun!
+ 