diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..11a5d8e --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +main.py \ No newline at end of file diff --git a/.idea/MarioWeb.iml b/.idea/MarioWeb.iml index 37901ac..4f8673c 100644 --- a/.idea/MarioWeb.iml +++ b/.idea/MarioWeb.iml @@ -5,7 +5,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index d56657a..81644ce 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/main.py b/main.py index 80095c7..8f5a5c9 100644 --- a/main.py +++ b/main.py @@ -193,21 +193,27 @@ def gameannoresult2(id): return redirect(url_for("gameplay2", id=id)) -@app.route("/gameover") +@app.route("/gameover",methods=['POST','GET']) def over(): finish = idm.getTimes(getId()) - return render_template("GameOver.html", finish=1, stage=1) - - -@app.route("/gameover//feedback", methods=['POST']) -def overa(): if request.method == 'POST': resultList = list(request.form)[0].split(",") idm.write_csv(feedbackPath, [getId(), resultList[0], ""]) + return render_template("GameOver.html", finish=1, stage=1) + +# @app.route('/feedback', methods=['POST']) +# def overa(): +# if request.method == 'POST': +# resultList = list(request.form)[0].split(",") +# idm.write_csv(feedbackPath, +# [getId(), resultList[0], +# ""]) + + # return redirect(url_for("over", id=id)) def saveFile(path, filename, content): cp = list(map(int, content)) file_dir = os.path.join(os.getcwd(), path) diff --git a/templates/GameOver.html b/templates/GameOver.html index dce88b2..9f75a86 100644 --- a/templates/GameOver.html +++ b/templates/GameOver.html @@ -3,7 +3,7 @@ - + @@ -189,9 +189,10 @@

-

Do you have any feedback?

+ +
+

Do you have any feedback?


-

- +
@@ -229,7 +256,7 @@ -
This page is created by Haocheng Du, Yuchen Li; game content is generated by Ziqi Wang. This project is supported by Dr. Liu and Prof. Yannakakis.
+
This page is created by Haocheng Du, Yuchen Li; game content is generated by procedural content generator (PCG) designed by Ziqi Wang.
This project is supported by Dr. Liu and Prof. Yannakakis.


@@ -250,7 +277,7 @@ - + diff --git a/templates/GameTutorial.html b/templates/GameTutorial.html index c71ca7d..957fbc5 100644 --- a/templates/GameTutorial.html +++ b/templates/GameTutorial.html @@ -217,18 +217,19 @@
-
+
-
+

Super Mario Bros Tutorial

-

Before proceeding to the main part of the experiment please familiarize yourself with the game.
- You may proceed to the next phase of this survey once you are ready!

- - Click ME to show the instruction page again. +

Before proceeding to the main part of the experiment please familiarize yourself with the game.
+ You may proceed to the next phase of this survey once you are ready!

+ + Click ME to show the instruction + page again.

If the game is not responding to your keyboard, please click on the game screen.

@@ -245,7 +246,7 @@
-
+
-
-
+ + + - -
@@ -366,19 +387,11 @@
- + - @@ -388,7 +401,7 @@