Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-01-19 01:24:08 +01:00
Code Releases Activity

Fix gauges for 2P side, blue gauge for dan if right, blue explosion if right

Browse Source
This commit is contained in:
0aubsq 2021-12-14 06:45:13 +01:00
parent 92e7ef3c33
commit 07ea72af5c
4 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TJAPlayer3/Common/TJAPlayer3.cs
View File

@ -400,6 +400,11 @@ namespace TJAPlayer3
return 0;
}
public static bool P1IsBlue()
{
return (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1);
}
#endregion
// コンストラクタ

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

@ -435,16 +435,23 @@ namespace TJAPlayer3
Taiko_Combo_Effect = TxC(GAME + TAIKO + @"Combo_Effect.png");
Taiko_Combo_Text = TxC(GAME + TAIKO + @"Combo_Text.png");
#endregion
#region ゲージ
Gauge = new CTexture[2];
Gauge = new CTexture[3];
Gauge[0] = TxC(GAME + GAUGE + @"1P.png");
Gauge[1] = TxC(GAME + GAUGE + @"2P.png");
Gauge_Base = new CTexture[2];
Gauge[2] = TxC(GAME + GAUGE + @"1P_Right.png");
Gauge_Base = new CTexture[3];
Gauge_Base[0] = TxC(GAME + GAUGE + @"1P_Base.png");
Gauge_Base[1] = TxC(GAME + GAUGE + @"2P_Base.png");
Gauge_Base[2] = TxC(GAME + GAUGE + @"1P_Base_Right.png");
Gauge_Line = new CTexture[2];
Gauge_Line[0] = TxC(GAME + GAUGE + @"1P_Line.png");
Gauge_Line[1] = TxC(GAME + GAUGE + @"2P_Line.png");
TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @"Rainbow\"));
if (TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn != 0)
{
@ -464,12 +471,15 @@ namespace TJAPlayer3
Gauge_Dan_Rainbow[i] = TxC(GAME + DANC + @"Rainbow\" + i.ToString() + ".png");
}
}
Gauge_Dan = new CTexture[4];
Gauge_Dan = new CTexture[6];
Gauge_Dan[0] = TxC(GAME + GAUGE + @"1P_Dan_Base.png");
Gauge_Dan[1] = TxC(GAME + GAUGE + @"1P_Dan.png");
Gauge_Dan[2] = TxC(GAME + GAUGE + @"1P_Dan_Clear_Base.png");
Gauge_Dan[3] = TxC(GAME + GAUGE + @"1P_Dan_Clear.png");
Gauge_Dan[4] = TxC(GAME + GAUGE + @"1P_Dan_Base_Right.png");
Gauge_Dan[5] = TxC(GAME + GAUGE + @"1P_Dan_Right.png");
Gauge_Soul = TxC(GAME + GAUGE + @"Soul.png");
Gauge_Flash = TxC(GAME + GAUGE + @"Flash.png");
@ -477,6 +487,7 @@ namespace TJAPlayer3
Gauge_Soul_Explosion = new CTexture[2];
Gauge_Soul_Explosion[0] = TxC(GAME + GAUGE + @"1P_Explosion.png");
Gauge_Soul_Explosion[1] = TxC(GAME + GAUGE + @"2P_Explosion.png");
#endregion
#region 吹き出し
Balloon_Combo = new CTexture[2];

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

@ -200,16 +200,23 @@ 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.Dan)
{
if (TJAPlayer3.Tx.Gauge_Dan[0] != null)
{
TJAPlayer3.Tx.Gauge_Dan[0].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
{
TJAPlayer3.Tx.Gauge_Dan[0]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
}
if (TJAPlayer3.Tx.Gauge_Dan[2] != null)
{
for (int i = 0; i < TJAPlayer3.DTX.Dan_C.Length; i++)
@ -225,31 +232,34 @@ namespace TJAPlayer3
}
}
else
{
if (TJAPlayer3.Tx.Gauge_Base[0] != null)
{
TJAPlayer3.Tx.Gauge_Base[0].t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
}
if (TJAPlayer3.Tx.Gauge_Base[1] != null)
{
if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay)
{
if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1)
{
TJAPlayer3.Tx.Gauge_Base[1].t2D上下反転描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, 700, 44));
}
else if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay)
{
TJAPlayer3.Tx.Gauge_Base[1].t2D描画(TJAPlayer3.app.Device, 492, 532, new Rectangle(0, 0, 700, 44));
}
TJAPlayer3.Tx.Gauge_Base[1]?.t2D描画(TJAPlayer3.app.Device, 492, 532, new Rectangle(0, 0, 700, 44));
}
}
#region[ ゲージ1P ]
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));
}
}
#endregion
#region [ Gauge 1P ]
if( TJAPlayer3.Tx.Gauge[0] != null )
{
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
{
TJAPlayer3.Tx.Gauge_Dan[1]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
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));
for (int i = 0; i < TJAPlayer3.DTX.Dan_C.Length; i++)
{
@ -272,10 +282,10 @@ namespace TJAPlayer3
}
else
{
if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1)
TJAPlayer3.Tx.Gauge[1].t2D上下反転描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
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));
TJAPlayer3.Tx.Gauge[0]?.t2D描画(TJAPlayer3.app.Device, 492, 144, new Rectangle(0, 0, nRectX, 44));
}
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && db現在のゲージ値[0] >= 80.0 && db現在のゲージ値[0] < 100.0)
@ -290,8 +300,10 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Gauge_Line[0] != null )
{
if( this.db現在のゲージ値[ 0 ] >= 100.0 )
{
#region [Rainbow]
if ( this.db現在のゲージ値[ 0 ] >= 100.0 )
{
this.ct虹アニメ.t進行Loop();
this.ct虹透明度.t進行Loop();
@ -310,10 +322,15 @@ 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));
}
}
TJAPlayer3.Tx.Gauge_Line[0].t2D描画( TJAPlayer3.app.Device, 492, 144 );
}
#endregion
TJAPlayer3.Tx.Gauge_Line[0].t2D描画( TJAPlayer3.app.Device, 492, 144 );
}
#region[ 「クリア」文字 ]
#region[ 「Clear」icon ]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan)
{
if (this.db現在のゲージ値[0] >= 80.0)
@ -326,9 +343,13 @@ namespace TJAPlayer3
}
}
#endregion
}
#endregion
#region[ ゲージ2P ]
#region [ Gauge 2P ]
if( TJAPlayer3.stage演奏ドラム画面.bDoublePlay && TJAPlayer3.Tx.Gauge[1] != null )
{
TJAPlayer3.Tx.Gauge[1].t2D描画( TJAPlayer3.app.Device, 492, 532, new Rectangle( 0, 0, nRectX2P, 44 ) );

6
TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsチップエフェクト.cs
View File

@ -79,15 +79,13 @@ namespace TJAPlayer3
switch (st[i].nプレイヤー)
{
case 0:
if (TJAPlayer3.Tx.Gauge_Soul_Explosion[0] != null)
TJAPlayer3.Tx.Gauge_Soul_Explosion[0].t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], new Rectangle(st[i].ct進行.n現在の値 * TJAPlayer3.Skin.Game_Effect_NotesFlash[0], 0, TJAPlayer3.Skin.Game_Effect_NotesFlash[0], TJAPlayer3.Skin.Game_Effect_NotesFlash[1]));
TJAPlayer3.Tx.Gauge_Soul_Explosion[TJAPlayer3.P1IsBlue() ? 1 : 0]?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], new Rectangle(st[i].ct進行.n現在の値 * TJAPlayer3.Skin.Game_Effect_NotesFlash[0], 0, TJAPlayer3.Skin.Game_Effect_NotesFlash[0], TJAPlayer3.Skin.Game_Effect_NotesFlash[1]));
if (this.st[i].ctChipEffect.n現在の値 < 13)
TJAPlayer3.Tx.Notes.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], new Rectangle(st[i].Lane * 130, 390, 130, 130));
break;
case 1:
if (TJAPlayer3.Tx.Gauge_Soul_Explosion[1] != null)
TJAPlayer3.Tx.Gauge_Soul_Explosion[1].t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], new Rectangle(st[i].ct進行.n現在の値 * TJAPlayer3.Skin.Game_Effect_NotesFlash[0], 0, TJAPlayer3.Skin.Game_Effect_NotesFlash[0], TJAPlayer3.Skin.Game_Effect_NotesFlash[1]));
TJAPlayer3.Tx.Gauge_Soul_Explosion[1]?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], new Rectangle(st[i].ct進行.n現在の値 * TJAPlayer3.Skin.Game_Effect_NotesFlash[0], 0, TJAPlayer3.Skin.Game_Effect_NotesFlash[0], TJAPlayer3.Skin.Game_Effect_NotesFlash[1]));
if (this.st[i].ctChipEffect.n現在の値 < 13)
TJAPlayer3.Tx.Notes.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], new Rectangle(st[i].Lane * 130, 390, 130, 130));
break;