Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-01-18 17:14:07 +01:00
Code Releases Activity

特訓モード画像変更 2 (#194)

Browse Source 
* 特訓

* 修正

Frameのコード書いてなかった...

* Update CAct演奏DrumsMtaiko.cs

誤字ってた

* Update CAct演奏Drumsレーン太鼓.cs

またミスを見つけた

* 直しました’
This commit is contained in:
OtinkoMann 2022-05-06 12:21:00 +09:00 committed by GitHub
parent eced54814e
commit fbe10c7e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 65 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TJAPlayer3/Stages/01.StartUp/TextureLoader.cs
View File

@ -417,16 +417,19 @@ namespace TJAPlayer3
#region Taiko
Taiko_Background = new CTexture[5];
Taiko_Background = new CTexture[7];
Taiko_Background[0] = TxC(GAME + TAIKO + @"1P_Background.png");
Taiko_Background[1] = TxC(GAME + TAIKO + @"2P_Background.png");
Taiko_Background[2] = TxC(GAME + TAIKO + @"Dan_Background.png");
Taiko_Background[3] = TxC(GAME + TAIKO + @"Tower_Background.png");
Taiko_Background[4] = TxC(GAME + TAIKO + @"1P_Background_Right.png");
Taiko_Frame = new CTexture[3];
Taiko_Background[5] = TxC(GAME + TAIKO + @"1P_Background_Tokkun.png");
Taiko_Background[6] = TxC(GAME + TAIKO + @"2P_Background_Tokkun.png");
Taiko_Frame = new CTexture[4];
Taiko_Frame[0] = TxC(GAME + TAIKO + @"1P_Frame.png");
Taiko_Frame[1] = TxC(GAME + TAIKO + @"2P_Frame.png");
Taiko_Frame[2] = TxC(GAME + TAIKO + @"Tower_Frame.png");
Taiko_Frame[3] = TxC(GAME + TAIKO + @"Tokkun_Frame.png");
Taiko_PlayerNumber = new CTexture[2];
Taiko_PlayerNumber[0] = TxC(GAME + TAIKO + @"1P_PlayerNumber.png");
Taiko_PlayerNumber[1] = TxC(GAME + TAIKO + @"2P_PlayerNumber.png");

48
TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs
View File

@ -90,15 +90,24 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Taiko_Background[2]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower)
TJAPlayer3.Tx.Taiko_Background[3]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
else
else if (!TJAPlayer3.ConfigIni.bTokkunMode
|| TJAPlayer3.Tx.Taiko_Background[5] == null
|| TJAPlayer3.Tx.Taiko_Background[6] == null)
{
if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay)
TJAPlayer3.Tx.Taiko_Background[1]?.t2D描画(TJAPlayer3.app.Device, 0, 360);
if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1)
TJAPlayer3.Tx.Taiko_Background[4]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
if (TJAPlayer3.P1IsBlue())
TJAPlayer3.Tx.Taiko_Background[4]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
else
TJAPlayer3.Tx.Taiko_Background[0]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
}
else {
if (TJAPlayer3.P1IsBlue())
TJAPlayer3.Tx.Taiko_Background[6]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
else
TJAPlayer3.Tx.Taiko_Background[5]?.t2D描画(TJAPlayer3.app.Device, 0, 184);
}
if(TJAPlayer3.Tx.Taiko_Base != null )
{
@ -205,39 +214,10 @@ namespace TJAPlayer3
}
for( int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++ )
{
// 2018/7/1 一時的にオプション画像の廃止。オプション画像については後日作り直します。(AioiLight)
//if( !CDTXMania.ConfigIni.bNoInfo && CDTXMania.Skin.eDiffDispMode != E難易度表示タイプ.mtaikoに画像で表示 )
//{
// this.txオプションパネル_HS.t2D描画( CDTXMania.app.Device, 0, 230, new Rectangle( 0, this.nHS * 44, 162, 44 ) );
// switch( CDTXMania.ConfigIni.eRandom.Taiko )
// {
// case Eランダムモード.RANDOM:
// if( this.txオプションパネル_RANMIR != null )
// this.txオプションパネル_RANMIR.t2D描画( CDTXMania.app.Device, 0, 264, new Rectangle( 0, 0, 162, 44 ) );
// break;
// case Eランダムモード.HYPERRANDOM:
// if( this.txオプションパネル_RANMIR != null )
// this.txオプションパネル_RANMIR.t2D描画( CDTXMania.app.Device, 0, 264, new Rectangle( 0, 88, 162, 44 ) );
// break;
// case Eランダムモード.SUPERRANDOM:
// if( this.txオプションパネル_RANMIR != null )
// this.txオプションパネル_RANMIR.t2D描画( CDTXMania.app.Device, 0, 264, new Rectangle( 0, 132, 162, 44 ) );
// break;
// case Eランダムモード.MIRROR:
// if( this.txオプションパネル_RANMIR != null )
// this.txオプションパネル_RANMIR.t2D描画( CDTXMania.app.Device, 0, 264, new Rectangle( 0, 44, 162, 44 ) );
// break;
// }
// if( CDTXMania.ConfigIni.eSTEALTH == Eステルスモード.STEALTH )
// this.txオプションパネル_特殊.t2D描画( CDTXMania.app.Device, 0, 300, new Rectangle( 0, 0, 162, 44 ) );
// else if( CDTXMania.ConfigIni.eSTEALTH == Eステルスモード.DORON )
// this.txオプションパネル_特殊.t2D描画( CDTXMania.app.Device, 0, 300, new Rectangle( 0, 44, 162, 44 ) );
//}
{
ModIcons.tDisplayMods(80, 236 + i * 190, i);
if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null)
{
TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].t2D描画(TJAPlayer3.app.Device,

86
TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsゲージ.cs
View File

@ -183,16 +183,16 @@ namespace TJAPlayer3
*/
// No gauge if tower
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower)
return 0;
#region [Gauge base]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower || TJAPlayer3.ConfigIni.bTokkunMode)
return 0;
#region [Gauge base]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
{
if (TJAPlayer3.P1IsBlue())
{
TJAPlayer3.Tx.Gauge_Dan[4]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
if (TJAPlayer3.P1IsBlue())
{
TJAPlayer3.Tx.Gauge_Dan[4]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
}
else
{
@ -214,23 +214,23 @@ namespace TJAPlayer3
}
}
else
{
if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay)
{
TJAPlayer3.Tx.Gauge_Base[1]?.t2D描画(TJAPlayer3.app.Device, 492, 532, new Rectangle(0, 0, 700, 44));
{
if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay)
{
TJAPlayer3.Tx.Gauge_Base[1]?.t2D描画(TJAPlayer3.app.Device, 492, 532, new Rectangle(0, 0, 700, 44));
}
if (TJAPlayer3.P1IsBlue())
{
TJAPlayer3.Tx.Gauge_Base[2]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
if (TJAPlayer3.P1IsBlue())
{
TJAPlayer3.Tx.Gauge_Base[2]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
}
else
{
TJAPlayer3.Tx.Gauge_Base[0]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
else
{
TJAPlayer3.Tx.Gauge_Base[0]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
}
}
}
#endregion
#region [ Gauge 1P ]
if( TJAPlayer3.Tx.Gauge[0] != null )
@ -238,7 +238,7 @@ namespace TJAPlayer3
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
{
if (TJAPlayer3.P1IsBlue())
if (TJAPlayer3.P1IsBlue())
TJAPlayer3.Tx.Gauge_Dan[5]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
else
TJAPlayer3.Tx.Gauge_Dan[1]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
@ -246,25 +246,25 @@ namespace TJAPlayer3
for (int i = 0; i < TJAPlayer3.DTX.Dan_C.Length; i++)
{
if (TJAPlayer3.DTX.Dan_C[i] != null && TJAPlayer3.DTX.Dan_C[i].GetExamType() == Exam.Type.Gauge && db現在のゲージ値[0] >= TJAPlayer3.DTX.Dan_C[i].GetValue(false))
{
TJAPlayer3.Tx.Gauge_Dan[3].Opacity = 255;
TJAPlayer3.Tx.Gauge_Dan[3]?.t2D描画(TJAPlayer3.app.Device, 492 + (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * 14), 144, new Rectangle(0, 0, nRectX - (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * 14), 44));
int Opacity = 0;
if (this.ctGaugeFlash.n現在の値 <= 365) Opacity = 0;
else if (this.ctGaugeFlash.n現在の値 <= 448) Opacity = (int)((this.ctGaugeFlash.n現在の値 - 365) / 83f * 255f);
{
TJAPlayer3.Tx.Gauge_Dan[3].Opacity = 255;
TJAPlayer3.Tx.Gauge_Dan[3]?.t2D描画(TJAPlayer3.app.Device, 492 + (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * 14), 144, new Rectangle(0, 0, nRectX - (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * 14), 44));
int Opacity = 0;
if (this.ctGaugeFlash.n現在の値 <= 365) Opacity = 0;
else if (this.ctGaugeFlash.n現在の値 <= 448) Opacity = (int)((this.ctGaugeFlash.n現在の値 - 365) / 83f * 255f);
else if (this.ctGaugeFlash.n現在の値 <= 531) Opacity = 255 - (int)((this.ctGaugeFlash.n現在の値 - 448) / 83f * 255f);
TJAPlayer3.Tx.Gauge_Dan[3].Opacity = Opacity;
TJAPlayer3.Tx.Gauge_Dan[3]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * 14, 44));
break;
}
}
}
}
else
{
if (TJAPlayer3.P1IsBlue())
if (TJAPlayer3.P1IsBlue())
TJAPlayer3.Tx.Gauge[2]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
else
TJAPlayer3.Tx.Gauge[0]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
@ -277,17 +277,17 @@ namespace TJAPlayer3
else if (this.ctGaugeFlash.n現在の値 <= 448) Opacity = (int)((this.ctGaugeFlash.n現在の値 - 365) / 83f * 255f);
else if (this.ctGaugeFlash.n現在の値 <= 531) Opacity = 255 - (int)((this.ctGaugeFlash.n現在の値 - 448) / 83f * 255f);
if (TJAPlayer3.Tx.Gauge_Flash != null)
{
TJAPlayer3.Tx.Gauge_Flash.Opacity = Opacity;
TJAPlayer3.Tx.Gauge_Flash.t2D描画(TJAPlayer3.app.Device, 492, 144);
if (TJAPlayer3.Tx.Gauge_Flash != null)
{
TJAPlayer3.Tx.Gauge_Flash.Opacity = Opacity;
TJAPlayer3.Tx.Gauge_Flash.t2D描画(TJAPlayer3.app.Device, 492, 144);
}
}
if (TJAPlayer3.Tx.Gauge_Line[0] != null )
{
{
#region [Rainbow]
if ( this.db現在のゲージ値[ 0 ] >= 100.0 )
@ -309,11 +309,11 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szテクスチャサイズ.Width,
TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan ? TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szテクスチャサイズ.Height - 22 : TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szテクスチャサイズ.Height));
}
}
}
#endregion
TJAPlayer3.Tx.Gauge_Line[0].t2D描画( TJAPlayer3.app.Device, 492, 144 );
}
@ -385,7 +385,7 @@ namespace TJAPlayer3
int[] nSoulFire = new int[] { 52, 443, 0, 0 };
for( int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++ )
{
if( this.db現在のゲージ値[ i ] >= 100.0 )
if( this.db現在のゲージ値[ i ] >= 100.0)
{
this.ct炎.t進行Loop();
TJAPlayer3.Tx.Gauge_Soul_Fire.t2D描画( TJAPlayer3.app.Device, 1112, nSoulFire[ i ], new Rectangle( 230 * ( this.ct炎.n現在の値 ), 0, 230, 230 ) );
@ -398,7 +398,7 @@ namespace TJAPlayer3
int[] nSoulY = new int[] { 125, 516, 0, 0 };
for( int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++ )
{
if( this.db現在のゲージ値[ i ] >= 80.0 )
if( this.db現在のゲージ値[ i ] >= 80.0)
{
TJAPlayer3.Tx.Gauge_Soul.t2D描画( TJAPlayer3.app.Device, 1184, nSoulY[ i ], new Rectangle( 0, 0, 80, 80 ) );
}

4
TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsレーン太鼓.cs
View File

@ -658,7 +658,9 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Taiko_Frame[0] != null)
{
// Tower frame (without tamashii jauge) if playing a tower chart
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower && TJAPlayer3.Tx.Taiko_Frame[2] != null)
if (TJAPlayer3.ConfigIni.bTokkunMode == true && TJAPlayer3.Tx.Taiko_Frame[3] != null)
TJAPlayer3.Tx.Taiko_Frame[3]?.t2D描画(TJAPlayer3.app.Device, 329, 136);
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower && TJAPlayer3.Tx.Taiko_Frame[2] != null)
TJAPlayer3.Tx.Taiko_Frame[2]?.t2D描画(TJAPlayer3.app.Device, 329, 136);
else
TJAPlayer3.Tx.Taiko_Frame[0]?.t2D描画(TJAPlayer3.app.Device, 329, 136);

BIN
Test/System/SimpleStyle/Graphics/5_Game/6_Taiko/1P_Background_Tokkun.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Test/System/SimpleStyle/Graphics/5_Game/6_Taiko/2P_Background_Tokkun.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Test/System/SimpleStyle/Graphics/5_Game/6_Taiko/Tokkun_Frame.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB