baiyanlali/MarioWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Debug

Browse Source
This commit is contained in:
bigJIU 2023-03-07 19:26:21 +08:00
parent 248ab9781a
commit aea6adfee6
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.idea/workspace.xml generated
View File

@ -3,33 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment=""> <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/IDManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/IDManager.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface.jar" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/reps/f_l_sav.rep" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/reps/f_l_sav.rep" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioRender.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioRender.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioWorld.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioWorld.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/sprites/Mario.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/sprites/Mario.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/annotation.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/annotation.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-1.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-10.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-2.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-3.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-4.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-5.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-6.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-7.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-8.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-9.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/t1.lvl" beforeDir="false" afterPath="$PROJECT_DIR$/levels/tt1.lvl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/levels/t2.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/t3.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GameAnnotation2.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation2.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/templates/GameTutorial.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameTutorial.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -253,7 +228,7 @@
<workItem from="1677595224096" duration="799000" /> <workItem from="1677595224096" duration="799000" />
<workItem from="1677674512203" duration="4789000" /> <workItem from="1677674512203" duration="4789000" />
<workItem from="1677840429576" duration="1147000" /> <workItem from="1677840429576" duration="1147000" />
<workItem from="1678093963205" duration="3442000" /> <workItem from="1678093963205" duration="4472000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -275,6 +250,6 @@
<SUITE FILE_PATH="coverage/MarioWeb$MarioWeb.coverage" NAME="MarioWeb Coverage Results" MODIFIED="1669305478201" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" /> <SUITE FILE_PATH="coverage/MarioWeb$MarioWeb.coverage" NAME="MarioWeb Coverage Results" MODIFIED="1669305478201" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
<SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1677224605926" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1677224605926" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1678187086740" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1678188177267" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component> </component>
</project> </project>

2
main.py
View File

@ -46,7 +46,7 @@ def gamepreplay():
""]) ""])
idm.setControl(cid, result.get("control")) idm.setControl(cid, result.get("control"))
print(result.get("gamestyle")) print(result.get("gamestyle"))
return redirect(url_for('gameplay', id=cid)) return redirect(url_for('gametutorial', id=cid))
# debug use: # debug use:
# return redirect(url_for('gameanno2', id=cid)) # return redirect(url_for('gameanno2', id=cid))

9
templates/GameTutorial.html
View File

@ -243,8 +243,7 @@
console.log("Cheerpj Initialize Succeed!"); console.log("Cheerpj Initialize Succeed!");
document.getElementById("loading").style.visibility = "hidden"; document.getElementById("loading").style.visibility = "hidden";
}) }).then(function (){
var control = ("{{control}}" == "1"); var control = ("{{control}}" == "1");
PlayLevel(level,control) PlayLevel(level,control)
@ -255,7 +254,11 @@
} }
document.getElementById("game").style.visibility = "visible"; document.getElementById("game").style.visibility = "visible";
});' class="cirButton"> });
})
' class="cirButton">
<h3>Repeat Tutorial</h3> <h3>Repeat Tutorial</h3>
</button> </button>
</div> </div>