diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelect難易度選択画面.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelect難易度選択画面.cs index 36cd8b5a..a6709217 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelect難易度選択画面.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelect難易度選択画面.cs @@ -250,7 +250,7 @@ namespace TJAPlayer3 } } - if (!bSelect[1] && !bOption[1]) + if (!bSelect[1] && !bOption[1] && TJAPlayer3.ConfigIni.nPlayerCount > 1) { if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue2P)) { diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs index a6c757a8..58025c46 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs @@ -235,26 +235,8 @@ namespace TJAPlayer3 // else if( CDTXMania.ConfigIni.eSTEALTH == Eステルスモード.DORON ) // this.txオプションパネル_特殊.t2D描画( CDTXMania.app.Device, 0, 300, new Rectangle( 0, 44, 162, 44 ) ); //} - - #region [Mods] - // HS - var _vals = new int[]{ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 29, 34, 39, 44, 49 }; - int _i = -1; - - for (int j = 0; j < _vals.Length; j++) - { - if (TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.GetActualPlayer(i)] >= _vals[j]) - _i = j; - else - break; - } - - if (_i >= 0) - TJAPlayer3.Tx.HiSp[_i]?.t2D描画(TJAPlayer3.app.Device, 114, 236 + i * 190); - - #endregion - + ModIcons.tDisplayMods(114, 236 + i * 190, TJAPlayer3.GetActualPlayer(i)); if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null) { diff --git a/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs b/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs new file mode 100644 index 00000000..026fb904 --- /dev/null +++ b/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TJAPlayer3 +{ + class ModIcons + { + static public void tDisplayMods(int x, int y, int player) + { + tDisplayHSIcon(x, y, player); + } + + static private void tDisplayHSIcon(int x, int y, int player) + { + var _vals = new int[] { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 29, 34, 39, 44, 49 }; + int _i = -1; + + for (int j = 0; j < _vals.Length; j++) + { + if (TJAPlayer3.ConfigIni.nScrollSpeed[player] >= _vals[j]) + _i = j; + else + break; + } + + if (_i >= 0) + TJAPlayer3.Tx.HiSp[_i]?.t2D描画(TJAPlayer3.app.Device, x, y); + } + + } +} diff --git a/TJAPlayer3/TJAPlayer3.csproj b/TJAPlayer3/TJAPlayer3.csproj index 42205ac4..8db21902 100644 --- a/TJAPlayer3/TJAPlayer3.csproj +++ b/TJAPlayer3/TJAPlayer3.csproj @@ -268,6 +268,7 @@ +