Merge branch 'main' of https://github.com/BigJIU/MarioWeb
This commit is contained in:
commit
b7a01ecacd
4
.idea/workspace.xml
generated
4
.idea/workspace.xml
generated
@ -2,7 +2,7 @@
|
|||||||
<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$/Mario-AI-Interface/src/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" 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" />
|
||||||
@ -226,7 +226,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="7404000" />
|
<workItem from="1678093963205" duration="7453000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
6
main.py
6
main.py
@ -79,7 +79,6 @@ def getJSONData(id):
|
|||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
print("POST Game")
|
print("POST Game")
|
||||||
resultList = list(request.form)[0].split(",")
|
resultList = list(request.form)[0].split(",")
|
||||||
print(resultList)
|
|
||||||
saveFile(replayDataPath, id + resultList[0][:-2], resultList[1:])
|
saveFile(replayDataPath, id + resultList[0][:-2], resultList[1:])
|
||||||
return "return!"
|
return "return!"
|
||||||
|
|
||||||
@ -107,7 +106,6 @@ def getRadioData():
|
|||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
print("POST Eval")
|
print("POST Eval")
|
||||||
result = request.form
|
result = request.form
|
||||||
print(result)
|
|
||||||
ipRecent = idm.getRecent(ip)
|
ipRecent = idm.getRecent(ip)
|
||||||
idm.write_csv(annotationPath, [ip, ipRecent[0], ipRecent[1], result["fun"]])
|
idm.write_csv(annotationPath, [ip, ipRecent[0], ipRecent[1], result["fun"]])
|
||||||
|
|
||||||
@ -135,7 +133,6 @@ def getJSONData2(id):
|
|||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
print("POST Game")
|
print("POST Game")
|
||||||
resultList = list(request.form)[0].split(",")
|
resultList = list(request.form)[0].split(",")
|
||||||
print(resultList)
|
|
||||||
saveFile(replayDataPath, id + resultList[0][:-2], resultList[1:])
|
saveFile(replayDataPath, id + resultList[0][:-2], resultList[1:])
|
||||||
return "return!"
|
return "return!"
|
||||||
|
|
||||||
@ -165,9 +162,8 @@ def gameannoresult2(id):
|
|||||||
print("result: " + id)
|
print("result: " + id)
|
||||||
|
|
||||||
resultList = list(request.form)[0].split(",")
|
resultList = list(request.form)[0].split(",")
|
||||||
print(resultList)
|
|
||||||
levelList = idm.getRecent(idm.getId(request.remote_addr))
|
levelList = idm.getRecent(idm.getId(request.remote_addr))
|
||||||
print(resultList)
|
|
||||||
|
|
||||||
idm.write_csv(annotationPath2,
|
idm.write_csv(annotationPath2,
|
||||||
[idm.getId(request.remote_addr), resultList[0], resultList[1], resultList[2], levelList[0], levelList[1],
|
[idm.getId(request.remote_addr), resultList[0], resultList[1], resultList[2], levelList[0], levelList[1],
|
||||||
|
Loading…
Reference in New Issue
Block a user