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

Fix 66

Browse Source
This commit is contained in:
bigJIU 2022-11-10 19:32:50 +08:00
parent 7b9d5567c3
commit 3e45a63683
6 changed files with 2145 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
.idea/workspace.xml generated
View File

@ -2,24 +2,10 @@
<project version="4"> <project version="4">
<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$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<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/src/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/agents/HumanAgent.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/agents/HumanAgent.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$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" /> <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="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$/pyExcel.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GameAnnotation.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/templates/GameAnnotation.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GameQuestion.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameQuestion.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/Template.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/templates/data.js" beforeDir="false" afterPath="$PROJECT_DIR$/templates/data.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/eval.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/templates/play.html" beforeDir="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" />
@ -88,6 +74,43 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="MarioWeb" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/test.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="Flask (main.py) (1)" type="Python.FlaskServer" temporary="true" nameIsGenerated="true">
<module name="MarioWeb" />
<option name="target" value="$PROJECT_DIR$/main.py" />
<option name="targetType" value="PATH" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="launchJavascriptDebuger" value="false" />
<method v="2" />
</configuration>
<configuration name="Flask (main.py)" type="Python.FlaskServer" temporary="true" nameIsGenerated="true"> <configuration name="Flask (main.py)" type="Python.FlaskServer" temporary="true" nameIsGenerated="true">
<option name="additionalOptions" value="--host 0.0.0.0 --port 8000" /> <option name="additionalOptions" value="--host 0.0.0.0 --port 8000" />
<module name="MarioWeb" /> <module name="MarioWeb" />
@ -105,12 +128,16 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<list> <list>
<item itemvalue="Flask server.Flask (main.py) (1)" />
<item itemvalue="Flask server.Flask (main.py)" /> <item itemvalue="Flask server.Flask (main.py)" />
<item itemvalue="Python.MarioWeb" /> <item itemvalue="Python.MarioWeb" />
<item itemvalue="Python.test" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Flask server.Flask (main.py)" /> <item itemvalue="Flask server.Flask (main.py)" />
<item itemvalue="Flask server.Flask (main.py) (1)" />
<item itemvalue="Python.test" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -131,7 +158,8 @@
<workItem from="1667357110859" duration="5735000" /> <workItem from="1667357110859" duration="5735000" />
<workItem from="1667456828218" duration="24361000" /> <workItem from="1667456828218" duration="24361000" />
<workItem from="1667898094682" duration="1595000" /> <workItem from="1667898094682" duration="1595000" />
<workItem from="1667998268807" duration="2239000" /> <workItem from="1667998268807" duration="2593000" />
<workItem from="1668064138807" duration="1888000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -150,6 +178,7 @@
</option> </option>
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1667998673231" 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="1668079915300" 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="1668079537189" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
</component> </component>
</project> </project>

BIN
__pycache__/main.cpython-39.pyc
View File

Binary file not shown.

6
data/questionare.csv
View File

@ -40,3 +40,9 @@ IP,Style,Frequency,Age,Gender
127.0.0.1,,,,, 127.0.0.1,,,,,
127.0.0.1,,,,, 127.0.0.1,,,,,
127.0.0.1,,,,, 127.0.0.1,,,,,
127.0.0.1,C,B,G,A,
127.0.0.1,A,A,G,B,
127.0.0.1,,,,,
127.0.0.1,D,E,D,,
127.0.0.1,,,,,
127.0.0.1,D,,,,

1 IP,Style,Frequency,Age,Gender
40 127.0.0.1,,,,,
41 127.0.0.1,,,,,
42 127.0.0.1,,,,,
43 127.0.0.1,C,B,G,A,
44 127.0.0.1,A,A,G,B,
45 127.0.0.1,,,,,
46 127.0.0.1,D,E,D,,
47 127.0.0.1,,,,,
48 127.0.0.1,D,,,,

4
main.py
View File

@ -60,8 +60,8 @@ def getJSONData(id):
# print(request.form) # print(request.form)
# print(list(request.form)) # print(list(request.form))
resultList = list(request.form)[0].split(",") resultList = list(request.form)[0].split(",")
print(resultList)
saveFile(replayDataPath, id + resultList[0], resultList[1:]) saveFile(replayDataPath, id + resultList[0][:-2], resultList[1:])
return "get!" return "get!"

12
templates/GameAnnotation.html
View File

@ -15,7 +15,7 @@
<link href="../templates/Web/font-awesome.min.css" rel="stylesheet"> <link href="../templates/Web/font-awesome.min.css" rel="stylesheet">
<link rel="shortcut icon" href="http://aingames.cn/static/img/logo.png"> <link rel="shortcut icon" href="http://aingames.cn/static/img/logo.png">
<script src="../templates/Web/dynamics.js"></script>
<script src="../templates/Web/font_3071663_oravow8bb8q.js"></script> <script src="../templates/Web/font_3071663_oravow8bb8q.js"></script>
<script src="../templates/data.js"></script> <script src="../templates/data.js"></script>
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
@ -51,6 +51,7 @@
margin-left: 35%; margin-left: 35%;
border-radius: 10px; border-radius: 10px;
} }
.cirButton { .cirButton {
width:100%; width:100%;
height:60px; height:60px;
@ -143,6 +144,8 @@
border-radius: 50%; border-radius: 50%;
} }
@keyframes click-wave { @keyframes click-wave {
0% { 0% {
height: 40px; height: 40px;
@ -159,6 +162,7 @@
} }
} }
</style> </style>
</head> </head>
@ -305,7 +309,11 @@ function Replay(id){
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="col-md-8"> <div class="col-md-8">
<!-- <button onclick="getRadioValue()" class="cirButton"> <h3>Submit</h3> </button>. --> <!-- <button onclick="getRadioValue()" class="cirButton"> <h3>Submit</h3> </button>. -->
<p><input type = "submit" value = "submit" /></p> <p><button type = "submit" value = "submit">Submit</button></p>
</div>
<br><br> <br><br>
</div> </div>

2082
templates/Web/dynamics.js Normal file
View File

File diff suppressed because it is too large Load Diff