From 79cb2afe6642c37d30776d1f38aac1448b2c1b04 Mon Sep 17 00:00:00 2001 From: bigJIU <1572204178@qq.com> Date: Wed, 26 Apr 2023 15:51:26 +0800 Subject: [PATCH] Update date --- Mario-AI-Interface/levels/lvl155.lvl | 16 ++++++++++++++++ Mario-AI-Interface/levels/lvl73.lvl | 16 ++++++++++++++++ Mario-AI-Interface/levels/lvl87.lvl | 16 ++++++++++++++++ ...9cbd3-ee8e-48de-baf8-da6438461d1d_lvl155.rep | Bin 0 -> 1461 bytes ...79cbd3-ee8e-48de-baf8-da6438461d1d_lvl87.rep | Bin 0 -> 1187 bytes Mario-AI-Interface/src/Play.java | 4 ++-- main.py | 8 +++++--- 7 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 Mario-AI-Interface/levels/lvl155.lvl create mode 100644 Mario-AI-Interface/levels/lvl73.lvl create mode 100644 Mario-AI-Interface/levels/lvl87.lvl create mode 100644 Mario-AI-Interface/reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl155.rep create mode 100644 Mario-AI-Interface/reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl87.rep diff --git a/Mario-AI-Interface/levels/lvl155.lvl b/Mario-AI-Interface/levels/lvl155.lvl new file mode 100644 index 0000000..74ca194 --- /dev/null +++ b/Mario-AI-Interface/levels/lvl155.lvl @@ -0,0 +1,16 @@ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-----------------#--------------------------------------------------------------------------------------------------------------------------------------------------------------SSSSSSSS-------- +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +----------------------------------o----------------------------oo--------------------------------------------------------------------------------------------------------------------------#---- +--------%%%%%%%%---------------S----------------%%%%----------------------------------SSSS-----U-------oo------------------------SS@----oo-----o-------%%------------------------o---------#--o- +---------||||||----------------------------------||----------------------------------------------------------------------------------------------------||---------------------------------##---- +---------||||||--------------#-------------------||--------------------------o---------------------------------------------------------------o---------||--------------------------------###-SSS +---------||||||--o----------####-------TT--------||-------o---------------ooor---------------------------------o-----------------------------S---------||-------------------------------####---- +------%%%%%%%%%%-----------####------S1TT-------%%|-----%%%%%%--Soo-------%%SSS--------------o---------###---------------TT-----------Q-----SSS-%------||------------------------------#####---- +-------||||||||------------####-TT-----#T-------|||------||||--o----------||----------------------##---------------------TT---------------------|------||---------TT------------------y####----- +-------||||||||-----------#####-TT------T-------|||------||||-----o-------||--------------------#####--------------------TT---------------------|------||---------TT----TT----------########---- +-------||||||||-g------g--#####-TT---k--T-------|||------||||------r------||------gy------------#####-#---kkk-------ggg--TT----o---k------------|----k-||---------TT----TT----------########---- +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXXXXXXXXXXX--%XX--XXXXXXXX-----%%%%%---||-X-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XX--XXXXXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXX-XXXX +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXXXXXXXXXXXXXXXX--X-XXXXXX------|||----||-X-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XX--XX--XXXXX-XXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXX@--XXXX diff --git a/Mario-AI-Interface/levels/lvl73.lvl b/Mario-AI-Interface/levels/lvl73.lvl new file mode 100644 index 0000000..f299caa --- /dev/null +++ b/Mario-AI-Interface/levels/lvl73.lvl @@ -0,0 +1,16 @@ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-----------------------------------------------------------------------------------------------------------------------------------------------------------------S----S---S--------------------- +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-----------------S--------------SSSSSSSSSS---SSS---------------------------SSSSS------------------------------------------------SSSSSSS--------------------------------------------------------- +-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------SSS---------------- +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +--------%%%%%%%%-----QQQ---------------------------------------------------------------------------------------------S-----------------------------------------------S------SS-------SSS-------- +---------||||||----------------------------------------------------------------------------o--------------------------------------------------------------------------------SS------------------ +---------||||||-------------------------------------------------------------------------------------------------------------------------------o-----------------------------SS------------------ +---------||||||----------------------------------------------------------------------------------------------------------------------------S--TT----------------------------SSSS---------------- +------%%%%%%%%%%#---#--#------------------###---SSS-------%SSSS------------------------TT----------------------------SS%%S%S-SS---------------TTSSQo--SS---------SSSSSSSSSS---SS---------------- +-------||||||||-#------#-----#-----------####-------------|--------------#-------------TT------------------------------||-|-------------------TT-------------------SS---------SS---------------- +-------||||||||-##-----#----##----------#####-------------|--------------#------------###------------------------------||-|-------TT----------TT-------------------SS---------SS---------------- +-------||||||||-##-----#----##-------k-######--#---r------|--------------#-----------####---------g---------kkkg-------||-|-------TT----------TT-------------------SSkk-------SS--gggg------k--- +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--X-X%X%---XXX-XXXXXXXXXXXXXXXX-X-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXXXXXXX----XXXXXXXXXXXXXXXXX--XXXXX------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XX-XXX|---XXX-XXXXXXXXXXXXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXXXXX-X-----XXXXXXXXXXXXXXXX--XXX-X------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX diff --git a/Mario-AI-Interface/levels/lvl87.lvl b/Mario-AI-Interface/levels/lvl87.lvl new file mode 100644 index 0000000..5918d92 --- /dev/null +++ b/Mario-AI-Interface/levels/lvl87.lvl @@ -0,0 +1,16 @@ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +----------------------------------------------------------------------------------------------------------------SSSSSSSSSSSSSSSS---------------------------------------------------------------- +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-------------------------------------------------------------------------------------------------------------------------------------------------oo-----oo-------------------------------------- +--------%%%%%%%%-------------------------------------------------------SS----------------------------------#--------------------SSSSSSSS-------------------------------------------------------- +---------||||||-------------S------------------o---------------------------------o------------------------##------------------------------------------------------------------------------------ +---------||||||--------TT--------------------------------------------------------------------------------###------------------------------------------------------------#----------------------- +---------||||||--------TT-----------------oo--------------------------------------o--------#------------####-----------------------------------------------------------k------------------------ +------%%%%%%%%%%-------##-----------------%%-------------%%-----------------------t-----TT--------------###-------TT----------------S---------S---------TT-------------##----#-------------#---- +-------||||||||---------------------------||--o----------||-----------------------TT----TT------------y####-------TT---TT-------------------------TT----TT------#------#---#-#-------------##--- +-------||||||||---------------------------||-%%%---------||-----------------------TT----TT------------#####-------TT---TT-------------------------TT----TT------#------#---###-------------##--- +-------||||||||------------k--------------||--|----r-----||-----------------------TT----###----------#####--------TT---TT---g--------kg-----k-----TT----TT-----##-----##---####-#------g--###--# +XXXXXXXXXXXXXXXXXXXX-----XXXX--X-------%%%%|--|---%%%%%%%%%%%%%%XXXXXXXXXX-------XXXXXXXXXX-----XXXXXXXXXX-----XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +XXXXXXXXXXXXXXXXXXXX-----XXXX-XX--------||-|--|----||||||||||||-X-XXXXXXXX------XXXXXXXXXXX-----XXXXXXXXXX-----XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX diff --git a/Mario-AI-Interface/reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl155.rep b/Mario-AI-Interface/reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl155.rep new file mode 100644 index 0000000000000000000000000000000000000000..0178db4a75a36051af9dca3fd28582c940097274 GIT binary patch literal 1461 zcmeHHyAlH-2sBonRVGzp{{KG%$gUi7xtsK%Q69SpqNQZ1A{{bZpxf%U47}FK3)->x zI^lHcW|z2o5P8ho9QlH5Dh=l8HQ$ptbfbmVoh2)kM{&=C2HOz5z1=}eDL0W!c&*P8 z?@EVq^15XfE5sWmWozP{L=n>>{<>SJ8Nx3Ej)g?dF+QbTBc=cV literal 0 HcmV?d00001 diff --git a/Mario-AI-Interface/reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl87.rep b/Mario-AI-Interface/reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl87.rep new file mode 100644 index 0000000000000000000000000000000000000000..18110a918a4d0751debc98937d9eff8dc8d98b90 GIT binary patch literal 1187 zcmdT>yAp&j2sGMgN-HP-|Dm!G7GlQHyR$h8!^>S*hT#t_r8JGOtXAA4!@$b+{<7+* zsH=boe}E!g=YY2+L-+e`RYK*k5e^na$~P~IsUS1GKg0=9P6P6-Nt=WnJz8OC7j2`s ze$4K#2K#vcqSzf6P%6cBqIVS9FN<_$h1ESH$rpYz7dbr3)aTf_PReu0UWVbGW$s^< QCFlFr>ke)M$Aw0;1DWC(jsO4v literal 0 HcmV?d00001 diff --git a/Mario-AI-Interface/src/Play.java b/Mario-AI-Interface/src/Play.java index 62b5d7c..cb83763 100644 --- a/Mario-AI-Interface/src/Play.java +++ b/Mario-AI-Interface/src/Play.java @@ -43,8 +43,8 @@ public class Play { public static String playJavaGame(){ game.setLives(5); - String levelPath = "./levels/group0/lvl73.lvl"; // For local - String repPath = "./reps/dfd40950-75e7-44fe-8833-371d32e525af_lvl73.rep"; // For local + String levelPath = "./levels/lvl155.lvl"; // For local + String repPath = "./reps/b179cbd3-ee8e-48de-baf8-da6438461d1d_lvl155.rep"; // For local //MarioGame.verbose = true; //Play Game //MarioResult tmpResult = game.playGame(new HumanAgent(false),getLevel(levelPath), 10, repPath,30); diff --git a/main.py b/main.py index ed7dfb5..9ccfbd4 100644 --- a/main.py +++ b/main.py @@ -3,6 +3,7 @@ import json import os import struct import uuid +from datetime import datetime from IDManager import idManager @@ -68,7 +69,7 @@ def gamepreplay(): result.get("frequency"), result.get("age") + result.get("myAge"), result.get("gender") + result.get("myGender"), - ""]) + datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")]) idm.setControl(cid, result.get("control")) print(result.get("gamestyle")) return redirect(url_for('gametutorial', id=cid)) @@ -135,7 +136,8 @@ def getRadioData(): print("POST Eval") result = request.form 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"], + datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")]) if idm.getTimes(ip): return redirect(url_for("gameplay2", id=ip)) @@ -194,7 +196,7 @@ def gameannoresult2(id): idm.write_csv(annotationPath2, [getId(), resultList[0], resultList[1], resultList[2], levelList[0], levelList[1], levelList[2], - ""]) + datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")]) if idm.getTimes(id): return redirect(url_for("over", id=id))