diff --git a/DivaBot/.settings/org.eclipse.core.resources.prefs b/DivaBot/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 1014ebf..0000000 --- a/DivaBot/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/sig/FutureToneBot.java=UTF-8 -encoding//src/sig/MyRobot.java=UTF-8 diff --git a/DivaBot/DivaBot.jar b/DivaBot/DivaBot.jar index 84b21f2..9586dea 100644 Binary files a/DivaBot/DivaBot.jar and b/DivaBot/DivaBot.jar differ diff --git a/DivaBot/FTcolorData b/DivaBot/FTcolorData index 285961c..7fa8b0e 100644 --- a/DivaBot/FTcolorData +++ b/DivaBot/FTcolorData @@ -53,7 +53,7 @@ Palette:4640730351,4763876062,5032315945 リンリンシグナル:3861355139,4483557874,4288300572 深海少女:1707469430,2008783754,4464171873 Weekender Girl:5324941973,4291207773,3423226791 -雨のちSweet*Drops:4949334744,6594145728,6390149415 +雨のちSweetDrops:4949334744,6594145728,6390149415 モノクロ∞ブルースカイ:3389877996,4499481553,6499626921 えれくとりっく・えんじぇぅ:3980119207,3510281625,4771931931 数多の舞 -Dance of many-:2401065708,2243409160,1437283022 @@ -183,7 +183,7 @@ ODDS&ENDS:7221115122,5699688784,3942971913 Pane dhiria:1267936293,1914064172,2287130377 え?あぁ、そう。:3884015728,2801529497,2785759986 システマティック・ラヴ:4012793748,2945948428,3416692091 -PIANO*GIRL:5617761462,4480618429,3406096688 +PIANOGIRL:5617761462,4480618429,3406096688 金の聖夜霜雪に朽ちて:4964652723,2210400014,1203879206 カラフル×セクシィ:6073900156,5319839007,3610881827 サンドリヨン:2768739004,2145434818,2476455675 @@ -200,7 +200,7 @@ Knife:3501013643,2015238387,1948776401 多重未来のカルテット~QUARTET THEME~:1973869383,1993264455,2507240454 右肩の蝶 -39's Giving Day Edition-:915863153,950726942,498994371 透明水彩:5796936963,6123422381,6330740232 -Equation+**:5616078976,5471739277,4915681049 +Equation+:5616078976,5471739277,4915681049 Absolunote:7486631516,8070231386,8029471096 ロキ:1239592967,645558990,1977730698 Nyanyanyanyanyanyanya!:4669645581,4518634435,3823158692 diff --git a/DivaBot/src/sig/DrawCanvas.java b/DivaBot/src/sig/DrawCanvas.java index 025d538..6720ef7 100644 --- a/DivaBot/src/sig/DrawCanvas.java +++ b/DivaBot/src/sig/DrawCanvas.java @@ -113,7 +113,7 @@ public class DrawCanvas extends JPanel implements KeyListener,ComponentListener, } public void pullData(final String songname,final String difficulty) { - this.songname=(songname.equalsIgnoreCase("PIANOGIRL")?"PIANO*GIRL":(songname.equalsIgnoreCase("16 -out of the gravity-"))?"1/6 -out of the gravity-":songname); + this.songname=songname.equalsIgnoreCase("雨のちSweetDrops")?"雨のちSweet*Drops":songname.equalsIgnoreCase("Equation+")?"Equation+**":songname.equalsIgnoreCase("PIANOGIRL")?"PIANO*GIRL":songname.equalsIgnoreCase("PIANOGIRL")?"PIANO*GIRL":(songname.equalsIgnoreCase("16 -out of the gravity-"))?"1/6 -out of the gravity-":songname; this.difficulty=difficulty; romanizedname=""; englishname=""; diff --git a/DivaBot/src/sig/MyRobot.java b/DivaBot/src/sig/MyRobot.java index 86585d1..0ca1021 100644 --- a/DivaBot/src/sig/MyRobot.java +++ b/DivaBot/src/sig/MyRobot.java @@ -429,7 +429,7 @@ public class MyRobot{ if (results.size()>0) { recordingResults=true; for (final Result r : results) { - r.songName=r.songName.equalsIgnoreCase("PIANOGIRL")?"PIANO*GIRL":(r.songName.equalsIgnoreCase("16 -out of the gravity-"))?"1/6 -out of the gravity-":r.songName; + r.songName=r.songName.equalsIgnoreCase("雨のちSweetDrops")?"雨のちSweet*Drops":r.songName.equalsIgnoreCase("Equation+")?"Equation+**":r.songName.equalsIgnoreCase("PIANOGIRL")?"PIANO*GIRL":r.songName.equalsIgnoreCase("PIANOGIRL")?"PIANO*GIRL":(r.songName.equalsIgnoreCase("16 -out of the gravity-"))?"1/6 -out of the gravity-":r.songName; HttpClient httpclient = HttpClients.createDefault(); HttpPost httppost = new HttpPost("http://45.33.13.215:4501/submit");