diff --git a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs index 86bee0ec..c61ddc47 100644 --- a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs +++ b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs @@ -2190,8 +2190,10 @@ namespace TJAPlayer3 // while ( nIndex_NearestChip_Future < count ) // 未来方向への検索 for ( ; nIndex_NearestChip_Future < count; nIndex_NearestChip_Future++ ) { + if( nIndex_NearestChip_Future < 0 ) continue; + CDTX.CChip chip = listChip[ nPlayer ][ nIndex_NearestChip_Future ]; if ( !chip.bHit && chip.b可視 ) @@ -2262,7 +2264,7 @@ namespace TJAPlayer3 if ( nTimeDiff_Future < nTimeDiff_Past ) { - if( !listChip[ nPlayer ][ nIndex_NearestChip_Past ].bHit + if ( !listChip[ nPlayer ][ nIndex_NearestChip_Past ].bHit && listChip[ nPlayer ][ nIndex_NearestChip_Past ].n発声時刻ms + 108 >= nTime && NotesManager.IsMissableNote(listChip[nPlayer][nIndex_NearestChip_Past]) ) @@ -2271,6 +2273,7 @@ namespace TJAPlayer3 } else nearestChip = listChip[ nPlayer ][ nIndex_NearestChip_Future ]; + // nTimeDiff = Math.Abs( (int) ( nTime - nearestChip.n発声時刻ms ) ); } else diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs index 67a3aa6a..294702d7 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs @@ -2356,7 +2356,7 @@ namespace TJAPlayer3 #endregion - string strNull = "Found"; + //string strNull = "Found"; if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.F1)) { diff --git a/Test/README.md b/Test/README.md index 12a76a53..a05da13e 100644 --- a/Test/README.md +++ b/Test/README.md @@ -67,6 +67,8 @@ BoxFontName=廻想体 ネクスト UP B 021 - Welcome To The Cafe : Sukima Altera feat. ALTERNATiVE THEORY - https://youtube.com/c/SukimaAltera | https://www.twitter.com/SukimaAltera (Chart by 0AuBSQ) 022 - Seismic Shake : DeBisco - https://soundcloud.com/debisco | https://twitter.com/debiscomusic (Chart by 0AuBSQ & bol) 023 - Stereotype : Taichenko - https://space.bilibili.com/356518101 (Chart by Taichenko (Extreme) & 0AuBSQ (Easy, Normal, Hard)) +024 - Rainy Night ~夢幻想~ : Taichenko - https://space.bilibili.com/356518101 https://b23.tv/LBMw5Oz (Chart by Taichenko (Extreme) & 風に乗ってgo (Easy, Normal, Hard)) +025 - Fearless : Ash Electric - https://linktr.ee/ashelectric (Chart by 0AuBSQ) ``` ### About the OpenTaiko Original Soundtrack diff --git a/Test/Songs/08 OpenTaiko Original/Fearless/Fearless.ogg b/Test/Songs/08 OpenTaiko Original/Fearless/Fearless.ogg new file mode 100644 index 00000000..5b17a7e6 Binary files /dev/null and b/Test/Songs/08 OpenTaiko Original/Fearless/Fearless.ogg differ diff --git a/Test/Songs/08 OpenTaiko Original/Fearless/Fearless.tja b/Test/Songs/08 OpenTaiko Original/Fearless/Fearless.tja new file mode 100644 index 00000000..2331560d --- /dev/null +++ b/Test/Songs/08 OpenTaiko Original/Fearless/Fearless.tja @@ -0,0 +1,330 @@ +TITLE:Fearless +SUBTITLE:--Ash Electric +WAVE:Fearless.ogg +BPM:128 +OFFSET:0 +DEMOSTART:46.875 + +COURSE:Oni +LEVEL:7 +BALLOON: + +#START +#MEASURE 4/4 +0, +2120101020020010, +2001021020010210, +2120101020020010, +2001021020010210, +2120101020020010, +2001021020010210, +2120101020020010, +2001021020010210, +1120101020001010, +1210101012102020, +1120101020001010, +1210101022202010, +1120101020001010, +1210101012102020, +1120101020001010, +1210101022202011, +1000100010001011, +2000100010001011, +2000200020002022, +2000200020002022, +1011101110111011, +2011101110111011, +2011201220222022, +2022202221202020, + +#GOGOSTART +1110101020001020, +1210102012102010, +1110101020001020, +1210102012202010, +1110101020001020, +1210102012102010, +1110101020001020, +1210102012201020, +1012101011102020, +1210101012102020, +1012101011102020, +1210101012202020, +1012101011102020, +1210101012102020, +1012101011102020, +1210101012202020, + +#GOGOEND +2120101120020011, +2001021020010210, +2120101120020011, +2001021020010210, +2120101120020011, +2001021020010210, +2120101120020011, +2001021020010210, + +#GOGOSTART +2120101120222011, +2011221020112210, +2120101120222011, +2011221020112210, +2120101120222011, +2011221020112210, +2120101120222011, +2011221020112210, + +#GOGOEND +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +#END + +COURSE:Hard +LEVEL:5 +BALLOON: + +#START +#MEASURE 4/4 +0, +2020101020020010, +2001001020010010, +2020101020020010, +2001001020010010, +2020101020020010, +2001001020010010, +2020101020020010, +2001001020010010, +12112011, +21012120, +12112011, +21012121, +12112011, +21012120, +12112011, +21012121, +10101011, +20101011, +20202022, +20202022, +10111011, +20111011, +20212022, +20222212, + +#GOGOSTART +11212011, +21022121, +11212011, +21011221, +11212011, +21022121, +11212011, +21011212, +11212021, +21122122, +11212021, +21111222, +11212021, +21122122, +11212021, +21111222, + +#GOGOEND +2020101020020010, +2001001020010010, +2020101020020010, +2001001020010010, +2020101020020010, +2001001020010010, +2020101020020010, +2001001020010010, + +#GOGOSTART +2011101020020010, +2001011020010110, +2011101020020010, +2001011020010110, +2011101020020010, +2001011020010110, +2011101020020010, +2001011020010110, + +#GOGOEND +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +#END + +COURSE:Normal +LEVEL:3 +BALLOON: + +#START +#MEASURE 4/4 +0, +2120, +22, +2120, +22, +2120, +22, +2120, +22, +1120, +2121, +1120, +2121, +1120, +2121, +1120, +2121, +1011, +2011, +2022, +2022, +1011, +2011, +2022, +2021, + +#GOGOSTART +1120, +2012, +1120, +2012, +1120, +2012, +1120, +2012, +1122, +2112, +1122, +2112, +1122, +2112, +1122, +2112, + +#GOGOEND +2120, +22, +2120, +22, +2120, +22, +2120, +22, + +#GOGOSTART +20112001, +20012001, +20112001, +20012001, +20112001, +20012001, +20112001, +20012001, + +#GOGOEND +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +20020020, +#END + +COURSE:Easy +LEVEL:2 +BALLOON:50 + +#START +#MEASURE 4/4 +0, +2, +22, +2, +22, +2, +22, +2, +22, +12, +02, +12, +02, +12, +02, +12, +02, +7, +0, +0, +0, +0, +0, +0, +08, + +#GOGOSTART +1, +22, +1, +22, +1, +22, +1, +22, +1002, +22, +1002, +22, +1002, +22, +1002, +22, + +#GOGOEND +2, +22, +2, +22, +2, +22, +2, +22, + +#GOGOSTART +21, +2022, +21, +2022, +21, +2022, +21, +2022, + +#GOGOEND +2, +2, +2, +2, +2, +2, +2, +20020020, +#END diff --git a/Test/Songs/08 OpenTaiko Original/Rainy Night ~夢幻想~/Rainy Night ~ Dream ~.ogg b/Test/Songs/08 OpenTaiko Original/Rainy Night ~夢幻想~/Rainy Night ~ Dream ~.ogg new file mode 100644 index 00000000..55441dbb Binary files /dev/null and b/Test/Songs/08 OpenTaiko Original/Rainy Night ~夢幻想~/Rainy Night ~ Dream ~.ogg differ diff --git a/Test/Songs/08 OpenTaiko Original/Rainy Night ~夢幻想~/Rainy Night ~夢幻想~.tja b/Test/Songs/08 OpenTaiko Original/Rainy Night ~夢幻想~/Rainy Night ~夢幻想~.tja new file mode 100644 index 00000000..27637c8c --- /dev/null +++ b/Test/Songs/08 OpenTaiko Original/Rainy Night ~夢幻想~/Rainy Night ~夢幻想~.tja @@ -0,0 +1,621 @@ +TITLE:Rainy Night ~z~ +SUBTITLE:--Taichenko +BPM:90 +WAVE:Rainy Night ~ Dream ~.ogg +OFFSET:0 +DEMOSTART:21.333 +AUTHOR:Taichenko_oni & ɏgo +SCOREMODE:2 + +COURSE:Oni +LEVEL:9 +BALLOON:15 +SCOREINIT:330 +SCOREDIFF:110 + +#START +#BPMCHANGE 90 +10210121, +20120201, +1, +22, +1020012010200121, +1020012010201202, +12020202, +1020002010200400, +#BPMCHANGE 180 +#GOGOSTART +1000201110002000, +0011201022102011, +1010201110102000, +1020002000221020, +1010201110102000, +1020001022102010, +2010102000102011, +1010201122102010, +21021020, +0011201021102010, +20120100, +1000201120102000, +1110201000112010, +1020101120102010, +2010102011102010, +1020111020111120, +#BPMCHANGE 90 +#GOGOEND +1020002000200022, +2020002000200022, +12020202, +2020002000200400, +#GOGOSTART +#BPMCHANGE 180 +1110201202112011, +1010201002112010, +2010201102112010, +2001201102102112, +1010201110102011, +1020101120102010, +2210102210102011, +2010201120102000, +#GOGOEND +1000201000102011, +1000201000102011, +11210121, +0011201000201020, +1110201000102010, +0010201022102010, +2210201020101020, +0020102012102020, +#GOGOSTART +1211202120102012, +1010201110102212, +1021201000102000, +30230232, +1210201120102210, +2011201022102210, +#BPMCHANGE 90 +#GOGOEND +70000008, +100000000000 +#SCROLL 1.05 +200000000 +#SCROLL 1.1 +200000 +#SCROLL 1.15 +200 +#SCROLL 1.2 +100000 +#SCROLL 1.25 +200 +#SCROLL 1.3 +100 +#SCROLL 1.35 +200 +#SCROLL 1.4 +200 +#SCROLL 1.45 +100 +#SCROLL 1.5 +100 +#SCROLL 1.55 +200 +#SCROLL 1.6 +100 +#SCROLL 1.65 +200 +#SCROLL 1.7 +100 +#SCROLL 1.75 +100 +#SCROLL 1.8 +200 +#SCROLL 1.85 +100000 +#SCROLL 1.875 +100 +#SCROLL 1.9 +100 +#SCROLL 1.925 +200 +#SCROLL 1.95 +200 +#SCROLL 1.975 +202020, +#BPMCHANGE 180 +#GOGOSTART +#SCROLL 1 +1011202102102012, +1010201122102212, +1011202101212011, +1020221000221020, +#BPMCHANGE 185 +1010201110221010, +2210201122102010, +2012201021202011, +1020101120102000, +#BPMCHANGE 190 +1020101120102011, +1020121202102011, +1021201002102011, +1010201210102222, +#BPMCHANGE 195 +1010201110202210, +1022101022102000, +2010102011102010, +1020111120111111, +#BPMCHANGE 200 +1011201202112011, +1020111120102212, +1022102102102011, +2010201110201111, +#BPMCHANGE 205 +1010201210201011, +2010221020112010, +2210102210102211, +1022101022121020, +#BPMCHANGE 210 +1210201110102011, +1010201122102212, +1022101122102011, +1020101122112222, +#BPMCHANGE 215 +1010201110201111, +2011112022102010, +#BPMCHANGE 220 +21 +#BPMCHANGE 210 +12 +#BPMCHANGE 200 +11 +#BPMCHANGE 190 +21, +#BPMCHANGE 180 +12 +#BPMCHANGE 170 +11 +#BPMCHANGE 160 +2112, +#BPMCHANGE 90 +#GOGOEND +3, +#BARLINEOFF +0, +#BARLINEON +10002002, +20002002, +2, +2, +10002002, +20002002, +1, +#END + +COURSE:Hard +LEVEL:7 +BALLOON:14,33 +SCOREINIT:480 +SCOREDIFF:120 + +#START +#BPMCHANGE 90 +10110020, +20110020, +1, +22, +1011102010201000, +1022202010201000, +1, +21, +#BPMCHANGE 180 +#GOGOSTART +1000201110002000, +01122120, +1000201110002000, +02211210, +1000201110002000, +01122120, +10210120, +1010201011102010, +2000101110002000, +01212210, +2000102220001000, +01212120, +1000201110002000, +01122120, +21121121, +12112010, +#BPMCHANGE 90 +#GOGOEND +12020202, +02020202, +12020202, +0020002000200300, +#BPMCHANGE 180 +#GOGOSTART +1000201110002000, +01212210, +2000101110002000, +01221120, +1000201110002000, +01122120, +2000101110002000, +01212122, +#GOGOEND +10210120, +11210120, +10210120, +12210210, +10210120, +11210120, +11211121, +01121122, +#GOGOSTART +10211210, +10211220, +10211210, +1000202010201022, +12012012, +01201121, +#BPMCHANGE 90 +#GOGOEND +70000008, +1022022010220110, +#BPMCHANGE 180 +#GOGOSTART +1000201110002000, +01122120, +1000201110002000, +02211210, +#BPMCHANGE 185 +1000201110002000, +01122120, +10210120, +1010201011102010, +#BPMCHANGE 190 +2000101110002000, +01212210, +2000102220001000, +01212120, +#BPMCHANGE 195 +1000201110002000, +01122120, +21121121, +12112112, +#BPMCHANGE 200 +1000201110002000, +01122120, +1000201110002000, +02211210, +#BPMCHANGE 205 +1000201110002000, +01122120, +10210120, +1010201011102010, +#BPMCHANGE 210 +2000101110002000, +01212210, +2000102220001000, +01212120, +#BPMCHANGE 215 +1000201110002000, +01122120, +#BPMCHANGE 220 +21 +#BPMCHANGE 210 +12 +#BPMCHANGE 200 +11 +#BPMCHANGE 190 +21, +#BPMCHANGE 180 +12 +#BPMCHANGE 170 +11 +#BPMCHANGE 160 +2112, +#BPMCHANGE 90 +#GOGOEND +7, +#BARLINEOFF +0008, +#BARLINEON +12, +12, +1, +2, +#BPMCHANGE 180 +10210120, +12, +10210120, +10001011, +3, +#END + +COURSE:Normal +LEVEL:5 +BALLOON:98,13 +SCOREINIT:520 +SCOREDIFF:210 + +#START +#BPMCHANGE 90 +10110000, +2, +1, +2, +10120000, +10120000, +1, +21, +#BPMCHANGE 180 +#GOGOSTART +1112, +0120, +1212, +0120, +1112, +0120, +1212, +12, +2112, +0120, +2212, +0120, +1112, +0120, +2112, +1222, +#BPMCHANGE 90 +#GOGOEND +7, +, +, +0008, +#BPMCHANGE 180 +#GOGOSTART +10210120, +12, +10120210, +21, +10210120, +12, +10210120, +11211120, +#GOGOEND +1212, +12, +1212, +12, +1212, +12, +1212, +10102220, +#GOGOSTART +1211, +21, +1212, +12, +12012012, +01201201, +#BPMCHANGE 90 +#GOGOEND +70000008, +33, +#BPMCHANGE 180 +#GOGOSTART +1112, +0120, +1212, +0120, +#BPMCHANGE 185 +1112, +0120, +1212, +12, +#BPMCHANGE 190 +2112, +0120, +2212, +0120, +#BPMCHANGE 195 +1112, +0120, +2112, +1222, +#BPMCHANGE 200 +1112, +0120, +1212, +0120, +#BPMCHANGE 205 +1112, +0120, +1212, +12, +#BPMCHANGE 210 +2112, +0120, +2212, +0120, +#BPMCHANGE 215 +1112, +0120, +#BPMCHANGE 220 +2 +#BPMCHANGE 210 +1 +#BPMCHANGE 200 +1 +#BPMCHANGE 190 +2, +#BPMCHANGE 180 +1 +#BPMCHANGE 170 +2 +#BPMCHANGE 160 +22, +#BPMCHANGE 90 +#GOGOEND +5, +0008, +12, +12, +1, +2, +#BPMCHANGE 180 +10010010, +1, +10010010, +11, +3, +#END + + +COURSE:Easy +LEVEL:4 +BALLOON:88,14 +SCOREINIT:610 +SCOREDIFF:130 + +#START +#BPMCHANGE 90 +1, +1, +1, +, +11, +11, +1, +2, +#BPMCHANGE 180 +#GOGOSTART +1011, +01, +1022, +02, +1011, +01, +1022, +02, +2011, +01, +2022, +02, +1011, +01, +1022, +0222, +#BPMCHANGE 90 +#GOGOEND +7, +, +, +0008, +#BPMCHANGE 180 +#GOGOSTART +10010100, +1, +20020200, +2, +10020010, +02001000, +10020010, +02002000, +#GOGOEND +1011, +12, +1012, +12, +1011, +12, +1012, +12, +1011, +21, +#GOGOSTART +1012, +12, +1012, +11, +#BPMCHANGE 90 +#GOGOEND +10000110, +70000008, +#BPMCHANGE 180 +#GOGOSTART +1011, +0110, +1022, +0220, +#BPMCHANGE 185 +1011, +0110, +1022, +0120, +#BPMCHANGE 190 +2011, +0110, +2022, +0220, +#BPMCHANGE 195 +1011, +0110, +1022, +0222, +#BPMCHANGE 200 +1011, +0111, +1022, +0222, +#BPMCHANGE 205 +1011, +0111, +1022, +0212, +#BPMCHANGE 210 +2011, +0111, +2022, +0222, +#BPMCHANGE 215 +1011, +0112, +#BPMCHANGE 220 +1 +#BPMCHANGE 210 +0 +#BPMCHANGE 200 +2 +#BPMCHANGE 190 +2, +#BPMCHANGE 180 +0 +#BPMCHANGE 170 +2 +#BPMCHANGE 160 +22, +#BPMCHANGE 90 +#GOGOEND +5, +#BARLINEOFF +0008, +#BARLINEON +1, +1, +1, +2, +#BPMCHANGE 180 +1001, +1, +1001, +1, +3, +#END + + + + +#END + + + diff --git a/Test/Songs/08 OpenTaiko Original/Slayer of/Slayer of..tja b/Test/Songs/08 OpenTaiko Original/Slayer of/Slayer of..tja index a59bf874..8235fa6e 100644 --- a/Test/Songs/08 OpenTaiko Original/Slayer of/Slayer of..tja +++ b/Test/Songs/08 OpenTaiko Original/Slayer of/Slayer of..tja @@ -7,7 +7,7 @@ DEMOSTART:60.564 SCOREMODE:2 COURSE:Edit -LEVEL:10 +LEVEL:11 BALLOON: SCOREINIT:690 SCOREDIFF:0