Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-15 11:23:26 +01:00
Code Releases Activity

Add score plate base for 2P (still empty yet), coin display for 2P and small fix

Browse Source
This commit is contained in:
0aubsq 2021-11-16 21:18:18 +01:00
parent 1880c3b229
commit 76779fa804
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TJAPlayer3/Stages/05.SongSelect/CActSelectPopupMenu.cs
View File

@ -326,18 +326,18 @@ namespace TJAPlayer3
#region [ ポップアップメニュー 背景描画 ]
if ( TJAPlayer3.Tx.Menu_Title != null )
{
TJAPlayer3.Tx.Menu_Title.t2D描画( TJAPlayer3.app.Device, 160, 40 );
TJAPlayer3.Tx.Menu_Title.t2D描画( TJAPlayer3.app.Device, 460, 40 );
}
#endregion
#region [ ソートメニュータイトル描画 ]
int x = 240, y = 44;
int x = 540, y = 44;
stqMenuTitle.txName.t2D描画( TJAPlayer3.app.Device, x, y );
#endregion
#region [ カーソル描画 ]
if ( TJAPlayer3.Tx.Menu_Highlight != null )
{
int height = 32;
int curX = 180;
int curX = 480;
int curY = 46 + ( height * ( this.n現在の選択行 + 1 ) );
TJAPlayer3.Tx.Menu_Highlight.t2D描画( TJAPlayer3.app.Device, curX, curY, new Rectangle( 0, 0, 16, 32 ) );
curX += 0x10;
@ -358,7 +358,7 @@ namespace TJAPlayer3
if ( lciMenuItems[ i ].txName != null )
{
int height = lciMenuItems[ i ].rectName.Height;
lciMenuItems[ i ].txName.t2D描画( TJAPlayer3.app.Device, 180, 77 + i * 32 );
lciMenuItems[ i ].txName.t2D描画( TJAPlayer3.app.Device, 480, 77 + i * 32 );
}
bool bValueBold = (bItemBold || (i == nItemSelecting && bIsSelectingIntItem)) ? true : false;
@ -391,7 +391,7 @@ namespace TJAPlayer3
{
using (var ctStr = TJAPlayer3.tテクスチャの生成(bmpStr, false))
{
ctStr.t2D描画(TJAPlayer3.app.Device, 330, 77 + i * 32);
ctStr.t2D描画(TJAPlayer3.app.Device, 630, 77 + i * 32);
}
}
}

2
TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs
View File

@ -545,7 +545,7 @@ namespace TJAPlayer3
#region [Reset nodes]
for (int s = 0; s <= (int)Difficulty.Edit; s++)
for (int s = 0; s <= (int)Difficulty.Edit + 1; s++)
{
CScorePad SPRef = ScorePads[s];

20
TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs
View File

@ -909,27 +909,37 @@ namespace TJAPlayer3
#region [Pad displayables]
int currentPad = (int)Difficulty.Edit + 1;
int[] currentPads = new int[2] { (int)Difficulty.Edit + 1, (int)Difficulty.Edit + 1 };
//int currentPad = (int)Difficulty.Edit + 1;
if (TJAPlayer3.stage選曲.act難易度選択画面.bIsDifficltSelect)
{
currentPad = Math.Max(0, TJAPlayer3.stage選曲.act難易度選択画面.n現在の選択行[0] - 2);
if (TJAPlayer3.stage選曲.act難易度選択画面.n現在の選択行[0] >= 2)
currentPads[0] = TJAPlayer3.stage選曲.act難易度選択画面.n現在の選択行[0] - 2;
if (TJAPlayer3.ConfigIni.nPlayerCount > 1 && TJAPlayer3.stage選曲.act難易度選択画面.n現在の選択行[1] > 2)
currentPads[1] = TJAPlayer3.stage選曲.act難易度選択画面.n現在の選択行[1] - 2;
}
TJAPlayer3.Tx.SongSelect_Table[currentPad]?.t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.SongSelect_Table[currentPads[0]]?.t2D描画(TJAPlayer3.app.Device, 0, 0);
if (TJAPlayer3.ConfigIni.nPlayerCount > 1)
TJAPlayer3.Tx.SongSelect_Table[currentPads[1]]?.t2D描画(TJAPlayer3.app.Device, 1034, 0);
// Current board
for (int i = 0; i < 10; i++)
{
tBoardNumberDraw(this.ptBoardNumber[i].X - 10, this.ptBoardNumber[i].Y, i < 7 ?
this.act曲リスト.ScorePads[currentPad].ScoreRankCount[i].ToString()
: this.act曲リスト.ScorePads[currentPad].CrownCount[i - 7].ToString());
this.act曲リスト.ScorePads[currentPads[0]].ScoreRankCount[i].ToString()
: this.act曲リスト.ScorePads[currentPads[0]].CrownCount[i - 7].ToString());
}
if (TJAPlayer3.NamePlateConfig.data.Medals[0] >= 0)
tBoardNumberDraw(this.ptBoardNumber[10].X - 10, this.ptBoardNumber[10].Y, TJAPlayer3.NamePlateConfig.data.Medals[0].ToString());
if (TJAPlayer3.NamePlateConfig.data.Medals[1] >= 0 && TJAPlayer3.ConfigIni.nPlayerCount > 1)
tBoardNumberDraw(this.ptBoardNumber[10].X - 10 + 1140, this.ptBoardNumber[10].Y, TJAPlayer3.NamePlateConfig.data.Medals[1].ToString());
#endregion
if (act難易度選択画面.bOption[0]) actPlayOption.On進行描画(0);