diff --git a/.gitignore b/.gitignore index 3a05d87..8210912 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,89 @@ + +#ignore thumbnails created by windows +Thumbs.db +#Ignore files build by Visual Studio +Debug/ +Release/ +ipch/ +bin/ +obj/ +lib/ +lib64/ +share/ +packages/ +venv/ +*.aps +*.bak +*.cache +*.clw +*.dll +*.exe +*.ilk +*.lib +*.log +*.mak +*.ncb +*.obj +*.opensdf +*.opt +*.pch +*.pdb +*.sbr +*.sdf +*.sln.old +*.suo +*.tlb +*.tlh +*.user +*.VC.db +*.VC.opendb +*.vcproj.*.old +*.vspscc +*_i.c +*_p.c +.scannerwork/ +.vs/ +__vm/ + +# Created by https://www.toptal.com/developers/gitignore/api/c++ +# Edit at https://www.toptal.com/developers/gitignore?templates=c++ + +### C++ ### +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app +*.lock + + # for python __pycache__/ *.py[cod] @@ -15,12 +101,16 @@ *.mhd *.xml *.npz -*.venv *.mp4 -*.mp3 +*.avi +*.json # for deep learning model *.pth *.onnx + # ZoneID (WSL) *Zone.Identifier + + +# End of https://www.toptal.com/developers/gitignore/api/c++ \ No newline at end of file diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js index ba67e70..5e91956 100644 --- a/flask/testapp/static/javascript/beautyVote.js +++ b/flask/testapp/static/javascript/beautyVote.js @@ -52,7 +52,6 @@ function setup(){ canvasSize(960, 1200); lineW(3); - //loadImg(0, "image/bg.png"); timer = 0; setQuestion(round); } @@ -117,23 +116,26 @@ if(round < MAX_ROUND){ if(50 <= tapX && tapX <= 450 && 300 <= tapY && tapY <= 550){ - player.choice = A; + player.choice = A; + postForm(player.choice) // 送信用 checkAnswer(); - scene = 2; } else if(500 <= tapX && tapX <= 900 && 300 <= tapY && tapY <= 550){ - player.choice = B; + player.choice = B; + postForm(player.choice) // 送信用 checkAnswer(); - } + } + else if(50 <= tapX && tapX <= 450 && 600 <= tapY && tapY <= 850){ - player.choice = C; + player.choice = C; + postForm(player.choice) // 送信用 checkAnswer(); - } + } else if(500 <= tapX && tapX <= 900 && 600 <= tapY && tapY <= 850){ player.choice = D; + postForm(player.choice) // 送信用 checkAnswer(); } - postForm(player.choice) // 送信用 } } break; @@ -164,7 +166,6 @@ } } - // 送信用 function postForm(value) {