Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-01-19 09:27:26 +01:00
Code Releases Activity

Too many changes to summarize, read description (#619)

Browse Source 
* Fix Dan Dojo ignoring Global Offset

* oops, someone forgot to update/draw the other AI Win scripts

* Skip long-holding P & go straight to P1 save file if possible

* Add timestamp variable to Lua API

Synced to chart

* Add English variants of language names

* minor change to language list

* Add Config menu BGM for OWM

* Add keybinds for Training Mode

my hands hurt

also delete key & arrow keys can be used in keybinds
also branch keys can only be used in auto & training

* Update Favorite.png

* List all inputs devices in TJAPlayer3.log

* Fix Training Mode skipback keybind not being saved correctly

* Invalid Scene Preset now points to default Scene Preset (if possible)

* wait no i did it wrong, THIS fixes invalid scene presets

* Append new entries to new langs
This commit is contained in:
DragonRatTiger / リュウコ 2024-05-03 03:36:14 -05:00 committed by GitHub
parent 0fa23477f0
commit 62945c0175
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 1185 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FDK/src/02.Input/CInputManager.cs
View File

@ -104,6 +104,15 @@ namespace FDK
this.InputDevices.Add(new CInputGamepad(gamepad)); this.InputDevices.Add(new CInputGamepad(gamepad));
} }
#endregion #endregion
Trace.TraceInformation("Found {0} Input Device{1}", InputDevices.Count, InputDevices.Count != 1 ? "s:" : ":");
for (int i = 0; i < InputDevices.Count; i++)
{
try
{
Trace.TraceInformation("Input Device #" + i + " (" + InputDevices[i].CurrentType.ToString() + ")");
}
catch { }
}
} }

4
OpenTaiko/BGScriptAPI.lua
View File

@ -14,6 +14,7 @@ local battleWin = false
local gauge = { 0, 0, 0, 0, 0 } local gauge = { 0, 0, 0, 0, 0 }
local bpm = { 0, 0, 0, 0, 0 } local bpm = { 0, 0, 0, 0, 0 }
local gogo = { false, false, false, false, false } local gogo = { false, false, false, false, false }
local timeStamp = -1
function setConstValues(_playerCount, _p1IsBlue, _lang, _simplemode, _puchicharaRarities, _characterRarities) function setConstValues(_playerCount, _p1IsBlue, _lang, _simplemode, _puchicharaRarities, _characterRarities)
@ -25,7 +26,7 @@ function setConstValues(_playerCount, _p1IsBlue, _lang, _simplemode, _puchichara
characterRarities = _characterRarities characterRarities = _characterRarities
end end
function updateValues(_deltaTime, _fps, _isClear, _towerNightNum, _battleState, _battleWin, _gauge, _bpm, _gogo) function updateValues(_deltaTime, _fps, _isClear, _towerNightNum, _battleState, _battleWin, _gauge, _bpm, _gogo, _timestamp)
deltaTime = _deltaTime deltaTime = _deltaTime
fps = _fps fps = _fps
isClear = _isClear isClear = _isClear
@ -35,4 +36,5 @@ function updateValues(_deltaTime, _fps, _isClear, _towerNightNum, _battleState,
gauge = _gauge gauge = _gauge
bpm = _bpm bpm = _bpm
gogo = _gogo gogo = _gogo
timeStamp = _timestamp
end end

BIN
OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Favorite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OpenTaiko/System/Open-World Memories/Sounds/BGM/Config.ogg Normal file
View File

Binary file not shown.

417
OpenTaiko/src/Common/CConfigIni.cs
View File

@ -832,7 +832,56 @@ namespace TJAPlayer3
case (int)EKeyConfigPad.CycleVideoDisplayMode: case (int)EKeyConfigPad.CycleVideoDisplayMode:
return this.padCycleVideoDisplayMode; return this.padCycleVideoDisplayMode;
}
case (int)EKeyConfigPad.TrainingIncreaseScrollSpeed:
return this.TrainingIncreaseScrollSpeed;
case (int)EKeyConfigPad.TrainingIncreaseSongSpeed:
return this.TrainingIncreaseSongSpeed;
case (int)EKeyConfigPad.TrainingDecreaseSongSpeed:
return this.TrainingDecreaseSongSpeed;
case (int)EKeyConfigPad.TrainingDecreaseScrollSpeed:
return this.TrainingDecreaseScrollSpeed;
case (int)EKeyConfigPad.TrainingToggleAuto:
return this.TrainingToggleAuto;
case (int)EKeyConfigPad.TrainingBranchNormal:
return this.TrainingBranchNormal;
case (int)EKeyConfigPad.TrainingBranchExpert:
return this.TrainingBranchExpert;
case (int)EKeyConfigPad.TrainingBranchMaster:
return this.TrainingBranchMaster;
case (int)EKeyConfigPad.TrainingPause:
return this.TrainingPause;
case (int)EKeyConfigPad.TrainingBookmark:
return this.TrainingBookmark;
case (int)EKeyConfigPad.TrainingMoveForwardMeasure:
return this.TrainingMoveForwardMeasure;
case (int)EKeyConfigPad.TrainingMoveBackMeasure:
return this.TrainingMoveBackMeasure;
case (int)EKeyConfigPad.TrainingSkipForwardMeasure:
return this.TrainingSkipForwardMeasure;
case (int)EKeyConfigPad.TrainingSkipBackMeasure:
return this.TrainingSkipBackMeasure;
case (int)EKeyConfigPad.TrainingJumpToFirstMeasure:
return this.TrainingJumpToFirstMeasure;
case (int)EKeyConfigPad.TrainingJumpToLastMeasure:
return this.TrainingJumpToLastMeasure;
}
throw new IndexOutOfRangeException(); throw new IndexOutOfRangeException();
} }
set set
@ -1042,7 +1091,71 @@ namespace TJAPlayer3
case (int)EKeyConfigPad.CycleVideoDisplayMode: case (int)EKeyConfigPad.CycleVideoDisplayMode:
this.padCycleVideoDisplayMode = value; this.padCycleVideoDisplayMode = value;
return; return;
}
case (int)EKeyConfigPad.TrainingIncreaseScrollSpeed:
this.TrainingIncreaseScrollSpeed = value;
return;
case (int)EKeyConfigPad.TrainingDecreaseScrollSpeed:
this.TrainingDecreaseScrollSpeed = value;
return;
case (int)EKeyConfigPad.TrainingIncreaseSongSpeed:
this.TrainingIncreaseSongSpeed = value;
return;
case (int)EKeyConfigPad.TrainingDecreaseSongSpeed:
this.TrainingDecreaseSongSpeed = value;
return;
case (int)EKeyConfigPad.TrainingToggleAuto:
this.TrainingToggleAuto = value;
return;
case (int)EKeyConfigPad.TrainingBranchNormal:
this.TrainingBranchNormal = value;
return;
case (int)EKeyConfigPad.TrainingBranchExpert:
this.TrainingBranchExpert = value;
return;
case (int)EKeyConfigPad.TrainingBranchMaster:
this.TrainingBranchMaster = value;
return;
case (int)EKeyConfigPad.TrainingPause:
this.TrainingPause = value;
return;
case (int)EKeyConfigPad.TrainingBookmark:
this.TrainingBookmark = value;
return;
case (int)EKeyConfigPad.TrainingMoveForwardMeasure:
this.TrainingMoveForwardMeasure = value;
return;
case (int)EKeyConfigPad.TrainingMoveBackMeasure:
this.TrainingMoveBackMeasure = value;
return;
case (int)EKeyConfigPad.TrainingSkipForwardMeasure:
this.TrainingSkipForwardMeasure = value;
return;
case (int)EKeyConfigPad.TrainingSkipBackMeasure:
this.TrainingSkipBackMeasure = value;
return;
case (int)EKeyConfigPad.TrainingJumpToFirstMeasure:
this.TrainingJumpToFirstMeasure = value;
return;
case (int)EKeyConfigPad.TrainingJumpToLastMeasure:
this.TrainingJumpToLastMeasure = value;
return;
}
throw new IndexOutOfRangeException(); throw new IndexOutOfRangeException();
} }
} }
@ -1107,9 +1220,26 @@ namespace TJAPlayer3
private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleAutoP2; private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleAutoP2;
private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleTrainingMode; private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleTrainingMode;
private CConfigIni.CKeyAssign.STKEYASSIGN[] padCycleVideoDisplayMode; private CConfigIni.CKeyAssign.STKEYASSIGN[] padCycleVideoDisplayMode;
//-----------------
#endregion public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingIncreaseScrollSpeed;
} public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingDecreaseScrollSpeed;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingToggleAuto;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingBranchNormal;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingBranchExpert;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingBranchMaster;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingPause;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingBookmark;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingMoveForwardMeasure;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingMoveBackMeasure;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingSkipForwardMeasure;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingSkipBackMeasure;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingIncreaseSongSpeed;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingDecreaseSongSpeed;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingJumpToFirstMeasure;
public CConfigIni.CKeyAssign.STKEYASSIGN[] TrainingJumpToLastMeasure;
//-----------------
#endregion
}
public bool KeyIsPressed(STKEYASSIGN[] pad) public bool KeyIsPressed(STKEYASSIGN[] pad)
{ {
@ -2950,7 +3080,7 @@ namespace TJAPlayer3
sw.WriteLine(); sw.WriteLine();
#endregion #endregion
#region [ SystemkeyAssign ] #region [ SystemKeyAssign ]
sw.WriteLine( "[SystemKeyAssign]" ); sw.WriteLine( "[SystemKeyAssign]" );
sw.WriteLine(); sw.WriteLine();
sw.Write( "Capture=" ); sw.Write( "Capture=" );
@ -2992,7 +3122,61 @@ namespace TJAPlayer3
sw.WriteLine(); sw.WriteLine();
#endregion #endregion
sw.Close(); #region [ TrainingKeyAssign ]
sw.WriteLine( "[TrainingKeyAssign]" );
sw.WriteLine();
sw.Write("TrainingIncreaseScrollSpeed=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingIncreaseScrollSpeed);
sw.WriteLine();
sw.Write("TrainingDecreaseScrollSpeed=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingDecreaseScrollSpeed);
sw.WriteLine();
sw.Write("TrainingIncreaseSongSpeed=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingIncreaseSongSpeed);
sw.WriteLine();
sw.Write("TrainingDecreaseSongSpeed=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingDecreaseSongSpeed);
sw.WriteLine();
sw.Write("TrainingToggleAuto=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingToggleAuto);
sw.WriteLine();
sw.Write("TrainingBranchNormal=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingBranchNormal);
sw.WriteLine();
sw.Write("TrainingBranchExpert=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingBranchExpert);
sw.WriteLine();
sw.Write("TrainingBranchMaster=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingBranchMaster);
sw.WriteLine();
sw.Write("TrainingPause=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingPause);
sw.WriteLine();
sw.Write("TrainingBookmark=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingBookmark);
sw.WriteLine();
sw.Write("TrainingMoveForwardMeasure=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingMoveForwardMeasure);
sw.WriteLine();
sw.Write("TrainingMoveBackMeasure=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingMoveBackMeasure);
sw.WriteLine();
sw.Write("TrainingSkipForwardMeasure=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingSkipForwardMeasure);
sw.WriteLine();
sw.Write("TrainingSkipBackMeasure=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingSkipBackMeasure);
sw.WriteLine();
sw.Write("TrainingJumpToFirstMeasure=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingJumpToFirstMeasure);
sw.WriteLine();
sw.Write("TrainingJumpToLastMeasure=");
this.tキーの書き出し(sw, this.KeyAssign.Drums.TrainingJumpToLastMeasure);
sw.WriteLine();
sw.WriteLine();
#endregion
sw.Close();
} }
public void tファイルから読み込み( string iniファイル名 ) public void tファイルから読み込み( string iniファイル名 )
{ {
@ -3076,6 +3260,10 @@ namespace TJAPlayer3
{ {
unknown = Eセクション種別.SystemKeyAssign; unknown = Eセクション種別.SystemKeyAssign;
} }
else if ( str2.Equals( "TrainingKeyAssign" ))
{
unknown = Eセクション種別.TrainingKeyAssign;
}
else if( str2.Equals( "Temp" ) ) else if( str2.Equals( "Temp" ) )
{ {
unknown = Eセクション種別.Temp; unknown = Eセクション種別.Temp;
@ -4217,53 +4405,157 @@ namespace TJAPlayer3
//----------------------------- //-----------------------------
case Eセクション種別.SystemKeyAssign: case Eセクション種別.SystemKeyAssign:
{ {
if( str3.Equals( "Capture" ) ) switch (str3)
{ {
this.tキーの読み出しと設定( str4, this.KeyAssign.System.Capture ); case "Capture":
} {
else if( str3.Equals( "SongVolumeIncrease" ) ) this.tキーの読み出しと設定(str4, this.KeyAssign.System.Capture);
break;
}
case "SongVolumeIncrease":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.SongVolIncrease);
break;
}
case "SongVolumeDecrease":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.SongVolDecrease);
break;
}
case "DisplayHits":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.DisplayHits);
break;
}
case "DisplayDebug":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.DisplayDebug);
break;
}
case "QuickConfig":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.QuickConfig);
break;
}
case "NewHeya":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.NewHeya);
break;
}
case "SortSongs":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.SortSongs);
break;
}
case "ToggleAutoP1":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.ToggleAutoP1);
break;
}
case "ToggleAutoP2":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.ToggleAutoP2);
break;
}
case "ToggleTrainingMode":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.ToggleTrainingMode);
break;
}
case "CycleVideoDisplayMode":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.System.CycleVideoDisplayMode);
break;
}
}
continue;
}
#endregion
#region [ [TrainingKeyAssign] ]
case Eセクション種別.TrainingKeyAssign:
{
switch (str3)
{ {
this.tキーの読み出しと設定( str4, this.KeyAssign.System.SongVolIncrease ); case "TrainingIncreaseScrollSpeed":
} {
else if( str3.Equals( "SongVolumeDecrease" ) ) this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingIncreaseScrollSpeed);
{ break;
this.tキーの読み出しと設定( str4, this.KeyAssign.System.SongVolDecrease ); }
} case "TrainingDecreaseScrollSpeed":
else if( str3.Equals( "DisplayHits" ) ) {
{ this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingDecreaseScrollSpeed);
this.tキーの読み出しと設定( str4, this.KeyAssign.System.DisplayHits ); break;
} }
else if( str3.Equals( "DisplayDebug" ) ) case "TrainingIncreaseSongSpeed":
{ {
this.tキーの読み出しと設定( str4, this.KeyAssign.System.DisplayDebug ); this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingIncreaseSongSpeed);
} break;
else if( str3.Equals( "QuickConfig" ) ) }
{ case "TrainingDecreaseSongSpeed":
this.tキーの読み出しと設定( str4, this.KeyAssign.System.QuickConfig ); {
} this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingDecreaseSongSpeed);
else if( str3.Equals( "NewHeya" ) ) break;
{ }
this.tキーの読み出しと設定( str4, this.KeyAssign.System.NewHeya ); case "TrainingToggleAuto":
} {
else if( str3.Equals( "SortSongs" ) ) this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingToggleAuto);
{ break;
this.tキーの読み出しと設定( str4, this.KeyAssign.System.SortSongs ); }
} case "TrainingBranchNormal":
else if( str3.Equals( "ToggleAutoP1" ) ) {
{ this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingBranchNormal);
this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleAutoP1 ); break;
} }
else if( str3.Equals( "ToggleAutoP2" ) ) case "TrainingBranchExpert":
{ {
this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleAutoP2 ); this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingBranchExpert);
} break;
else if( str3.Equals( "ToggleTrainingMode" ) ) }
{ case "TrainingBranchMaster":
this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleTrainingMode ); {
} this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingBranchMaster);
else if( str3.Equals( "CycleVideoDisplayMode" ) ) break;
{ }
this.tキーの読み出しと設定( str4, this.KeyAssign.System.CycleVideoDisplayMode ); case "TrainingPause":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingPause);
break;
}
case "TrainingBookmark":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingBookmark);
break;
}
case "TrainingMoveForwardMeasure":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingMoveForwardMeasure);
break;
}
case "TrainingMoveBackMeasure":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingMoveBackMeasure);
break;
}
case "TrainingSkipForwardMeasure":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingSkipForwardMeasure);
break;
}
case "TrainingSkipBackMeasure":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingSkipBackMeasure);
break;
}
case "TrainingJumpToFirstMeasure":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingJumpToFirstMeasure);
break;
}
case "TrainingJumpToLastMeasure":
{
this.tキーの読み出しと設定(str4, this.KeyAssign.Drums.TrainingJumpToLastMeasure);
break;
}
} }
continue; continue;
} }
@ -4319,6 +4611,7 @@ namespace TJAPlayer3
GUID, GUID,
DrumsKeyAssign, DrumsKeyAssign,
SystemKeyAssign, SystemKeyAssign,
TrainingKeyAssign,
Temp, Temp,
} }
@ -4506,7 +4799,7 @@ Capture=K065
SongVolumeIncrease=K074 SongVolumeIncrease=K074
SongVolumeDecrease=K0115 SongVolumeDecrease=K0115
DisplayHits=K057 DisplayHits=K057
DisplayDebug=K043 DisplayDebug=K049
QuickConfig=K055 QuickConfig=K055
NewHeya=K062 NewHeya=K062
SortSongs=K0126 SortSongs=K0126
@ -4514,6 +4807,24 @@ ToggleAutoP1=K056
ToggleAutoP2=K057 ToggleAutoP2=K057
ToggleTrainingMode=K060 ToggleTrainingMode=K060
CycleVideoDisplayMode=K058 CycleVideoDisplayMode=K058
[TrainingKeyAssign]
TrainingIncreaseScrollSpeed=K0132
TrainingDecreaseScrollSpeed=K050
TrainingIncreaseSongSpeed=K047
TrainingDecreaseSongSpeed=K012
TrainingToggleAuto=K059
TrainingBranchNormal=K01
TrainingBranchExpert=K02
TrainingBranchMaster=K03
TrainingPause=K0126,K019
TrainingBookmark=K010
TrainingMoveForwardMeasure=K0118,K020
TrainingMoveBackMeasure=K076,K013
TrainingSkipForwardMeasure=K0109
TrainingSkipBackMeasure=K0108
TrainingJumpToFirstMeasure=K070
TrainingJumpToLastMeasure=K051
"; ";
t文字列から読み込み( strDefaultKeyAssign ); t文字列から読み込み( strDefaultKeyAssign );
} }

26
OpenTaiko/src/Common/C定数.cs
View File

@ -196,11 +196,29 @@ namespace TJAPlayer3
ToggleAutoP2, ToggleAutoP2,
ToggleTrainingMode, ToggleTrainingMode,
#endregion #endregion
#region [Gameplay/Training] #region [Gameplay/Training only]
CycleVideoDisplayMode, CycleVideoDisplayMode,
#endregion #endregion
MAX, #endregion
#endregion #region [Training Keys]
TrainingIncreaseScrollSpeed,
TrainingDecreaseScrollSpeed,
TrainingIncreaseSongSpeed,
TrainingDecreaseSongSpeed,
TrainingToggleAuto,
TrainingBranchNormal,
TrainingBranchExpert,
TrainingBranchMaster,
TrainingPause,
TrainingBookmark,
TrainingMoveForwardMeasure,
TrainingMoveBackMeasure,
TrainingSkipForwardMeasure,
TrainingSkipBackMeasure,
TrainingJumpToFirstMeasure,
TrainingJumpToLastMeasure,
#endregion
MAX,
UNKNOWN = EPad.UNKNOWN UNKNOWN = EPad.UNKNOWN
} }
[Flags] [Flags]

10
OpenTaiko/src/Helpers/HScenePreset.cs
View File

@ -63,6 +63,16 @@ namespace TJAPlayer3
{ {
preset = ((Dictionary<string, DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.DTX.scenePreset]; preset = ((Dictionary<string, DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.DTX.scenePreset];
} }
else if (_ps != null
&& TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset != null
&& ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset))
{
preset = ((Dictionary<string, DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset];
}
else
{
preset = ((Dictionary<string, DBSkinPreset.SkinScene>)_ps)[""];
}
return preset; return preset;
} }

43
OpenTaiko/src/I18N/CLang_en.cs
View File

@ -312,6 +312,7 @@ namespace TJAPlayer3
[10150] = "Video Playback Display Mode", [10150] = "Video Playback Display Mode",
[10151] = "Change how videos are displayed\nin the background.", [10151] = "Change how videos are displayed\nin the background.",
// System Key Assign
[97] = "Capture", [97] = "Capture",
[98] = "System key assign:\nAssign any key for screen capture.\n(You can only use keyboard. You can't\nuse gamepads.)", [98] = "System key assign:\nAssign any key for screen capture.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10128] = "Increase Volume", [10128] = "Increase Volume",
@ -337,6 +338,48 @@ namespace TJAPlayer3
[10152] = "Cycle Video Playback Display", [10152] = "Cycle Video Playback Display",
[10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)", [10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Training Mode
[10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
// Training Key Assign
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
[100] = "Taiko Mode", [100] = "Taiko Mode",
[101] = "Dan-i Dojo", [101] = "Dan-i Dojo",
[102] = "Taiko Towers", [102] = "Taiko Towers",

40
OpenTaiko/src/I18N/CLang_es.cs
View File

@ -211,6 +211,46 @@ namespace TJAPlayer3
[10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)", [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10152] = "Cycle Video Playback Display", [10152] = "Cycle Video Playback Display",
[10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)", [10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
// Please translate the text above! // Please translate the text above!
[99] = "Rojo izquierdo", [99] = "Rojo izquierdo",

40
OpenTaiko/src/I18N/CLang_fr.cs
View File

@ -184,6 +184,46 @@ namespace TJAPlayer3
[10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)", [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10152] = "Cycle Video Playback Display", [10152] = "Cycle Video Playback Display",
[10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)", [10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
// Please translate the text above! // Please translate the text above!
[99] = "Rouge gauche", [99] = "Rouge gauche",

42
OpenTaiko/src/I18N/CLang_jp.cs
View File

@ -239,7 +239,47 @@ namespace TJAPlayer3
[10152] = "動画再生モード切替", [10152] = "動画再生モード切替",
[10153] = "システムキー割り当て:\n動画再生モード切替のキーを割り当てます\n(キーボード以外は割り当てられません)", [10153] = "システムキー割り当て:\n動画再生モード切替のキーを割り当てます\n(キーボード以外は割り当てられません)",
[99] = "LeftRed", [10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
[99] = "LeftRed",
[9992] = "太鼓の数字がアニメーションしなくなります\n" + [9992] = "太鼓の数字がアニメーションしなくなります\n" +
"Combo_Textが非表示になります\n" + "Combo_Textが非表示になります\n" +

41
OpenTaiko/src/I18N/CLang_ko.cs
View File

@ -336,6 +336,47 @@ namespace TJAPlayer3
[10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)", [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10152] = "Cycle Video Playback Display", [10152] = "Cycle Video Playback Display",
[10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)", [10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
// Please translate the text above!
[100] = "Taiko Mode", [100] = "Taiko Mode",
[101] = "Dan-i Dojo", [101] = "Dan-i Dojo",

41
OpenTaiko/src/I18N/CLang_nl.cs
View File

@ -337,6 +337,47 @@ namespace TJAPlayer3
[10152] = "Cycle Video Playback Display", [10152] = "Cycle Video Playback Display",
[10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)", [10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
// Please translate the text above!
[100] = "Taiko Mode", [100] = "Taiko Mode",
[101] = "Dan-i Dojo", [101] = "Dan-i Dojo",
[102] = "Taiko Towers", [102] = "Taiko Towers",

41
OpenTaiko/src/I18N/CLang_zh.cs
View File

@ -383,6 +383,47 @@ namespace TJAPlayer3
[10152] = "循环视频播放显示", [10152] = "循环视频播放显示",
[10153] = "系统按键分配：\n分配循环视频播放显示模式按键。\n（仅可使用键盘，不可使用手柄）", [10153] = "系统按键分配：\n分配循环视频播放显示模式按键。\n（仅可使用键盘，不可使用手柄）",
[10154] = "Measure Skip Count",
[10155] = "The number of measures to skip while\npressing Skip Forward/Back Measure in\nTraining Mode.",
[10156] = "Measure Jump Time Interval",
[10157] = "The amount of time in milliseconds needed to\nrepeatedly hit the Left/Right Blue keys in\norder to jump to a bookmarked measure in\nTraining Mode.",
[10158] = "Training Mode Key Config",
[10159] = "A secondary menu to adjust keys used during\nTraining Mode.",
[10160] = "Pause Training",
[10161] = "Drums key assign:\nAssign any key for pausing.",
[10162] = "Toggle Auto",
[10163] = "Drums key assign:\nAssign any key for toggling auto.",
[10164] = "Add/Remove Bookmark",
[10165] = "Drums key assign:\nAssign any key for adding/removing bookmarks.",
[10166] = "Increase Scroll Speed",
[10167] = "Drums key assign:\nAssign any key for increasing scroll speed.",
[10168] = "Decrease Scroll Speed",
[10169] = "Drums key assign:\nAssign any key for decreasing scroll speed.",
[10170] = "Increase Song Speed",
[10171] = "Drums key assign:\nAssign any key for increasing song speed.",
[10172] = "Decrease Song Speed",
[10173] = "Drums key assign:\nAssign any key for decreasing song speed.",
[10174] = "Set Branch to Normal",
[10175] = "Drums key assign:\nAssign any key for setting a chart's branch\nto normal.",
[10176] = "Set Branch to Expert",
[10177] = "Drums key assign:\nAssign any key for setting a chart's branch\nto expert.",
[10178] = "Set Branch to Master",
[10179] = "Drums key assign:\nAssign any key for setting a chart's branch\nto master.",
[10180] = "Move Forward Measure",
[10181] = "Drums key assign:\nAssign any key for moving forward a measure.",
[10182] = "Move Back Measure",
[10183] = "Drums key assign:\nAssign any key for moving back a measure.",
[10184] = "Skip Forward Measures",
[10185] = "Drums key assign:\nAssign any key for skipping forward measures.",
[10186] = "Skip Back Measures",
[10187] = "Drums key assign:\nAssign any key for skipping back measures.",
[10188] = "Jump to First Measure",
[10189] = "Drums key assign:\nAssign any key for jumping to the first measure.",
[10190] = "Jump to Last Measure",
[10191] = "Drums key assign:\nAssign any key for jumping to the last measure.",
// Please translate the text above!
[100] = "演奏模式", [100] = "演奏模式",
[101] = "段位道场", [101] = "段位道场",
[102] = "太鼓塔", [102] = "太鼓塔",

12
OpenTaiko/src/I18N/ILang.cs
View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace TJAPlayer3 namespace TJAPlayer3
{ {
internal interface ILang internal interface ILang
{ {

26
OpenTaiko/src/Items/CItemBase.cs
View File

@ -13,11 +13,11 @@ namespace TJAPlayer3
{ {
// プロパティ // プロパティ
public Eパネル種別 eパネル種別; public EPanelType eパネル種別;
public enum Eパネル種別 public enum EPanelType
{ {
通常, Normal,
その他 Other
} }
public E種別 e種別; public E種別 e種別;
@ -56,16 +56,16 @@ namespace TJAPlayer3
this.t初期化(str項目名, str説明文jp, str説明文en); this.t初期化(str項目名, str説明文jp, str説明文en);
} }
public CItemBase(string str項目名, Eパネル種別 eパネル種別) public CItemBase(string str項目名, EPanelType eパネル種別)
: this() : this()
{ {
this.t初期化( str項目名, eパネル種別 ); this.t初期化( str項目名, eパネル種別 );
} }
public CItemBase(string str項目名, Eパネル種別 eパネル種別, string str説明文jp) public CItemBase(string str項目名, EPanelType eパネル種別, string str説明文jp)
: this() { : this() {
this.t初期化(str項目名, eパネル種別, str説明文jp); this.t初期化(str項目名, eパネル種別, str説明文jp);
} }
public CItemBase(string str項目名, Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) public CItemBase(string str項目名, EPanelType eパネル種別, string str説明文jp, string str説明文en)
: this() { : this() {
this.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en); this.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en);
} }
@ -84,23 +84,23 @@ namespace TJAPlayer3
} }
public virtual void t初期化( string str項目名 ) public virtual void t初期化( string str項目名 )
{ {
this.t初期化( str項目名, Eパネル種別.通常 ); this.t初期化( str項目名, EPanelType.Normal );
} }
public virtual void t初期化(string str項目名, string str説明文jp) { public virtual void t初期化(string str項目名, string str説明文jp) {
this.t初期化(str項目名, Eパネル種別.通常, str説明文jp, str説明文jp); this.t初期化(str項目名, EPanelType.Normal, str説明文jp, str説明文jp);
} }
public virtual void t初期化(string str項目名, string str説明文jp, string str説明文en) { public virtual void t初期化(string str項目名, string str説明文jp, string str説明文en) {
this.t初期化(str項目名, Eパネル種別.通常, str説明文jp, str説明文en); this.t初期化(str項目名, EPanelType.Normal, str説明文jp, str説明文en);
} }
public virtual void t初期化( string str項目名, Eパネル種別 eパネル種別 ) public virtual void t初期化( string str項目名, EPanelType eパネル種別 )
{ {
this.t初期化(str項目名, eパネル種別, "", ""); this.t初期化(str項目名, eパネル種別, "", "");
} }
public virtual void t初期化(string str項目名, Eパネル種別 eパネル種別, string str説明文jp) { public virtual void t初期化(string str項目名, EPanelType eパネル種別, string str説明文jp) {
this.t初期化(str項目名, eパネル種別, str説明文jp, str説明文jp); this.t初期化(str項目名, eパネル種別, str説明文jp, str説明文jp);
} }
public virtual void t初期化(string str項目名, Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) { public virtual void t初期化(string str項目名, EPanelType eパネル種別, string str説明文jp, string str説明文en) {
this.str項目名 = str項目名; this.str項目名 = str項目名;
this.eパネル種別 = eパネル種別; this.eパネル種別 = eパネル種別;
this.str説明文 = (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "ja") ? str説明文jp : str説明文en; this.str説明文 = (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "ja") ? str説明文jp : str説明文en;

18
OpenTaiko/src/Items/CItemInteger.cs
View File

@ -40,16 +40,16 @@ namespace TJAPlayer3
} }
public CItemInteger( string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.Eパネル種別 eパネル種別 ) public CItemInteger( string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.EPanelType eパネル種別 )
: this() : this()
{ {
this.t初期化( str項目名, n最小値, n最大値, n初期値, eパネル種別 ); this.t初期化( str項目名, n最小値, n最大値, n初期値, eパネル種別 );
} }
public CItemInteger(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.Eパネル種別 eパネル種別, string str説明文jp) public CItemInteger(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.EPanelType eパネル種別, string str説明文jp)
: this() { : this() {
this.t初期化(str項目名, n最小値, n最大値, n初期値, eパネル種別, str説明文jp); this.t初期化(str項目名, n最小値, n最大値, n初期値, eパネル種別, str説明文jp);
} }
public CItemInteger(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) public CItemInteger(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.EPanelType eパネル種別, string str説明文jp, string str説明文en)
: this() { : this() {
this.t初期化(str項目名, n最小値, n最大値, n初期値, eパネル種別, str説明文jp, str説明文en); this.t初期化(str項目名, n最小値, n最大値, n初期値, eパネル種別, str説明文jp, str説明文en);
} }
@ -77,24 +77,24 @@ namespace TJAPlayer3
} }
public void t初期化( string str項目名, int n最小値, int n最大値, int n初期値 ) public void t初期化( string str項目名, int n最小値, int n最大値, int n初期値 )
{ {
this.t初期化( str項目名, n最小値, n最大値, n初期値, CItemBase.Eパネル種別.通常, "", "" ); this.t初期化( str項目名, n最小値, n最大値, n初期値, CItemBase.EPanelType.Normal, "", "" );
} }
public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, string str説明文jp) { public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, string str説明文jp) {
this.t初期化(str項目名, n最小値, n最大値, n初期値, CItemBase.Eパネル種別.通常, str説明文jp, str説明文jp); this.t初期化(str項目名, n最小値, n最大値, n初期値, CItemBase.EPanelType.Normal, str説明文jp, str説明文jp);
} }
public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, string str説明文jp, string str説明文en) { public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, string str説明文jp, string str説明文en) {
this.t初期化(str項目名, n最小値, n最大値, n初期値, CItemBase.Eパネル種別.通常, str説明文jp, str説明文en); this.t初期化(str項目名, n最小値, n最大値, n初期値, CItemBase.EPanelType.Normal, str説明文jp, str説明文en);
} }
public void t初期化( string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.Eパネル種別 eパネル種別 ) public void t初期化( string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.EPanelType eパネル種別 )
{ {
this.t初期化( str項目名, n最小値, n最大値, n初期値, eパネル種別, "", "" ); this.t初期化( str項目名, n最小値, n最大値, n初期値, eパネル種別, "", "" );
} }
public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.Eパネル種別 eパネル種別, string str説明文jp) { public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.EPanelType eパネル種別, string str説明文jp) {
this.t初期化(str項目名, n最小値, n最大値, n初期値, eパネル種別, str説明文jp, str説明文jp); this.t初期化(str項目名, n最小値, n最大値, n初期値, eパネル種別, str説明文jp, str説明文jp);
} }
public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) { public void t初期化(string str項目名, int n最小値, int n最大値, int n初期値, CItemBase.EPanelType eパネル種別, string str説明文jp, string str説明文en) {
base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en); base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en);
this.n最小値 = n最小値; this.n最小値 = n最小値;
this.n最大値 = n最大値; this.n最大値 = n最大値;

24
OpenTaiko/src/Items/CItemList.cs
View File

@ -28,21 +28,21 @@ namespace TJAPlayer3
{ {
this.t初期化( str項目名 ); this.t初期化( str項目名 );
} }
public CItemList( string str項目名, CItemBase.Eパネル種別 eパネル種別 ) public CItemList( string str項目名, CItemBase.EPanelType eパネル種別 )
: this() : this()
{ {
this.t初期化( str項目名, eパネル種別 ); this.t初期化( str項目名, eパネル種別 );
} }
public CItemList( string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, params string[] arg項目リスト ) public CItemList( string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, params string[] arg項目リスト )
: this() : this()
{ {
this.t初期化( str項目名, eパネル種別, n初期インデックス値, arg項目リスト ); this.t初期化( str項目名, eパネル種別, n初期インデックス値, arg項目リスト );
} }
public CItemList(string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, string str説明文jp, params string[] arg項目リスト) public CItemList(string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, string str説明文jp, params string[] arg項目リスト)
: this() { : this() {
this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, arg項目リスト); this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, arg項目リスト);
} }
public CItemList(string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, string str説明文jp, string str説明文en, params string[] arg項目リスト) public CItemList(string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, string str説明文jp, string str説明文en, params string[] arg項目リスト)
: this() { : this() {
this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, str説明文en, arg項目リスト); this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, str説明文en, arg項目リスト);
} }
@ -68,20 +68,20 @@ namespace TJAPlayer3
this.n現在選択されている項目番号 = this.list項目値.Count - 1; this.n現在選択されている項目番号 = this.list項目値.Count - 1;
} }
} }
public override void t初期化( string str項目名, CItemBase.Eパネル種別 eパネル種別 ) public override void t初期化( string str項目名, CItemBase.EPanelType eパネル種別 )
{ {
base.t初期化( str項目名, eパネル種別 ); base.t初期化( str項目名, eパネル種別 );
this.n現在選択されている項目番号 = 0; this.n現在選択されている項目番号 = 0;
this.list項目値.Clear(); this.list項目値.Clear();
} }
public void t初期化( string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, params string[] arg項目リスト ) public void t初期化( string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, params string[] arg項目リスト )
{ {
this.t初期化(str項目名, eパネル種別, n初期インデックス値, "", "",arg項目リスト); this.t初期化(str項目名, eパネル種別, n初期インデックス値, "", "",arg項目リスト);
} }
public void t初期化(string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, string str説明文jp, params string[] arg項目リスト) { public void t初期化(string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, string str説明文jp, params string[] arg項目リスト) {
this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, str説明文jp, arg項目リスト); this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, str説明文jp, arg項目リスト);
} }
public void t初期化(string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, string str説明文jp, string str説明文en, params string[] arg項目リスト) { public void t初期化(string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, string str説明文jp, string str説明文en, params string[] arg項目リスト) {
base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en); base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en);
this.n現在選択されている項目番号 = n初期インデックス値; this.n現在選択されている項目番号 = n初期インデックス値;
foreach (string str in arg項目リスト) { foreach (string str in arg項目リスト) {
@ -124,21 +124,21 @@ namespace TJAPlayer3
{ {
this.t初期化( str項目名 ); this.t初期化( str項目名 );
} }
public CSwitchItemList( string str項目名, CItemBase.Eパネル種別 eパネル種別 ) public CSwitchItemList( string str項目名, CItemBase.EPanelType eパネル種別 )
: this() : this()
{ {
this.t初期化( str項目名, eパネル種別 ); this.t初期化( str項目名, eパネル種別 );
} }
public CSwitchItemList( string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, params string[] arg項目リスト ) public CSwitchItemList( string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, params string[] arg項目リスト )
: this() : this()
{ {
this.t初期化( str項目名, eパネル種別, n初期インデックス値, arg項目リスト ); this.t初期化( str項目名, eパネル種別, n初期インデックス値, arg項目リスト );
} }
public CSwitchItemList(string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, string str説明文jp, params string[] arg項目リスト) public CSwitchItemList(string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, string str説明文jp, params string[] arg項目リスト)
: this() { : this() {
this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, arg項目リスト); this.t初期化(str項目名, eパネル種別, n初期インデックス値, str説明文jp, arg項目リスト);
} }
public CSwitchItemList( string str項目名, CItemBase.Eパネル種別 eパネル種別, int n初期インデックス値, string str説明文jp, string str説明文en, params string[] arg項目リスト ) public CSwitchItemList( string str項目名, CItemBase.EPanelType eパネル種別, int n初期インデックス値, string str説明文jp, string str説明文en, params string[] arg項目リスト )
: this() : this()
{ {
this.t初期化( str項目名, eパネル種別, n初期インデックス値, str説明文jp, str説明文en, arg項目リスト ); this.t初期化( str項目名, eパネル種別, n初期インデックス値, str説明文jp, str説明文en, arg項目リスト );

22
OpenTaiko/src/Items/CItemThreeState.cs
View File

@ -41,16 +41,16 @@ namespace TJAPlayer3
this.t初期化(str項目名, e初期状態, str説明文jp, str説明文en); this.t初期化(str項目名, e初期状態, str説明文jp, str説明文en);
} }
public CItemThreeState( string str項目名, E状態 e初期状態, CItemBase.Eパネル種別 eパネル種別 ) public CItemThreeState( string str項目名, E状態 e初期状態, CItemBase.EPanelType eパネル種別 )
: this() : this()
{ {
this.t初期化( str項目名, e初期状態, eパネル種別 ); this.t初期化( str項目名, e初期状態, eパネル種別 );
} }
public CItemThreeState(string str項目名, E状態 e初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp) public CItemThreeState(string str項目名, E状態 e初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp)
: this() { : this() {
this.t初期化(str項目名, e初期状態, eパネル種別, str説明文jp, str説明文jp); this.t初期化(str項目名, e初期状態, eパネル種別, str説明文jp, str説明文jp);
} }
public CItemThreeState(string str項目名, E状態 e初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) public CItemThreeState(string str項目名, E状態 e初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp, string str説明文en)
: this() { : this() {
this.t初期化(str項目名, e初期状態, eパネル種別, str説明文jp, str説明文en); this.t初期化(str項目名, e初期状態, eパネル種別, str説明文jp, str説明文en);
} }
@ -98,23 +98,23 @@ namespace TJAPlayer3
} }
public void t初期化( string str項目名, E状態 e初期状態 ) public void t初期化( string str項目名, E状態 e初期状態 )
{ {
this.t初期化( str項目名, e初期状態, CItemBase.Eパネル種別.通常 ); this.t初期化( str項目名, e初期状態, CItemBase.EPanelType.Normal );
} }
public void t初期化(string str項目名, E状態 e初期状態, string str説明文jp) { public void t初期化(string str項目名, E状態 e初期状態, string str説明文jp) {
this.t初期化(str項目名, e初期状態, CItemBase.Eパネル種別.通常, str説明文jp, str説明文jp); this.t初期化(str項目名, e初期状態, CItemBase.EPanelType.Normal, str説明文jp, str説明文jp);
} }
public void t初期化(string str項目名, E状態 e初期状態, string str説明文jp, string str説明文en) { public void t初期化(string str項目名, E状態 e初期状態, string str説明文jp, string str説明文en) {
this.t初期化(str項目名, e初期状態, CItemBase.Eパネル種別.通常, str説明文jp, str説明文en); this.t初期化(str項目名, e初期状態, CItemBase.EPanelType.Normal, str説明文jp, str説明文en);
} }
public void t初期化( string str項目名, E状態 e初期状態, CItemBase.Eパネル種別 eパネル種別 ) public void t初期化( string str項目名, E状態 e初期状態, CItemBase.EPanelType eパネル種別 )
{ {
this.t初期化(str項目名, e初期状態, CItemBase.Eパネル種別.通常, "", ""); this.t初期化(str項目名, e初期状態, CItemBase.EPanelType.Normal, "", "");
} }
public void t初期化(string str項目名, E状態 e初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp) { public void t初期化(string str項目名, E状態 e初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp) {
this.t初期化(str項目名, e初期状態, CItemBase.Eパネル種別.通常, str説明文jp, str説明文jp); this.t初期化(str項目名, e初期状態, CItemBase.EPanelType.Normal, str説明文jp, str説明文jp);
} }
public void t初期化(string str項目名, E状態 e初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) { public void t初期化(string str項目名, E状態 e初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp, string str説明文en) {
base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en); base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en);
this.e現在の状態 = e初期状態; this.e現在の状態 = e初期状態;
} }

18
OpenTaiko/src/Items/CItemToggle.cs
View File

@ -34,16 +34,16 @@ namespace TJAPlayer3
: this() { : this() {
this.t初期化(str項目名, b初期状態, str説明文jp, str説明文en); this.t初期化(str項目名, b初期状態, str説明文jp, str説明文en);
} }
public CItemToggle(string str項目名, bool b初期状態, CItemBase.Eパネル種別 eパネル種別) public CItemToggle(string str項目名, bool b初期状態, CItemBase.EPanelType eパネル種別)
: this() : this()
{ {
this.t初期化( str項目名, b初期状態, eパネル種別 ); this.t初期化( str項目名, b初期状態, eパネル種別 );
} }
public CItemToggle(string str項目名, bool b初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp) public CItemToggle(string str項目名, bool b初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp)
: this() { : this() {
this.t初期化(str項目名, b初期状態, eパネル種別, str説明文jp); this.t初期化(str項目名, b初期状態, eパネル種別, str説明文jp);
} }
public CItemToggle(string str項目名, bool b初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) public CItemToggle(string str項目名, bool b初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp, string str説明文en)
: this() { : this() {
this.t初期化(str項目名, b初期状態, eパネル種別, str説明文jp, str説明文en); this.t初期化(str項目名, b初期状態, eパネル種別, str説明文jp, str説明文en);
} }
@ -65,23 +65,23 @@ namespace TJAPlayer3
} }
public void t初期化( string str項目名, bool b初期状態 ) public void t初期化( string str項目名, bool b初期状態 )
{ {
this.t初期化( str項目名, b初期状態, CItemBase.Eパネル種別.通常 ); this.t初期化( str項目名, b初期状態, CItemBase.EPanelType.Normal );
} }
public void t初期化(string str項目名, bool b初期状態, string str説明文jp) { public void t初期化(string str項目名, bool b初期状態, string str説明文jp) {
this.t初期化(str項目名, b初期状態, CItemBase.Eパネル種別.通常, str説明文jp, str説明文jp); this.t初期化(str項目名, b初期状態, CItemBase.EPanelType.Normal, str説明文jp, str説明文jp);
} }
public void t初期化(string str項目名, bool b初期状態, string str説明文jp, string str説明文en) { public void t初期化(string str項目名, bool b初期状態, string str説明文jp, string str説明文en) {
this.t初期化(str項目名, b初期状態, CItemBase.Eパネル種別.通常, str説明文jp, str説明文en); this.t初期化(str項目名, b初期状態, CItemBase.EPanelType.Normal, str説明文jp, str説明文en);
} }
public void t初期化(string str項目名, bool b初期状態, CItemBase.Eパネル種別 eパネル種別) public void t初期化(string str項目名, bool b初期状態, CItemBase.EPanelType eパネル種別)
{ {
this.t初期化(str項目名, b初期状態, eパネル種別, "", ""); this.t初期化(str項目名, b初期状態, eパネル種別, "", "");
} }
public void t初期化(string str項目名, bool b初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp) { public void t初期化(string str項目名, bool b初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp) {
this.t初期化(str項目名, b初期状態, eパネル種別, str説明文jp, str説明文jp); this.t初期化(str項目名, b初期状態, eパネル種別, str説明文jp, str説明文jp);
} }
public void t初期化(string str項目名, bool b初期状態, CItemBase.Eパネル種別 eパネル種別, string str説明文jp, string str説明文en) { public void t初期化(string str項目名, bool b初期状態, CItemBase.EPanelType eパネル種別, string str説明文jp, string str説明文en) {
base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en); base.t初期化(str項目名, eパネル種別, str説明文jp, str説明文en);
this.bON = b初期状態; this.bON = b初期状態;
} }

5
OpenTaiko/src/Songs/CDTX.cs
View File

@ -1312,6 +1312,8 @@ namespace TJAPlayer3
this.BACKGROUND_GR = ""; this.BACKGROUND_GR = "";
this.PATH_WAV = ""; this.PATH_WAV = "";
this.BPM = 120.0; this.BPM = 120.0;
this.nOFFSET = TJAPlayer3.ConfigIni.nGlobalOffsetMs; // When OFFSET isn't called (typically in Dans), it should default to the game's Global Offset to avoid desync.
this.bOFFSETの値がマイナスである = nOFFSET < 0;
STDGBVALUE<int> stdgbvalue = new STDGBVALUE<int>(); STDGBVALUE<int> stdgbvalue = new STDGBVALUE<int>();
stdgbvalue.Drums = 0; stdgbvalue.Drums = 0;
stdgbvalue.Guitar = 0; stdgbvalue.Guitar = 0;
@ -6363,7 +6365,8 @@ namespace TJAPlayer3
nextSongnextSongChip.nチャンネル番号 = 0x01; nextSongnextSongChip.nチャンネル番号 = 0x01;
nextSongnextSongChip.n発声位置 = 384; nextSongnextSongChip.n発声位置 = 384;
nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime - (bOFFSETの値がマイナスである ? -nOFFSET : nOFFSET); //nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime - (bOFFSETの値がマイナスである ? -nOFFSET : nOFFSET);
nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime;
nextSongnextSongChip.fNow_Measure_m = this.fNow_Measure_m; nextSongnextSongChip.fNow_Measure_m = this.fNow_Measure_m;
nextSongnextSongChip.fNow_Measure_s = this.fNow_Measure_s; nextSongnextSongChip.fNow_Measure_s = this.fNow_Measure_s;
nextSongnextSongChip.n整数値 = 0x01; nextSongnextSongChip.n整数値 = 0x01;

135
OpenTaiko/src/Stages/02.Title/CStageタイトル.cs
View File

@ -150,8 +150,8 @@ namespace TJAPlayer3
#endregion #endregion
this.ctコインイン待機.TickLoop(); this.ctコインイン待機.TickLoop();
this.ctバナパス読み込み成功.Tick(); this.ctSaveLoaded.Tick();
this.ctバナパス読み込み失敗.Tick(); this.ctSaveLoadingFailed.Tick();
this.ctエントリーバー点滅.TickLoop(); this.ctエントリーバー点滅.TickLoop();
this.ctエントリーバー決定点滅.Tick(); this.ctエントリーバー決定点滅.Tick();
this.ctキャライン.Tick(); this.ctキャライン.Tick();
@ -208,52 +208,45 @@ namespace TJAPlayer3
*/ */
// 1st step (Save file loading) // 1st step (Save file loading)
if (!bバナパス読み込み && !bバナパス読み込み失敗) if (!bSaveIsLoading && !bSaveFailedToLoad)
{ {
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) || if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) ||
TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed))
{ {
// Hit 1P banapass // Hit 1P save
TJAPlayer3.SaveFile = 0; TJAPlayer3.SaveFile = 0;
CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL);
this.ctバナパス読み込み待機.Start(0, 600, 1, TJAPlayer3.Timer); this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer);
this.ctバナパス読み込み待機.CurrentValue = (int)this.ctバナパス読み込み待機.EndValue; this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue;
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i);
} }
else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P)) else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P))
{ {
// Hit 2P banapass // Hit 2P save
TJAPlayer3.SaveFile = 1; TJAPlayer3.SaveFile = 1;
CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL);
this.ctバナパス読み込み待機.Start(0, 600, 1, TJAPlayer3.Timer); this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer);
this.ctバナパス読み込み待機.CurrentValue = (int)this.ctバナパス読み込み待機.EndValue; this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue;
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i);
} }
else else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.P)) // In case "P" is already binded to another pad
{ {
// Default legacy P long press (Don't change the save file, will be deleted soon) // Hit 1P save
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.P)) TJAPlayer3.SaveFile = 0;
this.ctバナパス読み込み待機.Start(0, 600, 1, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL);
if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.P)) this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer);
ctバナパス読み込み待機.Tick(); this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue;
if (TJAPlayer3.InputManager.Keyboard.KeyReleased((int)SlimDXKeys.Key.P)) for (int i = 0; i < 2; i++)
{ TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i);
this.ctバナパス読み込み待機.Stop();
if (this.ctバナパス読み込み待機.CurrentValue < 600 && !bバナパス読み込み失敗)
{
ctバナパス読み込み失敗.Start(0, 1128, 1, TJAPlayer3.Timer);
bバナパス読み込み失敗 = true;
}
}
} }
} }
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow))
{ {
if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctバナパス読み込み成功.IsEnded) if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctSaveLoaded.IsEnded)
{ {
if (n現在の選択行プレイヤーエントリー + 1 <= 2) if (n現在の選択行プレイヤーエントリー + 1 <= 2)
{ {
@ -282,7 +275,7 @@ namespace TJAPlayer3
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow))
{ {
if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctバナパス読み込み成功.IsEnded) if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctSaveLoaded.IsEnded)
{ {
if (n現在の選択行プレイヤーエントリー - 1 >= 0) if (n現在の選択行プレイヤーエントリー - 1 >= 0)
{ {
@ -312,7 +305,7 @@ namespace TJAPlayer3
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)
|| TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))
{ {
if (bプレイヤーエントリー && this.ctバナパス読み込み成功.IsEnded) if (bプレイヤーエントリー && this.ctSaveLoaded.IsEnded)
{ {
if (n現在の選択行プレイヤーエントリー == 0 || n現在の選択行プレイヤーエントリー == 2) if (n現在の選択行プレイヤーエントリー == 0 || n現在の選択行プレイヤーエントリー == 2)
{ {
@ -331,10 +324,10 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Skin.soundDecideSFX.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
bプレイヤーエントリー = false; bプレイヤーエントリー = false;
bバナパス読み込み = false; bSaveIsLoading = false;
TJAPlayer3.Skin.SoundBanapas.bPlayed = false; TJAPlayer3.Skin.SoundBanapas.bPlayed = false;
ctバナパス読み込み成功 = new CCounter(); ctSaveLoaded = new CCounter();
ctバナパス読み込み待機 = new CCounter(); ctSaveLoading = new CCounter();
} }
} }
if (bモード選択) if (bモード選択)
@ -362,13 +355,13 @@ namespace TJAPlayer3
} }
} }
if (ctバナパス読み込み待機.CurrentValue >= 500) if (ctSaveLoading.CurrentValue >= 500)
{ {
if (!bバナパス読み込み) if (!bSaveIsLoading)
{ {
TJAPlayer3.Skin.soundEntry.tStop(); TJAPlayer3.Skin.soundEntry.tStop();
ctバナパス読み込み成功.Start(0, 3655, 1, TJAPlayer3.Timer); ctSaveLoaded.Start(0, 3655, 1, TJAPlayer3.Timer);
bバナパス読み込み = true; bSaveIsLoading = true;
bキャラカウンター初期化 = false; bキャラカウンター初期化 = false;
} }
} }
@ -406,9 +399,9 @@ namespace TJAPlayer3
if (bSaveFileLoaded == false) if (bSaveFileLoaded == false)
{ {
#region [ バナパス読み込み ] #region [ Save Loading ]
if (!bバナパス読み込み && !bバナパス読み込み失敗) if (!bSaveIsLoading && !bSaveFailedToLoad)
{ {
TJAPlayer3.Tx.Entry_Bar.t2D描画(0, 0); TJAPlayer3.Tx.Entry_Bar.t2D描画(0, 0);
@ -424,32 +417,32 @@ namespace TJAPlayer3
} }
else else
{ {
if (this.ctバナパス読み込み成功.CurrentValue <= 1000 && this.ctバナパス読み込み失敗.CurrentValue <= 1128) if (this.ctSaveLoaded.CurrentValue <= 1000 && this.ctSaveLoadingFailed.CurrentValue <= 1128)
{ {
if (bバナパス読み込み) if (bSaveIsLoading)
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.CurrentValue <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.CurrentValue - 2972); TJAPlayer3.Tx.Tile_Black.Opacity = this.ctSaveLoaded.CurrentValue <= 2972 ? 128 : 128 - (this.ctSaveLoaded.CurrentValue - 2972);
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++) for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++)
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++) for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++)
TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height);
TJAPlayer3.Tx.Banapas_Load[0].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue * 2; TJAPlayer3.Tx.Banapas_Load[0].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue * 2;
TJAPlayer3.Tx.Banapas_Load[0].vcScaleRatio.Y = ctバナパス読み込み成功.CurrentValue <= 100 ? ctバナパス読み込み成功.CurrentValue * 0.01f : 1.0f; TJAPlayer3.Tx.Banapas_Load[0].vcScaleRatio.Y = ctSaveLoaded.CurrentValue <= 100 ? ctSaveLoaded.CurrentValue * 0.01f : 1.0f;
TJAPlayer3.Tx.Banapas_Load[0].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load[0].t2D描画(0, 0);
TJAPlayer3.Tx.Banapas_Load[1].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue <= 96 ? (int)((ctバナパス読み込み成功.CurrentValue - 96) * 7.96875f) : 255; TJAPlayer3.Tx.Banapas_Load[1].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue <= 96 ? (int)((ctSaveLoaded.CurrentValue - 96) * 7.96875f) : 255;
TJAPlayer3.Tx.Banapas_Load[1].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load[1].t2D描画(0, 0);
if (TJAPlayer3.Tx.Banapas_Load[2] != null) if (TJAPlayer3.Tx.Banapas_Load[2] != null)
{ {
int step = TJAPlayer3.Tx.Banapas_Load[2].szTextureSize.Width / TJAPlayer3.Skin.Title_LoadingPinFrameCount; int step = TJAPlayer3.Tx.Banapas_Load[2].szTextureSize.Width / TJAPlayer3.Skin.Title_LoadingPinFrameCount;
int cycle = TJAPlayer3.Skin.Title_LoadingPinCycle; int cycle = TJAPlayer3.Skin.Title_LoadingPinCycle;
int _stamp = (ctバナパス読み込み成功.CurrentValue - 200) % (TJAPlayer3.Skin.Title_LoadingPinInstances * cycle); int _stamp = (ctSaveLoaded.CurrentValue - 200) % (TJAPlayer3.Skin.Title_LoadingPinInstances * cycle);
for (int i = 0; i < TJAPlayer3.Skin.Title_LoadingPinInstances; i++) for (int i = 0; i < TJAPlayer3.Skin.Title_LoadingPinInstances; i++)
{ {
TJAPlayer3.Tx.Banapas_Load[2].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue <= 96 ? (int)((ctバナパス読み込み成功.CurrentValue - 96) * 7.96875f) : 255; TJAPlayer3.Tx.Banapas_Load[2].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue <= 96 ? (int)((ctSaveLoaded.CurrentValue - 96) * 7.96875f) : 255;
TJAPlayer3.Tx.Banapas_Load[2].t2D拡大率考慮中央基準描画( TJAPlayer3.Tx.Banapas_Load[2].t2D拡大率考慮中央基準描画(
@ -468,9 +461,9 @@ namespace TJAPlayer3
} }
} }
if (bバナパス読み込み失敗) if (bSaveFailedToLoad)
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み失敗.CurrentValue <= 1000 ? 128 : 128 - (this.ctバナパス読み込み失敗.CurrentValue - 1000); TJAPlayer3.Tx.Tile_Black.Opacity = this.ctSaveLoadingFailed.CurrentValue <= 1000 ? 128 : 128 - (this.ctSaveLoadingFailed.CurrentValue - 1000);
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++) for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++)
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++) for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++)
@ -479,23 +472,23 @@ namespace TJAPlayer3
if (!TJAPlayer3.Skin.soundError.bPlayed) if (!TJAPlayer3.Skin.soundError.bPlayed)
TJAPlayer3.Skin.soundError.tPlay(); TJAPlayer3.Skin.soundError.tPlay();
int count = this.ctバナパス読み込み失敗.CurrentValue; int count = this.ctSaveLoadingFailed.CurrentValue;
TJAPlayer3.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2; TJAPlayer3.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2;
TJAPlayer3.Tx.Banapas_Load_Failure[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f; TJAPlayer3.Tx.Banapas_Load_Failure[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f;
TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D描画(0, 0);
if (ctバナパス読み込み失敗.CurrentValue >= 1128) if (ctSaveLoadingFailed.CurrentValue >= 1128)
{ {
bバナパス読み込み失敗 = false; bSaveFailedToLoad = false;
TJAPlayer3.Skin.soundError.bPlayed = false; TJAPlayer3.Skin.soundError.bPlayed = false;
} }
} }
} }
else else
{ {
if (bバナパス読み込み) if (bSaveIsLoading)
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.CurrentValue <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.CurrentValue - 2972); TJAPlayer3.Tx.Tile_Black.Opacity = this.ctSaveLoaded.CurrentValue <= 2972 ? 128 : 128 - (this.ctSaveLoaded.CurrentValue - 2972);
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++) for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++)
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++) for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++)
@ -504,7 +497,7 @@ namespace TJAPlayer3
if (!TJAPlayer3.Skin.SoundBanapas.bPlayed) if (!TJAPlayer3.Skin.SoundBanapas.bPlayed)
TJAPlayer3.Skin.SoundBanapas.tPlay(); TJAPlayer3.Skin.SoundBanapas.tPlay();
int count = this.ctバナパス読み込み成功.CurrentValue - 1000; int count = this.ctSaveLoaded.CurrentValue - 1000;
TJAPlayer3.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; TJAPlayer3.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2;
TJAPlayer3.Tx.Banapas_Load_Clear[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f; TJAPlayer3.Tx.Banapas_Load_Clear[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f;
TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D描画(0, 0);
@ -545,7 +538,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Banapas_Load_Clear[1].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; TJAPlayer3.Tx.Banapas_Load_Clear[1].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2;
TJAPlayer3.Tx.Banapas_Load_Clear[1].t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[0], TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[1] - anime); TJAPlayer3.Tx.Banapas_Load_Clear[1].t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[0], TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[1] - anime);
if (ctバナパス読み込み成功.CurrentValue >= 2000) if (ctSaveLoaded.CurrentValue >= 2000)
{ {
bプレイヤーエントリー = true; bプレイヤーエントリー = true;
} }
@ -568,7 +561,7 @@ namespace TJAPlayer3
this.bキャラカウンター初期化 = true; this.bキャラカウンター初期化 = true;
} }
int alpha = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctバナパス読み込み成功.CurrentValue - 3400); int alpha = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400);
TJAPlayer3.Tx.Entry_Player[0].Opacity = alpha; TJAPlayer3.Tx.Entry_Player[0].Opacity = alpha;
TJAPlayer3.Tx.Entry_Player[1].Opacity = alpha; TJAPlayer3.Tx.Entry_Player[1].Opacity = alpha;
@ -617,7 +610,7 @@ namespace TJAPlayer3
//this.PuchiChara.On進行描画(485 + 100, 140 + 190, false, alpha); //this.PuchiChara.On進行描画(485 + 100, 140 + 190, false, alpha);
this.PuchiChara.On進行描画(puchi_x, puchi_y, false, alpha); this.PuchiChara.On進行描画(puchi_x, puchi_y, false, alpha);
TJAPlayer3.Tx.Entry_Player[2].Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctバナパス読み込み成功.CurrentValue - 3400) - (this.ctエントリーバー点滅.CurrentValue <= 255 ? this.ctエントリーバー点滅.CurrentValue : 255 - (this.ctエントリーバー点滅.CurrentValue - 255)); TJAPlayer3.Tx.Entry_Player[2].Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400) - (this.ctエントリーバー点滅.CurrentValue <= 255 ? this.ctエントリーバー点滅.CurrentValue : 255 - (this.ctエントリーバー点滅.CurrentValue - 255));
TJAPlayer3.Tx.Entry_Player[2].t2D描画(TJAPlayer3.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], TJAPlayer3.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], TJAPlayer3.Tx.Entry_Player[2].t2D描画(TJAPlayer3.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], TJAPlayer3.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー],
new RectangleF(TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], new RectangleF(TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0],
TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1],
@ -662,7 +655,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3]
)); ));
Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctバナパス読み込み成功.CurrentValue - 3400); Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400);
if (Opacity > 0) if (Opacity > 0)
TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.Title_Entry_NamePlate[0], TJAPlayer3.Skin.Title_Entry_NamePlate[1], 0, true, Opacity); TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.Title_Entry_NamePlate[0], TJAPlayer3.Skin.Title_Entry_NamePlate[1], 0, true, Opacity);
} }
@ -1014,16 +1007,16 @@ namespace TJAPlayer3
{ {
bモード選択 = true; bモード選択 = true;
// bプレイヤーエントリー = true; // bプレイヤーエントリー = true;
bバナパス読み込み = true; bSaveIsLoading = true;
bプレイヤーエントリー決定 = true; bプレイヤーエントリー決定 = true;
bキャラカウンター初期化 = true; bキャラカウンター初期化 = true;
this.ctバナパス読み込み待機.Start(0, 600, 1, TJAPlayer3.Timer); this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer);
this.ctバナパス読み込み待機.CurrentValue = (int)this.ctバナパス読み込み待機.EndValue; this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue;
ctエントリーバー決定点滅.Start(0, 1055, 1, TJAPlayer3.Timer); ctエントリーバー決定点滅.Start(0, 1055, 1, TJAPlayer3.Timer);
ctエントリーバー決定点滅.CurrentValue = (int)ctエントリーバー決定点滅.CurrentValue; ctエントリーバー決定点滅.CurrentValue = (int)ctエントリーバー決定点滅.CurrentValue;
ctバナパス読み込み成功.Start(0, 3655, 1, TJAPlayer3.Timer); ctSaveLoaded.Start(0, 3655, 1, TJAPlayer3.Timer);
ctバナパス読み込み成功.CurrentValue = (int)ctバナパス読み込み成功.EndValue; ctSaveLoaded.CurrentValue = (int)ctSaveLoaded.EndValue;
ctキャライン.Start(0, 180, 2, TJAPlayer3.Timer); ctキャライン.Start(0, 180, 2, TJAPlayer3.Timer);
ctBarAnimeIn.Start(0, 1295, 1, TJAPlayer3.Timer); ctBarAnimeIn.Start(0, 1295, 1, TJAPlayer3.Timer);
@ -1042,10 +1035,10 @@ namespace TJAPlayer3
// Restore the title screen to the "Taiko hit start" screen // Restore the title screen to the "Taiko hit start" screen
private void UnloadSaveFile() private void UnloadSaveFile()
{ {
this.ctバナパス読み込み待機 = new CCounter(); this.ctSaveLoading = new CCounter();
this.ctコインイン待機 = new CCounter(0, 2000, 1, TJAPlayer3.Timer); this.ctコインイン待機 = new CCounter(0, 2000, 1, TJAPlayer3.Timer);
this.ctバナパス読み込み成功 = new CCounter(); this.ctSaveLoaded = new CCounter();
this.ctバナパス読み込み失敗 = new CCounter(); this.ctSaveLoadingFailed = new CCounter();
this.ctエントリーバー点滅 = new CCounter(0, 510, 2, TJAPlayer3.Timer); this.ctエントリーバー点滅 = new CCounter(0, 510, 2, TJAPlayer3.Timer);
this.ctエントリーバー決定点滅 = new CCounter(); this.ctエントリーバー決定点滅 = new CCounter();
@ -1060,8 +1053,8 @@ namespace TJAPlayer3
this.ctBarMove = new CCounter(); this.ctBarMove = new CCounter();
this.ctBarMove.CurrentValue = 250; this.ctBarMove.CurrentValue = 250;
this.bバナパス読み込み = false; this.bSaveIsLoading = false;
this.bバナパス読み込み失敗 = false; this.bSaveFailedToLoad = false;
this.bプレイヤーエントリー = false; this.bプレイヤーエントリー = false;
this.bプレイヤーエントリー決定 = false; this.bプレイヤーエントリー決定 = false;
this.bモード選択 = false; this.bモード選択 = false;
@ -1075,10 +1068,10 @@ namespace TJAPlayer3
private CCounter ctコインイン待機; private CCounter ctコインイン待機;
private CCounter ctバナパス読み込み待機; private CCounter ctSaveLoading;
private CCounter ctバナパス読み込み成功; private CCounter ctSaveLoaded;
private CCounter ctバナパス読み込み失敗; private CCounter ctSaveLoadingFailed;
private CCounter ctエントリーバー点滅; private CCounter ctエントリーバー点滅;
private CCounter ctエントリーバー決定点滅; private CCounter ctエントリーバー決定点滅;
@ -1101,8 +1094,8 @@ namespace TJAPlayer3
private int[] usedMenusPos; private int[] usedMenusPos;
private int usedMenusCount; private int usedMenusCount;
private bool bバナパス読み込み; private bool bSaveIsLoading;
private bool bバナパス読み込み失敗; private bool bSaveFailedToLoad;
private bool bプレイヤーエントリー; private bool bプレイヤーエントリー;
private bool bプレイヤーエントリー決定; private bool bプレイヤーエントリー決定;
private bool bモード選択; private bool bモード選択;

34
OpenTaiko/src/Stages/04.Config/CActConfigKeyAssign.cs
View File

@ -385,22 +385,34 @@ namespace TJAPlayer3
{ {
for( int i = 0; i < 144; i++ ) for( int i = 0; i < 144; i++ )
{ {
if (i != (int)SlimDXKeys.Key.Escape && //if (i != (int)SlimDXKeys.Key.Escape &&
i != (int)SlimDXKeys.Key.Return && // i != (int)SlimDXKeys.Key.Return &&
i != (int)SlimDXKeys.Key.UpArrow && // i != (int)SlimDXKeys.Key.UpArrow &&
i != (int)SlimDXKeys.Key.DownArrow && // i != (int)SlimDXKeys.Key.DownArrow &&
i != (int)SlimDXKeys.Key.LeftArrow && // i != (int)SlimDXKeys.Key.LeftArrow &&
i != (int)SlimDXKeys.Key.RightArrow && // i != (int)SlimDXKeys.Key.RightArrow &&
i != (int)SlimDXKeys.Key.Delete && // TJAPlayer3.InputManager.Keyboard.KeyPressed( i ) )
TJAPlayer3.InputManager.Keyboard.KeyPressed( i ) ) //{
{ if (i != (int)SlimDXKeys.Key.Escape &&
TJAPlayer3.Skin.soundDecideSFX.tPlay(); i != (int)SlimDXKeys.Key.Return &&
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Keyboard, 0, i, this.pad); TJAPlayer3.InputManager.Keyboard.KeyPressed(i))
{
TJAPlayer3.Skin.soundDecideSFX.tPlay();
if (pad < EKeyConfigPad.Capture)
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Keyboard, 0, i, this.pad);
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Keyboard; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Keyboard;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = 0; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = 0;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].コード = i; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].コード = i;
return true; return true;
} }
else if (i == (int)SlimDXKeys.Key.Return && TJAPlayer3.InputManager.Keyboard.KeyPressed(i)) // Remove keybind
{
TJAPlayer3.Skin.soundCancelSFX.tPlay();
TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Unknown;
TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0;
TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = 0;
return true;
}
} }
return false; return false;
} }

300
OpenTaiko/src/Stages/04.Config/CActConfigList.cs
View File

@ -18,7 +18,7 @@ namespace TJAPlayer3
get get
{ {
Eメニュー種別 e = this.eメニュー種別; Eメニュー種別 e = this.eメニュー種別;
if (e == Eメニュー種別.KeyAssignDrums || e == Eメニュー種別.KeyAssignSystem) if (e == Eメニュー種別.KeyAssignDrums || e == Eメニュー種別.KeyAssignSystem || e == Eメニュー種別.KeyAssignTraining)
{ {
return true; return true;
} }
@ -70,26 +70,26 @@ namespace TJAPlayer3
// #27029 2012.1.5 from: 説明文は最大9行→13行に変更。 // #27029 2012.1.5 from: 説明文は最大9行→13行に変更。
this.iSystemReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.Eパネル種別.その他, this.iSystemReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.EPanelType.Other,
CLangManager.LangInstance.GetString(3)); CLangManager.LangInstance.GetString(3));
this.list項目リスト.Add( this.iSystemReturnToMenu ); this.list項目リスト.Add( this.iSystemReturnToMenu );
this.iSystemReloadDTX = new CItemBase(CLangManager.LangInstance.GetString(4), CItemBase.Eパネル種別.通常, this.iSystemReloadDTX = new CItemBase(CLangManager.LangInstance.GetString(4), CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString(5)); CLangManager.LangInstance.GetString(5));
this.list項目リスト.Add( this.iSystemReloadDTX ); this.list項目リスト.Add( this.iSystemReloadDTX );
this.iSystemHardReloadDTX = new CItemBase(CLangManager.LangInstance.GetString(10148), CItemBase.Eパネル種別.通常, this.iSystemHardReloadDTX = new CItemBase(CLangManager.LangInstance.GetString(10148), CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString(10149)); CLangManager.LangInstance.GetString(10149));
this.list項目リスト.Add( this.iSystemHardReloadDTX ); this.list項目リスト.Add( this.iSystemHardReloadDTX );
this.iSystemLanguage = new CItemList(CLangManager.LangInstance.GetString(1), CItemList.Eパネル種別.通常, CLangManager.langToInt(TJAPlayer3.ConfigIni.sLang), this.iSystemLanguage = new CItemList(CLangManager.LangInstance.GetString(1), CItemList.EPanelType.Normal, CLangManager.langToInt(TJAPlayer3.ConfigIni.sLang),
CLangManager.LangInstance.GetString(0), CLangManager.LangInstance.GetString(0),
CLangManager.Languages); CLangManager.Languages);
this.list項目リスト.Add(this.iSystemLanguage); this.list項目リスト.Add(this.iSystemLanguage);
this.iLayoutType = new CItemInteger(CLangManager.LangInstance.GetString(16), 0, (int)eLayoutType.TOTAL - 1, TJAPlayer3.ConfigIni.nLayoutType, //this.iLayoutType = new CItemInteger(CLangManager.LangInstance.GetString(16), 0, (int)eLayoutType.TOTAL - 1, TJAPlayer3.ConfigIni.nLayoutType,
CLangManager.LangInstance.GetString(17)); // CLangManager.LangInstance.GetString(17));
this.list項目リスト.Add(this.iLayoutType); //this.list項目リスト.Add(this.iLayoutType);
this.iTaikoPlayerCount = new CItemInteger(CLangManager.LangInstance.GetString(6), 1, 5, TJAPlayer3.ConfigIni.nPlayerCount, this.iTaikoPlayerCount = new CItemInteger(CLangManager.LangInstance.GetString(6), 1, 5, TJAPlayer3.ConfigIni.nPlayerCount,
CLangManager.LangInstance.GetString(7)); CLangManager.LangInstance.GetString(7));
@ -113,7 +113,7 @@ namespace TJAPlayer3
CLangManager.LangInstance.GetString(18)); CLangManager.LangInstance.GetString(18));
this.list項目リスト.Add( this.iSystemTimeStretch ); this.list項目リスト.Add( this.iSystemTimeStretch );
this.iSystemGraphicsType = new CItemList(CLangManager.LangInstance.GetString(9997), CItemList.Eパネル種別.通常, TJAPlayer3.ConfigIni.nGraphicsDeviceType, this.iSystemGraphicsType = new CItemList(CLangManager.LangInstance.GetString(9997), CItemList.EPanelType.Normal, TJAPlayer3.ConfigIni.nGraphicsDeviceType,
CLangManager.LangInstance.GetString(9996), CLangManager.LangInstance.GetString(9996),
//new string[] { "OpenGL", "DirectX9", "DirectX11", "Vulkan", "Metal" }); //new string[] { "OpenGL", "DirectX9", "DirectX11", "Vulkan", "Metal" });
new string[] { "OpenGL", "DirectX11", "Vulkan", "Metal" }); new string[] { "OpenGL", "DirectX11", "Vulkan", "Metal" });
@ -137,14 +137,14 @@ namespace TJAPlayer3
if (CLangManager.fetchLang() == "ja") if (CLangManager.fetchLang() == "ja")
{ {
this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString(10150), CItemList.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eClipDispType, this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString(10150), CItemList.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eClipDispType,
CLangManager.LangInstance.GetString(10151), CLangManager.LangInstance.GetString(10151),
new string[] {"OFF","背景のみ","ウィンドウ","両方"}); new string[] {"OFF","背景","ウィンドウ","両方"});
this.list項目リスト.Add( this.iSystemAVIDisplayMode ); this.list項目リスト.Add( this.iSystemAVIDisplayMode );
} }
else else
{ {
this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString(10150), CItemList.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eClipDispType, this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString(10150), CItemList.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eClipDispType,
CLangManager.LangInstance.GetString(10151), CLangManager.LangInstance.GetString(10151),
new string[] {"None","Full","Mini","Both"}); new string[] {"None","Full","Mini","Both"});
this.list項目リスト.Add( this.iSystemAVIDisplayMode ); this.list項目リスト.Add( this.iSystemAVIDisplayMode );
@ -231,7 +231,7 @@ namespace TJAPlayer3
// #24820 2013.1.3 yyagi // #24820 2013.1.3 yyagi
this.iSystemSoundType = new CItemList(CLangManager.LangInstance.GetString(10043), CItemList.Eパネル種別.通常, TJAPlayer3.ConfigIni.nSoundDeviceType, this.iSystemSoundType = new CItemList(CLangManager.LangInstance.GetString(10043), CItemList.EPanelType.Normal, TJAPlayer3.ConfigIni.nSoundDeviceType,
CLangManager.LangInstance.GetString(43), CLangManager.LangInstance.GetString(43),
new string[] { "Bass", "ASIO", "WASAPI Exclusive", "WASAPI Shared" }); new string[] { "Bass", "ASIO", "WASAPI Exclusive", "WASAPI Shared" });
this.list項目リスト.Add(this.iSystemSoundType); this.list項目リスト.Add(this.iSystemSoundType);
@ -248,7 +248,7 @@ namespace TJAPlayer3
// #24820 2013.1.17 yyagi // #24820 2013.1.17 yyagi
string[] asiodevs = CEnumerateAllAsioDevices.GetAllASIODevices(); string[] asiodevs = CEnumerateAllAsioDevices.GetAllASIODevices();
this.iSystemASIODevice = new CItemList(CLangManager.LangInstance.GetString(10045), CItemList.Eパネル種別.通常, TJAPlayer3.ConfigIni.nASIODevice, this.iSystemASIODevice = new CItemList(CLangManager.LangInstance.GetString(10045), CItemList.EPanelType.Normal, TJAPlayer3.ConfigIni.nASIODevice,
CLangManager.LangInstance.GetString(45), CLangManager.LangInstance.GetString(45),
asiodevs ); asiodevs );
this.list項目リスト.Add( this.iSystemASIODevice ); this.list項目リスト.Add( this.iSystemASIODevice );
@ -297,7 +297,7 @@ namespace TJAPlayer3
this.iSystemSkinSubfolder = new CItemList(CLangManager.LangInstance.GetString(10054), CItemBase.Eパネル種別.通常, nSkinIndex, this.iSystemSkinSubfolder = new CItemList(CLangManager.LangInstance.GetString(10054), CItemBase.EPanelType.Normal, nSkinIndex,
CLangManager.LangInstance.GetString(54), CLangManager.LangInstance.GetString(54),
//"CONFIGURATIONを抜けると、設定した\n" + //"CONFIGURATIONを抜けると、設定した\n" +
//"スキンに変更されます。", //"スキンに変更されます。",
@ -306,7 +306,7 @@ namespace TJAPlayer3
this.iSystemGoToKeyAssign = new CItemBase(CLangManager.LangInstance.GetString(10055), CItemBase.Eパネル種別.通常, this.iSystemGoToKeyAssign = new CItemBase(CLangManager.LangInstance.GetString(10055), CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString(55)); CLangManager.LangInstance.GetString(55));
this.list項目リスト.Add( this.iSystemGoToKeyAssign ); this.list項目リスト.Add( this.iSystemGoToKeyAssign );
@ -331,7 +331,7 @@ namespace TJAPlayer3
// #27029 2012.1.5 from: 説明文は最大9行→13行に変更。 // #27029 2012.1.5 from: 説明文は最大9行→13行に変更。
this.iDrumsReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.Eパネル種別.その他, this.iDrumsReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.EPanelType.Other,
CLangManager.LangInstance.GetString(3)); CLangManager.LangInstance.GetString(3));
this.list項目リスト.Add( this.iDrumsReturnToMenu ); this.list項目リスト.Add( this.iDrumsReturnToMenu );
@ -373,7 +373,7 @@ namespace TJAPlayer3
this.list項目リスト.Add(this.iGlobalOffsetMs); this.list項目リスト.Add(this.iGlobalOffsetMs);
this.iTaikoDefaultCourse = new CItemList(CLangManager.LangInstance.GetString(80), CItemBase.Eパネル種別.通常, TJAPlayer3.ConfigIni.nDefaultCourse, this.iTaikoDefaultCourse = new CItemList(CLangManager.LangInstance.GetString(80), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.nDefaultCourse,
CLangManager.LangInstance.GetString(81), CLangManager.LangInstance.GetString(81),
new string[] { new string[] {
CLangManager.LangInstance.GetString(1040), CLangManager.LangInstance.GetString(1040),
@ -384,12 +384,12 @@ namespace TJAPlayer3
CLangManager.LangInstance.GetString(1045) }); CLangManager.LangInstance.GetString(1045) });
this.list項目リスト.Add(this.iTaikoDefaultCourse); this.list項目リスト.Add(this.iTaikoDefaultCourse);
this.iTaikoScoreMode = new CItemList(CLangManager.LangInstance.GetString(82), CItemBase.Eパネル種別.通常, TJAPlayer3.ConfigIni.nScoreMode, this.iTaikoScoreMode = new CItemList(CLangManager.LangInstance.GetString(82), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.nScoreMode,
CLangManager.LangInstance.GetString(83), CLangManager.LangInstance.GetString(83),
new string[] { "TYPE-A", "TYPE-B", "TYPE-C"}); new string[] { "TYPE-A", "TYPE-B", "TYPE-C"});
this.list項目リスト.Add(this.iTaikoScoreMode); this.list項目リスト.Add(this.iTaikoScoreMode);
this.ShinuchiMode = new CItemToggle(CLangManager.LangInstance.GetString(10084), TJAPlayer3.ConfigIni.ShinuchiMode, CItemBase.Eパネル種別.通常, this.ShinuchiMode = new CItemToggle(CLangManager.LangInstance.GetString(10084), TJAPlayer3.ConfigIni.ShinuchiMode, CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString(84)); CLangManager.LangInstance.GetString(84));
this.list項目リスト.Add(this.ShinuchiMode); this.list項目リスト.Add(this.ShinuchiMode);
@ -397,12 +397,12 @@ namespace TJAPlayer3
CLangManager.LangInstance.GetString(86)); CLangManager.LangInstance.GetString(86));
this.list項目リスト.Add(this.iTaikoBranchGuide); this.list項目リスト.Add(this.iTaikoBranchGuide);
this.iTaikoBranchAnime = new CItemList(CLangManager.LangInstance.GetString(87), CItemBase.Eパネル種別.通常, TJAPlayer3.ConfigIni.nBranchAnime, this.iTaikoBranchAnime = new CItemList(CLangManager.LangInstance.GetString(87), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.nBranchAnime,
CLangManager.LangInstance.GetString(88), CLangManager.LangInstance.GetString(88),
new string[] { "TYPE-A", "TYPE-B" }); new string[] { "TYPE-A", "TYPE-B" });
this.list項目リスト.Add(this.iTaikoBranchAnime); this.list項目リスト.Add(this.iTaikoBranchAnime);
this.iTaikoGameMode = new CItemList(CLangManager.LangInstance.GetString(89), CItemBase.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eGameMode, this.iTaikoGameMode = new CItemList(CLangManager.LangInstance.GetString(89), CItemBase.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eGameMode,
CLangManager.LangInstance.GetString(90), CLangManager.LangInstance.GetString(90),
new string[] { "OFF", "TYPE-A", "TYPE-B" }); new string[] { "OFF", "TYPE-A", "TYPE-B" });
this.list項目リスト.Add( this.iTaikoGameMode ); this.list項目リスト.Add( this.iTaikoGameMode );
@ -423,10 +423,22 @@ namespace TJAPlayer3
CLangManager.LangInstance.GetString(10125)); CLangManager.LangInstance.GetString(10125));
this.list項目リスト.Add(this.iShowExExtraAnime); this.list項目リスト.Add(this.iShowExExtraAnime);
this.iDrumsGoToKeyAssign = new CItemBase(CLangManager.LangInstance.GetString(95), CItemBase.Eパネル種別.通常, this.TokkunSkipCount = new CItemInteger(CLangManager.LangInstance.GetString(10154), 1, 99, TJAPlayer3.ConfigIni.TokkunSkipMeasures,
CLangManager.LangInstance.GetString(10155));
this.list項目リスト.Add(TokkunSkipCount);
this.TokkunMashInterval = new CItemInteger(CLangManager.LangInstance.GetString(10156), 1, 9999, TJAPlayer3.ConfigIni.TokkunMashInterval,
CLangManager.LangInstance.GetString(10157));
this.list項目リスト.Add(TokkunMashInterval);
this.iDrumsGoToKeyAssign = new CItemBase(CLangManager.LangInstance.GetString(95), CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString(96)); CLangManager.LangInstance.GetString(96));
this.list項目リスト.Add( this.iDrumsGoToKeyAssign ); this.list項目リスト.Add( this.iDrumsGoToKeyAssign );
this.iDrumsGoToTrainingKeyAssign = new CItemBase(CLangManager.LangInstance.GetString(10158), CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString(10159));
this.list項目リスト.Add( this.iDrumsGoToTrainingKeyAssign );
OnListMenuの初期化(); OnListMenuの初期化();
this.n現在の選択項目 = 0; this.n現在の選択項目 = 0;
this.eメニュー種別 = Eメニュー種別.Drums; this.eメニュー種別 = Eメニュー種別.Drums;
@ -477,14 +489,17 @@ namespace TJAPlayer3
this.b要素値にフォーカス中 = false; this.b要素値にフォーカス中 = false;
} }
if ( this.eメニュー種別 == Eメニュー種別.KeyAssignSystem ) switch (eメニュー種別)
{ {
t項目リストの設定_System(); case Eメニュー種別.KeyAssignSystem:
} t項目リストの設定_System();
else if ( this.eメニュー種別 == Eメニュー種別.KeyAssignDrums ) break;
{ case Eメニュー種別.KeyAssignDrums:
t項目リストの設定_Drums(); case Eメニュー種別.KeyAssignTraining:
} t項目リストの設定_Drums();
break;
}
// これ以外なら何もしない // これ以外なら何もしない
} }
public void tEnter押下() public void tEnter押下()
@ -616,6 +631,7 @@ namespace TJAPlayer3
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap5P); TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap5P);
} }
// Menu controls
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignDecide) else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignDecide)
{ {
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Decide); TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Decide);
@ -633,6 +649,7 @@ namespace TJAPlayer3
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RightChange); TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RightChange);
} }
// System controls
else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemCapture ) else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemCapture )
{ {
TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.Capture); TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.Capture);
@ -681,8 +698,74 @@ namespace TJAPlayer3
{ {
TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.CycleVideoDisplayMode); TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.CycleVideoDisplayMode);
} }
#endregion
else // Training controls
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingPause)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingPause);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingToggleAuto)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingToggleAuto);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBookmark)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBookmark);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingIncreaseScrollSpeed)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingIncreaseScrollSpeed);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingDecreaseScrollSpeed)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingDecreaseScrollSpeed);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingIncreaseSongSpeed)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingIncreaseSongSpeed);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingDecreaseSongSpeed)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingDecreaseSongSpeed);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBranchNormal)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchNormal);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBranchExpert)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchExpert);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBranchMaster)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchMaster);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingMoveForwardMeasure)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingMoveForwardMeasure);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingMoveBackMeasure)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingMoveBackMeasure);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingSkipForwardMeasure)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingSkipForwardMeasure);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingSkipBackMeasure)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingSkipBackMeasure);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingJumpToFirstMeasure)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingJumpToFirstMeasure);
}
else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingJumpToLastMeasure)
{
TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingJumpToLastMeasure);
}
#endregion
else
{ {
// #27029 2012.1.5 from // #27029 2012.1.5 from
//if( ( this.iSystemBDGroup.n現在選択されている項目番号 == (int) EBDGroup.どっちもBD ) && //if( ( this.iSystemBDGroup.n現在選択されている項目番号 == (int) EBDGroup.どっちもBD ) &&
@ -721,15 +804,23 @@ namespace TJAPlayer3
{ {
t項目リストの設定_KeyAssignSystem(); t項目リストの設定_KeyAssignSystem();
} }
else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemReturnToMenu ) // #24609 2011.4.12 yyagi else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemReturnToMenu ) // #24609 2011.4.12 yyagi
{ {
t項目リストの設定_System(); tConfigIniへ記録する();
t項目リストの設定_System();
} }
else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iDrumsGoToKeyAssign ) // #24525 2011.3.15 yyagi else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iDrumsGoToKeyAssign ) // #24525 2011.3.15 yyagi
{ {
tConfigIniへ記録する();
t項目リストの設定_KeyAssignDrums(); t項目リストの設定_KeyAssignDrums();
} }
else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignDrumsReturnToMenu ) // #24525 2011.3.15 yyagi else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iDrumsGoToTrainingKeyAssign )
{
tConfigIniへ記録する();
t項目リストの設定_KeyAssignTraining();
}
else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignDrumsReturnToMenu ||
this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignTrainingReturnToMenu ) // #24525 2011.3.15 yyagi
{ {
t項目リストの設定_Drums(); t項目リストの設定_Drums();
} }
@ -818,7 +909,7 @@ namespace TJAPlayer3
// #27029 2012.1.5 from: 説明文は最大9行→13行に変更。 // #27029 2012.1.5 from: 説明文は最大9行→13行に変更。
this.iKeyAssignSystemReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.Eパネル種別.その他, this.iKeyAssignSystemReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.EPanelType.Other,
CLangManager.LangInstance.GetString(3)); CLangManager.LangInstance.GetString(3));
this.list項目リスト.Add( this.iKeyAssignSystemReturnToMenu ); this.list項目リスト.Add( this.iKeyAssignSystemReturnToMenu );
@ -870,7 +961,7 @@ namespace TJAPlayer3
// #27029 2012.1.5 from: 説明文は最大9行→13行に変更。 // #27029 2012.1.5 from: 説明文は最大9行→13行に変更。
this.iKeyAssignDrumsReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.Eパネル種別.その他, this.iKeyAssignDrumsReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.EPanelType.Other,
CLangManager.LangInstance.GetString(3)); CLangManager.LangInstance.GetString(3));
this.list項目リスト.Add(this.iKeyAssignDrumsReturnToMenu); this.list項目リスト.Add(this.iKeyAssignDrumsReturnToMenu);
@ -977,8 +1068,85 @@ namespace TJAPlayer3
this.n現在の選択項目 = 0; this.n現在の選択項目 = 0;
this.eメニュー種別 = Eメニュー種別.KeyAssignDrums; this.eメニュー種別 = Eメニュー種別.KeyAssignDrums;
} }
#endregion public void t項目リストの設定_KeyAssignTraining()
public void t次に移動() {
this.list項目リスト.Clear();
this.iKeyAssignTrainingReturnToMenu = new CItemBase(CLangManager.LangInstance.GetString(2), CItemBase.EPanelType.Other,
CLangManager.LangInstance.GetString(3));
this.list項目リスト.Add(this.iKeyAssignTrainingReturnToMenu);
this.iKeyAssignTrainingPause = new CItemBase(CLangManager.LangInstance.GetString(10160),
CLangManager.LangInstance.GetString(10161));
this.list項目リスト.Add(this.iKeyAssignTrainingPause);
this.iKeyAssignTrainingToggleAuto = new CItemBase(CLangManager.LangInstance.GetString(10162),
CLangManager.LangInstance.GetString(10163));
this.list項目リスト.Add(this.iKeyAssignTrainingToggleAuto);
this.iKeyAssignTrainingBookmark = new CItemBase(CLangManager.LangInstance.GetString(10164),
CLangManager.LangInstance.GetString(10165));
this.list項目リスト.Add(this.iKeyAssignTrainingBookmark);
this.iKeyAssignTrainingIncreaseScrollSpeed = new CItemBase(CLangManager.LangInstance.GetString(10166),
CLangManager.LangInstance.GetString(10167));
this.list項目リスト.Add(this.iKeyAssignTrainingIncreaseScrollSpeed);
this.iKeyAssignTrainingDecreaseScrollSpeed = new CItemBase(CLangManager.LangInstance.GetString(10168),
CLangManager.LangInstance.GetString(10169));
this.list項目リスト.Add(this.iKeyAssignTrainingDecreaseScrollSpeed);
this.iKeyAssignTrainingIncreaseSongSpeed = new CItemBase(CLangManager.LangInstance.GetString(10170),
CLangManager.LangInstance.GetString(10171));
this.list項目リスト.Add(this.iKeyAssignTrainingIncreaseSongSpeed);
this.iKeyAssignTrainingDecreaseSongSpeed = new CItemBase(CLangManager.LangInstance.GetString(10172),
CLangManager.LangInstance.GetString(10173));
this.list項目リスト.Add(this.iKeyAssignTrainingDecreaseSongSpeed);
this.iKeyAssignTrainingBranchNormal = new CItemBase(CLangManager.LangInstance.GetString(10174),
CLangManager.LangInstance.GetString(10175));
this.list項目リスト.Add(this.iKeyAssignTrainingBranchNormal);
this.iKeyAssignTrainingBranchExpert = new CItemBase(CLangManager.LangInstance.GetString(10176),
CLangManager.LangInstance.GetString(10177));
this.list項目リスト.Add(this.iKeyAssignTrainingBranchExpert);
this.iKeyAssignTrainingBranchMaster = new CItemBase(CLangManager.LangInstance.GetString(10178),
CLangManager.LangInstance.GetString(10179));
this.list項目リスト.Add(this.iKeyAssignTrainingBranchMaster);
this.iKeyAssignTrainingMoveForwardMeasure = new CItemBase(CLangManager.LangInstance.GetString(10180),
CLangManager.LangInstance.GetString(10181));
this.list項目リスト.Add(this.iKeyAssignTrainingMoveForwardMeasure);
this.iKeyAssignTrainingMoveBackMeasure = new CItemBase(CLangManager.LangInstance.GetString(10182),
CLangManager.LangInstance.GetString(10183));
this.list項目リスト.Add(this.iKeyAssignTrainingMoveBackMeasure);
this.iKeyAssignTrainingSkipForwardMeasure = new CItemBase(CLangManager.LangInstance.GetString(10184),
CLangManager.LangInstance.GetString(10185));
this.list項目リスト.Add(this.iKeyAssignTrainingSkipForwardMeasure);
this.iKeyAssignTrainingSkipBackMeasure = new CItemBase(CLangManager.LangInstance.GetString(10186),
CLangManager.LangInstance.GetString(10187));
this.list項目リスト.Add(this.iKeyAssignTrainingSkipBackMeasure);
this.iKeyAssignTrainingJumpToFirstMeasure = new CItemBase(CLangManager.LangInstance.GetString(10188),
CLangManager.LangInstance.GetString(10189));
this.list項目リスト.Add(this.iKeyAssignTrainingJumpToFirstMeasure);
this.iKeyAssignTrainingJumpToLastMeasure = new CItemBase(CLangManager.LangInstance.GetString(10190),
CLangManager.LangInstance.GetString(10191));
this.list項目リスト.Add(this.iKeyAssignTrainingJumpToLastMeasure);
OnListMenuの初期化();
this.n現在の選択項目 = 0;
this.eメニュー種別 = Eメニュー種別.KeyAssignTraining;
}
#endregion
public void t次に移動()
{ {
TJAPlayer3.Skin.soundカーソル移動音.tPlay(); TJAPlayer3.Skin.soundカーソル移動音.tPlay();
if( this.b要素値にフォーカス中 ) if( this.b要素値にフォーカス中 )
@ -1322,8 +1490,8 @@ namespace TJAPlayer3
//----------------- //-----------------
switch( this.list項目リスト[ nItem ].eパネル種別 ) switch( this.list項目リスト[ nItem ].eパネル種別 )
{ {
case CItemBase.Eパネル種別.通常: case CItemBase.EPanelType.Normal:
case CItemBase.Eパネル種別.その他: case CItemBase.EPanelType.Other:
if ( TJAPlayer3.Tx.Config_ItemBox != null ) if ( TJAPlayer3.Tx.Config_ItemBox != null )
TJAPlayer3.Tx.Config_ItemBox.t2D描画( x, y ); TJAPlayer3.Tx.Config_ItemBox.t2D描画( x, y );
break; break;
@ -1526,6 +1694,7 @@ namespace TJAPlayer3
Drums, Drums,
KeyAssignSystem, // #24609 2011.4.12 yyagi: 画面キャプチャキーのアサイン KeyAssignSystem, // #24609 2011.4.12 yyagi: 画面キャプチャキーのアサイン
KeyAssignDrums, KeyAssignDrums,
KeyAssignTraining,
Unknown Unknown
} }
@ -1534,8 +1703,14 @@ namespace TJAPlayer3
private bool b要素値にフォーカス中; private bool b要素値にフォーカス中;
private CCounter ct三角矢印アニメ; private CCounter ct三角矢印アニメ;
private Eメニュー種別 eメニュー種別; private Eメニュー種別 eメニュー種別;
#region [ キーコンフィグ ] #region [ Key Config ]
private CItemBase iKeyAssignSystemCapture; // #24609
private CItemBase iKeyAssignSystemReturnToMenu; // #24609
private CItemBase iKeyAssignDrumsReturnToMenu;
private CItemBase iKeyAssignTrainingReturnToMenu;
#region [System]
private CItemBase iKeyAssignSystemCapture; // #24609
private CItemBase iKeyAssignSystemSongVolIncrease; private CItemBase iKeyAssignSystemSongVolIncrease;
private CItemBase iKeyAssignSystemSongVolDecrease; private CItemBase iKeyAssignSystemSongVolDecrease;
private CItemBase iKeyAssignSystemDisplayHit; private CItemBase iKeyAssignSystemDisplayHit;
@ -1547,10 +1722,10 @@ namespace TJAPlayer3
private CItemBase iKeyAssignSystemToggleAutoP2; private CItemBase iKeyAssignSystemToggleAutoP2;
private CItemBase iKeyAssignSystemToggleTrainingMode; private CItemBase iKeyAssignSystemToggleTrainingMode;
private CItemBase iKeyAssignSystemCycleVideoDisplayMode; private CItemBase iKeyAssignSystemCycleVideoDisplayMode;
private CItemBase iKeyAssignSystemReturnToMenu; // #24609 #endregion
private CItemBase iKeyAssignDrumsReturnToMenu;
private CItemBase iKeyAssignTaikoLRed; #region [Drum]
private CItemBase iKeyAssignTaikoLRed;
private CItemBase iKeyAssignTaikoRRed; private CItemBase iKeyAssignTaikoRRed;
private CItemBase iKeyAssignTaikoLBlue; private CItemBase iKeyAssignTaikoLBlue;
private CItemBase iKeyAssignTaikoRBlue; private CItemBase iKeyAssignTaikoRBlue;
@ -1585,9 +1760,29 @@ namespace TJAPlayer3
private CItemBase iKeyAssignCancel; private CItemBase iKeyAssignCancel;
private CItemBase iKeyAssignLeftChange; private CItemBase iKeyAssignLeftChange;
private CItemBase iKeyAssignRightChange; private CItemBase iKeyAssignRightChange;
#endregion #endregion
private CItemToggle iLogOutputLog;
#region [Training]
private CItemBase iKeyAssignTrainingIncreaseScrollSpeed;
private CItemBase iKeyAssignTrainingDecreaseScrollSpeed;
private CItemBase iKeyAssignTrainingToggleAuto;
private CItemBase iKeyAssignTrainingBranchNormal;
private CItemBase iKeyAssignTrainingBranchExpert;
private CItemBase iKeyAssignTrainingBranchMaster;
private CItemBase iKeyAssignTrainingPause;
private CItemBase iKeyAssignTrainingBookmark;
private CItemBase iKeyAssignTrainingMoveForwardMeasure;
private CItemBase iKeyAssignTrainingMoveBackMeasure;
private CItemBase iKeyAssignTrainingSkipForwardMeasure;
private CItemBase iKeyAssignTrainingSkipBackMeasure;
private CItemBase iKeyAssignTrainingIncreaseSongSpeed;
private CItemBase iKeyAssignTrainingDecreaseSongSpeed;
private CItemBase iKeyAssignTrainingJumpToFirstMeasure;
private CItemBase iKeyAssignTrainingJumpToLastMeasure;
#endregion
#endregion
private CItemToggle iLogOutputLog;
private CItemToggle iSystemApplyLoudnessMetadata; private CItemToggle iSystemApplyLoudnessMetadata;
private CItemInteger iSystemTargetLoudness; private CItemInteger iSystemTargetLoudness;
private CItemToggle iSystemApplySongVol; private CItemToggle iSystemApplySongVol;
@ -1672,6 +1867,7 @@ namespace TJAPlayer3
private int nSkinIndex; // private int nSkinIndex; //
private CItemBase iDrumsGoToKeyAssign; private CItemBase iDrumsGoToKeyAssign;
private CItemBase iDrumsGoToTrainingKeyAssign;
private CItemBase iSystemGoToKeyAssign; // #24609 private CItemBase iSystemGoToKeyAssign; // #24609
private CItemInteger iCommonPlaySpeed; private CItemInteger iCommonPlaySpeed;
@ -1712,6 +1908,8 @@ namespace TJAPlayer3
CItemToggle FastRender; CItemToggle FastRender;
CItemToggle ASyncTextureLoad; CItemToggle ASyncTextureLoad;
CItemInteger MusicPreTimeMs; CItemInteger MusicPreTimeMs;
CItemInteger TokkunSkipCount;
CItemInteger TokkunMashInterval;
private CItemInteger iInputAdjustTimeMs; private CItemInteger iInputAdjustTimeMs;
private CItemInteger iGlobalOffsetMs; private CItemInteger iGlobalOffsetMs;
@ -1829,7 +2027,7 @@ namespace TJAPlayer3
TJAPlayer3.ConfigIni.nPlayerCount = this.iTaikoPlayerCount.n現在の値; TJAPlayer3.ConfigIni.nPlayerCount = this.iTaikoPlayerCount.n現在の値;
TJAPlayer3.ConfigIni.nLayoutType = this.iLayoutType.n現在の値; //TJAPlayer3.ConfigIni.nLayoutType = this.iLayoutType.n現在の値;
TJAPlayer3.ConfigIni.FastRender = this.FastRender.bON; TJAPlayer3.ConfigIni.FastRender = this.FastRender.bON;
TJAPlayer3.ConfigIni.ASyncTextureLoad = this.ASyncTextureLoad.bON; TJAPlayer3.ConfigIni.ASyncTextureLoad = this.ASyncTextureLoad.bON;
TJAPlayer3.ConfigIni.SimpleMode = this.SimpleMode.bON; TJAPlayer3.ConfigIni.SimpleMode = this.SimpleMode.bON;
@ -1875,6 +2073,8 @@ namespace TJAPlayer3
TJAPlayer3.ConfigIni.bJudgeBigNotes = this.iTaikoBigNotesJudge.bON; TJAPlayer3.ConfigIni.bJudgeBigNotes = this.iTaikoBigNotesJudge.bON;
TJAPlayer3.ConfigIni.bForceNormalGauge = this.iTaikoForceNormalGauge.bON; TJAPlayer3.ConfigIni.bForceNormalGauge = this.iTaikoForceNormalGauge.bON;
TJAPlayer3.ConfigIni.TokkunSkipMeasures = this.TokkunSkipCount.n現在の値;
TJAPlayer3.ConfigIni.TokkunMashInterval = this.TokkunMashInterval.n現在の値;
} }
//----------------- //-----------------
#endregion #endregion

12
OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs
View File

@ -74,14 +74,14 @@ namespace TJAPlayer3
"Note: It also changes the songs' pitch." ) ); "Note: It also changes the songs' pitch." ) );
#endregion #endregion
#region [ 個別 Sud/Hid ] #region [ 個別 Sud/Hid ]
l.Add( new CItemList( "ランダム", CItemBase.Eパネル種別.通常, (int) TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile], l.Add( new CItemList( "ランダム", CItemBase.EPanelType.Normal, (int) TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile],
"いわゆるランダム。\n RANDOM: ちょっと変わる\n MIRROR: あべこべ \n SUPER: そこそこヤバい\n HYPER: 結構ヤバい\nなお、実装は適当な模様", "いわゆるランダム。\n RANDOM: ちょっと変わる\n MIRROR: あべこべ \n SUPER: そこそこヤバい\n HYPER: 結構ヤバい\nなお、実装は適当な模様",
"Guitar chips come randomly.\n\n Part: swapping lanes randomly for each\n measures.\n Super: swapping chip randomly\n Hyper: swapping randomly\n (number of lanes also changes)", "Guitar chips come randomly.\n\n Part: swapping lanes randomly for each\n measures.\n Super: swapping chip randomly\n Hyper: swapping randomly\n (number of lanes also changes)",
new string[] { "OFF", "RANDOM", "あべこべ", "SUPER", "HYPER" } ) ); new string[] { "OFF", "RANDOM", "あべこべ", "SUPER", "HYPER" } ) );
l.Add( new CItemList( "ドロン", CItemBase.Eパネル種別.通常, (int) TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile], l.Add( new CItemList( "ドロン", CItemBase.EPanelType.Normal, (int) TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile],
"", "",
new string[] { "OFF", "ドロン", "ステルス" } ) ); new string[] { "OFF", "ドロン", "ステルス" } ) );
l.Add( new CItemList( "ゲーム", CItemBase.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eGameMode, l.Add( new CItemList( "ゲーム", CItemBase.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eGameMode,
"ゲームモード\n" + "ゲームモード\n" +
"TYPE-A: 完走!叩ききりまショー!\n" + "TYPE-A: 完走!叩ききりまショー!\n" +
"TYPE-B: 完走!叩ききりまショー!(激辛)\n" + "TYPE-B: 完走!叩ききりまショー!(激辛)\n" +
@ -91,13 +91,13 @@ namespace TJAPlayer3
" ", " ",
new string[] { "OFF", "完走!", "完走!激辛" }) ); new string[] { "OFF", "完走!", "完走!激辛" }) );
l.Add(new CItemList(nameof(TJAPlayer3.ConfigIni.ShinuchiMode), CItemBase.Eパネル種別.通常, TJAPlayer3.ConfigIni.ShinuchiMode ? 1 : 0, "", "", new string[] { "OFF", "ON" })); l.Add(new CItemList(nameof(TJAPlayer3.ConfigIni.ShinuchiMode), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.ShinuchiMode ? 1 : 0, "", "", new string[] { "OFF", "ON" }));
#endregion #endregion
#region [ 共通 SET切り替え/More/Return ] #region [ 共通 SET切り替え/More/Return ]
l.Add(new CItemInteger("PlayerCount", 1, 5, TJAPlayer3.ConfigIni.nPlayerCount, "プレイヤーの人数を指定します。" ,"Set a player count.")); l.Add(new CItemInteger("PlayerCount", 1, 5, TJAPlayer3.ConfigIni.nPlayerCount, "プレイヤーの人数を指定します。" ,"Set a player count."));
l.Add( new CSwitchItemList( "More...", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" } ) ); l.Add( new CSwitchItemList( "More...", CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" } ) );
l.Add( new CSwitchItemList( "戻る", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "", "" } ) ); l.Add( new CSwitchItemList( "戻る", CItemBase.EPanelType.Normal, 0, "", "", new string[] { "", "" } ) );
#endregion #endregion
return l; return l;

10
OpenTaiko/src/Stages/05.SongSelect/CActSortSongs.cs
View File

@ -10,10 +10,10 @@ namespace TJAPlayer3
public CActSortSongs() public CActSortSongs()
{ {
List<CItemBase> lci = new List<CItemBase>(); List<CItemBase> lci = new List<CItemBase>();
lci.Add( new CItemList( CLangManager.LangInstance.GetString(9201), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "Z,Y,X,...", "A,B,C,..." } ) ); lci.Add( new CItemList( CLangManager.LangInstance.GetString(9201), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "Z,Y,X,...", "A,B,C,..." } ) );
lci.Add( new CItemList(CLangManager.LangInstance.GetString(9202), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "Z,Y,X,...", "A,B,C,..." } ) ); lci.Add( new CItemList(CLangManager.LangInstance.GetString(9202), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "Z,Y,X,...", "A,B,C,..." } ) );
lci.Add(new CItemList(CLangManager.LangInstance.GetString(9203), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "Z,Y,X,...", "A,B,C,..." })); lci.Add(new CItemList(CLangManager.LangInstance.GetString(9203), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "Z,Y,X,...", "A,B,C,..." }));
lci.Add( new CItemList(CLangManager.LangInstance.GetString(9204), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "13,12,11,...", "1,2,3,..." } ) ); lci.Add( new CItemList(CLangManager.LangInstance.GetString(9204), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "13,12,11,...", "1,2,3,..." } ) );
//lci.Add( new CItemList( "Best Rank", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "E,D,C,...", "SS,S,A,..." } ) ); //lci.Add( new CItemList( "Best Rank", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "E,D,C,...", "SS,S,A,..." } ) );
//lci.Add( new CItemList( "PlayCount", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "10,9,8,...", "1,2,3,..." } ) ); //lci.Add( new CItemList( "PlayCount", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "10,9,8,...", "1,2,3,..." } ) );
@ -22,7 +22,7 @@ namespace TJAPlayer3
lci.Add( new CItemList( "BPM", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "300,200,...", "70,80,90,..." } ) ); lci.Add( new CItemList( "BPM", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "300,200,...", "70,80,90,..." } ) );
#endif #endif
//lci.Add( new CItemList( "ジャンル", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "AC15", "AC8-14" } ) ); //lci.Add( new CItemList( "ジャンル", CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "AC15", "AC8-14" } ) );
lci.Add( new CItemList(CLangManager.LangInstance.GetString(9200), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "", "" } ) ); lci.Add( new CItemList(CLangManager.LangInstance.GetString(9200), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "", "" } ) );
base.Initialize( lci, false, "SORT MENU" ); base.Initialize( lci, false, "SORT MENU" );
} }

6
OpenTaiko/src/Stages/07.Game/CAct演奏PauseMenu.cs
View File

@ -39,9 +39,9 @@ namespace TJAPlayer3
List<CItemBase> l = new List<CItemBase>(); List<CItemBase> l = new List<CItemBase>();
#region [ 共通 SET切り替え/More/Return ] #region [ 共通 SET切り替え/More/Return ]
l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(900), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" })); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(900), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" }));
if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(901), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" })); if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(901), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" }));
l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(902), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "", "" })); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(902), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "", "" }));
#endregion #endregion
return l; return l;

34
OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -3221,13 +3221,13 @@ namespace TJAPlayer3
TJAPlayer3.DTX.tWave再生位置自動補正(); TJAPlayer3.DTX.tWave再生位置自動補正();
} }
// Tokkun only // Tokkun only
else if (TJAPlayer3.ConfigIni.bTokkunMode && else if (TJAPlayer3.ConfigIni.bTokkunMode &&
keyboard.KeyPressed( (int)SlimDXKeys.Key.UpArrow ) ) TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingIncreaseScrollSpeed) )
{ // UpArrow(scrollspeed up) { // UpArrow(scrollspeed up)
ドラムスクロール速度アップ(); ドラムスクロール速度アップ();
} }
else if (TJAPlayer3.ConfigIni.bTokkunMode && else if (TJAPlayer3.ConfigIni.bTokkunMode &&
keyboard.KeyPressed( (int)SlimDXKeys.Key.DownArrow ) ) TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingDecreaseScrollSpeed) )
{ // DownArrow (scrollspeed down) { // DownArrow (scrollspeed down)
ドラムスクロール速度ダウン(); ドラムスクロール速度ダウン();
} }
@ -3265,7 +3265,8 @@ namespace TJAPlayer3
} }
// this.t演奏中止(); // this.t演奏中止();
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D1 ) ) else if ( TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchNormal) &&
(TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]) )
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
@ -3291,7 +3292,8 @@ namespace TJAPlayer3
this.b強制的に分岐させた[0] = true; this.b強制的に分岐させた[0] = true;
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D2 ) ) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchExpert) &&
(TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen.
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
@ -3317,7 +3319,8 @@ namespace TJAPlayer3
this.b強制的に分岐させた[0] = true; this.b強制的に分岐させた[0] = true;
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D3 ) ) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchMaster) &&
(TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen.
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
@ -3370,15 +3373,9 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.ConfigIni.bTokkunMode) if (TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingToggleAuto) )
{ {
if (keyboard.KeyPressed((int)SlimDXKeys.Key.F6)) TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] = !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0];
{
if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] == false)
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] = true;
else
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] = false;
}
} }
} }
@ -3386,10 +3383,7 @@ namespace TJAPlayer3
if (keyboard.KeyPressed((int)SlimDXKeys.Key.F7)) if (keyboard.KeyPressed((int)SlimDXKeys.Key.F7))
{ {
if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1] == false) TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1] = !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1];
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1] = true;
else
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1] = false;
} }
#endif #endif
if ( !this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE && ( ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) if ( !this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE && ( ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) )
@ -3402,7 +3396,7 @@ namespace TJAPlayer3
{ // DownArrow (scrollspeed down) { // DownArrow (scrollspeed down)
ドラムスクロール速度ダウン(); ドラムスクロール速度ダウン();
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.Delete ) ) else if ( TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.DisplayDebug) )
{ // del (debug info) { // del (debug info)
TJAPlayer3.ConfigIni.b演奏情報を表示する = !TJAPlayer3.ConfigIni.b演奏情報を表示する; TJAPlayer3.ConfigIni.b演奏情報を表示する = !TJAPlayer3.ConfigIni.b演奏情報を表示する;
} }

76
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsTrainingMode.cs
View File

@ -113,7 +113,7 @@ namespace TJAPlayer3
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "TRAINING MODE (BETA)"); TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "TRAINING MODE (BETA)");
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Space)|| TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingPause))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -126,35 +126,21 @@ namespace TJAPlayer3
this.tPausePlay(); this.tPausePlay();
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingSkipForwardMeasure))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
if (this.nCurrentMeasure > 1) this.nCurrentMeasure += TJAPlayer3.ConfigIni.TokkunSkipMeasures;
{ if (this.nCurrentMeasure > this.nMeasureCount)
this.nCurrentMeasure--; this.nCurrentMeasure = this.nMeasureCount;
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure;
this.tMatchWithTheChartDisplayPosition(true); TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure;
TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay();
} this.tMatchWithTheChartDisplayPosition(true);
if (t配列の値interval以下か(ref this.LBlue, SoundManager.PlayTimer.SystemTimeMs, TJAPlayer3.ConfigIni.TokkunMashInterval)) TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay();
{
for (int index = this.JumpPointList.Count - 1; index >= 0; index--)
{
if (this.JumpPointList[index].Time <= SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed)
{
this.nCurrentMeasure = this.JumpPointList[index].Measure;
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure;
TJAPlayer3.Skin.sound特訓スキップ音.tPlay();
this.tMatchWithTheChartDisplayPosition(false);
break;
}
}
}
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.PageDown)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingSkipBackMeasure))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -168,7 +154,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay();
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingMoveForwardMeasure))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -197,21 +183,35 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.PageUp)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingMoveBackMeasure))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
this.nCurrentMeasure += TJAPlayer3.ConfigIni.TokkunSkipMeasures; if (this.nCurrentMeasure > 1)
if (this.nCurrentMeasure > this.nMeasureCount) {
this.nCurrentMeasure = this.nMeasureCount; this.nCurrentMeasure--;
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure;
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true);
TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay();
this.tMatchWithTheChartDisplayPosition(true); }
TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); if (t配列の値interval以下か(ref this.LBlue, SoundManager.PlayTimer.SystemTimeMs, TJAPlayer3.ConfigIni.TokkunMashInterval))
{
for (int index = this.JumpPointList.Count - 1; index >= 0; index--)
{
if (this.JumpPointList[index].Time <= SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed)
{
this.nCurrentMeasure = this.JumpPointList[index].Measure;
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure;
TJAPlayer3.Skin.sound特訓スキップ音.tPlay();
this.tMatchWithTheChartDisplayPosition(false);
break;
}
}
}
} }
} }
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingDecreaseSongSpeed))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -222,7 +222,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingIncreaseSongSpeed))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -233,7 +233,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Home)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingJumpToFirstMeasure))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -247,7 +247,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.End)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingJumpToLastMeasure))
{ {
if (this.bTrainingPAUSE) if (this.bTrainingPAUSE)
{ {
@ -261,7 +261,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.A)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBookmark))
this.tToggleBookmarkAtTheCurrentPosition(); this.tToggleBookmarkAtTheCurrentPosition();
if (this.bCurrentlyScrolling) if (this.bCurrentlyScrolling)

8
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums演奏終了演出.cs
View File

@ -743,6 +743,14 @@ namespace TJAPlayer3
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AILoseScript.Update(i); if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AILoseScript.Update(i);
AILoseScript.Draw(i); AILoseScript.Draw(i);
break; break;
case EndMode.AI_Win_FullCombo:
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AIWin_FullComboScript.Update(i);
AIWin_FullComboScript.Draw(i);
break;
case EndMode.AI_Win_Perfect:
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AIWin_PerfectScript.Update(i);
AIWin_PerfectScript.Draw(i);
break;
case EndMode.Tower_Dropout: case EndMode.Tower_Dropout:
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Tower_DropoutScript.Update(i); if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Tower_DropoutScript.Update(i);

17
OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs
View File

@ -277,7 +277,8 @@ namespace TJAPlayer3
TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin, TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin,
TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値, TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値,
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM, TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM,
new bool[] { false, false, false, false, false } new bool[] { false, false, false, false, false },
-1
); );
LuaInit.Call(); LuaInit.Call();
@ -302,6 +303,17 @@ namespace TJAPlayer3
currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f);
} }
double timestamp = -1.0;
if (TJAPlayer3.DTX != null)
{
double timeoffset = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan ? -2.0 : -8.2;
// Due to the fact that all Dans use DELAY to offset instead of OFFSET, Dan offset can't be properly synced. ¯\_(ツ)_/¯
timestamp = (((double)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) / 1000.0) +
(-(TJAPlayer3.ConfigIni.MusicPreTimeMs + TJAPlayer3.DTX.nOFFSET) / 1000.0) +
timeoffset;
}
LuaUpdateValues.Call(TJAPlayer3.FPS.DeltaTime, LuaUpdateValues.Call(TJAPlayer3.FPS.DeltaTime,
TJAPlayer3.FPS.NowFPS, TJAPlayer3.FPS.NowFPS,
@ -311,7 +323,8 @@ namespace TJAPlayer3
TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin, TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin,
TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値, TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値,
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM, TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM,
TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME); TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME,
timestamp);
/*LuaScript.SetObjectToPath("fps", TJAPlayer3.FPS.n現在のFPS); /*LuaScript.SetObjectToPath("fps", TJAPlayer3.FPS.n現在のFPS);
LuaScript.SetObjectToPath("deltaTime", TJAPlayer3.FPS.DeltaTime); LuaScript.SetObjectToPath("deltaTime", TJAPlayer3.FPS.DeltaTime);
LuaScript.SetObjectToPath("isClear", TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared); LuaScript.SetObjectToPath("isClear", TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared);