Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-12 01:50:47 +01:00
Code Releases Activity

Modifications within the code structure to prepare the DaniDoujou results screen update

Browse Source
This commit is contained in:
0aubsq 2021-10-06 15:36:44 +02:00
parent 118bef9705
commit 3d9d6e6be9
7 changed files with 310 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -3,6 +3,8 @@ TJAPlayer3-Develop-ReWriteのフォーク, 太鼓の達人 ニジイロVerを切
# In progress
Ver. 0.3.3
Will update this readme later.
This Taiko no Tatsujin simulator is a touhourenren's TJAPlayer3-Develop-ReWrite fork, fixing multiple bugs and adding multiple features to make it closer than the arcade Nijiiro version and planning to add various original features later (Like PS2 Taiko Towers type charts handling, an adventure/story mode, a way to unlock puchicharas/charts with coins earned after each play and so on)
@ -11,6 +13,8 @@ I can't share the skin for obvious reasons (Wouldn't take the risk of getting su
But you can reconstitute the skin yourself following the `README_SKIN.md` guide.
(`README_SKIN.md` guide will be updated at each skin update, please take a look at it each time you download an update to be sure you don't miss any required asset)
Self-made assets will be distributed separately.
# Short term To-Do List

16
README_SKIN.md
View File

@ -36,6 +36,10 @@ Sound/Result/CrownIn.ogg => Sounds/ResultScreen/CrownIn.ogg
Sound/Result/RankIn.ogg => Sounds/ResultScreen/RankIn.ogg
Sound/Result/Donchan/Donchan_Clear.ogg => Sounds/ResultScreen/Donchan_Clear.ogg
Sound/Result/Donchan/Donchan_Miss.ogg => Sounds/ResultScreen/Donchan_Miss.ogg
## Ver 0.4 ##
Sound/Dan/Dan_Result.ogg => Sounds/Dan/Dan_Result.ogg
```
## Third step (Second booster)
@ -61,6 +65,18 @@ Sounds/DiffSelect.ogg => Sounds/DiffSelect.ogg
Sounds/SongDecide.ogg => Sounds/SongDecide.ogg
```
## Fourth Step (Third booster) (From Ver 0.4 (DanichiDoujou update))
- Download and extract BetterTaikoCatsCaffe from the https://tjadataba.se/shimyu/ website
- Copy and paste the following files/folders (Resize to the annoted size if necessary) (Left starts at `BetterTaikoCatsCaffe/System/Base`, Right at `TJAPlayer3-Develop-BSQ/Test/System/0.JpnNijiiro`)
```
Sounds/Result/Dan/Failure.ogg => Sounds/Dan/Failure.ogg
Sounds/Result/Dan/Success.ogg => Sounds/Dan/Success.ogg
Sounds/Result/Dan/Better_Success.ogg => Sounds/Dan/Better_Success.ogg
```
## Last step (Additional assets)
- For >= 11 stars charts, within the `3_SongSelect\Difficulty_Select` folder copy `Difficulty_Star.png` and paste it to `Difficulty_Star_Red.png`, you can use a color filter app online to tint it in red.

8
TJAPlayer3/Common/CSkin.cs
View File

@ -335,6 +335,8 @@ namespace TJAPlayer3
public Cシステムサウンド bgmリザルトイン音 = null;
public Cシステムサウンド bgmリザルト音 = null;
public Cシステムサウンド bgmDanResult = null;
public Cシステムサウンド bgmタイトル = null;
public Cシステムサウンド bgmタイトルイン = null;
public Cシステムサウンド bgm選曲画面 = null;
@ -703,6 +705,8 @@ namespace TJAPlayer3
this.bgmリザルトイン音 = new Cシステムサウンド(@"Sounds\BGM\Result_In.ogg", false, false, true, ESoundGroup.SongPlayback);
this.bgmリザルト音 = new Cシステムサウンド(@"Sounds\BGM\Result.ogg", true, false, true, ESoundGroup.SongPlayback);
this.bgmDanResult = new Cシステムサウンド(@"Sounds\Dan\Dan_Result.ogg", false, false, true, ESoundGroup.SongPlayback);
this.soundCrownIn = new Cシステムサウンド(@"Sounds\ResultScreen\CrownIn.ogg", false, false, false, ESoundGroup.SoundEffect);
this.soundRankIn = new Cシステムサウンド(@"Sounds\ResultScreen\RankIn.ogg", false, false, false, ESoundGroup.SoundEffect);
@ -2907,8 +2911,8 @@ namespace TJAPlayer3
public int[] Result_NamePlate_Y = new int[] { 611, 611 };
public int[] Result_Dan = new int[] { 500, 500 };
public int[] Result_Dan_XY = new int[] { 100, 0 };
public int[] Result_Dan_Plate_XY = new int[] { 149, 416 };
public int[] Result_Dan_XY = new int[] { 0, 420 };
public int[] Result_Dan_Plate_XY = new int[] { 149, 149 };
#endregion
#region Font
public int Font_Edge_Ratio = 30;

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

@ -19,6 +19,7 @@ namespace TJAPlayer3
const string GAME = @"5_Game\";
const string RESULT = @"6_Result\";
const string EXIT = @"7_Exit\";
const string DANRESULT = @"7_DanResult\";
// InGame
const string CHARA = @"1_Chara\";
@ -766,10 +767,16 @@ namespace TJAPlayer3
#region 7_終了画面
Exit_Background = TxC(EXIT + @"Background.png");
#endregion
}
public void DisposeTexture()
#region [8_DanResults]
DanResult_Background = TxC(DANRESULT + @"Background.png");
#endregion
}
public void DisposeTexture()
{
foreach (var tex in listTexture)
{
@ -1104,9 +1111,15 @@ namespace TJAPlayer3
#region 7_終了画面
public CTexture Exit_Background/* , */
/*Exit_Text */;
/*Exit_Text */;
#endregion
#region [8_DanResults]
public CTexture DanResult_Background;
#endregion
#region [ 解放用 ]
public List<CTexture> listTexture = new List<CTexture>();
#endregion

28
TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs
View File

@ -223,8 +223,6 @@ namespace TJAPlayer3
this.PuchiChara.IdleAnimation();
Dan_Plate = TJAPlayer3.tテクスチャの生成(Path.GetDirectoryName(TJAPlayer3.DTX.strファイル名の絶対パス) + @"\Dan_Plate.png");
base.OnManagedリソースの作成();
}
}
@ -232,7 +230,6 @@ namespace TJAPlayer3
{
if (!base.b活性化してない)
{
Dan_Plate?.Dispose();
base.OnManagedリソースの解放();
}
}
@ -695,29 +692,6 @@ namespace TJAPlayer3
#endregion
}
else
{
#region 段位時リザルト
switch (TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C))
{
case Exam.Status.Failure:
TJAPlayer3.Tx.Result_Dan?.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Result_Dan_XY[0], TJAPlayer3.Skin.Result_Dan_XY[1], new Rectangle(0, 0, TJAPlayer3.Skin.Result_Dan[0], TJAPlayer3.Skin.Result_Dan[1]));
break;
case Exam.Status.Success:
TJAPlayer3.Tx.Result_Dan?.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Result_Dan_XY[0], TJAPlayer3.Skin.Result_Dan_XY[1], new Rectangle(TJAPlayer3.Skin.Result_Dan[0], 0, TJAPlayer3.Skin.Result_Dan[0], TJAPlayer3.Skin.Result_Dan[1]));
break;
case Exam.Status.Better_Success:
TJAPlayer3.Tx.Result_Dan?.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Result_Dan_XY[0], TJAPlayer3.Skin.Result_Dan_XY[1], new Rectangle(TJAPlayer3.Skin.Result_Dan[0] * 2, 0, TJAPlayer3.Skin.Result_Dan[0], TJAPlayer3.Skin.Result_Dan[1]));
break;
default:
break;
}
Dan_Plate?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Result_Dan_Plate_XY[0], TJAPlayer3.Skin.Result_Dan_Plate_XY[1]);
#endregion
}
if (!this.ct表示用.b終了値に達した)
{
@ -783,8 +757,6 @@ namespace TJAPlayer3
private readonly ST文字位置[] st大文字位置;
private ST文字位置[] stScoreFont;
private CTexture Dan_Plate;
private void t小文字表示(int x, int y, string str)
{
foreach (char ch in str)

436
TJAPlayer3/Stages/08.Result/CStage結果.cs
View File

@ -58,7 +58,10 @@ namespace TJAPlayer3
public override void On活性化()
{
TJAPlayer3.Skin.bgmリザルトイン音.t再生する();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower)
TJAPlayer3.Skin.bgmリザルトイン音.t再生する();
Trace.TraceInformation("結果ステージを活性化します。");
Trace.Indent();
b最近遊んだ曲追加済み = false;
@ -275,6 +278,8 @@ namespace TJAPlayer3
ctShine_Plate = new CCounter(0, 1000, 1, TJAPlayer3.Timer);
ctWork_Plate = new CCounter(0, 4000, 1, TJAPlayer3.Timer);
Dan_Plate = TJAPlayer3.tテクスチャの生成(Path.GetDirectoryName(TJAPlayer3.DTX.strファイル名の絶対パス) + @"\Dan_Plate.png");
base.OnManagedリソースの作成();
}
@ -286,11 +291,13 @@ namespace TJAPlayer3
if (this.ct登場用 != null)
{
this.ct登場用 = null;
}
//CDTXMania.tテクスチャの解放( ref this.tx背景 );
//CDTXMania.tテクスチャの解放( ref this.tx上部パネル );
//CDTXMania.tテクスチャの解放( ref this.tx下部パネル );
//CDTXMania.tテクスチャの解放( ref this.txオプションパネル );
}
//CDTXMania.tテクスチャの解放( ref this.tx背景 );
//CDTXMania.tテクスチャの解放( ref this.tx上部パネル );
//CDTXMania.tテクスチャの解放( ref this.tx下部パネル );
//CDTXMania.tテクスチャの解放( ref this.txオプションパネル );
Dan_Plate?.Dispose();
base.OnManagedリソースの解放();
}
}
@ -307,10 +314,12 @@ namespace TJAPlayer3
this.ct登場用 = new CCounter(0, 100, 5, TJAPlayer3.Timer);
this.actFI.tフェードイン開始();
base.eフェーズID = CStage.Eフェーズ.共通_フェードイン;
if (this.rResultSound != null)
{
this.rResultSound.t再生を開始する();
}
base.b初めての進行描画 = false;
}
this.bアニメが完了 = true;
@ -329,198 +338,274 @@ namespace TJAPlayer3
// 描画
if (!b音声再生 && !TJAPlayer3.Skin.bgmリザルトイン音.b再生中)
{
TJAPlayer3.Skin.bgmリザルト音.t再生する();
b音声再生 = true;
}
if (TJAPlayer3.Tx.Result_Background != null)
{
int CloudType = 0;
float MountainAppearValue = 2000 + (this.actParameterPanel.ctゲージアニメ.n終了値 * 66) + 8360 - 85;
if (this.actParameterPanel.ct全体進行.n現在の値 >= MountainAppearValue)
{
#region [Mountain Bump]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower)
{
#region [Ensou game result screen]
if (this.st演奏記録.Drums.fゲージ >= 80.0)
{
TJAPlayer3.Tx.Result_Background[1].Opacity = (this.actParameterPanel.ct全体進行.n現在の値 - (10275 + ((int)this.actParameterPanel.ctゲージアニメ.n終了値 * 66))) * 3;
TJAPlayer3.Tx.Result_Mountain[1].Opacity = (this.actParameterPanel.ct全体進行.n現在の値 - (10275 + ((int)this.actParameterPanel.ctゲージアニメ.n終了値 * 66))) * 3;
TJAPlayer3.Tx.Result_Mountain[0].Opacity = 255 - (this.actParameterPanel.ct全体進行.n現在の値 - (10275 + ((int)this.actParameterPanel.ctゲージアニメ.n終了値 * 66))) * 3;
if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 90)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 1.0f - (float)Math.Sin((float)this.actParameterPanel.ctMountain_ClearIn.n現在の値 * (Math.PI / 180)) * 0.18f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 225)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 0.82f + (float)Math.Sin((float)(this.actParameterPanel.ctMountain_ClearIn.n現在の値 - 90) / 1.5f * (Math.PI / 180)) * 0.58f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 245)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 1.4f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 335)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 0.9f + (float)Math.Sin((float)(this.actParameterPanel.ctMountain_ClearIn.n現在の値 - 155) * (Math.PI / 180)) * 0.5f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 515)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 0.9f + (float)Math.Sin((float)(this.actParameterPanel.ctMountain_ClearIn.n現在の値 - 335) * (Math.PI / 180)) * 0.4f;
}
if (!b音声再生 && !TJAPlayer3.Skin.bgmリザルトイン音.b再生中)
{
TJAPlayer3.Skin.bgmリザルト音.t再生する();
b音声再生 = true;
}
if (TJAPlayer3.Tx.Result_Background != null)
{
int CloudType = 0;
float MountainAppearValue = 2000 + (this.actParameterPanel.ctゲージアニメ.n終了値 * 66) + 8360 - 85;
if (this.actParameterPanel.ct全体進行.n現在の値 >= MountainAppearValue)
{
#region [Mountain Bump]
if (this.st演奏記録.Drums.fゲージ >= 80.0)
{
TJAPlayer3.Tx.Result_Background[1].Opacity = (this.actParameterPanel.ct全体進行.n現在の値 - (10275 + ((int)this.actParameterPanel.ctゲージアニメ.n終了値 * 66))) * 3;
TJAPlayer3.Tx.Result_Mountain[1].Opacity = (this.actParameterPanel.ct全体進行.n現在の値 - (10275 + ((int)this.actParameterPanel.ctゲージアニメ.n終了値 * 66))) * 3;
TJAPlayer3.Tx.Result_Mountain[0].Opacity = 255 - (this.actParameterPanel.ct全体進行.n現在の値 - (10275 + ((int)this.actParameterPanel.ctゲージアニメ.n終了値 * 66))) * 3;
if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 90)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 1.0f - (float)Math.Sin((float)this.actParameterPanel.ctMountain_ClearIn.n現在の値 * (Math.PI / 180)) * 0.18f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 225)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 0.82f + (float)Math.Sin((float)(this.actParameterPanel.ctMountain_ClearIn.n現在の値 - 90) / 1.5f * (Math.PI / 180)) * 0.58f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 245)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 1.4f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 335)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 0.9f + (float)Math.Sin((float)(this.actParameterPanel.ctMountain_ClearIn.n現在の値 - 155) * (Math.PI / 180)) * 0.5f;
}
else if (this.actParameterPanel.ctMountain_ClearIn.n現在の値 <= 515)
{
TJAPlayer3.Tx.Result_Mountain[1].vc拡大縮小倍率.Y = 0.9f + (float)Math.Sin((float)(this.actParameterPanel.ctMountain_ClearIn.n現在の値 - 335) * (Math.PI / 180)) * 0.4f;
}
}
#endregion
}
else
{
TJAPlayer3.Tx.Result_Background[1].Opacity = 0;
TJAPlayer3.Tx.Result_Mountain[0].Opacity = 255;
TJAPlayer3.Tx.Result_Mountain[1].Opacity = 0;
}
#endregion
}
else
{
TJAPlayer3.Tx.Result_Background[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.Result_Background[1].t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.Result_Mountain[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.Result_Mountain[1].t2D拡大率考慮下基準描画(TJAPlayer3.app.Device, 0, 720);
TJAPlayer3.Tx.Result_Background[1].Opacity = 0;
TJAPlayer3.Tx.Result_Mountain[0].Opacity = 255;
TJAPlayer3.Tx.Result_Mountain[1].Opacity = 0;
}
TJAPlayer3.Tx.Result_Background[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.Result_Background[1].t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.Result_Mountain[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
TJAPlayer3.Tx.Result_Mountain[1].t2D拡大率考慮下基準描画(TJAPlayer3.app.Device, 0, 720);
// TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, ctShine_Plate.n現在の値.ToString());
// TJAPlayer3.act文字コンソール.tPrint(10, 10, C文字コンソール.Eフォント種別.白, this.actParameterPanel.ct全体進行.n現在の値.ToString());
// TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, ctShine_Plate.n現在の値.ToString());
// TJAPlayer3.act文字コンソール.tPrint(10, 10, C文字コンソール.Eフォント種別.白, this.actParameterPanel.ct全体進行.n現在の値.ToString());
#region [Background Clouds]
#region [Background Clouds]
if (this.st演奏記録.Drums.fゲージ >= 80.0 && this.actParameterPanel.ct全体進行.n現在の値 >= MountainAppearValue)
{
CloudType = Math.Min(255, Math.Max(0, (int)this.actParameterPanel.ct全体進行.n現在の値 - (int)MountainAppearValue));
}
for (int i = 10; i >= 0; i--)
{
int CurMoveRed = (int)((double)CloudMaxMove[i] * Math.Tanh((double)this.actParameterPanel.ct全体進行.n現在の値 / 10000));
int CurMoveGold = (int)((double)CloudMaxMove[i] * Math.Tanh(Math.Max(0, (double)this.actParameterPanel.ct全体進行.n現在の値 - (double)MountainAppearValue) / 10000));
TJAPlayer3.Tx.Result_Cloud.vc拡大縮小倍率.X = 0.65f;
TJAPlayer3.Tx.Result_Cloud.vc拡大縮小倍率.Y = 0.65f;
TJAPlayer3.Tx.Result_Cloud.Opacity = CloudType;
TJAPlayer3.Tx.Result_Cloud.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, CloudXPos[i] - CurMoveGold, CloudYPos[i], new Rectangle(i * 1200, 360, 1200, 360));
TJAPlayer3.Tx.Result_Cloud.Opacity = 255 - CloudType;
TJAPlayer3.Tx.Result_Cloud.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, CloudXPos[i] - CurMoveRed, CloudYPos[i], new Rectangle(i * 1200, 0, 1200, 360));
}
#endregion
if (TJAPlayer3.stage結果.st演奏記録[0].fゲージ >= 80.0f && this.actParameterPanel.ct全体進行.n現在の値 >= MountainAppearValue)
{
#region [Background shines]
int ShineTime = (int)ctShine_Plate.n現在の値;
int Quadrant500 = ShineTime % 500;
for (int i = 0; i < 6; i++)
{
if (i < 2 && ShineTime >= 500 || i >= 2 && ShineTime < 500)
TJAPlayer3.Tx.Result_Shine.Opacity = 0;
else if (Quadrant500 >= ShinePFade && Quadrant500 <= 500 - ShinePFade)
TJAPlayer3.Tx.Result_Shine.Opacity = 255;
else
TJAPlayer3.Tx.Result_Shine.Opacity = (255 * Math.Min(Quadrant500, 500 - Quadrant500)) / ShinePFade;
TJAPlayer3.Tx.Result_Shine.vc拡大縮小倍率.X = ShinePSize[i];
TJAPlayer3.Tx.Result_Shine.vc拡大縮小倍率.Y = ShinePSize[i];
TJAPlayer3.Tx.Result_Shine.t2D中心基準描画(TJAPlayer3.app.Device, ShinePXPos[i] + 80, ShinePYPos[i]);
}
#endregion
#region [Fireworks]
// Primary pop
if (this.actParameterPanel.ct全体進行.n現在の値 <= MountainAppearValue + 1000)
{
for (int i = 0; i < 3; i++)
{
if (this.actParameterPanel.ct全体進行.n現在の値 <= MountainAppearValue + 255)
{
int TmpTimer = (int)(this.actParameterPanel.ct全体進行.n現在の値 - MountainAppearValue);
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f * ((float)TmpTimer / 225f);
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f * ((float)TmpTimer / 225f);
}
else
{
int TmpTimer = Math.Max(0, (2 * 255) - (int)(this.actParameterPanel.ct全体進行.n現在の値 - MountainAppearValue - 255));
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer / 2;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f;
}
TJAPlayer3.Tx.Result_Work[i].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, WorksPosX[i], WorksPosY[i]);
}
}
else
{
ctWork_Plate.t進行Loop();
for (int i = 0; i < 3; i++)
{
int TmpStamp = WorksTimeStamp[i];
if (ctWork_Plate.n現在の値 <= TmpStamp + 255)
{
int TmpTimer = (int)(ctWork_Plate.n現在の値 - TmpStamp);
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f * ((float)TmpTimer / 225f);
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f * ((float)TmpTimer / 225f);
}
else
{
int TmpTimer = Math.Max(0, (2 * 255) - (int)(ctWork_Plate.n現在の値 - TmpStamp - 255));
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer / 2;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f;
}
TJAPlayer3.Tx.Result_Work[i].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, WorksPosX[i], WorksPosY[i]);
}
}
#endregion
}
if (this.st演奏記録.Drums.fゲージ >= 80.0 && this.actParameterPanel.ct全体進行.n現在の値 >= MountainAppearValue)
{
CloudType = Math.Min(255, Math.Max(0, (int)this.actParameterPanel.ct全体進行.n現在の値 - (int)MountainAppearValue));
}
for (int i = 10; i >= 0; i--)
{
int CurMoveRed = (int)((double)CloudMaxMove[i] * Math.Tanh((double)this.actParameterPanel.ct全体進行.n現在の値 / 10000));
int CurMoveGold = (int)((double)CloudMaxMove[i] * Math.Tanh(Math.Max(0, (double)this.actParameterPanel.ct全体進行.n現在の値 - (double)MountainAppearValue) / 10000));
if (this.ct登場用.b進行中 && (TJAPlayer3.Tx.Result_Header != null))
{
double num2 = ((double)this.ct登場用.n現在の値) / 100.0;
double num3 = Math.Sin(Math.PI / 2 * num2);
num = ((int)(TJAPlayer3.Tx.Result_Header.sz画像サイズ.Height * num3)) - TJAPlayer3.Tx.Result_Header.sz画像サイズ.Height;
}
else
{
num = 0;
}
TJAPlayer3.Tx.Result_Cloud.vc拡大縮小倍率.X = 0.65f;
TJAPlayer3.Tx.Result_Cloud.vc拡大縮小倍率.Y = 0.65f;
TJAPlayer3.Tx.Result_Cloud.Opacity = CloudType;
if (!b音声再生 && !TJAPlayer3.Skin.bgmリザルトイン音.b再生中)
{
TJAPlayer3.Skin.bgmリザルト音.t再生する();
b音声再生 = true;
}
TJAPlayer3.Tx.Result_Cloud.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, CloudXPos[i] - CurMoveGold, CloudYPos[i], new Rectangle(i * 1200, 360, 1200, 360));
TJAPlayer3.Tx.Result_Cloud.Opacity = 255 - CloudType;
TJAPlayer3.Tx.Result_Cloud.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, CloudXPos[i] - CurMoveRed, CloudYPos[i], new Rectangle(i * 1200, 0, 1200, 360));
if (TJAPlayer3.Tx.Result_Header != null)
{
TJAPlayer3.Tx.Result_Header.t2D描画(TJAPlayer3.app.Device, 0, 0);
}
#endregion
if (TJAPlayer3.stage結果.st演奏記録[0].fゲージ >= 80.0f && this.actParameterPanel.ct全体進行.n現在の値 >= MountainAppearValue)
{
}
else
{
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
{
#region [Background shines]
#region [DaniDoujou result screen]
int ShineTime = (int)ctShine_Plate.n現在の値;
int Quadrant500 = ShineTime % 500;
for (int i = 0; i < 6; i++)
if (!b音声再生 && !TJAPlayer3.Skin.bgmDanResult.b再生中)
{
if (i < 2 && ShineTime >= 500 || i >= 2 && ShineTime < 500)
TJAPlayer3.Tx.Result_Shine.Opacity = 0;
else if (Quadrant500 >= ShinePFade && Quadrant500 <= 500 - ShinePFade)
TJAPlayer3.Tx.Result_Shine.Opacity = 255;
else
TJAPlayer3.Tx.Result_Shine.Opacity = (255 * Math.Min(Quadrant500, 500 - Quadrant500)) / ShinePFade;
TJAPlayer3.Tx.Result_Shine.vc拡大縮小倍率.X = ShinePSize[i];
TJAPlayer3.Tx.Result_Shine.vc拡大縮小倍率.Y = ShinePSize[i];
TJAPlayer3.Tx.Result_Shine.t2D中心基準描画(TJAPlayer3.app.Device, ShinePXPos[i] + 80, ShinePYPos[i]);
TJAPlayer3.Skin.bgmDanResult.t再生する();
b音声再生 = true;
}
TJAPlayer3.Tx.DanResult_Background.t2D描画(TJAPlayer3.app.Device, 0, 0);
#region [DanPlate]
// To add : Animation at 1 sec
Dan_Plate?.t2D中心基準描画(TJAPlayer3.app.Device, 138, 220);
#endregion
#region [Fireworks]
// Primary pop
if (this.actParameterPanel.ct全体進行.n現在の値 <= MountainAppearValue + 1000)
{
for (int i = 0; i < 3; i++)
{
if (this.actParameterPanel.ct全体進行.n現在の値 <= MountainAppearValue + 255)
{
int TmpTimer = (int)(this.actParameterPanel.ct全体進行.n現在の値 - MountainAppearValue);
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f * ((float)TmpTimer / 225f);
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f * ((float)TmpTimer / 225f);
}
else
{
int TmpTimer = Math.Max(0, (2 * 255) - (int)(this.actParameterPanel.ct全体進行.n現在の値 - MountainAppearValue - 255));
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer / 2;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f;
}
TJAPlayer3.Tx.Result_Work[i].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, WorksPosX[i], WorksPosY[i]);
}
}
else
{
ctWork_Plate.t進行Loop();
for (int i = 0; i < 3; i++)
{
int TmpStamp = WorksTimeStamp[i];
if (ctWork_Plate.n現在の値 <= TmpStamp + 255)
{
int TmpTimer = (int)(ctWork_Plate.n現在の値 - TmpStamp);
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f * ((float)TmpTimer / 225f);
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f * ((float)TmpTimer / 225f);
}
else
{
int TmpTimer = Math.Max(0, (2 * 255) - (int)(ctWork_Plate.n現在の値 - TmpStamp - 255));
TJAPlayer3.Tx.Result_Work[i].Opacity = TmpTimer / 2;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.X = 0.6f;
TJAPlayer3.Tx.Result_Work[i].vc拡大縮小倍率.Y = 0.6f;
}
TJAPlayer3.Tx.Result_Work[i].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, WorksPosX[i], WorksPosY[i]);
}
// Placeholder
switch (TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C))
{
case Exam.Status.Failure:
TJAPlayer3.Tx.Result_Dan?.t2D描画(TJAPlayer3.app.Device, -80, 180, new Rectangle(0, 0, TJAPlayer3.Skin.Result_Dan[0], TJAPlayer3.Skin.Result_Dan[1]));
break;
case Exam.Status.Success:
TJAPlayer3.Tx.Result_Dan?.t2D描画(TJAPlayer3.app.Device, -80, 180, new Rectangle(TJAPlayer3.Skin.Result_Dan[0], 0, TJAPlayer3.Skin.Result_Dan[0], TJAPlayer3.Skin.Result_Dan[1]));
break;
case Exam.Status.Better_Success:
TJAPlayer3.Tx.Result_Dan?.t2D描画(TJAPlayer3.app.Device, -80, 180, new Rectangle(TJAPlayer3.Skin.Result_Dan[0] * 2, 0, TJAPlayer3.Skin.Result_Dan[0], TJAPlayer3.Skin.Result_Dan[1]));
break;
default:
break;
}
if (!b音声再生 && !TJAPlayer3.Skin.bgmDanResult.b再生中)
{
TJAPlayer3.Skin.bgmDanResult.t再生する();
b音声再生 = true;
}
#endregion
}
else
{
#region [Tower result screen]
}
if (this.ct登場用.b進行中 && (TJAPlayer3.Tx.Result_Header != null))
{
double num2 = ((double)this.ct登場用.n現在の値) / 100.0;
double num3 = Math.Sin(Math.PI / 2 * num2);
num = ((int)(TJAPlayer3.Tx.Result_Header.sz画像サイズ.Height * num3)) - TJAPlayer3.Tx.Result_Header.sz画像サイズ.Height;
}
else
{
num = 0;
}
if (!b音声再生 && !TJAPlayer3.Skin.bgmリザルトイン音.b再生中)
{
TJAPlayer3.Skin.bgmリザルト音.t再生する();
b音声再生 = true;
}
if (TJAPlayer3.Tx.Result_Header != null)
{
TJAPlayer3.Tx.Result_Header.t2D描画(TJAPlayer3.app.Device, 0, 0);
}
#endregion
}
}
if (this.actParameterPanel.On進行描画() == 0)
{
@ -535,7 +620,10 @@ namespace TJAPlayer3
#region ネームプレート
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{
TJAPlayer3.NamePlate.tNamePlateDraw(28, 621, i);
// To change while implementing the 2P result screen
TJAPlayer3.NamePlate.tNamePlateDraw(28, 621, 0);
// TJAPlayer3.NamePlate.tNamePlateDraw(28, 621, i);
}
#endregion
@ -591,6 +679,7 @@ namespace TJAPlayer3
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
this.eフェードアウト完了時の戻り値 = E戻り値.完了;
TJAPlayer3.Skin.bgmリザルト音.t停止する();
TJAPlayer3.Skin.bgmDanResult.t停止する();
TJAPlayer3.Skin.sound決定音.t再生する();
}
}
@ -728,11 +817,14 @@ namespace TJAPlayer3
private float[] ShinePSize = { 0.44f, 0.6f, 0.4f, 0.15f, 0.35f, 0.6f };
private int ShinePFade = 100;
// Fireworks informatins
// Fireworks informations
private CCounter ctWork_Plate;
private int[] WorksPosX = { 800, 900, 1160 };
private int[] WorksPosY = { 435, 185, 260 };
private int[] WorksTimeStamp = { 1000, 2000, 3000 };
private int[] WorksTimeStamp = { 1000, 2000, 3000 };
// Dan informations
private CTexture Dan_Plate;
private CCounter ctAutoReturn;
//private CTexture txオプションパネル;

2
Test/System

@ -1 +1 @@
Subproject commit 1fa7e28b3da2d0bac4f34b1125d866e1f866db5e
Subproject commit e01331dafed845940b747a9e7432acc07dc88f97