Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-21 04:47:15 +01:00
Code Releases Activity

Exit menu button, game exit screen, fix dan intro animation

Browse Source
This commit is contained in:
0aubsq 2021-11-03 03:13:16 +01:00
parent 1229f14d06
commit 4b2e82777d
4 changed files with 66 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,17 +127,17 @@ namespace TJAPlayer3
Entry_Donchan_Normal[i] = TxC(TITLE + @"Donchan_Normal\" + i.ToString() + ".png");
}
for(int i = 0; i < 6; i++)
for(int i = 0; i < 7; i++)
{
ModeSelect_Bar[i] = TxC(TITLE + @"ModeSelect_Bar_" + i.ToString() + ".png");
}
for(int i = 0; i < 6; i++)
for(int i = 0; i < 7; i++)
{
ModeSelect_Bar_Chara[i] = TxC(TITLE + @"ModeSelect_Bar_Chara_" + i.ToString() + ".png");
}
ModeSelect_Bar[6] = TxC(TITLE + @"ModeSelect_Bar_Overlay.png");
ModeSelect_Bar[7] = TxC(TITLE + @"ModeSelect_Bar_Overlay.png");
#endregion
@ -942,8 +942,8 @@ namespace TJAPlayer3
public CTexture[] Entry_Player = new CTexture[3];
public CTexture[] Donchan_Entry = new CTexture[44];
public CTexture[] Entry_Donchan_Normal = new CTexture[13];
public CTexture[] ModeSelect_Bar = new CTexture[7];
public CTexture[] ModeSelect_Bar_Chara = new CTexture[6];
public CTexture[] ModeSelect_Bar = new CTexture[8];
public CTexture[] ModeSelect_Bar_Chara = new CTexture[7];
#endregion

95
TJAPlayer3/Stages/02.Title/CStageタイトル.cs
View File

@ -298,38 +298,26 @@ namespace TJAPlayer3
}
if (bモード選択)
{
if (this.n現在の選択行モード選択 == (int)E戻り値.CONFIG - 1)
{
TJAPlayer3.Skin.sound決定音.t再生する();
n現在の選択行モード選択 = (int)E戻り値.CONFIG - 1;
this.actFO.tフェードアウト開始(0, 500);
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
}
else if (this.n現在の選択行モード選択 == (int)E戻り値.DANGAMESTART - 1)
bool operationSucceded = false;
if (this.n現在の選択行モード選択 == (int)E戻り値.DANGAMESTART - 1)
{
if (TJAPlayer3.Songs管理.list曲ルート_Dan.Count > 0 && TJAPlayer3.ConfigIni.nPlayerCount != 2)
{
TJAPlayer3.Skin.sound決定音.t再生する();
n現在の選択行モード選択 = (int)E戻り値.DANGAMESTART - 1;
this.actFO.tフェードアウト開始(0, 500);
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
}
else
{
TJAPlayer3.Skin.soundError.t再生する();
}
if (TJAPlayer3.Songs管理.list曲ルート_Dan.Count > 0 && TJAPlayer3.ConfigIni.nPlayerCount != 2)
operationSucceded = true;
}
else if (this.n現在の選択行モード選択 == (int)E戻り値.GAMESTART - 1)
{
TJAPlayer3.Skin.sound決定音.t再生する();
n現在の選択行モード選択 = (int)E戻り値.GAMESTART - 1;
this.actFO.tフェードアウト開始(0, 500);
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
}
else
else if (this.n現在の選択行モード選択 == (int)E戻り値.GAMESTART - 1
|| this.n現在の選択行モード選択 == (int)E戻り値.EXIT - 1
|| this.n現在の選択行モード選択 == (int)E戻り値.CONFIG - 1)
operationSucceded = true;
if (operationSucceded == true)
{
TJAPlayer3.Skin.soundError.t再生する();
TJAPlayer3.Skin.sound決定音.t再生する();
this.actFO.tフェードアウト開始(0, 500);
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
}
else
TJAPlayer3.Skin.soundError.t再生する();
}
}
@ -583,8 +571,25 @@ namespace TJAPlayer3
if(this.stModeBar[i].n現在存在している行 == 1 && ctBarMove.n現在の値 >= 150)
{
int BarAnime = ctBarAnimeIn.n現在の値 >= (int)(26 * 16.6f) + 100 ? 0 : ctBarAnimeIn.n現在の値 >= (int)(26 * 16.6f) && ctBarAnimeIn.n現在の値 <= (int)(26 * 16.6f) + 100 ? 40 + (int)((ctBarAnimeIn.n現在の値 - (26 * 16.6)) / 100f * 71f) : ctBarAnimeIn.n現在の値 < (int)(26 * 16.6f) ? 40 : 111;
int BarAnime1 = BarAnime == 0 ? ctBarMove.n現在の値 >= 150 ? 40 + (int)((ctBarMove.n現在の値 - 150) / 100f * 71f) : ctBarMove.n現在の値 < 150 ? 40 : 111 : 0;
int BarAnime1 = BarAnime == 0 ? ctBarMove.n現在の値 >= 150 ? 40 + (int)((ctBarMove.n現在の値 - 150) / 100f * 71f) : ctBarMove.n現在の値 < 150 ? 40 : 111 : 0;
#region [Disable visualy 1p specific buttons if 2p]
if (restricted1p[i] == true && TJAPlayer3.ConfigIni.nPlayerCount > 1)
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = Color.DarkGray;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = Color.DarkGray;
this.stModeBar[i].BarTexture.color4 = Color.DarkGray;
}
else
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = Color.White;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = Color.White;
this.stModeBar[i].BarTexture.color4 = Color.White;
}
#endregion
this.stModeBar[i].BarTexture.Opacity = (int)((ctBarAnimeIn.n現在の値 - (16 * 16.6f)) * 1.23f);
this.stModeBar[i].BarTexture.vc拡大縮小倍率.Y = 1.0f;
@ -617,15 +622,8 @@ namespace TJAPlayer3
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].t2D中心基準描画(TJAPlayer3.app.Device, 640 + TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 4 - 114 + anime, 360,
new Rectangle(TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 2, 0, TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Height));
// TJAPlayer3.Tx.ModeSelect_Bar_Text[i].Opacity = 255;
// TJAPlayer3.Tx.ModeSelect_Bar_Text[i]?.t2D中心基準描画(TJAPlayer3.app.Device, 640, 355 - BarAnimeCount / 1.5f, new Rectangle(0, 0, 642, 122));
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i))?.t2D中心基準描画(TJAPlayer3.app.Device, 631, 379 - BarAnimeCount / 1.5f);
// TJAPlayer3.Tx.ModeSelect_Bar_Text[i].Opacity = (int)(BarAnimeCount * 2.55f);
// TJAPlayer3.Tx.ModeSelect_Bar_Text[i]?.t2D中心基準描画(TJAPlayer3.app.Device, 640, 355 + 132 / 2, new Rectangle(0, 122, 642, 148));
if (i < this.ttkBoxText.Length)
{
CTexture currentText = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkBoxText[i]);
@ -659,6 +657,23 @@ namespace TJAPlayer3
#endregion
#region [Disable visualy 1p specific buttons if 2p]
if (restricted1p[i] == true && TJAPlayer3.ConfigIni.nPlayerCount > 1)
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = Color.DarkGray;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = Color.DarkGray;
this.stModeBar[i].BarTexture.color4 = Color.DarkGray;
}
else
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = Color.White;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = Color.White;
this.stModeBar[i].BarTexture.color4 = Color.White;
}
#endregion
BarMoveX = ctBarMove.n現在の値 <= 100 ? (int)(pos.X - posSelect.X) - (int)(ctBarMove.n現在の値 / 100f * (pos.X - posSelect.X)) : 0;
BarMoveY = ctBarMove.n現在の値 <= 100 ? (int)(pos.Y - posSelect.Y) - (int)(ctBarMove.n現在の値 / 100f * (pos.Y - posSelect.Y)) : 0;
@ -667,9 +682,6 @@ namespace TJAPlayer3
this.stModeBar[i].BarTexture.t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
// TJAPlayer3.Tx.ModeSelect_Bar_Text[i].Opacity = 255;
// TJAPlayer3.Tx.ModeSelect_Bar_Text[i]?.t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY - 13, new Rectangle(0, 0, 642, 122));
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i))?.t2D中心基準描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX + 311, pos.Y + BarAnimeY - BarMoveY + 72);
}
}
@ -817,8 +829,9 @@ namespace TJAPlayer3
private Point[] ptモード選択バー座標 =
{ new Point(290, 107), new Point(319, 306), new Point(356, 513) };
private int nbModes = 6;
private STModeBar[] stModeBar = new STModeBar[6];
private int nbModes = 7;
private STModeBar[] stModeBar = new STModeBar[7];
private bool[] restricted1p = { false, true, true, false, true, false, false };
private struct STModeBar
{

6
TJAPlayer3/Stages/05.DaniSelect/CStage段位選択.cs
View File

@ -69,7 +69,7 @@ namespace TJAPlayer3
int stamp = this.段位リスト.ctDaniIn.n現在の値;
float zoom = Math.Max(1f, 5000 / (float)stamp);
float zoom = Math.Min(1.14f, Math.Max(1f, (float)Math.Pow(stamp / 3834f, 0.5f)));
TJAPlayer3.Tx.Dani_Background.vc拡大縮小倍率.X = zoom;
TJAPlayer3.Tx.Dani_Background.vc拡大縮小倍率.Y = zoom;
@ -106,8 +106,8 @@ namespace TJAPlayer3
int quarter = TJAPlayer3.Tx.Dani_Dan_Text.szテクスチャサイズ.Width / 4;
int[] xAxis = { 250, 1030 };
int[] yAxis = { 148, 572 };
int[] xAxis = { 300, 980 };
int[] yAxis = { 198, 522 };
int[] appearStamps = { 1645, 2188, 2646, 3152 };
for (int i = 0; i < 4; i++)

64
TJAPlayer3/Stages/09.Ending/CStage終了.cs
View File

@ -79,16 +79,13 @@ namespace TJAPlayer3
}
public override int On進行描画()
{
/*
if( !TJAPlayer3.ConfigIni.bEndingAnime ) //2017.01.27 DD
{
return 1;
}
//if( this.ds背景 != null )
//{
// this.ds背景.t再生開始();
// this.ds背景.t現時点における最新のスナップイメージをTextureに転写する( this.tx背景 );
//}
*/
if( !base.b活性化してない )
{
if( base.b初めての進行描画 )
@ -101,60 +98,7 @@ namespace TJAPlayer3
this.ct時間稼ぎ.t進行();
if( TJAPlayer3.Tx.Exit_Background != null )
{
//if( this.ds背景 != null )
//{
// if( this.ds背景.b上下反転 )
// this.tx背景.t2D上下反転描画( CDTXMania.app.Device, 0, 0 );
// else
// this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );
//}
//else
TJAPlayer3.Tx.Exit_Background.t2D描画( TJAPlayer3.app.Device, 0, 0 );
}
// if( this.ct時間稼ぎ.n現在の値 < 2000 )
// {
// if( this.tx文字 != null )
// {
// this.tx文字2.fZ軸中心回転 = -0.8f;
// this.tx文字3.fZ軸中心回転 = ( -1.6f * ( this.ct時間稼ぎ.n現在の値 / 1280.0f ) ) >= -1.6f ? ( -1.6f * ( this.ct時間稼ぎ.n現在の値 / 1280.0f ) ) : -1.6f ;
// this.tx文字2.vc拡大縮小倍率 = new Vector3( 4.0f, 4.0f, 1.0f );
// this.tx文字3.vc拡大縮小倍率 = new Vector3( 4.0f, 4.0f, 1.0f );
// this.tx文字2.t2D描画( CDTXMania.app.Device, 1100 - (int)( 1.30f * this.ct時間稼ぎ.n現在の値), 1600 - (int)( 1.6f * this.ct時間稼ぎ.n現在の値), new System.Drawing.Rectangle( 0, 0, 620, 92 ) );
// this.tx文字3.t2D描画( CDTXMania.app.Device, -250 + (int)( 1.10f * this.ct時間稼ぎ.n現在の値), 1600 - (int)( 1.6f * this.ct時間稼ぎ.n現在の値), new System.Drawing.Rectangle( 0, 92, 620, 94 ) );
// }
// }
// else
// {
// if( this.tx文字 != null )
// {
// this.tx文字2.fZ軸中心回転 = 0f;
// this.tx文字3.fZ軸中心回転 = 0f;
// this.tx文字2.vc拡大縮小倍率 = new Vector3( 1.3f, 1.3f, 1.0f );
// this.tx文字3.vc拡大縮小倍率 = new Vector3( 1.3f, 1.3f, 1.0f );
// this.tx文字2.t2D描画( CDTXMania.app.Device, 480, 376, new System.Drawing.Rectangle( 0, 0, 620, 92 ) );
// this.tx文字3.t2D描画( CDTXMania.app.Device, 500, 486, new System.Drawing.Rectangle( 0, 92, 620, 95 ) );
// this.tx文字.t2D描画( CDTXMania.app.Device, 662, 613, new System.Drawing.Rectangle( 0, 187, 620, 44 ) );
// }
// if( this.tx白 != null )
//{
// this.tx白.n透明度 = ( 2255 + 300 ) - ( this.ct時間稼ぎ.n現在の値 );
// for( int i = 0; i <= ( SampleFramework.GameWindowSize.Width / 64 ); i++ )
// {
// for( int j = 0; j <= ( SampleFramework.GameWindowSize.Height / 64 ); j++ )
// {
// this.tx白.t2D描画( CDTXMania.app.Device, i * 64, j * 64 );
// }
// }
//}
// }
TJAPlayer3.Tx.Exit_Background?.t2D描画( TJAPlayer3.app.Device, 0, 0 );
if( this.ct時間稼ぎ.b終了値に達した && !TJAPlayer3.Skin.soundゲーム終了音.b再生中 )
{