Skip to content

Commit

Permalink
本家風背景画像の封印を完全に解除。
Browse files Browse the repository at this point in the history
DirectSound時の音割れ対策でAdjustWaveを一旦削除。
バージョン表記の変更
  • Loading branch information
kairera0467 committed May 18, 2017
1 parent 44a06fc commit e1f57e1
Show file tree
Hide file tree
Showing 21 changed files with 75 additions and 102 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public override int On進行描画()
this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );

#region[ バージョン表示 ]
string strVersion = "KTT:J:A:I:2017050800";
string strVersion = "KTT:J:A:I:2017051800";
#if DEBUG
strVersion += " DEBUG";
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,24 +146,24 @@ public void t項目リストの設定_System()



this.iSystemAdjustWaves = new CItemToggle( "AdjustWaves", CDTXMania.ConfigIni.bWave再生位置自動調整機能有効,
"サウンド再生位置自動補正:\n" +
"ハードウェアやOSに起因するサウン\n" +
"ドのずれを強制的に補正します。\n" +
"BGM のように再生時間の長い音声\n" +
"データが使用されている曲で効果が\n" +
"あります。" +
"\n" +
"※ DirectSound使用時のみ有効です。",
"Automatic wave playing position\n" +
" adjustment feature. If you turn it ON,\n" +
" it decrease the lag which comes from\n" +
" the difference of hardware/OS.\n" +
"Usually, you should turn it ON." +
"\n"+
"Note: This setting is effetive\n" +
" only when DirectSound is used.");
this.list項目リスト.Add( this.iSystemAdjustWaves );
//this.iSystemAdjustWaves = new CItemToggle( "AdjustWaves", CDTXMania.ConfigIni.bWave再生位置自動調整機能有効,
// "サウンド再生位置自動補正:\n" +
// "ハードウェアやOSに起因するサウン\n" +
// "ドのずれを強制的に補正します。\n" +
// "BGM のように再生時間の長い音声\n" +
// "データが使用されている曲で効果が\n" +
// "あります。" +
// "\n" +
// "※ DirectSound使用時のみ有効です。",
// "Automatic wave playing position\n" +
// " adjustment feature. If you turn it ON,\n" +
// " it decrease the lag which comes from\n" +
// " the difference of hardware/OS.\n" +
// "Usually, you should turn it ON." +
// "\n"+
// "Note: This setting is effetive\n" +
// " only when DirectSound is used.");
//this.list項目リスト.Add( this.iSystemAdjustWaves );
this.iSystemVSyncWait = new CItemToggle( "VSyncWait", CDTXMania.ConfigIni.b垂直帰線待ちを行う,
"垂直帰線同期:\n画面の描画をディスプレイの垂直帰\n線中に行なう場合には ON を指定し\nます。ON にすると、ガタつきのない\n滑らかな画面描画が実現されます。",
"Turn ON to wait VSync (Vertical\n Synchronizing signal) at every\n drawings. (so FPS becomes 60)\nIf you have enough CPU/GPU power,\n the scroll would become smooth." );
Expand Down Expand Up @@ -2084,7 +2084,7 @@ private void tConfigIniへ記録する_System()
CDTXMania.ConfigIni.bSTAGEFAILED有効 = this.iSystemStageFailed.bON;
CDTXMania.ConfigIni.bランダムセレクトで子BOXを検索対象とする = this.iSystemRandomFromSubBox.bON;

CDTXMania.ConfigIni.bWave再生位置自動調整機能有効 = this.iSystemAdjustWaves.bON;
//CDTXMania.ConfigIni.bWave再生位置自動調整機能有効 = this.iSystemAdjustWaves.bON;
CDTXMania.ConfigIni.b垂直帰線待ちを行う = this.iSystemVSyncWait.bON;
CDTXMania.ConfigIni.bバッファ入力を行う = this.iSystemBufferedInput.bON;
CDTXMania.ConfigIni.bAVI有効 = this.iSystemAVI.bON;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2682,14 +2682,9 @@ protected bool t進行描画_チップ( E楽器パート ePlayMode )
this.actChara.ctクリア通常モーション = new CCounter( 0, this.actChara.arクリアモーション番号.Length - 1, ( dbUnit_clear * 2.0 ) / this.actChara.arクリアモーション番号.Length, CSound管理.rc演奏用タイマ );

this.actChara.ct通常モーション.db現在の値 = 0;

//#if C_82D982F182AF82CD82A282AF82A2
if( CDTXMania.bReiNoAreFlag ){
this.actDancer.ct通常モーション = new CCounter( 0, this.actDancer.arモーション番号_通常.Length - 1, ( dbUnit * 4.0) / this.actDancer.arモーション番号_通常.Length, CSound管理.rc演奏用タイマ );
//this.actDancer.ctモブ = new CCounter( 1.0, 16.0, (( dbUnit / 16.0 )), CSound管理.rc演奏用タイマ );
}
//#endif


if( this.actChara.nキャラクターMAX通常モーション枚数 != 0 )
{
double dbUnit_max = ( ( ( 60.0 / ( CDTXMania.stage演奏ドラム画面.actPlayInfo.dbBPM ) ) ) / this.actChara.ar黄色モーション番号.Length );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ public override void On非活性化()

public override void OnManagedリソースの作成()
{
if( CDTXMania.bReiNoAreFlag ){
//#if C_82D982F182AF82CD82A282AF82A2
this.strList = "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16";
this.strList_登場 = "0,1,2,3,4,5,6,7,8,8,8,8,8,8,8,8";
this.strList_退場 = "1,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3";
Expand Down Expand Up @@ -79,18 +77,13 @@ public override void OnManagedリソースの作成()
{
this.st投げ上げ[ i ].ct進行 = new CCounter();
}
}
//#endif

base.OnManagedリソースの作成();
}

public override void OnManagedリソースの解放()
{
//#if C_82D982F182AF82CD82A282AF82A2
CDTXMania.tテクスチャの解放( ref this.txフッター );
CDTXMania.tテクスチャの解放( ref this.txモブ );
//#endif
base.OnManagedリソースの解放();
}

Expand All @@ -102,9 +95,6 @@ public override int On進行描画()
this.b初めての進行描画 = true;
}

//#if C_82D982F182AF82CD82A282AF82A2
if( CDTXMania.bReiNoAreFlag ){

//レイヤー位置を考えて移動。
if( this.txフッター != null )
{
Expand Down Expand Up @@ -190,9 +180,6 @@ public override int On進行描画()
this.txモブ.t2D描画( CDTXMania.app.Device, 0, (( 780.0f - this.txモブ.szテクスチャサイズ.Height ) - (float)( 60.0f * Math.Sin( Math.PI * num1 / 14.0f ) )) );
}
}
}
//#endif

return base.On進行描画();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,8 @@ public override void On活性化()
double dbUnit_max_gogo = ( ( ( 60.0 / ( CDTXMania.stage演奏ドラム画面.actPlayInfo.dbBPM ) ) ) / this.actChara.ar黄色ゴーゴーモーション番号.Length );
this.actChara.ctMAXゴーゴーモーション = new CCounter( 0, this.actChara.ar黄色ゴーゴーモーション番号.Length - 1, dbUnit_max_gogo * 2, CSound管理.rc演奏用タイマ );
}

//#if C_82D982F182AF82CD82A282AF82A2
if( CDTXMania.bReiNoAreFlag )
{
this.actDancer.ct通常モーション = new CCounter( 0, this.actDancer.arモーション番号_通常.Length - 1, ( dbUnit * 4.0) / this.actDancer.arモーション番号_通常.Length, CSound管理.rc演奏用タイマ );
this.actDancer.ctモブ = new CCounter( 1.0, 16.0, ((60.0 / CDTXMania.stage演奏ドラム画面.actPlayInfo.dbBPM / 16.0 )), CSound管理.rc演奏用タイマ );
}
//#endif

//try
//{
Expand Down Expand Up @@ -347,44 +341,18 @@ public override int On進行描画()
{
this.t進行描画_背景();
}
else if( !CDTXMania.bReiNoAreFlag && !CDTXMania.ConfigIni.bAVI有効 )

if( CDTXMania.ConfigIni.bAVI有効 )
{
this.t進行描画_背景();
this.t進行描画_AVI();
}
else
{
this.actBackground.On進行描画();
this.actRollChara.On進行描画();
if( !this.bDoublePlay )
this.actDancer.On進行描画();
}

if( CDTXMania.bReiNoAreFlag )
{
if( CDTXMania.ConfigIni.bAVI有効 )
{
this.t進行描画_AVI();
}
else
{
this.actBackground.On進行描画();
this.actRollChara.On進行描画();
if( !this.bDoublePlay )
this.actDancer.On進行描画();
}
}
else
{
this.t進行描画_AVI();
}
//#if C_82D982F182AF82CD82A282AF82A2
// if( CDTXMania.ConfigIni.bAVI有効 )
// {
////#endif
// this.t進行描画_AVI();
////#if C_82D982F182AF82CD82A282AF82A2
// }
// else
// {
// this.actBackground.On進行描画();
// this.actRollChara.On進行描画();
// if( !this.bDoublePlay )
// this.actDancer.On進行描画();
// }
//#endif

if( !CDTXMania.ConfigIni.bNoInfo )
this.t進行描画_パネル文字列();
Expand Down
15 changes: 8 additions & 7 deletions DTXManiaプロジェクト/コード/全体/CConfigIni.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,8 @@ public CConfigIni()
this.bフィルイン有効 = true;
this.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = 1000;
this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = 100;
this.bWave再生位置自動調整機能有効 = true;
//this.bWave再生位置自動調整機能有効 = true;
this.bWave再生位置自動調整機能有効 = false;
this.bBGM音を発声する = true;
this.b歓声を発声する = true;
this.bScoreIniを出力する = true;
Expand Down Expand Up @@ -1536,8 +1537,8 @@ public void t書き出し( string iniファイル名 )
sw.WriteLine( "PreviewImageWait={0}", this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms );
sw.WriteLine();
#endregion
sw.WriteLine( "; Waveの再生位置自動補正(0:OFF, 1:ON)" );
sw.WriteLine( "AdjustWaves={0}", this.bWave再生位置自動調整機能有効 ? 1 : 0 );
//sw.WriteLine( "; Waveの再生位置自動補正(0:OFF, 1:ON)" );
//sw.WriteLine( "AdjustWaves={0}", this.bWave再生位置自動調整機能有効 ? 1 : 0 );
sw.WriteLine();
#region [ BGM/ドラムヒット音の再生 ]
sw.WriteLine( "; BGM の再生(0:OFF, 1:ON)" );
Expand Down Expand Up @@ -2365,10 +2366,10 @@ public void tファイルから読み込み( string iniファイル名 )
this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = C変換.n値を文字列から取得して範囲内に丸めて返( str4, 0, 0x5f5e0ff, this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms );
}
#endregion
else if( str3.Equals( "AdjustWaves" ) )
{
this.bWave再生位置自動調整機能有効 = C変換.bONorOFF( str4[ 0 ] );
}
//else if( str3.Equals( "AdjustWaves" ) )
//{
// this.bWave再生位置自動調整機能有効 = C変換.bONorOFF( str4[ 0 ] );
//}
#region [ BGM/ドラムのヒット音 ]
else if( str3.Equals( "BGMSound" ) )
{
Expand Down
3 changes: 1 addition & 2 deletions DTXManiaプロジェクト/コード/全体/CDTXMania.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ internal class CDTXMania : Game
{
// プロパティ
#region [ properties ]
public static readonly string VERSION = "Ver0.822β(170508)";
public static readonly string VERSION = "Ver0.823β(170518)";
public static readonly string SLIMDXDLL = "c_net20x86_Jun2010";
public static readonly string D3DXDLL = "d3dx9_43.dll"; // June 2010
//public static readonly string D3DXDLL = "d3dx9_42.dll"; // February 2010
Expand Down Expand Up @@ -296,7 +296,6 @@ public static CDTXVmode DTXVmode // #28821 2014.1.23 yyagi
set;
}

public static bool bReiNoAreFlag = false;
#endregion

// コンストラクタ
Expand Down
5 changes: 0 additions & 5 deletions DTXManiaプロジェクト/コード/全体/CSkin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -946,11 +946,6 @@ public void tReadSkinConfig()
//-----------------------------
#endregion
#region[ その他 ]
else if( strCommand == "COMMAND" )
{
if( strParam == "817" )
CDTXMania.bReiNoAreFlag = true;
}
#endregion
}
continue;
Expand Down
Binary file modified 実行時フォルダ/DTXManiaGR.exe
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 35 additions & 7 deletions 実行時フォルダ/readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KTT:J:A:H:2017050800
KTT:J:A:I:2017051800
TJAPlayer2 for.PC(��)

���T�v
Expand Down Expand Up @@ -135,6 +135,7 @@ TJAPlayer2
�E����g�̓���X���W��414�ȊO�̏ꍇ�A��ԉ����̃G�t�F�N�g�͏o�܂���B
�E�uCOURSE:5�v�A�܂��́uCOURSE:Tower�v�ɂ͑Ή����Ă��܂���B
�E�u,�v�����ŏ��߂��`���邱�Ƃ͂ł��܂���B
�@�Ever2017051800�ɂđΉ�


�������ڂ����r���[�ȂƂ���
Expand Down Expand Up @@ -223,10 +224,6 @@ TJAPlayer2

�E#DELAY ??
�@�E�ł��Ȃ����Ȃ�
�E#BMSCROLL
�E#HBSCROLL
�@�E�����w�薽�߂͑Ή����Ă��܂���B


���ׂ����d�l
�E�Q�[�W�̏㏸���͈ӊO�ƃK�`�B����Wiki�ɂ������f�[�^���̗p���܂����B
Expand All @@ -244,6 +241,7 @@ TJAPlayer2
���X�y�V�����T���N�X
FROM��(DTXMania����AStrokeStyle<T>����)
yyagi��(DTXMania�ێ�J��)
DD��(�ꕔ�����̉���)
TJAP�X��5th��650��(TJAP2����)
�����f�B�[��(�^�C�g����ʂ̔w�i�摜)
Music Revolver 76573��(�N���A���̃��[�V�����摜��)
Expand Down Expand Up @@ -275,8 +273,6 @@ Music Revolver 76573

���Ĕz�z�Ɋւ���
�{�̂̍Ĕz�z�A�t�A�Z���u���͎��R�ł��B
�������u�{�Ƃ��ۂ��w�i���[�h�v��L���ɂ�����Ԃ̖{�̂̔z�z�͈�؋֎~���܂��B�܂��A�e��B���R�}���h�����J���邱�Ƃ��ւ��܂��B
(������Ɋւ��Ă͓��ɐ����͂���܂���B)
�Ĕz�z������ۂ́ALicenses�t�H���_�̓�����Y��Ȃ��悤�ɂ��Ă��������B


Expand Down Expand Up @@ -310,6 +306,38 @@ Twitter:@kairera0467


���X�V����
ver.2017051800 2017/5/18
�@�\�lj�
�E�f�t�H���g�őI��������Փx���w�肷��I�v�V������lj�(mod by.DD)
�E�^�ł����[�h�lj�(�����R�[�h�𗘗p)(mod by.DD)
�ECOURSE�P��\�L�ɑΉ�(Easy,Normal,Hard,Oni,Edit,Tower �啶�����������݉�) (mod by.DD)
�E�u�܂��V��łˁv��ʂ̗L��/�����I�v�V�����lj�(mod by.DD)

�@�\����
�E�{�ƕ��w�i���[�h�����

�d�l�ύX
�EDirectSound���̉�����΍��AdjustWaves���ꎞ�I�ɓP���B
�E#HBSCROLL,#BMSCROLL�������ݒ肷��悤�ύX(mod by.DD)
�E���߂ƒl�𕪗����鎞�A�l�̑O�ɃX�y�[�X��]�v�ȕ������L��ꍇ�͍폜����悤�ɂ���(mod by.DD)
�E�w�b�_���ɂ��郁��(���߈ȊO�̕�����)���폜����悤�ύX(mod by.DD)
�E��A�ł̏�������������Ă��Ȃ��̂ŕ��D�A�ň����ɕύX(mod by.DD)
�E���t��ʂ̃f�o�b�O���Ɍ��݂�SCOREMODE��SCROLLMODE��lj�(mod by.DD)
�ESCOREMODE���w�肳��Ă��镈�ʂ��Đ������ۂ�SCOREMODE��Config.ini�ɔ��f���Ȃ��悤�ύX(mod by.DD)

�s��C��
�E�蓮��SCROLLMODE��؂�ւ������ُ̈���C��(mod by.DD)
�E����t�H���_���ɂ��镡����TJA�𐳏�ɔF�����Ȃ��o�O���C���B(mod by.DD)
�E�J���}�݂̂̍s��S�x��(0,)�Ƃ��ĔF������悤�C��(mod by.DD)
�E���߂ƒl�̊ԂɃX�y�[�X�������Ă��ǂݍ��߂�悤�ɏC��(mod by.DD)

�@�\�p�~
�E�B���R�}���h�̔p�~
�E�R���t�B�O�t�@�C���ɂ��SCROLLMODE�̐ݒ��p�~�B(mod by.DD)

���̑�
�EVisualStudio 2015�ȍ~�ł̃r���h�ɑΉ�

2017050800 �f�t�H���g�X�L���̃t�H���_�����uDefault�v�ɕύX�B
�B���R�}���h�̒lj��B(�����I)
2017041600 �f�t�H���g�X�L���̉摜�����������Ă����̂Œlj�
Expand Down

0 comments on commit e1f57e1

Please sign in to comment.