Use utf-8 with bom for all .cs files (#156)
This commit is contained in:
parent
e51541bd1e
commit
e6c30cd5f9
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace SampleFramework
|
namespace SampleFramework
|
||||||
{
|
{
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
Binary file not shown.
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Created by WHMHammer on Feb. 14th, 2022
|
// Created by WHMHammer on Feb. 14th, 2022
|
||||||
// Translated from CLang_en.cs
|
// Translated from CLang_en.cs
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using FDK;
|
using FDK;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@ -6,7 +6,7 @@ using System.Threading.Tasks;
|
|||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using FDK;
|
using FDK;
|
||||||
using SharpDX;
|
using SharpDX;
|
||||||
using static TJAPlayer3.CActSelect曲リスト;
|
using static TJAPlayer3.CActSelect曲リスト;
|
||||||
|
|
||||||
using Rectangle = System.Drawing.Rectangle;
|
using Rectangle = System.Drawing.Rectangle;
|
||||||
using RectangleF = System.Drawing.RectangleF;
|
using RectangleF = System.Drawing.RectangleF;
|
||||||
@ -18,22 +18,22 @@ namespace TJAPlayer3
|
|||||||
{
|
{
|
||||||
public CStageHeya()
|
public CStageHeya()
|
||||||
{
|
{
|
||||||
base.eステージID = Eステージ.Heya;
|
base.eステージID = Eステージ.Heya;
|
||||||
base.eフェーズID = CStage.Eフェーズ.共通_通常状態;
|
base.eフェーズID = CStage.Eフェーズ.共通_通常状態;
|
||||||
|
|
||||||
base.list子Activities.Add(this.actFOtoTitle = new CActFIFOBlack());
|
base.list子Activities.Add(this.actFOtoTitle = new CActFIFOBlack());
|
||||||
|
|
||||||
base.list子Activities.Add(this.PuchiChara = new PuchiChara());
|
base.list子Activities.Add(this.PuchiChara = new PuchiChara());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public override void On活性化()
|
public override void On活性化()
|
||||||
{
|
{
|
||||||
if (base.b活性化してる)
|
if (base.b活性化してる)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
base.eフェーズID = CStage.Eフェーズ.共通_通常状態;
|
base.eフェーズID = CStage.Eフェーズ.共通_通常状態;
|
||||||
this.eフェードアウト完了時の戻り値 = E戻り値.継続;
|
this.eフェードアウト完了時の戻り値 = E戻り値.継続;
|
||||||
|
|
||||||
ctDonchan_In = new CCounter();
|
ctDonchan_In = new CCounter();
|
||||||
ctDonchan_Normal = new CCounter(0, TJAPlayer3.Tx.SongSelect_Donchan_Normal.Length - 1, 1000 / 45, TJAPlayer3.Timer);
|
ctDonchan_Normal = new CCounter(0, TJAPlayer3.Tx.SongSelect_Donchan_Normal.Length - 1, 1000 / 45, TJAPlayer3.Timer);
|
||||||
@ -70,7 +70,7 @@ namespace TJAPlayer3
|
|||||||
this.ttkDanTitles = new TitleTextureKey[amount];
|
this.ttkDanTitles = new TitleTextureKey[amount];
|
||||||
|
|
||||||
// Silver Shinjin (default rank) always avaliable by default
|
// Silver Shinjin (default rank) always avaliable by default
|
||||||
this.ttkDanTitles[0] = new TitleTextureKey("新人", this.pfHeyaFont, Color.White, Color.Black, 1000);
|
this.ttkDanTitles[0] = new TitleTextureKey("新人", this.pfHeyaFont, Color.White, Color.Black, 1000);
|
||||||
|
|
||||||
int idx = 1;
|
int idx = 1;
|
||||||
if (TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer] != null)
|
if (TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer] != null)
|
||||||
@ -96,7 +96,7 @@ namespace TJAPlayer3
|
|||||||
this.ttkTitles = new TitleTextureKey[amount];
|
this.ttkTitles = new TitleTextureKey[amount];
|
||||||
|
|
||||||
// Wood shojinsha (default title) always avaliable by default
|
// Wood shojinsha (default title) always avaliable by default
|
||||||
this.ttkTitles[0] = new TitleTextureKey("初心者", this.pfHeyaFont, Color.Black, Color.Transparent, 1000);
|
this.ttkTitles[0] = new TitleTextureKey("初心者", this.pfHeyaFont, Color.Black, Color.Transparent, 1000);
|
||||||
|
|
||||||
idx = 1;
|
idx = 1;
|
||||||
if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null)
|
if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null)
|
||||||
@ -155,30 +155,30 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
this.PuchiChara.IdleAnimation();
|
this.PuchiChara.IdleAnimation();
|
||||||
|
|
||||||
base.On活性化();
|
base.On活性化();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void On非活性化()
|
public override void On非活性化()
|
||||||
{
|
{
|
||||||
base.On非活性化();
|
base.On非活性化();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnManagedリソースの作成()
|
public override void OnManagedリソースの作成()
|
||||||
{
|
{
|
||||||
base.OnManagedリソースの作成();
|
base.OnManagedリソースの作成();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnManagedリソースの解放()
|
public override void OnManagedリソースの解放()
|
||||||
{
|
{
|
||||||
base.OnManagedリソースの解放();
|
base.OnManagedリソースの解放();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int On進行描画()
|
public override int On進行描画()
|
||||||
{
|
{
|
||||||
ctDonchan_Normal.t進行Loop();
|
ctDonchan_Normal.t進行Loop();
|
||||||
ctDonchan_In.t進行();
|
ctDonchan_In.t進行();
|
||||||
|
|
||||||
TJAPlayer3.Tx.Heya_Background.t2D描画(TJAPlayer3.app.Device, 0, 0);
|
TJAPlayer3.Tx.Heya_Background.t2D描画(TJAPlayer3.app.Device, 0, 0);
|
||||||
|
|
||||||
#region [Menus display]
|
#region [Menus display]
|
||||||
|
|
||||||
@ -186,21 +186,21 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
for (int i = 0; i < this.ttkMainMenuOpt.Length; i++)
|
for (int i = 0; i < this.ttkMainMenuOpt.Length; i++)
|
||||||
{
|
{
|
||||||
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkMainMenuOpt[i]);
|
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkMainMenuOpt[i]);
|
||||||
|
|
||||||
if (iCurrentMenu != -1 || iMainMenuCurrent != i)
|
if (iCurrentMenu != -1 || iMainMenuCurrent != i)
|
||||||
{
|
{
|
||||||
tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray);
|
tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tmpTex.color4 = C変換.ColorToColor4(Color.White);
|
tmpTex.color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 26 + 80 * i);
|
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 26 + 80 * i);
|
||||||
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 40 + 80 * i);
|
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 40 + 80 * i);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@ -215,40 +215,40 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
if (i != 0)
|
if (i != 0)
|
||||||
{
|
{
|
||||||
TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.Heya_Lock.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Heya_Lock.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.Heya_Lock.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Heya_Lock.color4 = C変換.ColorToColor4(Color.White);
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200);
|
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200);
|
||||||
|
|
||||||
int puriColumn = pos % 5;
|
int puriColumn = pos % 5;
|
||||||
int puriRow = pos / 5;
|
int puriRow = pos / 5;
|
||||||
|
|
||||||
TJAPlayer3.Tx.PuchiChara.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 320 + (int)(PuchiChara.sineY),
|
TJAPlayer3.Tx.PuchiChara.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 320 + (int)(PuchiChara.sineY),
|
||||||
new Rectangle((PuchiChara.Counter.n現在の値 + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0],
|
new Rectangle((PuchiChara.Counter.n現在の値 + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0],
|
||||||
puriRow * TJAPlayer3.Skin.Game_PuchiChara[1],
|
puriRow * TJAPlayer3.Skin.Game_PuchiChara[1],
|
||||||
TJAPlayer3.Skin.Game_PuchiChara[0],
|
TJAPlayer3.Skin.Game_PuchiChara[0],
|
||||||
TJAPlayer3.Skin.Game_PuchiChara[1]));
|
TJAPlayer3.Skin.Game_PuchiChara[1]));
|
||||||
|
|
||||||
TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.White);
|
||||||
|
|
||||||
if (ttkPuchiCharaNames[pos] != null)
|
if (ttkPuchiCharaNames[pos] != null)
|
||||||
{
|
{
|
||||||
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaNames[pos]);
|
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaNames[pos]);
|
||||||
|
|
||||||
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 448);
|
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 448);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (puchiUnlockables.ContainsKey(pos)
|
if (puchiUnlockables.ContainsKey(pos)
|
||||||
&& !TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Contains(pos))
|
&& !TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Contains(pos))
|
||||||
TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200);
|
TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -267,22 +267,22 @@ namespace TJAPlayer3
|
|||||||
if (i != 0)
|
if (i != 0)
|
||||||
{
|
{
|
||||||
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
|
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
|
||||||
TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
|
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
|
||||||
TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.White);
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200);
|
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200);
|
||||||
|
|
||||||
TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 320);
|
TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 320);
|
||||||
|
|
||||||
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
|
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
|
||||||
TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.White);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -296,36 +296,36 @@ namespace TJAPlayer3
|
|||||||
{
|
{
|
||||||
int pos = (this.ttkDanTitles.Length * 5 + iDanTitleCurrent + i) % this.ttkDanTitles.Length;
|
int pos = (this.ttkDanTitles.Length * 5 + iDanTitleCurrent + i) % this.ttkDanTitles.Length;
|
||||||
|
|
||||||
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkDanTitles[pos]);
|
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkDanTitles[pos]);
|
||||||
|
|
||||||
if (i != 0)
|
if (i != 0)
|
||||||
{
|
{
|
||||||
tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray);
|
tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tmpTex.color4 = C変換.ColorToColor4(Color.White);
|
tmpTex.color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White);
|
||||||
}
|
}
|
||||||
|
|
||||||
int danGrade = 0;
|
int danGrade = 0;
|
||||||
if (pos > 0)
|
if (pos > 0)
|
||||||
{
|
{
|
||||||
danGrade = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[pos].str文字].clearStatus;
|
danGrade = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[pos].str文字].clearStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i);
|
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i);
|
||||||
|
|
||||||
TJAPlayer3.Tx.NamePlateBase.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device,
|
TJAPlayer3.Tx.NamePlateBase.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device,
|
||||||
718 + -10 * Math.Abs(i),
|
718 + -10 * Math.Abs(i),
|
||||||
331 + 70 * i,
|
331 + 70 * i,
|
||||||
new RectangleF(0, (8 + danGrade) * 54, 220, 54));
|
new RectangleF(0, (8 + danGrade) * 54, 220, 54));
|
||||||
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White);
|
||||||
|
|
||||||
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i);
|
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -341,37 +341,37 @@ namespace TJAPlayer3
|
|||||||
{
|
{
|
||||||
int pos = (this.ttkTitles.Length * 5 + iTitleCurrent + i) % this.ttkTitles.Length;
|
int pos = (this.ttkTitles.Length * 5 + iTitleCurrent + i) % this.ttkTitles.Length;
|
||||||
|
|
||||||
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkTitles[pos]);
|
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkTitles[pos]);
|
||||||
|
|
||||||
if (i != 0)
|
if (i != 0)
|
||||||
{
|
{
|
||||||
tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray);
|
tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray);
|
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tmpTex.color4 = C変換.ColorToColor4(Color.White);
|
tmpTex.color4 = C変換.ColorToColor4(Color.White);
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
|
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i);
|
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i);
|
||||||
|
|
||||||
int iType = -1;
|
int iType = -1;
|
||||||
|
|
||||||
if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null &&
|
if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null &&
|
||||||
TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[pos].str文字))
|
TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[pos].str文字))
|
||||||
iType = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[pos].str文字].iType;
|
iType = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[pos].str文字].iType;
|
||||||
else if (pos == 0)
|
else if (pos == 0)
|
||||||
iType = 0;
|
iType = 0;
|
||||||
|
|
||||||
if (iType >= 0 && iType < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title)
|
if (iType >= 0 && iType < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title)
|
||||||
{
|
{
|
||||||
TJAPlayer3.Tx.NamePlate_Title[iType][TJAPlayer3.NamePlate.ctAnimatedNamePlateTitle.n現在の値 % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[iType]].t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device,
|
TJAPlayer3.Tx.NamePlate_Title[iType][TJAPlayer3.NamePlate.ctAnimatedNamePlateTitle.n現在の値 % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[iType]].t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device,
|
||||||
730 + -10 * Math.Abs(i),
|
730 + -10 * Math.Abs(i),
|
||||||
348 + 70 * i);
|
348 + 70 * i);
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i);
|
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -385,41 +385,41 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
if (iCurrentMenu >= 0)
|
if (iCurrentMenu >= 0)
|
||||||
{
|
{
|
||||||
if (this.ttkInfoSection != null && this.ttkInfoSection.str文字 != "")
|
if (this.ttkInfoSection != null && this.ttkInfoSection.str文字 != "")
|
||||||
TJAPlayer3.Tx.Heya_Box?.t2D描画(TJAPlayer3.app.Device, 0, 0);
|
TJAPlayer3.Tx.Heya_Box?.t2D描画(TJAPlayer3.app.Device, 0, 0);
|
||||||
|
|
||||||
if (this.ttkInfoSection != null)
|
if (this.ttkInfoSection != null)
|
||||||
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection)
|
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection)
|
||||||
.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620, 560);
|
.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620, 560);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region [General Don animations]
|
#region [General Don animations]
|
||||||
|
|
||||||
if (!ctDonchan_In.b開始した)
|
if (!ctDonchan_In.b開始した)
|
||||||
{
|
{
|
||||||
TJAPlayer3.Skin.soundHeyaBGM.t再生する();
|
TJAPlayer3.Skin.soundHeyaBGM.t再生する();
|
||||||
ctDonchan_In.t開始(0, 180, 1.25f, TJAPlayer3.Timer);
|
ctDonchan_In.t開始(0, 180, 1.25f, TJAPlayer3.Timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] + 5, 0);
|
TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] + 5, 0);
|
||||||
|
|
||||||
#region [ どんちゃん関連 ]
|
#region [ どんちゃん関連 ]
|
||||||
|
|
||||||
if (ctDonchan_In.n現在の値 != 90)
|
if (ctDonchan_In.n現在の値 != 90)
|
||||||
{
|
{
|
||||||
float DonchanX = 0f, DonchanY = 0f;
|
float DonchanX = 0f, DonchanY = 0f;
|
||||||
|
|
||||||
DonchanX = (float)Math.Sin(ctDonchan_In.n現在の値 / 2 * (Math.PI / 180)) * 200f;
|
DonchanX = (float)Math.Sin(ctDonchan_In.n現在の値 / 2 * (Math.PI / 180)) * 200f;
|
||||||
DonchanY = ((float)Math.Sin((90 + (ctDonchan_In.n現在の値 / 2)) * (Math.PI / 180)) * 150f);
|
DonchanY = ((float)Math.Sin((90 + (ctDonchan_In.n現在の値 / 2)) * (Math.PI / 180)) * 150f);
|
||||||
|
|
||||||
TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].Opacity = ctDonchan_In.n現在の値 * 2;
|
TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].Opacity = ctDonchan_In.n現在の値 * 2;
|
||||||
TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].t2D描画(TJAPlayer3.app.Device, -200 + DonchanX, 336 - DonchanY);
|
TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].t2D描画(TJAPlayer3.app.Device, -200 + DonchanX, 336 - DonchanY);
|
||||||
|
|
||||||
#region [PuchiChara]
|
#region [PuchiChara]
|
||||||
|
|
||||||
this.PuchiChara.On進行描画(0 + 100, 336 + 230, false);
|
this.PuchiChara.On進行描画(0 + 100, 336 + 230, false);
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
@ -428,29 +428,29 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region [ キー関連 ]
|
#region [ キー関連 ]
|
||||||
|
|
||||||
if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.RightArrow) ||
|
if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.RightArrow) ||
|
||||||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue))
|
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue))
|
||||||
{
|
{
|
||||||
if (this.tMove(1))
|
if (this.tMove(1))
|
||||||
{
|
{
|
||||||
TJAPlayer3.Skin.sound変更音.t再生する();
|
TJAPlayer3.Skin.sound変更音.t再生する();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.LeftArrow) ||
|
else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.LeftArrow) ||
|
||||||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue))
|
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue))
|
||||||
{
|
{
|
||||||
if (this.tMove(-1))
|
if (this.tMove(-1))
|
||||||
{
|
{
|
||||||
TJAPlayer3.Skin.sound変更音.t再生する();
|
TJAPlayer3.Skin.sound変更音.t再生する();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.Return) ||
|
else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.Return) ||
|
||||||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed) ||
|
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed) ||
|
||||||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed))
|
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed))
|
||||||
{
|
{
|
||||||
|
|
||||||
#region [Decide]
|
#region [Decide]
|
||||||
@ -460,10 +460,10 @@ namespace TJAPlayer3
|
|||||||
// Return to main menu
|
// Return to main menu
|
||||||
if (iCurrentMenu == -1 && iMainMenuCurrent == 0)
|
if (iCurrentMenu == -1 && iMainMenuCurrent == 0)
|
||||||
{
|
{
|
||||||
TJAPlayer3.Skin.soundHeyaBGM.t停止する();
|
TJAPlayer3.Skin.soundHeyaBGM.t停止する();
|
||||||
this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る;
|
this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る;
|
||||||
this.actFOtoTitle.tフェードアウト開始();
|
this.actFOtoTitle.tフェードアウト開始();
|
||||||
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
|
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (iCurrentMenu == -1)
|
else if (iCurrentMenu == -1)
|
||||||
@ -515,11 +515,11 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
if (iDanTitleCurrent > 0)
|
if (iDanTitleCurrent > 0)
|
||||||
{
|
{
|
||||||
iG = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str文字].isGold;
|
iG = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str文字].isGold;
|
||||||
cs = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str文字].clearStatus;
|
cs = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str文字].clearStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.NamePlateConfig.data.Dan[iPlayer] = this.ttkDanTitles[iDanTitleCurrent].str文字;
|
TJAPlayer3.NamePlateConfig.data.Dan[iPlayer] = this.ttkDanTitles[iDanTitleCurrent].str文字;
|
||||||
TJAPlayer3.NamePlateConfig.data.DanGold[iPlayer] = iG;
|
TJAPlayer3.NamePlateConfig.data.DanGold[iPlayer] = iG;
|
||||||
TJAPlayer3.NamePlateConfig.data.DanType[iPlayer] = cs;
|
TJAPlayer3.NamePlateConfig.data.DanType[iPlayer] = cs;
|
||||||
|
|
||||||
@ -533,11 +533,11 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
else if (iCurrentMenu == 3)
|
else if (iCurrentMenu == 3)
|
||||||
{
|
{
|
||||||
TJAPlayer3.NamePlateConfig.data.Title[iPlayer] = this.ttkTitles[iTitleCurrent].str文字;
|
TJAPlayer3.NamePlateConfig.data.Title[iPlayer] = this.ttkTitles[iTitleCurrent].str文字;
|
||||||
|
|
||||||
if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null
|
if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null
|
||||||
&& TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[iTitleCurrent].str文字))
|
&& TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[iTitleCurrent].str文字))
|
||||||
TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[iTitleCurrent].str文字].iType;
|
TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[iTitleCurrent].str文字].iType;
|
||||||
else if (iTitleCurrent == 0)
|
else if (iTitleCurrent == 0)
|
||||||
TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = 0;
|
TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = 0;
|
||||||
else
|
else
|
||||||
@ -552,26 +552,26 @@ namespace TJAPlayer3
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ess == ESelectStatus.SELECTED)
|
if (ess == ESelectStatus.SELECTED)
|
||||||
TJAPlayer3.Skin.sound決定音.t再生する();
|
TJAPlayer3.Skin.sound決定音.t再生する();
|
||||||
else if (ess == ESelectStatus.FAILED)
|
else if (ess == ESelectStatus.FAILED)
|
||||||
TJAPlayer3.Skin.soundError.t再生する();
|
TJAPlayer3.Skin.soundError.t再生する();
|
||||||
else
|
else
|
||||||
TJAPlayer3.Skin.SoundBanapas.t再生する(); // To change with a more appropriate sfx sooner or later
|
TJAPlayer3.Skin.SoundBanapas.t再生する(); // To change with a more appropriate sfx sooner or later
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.Escape))
|
else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.Escape))
|
||||||
{
|
{
|
||||||
|
|
||||||
TJAPlayer3.Skin.sound取消音.t再生する();
|
TJAPlayer3.Skin.sound取消音.t再生する();
|
||||||
|
|
||||||
if (iCurrentMenu == -1)
|
if (iCurrentMenu == -1)
|
||||||
{
|
{
|
||||||
TJAPlayer3.Skin.soundHeyaBGM.t停止する();
|
TJAPlayer3.Skin.soundHeyaBGM.t停止する();
|
||||||
this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る;
|
this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る;
|
||||||
this.actFOtoTitle.tフェードアウト開始();
|
this.actFOtoTitle.tフェードアウト開始();
|
||||||
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
|
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -586,25 +586,25 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
switch (base.eフェーズID)
|
switch (base.eフェーズID)
|
||||||
{
|
{
|
||||||
case CStage.Eフェーズ.共通_フェードアウト:
|
case CStage.Eフェーズ.共通_フェードアウト:
|
||||||
if (this.actFOtoTitle.On進行描画() == 0)
|
if (this.actFOtoTitle.On進行描画() == 0)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return (int)this.eフェードアウト完了時の戻り値;
|
return (int)this.eフェードアウト完了時の戻り値;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum E戻り値 : int
|
public enum E戻り値 : int
|
||||||
{
|
{
|
||||||
継続,
|
継続,
|
||||||
タイトルに戻る,
|
タイトルに戻る,
|
||||||
選曲した
|
選曲した
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool bInSongPlayed;
|
public bool bInSongPlayed;
|
||||||
@ -724,7 +724,7 @@ namespace TJAPlayer3
|
|||||||
private int iPuchiCharaCount;
|
private int iPuchiCharaCount;
|
||||||
private int iCharacterCount;
|
private int iCharacterCount;
|
||||||
|
|
||||||
public E戻り値 eフェードアウト完了時の戻り値;
|
public E戻り値 eフェードアウト完了時の戻り値;
|
||||||
|
|
||||||
public CActFIFOBlack actFOtoTitle;
|
public CActFIFOBlack actFOtoTitle;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user