Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-24 07:30:21 +01:00
Code Releases Activity

Fix #551 and more code translation

Browse Source
This commit is contained in:
0auBSQ 2024-01-27 17:26:09 +09:00
parent 24e55eaef6
commit a97ea616e3
105 changed files with 2499 additions and 2497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
FDK/src/04.Graphics/CTexture.cs
View File

@ -277,7 +277,7 @@ namespace FDK
} }
} }
} }
public Size szテクスチャサイズ public Size szTextureSize
{ {
get; get;
private set; private set;
@ -287,7 +287,7 @@ namespace FDK
get; get;
protected set; protected set;
} }
public Vector3D<float> vc拡大縮小倍率; public Vector3D<float> vcScaleRatio;
// 画面が変わるたび以下のプロパティを設定し治すこと。 // 画面が変わるたび以下のプロパティを設定し治すこと。
@ -307,22 +307,22 @@ namespace FDK
public CTexture() public CTexture()
{ {
this.sz画像サイズ = new Size(0, 0); this.sz画像サイズ = new Size(0, 0);
this.szテクスチャサイズ = new Size(0, 0); this.szTextureSize = new Size(0, 0);
this._opacity = 0xff; this._opacity = 0xff;
this.b加算合成 = false; this.b加算合成 = false;
this.fZ軸中心回転 = 0f; this.fZ軸中心回転 = 0f;
this.vc拡大縮小倍率 = new Vector3D<float>(1f, 1f, 1f); this.vcScaleRatio = new Vector3D<float>(1f, 1f, 1f);
// this._txData = null; // this._txData = null;
} }
public CTexture(CTexture tx) public CTexture(CTexture tx)
{ {
this.sz画像サイズ = tx.sz画像サイズ; this.sz画像サイズ = tx.sz画像サイズ;
this.szテクスチャサイズ = tx.szテクスチャサイズ; this.szTextureSize = tx.szTextureSize;
this._opacity = tx._opacity; this._opacity = tx._opacity;
this.b加算合成 = tx.b加算合成; this.b加算合成 = tx.b加算合成;
this.fZ軸中心回転 = tx.fZ軸中心回転; this.fZ軸中心回転 = tx.fZ軸中心回転;
this.vc拡大縮小倍率 = tx.vc拡大縮小倍率; this.vcScaleRatio = tx.vcScaleRatio;
Texture_ = tx.Texture_; Texture_ = tx.Texture_;
// this._txData = null; // this._txData = null;
} }
@ -331,7 +331,7 @@ namespace FDK
{ {
Texture_ = texture.Texture_; Texture_ = texture.Texture_;
this.sz画像サイズ = new Size(n幅, n高さ); this.sz画像サイズ = new Size(n幅, n高さ);
this.szテクスチャサイズ = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ); this.szTextureSize = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ);
this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height); this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height);
} }
@ -344,7 +344,7 @@ namespace FDK
Texture_ = GenTexture(data, (uint)width, (uint)height, rgbaType); Texture_ = GenTexture(data, (uint)width, (uint)height, rgbaType);
} }
this.sz画像サイズ = new Size(width, height); this.sz画像サイズ = new Size(width, height);
this.szテクスチャサイズ = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ); this.szTextureSize = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ);
this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height); this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height);
} }
@ -379,7 +379,7 @@ namespace FDK
try try
{ {
this.sz画像サイズ = new Size(n幅, n高さ); this.sz画像サイズ = new Size(n幅, n高さ);
this.szテクスチャサイズ = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ); this.szTextureSize = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ);
this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height); this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height);
} }
catch catch
@ -483,7 +483,7 @@ namespace FDK
this.sz画像サイズ = new Size(bitmap.Width, bitmap.Height); this.sz画像サイズ = new Size(bitmap.Width, bitmap.Height);
this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height); this.rc全画像 = new Rectangle(0, 0, this.sz画像サイズ.Width, this.sz画像サイズ.Height);
this.szテクスチャサイズ = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ); this.szTextureSize = this.t指定されたサイズを超えない最適なテクスチャサイズを返す(this.sz画像サイズ);
} }
catch catch
{ {
@ -498,17 +498,17 @@ namespace FDK
// Rectangleを使う場合、座標調整のためにテクスチャサイズの値をそのまま使うとまずいことになるため、Rectragleから幅を取得して調整をする。 // Rectangleを使う場合、座標調整のためにテクスチャサイズの値をそのまま使うとまずいことになるため、Rectragleから幅を取得して調整をする。
public void t2D中心基準描画(int x, int y) public void t2D中心基準描画(int x, int y)
{ {
this.t2D描画(x - (this.szテクスチャサイズ.Width / 2), y - (this.szテクスチャサイズ.Height / 2), 1f, this.rc全画像); this.t2D描画(x - (this.szTextureSize.Width / 2), y - (this.szTextureSize.Height / 2), 1f, this.rc全画像);
} }
public void t2D中心基準描画Mirrored(int x, int y) public void t2D中心基準描画Mirrored(int x, int y)
{ {
this.t2D左右反転描画(x - (this.szテクスチャサイズ.Width / 2), y - (this.szテクスチャサイズ.Height / 2), 1f, this.rc全画像); this.t2D左右反転描画(x - (this.szTextureSize.Width / 2), y - (this.szTextureSize.Height / 2), 1f, this.rc全画像);
} }
public void t2D中心基準描画Mirrored(float x, float y) public void t2D中心基準描画Mirrored(float x, float y)
{ {
this.t2D左右反転描画(x - (this.szテクスチャサイズ.Width / 2), y - (this.szテクスチャサイズ.Height / 2), 1f, this.rc全画像); this.t2D左右反転描画(x - (this.szTextureSize.Width / 2), y - (this.szTextureSize.Height / 2), 1f, this.rc全画像);
} }
public void t2D中心基準描画(int x, int y, Rectangle rc画像内の描画領域) public void t2D中心基準描画(int x, int y, Rectangle rc画像内の描画領域)
@ -517,7 +517,7 @@ namespace FDK
} }
public void t2D中心基準描画(float x, float y) public void t2D中心基準描画(float x, float y)
{ {
this.t2D描画((int)x - (this.szテクスチャサイズ.Width / 2), (int)y - (this.szテクスチャサイズ.Height / 2), 1f, this.rc全画像); this.t2D描画((int)x - (this.szTextureSize.Width / 2), (int)y - (this.szTextureSize.Height / 2), 1f, this.rc全画像);
} }
public void t2D中心基準描画(float x, float y, Rectangle rc画像内の描画領域) public void t2D中心基準描画(float x, float y, Rectangle rc画像内の描画領域)
{ {
@ -531,33 +531,33 @@ namespace FDK
// 下を基準にして描画する(拡大率考慮)メソッドを追加。 (AioiLight) // 下を基準にして描画する(拡大率考慮)メソッドを追加。 (AioiLight)
public void t2D拡大率考慮下基準描画(int x, int y) public void t2D拡大率考慮下基準描画(int x, int y)
{ {
this.t2D描画(x, y - (szテクスチャサイズ.Height * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D描画(x, y - (szTextureSize.Height * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮下基準描画(int x, int y, Rectangle rc画像内の描画領域) public void t2D拡大率考慮下基準描画(int x, int y, Rectangle rc画像内の描画領域)
{ {
this.t2D描画(x, y - (rc画像内の描画領域.Height * this.vc拡大縮小倍率.Y), 1f, rc画像内の描画領域); this.t2D描画(x, y - (rc画像内の描画領域.Height * this.vcScaleRatio.Y), 1f, rc画像内の描画領域);
} }
public void t2D拡大率考慮下中心基準描画(int x, int y) public void t2D拡大率考慮下中心基準描画(int x, int y)
{ {
this.t2D描画(x - (this.szテクスチャサイズ.Width / 2 * this.vc拡大縮小倍率.X), y - (szテクスチャサイズ.Height * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D描画(x - (this.szTextureSize.Width / 2 * this.vcScaleRatio.X), y - (szTextureSize.Height * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮下中心基準描画Mirrored(int x, int y) public void t2D拡大率考慮下中心基準描画Mirrored(int x, int y)
{ {
this.t2D左右反転描画(x - (this.szテクスチャサイズ.Width / 2 * this.vc拡大縮小倍率.X), y - (szテクスチャサイズ.Height * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D左右反転描画(x - (this.szTextureSize.Width / 2 * this.vcScaleRatio.X), y - (szTextureSize.Height * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮下中心基準描画Mirrored(float x, float y) public void t2D拡大率考慮下中心基準描画Mirrored(float x, float y)
{ {
this.t2D左右反転描画(x - (this.szテクスチャサイズ.Width / 2 * this.vc拡大縮小倍率.X), y - (szテクスチャサイズ.Height * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D左右反転描画(x - (this.szTextureSize.Width / 2 * this.vcScaleRatio.X), y - (szTextureSize.Height * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮下基準描画(float x, float y) public void t2D拡大率考慮下基準描画(float x, float y)
{ {
this.t2D描画(x, y - (szテクスチャサイズ.Height * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D描画(x, y - (szTextureSize.Height * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮下基準描画(float x, float y, RectangleF rc画像内の描画領域) public void t2D拡大率考慮下基準描画(float x, float y, RectangleF rc画像内の描画領域)
{ {
this.t2D描画(x, y - (rc画像内の描画領域.Height * this.vc拡大縮小倍率.Y), 1f, rc画像内の描画領域); this.t2D描画(x, y - (rc画像内の描画領域.Height * this.vcScaleRatio.Y), 1f, rc画像内の描画領域);
} }
public void t2D拡大率考慮下中心基準描画(float x, float y) public void t2D拡大率考慮下中心基準描画(float x, float y)
{ {
@ -566,7 +566,7 @@ namespace FDK
public void t2D拡大率考慮下中心基準描画(int x, int y, Rectangle rc画像内の描画領域) public void t2D拡大率考慮下中心基準描画(int x, int y, Rectangle rc画像内の描画領域)
{ {
this.t2D描画(x - ((rc画像内の描画領域.Width / 2)), y - (rc画像内の描画領域.Height * this.vc拡大縮小倍率.Y), 1f, rc画像内の描画領域); this.t2D描画(x - ((rc画像内の描画領域.Width / 2)), y - (rc画像内の描画領域.Height * this.vcScaleRatio.Y), 1f, rc画像内の描画領域);
} }
public void t2D拡大率考慮下中心基準描画(float x, float y, Rectangle rc画像内の描画領域) public void t2D拡大率考慮下中心基準描画(float x, float y, Rectangle rc画像内の描画領域)
{ {
@ -574,7 +574,7 @@ namespace FDK
} }
public void t2D下中央基準描画(int x, int y) public void t2D下中央基準描画(int x, int y)
{ {
this.t2D描画(x - (this.szテクスチャサイズ.Width / 2), y - (szテクスチャサイズ.Height), this.rc全画像); this.t2D描画(x - (this.szTextureSize.Width / 2), y - (szTextureSize.Height), this.rc全画像);
} }
public void t2D下中央基準描画(int x, int y, Rectangle rc画像内の描画領域) public void t2D下中央基準描画(int x, int y, Rectangle rc画像内の描画領域)
{ {
@ -585,39 +585,39 @@ namespace FDK
public void t2D拡大率考慮中央基準描画(int x, int y) public void t2D拡大率考慮中央基準描画(int x, int y)
{ {
this.t2D描画(x - (this.szテクスチャサイズ.Width / 2 * this.vc拡大縮小倍率.X), y - (szテクスチャサイズ.Height / 2 * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D描画(x - (this.szTextureSize.Width / 2 * this.vcScaleRatio.X), y - (szTextureSize.Height / 2 * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮中央基準描画(int x, int y, RectangleF rc) public void t2D拡大率考慮中央基準描画(int x, int y, RectangleF rc)
{ {
this.t2D描画(x - (rc.Width / 2 * this.vc拡大縮小倍率.X), y - (rc.Height / 2 * this.vc拡大縮小倍率.Y), 1f, rc); this.t2D描画(x - (rc.Width / 2 * this.vcScaleRatio.X), y - (rc.Height / 2 * this.vcScaleRatio.Y), 1f, rc);
} }
public void t2D_DisplayImage_AnchorCenterLeft(int x, int y, RectangleF rc) public void t2D_DisplayImage_AnchorCenterLeft(int x, int y, RectangleF rc)
{ {
this.t2D描画(x, y - (rc.Height / 2 * this.vc拡大縮小倍率.Y), 1f, rc); this.t2D描画(x, y - (rc.Height / 2 * this.vcScaleRatio.Y), 1f, rc);
} }
public void t2D拡大率考慮上中央基準描画(int x, int y, RectangleF rc) public void t2D拡大率考慮上中央基準描画(int x, int y, RectangleF rc)
{ {
this.t2D描画(x - (rc.Width / 2 * this.vc拡大縮小倍率.X), y, 1f, rc); this.t2D描画(x - (rc.Width / 2 * this.vcScaleRatio.X), y, 1f, rc);
} }
public void t2D_DisplayImage_AnchorUpRight(int x, int y, RectangleF rc) public void t2D_DisplayImage_AnchorUpRight(int x, int y, RectangleF rc)
{ {
this.t2D描画(x - (rc.Width * this.vc拡大縮小倍率.X), y, 1f, rc); this.t2D描画(x - (rc.Width * this.vcScaleRatio.X), y, 1f, rc);
} }
public void t2D拡大率考慮上中央基準描画(int x, int y) public void t2D拡大率考慮上中央基準描画(int x, int y)
{ {
this.t2D描画(x - (rc全画像.Width / 2 * this.vc拡大縮小倍率.X), y, 1f, rc全画像); this.t2D描画(x - (rc全画像.Width / 2 * this.vcScaleRatio.X), y, 1f, rc全画像);
} }
public void t2D拡大率考慮中央基準描画(float x, float y) public void t2D拡大率考慮中央基準描画(float x, float y)
{ {
this.t2D描画(x - (this.szテクスチャサイズ.Width / 2 * this.vc拡大縮小倍率.X), y - (szテクスチャサイズ.Height / 2 * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D描画(x - (this.szTextureSize.Width / 2 * this.vcScaleRatio.X), y - (szTextureSize.Height / 2 * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮中央基準描画Mirrored(float x, float y) public void t2D拡大率考慮中央基準描画Mirrored(float x, float y)
{ {
this.t2D左右反転描画(x - (this.szテクスチャサイズ.Width / 2 * this.vc拡大縮小倍率.X), y - (szテクスチャサイズ.Height / 2 * this.vc拡大縮小倍率.Y), 1f, this.rc全画像); this.t2D左右反転描画(x - (this.szTextureSize.Width / 2 * this.vcScaleRatio.X), y - (szTextureSize.Height / 2 * this.vcScaleRatio.Y), 1f, this.rc全画像);
} }
public void t2D拡大率考慮中央基準描画(float x, float y, RectangleF rc) public void t2D拡大率考慮中央基準描画(float x, float y, RectangleF rc)
{ {
this.t2D描画(x - (rc.Width / 2 * this.vc拡大縮小倍率.X), y - (rc.Height / 2 * this.vc拡大縮小倍率.Y), 1f, rc); this.t2D描画(x - (rc.Width / 2 * this.vcScaleRatio.X), y - (rc.Height / 2 * this.vcScaleRatio.Y), 1f, rc);
} }
public void t2D拡大率考慮描画(RefPnt refpnt, float x, float y) public void t2D拡大率考慮描画(RefPnt refpnt, float x, float y)
{ {
@ -635,28 +635,28 @@ namespace FDK
this.t2D描画(x, y, depth, rect); this.t2D描画(x, y, depth, rect);
break; break;
case RefPnt.Up: case RefPnt.Up:
this.t2D描画(x - (rect.Width / 2 * this.vc拡大縮小倍率.X), y, depth, rect); this.t2D描画(x - (rect.Width / 2 * this.vcScaleRatio.X), y, depth, rect);
break; break;
case RefPnt.UpRight: case RefPnt.UpRight:
this.t2D描画(x - rect.Width * this.vc拡大縮小倍率.X, y, depth, rect); this.t2D描画(x - rect.Width * this.vcScaleRatio.X, y, depth, rect);
break; break;
case RefPnt.Left: case RefPnt.Left:
this.t2D描画(x, y - (rect.Height / 2 * this.vc拡大縮小倍率.Y), depth, rect); this.t2D描画(x, y - (rect.Height / 2 * this.vcScaleRatio.Y), depth, rect);
break; break;
case RefPnt.Center: case RefPnt.Center:
this.t2D描画(x - (rect.Width / 2 * this.vc拡大縮小倍率.X), y - (rect.Height / 2 * this.vc拡大縮小倍率.Y), depth, rect); this.t2D描画(x - (rect.Width / 2 * this.vcScaleRatio.X), y - (rect.Height / 2 * this.vcScaleRatio.Y), depth, rect);
break; break;
case RefPnt.Right: case RefPnt.Right:
this.t2D描画(x - rect.Width * this.vc拡大縮小倍率.X, y - (rect.Height / 2 * this.vc拡大縮小倍率.Y), depth, rect); this.t2D描画(x - rect.Width * this.vcScaleRatio.X, y - (rect.Height / 2 * this.vcScaleRatio.Y), depth, rect);
break; break;
case RefPnt.DownLeft: case RefPnt.DownLeft:
this.t2D描画(x, y - rect.Height * this.vc拡大縮小倍率.Y, depth, rect); this.t2D描画(x, y - rect.Height * this.vcScaleRatio.Y, depth, rect);
break; break;
case RefPnt.Down: case RefPnt.Down:
this.t2D描画(x - (rect.Width / 2 * this.vc拡大縮小倍率.X), y - rect.Height * this.vc拡大縮小倍率.Y, depth, rect); this.t2D描画(x - (rect.Width / 2 * this.vcScaleRatio.X), y - rect.Height * this.vcScaleRatio.Y, depth, rect);
break; break;
case RefPnt.DownRight: case RefPnt.DownRight:
this.t2D描画(x - rect.Width * this.vc拡大縮小倍率.X, y - rect.Height * this.vc拡大縮小倍率.Y, depth, rect); this.t2D描画(x - rect.Width * this.vcScaleRatio.X, y - rect.Height * this.vcScaleRatio.Y, depth, rect);
break; break;
default: default:
break; break;
@ -742,7 +742,7 @@ namespace FDK
//スケーリング----- //スケーリング-----
mvp *= Matrix4X4.CreateScale(rc画像内の描画領域.Width / GameWindowSize.Width, rc画像内の描画領域.Height / GameWindowSize.Height, 1) * mvp *= Matrix4X4.CreateScale(rc画像内の描画領域.Width / GameWindowSize.Width, rc画像内の描画領域.Height / GameWindowSize.Height, 1) *
Matrix4X4.CreateScale(flipX ? -vc拡大縮小倍率.X : vc拡大縮小倍率.X, flipY ? -vc拡大縮小倍率.Y : vc拡大縮小倍率.Y, 1.0f); Matrix4X4.CreateScale(flipX ? -vcScaleRatio.X : vcScaleRatio.X, flipY ? -vcScaleRatio.Y : vcScaleRatio.Y, 1.0f);
//----- //-----
//回転----- //回転-----
@ -752,8 +752,8 @@ namespace FDK
//----- //-----
//移動---- //移動----
float offsetX = rc画像内の描画領域.Width * vc拡大縮小倍率.X / GameWindowSize.Width; float offsetX = rc画像内の描画領域.Width * vcScaleRatio.X / GameWindowSize.Width;
float offsetY = rc画像内の描画領域.Height * vc拡大縮小倍率.Y / GameWindowSize.Height; float offsetY = rc画像内の描画領域.Height * vcScaleRatio.Y / GameWindowSize.Height;
mvp *= Matrix4X4.CreateTranslation(offsetX, -offsetY, 0.0f); mvp *= Matrix4X4.CreateTranslation(offsetX, -offsetY, 0.0f);
mvp *= Matrix4X4.CreateTranslation(-1.0f, 1.0f, 0); mvp *= Matrix4X4.CreateTranslation(-1.0f, 1.0f, 0);
mvp *= Matrix4X4.CreateTranslation(x / GameWindowSize.Width * 2, -y / GameWindowSize.Height * 2, 0.0f); mvp *= Matrix4X4.CreateTranslation(x / GameWindowSize.Width * 2, -y / GameWindowSize.Height * 2, 0.0f);

8
OpenTaiko/src/Character/CMenuCharacter.cs
View File

@ -305,8 +305,8 @@ namespace TJAPlayer3
//float _x = (x + (150.0f * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX; //float _x = (x + (150.0f * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX;
//float _y = (y + (((_substitute == true) ? 290 : _ref[_ctref[player].n現在の値].szテクスチャサイズ.Height)) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f)) * resolutionRatioY; //float _y = (y + (((_substitute == true) ? 290 : _ref[_ctref[player].n現在の値].szテクスチャサイズ.Height)) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f)) * resolutionRatioY;
_tex.vc拡大縮小倍率.X *= resolutionRatioX; _tex.vcScaleRatio.X *= resolutionRatioX;
_tex.vc拡大縮小倍率.Y *= resolutionRatioY; _tex.vcScaleRatio.Y *= resolutionRatioY;
float _x = x; float _x = x;
float _y = y; float _y = y;
@ -335,8 +335,8 @@ namespace TJAPlayer3
); );
} }
_tex.vc拡大縮小倍率.X = 1f; _tex.vcScaleRatio.X = 1f;
_tex.vc拡大縮小倍率.Y = 1f; _tex.vcScaleRatio.Y = 1f;
_tex.Opacity = 255; _tex.Opacity = 255;

8
OpenTaiko/src/Character/CResultCharacter.cs
View File

@ -265,8 +265,8 @@ namespace TJAPlayer3
float _x = x; float _x = x;
float _y = y; float _y = y;
_tex.vc拡大縮小倍率.X *= resolutionRatioX; _tex.vcScaleRatio.X *= resolutionRatioX;
_tex.vc拡大縮小倍率.Y *= resolutionRatioY; _tex.vcScaleRatio.Y *= resolutionRatioY;
if (pos % 2 == 0 || TJAPlayer3.ConfigIni.nPlayerCount > 2) if (pos % 2 == 0 || TJAPlayer3.ConfigIni.nPlayerCount > 2)
{ {
@ -283,8 +283,8 @@ namespace TJAPlayer3
); );
} }
_tex.vc拡大縮小倍率.X = 1f; _tex.vcScaleRatio.X = 1f;
_tex.vc拡大縮小倍率.Y = 1f; _tex.vcScaleRatio.Y = 1f;
_tex.Opacity = 255; _tex.Opacity = 255;

6
OpenTaiko/src/Character/PuchiChara.cs
View File

@ -102,9 +102,9 @@ namespace TJAPlayer3
{ {
float puchiScale = TJAPlayer3.Skin.Resolution[1] / 720.0f; float puchiScale = TJAPlayer3.Skin.Resolution[1] / 720.0f;
chara.vc拡大縮小倍率 = new Vector3D<float>((isBalloon ? TJAPlayer3.Skin.Game_PuchiChara_Scale[1] * puchiScale : TJAPlayer3.Skin.Game_PuchiChara_Scale[0] * puchiScale)); chara.vcScaleRatio = new Vector3D<float>((isBalloon ? TJAPlayer3.Skin.Game_PuchiChara_Scale[1] * puchiScale : TJAPlayer3.Skin.Game_PuchiChara_Scale[0] * puchiScale));
chara.vc拡大縮小倍率.X *= scale; chara.vcScaleRatio.X *= scale;
chara.vc拡大縮小倍率.Y *= scale; chara.vcScaleRatio.Y *= scale;
chara.Opacity = alpha; chara.Opacity = alpha;
// (isGrowing ? TJAPlayer3.Skin.Game_PuchiChara[1] : 0) => Height // (isGrowing ? TJAPlayer3.Skin.Game_PuchiChara[1] : 0) => Height

2
OpenTaiko/src/Common/CConfigIni.cs
View File

@ -1094,7 +1094,7 @@ namespace TJAPlayer3
public bool KeyIsPressed(STKEYASSIGN[] pad) public bool KeyIsPressed(STKEYASSIGN[] pad)
{ {
return TJAPlayer3.Input管理.Keyboard.KeyPressed(pad.ToList().ConvertAll<int>(key => key.コード)); return TJAPlayer3.InputManager.Keyboard.KeyPressed(pad.ToList().ConvertAll<int>(key => key.コード));
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

28
OpenTaiko/src/Common/CPad.cs
View File

@ -41,7 +41,7 @@ namespace TJAPlayer3
// メソッド // メソッド
public List<STInputEvent> GetEvents( E楽器パート part, Eパッド pad ) public List<STInputEvent> GetEvents( EInstrumentPad part, EPad pad )
{ {
CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = this.rConfigIni.KeyAssign[ (int) part ][ (int) pad ]; CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = this.rConfigIni.KeyAssign[ (int) part ][ (int) pad ];
List<STInputEvent> list = new List<STInputEvent>(); List<STInputEvent> list = new List<STInputEvent>();
@ -104,9 +104,9 @@ namespace TJAPlayer3
} }
return list; return list;
} }
public bool b押された( E楽器パート part, Eパッド pad ) public bool bPressed( EInstrumentPad part, EPad pad )
{ {
if( part != E楽器パート.UNKNOWN ) if( part != EInstrumentPad.UNKNOWN )
{ {
CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = this.rConfigIni.KeyAssign[ (int) part ][ (int) pad ]; CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = this.rConfigIni.KeyAssign[ (int) part ][ (int) pad ];
@ -165,25 +165,25 @@ namespace TJAPlayer3
} }
return false; return false;
} }
public bool b押されたDGB( Eパッド pad ) public bool bPressedDGB( EPad pad )
{ {
if( !this.b押された( E楽器パート.DRUMS, pad ) && !this.b押された( E楽器パート.GUITAR, pad ) ) if( !this.bPressed( EInstrumentPad.DRUMS, pad ) && !this.bPressed( EInstrumentPad.GUITAR, pad ) )
{ {
return this.b押された( E楽器パート.BASS, pad ); return this.bPressed( EInstrumentPad.BASS, pad );
} }
return true; return true;
} }
public bool b押されたGB( Eパッド pad ) public bool bPressedGB( EPad pad )
{ {
if( !this.b押された( E楽器パート.GUITAR, pad ) ) if( !this.bPressed( EInstrumentPad.GUITAR, pad ) )
{ {
return this.b押された( E楽器パート.BASS, pad ); return this.bPressed( EInstrumentPad.BASS, pad );
} }
return true; return true;
} }
public bool b押されている( E楽器パート part, Eパッド pad ) public bool b押されている( EInstrumentPad part, EPad pad )
{ {
if( part != E楽器パート.UNKNOWN ) if( part != EInstrumentPad.UNKNOWN )
{ {
CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = this.rConfigIni.KeyAssign[ (int) part ][ (int) pad ]; CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = this.rConfigIni.KeyAssign[ (int) part ][ (int) pad ];
for( int i = 0; i < stkeyassignArray.Length; i++ ) for( int i = 0; i < stkeyassignArray.Length; i++ )
@ -239,11 +239,11 @@ namespace TJAPlayer3
} }
return false; return false;
} }
public bool b押されているGB( Eパッド pad ) public bool b押されているGB( EPad pad )
{ {
if( !this.b押されている( E楽器パート.GUITAR, pad ) ) if( !this.b押されている( EInstrumentPad.GUITAR, pad ) )
{ {
return this.b押されている( E楽器パート.BASS, pad ); return this.b押されている( EInstrumentPad.BASS, pad );
} }
return true; return true;
} }

24
OpenTaiko/src/Common/CSkin.cs
View File

@ -366,9 +366,9 @@ namespace TJAPlayer3
public CSystemSound soundフルコンボ音 = null; public CSystemSound soundフルコンボ音 = null;
public CSystemSound sound歓声音 = null; public CSystemSound sound歓声音 = null;
public CSystemSound sound曲読込開始音 = null; public CSystemSound sound曲読込開始音 = null;
public CSystemSound sound決定音 = null; public CSystemSound soundDecideSFX = null;
public CSystemSound sound取消音 = null; public CSystemSound soundCancelSFX = null;
public CSystemSound sound変更音 = null; public CSystemSound soundChangeSFX = null;
public CSystemSound soundSongSelectChara = null; public CSystemSound soundSongSelectChara = null;
public CSystemSound soundSkip = null; public CSystemSound soundSkip = null;
public CSystemSound soundEntry = null; public CSystemSound soundEntry = null;
@ -450,13 +450,13 @@ namespace TJAPlayer3
return this.soundカーソル移動音; return this.soundカーソル移動音;
case Eシステムサウンド.SOUND決定音: case Eシステムサウンド.SOUND決定音:
return this.sound決定音; return this.soundDecideSFX;
case Eシステムサウンド.SOUND変更音: case Eシステムサウンド.SOUND変更音:
return this.sound変更音; return this.soundChangeSFX;
case Eシステムサウンド.SOUND取消音: case Eシステムサウンド.SOUND取消音:
return this.sound取消音; return this.soundCancelSFX;
case Eシステムサウンド.SOUND歓声音: case Eシステムサウンド.SOUND歓声音:
return this.sound歓声音; return this.sound歓声音;
@ -538,13 +538,13 @@ namespace TJAPlayer3
return this.soundカーソル移動音; return this.soundカーソル移動音;
case 1: case 1:
return this.sound決定音; return this.soundDecideSFX;
case 2: case 2:
return this.sound変更音; return this.soundChangeSFX;
case 3: case 3:
return this.sound取消音; return this.soundCancelSFX;
case 4: case 4:
return this.sound歓声音; return this.sound歓声音;
@ -739,9 +739,9 @@ namespace TJAPlayer3
} }
this.soundカーソル移動音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Move.ogg", false, false, false, ESoundGroup.SoundEffect); this.soundカーソル移動音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Move.ogg", false, false, false, ESoundGroup.SoundEffect);
this.sound決定音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Decide.ogg", false, false, false, ESoundGroup.SoundEffect); this.soundDecideSFX = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Decide.ogg", false, false, false, ESoundGroup.SoundEffect);
this.sound変更音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Change.ogg", false, false, false, ESoundGroup.SoundEffect); this.soundChangeSFX = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Change.ogg", false, false, false, ESoundGroup.SoundEffect);
this.sound取消音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Cancel.ogg", false, false, true, ESoundGroup.SoundEffect); this.soundCancelSFX = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Cancel.ogg", false, false, true, ESoundGroup.SoundEffect);
this.sound歓声音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Audience.ogg", false, false, true, ESoundGroup.SoundEffect); this.sound歓声音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Audience.ogg", false, false, true, ESoundGroup.SoundEffect);
this.soundSTAGEFAILED音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Stage failed.ogg", false, true, true, ESoundGroup.Voice); this.soundSTAGEFAILED音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Stage failed.ogg", false, true, true, ESoundGroup.Voice);
this.soundゲーム開始音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Game start.ogg", false, false, false, ESoundGroup.Voice); this.soundゲーム開始音 = new CSystemSound(@$"Sounds{System.IO.Path.DirectorySeparatorChar}Game start.ogg", false, false, false, ESoundGroup.Voice);

62
OpenTaiko/src/Common/CSongDict.cs
View File

@ -9,7 +9,7 @@ namespace TJAPlayer3
{ {
internal class CSongDict internal class CSongDict
{ {
private static Dictionary<string, C曲リストノード> nodes = new Dictionary<string, C曲リストノード>(); private static Dictionary<string, CSongListNode> nodes = new Dictionary<string, CSongListNode>();
private static HashSet<string> urls = new HashSet<string>(); private static HashSet<string> urls = new HashSet<string>();
public static CActSelect曲リスト.CScorePad[][] ScorePads = new CActSelect曲リスト.CScorePad[5][] public static CActSelect曲リスト.CScorePad[][] ScorePads = new CActSelect曲リスト.CScorePad[5][]
@ -33,14 +33,14 @@ namespace TJAPlayer3
#region [General song dict methods] #region [General song dict methods]
public static C曲リストノード tGetNodeFromID(string id) public static CSongListNode tGetNodeFromID(string id)
{ {
if (nodes.ContainsKey(id)) if (nodes.ContainsKey(id))
return nodes[id].Clone(); return nodes[id].Clone();
return null; return null;
} }
public static void tAddSongNode(CSongUniqueID sid, C曲リストノード node) public static void tAddSongNode(CSongUniqueID sid, CSongListNode node)
{ {
if (sid != null && sid.data.id != null && sid.data.id != "" && !nodes.ContainsKey(sid.data.id)) if (sid != null && sid.data.id != null && sid.data.id != "" && !nodes.ContainsKey(sid.data.id))
nodes.Add(sid.data.id, node.Clone()); nodes.Add(sid.data.id, node.Clone());
@ -88,10 +88,10 @@ namespace TJAPlayer3
#region [Extra methods] #region [Extra methods]
// Generate a back button // Generate a back button
public static C曲リストノード tGenerateBackButton(C曲リストノード parent, string path = "/", List<string> listStrBoxDef = null) public static CSongListNode tGenerateBackButton(CSongListNode parent, string path = "/", List<string> listStrBoxDef = null)
{ {
C曲リストノード itemBack = new C曲リストノード(); CSongListNode itemBack = new CSongListNode();
itemBack.eノード種別 = C曲リストノード.Eノード種別.BACKBOX; itemBack.eノード種別 = CSongListNode.ENodeType.BACKBOX;
// とじる // とじる
@ -108,9 +108,9 @@ namespace TJAPlayer3
itemBack.strジャンル = parent.strジャンル; itemBack.strジャンル = parent.strジャンル;
itemBack.strSelectBGPath = parent.strSelectBGPath; itemBack.strSelectBGPath = parent.strSelectBGPath;
itemBack.nスコア数 = 1; itemBack.nスコア数 = 1;
itemBack.r親ノード = parent; itemBack.rParentNode = parent;
itemBack.strSkinPath = (parent.r親ノード == null) ? itemBack.strSkinPath = (parent.rParentNode == null) ?
"" : parent.r親ノード.strSkinPath; "" : parent.rParentNode.strSkinPath;
// I guess this is used to count the number of box.def instances and only at startup, which makes using it here pretty weird // I guess this is used to count the number of box.def instances and only at startup, which makes using it here pretty weird
if (listStrBoxDef != null && itemBack.strSkinPath != "" && !listStrBoxDef.Contains(itemBack.strSkinPath)) if (listStrBoxDef != null && itemBack.strSkinPath != "" && !listStrBoxDef.Contains(itemBack.strSkinPath))
@ -118,8 +118,8 @@ namespace TJAPlayer3
listStrBoxDef.Add(itemBack.strSkinPath); listStrBoxDef.Add(itemBack.strSkinPath);
} }
itemBack.strBreadcrumbs = (itemBack.r親ノード == null) ? itemBack.strBreadcrumbs = (itemBack.rParentNode == null) ?
itemBack.strタイトル : itemBack.r親ノード.strBreadcrumbs + " > " + itemBack.strタイトル; itemBack.strタイトル : itemBack.rParentNode.strBreadcrumbs + " > " + itemBack.strタイトル;
itemBack.arスコア[0] = new Cスコア(); itemBack.arスコア[0] = new Cスコア();
itemBack.arスコア[0].ファイル情報.フォルダの絶対パス = ""; itemBack.arスコア[0].ファイル情報.フォルダの絶対パス = "";
@ -129,18 +129,18 @@ namespace TJAPlayer3
return (itemBack); return (itemBack);
} }
public static C曲リストノード tGenerateRandomButton(C曲リストノード parent, string path = "/") public static CSongListNode tGenerateRandomButton(CSongListNode parent, string path = "/")
{ {
C曲リストノード itemRandom = new C曲リストノード(); CSongListNode itemRandom = new CSongListNode();
itemRandom.eノード種別 = C曲リストノード.Eノード種別.RANDOM; itemRandom.eノード種別 = CSongListNode.ENodeType.RANDOM;
itemRandom.strタイトル = CLangManager.LangInstance.GetString(203) + " (" + path + ")"; ; itemRandom.strタイトル = CLangManager.LangInstance.GetString(203) + " (" + path + ")"; ;
itemRandom.nスコア数 = (int)Difficulty.Total; itemRandom.nスコア数 = (int)Difficulty.Total;
itemRandom.r親ノード = parent; itemRandom.rParentNode = parent;
itemRandom.strBreadcrumbs = (itemRandom.r親ノード == null) ? itemRandom.strBreadcrumbs = (itemRandom.rParentNode == null) ?
itemRandom.strタイトル : itemRandom.r親ノード.strBreadcrumbs + " > " + itemRandom.strタイトル; itemRandom.strタイトル : itemRandom.rParentNode.strBreadcrumbs + " > " + itemRandom.strタイトル;
itemRandom.arスコア[0] = new Cスコア(); itemRandom.arスコア[0] = new Cスコア();
@ -148,10 +148,10 @@ namespace TJAPlayer3
} }
// Reset the position of all back buttons, also adds a random button at the end // Reset the position of all back buttons, also adds a random button at the end
public static List<C曲リストノード> tReinsertBackButtons(C曲リストノード parent, List<C曲リストノード> songList, string path = "/", List<string> listStrBoxDef = null) public static List<CSongListNode> tReinsertBackButtons(CSongListNode parent, List<CSongListNode> songList, string path = "/", List<string> listStrBoxDef = null)
{ {
// Remove all the existing back boxes currently existing // Remove all the existing back boxes currently existing
songList.RemoveAll(e => e.eノード種別 == C曲リストノード.Eノード種別.BACKBOX || e.eノード種別 == C曲リストノード.Eノード種別.RANDOM); songList.RemoveAll(e => e.eノード種別 == CSongListNode.ENodeType.BACKBOX || e.eノード種別 == CSongListNode.ENodeType.RANDOM);
int songCount = songList.Count; int songCount = songList.Count;
@ -169,11 +169,11 @@ namespace TJAPlayer3
} }
private static C曲リストノード tReadaptChildNote(C曲リストノード parent, C曲リストノード node) private static CSongListNode tReadaptChildNote(CSongListNode parent, CSongListNode node)
{ {
if (node != null) if (node != null)
{ {
node.r親ノード = parent; node.rParentNode = parent;
node.isChangedBgType = parent.isChangedBgType; node.isChangedBgType = parent.isChangedBgType;
node.isChangedBgColor = parent.isChangedBgColor; node.isChangedBgColor = parent.isChangedBgColor;
node.isChangedBoxType = parent.isChangedBoxType; node.isChangedBoxType = parent.isChangedBoxType;
@ -192,9 +192,9 @@ namespace TJAPlayer3
} }
// Generate the favorite folder content // Generate the favorite folder content
public static List<C曲リストノード> tFetchFavoriteFolder(C曲リストノード parent) public static List<CSongListNode> tFetchFavoriteFolder(CSongListNode parent)
{ {
List<C曲リストノード> childList = new List<C曲リストノード>(); List<CSongListNode> childList = new List<CSongListNode>();
foreach (string id in TJAPlayer3.Favorites.data.favorites[TJAPlayer3.SaveFile]) foreach (string id in TJAPlayer3.Favorites.data.favorites[TJAPlayer3.SaveFile])
{ {
@ -216,9 +216,9 @@ namespace TJAPlayer3
} }
// Generate recently played songs folder // Generate recently played songs folder
public static List<C曲リストノード> tFetchRecentlyPlayedSongsFolder(C曲リストノード parent) public static List<CSongListNode> tFetchRecentlyPlayedSongsFolder(CSongListNode parent)
{ {
List<C曲リストノード> childList = new List<C曲リストノード>(); List<CSongListNode> childList = new List<CSongListNode>();
foreach (string id in TJAPlayer3.RecentlyPlayedSongs.data.recentlyplayedsongs[TJAPlayer3.SaveFile].Reverse()) foreach (string id in TJAPlayer3.RecentlyPlayedSongs.data.recentlyplayedsongs[TJAPlayer3.SaveFile].Reverse())
{ {
@ -248,11 +248,11 @@ namespace TJAPlayer3
} }
// Generate search by difficulty folder // Generate search by difficulty folder
public static List<C曲リストノード> tFetchSongsByDifficulty(C曲リストノード parent, int difficulty = (int)Difficulty.Oni, int level = 8) public static List<CSongListNode> tFetchSongsByDifficulty(CSongListNode parent, int difficulty = (int)Difficulty.Oni, int level = 8)
{ {
List<C曲リストノード> childList = new List<C曲リストノード>(); List<CSongListNode> childList = new List<CSongListNode>();
foreach (C曲リストノード nodeT in nodes.Values) foreach (CSongListNode nodeT in nodes.Values)
{ {
var score = nodeT.nLevel; var score = nodeT.nLevel;
if (tLevelMatches(score[difficulty], level) if (tLevelMatches(score[difficulty], level)
@ -303,18 +303,18 @@ namespace TJAPlayer3
#region [Load nodes] #region [Load nodes]
foreach (C曲リストノード song in nodes.Values) foreach (CSongListNode song in nodes.Values)
{ {
for (int pl = 0; pl < 5; pl++) for (int pl = 0; pl < 5; pl++)
{ {
CActSelect曲リスト.CScorePad[] SPArrRef = ScorePads[pl]; CActSelect曲リスト.CScorePad[] SPArrRef = ScorePads[pl];
if (song.eノード種別 == C曲リストノード.Eノード種別.SCORE if (song.eノード種別 == CSongListNode.ENodeType.SCORE
&& song.strジャンル != "最近遊んだ曲" && song.strジャンル != "最近遊んだ曲"
&& song.strジャンル != "Favorite" && song.strジャンル != "Favorite"
&& song.strジャンル != "SearchD") && song.strジャンル != "SearchD")
{ {
var score = song.arスコア[TJAPlayer3.stage選曲.act曲リスト.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)]; var score = song.arスコア[TJAPlayer3.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)];
if (score != null) if (score != null)
{ {

128
OpenTaiko/src/Common/C定数.cs
View File

@ -69,7 +69,7 @@ namespace TJAPlayer3
普通 = 1, 普通 = 1,
大きい = 2 大きい = 2
} }
public enum Eパッド // 演奏用のenum。ここを修正するときは、次に出てくる EKeyConfigPad と EパッドFlag もセットで修正すること。 public enum EPad // 演奏用のenum。ここを修正するときは、次に出てくる EKeyConfigPad と EパッドFlag もセットで修正すること。
{ {
HH = 0, HH = 0,
R = 0, R = 0,
@ -129,58 +129,58 @@ namespace TJAPlayer3
} }
public enum EKeyConfigPad // #24609 キーコンフィグで使うenum。capture要素あり。 public enum EKeyConfigPad // #24609 キーコンフィグで使うenum。capture要素あり。
{ {
HH = Eパッド.HH, HH = EPad.HH,
R = Eパッド.R, R = EPad.R,
SD = Eパッド.SD, SD = EPad.SD,
G = Eパッド.G, G = EPad.G,
BD = Eパッド.BD, BD = EPad.BD,
B = Eパッド.B, B = EPad.B,
HT = Eパッド.HT, HT = EPad.HT,
Pick = Eパッド.Pick, Pick = EPad.Pick,
LT = Eパッド.LT, LT = EPad.LT,
Wail = Eパッド.Wail, Wail = EPad.Wail,
FT = Eパッド.FT, FT = EPad.FT,
Cancel = Eパッド.Cancel, Cancel = EPad.Cancel,
CY = Eパッド.CY, CY = EPad.CY,
Decide = Eパッド.Decide, Decide = EPad.Decide,
HHO = Eパッド.HHO, HHO = EPad.HHO,
RD = Eパッド.RD, RD = EPad.RD,
LC = Eパッド.LC, LC = EPad.LC,
LP = Eパッド.LP, // #27029 2012.1.4 from LP = EPad.LP, // #27029 2012.1.4 from
LBD = Eパッド.LBD, LBD = EPad.LBD,
#region [Gameplay Keys] #region [Gameplay Keys]
LRed = Eパッド.LRed, LRed = EPad.LRed,
RRed = Eパッド.RRed, RRed = EPad.RRed,
LBlue = Eパッド.LBlue, LBlue = EPad.LBlue,
RBlue = Eパッド.RBlue, RBlue = EPad.RBlue,
LRed2P = Eパッド.LRed2P, LRed2P = EPad.LRed2P,
RRed2P = Eパッド.RRed2P, RRed2P = EPad.RRed2P,
LBlue2P = Eパッド.LBlue2P, LBlue2P = EPad.LBlue2P,
RBlue2P = Eパッド.RBlue2P, RBlue2P = EPad.RBlue2P,
LRed3P = Eパッド.LRed3P, LRed3P = EPad.LRed3P,
RRed3P = Eパッド.RRed3P, RRed3P = EPad.RRed3P,
LBlue3P = Eパッド.LBlue3P, LBlue3P = EPad.LBlue3P,
RBlue3P = Eパッド.RBlue3P, RBlue3P = EPad.RBlue3P,
LRed4P = Eパッド.LRed4P, LRed4P = EPad.LRed4P,
RRed4P = Eパッド.RRed4P, RRed4P = EPad.RRed4P,
LBlue4P = Eパッド.LBlue4P, LBlue4P = EPad.LBlue4P,
RBlue4P = Eパッド.RBlue4P, RBlue4P = EPad.RBlue4P,
LRed5P = Eパッド.LRed5P, LRed5P = EPad.LRed5P,
RRed5P = Eパッド.RRed5P, RRed5P = EPad.RRed5P,
LBlue5P = Eパッド.LBlue5P, LBlue5P = EPad.LBlue5P,
RBlue5P = Eパッド.RBlue5P, RBlue5P = EPad.RBlue5P,
Clap = Eパッド.CLAP, Clap = EPad.CLAP,
Clap2P = Eパッド.CLAP2P, Clap2P = EPad.CLAP2P,
Clap3P = Eパッド.CLAP3P, Clap3P = EPad.CLAP3P,
Clap4P = Eパッド.CLAP4P, Clap4P = EPad.CLAP4P,
Clap5P = Eパッド.CLAP5P, Clap5P = EPad.CLAP5P,
LeftChange = Eパッド.LeftChange, LeftChange = EPad.LeftChange,
RightChange = Eパッド.RightChange, RightChange = EPad.RightChange,
#endregion #endregion
#region [System Keys] #region [System Keys]
Capture, Capture,
@ -198,7 +198,7 @@ namespace TJAPlayer3
#endregion #endregion
MAX, MAX,
#endregion #endregion
UNKNOWN = Eパッド.UNKNOWN UNKNOWN = EPad.UNKNOWN
} }
[Flags] [Flags]
public enum EパッドFlag // #24063 2011.1.16 yyagi コマンド入力用 パッド入力のフラグ化 public enum EパッドFlag // #24063 2011.1.16 yyagi コマンド入力用 パッド入力のフラグ化
@ -256,7 +256,7 @@ namespace TJAPlayer3
KONGA = 1, KONGA = 1,
} }
public enum E楽器パート // ここを修正するときは、セットで次の EKeyConfigPart も修正すること。 public enum EInstrumentPad // ここを修正するときは、セットで次の EKeyConfigPart も修正すること。
{ {
DRUMS = 0, DRUMS = 0,
GUITAR = 1, GUITAR = 1,
@ -266,12 +266,12 @@ namespace TJAPlayer3
} }
public enum EKeyConfigPart // : E楽器パート public enum EKeyConfigPart // : E楽器パート
{ {
DRUMS = E楽器パート.DRUMS, DRUMS = EInstrumentPad.DRUMS,
GUITAR = E楽器パート.GUITAR, GUITAR = EInstrumentPad.GUITAR,
BASS = E楽器パート.BASS, BASS = EInstrumentPad.BASS,
TAIKO = E楽器パート.TAIKO, TAIKO = EInstrumentPad.TAIKO,
SYSTEM, SYSTEM,
UNKNOWN = E楽器パート.UNKNOWN UNKNOWN = EInstrumentPad.UNKNOWN
} }
public enum E打ち分け時の再生の優先順位 public enum E打ち分け時の再生の優先順位
@ -440,19 +440,19 @@ namespace TJAPlayer3
{ {
switch( index ) switch( index )
{ {
case (int) E楽器パート.DRUMS: case (int) EInstrumentPad.DRUMS:
return this.Drums; return this.Drums;
case (int) E楽器パート.GUITAR: case (int) EInstrumentPad.GUITAR:
return this.Guitar; return this.Guitar;
case (int) E楽器パート.BASS: case (int) EInstrumentPad.BASS:
return this.Bass; return this.Bass;
case (int) E楽器パート.TAIKO: case (int) EInstrumentPad.TAIKO:
return this.Taiko; return this.Taiko;
case (int) E楽器パート.UNKNOWN: case (int) EInstrumentPad.UNKNOWN:
return this.Unknown; return this.Unknown;
} }
throw new IndexOutOfRangeException(); throw new IndexOutOfRangeException();
@ -461,23 +461,23 @@ namespace TJAPlayer3
{ {
switch( index ) switch( index )
{ {
case (int) E楽器パート.DRUMS: case (int) EInstrumentPad.DRUMS:
this.Drums = value; this.Drums = value;
return; return;
case (int) E楽器パート.GUITAR: case (int) EInstrumentPad.GUITAR:
this.Guitar = value; this.Guitar = value;
return; return;
case (int) E楽器パート.BASS: case (int) EInstrumentPad.BASS:
this.Bass = value; this.Bass = value;
return; return;
case (int) E楽器パート.TAIKO: case (int) EInstrumentPad.TAIKO:
this.Taiko = value; this.Taiko = value;
return; return;
case (int) E楽器パート.UNKNOWN: case (int) EInstrumentPad.UNKNOWN:
this.Unknown = value; this.Unknown = value;
return; return;
} }

4
OpenTaiko/src/Common/C文字コンソール.cs
View File

@ -83,8 +83,8 @@ namespace TJAPlayer3
this.txフォント8x16[ 0 ] = TJAPlayer3.Tx.TxC(@"Console_Font.png"); this.txフォント8x16[ 0 ] = TJAPlayer3.Tx.TxC(@"Console_Font.png");
this.txフォント8x16[ 1 ] = TJAPlayer3.Tx.TxC(@"Console_Font_Small.png"); this.txフォント8x16[ 1 ] = TJAPlayer3.Tx.TxC(@"Console_Font_Small.png");
nFontWidth = this.txフォント8x16[0].szテクスチャサイズ.Width / 32; nFontWidth = this.txフォント8x16[0].szTextureSize.Width / 32;
nFontHeight = this.txフォント8x16[0].szテクスチャサイズ.Height / 16; nFontHeight = this.txフォント8x16[0].szTextureSize.Height / 16;
this.rc文字の矩形領域 = new Rectangle[3, str表記可能文字.Length]; this.rc文字の矩形領域 = new Rectangle[3, str表記可能文字.Length];
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)

2
OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs
View File

@ -38,7 +38,7 @@ namespace TJAPlayer3
keyboard.KeyPressing((int)SlimDXKeys.Key.RightControl)) keyboard.KeyPressing((int)SlimDXKeys.Key.RightControl))
{ {
soundGroup = ESoundGroup.SoundEffect; soundGroup = ESoundGroup.SoundEffect;
システムサウンド = skin.sound決定音; システムサウンド = skin.soundDecideSFX;
} }
else if (keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift) || else if (keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift) ||
keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift)) keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift))

10
OpenTaiko/src/Common/Modal.cs
View File

@ -53,10 +53,10 @@ namespace TJAPlayer3
*/ */
_boxRect = new Rectangle( _boxRect = new Rectangle(
(modalFormat == EModalFormat.Full || player == 0) ? 0 : _box.szテクスチャサイズ.Width / 2, (modalFormat == EModalFormat.Full || player == 0) ? 0 : _box.szTextureSize.Width / 2,
0, 0,
(modalFormat == EModalFormat.Full) ? _box.szテクスチャサイズ.Width : _box.szテクスチャサイズ.Width / 2, (modalFormat == EModalFormat.Full) ? _box.szTextureSize.Width : _box.szTextureSize.Width / 2,
_box.szテクスチャサイズ.Height / (((TJAPlayer3.ConfigIni.nPlayerCount - 1) / 2) + 1)); _box.szTextureSize.Height / (((TJAPlayer3.ConfigIni.nPlayerCount - 1) / 2) + 1));
tGenerateTextures(); tGenerateTextures();
@ -254,8 +254,8 @@ namespace TJAPlayer3
Color.Black, Color.Black,
1800); 1800);
_ModalText = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_content); _ModalText = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_content);
_ModalTitle = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_title); _ModalTitle = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_title);
} }
private CTexture _box; private CTexture _box;

2
OpenTaiko/src/Common/SaveFile.cs
View File

@ -163,7 +163,7 @@ namespace TJAPlayer3
#region [Player stats] #region [Player stats]
public void tUpdateSongClearStatus(C曲リストノード node, int clearStatus, int difficulty) public void tUpdateSongClearStatus(CSongListNode node, int clearStatus, int difficulty)
{ {
if (difficulty > (int)Difficulty.Edit) return; if (difficulty > (int)Difficulty.Edit) return;

118
OpenTaiko/src/Common/TJAPlayer3.cs
View File

@ -231,7 +231,7 @@ namespace TJAPlayer3
get; get;
private set; private set;
} }
public static CInputManager Input管理 public static CInputManager InputManager
{ {
get; get;
private set; private set;
@ -241,10 +241,10 @@ namespace TJAPlayer3
{ {
get get
{ {
if( stage選曲.r確定された曲 != null ) if( stageSongSelect.rChoosenSong != null )
{ {
C曲リストノード c曲リストノード = stage選曲.r確定された曲.r親ノード; CSongListNode c曲リストノード = stageSongSelect.rChoosenSong.rParentNode;
if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == C曲リストノード.Eノード種別.BOX ) ) && ( c曲リストノード.nPerfect範囲ms >= 0 ) ) if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX ) ) && ( c曲リストノード.nPerfect範囲ms >= 0 ) )
{ {
return c曲リストノード.nPerfect範囲ms; return c曲リストノード.nPerfect範囲ms;
} }
@ -256,10 +256,10 @@ namespace TJAPlayer3
{ {
get get
{ {
if( stage選曲.r確定された曲 != null ) if( stageSongSelect.rChoosenSong != null )
{ {
C曲リストノード c曲リストノード = stage選曲.r確定された曲.r親ノード; CSongListNode c曲リストノード = stageSongSelect.rChoosenSong.rParentNode;
if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == C曲リストノード.Eノード種別.BOX ) ) && ( c曲リストノード.nGreat範囲ms >= 0 ) ) if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX ) ) && ( c曲リストノード.nGreat範囲ms >= 0 ) )
{ {
return c曲リストノード.nGreat範囲ms; return c曲リストノード.nGreat範囲ms;
} }
@ -271,10 +271,10 @@ namespace TJAPlayer3
{ {
get get
{ {
if( stage選曲.r確定された曲 != null ) if( stageSongSelect.rChoosenSong != null )
{ {
C曲リストノード c曲リストノード = stage選曲.r確定された曲.r親ノード; CSongListNode c曲リストノード = stageSongSelect.rChoosenSong.rParentNode;
if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == C曲リストノード.Eノード種別.BOX ) ) && ( c曲リストノード.nGood範囲ms >= 0 ) ) if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX ) ) && ( c曲リストノード.nGood範囲ms >= 0 ) )
{ {
return c曲リストノード.nGood範囲ms; return c曲リストノード.nGood範囲ms;
} }
@ -286,10 +286,10 @@ namespace TJAPlayer3
{ {
get get
{ {
if( stage選曲.r確定された曲 != null ) if( stageSongSelect.rChoosenSong != null )
{ {
C曲リストノード c曲リストノード = stage選曲.r確定された曲.r親ノード; CSongListNode c曲リストノード = stageSongSelect.rChoosenSong.rParentNode;
if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == C曲リストノード.Eノード種別.BOX ) ) && ( c曲リストノード.nPoor範囲ms >= 0 ) ) if( ( ( c曲リストノード != null ) && ( c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX ) ) && ( c曲リストノード.nPoor範囲ms >= 0 ) )
{ {
return c曲リストノード.nPoor範囲ms; return c曲リストノード.nPoor範囲ms;
} }
@ -402,7 +402,7 @@ namespace TJAPlayer3
get; get;
private set; private set;
} }
public static CStage選曲 stage選曲 public static CStage選曲 stageSongSelect
{ {
get; get;
private set; private set;
@ -756,7 +756,7 @@ namespace TJAPlayer3
} }
protected override void Update() protected override void Update()
{ {
Input管理?.Polling( TJAPlayer3.ConfigIni.bBufferedInputs ); InputManager?.Polling( TJAPlayer3.ConfigIni.bBufferedInputs );
} }
protected override void Draw() protected override void Draw()
{ {
@ -854,7 +854,7 @@ namespace TJAPlayer3
Directory.SetCurrentDirectory( sp.pluginDirectory ); Directory.SetCurrentDirectory( sp.pluginDirectory );
if( TJAPlayer3.act現在入力を占有中のプラグイン == null || TJAPlayer3.act現在入力を占有中のプラグイン == sp.plugin ) if( TJAPlayer3.act現在入力を占有中のプラグイン == null || TJAPlayer3.act現在入力を占有中のプラグイン == sp.plugin )
sp.plugin.On進行描画(TJAPlayer3.Pad, TJAPlayer3.Input管理.Keyboard ); sp.plugin.On進行描画(TJAPlayer3.Pad, TJAPlayer3.InputManager.Keyboard );
else else
sp.plugin.On進行描画( null, null ); sp.plugin.On進行描画( null, null );
@ -891,7 +891,7 @@ namespace TJAPlayer3
actEnumSongs.CreateManagedResource(); actEnumSongs.CreateManagedResource();
actEnumSongs.CreateUnmanagedResource(); actEnumSongs.CreateUnmanagedResource();
} }
TJAPlayer3.stage選曲.bIsEnumeratingSongs = true; TJAPlayer3.stageSongSelect.bIsEnumeratingSongs = true;
EnumSongs.Init(); // 取得した曲数を、新インスタンスにも与える EnumSongs.Init(); // 取得した曲数を、新インスタンスにも与える
EnumSongs.StartEnumFromDisk(); // 曲検索スレッドの起動_開始 EnumSongs.StartEnumFromDisk(); // 曲検索スレッドの起動_開始
} }
@ -944,10 +944,10 @@ namespace TJAPlayer3
actEnumSongs.ReleaseManagedResource(); actEnumSongs.ReleaseManagedResource();
actEnumSongs.ReleaseUnmanagedResource(); actEnumSongs.ReleaseUnmanagedResource();
} }
TJAPlayer3.stage選曲.bIsEnumeratingSongs = false; TJAPlayer3.stageSongSelect.bIsEnumeratingSongs = false;
bool bRemakeSongTitleBar = ( r現在のステージ.eStageID == CStage.EStage.SongSelect ) ? true : false; bool bRemakeSongTitleBar = ( r現在のステージ.eStageID == CStage.EStage.SongSelect ) ? true : false;
TJAPlayer3.stage選曲.Refresh( EnumSongs.Songs管理, bRemakeSongTitleBar ); TJAPlayer3.stageSongSelect.Refresh( EnumSongs.Songs管理, bRemakeSongTitleBar );
EnumSongs.SongListEnumCompletelyDone(); EnumSongs.SongListEnumCompletelyDone();
} }
#endregion #endregion
@ -1033,16 +1033,16 @@ namespace TJAPlayer3
} }
Trace.TraceInformation( "----------------------" ); Trace.TraceInformation( "----------------------" );
Trace.TraceInformation( "■ 選曲" ); Trace.TraceInformation( "■ 選曲" );
stage選曲.Activate(); stageSongSelect.Activate();
if (!ConfigIni.PreAssetsLoading) if (!ConfigIni.PreAssetsLoading)
{ {
stage選曲.CreateManagedResource(); stageSongSelect.CreateManagedResource();
stage選曲.CreateUnmanagedResource(); stageSongSelect.CreateUnmanagedResource();
} }
r直前のステージ = r現在のステージ; r直前のステージ = r現在のステージ;
r現在のステージ = stage選曲; r現在のステージ = stageSongSelect;
TJAPlayer3.latestSongSelect = stage選曲; TJAPlayer3.latestSongSelect = stageSongSelect;
//----------------------------- //-----------------------------
#endregion #endregion
break; break;
@ -1220,16 +1220,16 @@ namespace TJAPlayer3
} }
Trace.TraceInformation("----------------------"); Trace.TraceInformation("----------------------");
Trace.TraceInformation("■ 選曲"); Trace.TraceInformation("■ 選曲");
stage選曲.Activate(); stageSongSelect.Activate();
if (!ConfigIni.PreAssetsLoading) if (!ConfigIni.PreAssetsLoading)
{ {
stage選曲.CreateManagedResource(); stageSongSelect.CreateManagedResource();
stage選曲.CreateUnmanagedResource(); stageSongSelect.CreateUnmanagedResource();
} }
r直前のステージ = r現在のステージ; r直前のステージ = r現在のステージ;
r現在のステージ = stage選曲; r現在のステージ = stageSongSelect;
TJAPlayer3.latestSongSelect = stage選曲; TJAPlayer3.latestSongSelect = stageSongSelect;
ConfigIni.nPreviousPlayerCount = ConfigIni.nPlayerCount; ConfigIni.nPreviousPlayerCount = ConfigIni.nPlayerCount;
ConfigIni.nPlayerCount = 2; ConfigIni.nPlayerCount = 2;
ConfigIni.bAIBattleMode = true; ConfigIni.bAIBattleMode = true;
@ -1302,14 +1302,14 @@ namespace TJAPlayer3
} }
Trace.TraceInformation( "----------------------" ); Trace.TraceInformation( "----------------------" );
Trace.TraceInformation( "■ 選曲" ); Trace.TraceInformation( "■ 選曲" );
stage選曲.Activate(); stageSongSelect.Activate();
if (!ConfigIni.PreAssetsLoading) if (!ConfigIni.PreAssetsLoading)
{ {
stage選曲.CreateManagedResource(); stageSongSelect.CreateManagedResource();
stage選曲.CreateUnmanagedResource(); stageSongSelect.CreateUnmanagedResource();
} }
r直前のステージ = r現在のステージ; r直前のステージ = r現在のステージ;
r現在のステージ = stage選曲; r現在のステージ = stageSongSelect;
foreach( STPlugin pg in this.PluginList ) foreach( STPlugin pg in this.PluginList )
{ {
@ -1929,14 +1929,14 @@ for (int i = 0; i < 3; i++) {
Trace.TraceInformation("----------------------"); Trace.TraceInformation("----------------------");
Trace.TraceInformation("■ 選曲"); Trace.TraceInformation("■ 選曲");
stage選曲.Activate(); stageSongSelect.Activate();
if (!ConfigIni.PreAssetsLoading) if (!ConfigIni.PreAssetsLoading)
{ {
stage選曲.CreateManagedResource(); stageSongSelect.CreateManagedResource();
stage選曲.CreateUnmanagedResource(); stageSongSelect.CreateUnmanagedResource();
} }
r直前のステージ = r現在のステージ; r直前のステージ = r現在のステージ;
r現在のステージ = stage選曲; r現在のステージ = stageSongSelect;
#region [ プラグイン Onステージ変更() の呼び出し ] #region [ プラグイン Onステージ変更() の呼び出し ]
//--------------------- //---------------------
@ -2104,7 +2104,7 @@ for (int i = 0; i < 3; i++) {
// Seek latest registered song select screen // Seek latest registered song select screen
r現在のステージ = TJAPlayer3.latestSongSelect; r現在のステージ = TJAPlayer3.latestSongSelect;
stage選曲.NowSong++; stageSongSelect.NowSong++;
foreach (STPlugin pg in this.PluginList) foreach (STPlugin pg in this.PluginList)
{ {
@ -2207,14 +2207,14 @@ for (int i = 0; i < 3; i++) {
} }
Trace.TraceInformation( "----------------------" ); Trace.TraceInformation( "----------------------" );
Trace.TraceInformation( "■ 選曲" ); Trace.TraceInformation( "■ 選曲" );
stage選曲.Activate(); stageSongSelect.Activate();
if (!ConfigIni.PreAssetsLoading) if (!ConfigIni.PreAssetsLoading)
{ {
stage選曲.CreateManagedResource(); stageSongSelect.CreateManagedResource();
stage選曲.CreateUnmanagedResource(); stageSongSelect.CreateUnmanagedResource();
} }
r直前のステージ = r現在のステージ; r直前のステージ = r現在のステージ;
r現在のステージ = stage選曲; r現在のステージ = stageSongSelect;
this.tガベージコレクションを実行する(); this.tガベージコレクションを実行する();
} }
//----------------------------- //-----------------------------
@ -2321,7 +2321,7 @@ for (int i = 0; i < 3; i++) {
this.bネットワークに接続中 = reply.Status == IPStatus.Success; this.bネットワークに接続中 = reply.Status == IPStatus.Success;
}); });
} }
TJAPlayer3.Tx.Network_Connection.t2D描画(GameWindowSize.Width - (TJAPlayer3.Tx.Network_Connection.szテクスチャサイズ.Width / 2), GameWindowSize.Height - TJAPlayer3.Tx.Network_Connection.szテクスチャサイズ.Height, new Rectangle((TJAPlayer3.Tx.Network_Connection.szテクスチャサイズ.Width / 2) * (this.bネットワークに接続中 ? 0 : 1), 0, TJAPlayer3.Tx.Network_Connection.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.Network_Connection.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Network_Connection.t2D描画(GameWindowSize.Width - (TJAPlayer3.Tx.Network_Connection.szTextureSize.Width / 2), GameWindowSize.Height - TJAPlayer3.Tx.Network_Connection.szTextureSize.Height, new Rectangle((TJAPlayer3.Tx.Network_Connection.szTextureSize.Width / 2) * (this.bネットワークに接続中 ? 0 : 1), 0, TJAPlayer3.Tx.Network_Connection.szTextureSize.Width / 2, TJAPlayer3.Tx.Network_Connection.szTextureSize.Height));
} }
// オーバレイを描画する(テクスチャの生成されていない起動ステージは例外 // オーバレイを描画する(テクスチャの生成されていない起動ステージは例外
@ -2340,7 +2340,7 @@ for (int i = 0; i < 3; i++) {
if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.Capture)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.Capture))
{ {
#if DEBUG #if DEBUG
if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl)) if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl))
{ {
if (r現在のステージ.eStageID != CStage.EStage.Game) if (r現在のステージ.eStageID != CStage.EStage.Game)
{ {
@ -2556,8 +2556,8 @@ for (int i = 0; i < 3; i++) {
public static float GetSongNameXScaling(ref CTexture cTexture, int samePixel = 660) public static float GetSongNameXScaling(ref CTexture cTexture, int samePixel = 660)
{ {
if (cTexture == null) return 1f; if (cTexture == null) return 1f;
float scalingRate = (float)samePixel / (float)cTexture.szテクスチャサイズ.Width; float scalingRate = (float)samePixel / (float)cTexture.szTextureSize.Width;
if (cTexture.szテクスチャサイズ.Width <= samePixel) if (cTexture.szTextureSize.Width <= samePixel)
scalingRate = 1.0f; scalingRate = 1.0f;
return scalingRate; return scalingRate;
} }
@ -2808,8 +2808,8 @@ for (int i = 0; i < 3; i++) {
try try
{ {
bool bUseMIDIIn = !DTXVmode.Enabled; bool bUseMIDIIn = !DTXVmode.Enabled;
Input管理 = new CInputManager(Window_); InputManager = new CInputManager(Window_);
foreach( IInputDevice device in Input管理.InputDevices ) foreach( IInputDevice device in InputManager.InputDevices )
{ {
if( ( device.CurrentType == InputDeviceType.Joystick ) && !ConfigIni.dicJoystick.ContainsValue( device.GUID ) ) if( ( device.CurrentType == InputDeviceType.Joystick ) && !ConfigIni.dicJoystick.ContainsValue( device.GUID ) )
{ {
@ -2830,7 +2830,7 @@ for (int i = 0; i < 3; i++) {
ConfigIni.dicGamepad.Add( key, device.GUID ); ConfigIni.dicGamepad.Add( key, device.GUID );
} }
} }
foreach( IInputDevice device2 in Input管理.InputDevices ) foreach( IInputDevice device2 in InputManager.InputDevices )
{ {
if( device2.CurrentType == InputDeviceType.Joystick ) if( device2.CurrentType == InputDeviceType.Joystick )
{ {
@ -2876,7 +2876,7 @@ for (int i = 0; i < 3; i++) {
Trace.Indent(); Trace.Indent();
try try
{ {
Pad = new CPad( ConfigIni, Input管理 ); Pad = new CPad( ConfigIni, InputManager );
Trace.TraceInformation( "パッドの初期化を完了しました。" ); Trace.TraceInformation( "パッドの初期化を完了しました。" );
} }
catch( Exception exception3 ) catch( Exception exception3 )
@ -3007,7 +3007,7 @@ for (int i = 0; i < 3; i++) {
stageタイトル = new CStageタイトル(); stageタイトル = new CStageタイトル();
// stageオプション = new CStageオプション(); // stageオプション = new CStageオプション();
stageコンフィグ = new CStageコンフィグ(); stageコンフィグ = new CStageコンフィグ();
stage選曲 = new CStage選曲(); stageSongSelect = new CStage選曲();
stage段位選択 = new CStage段位選択(); stage段位選択 = new CStage段位選択();
stageHeya = new CStageHeya(); stageHeya = new CStageHeya();
stageOnlineLounge = new CStageOnlineLounge(); stageOnlineLounge = new CStageOnlineLounge();
@ -3027,7 +3027,7 @@ for (int i = 0; i < 3; i++) {
this.listトップレベルActivities.Add( stageタイトル ); this.listトップレベルActivities.Add( stageタイトル );
// this.listトップレベルActivities.Add( stageオプション ); // this.listトップレベルActivities.Add( stageオプション );
this.listトップレベルActivities.Add( stageコンフィグ ); this.listトップレベルActivities.Add( stageコンフィグ );
this.listトップレベルActivities.Add( stage選曲 ); this.listトップレベルActivities.Add( stageSongSelect );
this.listトップレベルActivities.Add( stage段位選択 ); this.listトップレベルActivities.Add( stage段位選択 );
this.listトップレベルActivities.Add( stageHeya ); this.listトップレベルActivities.Add( stageHeya );
this.listトップレベルActivities.Add(stageOnlineLounge); this.listトップレベルActivities.Add(stageOnlineLounge);
@ -3336,14 +3336,14 @@ for (int i = 0; i < 3; i++) {
#endregion #endregion
#region [ DirectInput, MIDI入力の終了処理 ] #region [ DirectInput, MIDI入力の終了処理 ]
//--------------------- //---------------------
if (Input管理 != null) if (InputManager != null)
{ {
Trace.TraceInformation( "DirectInput, MIDI入力の終了処理を行います。" ); Trace.TraceInformation( "DirectInput, MIDI入力の終了処理を行います。" );
Trace.Indent(); Trace.Indent();
try try
{ {
Input管理.Dispose(); InputManager.Dispose();
Input管理 = null; InputManager = null;
Trace.TraceInformation( "DirectInput, MIDI入力の終了処理を完了しました。" ); Trace.TraceInformation( "DirectInput, MIDI入力の終了処理を完了しました。" );
} }
catch( Exception exception5 ) catch( Exception exception5 )
@ -3547,12 +3547,12 @@ for (int i = 0; i < 3; i++) {
ini.tヒストリを追加する( str新ヒストリ行 ); ini.tヒストリを追加する( str新ヒストリ行 );
if( !bコンパクトモード ) if( !bコンパクトモード )
{ {
stage選曲.r確定されたスコア.譜面情報.演奏回数.Drums = ini.stファイル.PlayCountDrums; stageSongSelect.r確定されたスコア.譜面情報.演奏回数.Drums = ini.stファイル.PlayCountDrums;
stage選曲.r確定されたスコア.譜面情報.演奏回数.Guitar = ini.stファイル.PlayCountGuitar; stageSongSelect.r確定されたスコア.譜面情報.演奏回数.Guitar = ini.stファイル.PlayCountGuitar;
stage選曲.r確定されたスコア.譜面情報.演奏回数.Bass = ini.stファイル.PlayCountBass; stageSongSelect.r確定されたスコア.譜面情報.演奏回数.Bass = ini.stファイル.PlayCountBass;
for( int j = 0; j < ini.stファイル.History.Length; j++ ) for( int j = 0; j < ini.stファイル.History.Length; j++ )
{ {
stage選曲.r確定されたスコア.譜面情報.演奏履歴[ j ] = ini.stファイル.History[ j ]; stageSongSelect.r確定されたスコア.譜面情報.演奏履歴[ j ] = ini.stファイル.History[ j ];
} }
} }
} }

8
OpenTaiko/src/Components/CSongReplay.cs
View File

@ -274,7 +274,7 @@ namespace TJAPlayer3
int actualPlayer = TJAPlayer3.GetActualPlayer(storedPlayer); int actualPlayer = TJAPlayer3.GetActualPlayer(storedPlayer);
// Game mode // Game mode
switch (TJAPlayer3.stage選曲.n確定された曲の難易度[0]) switch (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0])
{ {
case (int)Difficulty.Dan: case (int)Difficulty.Dan:
GameMode = 1; GameMode = 1;
@ -358,9 +358,9 @@ namespace TJAPlayer3
CompressedInputs = SevenZip.Compression.LZMA.SevenZipHelper.Compress(barr); CompressedInputs = SevenZip.Compression.LZMA.SevenZipHelper.Compress(barr);
CompressedInputsSize = CompressedInputs.Length; CompressedInputsSize = CompressedInputs.Length;
// Chart metadata // Chart metadata
ChartUniqueID = TJAPlayer3.stage選曲.r確定された曲.uniqueId.data.id; ChartUniqueID = TJAPlayer3.stageSongSelect.rChoosenSong.uniqueId.data.id;
ChartDifficulty = (byte)TJAPlayer3.stage選曲.n確定された曲の難易度[storedPlayer]; ChartDifficulty = (byte)TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[storedPlayer];
ChartLevel = (byte)Math.Min(255, TJAPlayer3.stage選曲.r確定された曲.arスコア[ChartDifficulty].譜面情報.nレベル[ChartDifficulty]); ChartLevel = (byte)Math.Min(255, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[ChartDifficulty].譜面情報.nレベル[ChartDifficulty]);
// Online score ID used for online leaderboards linking, given by the server (Defaulted to 0 for now) // Online score ID used for online leaderboards linking, given by the server (Defaulted to 0 for now)
OnlineScoreID = 0; OnlineScoreID = 0;
// Replay Checksum (Calculate at the end) // Replay Checksum (Calculate at the end)

2
OpenTaiko/src/Databases/DBCharacter.cs
View File

@ -27,7 +27,7 @@ namespace TJAPlayer3
public string tGetGaugeType() public string tGetGaugeType()
{ {
return TJAPlayer3.ConfigIni.bForceNormalGauge || TJAPlayer3.stage選曲.n確定された曲の難易度[0] >= 5 ? "Normal" : Gauge; return TJAPlayer3.ConfigIni.bForceNormalGauge || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] >= 5 ? "Normal" : Gauge;
} }

70
OpenTaiko/src/Helpers/HGaugeMethods.cs
View File

@ -168,8 +168,8 @@ namespace TJAPlayer3
{ {
if (baseTexture != null) if (baseTexture != null)
{ {
baseTexture.vc拡大縮小倍率.X = scale_x; baseTexture.vcScaleRatio.X = scale_x;
baseTexture.vc拡大縮小倍率.Y = scale_y; baseTexture.vcScaleRatio.Y = scale_y;
baseTexture.t2D描画(x, y, baseTexture.t2D描画(x, y,
new Rectangle( new Rectangle(
@ -189,8 +189,8 @@ namespace TJAPlayer3
if (baseTexture != null) if (baseTexture != null)
{ {
baseTexture.vc拡大縮小倍率.X = scale_x; baseTexture.vcScaleRatio.X = scale_x;
baseTexture.vc拡大縮小倍率.Y = scale_y; baseTexture.vcScaleRatio.Y = scale_y;
int gaugeTexLength = GaugeBox[2]; int gaugeTexLength = GaugeBox[2];
int clearPartLength = (int)(gaugeTexLength * (revnorma / 100f)); int clearPartLength = (int)(gaugeTexLength * (revnorma / 100f));
@ -241,8 +241,8 @@ namespace TJAPlayer3
// Fill // Fill
if (fillTexture != null && !isRainbow) if (fillTexture != null && !isRainbow)
{ {
fillTexture.vc拡大縮小倍率.X = scale_x; fillTexture.vcScaleRatio.X = scale_x;
fillTexture.vc拡大縮小倍率.Y = scale_y; fillTexture.vcScaleRatio.Y = scale_y;
fillTexture.Opacity = 255; fillTexture.Opacity = 255;
if (gaugeType != EGaugeType.NORMAL && tIsDangerHardGauge(diff, level, gaugeType, percent, perfectHits, totalNotes)) fillTexture.Opacity = 255 - flashOpacity; if (gaugeType != EGaugeType.NORMAL && tIsDangerHardGauge(diff, level, gaugeType, percent, perfectHits, totalNotes)) fillTexture.Opacity = 255 - flashOpacity;
@ -265,8 +265,8 @@ namespace TJAPlayer3
int differencial = closestTwo - closestNorma; int differencial = closestTwo - closestNorma;
int xOff = (int)(scale_x * texStartPoint); int xOff = (int)(scale_x * texStartPoint);
yellowTexture.vc拡大縮小倍率.X = scale_x; yellowTexture.vcScaleRatio.X = scale_x;
yellowTexture.vc拡大縮小倍率.Y = scale_y; yellowTexture.vcScaleRatio.Y = scale_y;
yellowTexture.Opacity = 255; yellowTexture.Opacity = 255;
yellowTexture.t2D描画(x + xOff, y, yellowTexture.t2D描画(x + xOff, y,
@ -281,8 +281,8 @@ namespace TJAPlayer3
// Rainbow // Rainbow
if (rainbowTexture != null && percent >= 100f) if (rainbowTexture != null && percent >= 100f)
{ {
rainbowTexture.vc拡大縮小倍率.X = scale_x; rainbowTexture.vcScaleRatio.X = scale_x;
rainbowTexture.vc拡大縮小倍率.Y = scale_y; rainbowTexture.vcScaleRatio.Y = scale_y;
rainbowTexture.t2D描画(rainbow_x, rainbow_y); rainbowTexture.t2D描画(rainbow_x, rainbow_y);
} }
@ -298,8 +298,8 @@ namespace TJAPlayer3
{ {
if (flashTexture != null) if (flashTexture != null)
{ {
flashTexture.vc拡大縮小倍率.X = scale_x; flashTexture.vcScaleRatio.X = scale_x;
flashTexture.vc拡大縮小倍率.Y = scale_y; flashTexture.vcScaleRatio.Y = scale_y;
flashTexture.Opacity = Opacity; flashTexture.Opacity = Opacity;
flashTexture.t2D描画(x, y, flashTexture.t2D描画(x, y,
@ -320,8 +320,8 @@ namespace TJAPlayer3
float currentFill = tHardGaugeGetKillscreenRatio(diff, level, gaugeType, perfectHits, totalNotes); float currentFill = tHardGaugeGetKillscreenRatio(diff, level, gaugeType, perfectHits, totalNotes);
if (killzoneTexture != null) if (killzoneTexture != null)
{ {
killzoneTexture.vc拡大縮小倍率.X = scale_x; killzoneTexture.vcScaleRatio.X = scale_x;
killzoneTexture.vc拡大縮小倍率.Y = scale_y; killzoneTexture.vcScaleRatio.Y = scale_y;
killzoneTexture.t2D描画(x, y, killzoneTexture.t2D描画(x, y,
new Rectangle( new Rectangle(
@ -360,13 +360,13 @@ namespace TJAPlayer3
if (gaugeType != EGaugeType.NORMAL || diff > Difficulty.Edit) return; if (gaugeType != EGaugeType.NORMAL || diff > Difficulty.Edit) return;
float percent = Math.Min(100f, Math.Max(0f, currentPercent)); float percent = Math.Min(100f, Math.Max(0f, currentPercent));
int soulfire_width = soulFire.szテクスチャサイズ.Width / 8; int soulfire_width = soulFire.szTextureSize.Width / 8;
int soulfire_height = soulFire.szテクスチャサイズ.Height; int soulfire_height = soulFire.szTextureSize.Height;
if (percent >= 100.0) if (percent >= 100.0)
{ {
soulFire.vc拡大縮小倍率.X = scale_x; soulFire.vcScaleRatio.X = scale_x;
soulFire.vc拡大縮小倍率.Y = scale_y; soulFire.vcScaleRatio.Y = scale_y;
soulFire.t2D描画(fire_x, fire_y, new Rectangle(soulfire_width * fireFrame, 0, soulfire_width, soulfire_height)); soulFire.t2D描画(fire_x, fire_y, new Rectangle(soulfire_width * fireFrame, 0, soulfire_width, soulfire_height));
} }
@ -379,17 +379,17 @@ namespace TJAPlayer3
float norma = tGetCurrentGaugeNorma(diff, level); float norma = tGetCurrentGaugeNorma(diff, level);
float percent = Math.Min(100f, Math.Max(0f, currentPercent)); float percent = Math.Min(100f, Math.Max(0f, currentPercent));
soulLetter.vc拡大縮小倍率.X = scale_x; soulLetter.vcScaleRatio.X = scale_x;
soulLetter.vc拡大縮小倍率.Y = scale_y; soulLetter.vcScaleRatio.Y = scale_y;
int soul_height = soulLetter.szテクスチャサイズ.Height / 2; int soul_height = soulLetter.szTextureSize.Height / 2;
if (tNormaCheck(diff, level, gaugeType, percent, 0)) if (tNormaCheck(diff, level, gaugeType, percent, 0))
{ {
soulLetter.t2D描画(soul_x, soul_y, new Rectangle(0, 0, soulLetter.szテクスチャサイズ.Width, soul_height)); soulLetter.t2D描画(soul_x, soul_y, new Rectangle(0, 0, soulLetter.szTextureSize.Width, soul_height));
} }
else else
{ {
soulLetter.t2D描画(soul_x, soul_y, new Rectangle(0, soul_height, soulLetter.szテクスチャサイズ.Width, soul_height)); soulLetter.t2D描画(soul_x, soul_y, new Rectangle(0, soul_height, soulLetter.szTextureSize.Width, soul_height));
} }
} }
@ -448,10 +448,10 @@ namespace TJAPlayer3
public static bool UNSAFE_FastNormaCheck(int player) public static bool UNSAFE_FastNormaCheck(int player)
{ {
var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character];
var _dif = TJAPlayer3.stage選曲.n確定された曲の難易度[player]; var _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player];
return tNormaCheck( return tNormaCheck(
(Difficulty)_dif, (Difficulty)_dif,
TJAPlayer3.stage選曲.r確定された曲.arスコア[_dif].譜面情報.nレベル[_dif], TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif],
tGetGaugeTypeEnum(chara.effect.tGetGaugeType()), tGetGaugeTypeEnum(chara.effect.tGetGaugeType()),
(float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player], (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player],
UNSAFE_KillZonePercent(player) UNSAFE_KillZonePercent(player)
@ -482,9 +482,9 @@ namespace TJAPlayer3
int totalHits = dtxs[player].nノーツ数[3]; int totalHits = dtxs[player].nノーツ数[3];
// Difficulty // Difficulty
int _dif = TJAPlayer3.stage選曲.n確定された曲の難易度[player]; int _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player];
Difficulty difficulty = (Difficulty)_dif; Difficulty difficulty = (Difficulty)_dif;
int level = TJAPlayer3.stage選曲.r確定された曲.arスコア[_dif].譜面情報.nレベル[_dif]; int level = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif];
return tHardGaugeGetKillscreenRatio( return tHardGaugeGetKillscreenRatio(
difficulty, difficulty,
@ -617,9 +617,9 @@ namespace TJAPlayer3
} }
// Difficulty // Difficulty
int _dif = TJAPlayer3.stage選曲.n確定された曲の難易度[player]; int _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player];
Difficulty difficulty = (Difficulty)_dif; Difficulty difficulty = (Difficulty)_dif;
int level = TJAPlayer3.stage選曲.r確定された曲.arスコア[_dif].譜面情報.nレベル[_dif]; int level = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif];
// Current percent // Current percent
float currentPercent = (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player]; float currentPercent = (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player];
@ -703,9 +703,9 @@ namespace TJAPlayer3
} }
// Difficulty // Difficulty
int _dif = TJAPlayer3.stage選曲.n確定された曲の難易度[player]; int _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player];
Difficulty difficulty = (Difficulty)_dif; Difficulty difficulty = (Difficulty)_dif;
int level = TJAPlayer3.stage選曲.r確定された曲.arスコア[_dif].譜面情報.nレベル[_dif]; int level = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif];
int gauge_x; int gauge_x;
int gauge_y; int gauge_y;
@ -825,13 +825,13 @@ namespace TJAPlayer3
// Positionnings // Positionnings
if (soulLetter != null) if (soulLetter != null)
{ {
soulText_x -= (int)((soulLetter.szテクスチャサイズ.Width / 2)); soulText_x -= (int)((soulLetter.szTextureSize.Width / 2));
soulText_y -= (soulLetter.szテクスチャサイズ.Height / 4); soulText_y -= (soulLetter.szTextureSize.Height / 4);
} }
if (soulFlame != null) if (soulFlame != null)
{ {
soulFire_y -= (soulFlame.szテクスチャサイズ.Height / 2); soulFire_y -= (soulFlame.szTextureSize.Height / 2);
soulFire_x -= (int)((soulFlame.szテクスチャサイズ.Width / 16)); soulFire_x -= (int)((soulFlame.szTextureSize.Width / 16));
} }
tDrawCompleteGauge(baseTexture, baseNormaTexture, flashTexture, fillTexture, yellowTexture, rainbowTextureArr, killzoneTexture, clearIcon, null, null, gauge_x, gauge_y, gauge_rainbow_x, gauge_rainbow_y, 0, rainbowTextureIndex, soulFlameIndex, difficulty, level, currentPercent, gaugeType, scale_x, 1f, clearText_x, clearText_y, perfectHits, totalHits, soulText_x, soulText_y, soulFire_x, soulFire_y, clearRect, clearRectHighlight); tDrawCompleteGauge(baseTexture, baseNormaTexture, flashTexture, fillTexture, yellowTexture, rainbowTextureArr, killzoneTexture, clearIcon, null, null, gauge_x, gauge_y, gauge_rainbow_x, gauge_rainbow_y, 0, rainbowTextureIndex, soulFlameIndex, difficulty, level, currentPercent, gaugeType, scale_x, 1f, clearText_x, clearText_y, perfectHits, totalHits, soulText_x, soulText_y, soulFire_x, soulFire_y, clearRect, clearRectHighlight);

10
OpenTaiko/src/Helpers/HScenePreset.cs
View File

@ -14,11 +14,11 @@ namespace TJAPlayer3
public static DBSkinPreset.SkinScene GetBGPreset() public static DBSkinPreset.SkinScene GetBGPreset()
{ {
string presetSection = ""; string presetSection = "";
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
presetSection = "Tower"; presetSection = "Tower";
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
presetSection = "Dan"; presetSection = "Dan";
} }
@ -52,9 +52,9 @@ namespace TJAPlayer3
}; };
var preset = (_ps != null var preset = (_ps != null
&& TJAPlayer3.stage選曲.r確定された曲.strScenePreset != null && TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset != null
&& ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.stage選曲.r確定された曲.strScenePreset)) && ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset))
? ((Dictionary<string,DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.stage選曲.r確定された曲.strScenePreset] ? ((Dictionary<string,DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset]
: null; : null;
if (_ps != null if (_ps != null

12
OpenTaiko/src/Songs/CDTX.cs
View File

@ -197,7 +197,7 @@ namespace TJAPlayer3
public int n描画優先度; //(特殊)現状連打との判断目的で使用 public int n描画優先度; //(特殊)現状連打との判断目的で使用
public ENoteState eNoteState; public ENoteState eNoteState;
public EAVI種別 eAVI種別; public EAVI種別 eAVI種別;
public E楽器パート e楽器パート = E楽器パート.UNKNOWN; public EInstrumentPad e楽器パート = EInstrumentPad.UNKNOWN;
public int nチャンネル番号; public int nチャンネル番号;
public int VideoStartTimeMs; public int VideoStartTimeMs;
public STDGBVALUE<int> nバーからの距離dot; public STDGBVALUE<int> nバーからの距離dot;
@ -357,7 +357,7 @@ namespace TJAPlayer3
this.bHit = false; this.bHit = false;
this.IsMissed = false; this.IsMissed = false;
this.b可視 = true; this.b可視 = true;
this.e楽器パート = E楽器パート.UNKNOWN; this.e楽器パート = EInstrumentPad.UNKNOWN;
this.n透明度 = 0xff; this.n透明度 = 0xff;
this.nバーからの距離dot.Drums = 0; this.nバーからの距離dot.Drums = 0;
this.nバーからの距離dot.Guitar = 0; this.nバーからの距離dot.Guitar = 0;
@ -6708,7 +6708,7 @@ namespace TJAPlayer3
chip.nコース = n現在のコース; chip.nコース = n現在のコース;
chip.n分岐回数 = this.n内部番号BRANCH1to; chip.n分岐回数 = this.n内部番号BRANCH1to;
chip.e楽器パート = E楽器パート.TAIKO; chip.e楽器パート = EInstrumentPad.TAIKO;
chip.nノーツ出現時刻ms = (int)(this.db出現時刻 * 1000.0); chip.nノーツ出現時刻ms = (int)(this.db出現時刻 * 1000.0);
chip.nノーツ移動開始時刻ms = (int)(this.db移動待機時刻 * 1000.0); chip.nノーツ移動開始時刻ms = (int)(this.db移動待機時刻 * 1000.0);
chip.nPlayerSide = this.nPlayerSide; chip.nPlayerSide = this.nPlayerSide;
@ -9498,15 +9498,15 @@ namespace TJAPlayer3
//----------------- //-----------------
if ((nチャンネル番号 >= 0x11) && (nチャンネル番号 <= 0x1C)) if ((nチャンネル番号 >= 0x11) && (nチャンネル番号 <= 0x1C))
{ {
chip.e楽器パート = E楽器パート.DRUMS; chip.e楽器パート = EInstrumentPad.DRUMS;
} }
if ((nチャンネル番号 >= 0x20) && (nチャンネル番号 <= 0x27)) if ((nチャンネル番号 >= 0x20) && (nチャンネル番号 <= 0x27))
{ {
chip.e楽器パート = E楽器パート.GUITAR; chip.e楽器パート = EInstrumentPad.GUITAR;
} }
if ((nチャンネル番号 >= 160) && (nチャンネル番号 <= 0xA7)) if ((nチャンネル番号 >= 160) && (nチャンネル番号 <= 0xA7))
{ {
chip.e楽器パート = E楽器パート.BASS; chip.e楽器パート = EInstrumentPad.BASS;
} }
//----------------- //-----------------
#endregion #endregion

6
OpenTaiko/src/Songs/CScoreIni.cs
View File

@ -1433,7 +1433,7 @@ namespace TJAPlayer3
} }
return (int)ERANK.E; return (int)ERANK.E;
} }
internal static double tゲーム型スキルを計算して返す( int nLevel, int nTotal, int nPerfect, int nCombo, E楽器パート inst, STAUTOPLAY bAutoPlay ) internal static double tゲーム型スキルを計算して返す( int nLevel, int nTotal, int nPerfect, int nCombo, EInstrumentPad inst, STAUTOPLAY bAutoPlay )
{ {
double ret; double ret;
if( ( nTotal == 0 ) || ( ( nPerfect == 0 ) && ( nCombo == 0 ) ) ) if( ( nTotal == 0 ) || ( ( nPerfect == 0 ) && ( nCombo == 0 ) ) )
@ -1444,7 +1444,7 @@ namespace TJAPlayer3
return ret; return ret;
} }
internal static double t演奏型スキルを計算して返す( int nTotal, int nPerfect, int nGreat, int nGood, int nPoor, int nMiss, E楽器パート inst, STAUTOPLAY bAutoPlay) internal static double t演奏型スキルを計算して返す( int nTotal, int nPerfect, int nGreat, int nGood, int nPoor, int nMiss, EInstrumentPad inst, STAUTOPLAY bAutoPlay)
{ {
if( nTotal == 0 ) if( nTotal == 0 )
return 0.0; return 0.0;
@ -1456,7 +1456,7 @@ namespace TJAPlayer3
ret *= dbCalcReviseValForDrGtBsAutoLanes( inst, bAutoPlay ); ret *= dbCalcReviseValForDrGtBsAutoLanes( inst, bAutoPlay );
return ret; return ret;
} }
internal static double dbCalcReviseValForDrGtBsAutoLanes( E楽器パート inst, STAUTOPLAY bAutoPlay ) internal static double dbCalcReviseValForDrGtBsAutoLanes( EInstrumentPad inst, STAUTOPLAY bAutoPlay )
{ {
//削除 //削除
return 1.0; return 1.0;

22
OpenTaiko/src/Songs/C曲リストノード.cs → OpenTaiko/src/Songs/CSongListNode.cs
View File

@ -5,12 +5,12 @@ using System.Drawing;
namespace TJAPlayer3 namespace TJAPlayer3
{ {
[Serializable] [Serializable]
internal class C曲リストノード internal class CSongListNode
{ {
// プロパティ // プロパティ
public Eノード種別 eノード種別 = Eノード種別.UNKNOWN; public ENodeType eノード種別 = ENodeType.UNKNOWN;
public enum Eノード種別 public enum ENodeType
{ {
SCORE, SCORE,
SCORE_MIDI, SCORE_MIDI,
@ -52,15 +52,15 @@ namespace TJAPlayer3
public bool IsChangedForeColor; public bool IsChangedForeColor;
public bool IsChangedBackColor; public bool IsChangedBackColor;
public bool isChangedBoxColor; public bool isChangedBoxColor;
public List<C曲リストノード> listランダム用ノードリスト; public List<CSongListNode> listランダム用ノードリスト;
public List<C曲リストノード> list子リスト; public List<CSongListNode> list子リスト;
public int nGood範囲ms = -1; public int nGood範囲ms = -1;
public int nGreat範囲ms = -1; public int nGreat範囲ms = -1;
public int nPerfect範囲ms = -1; public int nPerfect範囲ms = -1;
public int nPoor範囲ms = -1; public int nPoor範囲ms = -1;
public int nスコア数; public int nスコア数;
public C曲リストノード r親ノード; public CSongListNode rParentNode;
public int Openindex; public int Openindex;
public bool bIsOpenFolder; public bool bIsOpenFolder;
@ -102,21 +102,21 @@ namespace TJAPlayer3
// コンストラクタ // コンストラクタ
public C曲リストノード() public CSongListNode()
{ {
this.nID = id++; this.nID = id++;
} }
public C曲リストノード Clone() public CSongListNode Clone()
{ {
return (C曲リストノード)MemberwiseClone(); return (CSongListNode)MemberwiseClone();
} }
public override bool Equals(object other) public override bool Equals(object other)
{ {
if (other.GetType() == typeof(C曲リストノード)) if (other.GetType() == typeof(CSongListNode))
{ {
C曲リストノード obj = (C曲リストノード)other; CSongListNode obj = (CSongListNode)other;
return this.nID == obj.nID; return this.nID == obj.nID;
} }
return this.GetHashCode() == other.GetHashCode(); return this.GetHashCode() == other.GetHashCode();

188
OpenTaiko/src/Songs/CSong管理.cs
View File

@ -48,10 +48,10 @@ namespace TJAPlayer3
get; get;
set; set;
} }
public Dictionary<string, C曲リストノード> listSongsDB; // songs.dbから構築されるlist public Dictionary<string, CSongListNode> listSongsDB; // songs.dbから構築されるlist
public List<C曲リストノード> list曲ルート; // 起動時にフォルダ検索して構築されるlist public List<CSongListNode> list曲ルート; // 起動時にフォルダ検索して構築されるlist
public List<C曲リストノード> list曲ルート_Dan = new List<C曲リストノード>(); // 起動時にフォルダ検索して構築されるlist public List<CSongListNode> list曲ルート_Dan = new List<CSongListNode>(); // 起動時にフォルダ検索して構築されるlist
public List<C曲リストノード> list曲ルート_Tower = new List<C曲リストノード>(); // 起動時にフォルダ検索して構築されるlist public List<CSongListNode> list曲ルート_Tower = new List<CSongListNode>(); // 起動時にフォルダ検索して構築されるlist
public static List<FDK.CTexture> listCustomBGs = new List<FDK.CTexture>(); public static List<FDK.CTexture> listCustomBGs = new List<FDK.CTexture>();
public bool bIsSuspending // 外部スレッドから、内部スレッドのsuspendを指示する時にtrueにする public bool bIsSuspending // 外部スレッドから、内部スレッドのsuspendを指示する時にtrueにする
{ // 再開時は、これをfalseにしてから、次のautoReset.Set()を実行する { // 再開時は、これをfalseにしてから、次のautoReset.Set()を実行する
@ -84,7 +84,7 @@ namespace TJAPlayer3
public CSongs管理() public CSongs管理()
{ {
this.listSongsDB = new (); this.listSongsDB = new ();
this.list曲ルート = new List<C曲リストノード>(); this.list曲ルート = new List<CSongListNode>();
this.n検索された曲ノード数 = 0; this.n検索された曲ノード数 = 0;
this.n検索されたスコア数 = 0; this.n検索されたスコア数 = 0;
this.bIsSuspending = false; // #27060 this.bIsSuspending = false; // #27060
@ -101,13 +101,13 @@ namespace TJAPlayer3
public void UpdateDownloadBox() public void UpdateDownloadBox()
{ {
C曲リストノード downloadBox = null; CSongListNode downloadBox = null;
for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++) for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++)
{ {
if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == "Download") if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == "Download")
{ {
downloadBox = TJAPlayer3.Songs管理.list曲ルート[i]; downloadBox = TJAPlayer3.Songs管理.list曲ルート[i];
if (downloadBox.r親ノード != null) downloadBox = downloadBox.r親ノード; if (downloadBox.rParentNode != null) downloadBox = downloadBox.rParentNode;
} }
} }
@ -115,7 +115,7 @@ namespace TJAPlayer3
if (downloadBox != null && downloadBox.list子リスト != null) if (downloadBox != null && downloadBox.list子リスト != null)
{ {
var flatten = TJAPlayer3.stage選曲.act曲リスト.flattenList(downloadBox.list子リスト); var flatten = TJAPlayer3.stageSongSelect.actSongList.flattenList(downloadBox.list子リスト);
// Works because flattenList creates a new List // Works because flattenList creates a new List
for (int i = 0; i < downloadBox.list子リスト.Count; i++) for (int i = 0; i < downloadBox.list子リスト.Count; i++)
@ -160,7 +160,7 @@ namespace TJAPlayer3
{ {
this.t曲を検索してリストを作成する( str基点フォルダ, b子BOXへ再帰する, this.list曲ルート, null ); this.t曲を検索してリストを作成する( str基点フォルダ, b子BOXへ再帰する, this.list曲ルート, null );
} }
private void t曲を検索してリストを作成する( string str基点フォルダ, bool b子BOXへ再帰する, List<C曲リストノード> listノードリスト, C曲リストノード node親 ) private void t曲を検索してリストを作成する( string str基点フォルダ, bool b子BOXへ再帰する, List<CSongListNode> listノードリスト, CSongListNode node親 )
{ {
if( !str基点フォルダ.EndsWith( Path.DirectorySeparatorChar ) ) if( !str基点フォルダ.EndsWith( Path.DirectorySeparatorChar ) )
str基点フォルダ = str基点フォルダ + Path.DirectorySeparatorChar; str基点フォルダ = str基点フォルダ + Path.DirectorySeparatorChar;
@ -204,8 +204,8 @@ namespace TJAPlayer3
#region[ 新処理 ] #region[ 新処理 ]
C曲リストノード c曲リストノード = new C曲リストノード(); CSongListNode c曲リストノード = new CSongListNode();
c曲リストノード.eノード種別 = C曲リストノード.Eノード種別.SCORE; c曲リストノード.eノード種別 = CSongListNode.ENodeType.SCORE;
bool b = false; bool b = false;
for( int n = 0; n < (int)Difficulty.Total; n++ ) for( int n = 0; n < (int)Difficulty.Total; n++ )
@ -214,9 +214,9 @@ namespace TJAPlayer3
if( dtx.b譜面が存在する[ n ] ) if( dtx.b譜面が存在する[ n ] )
{ {
c曲リストノード.nスコア数++; c曲リストノード.nスコア数++;
c曲リストノード.r親ノード = node親; c曲リストノード.rParentNode = node親;
c曲リストノード.strBreadcrumbs = ( c曲リストノード.r親ノード == null ) ? c曲リストノード.strBreadcrumbs = ( c曲リストノード.rParentNode == null ) ?
str基点フォルダ + fileinfo.Name : c曲リストノード.r親ノード.strBreadcrumbs + " > " + str基点フォルダ + fileinfo.Name; str基点フォルダ + fileinfo.Name : c曲リストノード.rParentNode.strBreadcrumbs + " > " + str基点フォルダ + fileinfo.Name;
c曲リストノード.strタイトル = dtx.TITLE; c曲リストノード.strタイトル = dtx.TITLE;
c曲リストノード.strサブタイトル = dtx.SUBTITLE; c曲リストノード.strサブタイトル = dtx.SUBTITLE;
@ -224,9 +224,9 @@ namespace TJAPlayer3
c曲リストノード.strMaker = dtx.MAKER; c曲リストノード.strMaker = dtx.MAKER;
c曲リストノード.nSide = dtx.SIDE; c曲リストノード.nSide = dtx.SIDE;
c曲リストノード.bExplicit = dtx.EXPLICIT; c曲リストノード.bExplicit = dtx.EXPLICIT;
if (c曲リストノード.r親ノード != null && c曲リストノード.r親ノード.strジャンル != "") if (c曲リストノード.rParentNode != null && c曲リストノード.rParentNode.strジャンル != "")
{ {
c曲リストノード.strジャンル = c曲リストノード.r親ノード.strジャンル; c曲リストノード.strジャンル = c曲リストノード.rParentNode.strジャンル;
} }
c曲リストノード.strSelectBGPath = $@"{fileinfo.FullName}{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}{dtx.SELECTBG}"; c曲リストノード.strSelectBGPath = $@"{fileinfo.FullName}{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}{dtx.SELECTBG}";
if (!File.Exists(c曲リストノード.strSelectBGPath)) c曲リストノード.strSelectBGPath = null; if (!File.Exists(c曲リストノード.strSelectBGPath)) c曲リストノード.strSelectBGPath = null;
@ -346,49 +346,49 @@ namespace TJAPlayer3
fs.Dispose(); fs.Dispose();
if (listSongsDB.TryGetValue(filePath + hash, out C曲リストノード value)) if (listSongsDB.TryGetValue(filePath + hash, out CSongListNode value))
{ {
this.n検索されたスコア数++; this.n検索されたスコア数++;
listノードリスト.Add( value ); listノードリスト.Add( value );
CSongDict.tAddSongNode(value.uniqueId, value); CSongDict.tAddSongNode(value.uniqueId, value);
value.r親ノード = node親; value.rParentNode = node親;
if (value.r親ノード != null) if (value.rParentNode != null)
{ {
value.strScenePreset = value.r親ノード.strScenePreset; value.strScenePreset = value.rParentNode.strScenePreset;
if (value.r親ノード.IsChangedForeColor) if (value.rParentNode.IsChangedForeColor)
{ {
value.ForeColor = value.r親ノード.ForeColor; value.ForeColor = value.rParentNode.ForeColor;
value.IsChangedForeColor = true; value.IsChangedForeColor = true;
} }
if (value.r親ノード.IsChangedBackColor) if (value.rParentNode.IsChangedBackColor)
{ {
value.BackColor = value.r親ノード.BackColor; value.BackColor = value.rParentNode.BackColor;
value.IsChangedBackColor = true; value.IsChangedBackColor = true;
} }
if (value.r親ノード.isChangedBoxColor) if (value.rParentNode.isChangedBoxColor)
{ {
value.BoxColor = value.r親ノード.BoxColor; value.BoxColor = value.rParentNode.BoxColor;
value.isChangedBoxColor = true; value.isChangedBoxColor = true;
} }
if (value.r親ノード.isChangedBgColor) if (value.rParentNode.isChangedBgColor)
{ {
value.BgColor = value.r親ノード.BgColor; value.BgColor = value.rParentNode.BgColor;
value.isChangedBgColor = true; value.isChangedBgColor = true;
} }
if (value.r親ノード.isChangedBgType) if (value.rParentNode.isChangedBgType)
{ {
value.BgType = value.r親ノード.BgType; value.BgType = value.rParentNode.BgType;
value.isChangedBgType = true; value.isChangedBgType = true;
} }
if (value.r親ノード.isChangedBoxType) if (value.rParentNode.isChangedBoxType)
{ {
value.BoxType = value.r親ノード.BoxType; value.BoxType = value.rParentNode.BoxType;
value.isChangedBoxType = true; value.isChangedBoxType = true;
} }
if (value.r親ノード.isChangedBoxChara) if (value.rParentNode.isChangedBoxChara)
{ {
value.BoxChara = value.r親ノード.BoxChara; value.BoxChara = value.rParentNode.BoxChara;
value.isChangedBoxChara = true; value.isChangedBoxChara = true;
} }
} }
@ -398,8 +398,8 @@ namespace TJAPlayer3
else else
{ {
CDTX dtx = new CDTX(filePath , false, 1.0, 0, 0 ); CDTX dtx = new CDTX(filePath , false, 1.0, 0, 0 );
C曲リストノード c曲リストノード = new C曲リストノード(); CSongListNode c曲リストノード = new CSongListNode();
c曲リストノード.eノード種別 = C曲リストノード.Eノード種別.SCORE; c曲リストノード.eノード種別 = CSongListNode.ENodeType.SCORE;
bool b = false; bool b = false;
for( int n = 0; n < (int)Difficulty.Total; n++ ) for( int n = 0; n < (int)Difficulty.Total; n++ )
@ -407,9 +407,9 @@ namespace TJAPlayer3
if( dtx.b譜面が存在する[ n ] ) if( dtx.b譜面が存在する[ n ] )
{ {
c曲リストノード.nスコア数++; c曲リストノード.nスコア数++;
c曲リストノード.r親ノード = node親; c曲リストノード.rParentNode = node親;
c曲リストノード.strBreadcrumbs = ( c曲リストノード.r親ノード == null ) ? c曲リストノード.strBreadcrumbs = ( c曲リストノード.rParentNode == null ) ?
str基点フォルダ + fileinfo.Name : c曲リストノード.r親ノード.strBreadcrumbs + " > " + str基点フォルダ + fileinfo.Name; str基点フォルダ + fileinfo.Name : c曲リストノード.rParentNode.strBreadcrumbs + " > " + str基点フォルダ + fileinfo.Name;
c曲リストノード.strタイトル = dtx.TITLE; c曲リストノード.strタイトル = dtx.TITLE;
c曲リストノード.strサブタイトル = dtx.SUBTITLE; c曲リストノード.strサブタイトル = dtx.SUBTITLE;
@ -436,9 +436,9 @@ namespace TJAPlayer3
if (!string.IsNullOrEmpty(dtx.GENRE)) if (!string.IsNullOrEmpty(dtx.GENRE))
{ {
if(c曲リストノード.r親ノード != null) if(c曲リストノード.rParentNode != null)
{ {
c曲リストノード.strジャンル = c曲リストノード.r親ノード.strジャンル; c曲リストノード.strジャンル = c曲リストノード.rParentNode.strジャンル;
c曲リストノード.str本当のジャンル = dtx.GENRE; c曲リストノード.str本当のジャンル = dtx.GENRE;
} }
else else
@ -449,13 +449,13 @@ namespace TJAPlayer3
} }
else else
{ {
c曲リストノード.strジャンル = c曲リストノード.r親ノード.strジャンル; c曲リストノード.strジャンル = c曲リストノード.rParentNode.strジャンル;
c曲リストノード.str本当のジャンル = c曲リストノード.r親ノード.strジャンル; c曲リストノード.str本当のジャンル = c曲リストノード.rParentNode.strジャンル;
} }
if (c曲リストノード.strSelectBGPath == null || !File.Exists(str基点フォルダ + dtx.SELECTBG)) if (c曲リストノード.strSelectBGPath == null || !File.Exists(str基点フォルダ + dtx.SELECTBG))
{ {
c曲リストノード.strSelectBGPath = c曲リストノード.r親ノード.strSelectBGPath; c曲リストノード.strSelectBGPath = c曲リストノード.rParentNode.strSelectBGPath;
} }
else else
{ {
@ -463,42 +463,42 @@ namespace TJAPlayer3
} }
if (!File.Exists(c曲リストノード.strSelectBGPath)) c曲リストノード.strSelectBGPath = null; if (!File.Exists(c曲リストノード.strSelectBGPath)) c曲リストノード.strSelectBGPath = null;
if (c曲リストノード.r親ノード != null) if (c曲リストノード.rParentNode != null)
{ {
c曲リストノード.strScenePreset = c曲リストノード.r親ノード.strScenePreset; c曲リストノード.strScenePreset = c曲リストノード.rParentNode.strScenePreset;
if (c曲リストノード.r親ノード.IsChangedForeColor) if (c曲リストノード.rParentNode.IsChangedForeColor)
{ {
c曲リストノード.ForeColor = c曲リストノード.r親ノード.ForeColor; c曲リストノード.ForeColor = c曲リストノード.rParentNode.ForeColor;
c曲リストノード.IsChangedForeColor = true; c曲リストノード.IsChangedForeColor = true;
} }
if (c曲リストノード.r親ノード.IsChangedBackColor) if (c曲リストノード.rParentNode.IsChangedBackColor)
{ {
c曲リストノード.BackColor = c曲リストノード.r親ノード.BackColor; c曲リストノード.BackColor = c曲リストノード.rParentNode.BackColor;
c曲リストノード.IsChangedBackColor = true; c曲リストノード.IsChangedBackColor = true;
} }
if (c曲リストノード.r親ノード.isChangedBoxColor) if (c曲リストノード.rParentNode.isChangedBoxColor)
{ {
c曲リストノード.BoxColor = c曲リストノード.r親ノード.BoxColor; c曲リストノード.BoxColor = c曲リストノード.rParentNode.BoxColor;
c曲リストノード.isChangedBoxColor = true; c曲リストノード.isChangedBoxColor = true;
} }
if (c曲リストノード.r親ノード.isChangedBgColor) if (c曲リストノード.rParentNode.isChangedBgColor)
{ {
c曲リストノード.BgColor = c曲リストノード.r親ノード.BgColor; c曲リストノード.BgColor = c曲リストノード.rParentNode.BgColor;
c曲リストノード.isChangedBgColor = true; c曲リストノード.isChangedBgColor = true;
} }
if (c曲リストノード.r親ノード.isChangedBgType) if (c曲リストノード.rParentNode.isChangedBgType)
{ {
c曲リストノード.BgType = c曲リストノード.r親ノード.BgType; c曲リストノード.BgType = c曲リストノード.rParentNode.BgType;
c曲リストノード.isChangedBgType = true; c曲リストノード.isChangedBgType = true;
} }
if (c曲リストノード.r親ノード.isChangedBoxType) if (c曲リストノード.rParentNode.isChangedBoxType)
{ {
c曲リストノード.BoxType = c曲リストノード.r親ノード.BoxType; c曲リストノード.BoxType = c曲リストノード.rParentNode.BoxType;
c曲リストノード.isChangedBoxType = true; c曲リストノード.isChangedBoxType = true;
} }
if (c曲リストノード.r親ノード.isChangedBoxChara) if (c曲リストノード.rParentNode.isChangedBoxChara)
{ {
c曲リストノード.BoxChara = c曲リストノード.r親ノード.BoxChara; c曲リストノード.BoxChara = c曲リストノード.rParentNode.BoxChara;
c曲リストノード.isChangedBoxChara = true; c曲リストノード.isChangedBoxChara = true;
} }
@ -557,9 +557,9 @@ namespace TJAPlayer3
c曲リストノード.arスコア[ n ].ファイル情報.ファイルサイズ = fileinfo.Length; c曲リストノード.arスコア[ n ].ファイル情報.ファイルサイズ = fileinfo.Length;
c曲リストノード.arスコア[ n ].ファイル情報.最終更新日時 = fileinfo.LastWriteTime; c曲リストノード.arスコア[ n ].ファイル情報.最終更新日時 = fileinfo.LastWriteTime;
if (c曲リストノード.r親ノード != null && String.IsNullOrEmpty(c曲リストノード.arスコア[n].譜面情報.Preimage)) if (c曲リストノード.rParentNode != null && String.IsNullOrEmpty(c曲リストノード.arスコア[n].譜面情報.Preimage))
{ {
c曲リストノード.arスコア[n].譜面情報.Preimage = c曲リストノード.r親ノード.arスコア[0].譜面情報.Preimage; c曲リストノード.arスコア[n].譜面情報.Preimage = c曲リストノード.rParentNode.arスコア[0].譜面情報.Preimage;
} }
string strFileNameScoreIni = c曲リストノード.arスコア[ n ].ファイル情報.ファイルの絶対パス + ".score.ini"; string strFileNameScoreIni = c曲リストノード.arスコア[ n ].ファイル情報.ファイルの絶対パス + ".score.ini";
@ -626,8 +626,8 @@ namespace TJAPlayer3
if( File.Exists( infoDir.FullName + @$"{Path.DirectorySeparatorChar}box.def" ) ) if( File.Exists( infoDir.FullName + @$"{Path.DirectorySeparatorChar}box.def" ) )
{ {
CBoxDef boxdef = new CBoxDef( infoDir.FullName + @$"{Path.DirectorySeparatorChar}box.def" ); CBoxDef boxdef = new CBoxDef( infoDir.FullName + @$"{Path.DirectorySeparatorChar}box.def" );
C曲リストノード c曲リストノード = new C曲リストノード(); CSongListNode c曲リストノード = new CSongListNode();
c曲リストノード.eノード種別 = C曲リストノード.Eノード種別.BOX; c曲リストノード.eノード種別 = CSongListNode.ENodeType.BOX;
c曲リストノード.bDTXFilesで始まるフォルダ名のBOXである = false; c曲リストノード.bDTXFilesで始まるフォルダ名のBOXである = false;
c曲リストノード.strタイトル = boxdef.Title; c曲リストノード.strタイトル = boxdef.Title;
c曲リストノード.strジャンル = boxdef.Genre; c曲リストノード.strジャンル = boxdef.Genre;
@ -727,14 +727,14 @@ namespace TJAPlayer3
c曲リストノード.arスコア[ 0 ].譜面情報.ジャンル = boxdef.Genre; c曲リストノード.arスコア[ 0 ].譜面情報.ジャンル = boxdef.Genre;
if (!String.IsNullOrEmpty(boxdef.DefaultPreimage)) if (!String.IsNullOrEmpty(boxdef.DefaultPreimage))
c曲リストノード.arスコア[0].譜面情報.Preimage = boxdef.DefaultPreimage; c曲リストノード.arスコア[0].譜面情報.Preimage = boxdef.DefaultPreimage;
c曲リストノード.r親ノード = node親; c曲リストノード.rParentNode = node親;
c曲リストノード.strBreadcrumbs = ( c曲リストノード.r親ノード == null ) ? c曲リストノード.strBreadcrumbs = ( c曲リストノード.rParentNode == null ) ?
c曲リストノード.strタイトル : c曲リストノード.r親ノード.strBreadcrumbs + " > " + c曲リストノード.strタイトル; c曲リストノード.strタイトル : c曲リストノード.rParentNode.strBreadcrumbs + " > " + c曲リストノード.strタイトル;
c曲リストノード.list子リスト = new List<C曲リストノード>(); c曲リストノード.list子リスト = new List<CSongListNode>();
listノードリスト.Add( c曲リストノード ); listノードリスト.Add( c曲リストノード );
if( TJAPlayer3.ConfigIni.bLog曲検索ログ出力 ) if( TJAPlayer3.ConfigIni.bLog曲検索ログ出力 )
{ {
@ -744,9 +744,9 @@ namespace TJAPlayer3
{ {
StringBuilder sb = new StringBuilder( 0x400 ); StringBuilder sb = new StringBuilder( 0x400 );
sb.Append( string.Format( "nID#{0:D3}", c曲リストノード.nID ) ); sb.Append( string.Format( "nID#{0:D3}", c曲リストノード.nID ) );
if( c曲リストノード.r親ノード != null ) if( c曲リストノード.rParentNode != null )
{ {
sb.Append( string.Format( "(in#{0:D3}):", c曲リストノード.r親ノード.nID ) ); sb.Append( string.Format( "(in#{0:D3}):", c曲リストノード.rParentNode.nID ) );
} }
else else
{ {
@ -813,7 +813,7 @@ namespace TJAPlayer3
//----------------- //-----------------
#endregion #endregion
private void LoadChartInfo(C曲リストノード c曲リストノード, CDTX cdtx, int i) private void LoadChartInfo(CSongListNode c曲リストノード, CDTX cdtx, int i)
{ {
if( ( c曲リストノード.arスコア[ i ] != null ) && !c曲リストノード.arスコア[ i ].bSongDBにキャッシュがあった ) if( ( c曲リストノード.arスコア[ i ] != null ) && !c曲リストノード.arスコア[ i ].bSongDBにキャッシュがあった )
{ {
@ -1003,7 +1003,7 @@ namespace TJAPlayer3
for (int p = 0; p < list曲ルート.Count; p++) for (int p = 0; p < list曲ルート.Count; p++)
{ {
var c曲リストノード = list曲ルート[p]; var c曲リストノード = list曲ルート[p];
if (c曲リストノード.eノード種別 == C曲リストノード.Eノード種別.BOX) if (c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX)
{ {
if (c曲リストノード.strジャンル == "段位道場") if (c曲リストノード.strジャンル == "段位道場")
{ {
@ -1095,12 +1095,12 @@ namespace TJAPlayer3
} }
private void t曲リストへ後処理を適用する( List<C曲リストノード> ノードリスト, string parentName = "/", bool isGlobal = true ) private void t曲リストへ後処理を適用する( List<CSongListNode> ノードリスト, string parentName = "/", bool isGlobal = true )
{ {
if (isGlobal && ノードリスト.Count > 0) if (isGlobal && ノードリスト.Count > 0)
{ {
var randomNode = CSongDict.tGenerateRandomButton(ノードリスト[0].r親ノード, parentName); var randomNode = CSongDict.tGenerateRandomButton(ノードリスト[0].rParentNode, parentName);
ノードリスト.Add(randomNode); ノードリスト.Add(randomNode);
} }
@ -1118,24 +1118,24 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 1) else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 1)
{ {
t曲リストのソート9_ジャンル順(ノードリスト, E楽器パート.TAIKO, 1, 0); t曲リストのソート9_ジャンル順(ノードリスト, EInstrumentPad.TAIKO, 1, 0);
} }
else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 2) else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 2)
{ {
t曲リストのソート9_ジャンル順(ノードリスト, E楽器パート.TAIKO, 2, 0); t曲リストのソート9_ジャンル順(ノードリスト, EInstrumentPad.TAIKO, 2, 0);
} }
//----------------------------- //-----------------------------
#endregion #endregion
} }
// すべてのノードについて… // すべてのノードについて…
foreach ( C曲リストノード c曲リストノード in ノードリスト ) foreach ( CSongListNode c曲リストノード in ノードリスト )
{ {
SlowOrSuspendSearchTask(); // #27060 中断要求があったら、解除要求が来るまで待機, #PREMOVIE再生中は検索負荷を落とす SlowOrSuspendSearchTask(); // #27060 中断要求があったら、解除要求が来るまで待機, #PREMOVIE再生中は検索負荷を落とす
#region [ Append "Back" buttons to the included folders ] #region [ Append "Back" buttons to the included folders ]
//----------------------------- //-----------------------------
if ( c曲リストノード.eノード種別 == C曲リストノード.Eノード種別.BOX ) if ( c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX )
{ {
#region [ Sort child nodes ] #region [ Sort child nodes ]
@ -1146,11 +1146,11 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 1) else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 1)
{ {
t曲リストのソート9_ジャンル順(c曲リストノード.list子リスト, E楽器パート.TAIKO, 1, 0); t曲リストのソート9_ジャンル順(c曲リストノード.list子リスト, EInstrumentPad.TAIKO, 1, 0);
} }
else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 2) else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 2)
{ {
t曲リストのソート9_ジャンル順(c曲リストノード.list子リスト, E楽器パート.TAIKO, 2, 0); t曲リストのソート9_ジャンル順(c曲リストノード.list子リスト, EInstrumentPad.TAIKO, 2, 0);
} }
//----------------------------- //-----------------------------
#endregion #endregion
@ -1336,11 +1336,11 @@ namespace TJAPlayer3
#region [ 曲リストソート ] #region [ 曲リストソート ]
//----------------- //-----------------
public static void t曲リストのソート1_絶対パス順( List<C曲リストノード> ノードリスト ) public static void t曲リストのソート1_絶対パス順( List<CSongListNode> ノードリスト )
{ {
t曲リストのソート1_絶対パス順(ノードリスト, E楽器パート.TAIKO, 1, 0); t曲リストのソート1_絶対パス順(ノードリスト, EInstrumentPad.TAIKO, 1, 0);
foreach( C曲リストノード c曲リストノード in ノードリスト ) foreach( CSongListNode c曲リストノード in ノードリスト )
{ {
if( ( c曲リストノード.list子リスト != null ) && ( c曲リストノード.list子リスト.Count > 1 ) ) if( ( c曲リストノード.list子リスト != null ) && ( c曲リストノード.list子リスト.Count > 1 ) )
{ {
@ -1349,9 +1349,9 @@ namespace TJAPlayer3
} }
} }
public static void t曲リストのソート1_絶対パス順( List<C曲リストノード> ノードリスト, E楽器パート part, int order, params object[] p ) public static void t曲リストのソート1_絶対パス順( List<CSongListNode> ノードリスト, EInstrumentPad part, int order, params object[] p )
{ {
var comparer = new ComparerChain<C曲リストノード>( var comparer = new ComparerChain<CSongListNode>(
new C曲リストノードComparerノード種別(), new C曲リストノードComparerノード種別(),
new C曲リストノードComparer絶対パス(order), new C曲リストノードComparer絶対パス(order),
new C曲リストノードComparerタイトル(order), new C曲リストノードComparerタイトル(order),
@ -1360,9 +1360,9 @@ namespace TJAPlayer3
ノードリスト.Sort( comparer ); ノードリスト.Sort( comparer );
} }
public static void t曲リストのソート2_タイトル順( List<C曲リストノード> ノードリスト, E楽器パート part, int order, params object[] p ) public static void t曲リストのソート2_タイトル順( List<CSongListNode> ノードリスト, EInstrumentPad part, int order, params object[] p )
{ {
var comparer = new ComparerChain<C曲リストノード>( var comparer = new ComparerChain<CSongListNode>(
new C曲リストノードComparerノード種別(), new C曲リストノードComparerノード種別(),
new C曲リストノードComparerタイトル(order), new C曲リストノードComparerタイトル(order),
new C曲リストノードComparerSubtitle(order), new C曲リストノードComparerSubtitle(order),
@ -1371,9 +1371,9 @@ namespace TJAPlayer3
ノードリスト.Sort( comparer ); ノードリスト.Sort( comparer );
} }
public static void tSongListSortBySubtitle(List<C曲リストノード> ノードリスト, E楽器パート part, int order, params object[] p) public static void tSongListSortBySubtitle(List<CSongListNode> ノードリスト, EInstrumentPad part, int order, params object[] p)
{ {
var comparer = new ComparerChain<C曲リストノード>( var comparer = new ComparerChain<CSongListNode>(
new C曲リストノードComparerノード種別(), new C曲リストノードComparerノード種別(),
new C曲リストノードComparerSubtitle(order), new C曲リストノードComparerSubtitle(order),
new C曲リストノードComparerタイトル(order), new C曲リストノードComparerタイトル(order),
@ -1382,9 +1382,9 @@ namespace TJAPlayer3
ノードリスト.Sort(comparer); ノードリスト.Sort(comparer);
} }
public static void tSongListSortByLevel(List<C曲リストノード> ノードリスト, E楽器パート part, int order, params object[] p) public static void tSongListSortByLevel(List<CSongListNode> ノードリスト, EInstrumentPad part, int order, params object[] p)
{ {
var comparer = new ComparerChain<C曲リストノード>( var comparer = new ComparerChain<CSongListNode>(
new C曲リストノードComparerノード種別(), new C曲リストノードComparerノード種別(),
new C曲リストノードComparerLevel(order), new C曲リストノードComparerLevel(order),
new C曲リストノードComparerLevelIcon(order), new C曲リストノードComparerLevelIcon(order),
@ -1395,15 +1395,15 @@ namespace TJAPlayer3
ノードリスト.Sort(comparer); ノードリスト.Sort(comparer);
} }
public static void t曲リストのソート9_ジャンル順(List<C曲リストノード> ノードリスト, E楽器パート part, int order, params object[] p) public static void t曲リストのソート9_ジャンル順(List<CSongListNode> ノードリスト, EInstrumentPad part, int order, params object[] p)
{ {
try try
{ {
var acGenreComparer = order == 1 var acGenreComparer = order == 1
? (IComparer<C曲リストノード>) new C曲リストノードComparerAC8_14() ? (IComparer<CSongListNode>) new C曲リストノードComparerAC8_14()
: new C曲リストノードComparerAC15(); : new C曲リストノードComparerAC15();
var comparer = new ComparerChain<C曲リストノード>( var comparer = new ComparerChain<CSongListNode>(
new C曲リストノードComparerノード種別(), new C曲リストノードComparerノード種別(),
acGenreComparer, acGenreComparer,
new C曲リストノードComparer絶対パス(1), new C曲リストノードComparer絶対パス(1),

4
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC15.cs
View File

@ -2,9 +2,9 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerAC15 : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerAC15 : IComparer<CSongListNode>
{ {
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
return CStrジャンルtoNum.ForAC15(n1.strジャンル).CompareTo(CStrジャンルtoNum.ForAC15(n2.strジャンル)); return CStrジャンルtoNum.ForAC15(n1.strジャンル).CompareTo(CStrジャンルtoNum.ForAC15(n2.strジャンル));
} }

4
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC8_14.cs
View File

@ -2,9 +2,9 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerAC8_14 : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerAC8_14 : IComparer<CSongListNode>
{ {
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
return CStrジャンルtoNum.ForAC8_14(n1.strジャンル).CompareTo(CStrジャンルtoNum.ForAC8_14(n2.strジャンル)); return CStrジャンルtoNum.ForAC8_14(n1.strジャンル).CompareTo(CStrジャンルtoNum.ForAC8_14(n2.strジャンル));
} }

12
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevel.cs
View File

@ -2,7 +2,7 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerLevel : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerLevel : IComparer<CSongListNode>
{ {
private readonly int _order; private readonly int _order;
@ -11,10 +11,10 @@ namespace TJAPlayer3.C曲リストノードComparers
this._order = order; this._order = order;
} }
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
int _n1s = (n1.eノード種別 != C曲リストノード.Eノード種別.SCORE) ? 0 : 1; int _n1s = (n1.eノード種別 != CSongListNode.ENodeType.SCORE) ? 0 : 1;
int _n2s = (n2.eノード種別 != C曲リストノード.Eノード種別.SCORE) ? 0 : 1; int _n2s = (n2.eノード種別 != CSongListNode.ENodeType.SCORE) ? 0 : 1;
if (_n1s == 0 || _n2s == 0) if (_n1s == 0 || _n2s == 0)
@ -24,9 +24,9 @@ namespace TJAPlayer3.C曲リストノードComparers
return _order * _diffOf(n1).CompareTo(_diffOf(n2)); return _order * _diffOf(n1).CompareTo(_diffOf(n2));
} }
private int _diffOf(C曲リストノード n1) private int _diffOf(CSongListNode n1)
{ {
return n1.nLevel[TJAPlayer3.stage選曲.act曲リスト.tFetchDifficulty(n1)]; return n1.nLevel[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(n1)];
} }
} }
} }

12
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevelIcon.cs
View File

@ -2,7 +2,7 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerLevelIcon : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerLevelIcon : IComparer<CSongListNode>
{ {
private readonly int _order; private readonly int _order;
@ -11,10 +11,10 @@ namespace TJAPlayer3.C曲リストノードComparers
this._order = order; this._order = order;
} }
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
int _n1s = (n1.eノード種別 != C曲リストノード.Eノード種別.SCORE) ? 0 : 1; int _n1s = (n1.eノード種別 != CSongListNode.ENodeType.SCORE) ? 0 : 1;
int _n2s = (n2.eノード種別 != C曲リストノード.Eノード種別.SCORE) ? 0 : 1; int _n2s = (n2.eノード種別 != CSongListNode.ENodeType.SCORE) ? 0 : 1;
if (_n1s == 0 || _n2s == 0) if (_n1s == 0 || _n2s == 0)
@ -24,9 +24,9 @@ namespace TJAPlayer3.C曲リストノードComparers
return _order * _diffOf(n1).CompareTo(_diffOf(n2)); return _order * _diffOf(n1).CompareTo(_diffOf(n2));
} }
private int _diffOf(C曲リストノード n1) private int _diffOf(CSongListNode n1)
{ {
return (int)n1.nLevelIcon[TJAPlayer3.stage選曲.act曲リスト.tFetchDifficulty(n1)]; return (int)n1.nLevelIcon[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(n1)];
} }
} }
} }

4
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerSubtitle.cs
View File

@ -2,7 +2,7 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerSubtitle : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerSubtitle : IComparer<CSongListNode>
{ {
private readonly int _order; private readonly int _order;
@ -11,7 +11,7 @@ namespace TJAPlayer3.C曲リストノードComparers
this._order = order; this._order = order;
} }
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
return _order * n1.strサブタイトル.CompareTo(n2.strサブタイトル); return _order * n1.strサブタイトル.CompareTo(n2.strサブタイトル);
} }

4
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs
View File

@ -2,7 +2,7 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerタイトル : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerタイトル : IComparer<CSongListNode>
{ {
private readonly int _order; private readonly int _order;
@ -11,7 +11,7 @@ namespace TJAPlayer3.C曲リストノードComparers
this._order = order; this._order = order;
} }
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
return _order * n1.strタイトル.CompareTo( n2.strタイトル ); return _order * n1.strタイトル.CompareTo( n2.strタイトル );
} }

18
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs
View File

@ -3,27 +3,27 @@ using System.Collections.Generic;
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparerノード種別 : IComparer<C曲リストノード> internal sealed class C曲リストノードComparerノード種別 : IComparer<CSongListNode>
{ {
public int Compare(C曲リストノード x, C曲リストノード y) public int Compare(CSongListNode x, CSongListNode y)
{ {
return ToComparable(x.eノード種別).CompareTo(ToComparable(y.eノード種別)); return ToComparable(x.eノード種別).CompareTo(ToComparable(y.eノード種別));
} }
private static int ToComparable(C曲リストノード.Eノード種別 eノード種別) private static int ToComparable(CSongListNode.ENodeType eノード種別)
{ {
switch (eノード種別) switch (eノード種別)
{ {
case C曲リストノード.Eノード種別.BOX: case CSongListNode.ENodeType.BOX:
return 0; return 0;
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
case C曲リストノード.Eノード種別.SCORE_MIDI: case CSongListNode.ENodeType.SCORE_MIDI:
return 1; return 1;
case C曲リストノード.Eノード種別.UNKNOWN: case CSongListNode.ENodeType.UNKNOWN:
return 2; return 2;
case C曲リストノード.Eノード種別.RANDOM: case CSongListNode.ENodeType.RANDOM:
return 4; return 4;
case C曲リストノード.Eノード種別.BACKBOX: case CSongListNode.ENodeType.BACKBOX:
return 3; return 3;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();

8
OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparer絶対パス.cs
View File

@ -2,7 +2,7 @@
namespace TJAPlayer3.C曲リストノードComparers namespace TJAPlayer3.C曲リストノードComparers
{ {
internal sealed class C曲リストノードComparer絶対パス : IComparer<C曲リストノード> internal sealed class C曲リストノードComparer絶対パス : IComparer<CSongListNode>
{ {
private readonly int _order; private readonly int _order;
@ -11,9 +11,9 @@ namespace TJAPlayer3.C曲リストノードComparers
this._order = order; this._order = order;
} }
public int Compare(C曲リストノード n1, C曲リストノード n2) public int Compare(CSongListNode n1, CSongListNode n2)
{ {
if( ( n1.eノード種別 == C曲リストノード.Eノード種別.BOX ) && ( n2.eノード種別 == C曲リストノード.Eノード種別.BOX ) ) if( ( n1.eノード種別 == CSongListNode.ENodeType.BOX ) && ( n2.eノード種別 == CSongListNode.ENodeType.BOX ) )
{ {
return _order * n1.arスコア[ 0 ].ファイル情報.フォルダの絶対パス.CompareTo( n2.arスコア[ 0 ].ファイル情報.フォルダの絶対パス ); return _order * n1.arスコア[ 0 ].ファイル情報.フォルダの絶対パス.CompareTo( n2.arスコア[ 0 ].ファイル情報.フォルダの絶対パス );
} }
@ -24,7 +24,7 @@ namespace TJAPlayer3.C曲リストノードComparers
return _order * str.CompareTo( strB ); return _order * str.CompareTo( strB );
} }
private static string strファイルの絶対パス(C曲リストノード c曲リストノード) private static string strファイルの絶対パス(CSongListNode c曲リストノード)
{ {
for (int i = 0; i < (int)Difficulty.Total; i++) for (int i = 0; i < (int)Difficulty.Total; i++)
{ {

2
OpenTaiko/src/Stages/01.StartUp/CPuchichara.cs
View File

@ -38,7 +38,7 @@ namespace TJAPlayer3
tx = TJAPlayer3.Tx.TxCAbsolute($@"{path}{Path.DirectorySeparatorChar}Chara.png"); tx = TJAPlayer3.Tx.TxCAbsolute($@"{path}{Path.DirectorySeparatorChar}Chara.png");
if (tx != null) if (tx != null)
{ {
tx.vc拡大縮小倍率 = new Vector3D<float>(TJAPlayer3.Skin.Game_PuchiChara_Scale[0]); tx.vcScaleRatio = new Vector3D<float>(TJAPlayer3.Skin.Game_PuchiChara_Scale[0]);
} }
// Heya render // Heya render

4
OpenTaiko/src/Stages/01.StartUp/CStage起動.cs
View File

@ -201,9 +201,9 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Songs管理 = ( es != null ) ? es.Songs管理 : null; // 最後に、曲リストを拾い上げる TJAPlayer3.Songs管理 = ( es != null ) ? es.Songs管理 : null; // 最後に、曲リストを拾い上げる
if(TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) if(TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
return 1; return 1;
} }
} }

2
OpenTaiko/src/Stages/02.Title/CActEnumSongs.cs
View File

@ -97,7 +97,7 @@ namespace TJAPlayer3
{ {
SKBitmap image = ftMessage.DrawText(strMessage[ ci ], Color.White); SKBitmap image = ftMessage.DrawText(strMessage[ ci ], Color.White);
this.txMessage = new CTexture( image ); this.txMessage = new CTexture( image );
this.txMessage.vc拡大縮小倍率 = new Vector3D<float>( 0.5f, 0.5f, 1f ); this.txMessage.vcScaleRatio = new Vector3D<float>( 0.5f, 0.5f, 1f );
image.Dispose(); image.Dispose();
TJAPlayer3.tDisposeSafely( ref ftMessage ); TJAPlayer3.tDisposeSafely( ref ftMessage );
} }

2
OpenTaiko/src/Stages/02.Title/CEnumSongs.cs
View File

@ -493,7 +493,7 @@ namespace TJAPlayer3
{ {
BinaryFormatter songlistdb_ = new BinaryFormatter(); BinaryFormatter songlistdb_ = new BinaryFormatter();
using Stream songlistdb = File.OpenRead($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db"); using Stream songlistdb = File.OpenRead($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db");
this.Songs管理.listSongsDB = (Dictionary<string, C曲リストノード>)songlistdb_.Deserialize(songlistdb); this.Songs管理.listSongsDB = (Dictionary<string, CSongListNode>)songlistdb_.Deserialize(songlistdb);
} }
} }
catch(Exception exception) catch(Exception exception)

118
OpenTaiko/src/Stages/02.Title/CStageタイトル.cs
View File

@ -173,11 +173,11 @@ namespace TJAPlayer3
if (base.ePhaseID == CStage.EPhase.Common_NORMAL // 通常状態、かつ if (base.ePhaseID == CStage.EPhase.Common_NORMAL // 通常状態、かつ
&& TJAPlayer3.act現在入力を占有中のプラグイン == null) // プラグインの入力占有がない && TJAPlayer3.act現在入力を占有中のプラグイン == null) // プラグインの入力占有がない
{ {
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Cancel)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel))
{ {
if (bモード選択) if (bモード選択)
{ {
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
bSaveFileLoaded = false; bSaveFileLoaded = false;
UnloadSaveFile(); UnloadSaveFile();
if (bSaveFileLoaded == false) if (bSaveFileLoaded == false)
@ -185,7 +185,7 @@ namespace TJAPlayer3
} }
else else
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
n現在の選択行モード選択 = (int)E戻り値.EXIT + 1; n現在の選択行モード選択 = (int)E戻り値.EXIT + 1;
this.actFO.tフェードアウト開始(0, 500); this.actFO.tフェードアウト開始(0, 500);
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
@ -211,8 +211,8 @@ namespace TJAPlayer3
if (!bバナパス読み込み && !bバナパス読み込み失敗) if (!bバナパス読み込み && !bバナパス読み込み失敗)
{ {
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide) || if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed))
{ {
// Hit 1P banapass // Hit 1P banapass
TJAPlayer3.SaveFile = 0; TJAPlayer3.SaveFile = 0;
@ -222,7 +222,7 @@ namespace TJAPlayer3
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i);
} }
else if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed2P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed2P)) else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P))
{ {
// Hit 2P banapass // Hit 2P banapass
TJAPlayer3.SaveFile = 1; TJAPlayer3.SaveFile = 1;
@ -235,11 +235,11 @@ namespace TJAPlayer3
else else
{ {
// Default legacy P long press (Don't change the save file, will be deleted soon) // Default legacy P long press (Don't change the save file, will be deleted soon)
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.P)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.P))
this.ctバナパス読み込み待機.Start(0, 600, 1, TJAPlayer3.Timer); this.ctバナパス読み込み待機.Start(0, 600, 1, TJAPlayer3.Timer);
if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.P)) if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.P))
ctバナパス読み込み待機.Tick(); ctバナパス読み込み待機.Tick();
if (TJAPlayer3.Input管理.Keyboard.KeyReleased((int)SlimDXKeys.Key.P)) if (TJAPlayer3.InputManager.Keyboard.KeyReleased((int)SlimDXKeys.Key.P))
{ {
this.ctバナパス読み込み待機.Stop(); this.ctバナパス読み込み待機.Stop();
if (this.ctバナパス読み込み待機.CurrentValue < 600 && !bバナパス読み込み失敗) if (this.ctバナパス読み込み待機.CurrentValue < 600 && !bバナパス読み込み失敗)
@ -251,13 +251,13 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow))
{ {
if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctバナパス読み込み成功.IsEnded) if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctバナパス読み込み成功.IsEnded)
{ {
if (n現在の選択行プレイヤーエントリー + 1 <= 2) if (n現在の選択行プレイヤーエントリー + 1 <= 2)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
n現在の選択行プレイヤーエントリー += 1; n現在の選択行プレイヤーエントリー += 1;
} }
} }
@ -267,7 +267,7 @@ namespace TJAPlayer3
//if (n現在の選択行モード選択 < this.nbModes - 1) //if (n現在の選択行モード選択 < this.nbModes - 1)
if (n現在の選択行モード選択 < usedMenusCount - 1) if (n現在の選択行モード選択 < usedMenusCount - 1)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
ctBarMove.Start(0, 250, 1.2f, TJAPlayer3.Timer); ctBarMove.Start(0, 250, 1.2f, TJAPlayer3.Timer);
n現在の選択行モード選択++; n現在の選択行モード選択++;
this.bDownPushed = true; this.bDownPushed = true;
@ -280,13 +280,13 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow))
{ {
if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctバナパス読み込み成功.IsEnded) if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctバナパス読み込み成功.IsEnded)
{ {
if (n現在の選択行プレイヤーエントリー - 1 >= 0) if (n現在の選択行プレイヤーエントリー - 1 >= 0)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
n現在の選択行プレイヤーエントリー -= 1; n現在の選択行プレイヤーエントリー -= 1;
} }
} }
@ -295,7 +295,7 @@ namespace TJAPlayer3
{ {
if (n現在の選択行モード選択 > 0) if (n現在の選択行モード選択 > 0)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
ctBarMove.Start(0, 250, 1.2f, TJAPlayer3.Timer); ctBarMove.Start(0, 250, 1.2f, TJAPlayer3.Timer);
n現在の選択行モード選択--; n現在の選択行モード選択--;
this.bDownPushed = false; this.bDownPushed = false;
@ -309,8 +309,8 @@ namespace TJAPlayer3
} }
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)
|| TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))
{ {
if (bプレイヤーエントリー && this.ctバナパス読み込み成功.IsEnded) if (bプレイヤーエントリー && this.ctバナパス読み込み成功.IsEnded)
{ {
@ -318,7 +318,7 @@ namespace TJAPlayer3
{ {
if (!bプレイヤーエントリー決定) if (!bプレイヤーエントリー決定)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
ctエントリーバー決定点滅.Start(0, 1055, 1, TJAPlayer3.Timer); ctエントリーバー決定点滅.Start(0, 1055, 1, TJAPlayer3.Timer);
bプレイヤーエントリー決定 = true; bプレイヤーエントリー決定 = true;
TJAPlayer3.PlayerSide = (n現在の選択行プレイヤーエントリー == 2) ? 1 : 0; TJAPlayer3.PlayerSide = (n現在の選択行プレイヤーエントリー == 2) ? 1 : 0;
@ -329,7 +329,7 @@ namespace TJAPlayer3
} }
else else
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
bプレイヤーエントリー = false; bプレイヤーエントリー = false;
bバナパス読み込み = false; bバナパス読み込み = false;
TJAPlayer3.Skin.SoundBanapas.bPlayed = false; TJAPlayer3.Skin.SoundBanapas.bPlayed = false;
@ -353,7 +353,7 @@ namespace TJAPlayer3
if (operationSucceded == true) if (operationSucceded == true)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
this.actFO.tフェードアウト開始(0, 500); this.actFO.tフェードアウト開始(0, 500);
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
} }
@ -430,12 +430,12 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.CurrentValue <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.CurrentValue - 2972); TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.CurrentValue <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.CurrentValue - 2972);
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++) for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++)
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++) for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++)
TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height);
TJAPlayer3.Tx.Banapas_Load[0].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue * 2; TJAPlayer3.Tx.Banapas_Load[0].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue * 2;
TJAPlayer3.Tx.Banapas_Load[0].vc拡大縮小倍率.Y = ctバナパス読み込み成功.CurrentValue <= 100 ? ctバナパス読み込み成功.CurrentValue * 0.01f : 1.0f; TJAPlayer3.Tx.Banapas_Load[0].vcScaleRatio.Y = ctバナパス読み込み成功.CurrentValue <= 100 ? ctバナパス読み込み成功.CurrentValue * 0.01f : 1.0f;
TJAPlayer3.Tx.Banapas_Load[0].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load[0].t2D描画(0, 0);
TJAPlayer3.Tx.Banapas_Load[1].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue <= 96 ? (int)((ctバナパス読み込み成功.CurrentValue - 96) * 7.96875f) : 255; TJAPlayer3.Tx.Banapas_Load[1].Opacity = ctバナパス読み込み成功.CurrentValue >= 872 ? 255 - (ctバナパス読み込み成功.CurrentValue - 872) * 2 : ctバナパス読み込み成功.CurrentValue <= 96 ? (int)((ctバナパス読み込み成功.CurrentValue - 96) * 7.96875f) : 255;
@ -443,7 +443,7 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Banapas_Load[2] != null) if (TJAPlayer3.Tx.Banapas_Load[2] != null)
{ {
int step = TJAPlayer3.Tx.Banapas_Load[2].szテクスチャサイズ.Width / TJAPlayer3.Skin.Title_LoadingPinFrameCount; int step = TJAPlayer3.Tx.Banapas_Load[2].szTextureSize.Width / TJAPlayer3.Skin.Title_LoadingPinFrameCount;
int cycle = TJAPlayer3.Skin.Title_LoadingPinCycle; int cycle = TJAPlayer3.Skin.Title_LoadingPinCycle;
int _stamp = (ctバナパス読み込み成功.CurrentValue - 200) % (TJAPlayer3.Skin.Title_LoadingPinInstances * cycle); int _stamp = (ctバナパス読み込み成功.CurrentValue - 200) % (TJAPlayer3.Skin.Title_LoadingPinInstances * cycle);
@ -463,7 +463,7 @@ namespace TJAPlayer3
: 0), : 0),
0, 0,
step, step,
TJAPlayer3.Tx.Banapas_Load[2].szテクスチャサイズ.Height)); TJAPlayer3.Tx.Banapas_Load[2].szTextureSize.Height));
} }
} }
@ -472,16 +472,16 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み失敗.CurrentValue <= 1000 ? 128 : 128 - (this.ctバナパス読み込み失敗.CurrentValue - 1000); TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み失敗.CurrentValue <= 1000 ? 128 : 128 - (this.ctバナパス読み込み失敗.CurrentValue - 1000);
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++) for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++)
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++) for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++)
TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height);
if (!TJAPlayer3.Skin.soundError.bPlayed) if (!TJAPlayer3.Skin.soundError.bPlayed)
TJAPlayer3.Skin.soundError.tPlay(); TJAPlayer3.Skin.soundError.tPlay();
int count = this.ctバナパス読み込み失敗.CurrentValue; int count = this.ctバナパス読み込み失敗.CurrentValue;
TJAPlayer3.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2; TJAPlayer3.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2;
TJAPlayer3.Tx.Banapas_Load_Failure[0].vc拡大縮小倍率.Y = count <= 100 ? count * 0.01f : 1.0f; TJAPlayer3.Tx.Banapas_Load_Failure[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f;
TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D描画(0, 0);
if (ctバナパス読み込み失敗.CurrentValue >= 1128) if (ctバナパス読み込み失敗.CurrentValue >= 1128)
@ -497,16 +497,16 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.CurrentValue <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.CurrentValue - 2972); TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.CurrentValue <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.CurrentValue - 2972);
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++) for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++)
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++) for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++)
TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height);
if (!TJAPlayer3.Skin.SoundBanapas.bPlayed) if (!TJAPlayer3.Skin.SoundBanapas.bPlayed)
TJAPlayer3.Skin.SoundBanapas.tPlay(); TJAPlayer3.Skin.SoundBanapas.tPlay();
int count = this.ctバナパス読み込み成功.CurrentValue - 1000; int count = this.ctバナパス読み込み成功.CurrentValue - 1000;
TJAPlayer3.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; TJAPlayer3.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2;
TJAPlayer3.Tx.Banapas_Load_Clear[0].vc拡大縮小倍率.Y = count <= 100 ? count * 0.01f : 1.0f; TJAPlayer3.Tx.Banapas_Load_Clear[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f;
TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D描画(0, 0); TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D描画(0, 0);
float anime = 0f; float anime = 0f;
@ -540,8 +540,8 @@ namespace TJAPlayer3
} }
} }
TJAPlayer3.Tx.Banapas_Load_Clear[1].vc拡大縮小倍率.X = 1.0f + scalex; TJAPlayer3.Tx.Banapas_Load_Clear[1].vcScaleRatio.X = 1.0f + scalex;
TJAPlayer3.Tx.Banapas_Load_Clear[1].vc拡大縮小倍率.Y = 1.0f + scaley; TJAPlayer3.Tx.Banapas_Load_Clear[1].vcScaleRatio.Y = 1.0f + scaley;
TJAPlayer3.Tx.Banapas_Load_Clear[1].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; TJAPlayer3.Tx.Banapas_Load_Clear[1].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2;
TJAPlayer3.Tx.Banapas_Load_Clear[1].t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[0], TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[1] - anime); TJAPlayer3.Tx.Banapas_Load_Clear[1].t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[0], TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[1] - anime);
@ -589,7 +589,7 @@ namespace TJAPlayer3
int _charaId = TJAPlayer3.SaveFileInstances[_actual].data.Character; int _charaId = TJAPlayer3.SaveFileInstances[_actual].data.Character;
int chara_x = TJAPlayer3.Skin.Title_Entry_NamePlate[0] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2; int chara_x = TJAPlayer3.Skin.Title_Entry_NamePlate[0] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2;
int chara_y = TJAPlayer3.Skin.Title_Entry_NamePlate[1]; int chara_y = TJAPlayer3.Skin.Title_Entry_NamePlate[1];
int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0]; int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0];
@ -693,7 +693,7 @@ namespace TJAPlayer3
//int chara_y = (int)(TJAPlayer3.Skin.Characters_Title_Normal_Y[_charaId][player] - DonchanY); //int chara_y = (int)(TJAPlayer3.Skin.Characters_Title_Normal_Y[_charaId][player] - DonchanY);
int chara_x = (int)DonchanX + TJAPlayer3.Skin.SongSelect_NamePlate_X[player] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2; int chara_x = (int)DonchanX + TJAPlayer3.Skin.SongSelect_NamePlate_X[player] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2;
int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[player] - (int)DonchanY; int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[player] - (int)DonchanY;
int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[player]; int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[player];
@ -731,8 +731,8 @@ namespace TJAPlayer3
_bar.color4 = CConversion.ColorToColor4(Color.DarkGray); _bar.color4 = CConversion.ColorToColor4(Color.DarkGray);
if (_chara != null) if (_chara != null)
_chara.color4 = CConversion.ColorToColor4(Color.DarkGray); _chara.color4 = CConversion.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.DarkGray); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.DarkGray); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.DarkGray);
} }
else else
{ {
@ -740,8 +740,8 @@ namespace TJAPlayer3
_bar.color4 = CConversion.ColorToColor4(Color.White); _bar.color4 = CConversion.ColorToColor4(Color.White);
if (_chara != null) if (_chara != null)
_chara.color4 = CConversion.ColorToColor4(Color.White); _chara.color4 = CConversion.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.White); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.White); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.White);
} }
#endregion #endregion
@ -771,8 +771,8 @@ namespace TJAPlayer3
if (_bar != null) if (_bar != null)
{ {
_bar.Opacity = 255; _bar.Opacity = 255;
_bar.vc拡大縮小倍率.X = 1.0f; _bar.vcScaleRatio.X = 1.0f;
_bar.vc拡大縮小倍率.Y = 1.0f; _bar.vcScaleRatio.Y = 1.0f;
_bar.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[0] - (TJAPlayer3.Skin.Title_VerticalBar ? barAnimeX : 0), _bar.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[0] - (TJAPlayer3.Skin.Title_VerticalBar ? barAnimeX : 0),
TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[0] - (TJAPlayer3.Skin.Title_VerticalBar ? 0 : barAnime), TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[0] - (TJAPlayer3.Skin.Title_VerticalBar ? 0 : barAnime),
new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[0][0], new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[0][0],
@ -788,11 +788,11 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Title_VerticalBar) if (TJAPlayer3.Skin.Title_VerticalBar)
{ {
_bar.vc拡大縮小倍率.X = (barAnimeX / TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][2]) * 2.0f; _bar.vcScaleRatio.X = (barAnimeX / TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][2]) * 2.0f;
} }
else else
{ {
_bar.vc拡大縮小倍率.Y = (barAnime / TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][3]) * 2.0f; _bar.vcScaleRatio.Y = (barAnime / TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][3]) * 2.0f;
} }
_bar.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[2], TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[2], _bar.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[2], TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[2],
@ -807,8 +807,8 @@ namespace TJAPlayer3
{ {
CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount]; CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount];
_overlap.vc拡大縮小倍率.X = 1.0f; _overlap.vcScaleRatio.X = 1.0f;
_overlap.vc拡大縮小倍率.Y = 1.0f; _overlap.vcScaleRatio.Y = 1.0f;
_overlap.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[0], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[0], _overlap.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[0], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[0],
new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][0], new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][0],
TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][1], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][1],
@ -823,11 +823,11 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Title_VerticalBar) if (TJAPlayer3.Skin.Title_VerticalBar)
{ {
_overlap.vc拡大縮小倍率.X = (overlayAnimeX / TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][2]); _overlap.vcScaleRatio.X = (overlayAnimeX / TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][2]);
} }
else else
{ {
_overlap.vc拡大縮小倍率.Y = (overlayAnime / TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][3]); _overlap.vcScaleRatio.Y = (overlayAnime / TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][3]);
} }
_overlap.t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[2], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[2], _overlap.t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[2], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[2],
@ -852,16 +852,16 @@ namespace TJAPlayer3
{ {
_chara.Opacity = (int)(BarAnimeCount * 255f) + (int)(barAnimef * 2.5f); _chara.Opacity = (int)(BarAnimeCount * 255f) + (int)(barAnimef * 2.5f);
_chara.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_X[0] - anime, TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Y[0], _chara.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_X[0] - anime, TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Y[0],
new Rectangle(0, 0, _chara.szテクスチャサイズ.Width / 2, _chara.szテクスチャサイズ.Height)); new Rectangle(0, 0, _chara.szTextureSize.Width / 2, _chara.szTextureSize.Height));
_chara.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_X[1] + anime, TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Y[1], _chara.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_X[1] + anime, TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Y[1],
new Rectangle(_chara.szテクスチャサイズ.Width / 2, 0, _chara.szテクスチャサイズ.Width / 2, _chara.szテクスチャサイズ.Height)); new Rectangle(_chara.szTextureSize.Width / 2, 0, _chara.szTextureSize.Width / 2, _chara.szTextureSize.Height));
} }
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText)?.t2D中心基準描画( TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText)?.t2D中心基準描画(
TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title[0] + (TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title_Move_X * BarAnimeCount), TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title[0] + (TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title_Move_X * BarAnimeCount),
TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title[1] - (TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title_Move * BarAnimeCount)); TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title[1] - (TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title_Move * BarAnimeCount));
CTexture currentText = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true); CTexture currentText = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true);
if (currentText != null) if (currentText != null)
{ {
currentText.Opacity = (int)(BarAnimeCount * 255f); currentText.Opacity = (int)(BarAnimeCount * 255f);
@ -899,8 +899,8 @@ namespace TJAPlayer3
if (_bar != null) if (_bar != null)
{ {
_bar.vc拡大縮小倍率.X = 1.0f; _bar.vcScaleRatio.X = 1.0f;
_bar.vc拡大縮小倍率.Y = 1.0f; _bar.vcScaleRatio.Y = 1.0f;
_bar.t2D描画(pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY); _bar.t2D描画(pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
} }
@ -908,14 +908,14 @@ namespace TJAPlayer3
{ {
CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount]; CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount];
_overlap.vc拡大縮小倍率.X = 1.0f; _overlap.vcScaleRatio.X = 1.0f;
_overlap.vc拡大縮小倍率.Y = 1.0f; _overlap.vcScaleRatio.Y = 1.0f;
_overlap.t2D描画(pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY); _overlap.t2D描画(pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
} }
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText)?.t2D中心基準描画(pos.X + BarAnimeX - BarMoveX + TJAPlayer3.Skin.Title_ModeSelect_Title_Offset[0], pos.Y + BarAnimeY - BarMoveY + TJAPlayer3.Skin.Title_ModeSelect_Title_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText)?.t2D中心基準描画(pos.X + BarAnimeX - BarMoveX + TJAPlayer3.Skin.Title_ModeSelect_Title_Offset[0], pos.Y + BarAnimeY - BarMoveY + TJAPlayer3.Skin.Title_ModeSelect_Title_Offset[1]);
} }
} }
} }

42
OpenTaiko/src/Stages/04.Config/CActConfigKeyAssign.cs
View File

@ -42,7 +42,7 @@ namespace TJAPlayer3
{ {
if( !this.bキー入力待ち ) if( !this.bキー入力待ち )
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
switch( this.n現在の選択行 ) switch( this.n現在の選択行 )
{ {
case 0x10: case 0x10:
@ -116,21 +116,21 @@ namespace TJAPlayer3
{ {
if( this.bキー入力待ち ) if( this.bキー入力待ち )
{ {
if( TJAPlayer3.Input管理.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) ) if( TJAPlayer3.InputManager.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) )
{ {
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
this.bキー入力待ち = false; this.bキー入力待ち = false;
TJAPlayer3.Input管理.Polling( false ); TJAPlayer3.InputManager.Polling( false );
} }
else if( ( this.tキーチェックとアサイン_Keyboard() || this.tキーチェックとアサイン_MidiIn() ) || ( this.tキーチェックとアサイン_Joypad() || tキーチェックとアサイン_Gamepad() || this.tキーチェックとアサイン_Mouse() ) ) else if( ( this.tキーチェックとアサイン_Keyboard() || this.tキーチェックとアサイン_MidiIn() ) || ( this.tキーチェックとアサイン_Joypad() || tキーチェックとアサイン_Gamepad() || this.tキーチェックとアサイン_Mouse() ) )
{ {
this.bキー入力待ち = false; this.bキー入力待ち = false;
TJAPlayer3.Input管理.Polling( false ); TJAPlayer3.InputManager.Polling( false );
} }
} }
else if( ( TJAPlayer3.Input管理.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Delete ) && ( this.n現在の選択行 >= 0 ) ) && ( this.n現在の選択行 <= 15 ) ) else if( ( TJAPlayer3.InputManager.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Delete ) && ( this.n現在の選択行 >= 0 ) ) && ( this.n現在の選択行 <= 15 ) )
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Unknown; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Unknown;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = 0; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = 0;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].コード = 0; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].コード = 0;
@ -144,14 +144,14 @@ namespace TJAPlayer3
float scale = 0.55f; float scale = 0.55f;
for( int j = 0; j < 14; j++ ) for( int j = 0; j < 14; j++ )
{ {
TJAPlayer3.Tx.Menu_Highlight.vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.X = scale;
TJAPlayer3.Tx.Menu_Highlight.vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.Y = scale;
TJAPlayer3.Tx.Menu_Highlight.t2D描画( num2, num3 ); TJAPlayer3.Tx.Menu_Highlight.t2D描画( num2, num3 );
num2 += (int)(TJAPlayer3.Tx.Menu_Highlight.szテクスチャサイズ.Width * scale); num2 += (int)(TJAPlayer3.Tx.Menu_Highlight.szTextureSize.Width * scale);
TJAPlayer3.Tx.Menu_Highlight.vc拡大縮小倍率.X = 1; TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.X = 1;
TJAPlayer3.Tx.Menu_Highlight.vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.Y = 1;
} }
//TJAPlayer3.Tx.Menu_Highlight.t2D描画( num2, num3, new Rectangle( 0x10, 0, 0x10, 0x20 ) ); //TJAPlayer3.Tx.Menu_Highlight.t2D描画( num2, num3, new Rectangle( 0x10, 0, 0x10, 0x20 ) );
} }
@ -339,7 +339,7 @@ namespace TJAPlayer3
private bool tキーチェックとアサイン_Gamepad() private bool tキーチェックとアサイン_Gamepad()
{ {
foreach( IInputDevice device in TJAPlayer3.Input管理.InputDevices ) foreach( IInputDevice device in TJAPlayer3.InputManager.InputDevices )
{ {
if( device.CurrentType == InputDeviceType.Gamepad ) if( device.CurrentType == InputDeviceType.Gamepad )
{ {
@ -347,7 +347,7 @@ namespace TJAPlayer3
{ {
if (device.KeyPressed(i)) if (device.KeyPressed(i))
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Gamepad, device.ID, i, this.pad); TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Gamepad, device.ID, i, this.pad);
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Gamepad; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Gamepad;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = device.ID; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = device.ID;
@ -361,7 +361,7 @@ namespace TJAPlayer3
} }
private bool tキーチェックとアサイン_Joypad() private bool tキーチェックとアサイン_Joypad()
{ {
foreach( IInputDevice device in TJAPlayer3.Input管理.InputDevices ) foreach( IInputDevice device in TJAPlayer3.InputManager.InputDevices )
{ {
if( device.CurrentType == InputDeviceType.Joystick ) if( device.CurrentType == InputDeviceType.Joystick )
{ {
@ -369,7 +369,7 @@ namespace TJAPlayer3
{ {
if (device.KeyPressed(i)) if (device.KeyPressed(i))
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Joypad, device.ID, i, this.pad); TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Joypad, device.ID, i, this.pad);
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Joypad; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Joypad;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = device.ID; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = device.ID;
@ -392,9 +392,9 @@ namespace TJAPlayer3
i != (int)SlimDXKeys.Key.LeftArrow && i != (int)SlimDXKeys.Key.LeftArrow &&
i != (int)SlimDXKeys.Key.RightArrow && i != (int)SlimDXKeys.Key.RightArrow &&
i != (int)SlimDXKeys.Key.Delete && i != (int)SlimDXKeys.Key.Delete &&
TJAPlayer3.Input管理.Keyboard.KeyPressed( i ) ) TJAPlayer3.InputManager.Keyboard.KeyPressed( i ) )
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Keyboard, 0, i, this.pad); TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Keyboard, 0, i, this.pad);
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Keyboard; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Keyboard;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = 0; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = 0;
@ -406,7 +406,7 @@ namespace TJAPlayer3
} }
private bool tキーチェックとアサイン_MidiIn() private bool tキーチェックとアサイン_MidiIn()
{ {
foreach( IInputDevice device in TJAPlayer3.Input管理.InputDevices ) foreach( IInputDevice device in TJAPlayer3.InputManager.InputDevices )
{ {
if( device.CurrentType == InputDeviceType.MidiIn ) if( device.CurrentType == InputDeviceType.MidiIn )
{ {
@ -414,7 +414,7 @@ namespace TJAPlayer3
{ {
if( device.KeyPressed( i ) ) if( device.KeyPressed( i ) )
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.MIDIInput, device.ID, i, this.pad); TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.MIDIInput, device.ID, i, this.pad);
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.MIDIInput; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.MIDIInput;
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = device.ID; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].ID = device.ID;
@ -430,7 +430,7 @@ namespace TJAPlayer3
{ {
for( int i = 0; i < 8; i++ ) for( int i = 0; i < 8; i++ )
{ {
if( TJAPlayer3.Input管理.Mouse.KeyPressed( i ) ) if( TJAPlayer3.InputManager.Mouse.KeyPressed( i ) )
{ {
TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Mouse, 0, i, this.pad); TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する( EInputDevice.Mouse, 0, i, this.pad);
TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Mouse; TJAPlayer3.ConfigIni.KeyAssign[ (int) this.part ][ (int) this.pad ][ this.n現在の選択行 ].入力デバイス = EInputDevice.Mouse;

8
OpenTaiko/src/Stages/04.Config/CActConfigList.cs
View File

@ -432,7 +432,7 @@ namespace TJAPlayer3
/// 4: Semi-Invisible /// 4: Semi-Invisible
/// 5: Full-Invisible /// 5: Full-Invisible
/// </returns> /// </returns>
private int getDefaultSudHidValue( E楽器パート eInst ) private int getDefaultSudHidValue( EInstrumentPad eInst )
{ {
int defvar; int defvar;
int nInst = (int) eInst; int nInst = (int) eInst;
@ -470,7 +470,7 @@ namespace TJAPlayer3
} }
public void tEnter押下() public void tEnter押下()
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
if( this.b要素値にフォーカス中 ) if( this.b要素値にフォーカス中 )
{ {
this.b要素値にフォーカス中 = false; this.b要素値にフォーカス中 = false;
@ -733,7 +733,7 @@ namespace TJAPlayer3
TJAPlayer3.actEnumSongs.Activate(); TJAPlayer3.actEnumSongs.Activate();
// TJAPlayer3.stage選曲.Refresh(TJAPlayer3.EnumSongs.Songs管理, true); // TJAPlayer3.stage選曲.Refresh(TJAPlayer3.EnumSongs.Songs管理, true);
TJAPlayer3.stage選曲.act曲リスト.ResetSongIndex(); TJAPlayer3.stageSongSelect.actSongList.ResetSongIndex();
} }
#endregion #endregion
} }
@ -758,7 +758,7 @@ namespace TJAPlayer3
} }
txSkinSample1 = TJAPlayer3.tテクスチャの生成( bmSrc, false ); txSkinSample1 = TJAPlayer3.tテクスチャの生成( bmSrc, false );
txSkinSample1.vc拡大縮小倍率 = new Silk.NET.Maths.Vector3D<float>(_w / (float)txSkinSample1.szテクスチャサイズ.Width, _h / (float)txSkinSample1.szテクスチャサイズ.Height, 0); txSkinSample1.vcScaleRatio = new Silk.NET.Maths.Vector3D<float>(_w / (float)txSkinSample1.szTextureSize.Width, _h / (float)txSkinSample1.szTextureSize.Height, 0);
bmSrc.Dispose(); bmSrc.Dispose();
nSkinSampleIndex = nSkinIndex; nSkinSampleIndex = nSkinIndex;

26
OpenTaiko/src/Stages/04.Config/CStageコンフィグ.cs
View File

@ -303,11 +303,11 @@ namespace TJAPlayer3
new Rectangle(width * 2, 0, width, height)); new Rectangle(width * 2, 0, width, height));
//Center //Center
TJAPlayer3.Tx.Config_Cursor.vc拡大縮小倍率.X = (move / (float)width) * 2.0f; TJAPlayer3.Tx.Config_Cursor.vcScaleRatio.X = (move / (float)width) * 2.0f;
TJAPlayer3.Tx.Config_Cursor.t2D拡大率考慮中央基準描画(x, y, TJAPlayer3.Tx.Config_Cursor.t2D拡大率考慮中央基準描画(x, y,
new Rectangle(width, 0, width, height)); new Rectangle(width, 0, width, height));
TJAPlayer3.Tx.Config_Cursor.vc拡大縮小倍率.X = 1.0f; TJAPlayer3.Tx.Config_Cursor.vcScaleRatio.X = 1.0f;
} }
//--------------------- //---------------------
#endregion #endregion
@ -407,9 +407,9 @@ namespace TJAPlayer3
// 曲データの一覧取得中は、キー入力を無効化する // 曲データの一覧取得中は、キー入力を無効化する
if ( !TJAPlayer3.EnumSongs.IsEnumerating || TJAPlayer3.actEnumSongs.bコマンドでの曲データ取得 != true ) if ( !TJAPlayer3.EnumSongs.IsEnumerating || TJAPlayer3.actEnumSongs.bコマンドでの曲データ取得 != true )
{ {
if ( ( TJAPlayer3.Input管理.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) || TJAPlayer3.Pad.b押された( E楽器パート.DRUMS, Eパッド.FT ) ) || TJAPlayer3.Pad.b押されたGB( Eパッド.FT ) ) if ( ( TJAPlayer3.InputManager.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) || TJAPlayer3.Pad.bPressed( EInstrumentPad.DRUMS, EPad.FT ) ) || TJAPlayer3.Pad.bPressedGB( EPad.FT ) )
{ {
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
if ( !this.bメニューにフォーカス中 ) if ( !this.bメニューにフォーカス中 )
{ {
if ( this.eItemPanelモード == EItemPanelモード.キーコード一覧 ) if ( this.eItemPanelモード == EItemPanelモード.キーコード一覧 )
@ -430,18 +430,18 @@ namespace TJAPlayer3
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
} }
} }
else if ( ( TJAPlayer3.Pad.b押されたDGB( Eパッド.CY ) || TJAPlayer3.Pad.b押された( E楽器パート.DRUMS, Eパッド.RD ) ) || ( TJAPlayer3.Pad.b押された( E楽器パート.DRUMS, Eパッド.LC ) || ( TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.Input管理.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Return ) ) ) ) else if ( ( TJAPlayer3.Pad.bPressedDGB( EPad.CY ) || TJAPlayer3.Pad.bPressed( EInstrumentPad.DRUMS, EPad.RD ) ) || ( TJAPlayer3.Pad.bPressed( EInstrumentPad.DRUMS, EPad.LC ) || ( TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Return ) ) ) )
{ {
if ( this.n現在のメニュー番号 == 2 ) if ( this.n現在のメニュー番号 == 2 )
{ {
// Exit // Exit
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
this.actFIFO.tフェードアウト開始(); this.actFIFO.tフェードアウト開始();
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
} }
else if ( this.bメニューにフォーカス中 ) else if ( this.bメニューにフォーカス中 )
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
this.bメニューにフォーカス中 = false; this.bメニューにフォーカス中 = false;
this.t説明文パネルに現在選択されている項目の説明を描画する(); this.t説明文パネルに現在選択されている項目の説明を描画する();
} }
@ -471,15 +471,15 @@ namespace TJAPlayer3
} }
} }
} }
this.ctキー反復用.Up.KeyIntervalFunc( TJAPlayer3.Input管理.Keyboard.KeyPressing( (int)SlimDXKeys.Key.UpArrow ), new CCounter.KeyProcess( this.tカーソルを上へ移動する ) ); this.ctキー反復用.Up.KeyIntervalFunc( TJAPlayer3.InputManager.Keyboard.KeyPressing( (int)SlimDXKeys.Key.UpArrow ), new CCounter.KeyProcess( this.tカーソルを上へ移動する ) );
this.ctキー反復用.R.KeyIntervalFunc( TJAPlayer3.Pad.b押されているGB( Eパッド.HH ), new CCounter.KeyProcess( this.tカーソルを上へ移動する ) ); this.ctキー反復用.R.KeyIntervalFunc( TJAPlayer3.Pad.b押されているGB( EPad.HH ), new CCounter.KeyProcess( this.tカーソルを上へ移動する ) );
if ( TJAPlayer3.Pad.b押された( E楽器パート.DRUMS, Eパッド.SD ) ) if ( TJAPlayer3.Pad.bPressed( EInstrumentPad.DRUMS, EPad.SD ) )
{ {
this.tカーソルを上へ移動する(); this.tカーソルを上へ移動する();
} }
this.ctキー反復用.Down.KeyIntervalFunc( TJAPlayer3.Input管理.Keyboard.KeyPressing( (int)SlimDXKeys.Key.DownArrow ), new CCounter.KeyProcess( this.tカーソルを下へ移動する ) ); this.ctキー反復用.Down.KeyIntervalFunc( TJAPlayer3.InputManager.Keyboard.KeyPressing( (int)SlimDXKeys.Key.DownArrow ), new CCounter.KeyProcess( this.tカーソルを下へ移動する ) );
this.ctキー反復用.B.KeyIntervalFunc( TJAPlayer3.Pad.b押されているGB( Eパッド.BD ), new CCounter.KeyProcess( this.tカーソルを下へ移動する ) ); this.ctキー反復用.B.KeyIntervalFunc( TJAPlayer3.Pad.b押されているGB( EPad.BD ), new CCounter.KeyProcess( this.tカーソルを下へ移動する ) );
if ( TJAPlayer3.Pad.b押された( E楽器パート.DRUMS, Eパッド.LT ) ) if ( TJAPlayer3.Pad.bPressed( EInstrumentPad.DRUMS, EPad.LT ) )
{ {
this.tカーソルを下へ移動する(); this.tカーソルを下へ移動する();
} }

116
OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位リスト.cs
View File

@ -109,8 +109,8 @@ namespace TJAPlayer3
if (stバー情報.Length != 0 && ctDaniIn.CurrentValue == 6000) if (stバー情報.Length != 0 && ctDaniIn.CurrentValue == 6000)
{ {
TJAPlayer3.Tx.DanC_ExamType.vc拡大縮小倍率.X = 0.81f; TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.X = 0.81f;
TJAPlayer3.Tx.DanC_ExamType.vc拡大縮小倍率.Y = 0.81f; TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.Y = 0.81f;
float Anime = ctDanAnimeIn.CurrentValue == 90 ? bLeftMove ? (float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0] : -((float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0]) : TJAPlayer3.Skin.Resolution[0] - (float)Math.Sin(ctDanAnimeIn.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0]; float Anime = ctDanAnimeIn.CurrentValue == 90 ? bLeftMove ? (float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0] : -((float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0]) : TJAPlayer3.Skin.Resolution[0] - (float)Math.Sin(ctDanAnimeIn.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0];
@ -150,8 +150,8 @@ namespace TJAPlayer3
// stバー情報[n現在の選択行] // stバー情報[n現在の選択行]
int tickWidth = TJAPlayer3.Tx.Dani_Plate.szテクスチャサイズ.Width / 7; int tickWidth = TJAPlayer3.Tx.Dani_Plate.szTextureSize.Width / 7;
int tickHeight = TJAPlayer3.Tx.Dani_Plate.szテクスチャサイズ.Height; int tickHeight = TJAPlayer3.Tx.Dani_Plate.szTextureSize.Height;
for (int idx = -13; idx < 14; idx++) for (int idx = -13; idx < 14; idx++)
{ {
@ -187,7 +187,7 @@ namespace TJAPlayer3
#region [Dan grade title] #region [Dan grade title]
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTextureTate(stバー情報[currentSong].ttkタイトル[stバー情報[currentSong].ttkタイトル.Length - 1]) TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTextureTate(stバー情報[currentSong].ttkタイトル[stバー情報[currentSong].ttkタイトル.Length - 1])
.t2D拡大率考慮上中央基準描画(xPos + TJAPlayer3.Skin.DaniSelect_Plate_Title_Offset[0], yPos + TJAPlayer3.Skin.DaniSelect_Plate_Title_Offset[1]); .t2D拡大率考慮上中央基準描画(xPos + TJAPlayer3.Skin.DaniSelect_Plate_Title_Offset[0], yPos + TJAPlayer3.Skin.DaniSelect_Plate_Title_Offset[1]);
#endregion #endregion
@ -209,10 +209,10 @@ namespace TJAPlayer3
if (currentRank >= 0) if (currentRank >= 0)
{ {
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.X = 0.20f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 0.20f;
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.Y = 0.20f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 0.20f;
int rank_width = TJAPlayer3.Tx.DanResult_Rank.szテクスチャサイズ.Width / 7; int rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7;
int rank_height = TJAPlayer3.Tx.DanResult_Rank.szテクスチャサイズ.Height; int rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height;
TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮上中央基準描画(xPos - 2, yPos - 14, new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height)); TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮上中央基準描画(xPos - 2, yPos - 14, new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height));
} }
@ -249,7 +249,7 @@ namespace TJAPlayer3
private CStage選曲.STNumber[] stSoulNumber = new CStage選曲.STNumber[10]; private CStage選曲.STNumber[] stSoulNumber = new CStage選曲.STNumber[10];
private CStage選曲.STNumber[] stExamNumber = new CStage選曲.STNumber[10]; private CStage選曲.STNumber[] stExamNumber = new CStage選曲.STNumber[10];
public List<C曲リストノード> listSongs; public List<CSongListNode> listSongs;
public STバー情報[] stバー情報; public STバー情報[] stバー情報;
public struct STバー情報 public struct STバー情報
@ -257,7 +257,7 @@ namespace TJAPlayer3
public TitleTextureKey[] ttkタイトル; public TitleTextureKey[] ttkタイトル;
public int[] n曲難易度; public int[] n曲難易度;
public int[] n曲レベル; public int[] n曲レベル;
public C曲リストノード.Eノード種別 eノード種別; public CSongListNode.ENodeType eノード種別;
public List<CDTX.DanSongs> List_DanSongs; public List<CDTX.DanSongs> List_DanSongs;
public CTexture txBarCenter; public CTexture txBarCenter;
public CTexture txDanPlate; public CTexture txDanPlate;
@ -268,7 +268,7 @@ namespace TJAPlayer3
public Color cDanTickColor; public Color cDanTickColor;
} }
public C曲リストノード currentBar public CSongListNode currentBar
{ {
get get
{ {
@ -301,10 +301,10 @@ namespace TJAPlayer3
int danTick = 0; int danTick = 0;
Color danTickColor = Color.White; Color danTickColor = Color.White;
if (TJAPlayer3.stage選曲.r確定されたスコア != null) if (TJAPlayer3.stageSongSelect.r確定されたスコア != null)
{ {
danTick = TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.nDanTick; danTick = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.nDanTick;
danTickColor = TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.cDanTickColor; danTickColor = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.cDanTickColor;
} }
if (songNode != null) if (songNode != null)
{ {
@ -315,7 +315,7 @@ namespace TJAPlayer3
} }
int unit = TJAPlayer3.Tx.Dani_DanPlates.szテクスチャサイズ.Width / 6; int unit = TJAPlayer3.Tx.Dani_DanPlates.szTextureSize.Width / 6;
if (TJAPlayer3.Tx.Dani_DanPlates != null) if (TJAPlayer3.Tx.Dani_DanPlates != null)
{ {
@ -326,13 +326,13 @@ namespace TJAPlayer3
unit * danTick, unit * danTick,
0, 0,
unit, unit,
TJAPlayer3.Tx.Dani_DanPlates_Back.szテクスチャサイズ.Height TJAPlayer3.Tx.Dani_DanPlates_Back.szTextureSize.Height
)); ));
TJAPlayer3.Tx.Dani_DanPlates?.t2D中心基準描画(x, y, new Rectangle( TJAPlayer3.Tx.Dani_DanPlates?.t2D中心基準描画(x, y, new Rectangle(
unit * danTick, unit * danTick,
0, 0,
unit, unit,
TJAPlayer3.Tx.Dani_DanPlates.szテクスチャサイズ.Height TJAPlayer3.Tx.Dani_DanPlates.szTextureSize.Height
)); ));
if (pfDanPlateTitle == null) if (pfDanPlateTitle == null)
@ -340,8 +340,8 @@ namespace TJAPlayer3
string titleTmp = ""; string titleTmp = "";
if (TJAPlayer3.stage選曲.r確定されたスコア != null) if (TJAPlayer3.stageSongSelect.r確定されたスコア != null)
titleTmp = TJAPlayer3.stage選曲.r確定された曲.strタイトル; titleTmp = TJAPlayer3.stageSongSelect.rChoosenSong.strタイトル;
if (songNode != null) if (songNode != null)
{ {
STバー情報 stNode = (STバー情報)songNode; STバー情報 stNode = (STバー情報)songNode;
@ -350,7 +350,7 @@ namespace TJAPlayer3
} }
TitleTextureKey ttkTmp = new TitleTextureKey(titleTmp.Substring(0, 2), pfDanPlateTitle, Color.White, Color.Black, 1000); TitleTextureKey ttkTmp = new TitleTextureKey(titleTmp.Substring(0, 2), pfDanPlateTitle, Color.White, Color.Black, 1000);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTextureTate(ttkTmp).t2D中心基準描画(x + TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Offset[0], y + TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTextureTate(ttkTmp).t2D中心基準描画(x + TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Offset[0], y + TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Offset[1]);
} }
} }
@ -377,23 +377,23 @@ namespace TJAPlayer3
if (showFade) if (showFade)
{ {
TJAPlayer3.Tx.Dani_DanIcon_Fade.vc拡大縮小倍率 = new Vector3D<float>(scale, scale, 1.0f); TJAPlayer3.Tx.Dani_DanIcon_Fade.vcScaleRatio = new Vector3D<float>(scale, scale, 1.0f);
TJAPlayer3.Tx.Dani_DanIcon_Fade.Opacity = opacity; TJAPlayer3.Tx.Dani_DanIcon_Fade.Opacity = opacity;
TJAPlayer3.Tx.Dani_DanIcon_Fade.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, TJAPlayer3.Skin.DaniSelect_DanIcon_Color.Length - 1)]); TJAPlayer3.Tx.Dani_DanIcon_Fade.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, TJAPlayer3.Skin.DaniSelect_DanIcon_Color.Length - 1)]);
TJAPlayer3.Tx.Dani_DanIcon_Fade.t2D拡大率考慮描画(CTexture.RefPnt.Left, x - ((TJAPlayer3.Tx.Dani_DanIcon.szテクスチャサイズ.Width / 2) * scale), y); TJAPlayer3.Tx.Dani_DanIcon_Fade.t2D拡大率考慮描画(CTexture.RefPnt.Left, x - ((TJAPlayer3.Tx.Dani_DanIcon.szTextureSize.Width / 2) * scale), y);
TJAPlayer3.Tx.Dani_DanIcon_Fade.Opacity = 255; TJAPlayer3.Tx.Dani_DanIcon_Fade.Opacity = 255;
} }
TJAPlayer3.Tx.Dani_DanIcon.vc拡大縮小倍率 = new Vector3D<float>(scale, scale, 1.0f); TJAPlayer3.Tx.Dani_DanIcon.vcScaleRatio = new Vector3D<float>(scale, scale, 1.0f);
TJAPlayer3.Tx.Dani_DanIcon.Opacity = opacity; TJAPlayer3.Tx.Dani_DanIcon.Opacity = opacity;
TJAPlayer3.Tx.Dani_DanIcon.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, TJAPlayer3.Skin.DaniSelect_DanIcon_Color.Length - 1)]); TJAPlayer3.Tx.Dani_DanIcon.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, TJAPlayer3.Skin.DaniSelect_DanIcon_Color.Length - 1)]);
TJAPlayer3.Tx.Dani_DanIcon.t2D拡大率考慮中央基準描画(x, y); TJAPlayer3.Tx.Dani_DanIcon.t2D拡大率考慮中央基準描画(x, y);
TJAPlayer3.Tx.Dani_DanIcon.Opacity = 255; TJAPlayer3.Tx.Dani_DanIcon.Opacity = 255;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTmp).vc拡大縮小倍率 = new Vector3D<float>(scale, scale, 1.0f); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTmp).vcScaleRatio = new Vector3D<float>(scale, scale, 1.0f);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTmp).Opacity = opacity; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTmp).Opacity = opacity;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTmp).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.DaniSelect_DanIconTitle_Offset[0], y + TJAPlayer3.Skin.DaniSelect_DanIconTitle_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTmp).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.DaniSelect_DanIconTitle_Offset[0], y + TJAPlayer3.Skin.DaniSelect_DanIconTitle_Offset[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTmp).Opacity = 255; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTmp).Opacity = 255;
} }
private void tDrawDanSelectedLevel(float Anime, int modifier = 0) private void tDrawDanSelectedLevel(float Anime, int modifier = 0)
@ -404,7 +404,7 @@ namespace TJAPlayer3
switch(stバー情報[currentSong].eノード種別) switch(stバー情報[currentSong].eノード種別)
{ {
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
{ {
#region [Center bar and Dan plate] #region [Center bar and Dan plate]
@ -418,7 +418,7 @@ namespace TJAPlayer3
} }
else else
{ {
int unit = TJAPlayer3.Tx.Dani_DanSides.szテクスチャサイズ.Width / 6; int unit = TJAPlayer3.Tx.Dani_DanSides.szTextureSize.Width / 6;
TJAPlayer3.Tx.Dani_DanSides.color4 = CConversion.ColorToColor4(danTickColor); TJAPlayer3.Tx.Dani_DanSides.color4 = CConversion.ColorToColor4(danTickColor);
TJAPlayer3.Tx.Dani_Bar_Center.t2D描画(scroll + Anime, 0); TJAPlayer3.Tx.Dani_Bar_Center.t2D描画(scroll + Anime, 0);
@ -428,14 +428,14 @@ namespace TJAPlayer3
unit * danTick, unit * danTick,
0, 0,
unit, unit,
TJAPlayer3.Tx.Dani_DanSides.szテクスチャサイズ.Height TJAPlayer3.Tx.Dani_DanSides.szTextureSize.Height
)); ));
TJAPlayer3.Tx.Dani_DanSides.t2D左右反転描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_DanSides_X[1], TJAPlayer3.Skin.DaniSelect_DanSides_Y[1], new Rectangle( TJAPlayer3.Tx.Dani_DanSides.t2D左右反転描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_DanSides_X[1], TJAPlayer3.Skin.DaniSelect_DanSides_Y[1], new Rectangle(
unit * danTick, unit * danTick,
0, 0,
unit, unit,
TJAPlayer3.Tx.Dani_DanSides.szテクスチャサイズ.Height TJAPlayer3.Tx.Dani_DanSides.szTextureSize.Height
)); ));
} }
@ -449,11 +449,11 @@ namespace TJAPlayer3
if (currentRank >= 0) if (currentRank >= 0)
{ {
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.X = 0.8f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 0.8f;
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.Y = 0.8f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 0.8f;
int rank_width = TJAPlayer3.Tx.DanResult_Rank.szテクスチャサイズ.Width / 7; int rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7;
int rank_height = TJAPlayer3.Tx.DanResult_Rank.szテクスチャサイズ.Height; int rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height;
TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Rank[0], TJAPlayer3.Skin.DaniSelect_Rank[1], new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height)); TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Rank[0], TJAPlayer3.Skin.DaniSelect_Rank[1], new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height));
} }
@ -468,7 +468,7 @@ namespace TJAPlayer3
tSoulDraw(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Value_Gauge[0], TJAPlayer3.Skin.DaniSelect_Value_Gauge[1], stバー情報[currentSong].List_DanSongs[0].Dan_C[0].Value[0]); tSoulDraw(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Value_Gauge[0], TJAPlayer3.Skin.DaniSelect_Value_Gauge[1], stバー情報[currentSong].List_DanSongs[0].Dan_C[0].Value[0]);
//TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[0]).t2D下中央基準描画((int)(scroll + 396 + Anime), 452); //TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[0]).t2D下中央基準描画((int)(scroll + 396 + Anime), 452);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[0]).t2D拡大率考慮中央基準描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_Text_Gauge[0], TJAPlayer3.Skin.DaniSelect_Text_Gauge[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkExams[0]).t2D拡大率考慮中央基準描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_Text_Gauge[0], TJAPlayer3.Skin.DaniSelect_Text_Gauge[1]);
#endregion #endregion
@ -515,8 +515,8 @@ namespace TJAPlayer3
*/ */
} }
int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szテクスチャサイズ.Width / 5; int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5;
int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szテクスチャサイズ.Height; int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height;
int sections_count = 1 + ((stバー情報[currentSong].n曲レベル.Length - 1) / 3); int sections_count = 1 + ((stバー情報[currentSong].n曲レベル.Length - 1) / 3);
for (int i = 0; i < stバー情報[currentSong].ttkタイトル.Length - 1; i++) for (int i = 0; i < stバー情報[currentSong].ttkタイトル.Length - 1; i++)
@ -527,9 +527,9 @@ namespace TJAPlayer3
{ {
opacity = getOpacity(i, sections_count); opacity = getOpacity(i, sections_count);
} }
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).Opacity = opacity; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).Opacity = opacity;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).t2D描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Title_X[pos], TJAPlayer3.Skin.DaniSelect_Title_Y[pos]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).t2D描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Title_X[pos], TJAPlayer3.Skin.DaniSelect_Title_Y[pos]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).Opacity = 255; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).Opacity = 255;
tDisplayDanIcon(i + 1, scroll + Anime + TJAPlayer3.Skin.DaniSelect_DanIcon_X[pos], TJAPlayer3.Skin.DaniSelect_DanIcon_Y[pos], opacity, 1.0f); tDisplayDanIcon(i + 1, scroll + Anime + TJAPlayer3.Skin.DaniSelect_DanIcon_X[pos], TJAPlayer3.Skin.DaniSelect_DanIcon_Y[pos], opacity, 1.0f);
} }
@ -692,7 +692,7 @@ namespace TJAPlayer3
if (stバー情報[currentSong].List_DanSongs[0].Dan_C[j] != null) if (stバー情報[currentSong].List_DanSongs[0].Dan_C[j] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[(int)stバー情報[currentSong].List_DanSongs[0].Dan_C[j].GetExamType()]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkExams[(int)stバー情報[currentSong].List_DanSongs[0].Dan_C[j].GetExamType()]);
tmpTex.Opacity = opacity; tmpTex.Opacity = opacity;
//tmpTex.t2D下中央基準描画((int)(scroll + 614 + Anime), 452 + index * 88); //tmpTex.t2D下中央基準描画((int)(scroll + 614 + Anime), 452 + index * 88);
@ -709,16 +709,16 @@ namespace TJAPlayer3
} }
} }
public void tOpenFolder(C曲リストノード song) public void tOpenFolder(CSongListNode song)
{ {
listSongs = song.list子リスト; listSongs = song.list子リスト;
n現在の選択行 = 0; n現在の選択行 = 0;
tUpdateSongs(); tUpdateSongs();
} }
public void tCloseFolder(C曲リストノード song) public void tCloseFolder(CSongListNode song)
{ {
listSongs = song.r親ノード.r親ノード.list子リスト; listSongs = song.rParentNode.rParentNode.list子リスト;
n現在の選択行 = 0; n現在の選択行 = 0;
tUpdateSongs(); tUpdateSongs();
} }
@ -738,7 +738,7 @@ namespace TJAPlayer3
stバー情報[i].eノード種別 = song.eノード種別; stバー情報[i].eノード種別 = song.eノード種別;
switch (song.eノード種別) switch (song.eノード種別)
{ {
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
{ {
stバー情報[i].ttkタイトル = new TitleTextureKey[listSongs[i].DanSongs.Count + 1]; stバー情報[i].ttkタイトル = new TitleTextureKey[listSongs[i].DanSongs.Count + 1];
stバー情報[i].n曲難易度 = new int[listSongs[i].DanSongs.Count]; stバー情報[i].n曲難易度 = new int[listSongs[i].DanSongs.Count];
@ -785,21 +785,21 @@ namespace TJAPlayer3
} }
} }
break; break;
case C曲リストノード.Eノード種別.BOX: case CSongListNode.ENodeType.BOX:
{ {
stバー情報[i].ttkタイトル = new TitleTextureKey[1]; stバー情報[i].ttkタイトル = new TitleTextureKey[1];
stバー情報[i].ttkタイトル[0] = new TitleTextureKey(song.strタイトル, pfDanSong, Color.White, Color.Black, 700); stバー情報[i].ttkタイトル[0] = new TitleTextureKey(song.strタイトル, pfDanSong, Color.White, Color.Black, 700);
stバー情報[i].cDanTickColor = song.BoxColor; stバー情報[i].cDanTickColor = song.BoxColor;
} }
break; break;
case C曲リストノード.Eノード種別.BACKBOX: case CSongListNode.ENodeType.BACKBOX:
{ {
stバー情報[i].ttkタイトル = new TitleTextureKey[1]; stバー情報[i].ttkタイトル = new TitleTextureKey[1];
stバー情報[i].ttkタイトル[0] = new TitleTextureKey(CLangManager.LangInstance.GetString(200), pfDanSong, Color.White, Color.Black, 700); stバー情報[i].ttkタイトル[0] = new TitleTextureKey(CLangManager.LangInstance.GetString(200), pfDanSong, Color.White, Color.Black, 700);
stバー情報[i].cDanTickColor = Color.FromArgb(180, 150, 70); stバー情報[i].cDanTickColor = Color.FromArgb(180, 150, 70);
} }
break; break;
case C曲リストノード.Eノード種別.RANDOM: case CSongListNode.ENodeType.RANDOM:
{ {
stバー情報[i].ttkタイトル = new TitleTextureKey[1]; stバー情報[i].ttkタイトル = new TitleTextureKey[1];
stバー情報[i].ttkタイトル[0] = new TitleTextureKey(CLangManager.LangInstance.GetString(203), pfDanSong, Color.White, Color.Black, 700); stバー情報[i].ttkタイトル[0] = new TitleTextureKey(CLangManager.LangInstance.GetString(203), pfDanSong, Color.White, Color.Black, 700);
@ -815,7 +815,7 @@ namespace TJAPlayer3
{ {
if(n現在の選択行 < stバー情報.Length - 1) if(n現在の選択行 < stバー情報.Length - 1)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
this.bLeftMove = false; this.bLeftMove = false;
this.ctDaniMoveAnime.Start(0, 90, 2f, TJAPlayer3.Timer); this.ctDaniMoveAnime.Start(0, 90, 2f, TJAPlayer3.Timer);
} }
@ -825,7 +825,7 @@ namespace TJAPlayer3
{ {
if (n現在の選択行 > 0) if (n現在の選択行 > 0)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
this.bLeftMove = true; this.bLeftMove = true;
this.ctDaniMoveAnime.Start(0, 90, 2f, TJAPlayer3.Timer); this.ctDaniMoveAnime.Start(0, 90, 2f, TJAPlayer3.Timer);
} }
@ -857,12 +857,12 @@ namespace TJAPlayer3
float _x = x - (((TJAPlayer3.Skin.DaniSelect_Level_Number_Interval[0] * offset) + (width / 2)) * scale); float _x = x - (((TJAPlayer3.Skin.DaniSelect_Level_Number_Interval[0] * offset) + (width / 2)) * scale);
float _y = y - (((TJAPlayer3.Skin.DaniSelect_Level_Number_Interval[1] * offset) - (width / 2)) * scale); float _y = y - (((TJAPlayer3.Skin.DaniSelect_Level_Number_Interval[1] * offset) - (width / 2)) * scale);
TJAPlayer3.Tx.Dani_Level_Number.vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.X = scale;
TJAPlayer3.Tx.Dani_Level_Number.vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.Y = scale;
TJAPlayer3.Tx.Dani_Level_Number.t2D描画(_x, _y, TJAPlayer3.Tx.Dani_Level_Number.t2D描画(_x, _y,
new RectangleF(width * nums[j], 0, width, height)); new RectangleF(width * nums[j], 0, width, height));
TJAPlayer3.Tx.Dani_Level_Number.vc拡大縮小倍率.X = 1; TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.X = 1;
TJAPlayer3.Tx.Dani_Level_Number.vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.Y = 1;
} }
} }
@ -932,8 +932,8 @@ namespace TJAPlayer3
float text_width = TJAPlayer3.Skin.DaniSelect_Exam_Number_Text_Width; float text_width = TJAPlayer3.Skin.DaniSelect_Exam_Number_Text_Width;
TJAPlayer3.Tx.Dani_Exam_Number.vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Dani_Exam_Number.vcScaleRatio.X = scale;
TJAPlayer3.Tx.Dani_Exam_Number.vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Dani_Exam_Number.vcScaleRatio.Y = scale;
TJAPlayer3.Tx.Dani_Exam_Number.t2D描画( TJAPlayer3.Tx.Dani_Exam_Number.t2D描画(
x + ((TJAPlayer3.Skin.DaniSelect_Exam_Number_Interval[0] + (width / 2)) * scale), x + ((TJAPlayer3.Skin.DaniSelect_Exam_Number_Interval[0] + (width / 2)) * scale),

22
OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位挑戦選択画面.cs
View File

@ -66,40 +66,40 @@ namespace TJAPlayer3
if (ctBarIn.IsEnded && !TJAPlayer3.stage段位選択.b選択した && bOption == false) if (ctBarIn.IsEnded && !TJAPlayer3.stage段位選択.b選択した && bOption == false)
{ {
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue))
{ {
if (n現在の選択行 - 1 >= 0) if (n現在の選択行 - 1 >= 0)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
n現在の選択行--; n現在の選択行--;
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue))
{ {
if (n現在の選択行 + 1 <= 2) if (n現在の選択行 + 1 <= 2)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
n現在の選択行++; n現在の選択行++;
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed))
{ {
if (n現在の選択行 == 0) if (n現在の選択行 == 0)
{ {
this.ctBarOut.Start(0, 255, 0.5f, TJAPlayer3.Timer); this.ctBarOut.Start(0, 255, 0.5f, TJAPlayer3.Timer);
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
TJAPlayer3.stage段位選択.bDifficultyIn = false; TJAPlayer3.stage段位選択.bDifficultyIn = false;
} }
else if (n現在の選択行 == 1) else if (n現在の選択行 == 1)
{ {
//TJAPlayer3.Skin.soundDanSongSelect.t再生する(); //TJAPlayer3.Skin.soundDanSongSelect.t再生する();
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.Skin.voiceMenuDanSelectConfirm[TJAPlayer3.SaveFile]?.tPlay(); TJAPlayer3.Skin.voiceMenuDanSelectConfirm[TJAPlayer3.SaveFile]?.tPlay();
TJAPlayer3.stage段位選択.ct待機.Start(0, 3000, 1, TJAPlayer3.Timer); TJAPlayer3.stage段位選択.ct待機.Start(0, 3000, 1, TJAPlayer3.Timer);
} }

60
OpenTaiko/src/Stages/05.DaniSelect/CStage段位選択.cs
View File

@ -178,32 +178,32 @@ namespace TJAPlayer3
int returnTitle() int returnTitle()
{ {
TJAPlayer3.Skin.soundDanSelectBGM.tStop(); TJAPlayer3.Skin.soundDanSelectBGM.tStop();
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る;
this.actFOtoTitle.tフェードアウト開始(); this.actFOtoTitle.tフェードアウト開始();
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
return 0; return 0;
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange))
{ {
this.段位リスト.t右に移動(); this.段位リスト.t右に移動();
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange))
{ {
this.段位リスト.t左に移動(); this.段位リスト.t左に移動();
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide))
{ {
switch(段位リスト.currentBar.eノード種別) switch(段位リスト.currentBar.eノード種別)
{ {
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
case C曲リストノード.Eノード種別.RANDOM: case CSongListNode.ENodeType.RANDOM:
{ {
//this.t段位を選択する(); //this.t段位を選択する();
//TJAPlayer3.Skin.soundDanSongSelectCheck.t再生する(); //TJAPlayer3.Skin.soundDanSongSelectCheck.t再生する();
@ -212,21 +212,21 @@ namespace TJAPlayer3
this.段位挑戦選択画面.ctBarIn.Start(0, 255, 1, TJAPlayer3.Timer); this.段位挑戦選択画面.ctBarIn.Start(0, 255, 1, TJAPlayer3.Timer);
} }
break; break;
case C曲リストノード.Eノード種別.BOX: case CSongListNode.ENodeType.BOX:
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
段位リスト.tOpenFolder(段位リスト.currentBar); 段位リスト.tOpenFolder(段位リスト.currentBar);
} }
break; break;
case C曲リストノード.Eノード種別.BACKBOX: case CSongListNode.ENodeType.BACKBOX:
{ {
if (TJAPlayer3.Songs管理.list曲ルート.Contains(段位リスト.currentBar.r親ノード) && 段位リスト.currentBar.r親ノード.strジャンル == "段位道場") if (TJAPlayer3.Songs管理.list曲ルート.Contains(段位リスト.currentBar.rParentNode) && 段位リスト.currentBar.rParentNode.strジャンル == "段位道場")
{ {
return returnTitle(); return returnTitle();
} }
else else
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
段位リスト.tCloseFolder(段位リスト.currentBar); 段位リスト.tCloseFolder(段位リスト.currentBar);
} }
} }
@ -234,8 +234,8 @@ namespace TJAPlayer3
} }
} }
if(TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || if(TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Cancel)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel))
{ {
return returnTitle(); return returnTitle();
} }
@ -257,7 +257,7 @@ namespace TJAPlayer3
//CMenuCharacter.tMenuDisplayCharacter(0, (int)(-200 + DonchanX), (int)(336 - DonchanY), CMenuCharacter.ECharacterAnimation.NORMAL); //CMenuCharacter.tMenuDisplayCharacter(0, (int)(-200 + DonchanX), (int)(336 - DonchanY), CMenuCharacter.ECharacterAnimation.NORMAL);
int chara_x = TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2; int chara_x = TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2;
int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0]; int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0];
CMenuCharacter.tMenuDisplayCharacter( CMenuCharacter.tMenuDisplayCharacter(
@ -286,7 +286,7 @@ namespace TJAPlayer3
if (ct待機.CurrentValue >= 3000) if (ct待機.CurrentValue >= 3000)
{ {
if (段位リスト.currentBar.eノード種別 == C曲リストノード.Eノード種別.RANDOM) if (段位リスト.currentBar.eノード種別 == CSongListNode.ENodeType.RANDOM)
{ {
if (!tSelectSongRandomly()) if (!tSelectSongRandomly())
{ {
@ -334,11 +334,11 @@ namespace TJAPlayer3
public void t段位を選択する() public void t段位を選択する()
{ {
this.b選択した = true; this.b選択した = true;
TJAPlayer3.stage選曲.r確定された曲 = 段位リスト.listSongs[段位リスト.n現在の選択行]; TJAPlayer3.stageSongSelect.rChoosenSong = 段位リスト.listSongs[段位リスト.n現在の選択行];
TJAPlayer3.stage選曲.r確定されたスコア = 段位リスト.listSongs[段位リスト.n現在の選択行].arスコア[(int)Difficulty.Dan]; TJAPlayer3.stageSongSelect.r確定されたスコア = 段位リスト.listSongs[段位リスト.n現在の選択行].arスコア[(int)Difficulty.Dan];
TJAPlayer3.stage選曲.n確定された曲の難易度[0] = (int)Difficulty.Dan; TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Dan;
TJAPlayer3.stage選曲.str確定された曲のジャンル = 段位リスト.listSongs[段位リスト.n現在の選択行].strジャンル; TJAPlayer3.stageSongSelect.str確定された曲のジャンル = 段位リスト.listSongs[段位リスト.n現在の選択行].strジャンル;
if ((TJAPlayer3.stage選曲.r確定された曲 != null) && (TJAPlayer3.stage選曲.r確定されたスコア != null)) if ((TJAPlayer3.stageSongSelect.rChoosenSong != null) && (TJAPlayer3.stageSongSelect.r確定されたスコア != null))
{ {
this.eフェードアウト完了時の戻り値 = E戻り値.選曲した; this.eフェードアウト完了時の戻り値 = E戻り値.選曲した;
this.actFOtoNowLoading.tフェードアウト開始(); // #27787 2012.3.10 yyagi 曲決定時の画面フェードアウトの省略 this.actFOtoNowLoading.tフェードアウト開始(); // #27787 2012.3.10 yyagi 曲決定時の画面フェードアウトの省略
@ -352,7 +352,7 @@ namespace TJAPlayer3
{ {
this.b選択した = true; this.b選択した = true;
var mandatoryDiffs = new List<int>(); var mandatoryDiffs = new List<int>();
C曲リストノード song = 段位リスト.currentBar; CSongListNode song = 段位リスト.currentBar;
song.stackランダム演奏番号.Clear(); song.stackランダム演奏番号.Clear();
song.listランダム用ノードリスト = null; song.listランダム用ノードリスト = null;
@ -361,8 +361,8 @@ namespace TJAPlayer3
{ {
if (song.listランダム用ノードリスト == null) if (song.listランダム用ノードリスト == null)
{ {
List<C曲リストノード> songs = new List<C曲リストノード>(); List<CSongListNode> songs = new List<CSongListNode>();
TJAPlayer3.stage選曲.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.r親ノード, ref songs, ref mandatoryDiffs, true); TJAPlayer3.stageSongSelect.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.rParentNode, ref songs, ref mandatoryDiffs, true);
song.listランダム用ノードリスト = songs; song.listランダム用ノードリスト = songs;
} }
int count = song.listランダム用ノードリスト.Count; int count = song.listランダム用ノードリスト.Count;
@ -401,11 +401,11 @@ namespace TJAPlayer3
} }
// Third assignment // Third assignment
TJAPlayer3.stage選曲.r確定された曲 = song.listランダム用ノードリスト[song.stackランダム演奏番号.Pop()]; TJAPlayer3.stageSongSelect.rChoosenSong = song.listランダム用ノードリスト[song.stackランダム演奏番号.Pop()];
TJAPlayer3.stage選曲.n確定された曲の難易度[0] = (int)Difficulty.Dan; TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Dan;
TJAPlayer3.stage選曲.r確定されたスコア = TJAPlayer3.stage選曲.r確定された曲.arスコア[TJAPlayer3.stage選曲.act曲リスト.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(TJAPlayer3.stage選曲.r確定された曲)]; TJAPlayer3.stageSongSelect.r確定されたスコア = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(TJAPlayer3.stageSongSelect.rChoosenSong)];
TJAPlayer3.stage選曲.str確定された曲のジャンル = TJAPlayer3.stage選曲.r確定された曲.strジャンル; TJAPlayer3.stageSongSelect.str確定された曲のジャンル = TJAPlayer3.stageSongSelect.rChoosenSong.strジャンル;
//TJAPlayer3.Skin.sound曲決定音.t再生する(); //TJAPlayer3.Skin.sound曲決定音.t再生する();

64
OpenTaiko/src/Stages/05.SongSelect/CActPlayOption.cs
View File

@ -121,7 +121,7 @@ namespace TJAPlayer3
} }
for (int i = 0; i < OptionType.Length; i++) for (int i = 0; i < OptionType.Length; i++)
OptionType[i].vc拡大縮小倍率.X = 0.96f; OptionType[i].vcScaleRatio.X = 0.96f;
base.Activate(); base.Activate();
} }
@ -167,7 +167,7 @@ namespace TJAPlayer3
if (!ctOpen.IsTicked) ctOpen.Start(0, 50, 6, TJAPlayer3.Timer); if (!ctOpen.IsTicked) ctOpen.Start(0, 50, 6, TJAPlayer3.Timer);
var act難易度 = TJAPlayer3.stage選曲.act難易度選択画面; var act難易度 = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen;
var danAct = TJAPlayer3.stage段位選択.段位挑戦選択画面; var danAct = TJAPlayer3.stage段位選択.段位挑戦選択画面;
#region [ Open & Close ] #region [ Open & Close ]
@ -204,8 +204,8 @@ namespace TJAPlayer3
}; };
var pos = player % 2; var pos = player % 2;
var _shift = pos == 1 ? (TJAPlayer3.Tx.Difficulty_Option.szテクスチャサイズ.Width / 2) : 0; var _shift = pos == 1 ? (TJAPlayer3.Tx.Difficulty_Option.szTextureSize.Width / 2) : 0;
var _rect = new Rectangle(_shift, 0, TJAPlayer3.Tx.Difficulty_Option.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.Difficulty_Option.szテクスチャサイズ.Height); var _rect = new Rectangle(_shift, 0, TJAPlayer3.Tx.Difficulty_Option.szTextureSize.Width / 2, TJAPlayer3.Tx.Difficulty_Option.szTextureSize.Height);
TJAPlayer3.Tx.Difficulty_Option.t2D描画(_shift, y, _rect); TJAPlayer3.Tx.Difficulty_Option.t2D描画(_shift, y, _rect);
TJAPlayer3.Tx.Difficulty_Option_Select.t2D描画(_shift + TJAPlayer3.Skin.SongSelect_Option_Select_Offset[0] + NowCount * TJAPlayer3.Skin.SongSelect_Option_Interval[0], TJAPlayer3.Tx.Difficulty_Option_Select.t2D描画(_shift + TJAPlayer3.Skin.SongSelect_Option_Select_Offset[0] + NowCount * TJAPlayer3.Skin.SongSelect_Option_Interval[0],
@ -254,52 +254,52 @@ namespace TJAPlayer3
switch (player) switch (player)
{ {
case 0: case 0:
_rightDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)); _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow));
_leftDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)); _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow));
_centerDrum = (TJAPlayer3.Pad.b押されたDGB(Eパッド.Decide) || _centerDrum = (TJAPlayer3.Pad.bPressedDGB(EPad.Decide) ||
(TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))); (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)));
_cancel = (TJAPlayer3.Pad.b押されたDGB(Eパッド.Cancel) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)); _cancel = (TJAPlayer3.Pad.bPressedDGB(EPad.Cancel) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape));
break; break;
case 1: case 1:
_rightDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue2P)); _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P));
_leftDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue2P)); _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P));
_centerDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed2P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed2P)); _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P));
break; break;
case 2: case 2:
_rightDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue3P)); _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue3P));
_leftDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue3P)); _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue3P));
_centerDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed3P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed3P)); _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed3P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed3P));
break; break;
case 3: case 3:
_rightDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue4P)); _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue4P));
_leftDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue4P)); _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue4P));
_centerDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed4P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed4P)); _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed4P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed4P));
break; break;
case 4: case 4:
_rightDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue5P)); _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue5P));
_leftDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue5P)); _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue5P));
_centerDrum = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed5P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed5P)); _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed5P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed5P));
break; break;
} }
if (_leftDrum || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) if (_leftDrum || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow))
{ {
OptionSelect(true); OptionSelect(true);
tFetchMults(player); tFetchMults(player);
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
if (_rightDrum || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) if (_rightDrum || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow))
{ {
OptionSelect(false); OptionSelect(false);
tFetchMults(player); tFetchMults(player);
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
if (_centerDrum && ctOpen.CurrentValue >= ctOpen.EndValue) if (_centerDrum && ctOpen.CurrentValue >= ctOpen.EndValue)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
if (NowCount < nOptionCount) if (NowCount < nOptionCount)
{ {
NowCount++; NowCount++;
@ -313,19 +313,19 @@ namespace TJAPlayer3
int cp1 = nOptionCount + 1; int cp1 = nOptionCount + 1;
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow)) { if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow)) {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
NowCount = (NowCount + cp1 - 1) % cp1; NowCount = (NowCount + cp1 - 1) % cp1;
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow)) { if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow)) {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
NowCount = (NowCount + 1) % cp1; NowCount = (NowCount + 1) % cp1;
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape))
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
bEnd = true; bEnd = true;
ctClose.Start(0, 50, 6, TJAPlayer3.Timer); ctClose.Start(0, 50, 6, TJAPlayer3.Timer);
} }

46
OpenTaiko/src/Stages/05.SongSelect/CActSelectDanInfo.cs
View File

@ -72,12 +72,12 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.SongSelect_DanInfo_Show) if (TJAPlayer3.Skin.SongSelect_DanInfo_Show)
{ {
for(int i = 0; i < TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count; i++) for(int i = 0; i < TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++)
{ {
var dan = TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs[i]; var dan = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[i];
int songIndex = i / 3; int songIndex = i / 3;
int opacity = 255; int opacity = 255;
if (TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count > 3) if (TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count > 3)
{ {
if (nNowSongIndex == songIndex) if (nNowSongIndex == songIndex)
{ {
@ -96,23 +96,23 @@ namespace TJAPlayer3
int pos = i % 3; int pos = i % 3;
CActSelect段位リスト.tDisplayDanIcon(i + 1, TJAPlayer3.Skin.SongSelect_DanInfo_Icon_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Icon_Y[pos], opacity, TJAPlayer3.Skin.SongSelect_DanInfo_Icon_Scale, false); CActSelect段位リスト.tDisplayDanIcon(i + 1, TJAPlayer3.Skin.SongSelect_DanInfo_Icon_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Icon_Y[pos], opacity, TJAPlayer3.Skin.SongSelect_DanInfo_Icon_Scale, false);
int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szテクスチャサイズ.Width / 5; int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5;
int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szテクスチャサイズ.Height; int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = opacity; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = opacity;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.X = TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.Y = TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Y[pos], new Rectangle(dan.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Y[pos], new Rectangle(dan.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height));
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.X = 1; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 1;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 1;
TJAPlayer3.Tx.Dani_Level_Number.Opacity = opacity; TJAPlayer3.Tx.Dani_Level_Number.Opacity = opacity;
TJAPlayer3.stage段位選択.段位リスト.tLevelNumberDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_Y[pos], dan.Level, TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_Scale); TJAPlayer3.stage段位選択.段位リスト.tLevelNumberDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_Y[pos], dan.Level, TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_Scale);
TJAPlayer3.Tx.Dani_Level_Number.Opacity = 255; TJAPlayer3.Tx.Dani_Level_Number.Opacity = 255;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTitles[i]).Opacity = opacity; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTitles[i]).Opacity = opacity;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTitles[i]).t2D描画(TJAPlayer3.Skin.SongSelect_DanInfo_Title_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Title_Y[pos]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTitles[i]).t2D描画(TJAPlayer3.Skin.SongSelect_DanInfo_Title_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Title_Y[pos]);
} }
@ -120,16 +120,16 @@ namespace TJAPlayer3
for (int j = 0; j < CExamInfo.cMaxExam; j++) for (int j = 0; j < CExamInfo.cMaxExam; j++)
{ {
int index = j; int index = j;
Dan_C danc0 = TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs[0].Dan_C[j]; Dan_C danc0 = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[0].Dan_C[j];
if (danc0 != null) if (danc0 != null)
{ {
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[(int)danc0.GetExamType()]).t2D中心基準描画(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_X[index], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Y[index]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkExams[(int)danc0.GetExamType()]).t2D中心基準描画(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_X[index], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Y[index]);
} }
if (TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs[TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count - 1].Dan_C[j] == null) if (TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count - 1].Dan_C[j] == null)
{ {
Dan_C danc = TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs[0].Dan_C[j]; Dan_C danc = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[0].Dan_C[j];
if (danc != null) if (danc != null)
{ {
TJAPlayer3.stage段位選択.段位リスト.tExamDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_X[0], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Y[index], danc.Value[0], danc.GetExamRange(), TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Scale); TJAPlayer3.stage段位選択.段位リスト.tExamDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_X[0], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Y[index], danc.Value[0], danc.GetExamRange(), TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Scale);
@ -137,13 +137,13 @@ namespace TJAPlayer3
} }
else else
{ {
for (int i = 0; i < TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++)
{ {
Dan_C danc = TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs[i].Dan_C[j]; Dan_C danc = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[i].Dan_C[j];
if (danc != null) if (danc != null)
{ {
int opacity = 255; int opacity = 255;
if (TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count > 3) if (TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count > 3)
{ {
if (nNowSongIndex == i / 3) if (nNowSongIndex == i / 3)
{ {
@ -173,12 +173,12 @@ namespace TJAPlayer3
public void UpdateSong() public void UpdateSong()
{ {
if (TJAPlayer3.stage選曲.r現在選択中の曲 == null || TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs == null) return; if (TJAPlayer3.stageSongSelect.rNowSelectedSong == null || TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs == null) return;
ttkTitles = new CActSelect曲リスト.TitleTextureKey[TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count]; ttkTitles = new CActSelect曲リスト.TitleTextureKey[TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count];
for (int i = 0; i < TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++)
{ {
var dan = TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs[i]; var dan = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[i];
ttkTitles[i] = new CActSelect曲リスト.TitleTextureKey(dan.Title, pfTitleFont, Color.Black, Color.Transparent, 700); ttkTitles[i] = new CActSelect曲リスト.TitleTextureKey(dan.Title, pfTitleFont, Color.Black, Color.Transparent, 700);
} }
} }
@ -199,7 +199,7 @@ namespace TJAPlayer3
private void tNextStep() private void tNextStep()
{ {
nPrevSongIndex = nNowSongIndex; nPrevSongIndex = nNowSongIndex;
nNowSongIndex = (nNowSongIndex + 1) % (int)Math.Ceiling(TJAPlayer3.stage選曲.r現在選択中の曲.DanSongs.Count / 3.0); nNowSongIndex = (nNowSongIndex + 1) % (int)Math.Ceiling(TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count / 3.0);
ctStepFade = new CCounter(0, 255, 1, TJAPlayer3.Timer); ctStepFade = new CCounter(0, 255, 1, TJAPlayer3.Timer);
} }

58
OpenTaiko/src/Stages/05.SongSelect/CActSelectPopupMenu.cs
View File

@ -45,7 +45,7 @@ namespace TJAPlayer3
get; get;
private set; private set;
} }
public virtual void tActivatePopupMenu( E楽器パート einst ) public virtual void tActivatePopupMenu( EInstrumentPad einst )
{ {
nItemSelecting = -1; // #24757 2011.4.1 yyagi: Clear sorting status in each stating menu. nItemSelecting = -1; // #24757 2011.4.1 yyagi: Clear sorting status in each stating menu.
this.eInst = einst; this.eInst = einst;
@ -132,7 +132,7 @@ namespace TJAPlayer3
{ {
if ( this.bキー入力待ち ) if ( this.bキー入力待ち )
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
if ( this.n現在の選択行 != lciMenuItems.Length - 1 ) if ( this.n現在の選択行 != lciMenuItems.Length - 1 )
{ {
@ -283,21 +283,21 @@ namespace TJAPlayer3
if ( this.bキー入力待ち ) if ( this.bキー入力待ち )
{ {
#region [ Shift-F1: CONFIG画面 ] #region [ Shift-F1: CONFIG画面 ]
if ( ( TJAPlayer3.Input管理.Keyboard.KeyPressing( (int)SlimDXKeys.Key.RightShift ) || TJAPlayer3.Input管理.Keyboard.KeyPressing( (int)SlimDXKeys.Key.LeftShift ) ) && if ( ( TJAPlayer3.InputManager.Keyboard.KeyPressing( (int)SlimDXKeys.Key.RightShift ) || TJAPlayer3.InputManager.Keyboard.KeyPressing( (int)SlimDXKeys.Key.LeftShift ) ) &&
TJAPlayer3.Input管理.Keyboard.KeyPressed( (int)SlimDXKeys.Key.F1 ) ) TJAPlayer3.InputManager.Keyboard.KeyPressed( (int)SlimDXKeys.Key.F1 ) )
{ // [SHIFT] + [F1] CONFIG { // [SHIFT] + [F1] CONFIG
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
tCancel(); tCancel();
this.bGotoDetailConfig = true; this.bGotoDetailConfig = true;
} }
#endregion #endregion
#region [ キー入力: キャンセル ] #region [ キー入力: キャンセル ]
else if ( ( TJAPlayer3.Input管理.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) else if ( ( TJAPlayer3.InputManager.Keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape )
|| TJAPlayer3.Pad.b押された( E楽器パート.DRUMS, Eパッド.FT ) || TJAPlayer3.Pad.bPressed( EInstrumentPad.DRUMS, EPad.FT )
|| TJAPlayer3.Pad.b押されたGB( Eパッド.Cancel ) ) || TJAPlayer3.Pad.bPressedGB( EPad.Cancel ) )
&& this.bEsc有効 ) && this.bEsc有効 )
{ // キャンセル { // キャンセル
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
tCancel(); tCancel();
this.bIsActivePopupMenu = false; this.bIsActivePopupMenu = false;
} }
@ -308,25 +308,25 @@ namespace TJAPlayer3
#region [ キー入力: 決定 ] #region [ キー入力: 決定 ]
// E楽器パート eInst = E楽器パート.UNKNOWN; // E楽器パート eInst = E楽器パート.UNKNOWN;
ESortAction eAction = ESortAction.END; ESortAction eAction = ESortAction.END;
if (TJAPlayer3.Pad.b押された(E楽器パート.GUITAR, Eパッド.Decide)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.GUITAR, EPad.Decide))
{ {
eInst = E楽器パート.GUITAR; eInst = EInstrumentPad.GUITAR;
eAction = ESortAction.Decide; eAction = ESortAction.Decide;
} }
else if (TJAPlayer3.Pad.b押された(E楽器パート.BASS, Eパッド.Decide)) else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.BASS, EPad.Decide))
{ {
eInst = E楽器パート.BASS; eInst = EInstrumentPad.BASS;
eAction = ESortAction.Decide; eAction = ESortAction.Decide;
} }
else if ( else if (
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide) // #24756 2011.4.1 yyagi: Add condition "Drum-Decide" to enable CY in Sort Menu. TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) // #24756 2011.4.1 yyagi: Add condition "Drum-Decide" to enable CY in Sort Menu.
|| TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RD) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD)
|| TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LC) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC)
|| TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed)
|| TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed)
|| (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))) || (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))
{ {
eInst = E楽器パート.DRUMS; eInst = EInstrumentPad.DRUMS;
eAction = ESortAction.Decide; eAction = ESortAction.Decide;
} }
if (eAction == ESortAction.Decide) // 決定 if (eAction == ESortAction.Decide) // 決定
@ -335,17 +335,17 @@ namespace TJAPlayer3
} }
#endregion #endregion
#region [ キー入力: 前に移動 ] #region [ キー入力: 前に移動 ]
this.ctキー反復用.Up.KeyIntervalFunc(TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.UpArrow), new CCounter.KeyProcess(this.t前に移動)); this.ctキー反復用.Up.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.UpArrow), new CCounter.KeyProcess(this.t前に移動));
this.ctキー反復用.R.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(Eパッド.R), new CCounter.KeyProcess(this.t前に移動)); this.ctキー反復用.R.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(EPad.R), new CCounter.KeyProcess(this.t前に移動));
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.SD) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.SD) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue))
{ {
this.t前に移動(); this.t前に移動();
} }
#endregion #endregion
#region [ キー入力: 次に移動 ] #region [ キー入力: 次に移動 ]
this.ctキー反復用.Down.KeyIntervalFunc(TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.DownArrow), new CCounter.KeyProcess(this.t次に移動)); this.ctキー反復用.Down.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.DownArrow), new CCounter.KeyProcess(this.t次に移動));
this.ctキー反復用.B.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(Eパッド.B), new CCounter.KeyProcess(this.t次に移動)); this.ctキー反復用.B.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(EPad.B), new CCounter.KeyProcess(this.t次に移動));
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LT) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LT) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue))
{ {
this.t次に移動(); this.t次に移動();
} }
@ -367,8 +367,8 @@ namespace TJAPlayer3
int curX = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[0] + (TJAPlayer3.Skin.PopupMenu_Move[0] * (this.n現在の選択行 + 1)); int curX = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[0] + (TJAPlayer3.Skin.PopupMenu_Move[0] * (this.n現在の選択行 + 1));
int curY = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[1] + (TJAPlayer3.Skin.PopupMenu_Move[1] * (this.n現在の選択行 + 1)); int curY = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[1] + (TJAPlayer3.Skin.PopupMenu_Move[1] * (this.n現在の選択行 + 1));
int width = TJAPlayer3.Tx.Menu_Highlight.szテクスチャサイズ.Width / 2; int width = TJAPlayer3.Tx.Menu_Highlight.szTextureSize.Width / 2;
int height = TJAPlayer3.Tx.Menu_Highlight.szテクスチャサイズ.Height; int height = TJAPlayer3.Tx.Menu_Highlight.szTextureSize.Height;
TJAPlayer3.Tx.Menu_Highlight.t2D描画( curX, curY, new Rectangle( 0, 0, width, height) ); TJAPlayer3.Tx.Menu_Highlight.t2D描画( curX, curY, new Rectangle( 0, 0, width, height) );
curX += width; curX += width;
@ -443,7 +443,7 @@ namespace TJAPlayer3
protected bool bEsc有効; protected bool bEsc有効;
internal int n現在の選択行; internal int n現在の選択行;
internal E楽器パート eInst = E楽器パート.UNKNOWN; internal EInstrumentPad eInst = EInstrumentPad.UNKNOWN;
//private CTexture txPopupMenuBackground; //private CTexture txPopupMenuBackground;
//private CTexture txCursor; //private CTexture txCursor;

30
OpenTaiko/src/Stages/05.SongSelect/CActSelectPreimageパネル.cs
View File

@ -9,7 +9,7 @@ using FDK;
using Rectangle = System.Drawing.Rectangle; using Rectangle = System.Drawing.Rectangle;
using Point = System.Drawing.Point; using Point = System.Drawing.Point;
using static TJAPlayer3.C曲リストノード; using static TJAPlayer3.CSongListNode;
namespace TJAPlayer3 namespace TJAPlayer3
{ {
@ -79,7 +79,7 @@ namespace TJAPlayer3
} }
this.ct登場アニメ用.Tick(); this.ct登場アニメ用.Tick();
this.ctセンサ光.TickLoop(); this.ctセンサ光.TickLoop();
if( ( !TJAPlayer3.stage選曲.bスクロール中 && ( this.ct遅延表示 != null ) ) && this.ct遅延表示.IsTicked ) if( ( !TJAPlayer3.stageSongSelect.bCurrentlyScrolling && ( this.ct遅延表示 != null ) ) && this.ct遅延表示.IsTicked )
{ {
this.ct遅延表示.Tick(); this.ct遅延表示.Tick();
if ( ( this.ct遅延表示.CurrentValue >= 0 ) && this.b新しいプレビューファイルをまだ読み込んでいない ) if ( ( this.ct遅延表示.CurrentValue >= 0 ) && this.b新しいプレビューファイルをまだ読み込んでいない )
@ -151,7 +151,7 @@ namespace TJAPlayer3
} }
private bool tプレビュー画像の指定があれば構築する() private bool tプレビュー画像の指定があれば構築する()
{ {
Cスコア cスコア = TJAPlayer3.stage選曲.r現在選択中のスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア;
if ((cスコア == null) || string.IsNullOrEmpty(cスコア.譜面情報.Preimage)) return false; if ((cスコア == null) || string.IsNullOrEmpty(cスコア.譜面情報.Preimage)) return false;
string str = ((!Path.IsPathRooted(cスコア.譜面情報.Preimage)) ? cスコア.ファイル情報.フォルダの絶対パス : "") + cスコア.譜面情報.Preimage; string str = ((!Path.IsPathRooted(cスコア.譜面情報.Preimage)) ? cスコア.ファイル情報.フォルダの絶対パス : "") + cスコア.譜面情報.Preimage;
@ -181,14 +181,14 @@ namespace TJAPlayer3
/// </summary> /// </summary>
private void t描画処理_ジャンル文字列() private void t描画処理_ジャンル文字列()
{ {
C曲リストノード c曲リストノード = TJAPlayer3.stage選曲.r現在選択中の曲; CSongListNode c曲リストノード = TJAPlayer3.stageSongSelect.rNowSelectedSong;
Cスコア cスコア = TJAPlayer3.stage選曲.r現在選択中のスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア;
if( ( c曲リストノード != null ) && ( cスコア != null ) ) if( ( c曲リストノード != null ) && ( cスコア != null ) )
{ {
string str = ""; string str = "";
switch( c曲リストノード.eノード種別 ) switch( c曲リストノード.eノード種別 )
{ {
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
if( ( c曲リストノード.strジャンル == null ) || ( c曲リストノード.strジャンル.Length <= 0 ) ) if( ( c曲リストノード.strジャンル == null ) || ( c曲リストノード.strジャンル.Length <= 0 ) )
{ {
if( ( cスコア.譜面情報.ジャンル != null ) && ( cスコア.譜面情報.ジャンル.Length > 0 ) ) if( ( cスコア.譜面情報.ジャンル != null ) && ( cスコア.譜面情報.ジャンル.Length > 0 ) )
@ -228,19 +228,19 @@ namespace TJAPlayer3
str = c曲リストノード.strジャンル; str = c曲リストノード.strジャンル;
break; break;
case C曲リストノード.Eノード種別.SCORE_MIDI: case CSongListNode.ENodeType.SCORE_MIDI:
str = "MIDI"; str = "MIDI";
break; break;
case C曲リストノード.Eノード種別.BOX: case CSongListNode.ENodeType.BOX:
str = "MusicBox"; str = "MusicBox";
break; break;
case C曲リストノード.Eノード種別.BACKBOX: case CSongListNode.ENodeType.BACKBOX:
str = "BackBox"; str = "BackBox";
break; break;
case C曲リストノード.Eノード種別.RANDOM: case CSongListNode.ENodeType.RANDOM:
str = "Random"; str = "Random";
break; break;
@ -260,7 +260,7 @@ namespace TJAPlayer3
int y = this.n本体Y + 0x7b; int y = this.n本体Y + 0x7b;
if( this.txセンサ光 != null ) if( this.txセンサ光 != null )
{ {
this.txセンサ光.vc拡大縮小倍率 = new Vector3D<float>( 1f, 1f, 1f ); this.txセンサ光.vcScaleRatio = new Vector3D<float>( 1f, 1f, 1f );
this.txセンサ光.Opacity = 0xff; this.txセンサ光.Opacity = 0xff;
this.txセンサ光.t2D描画( x, y, new Rectangle( ( num % 4 ) * 0x40, ( num / 4 ) * 0x40, 0x40, 0x40 ) ); this.txセンサ光.t2D描画( x, y, new Rectangle( ( num % 4 ) * 0x40, ( num / 4 ) * 0x40, 0x40, 0x40 ) );
} }
@ -276,7 +276,7 @@ namespace TJAPlayer3
int num10 = ( ( this.n本体Y + 0x7b ) + 0x20 ) - ( num8 / 2 ); int num10 = ( ( this.n本体Y + 0x7b ) + 0x20 ) - ( num8 / 2 );
if( this.txセンサ光 != null ) if( this.txセンサ光 != null )
{ {
this.txセンサ光.vc拡大縮小倍率 = new Vector3D<float>( (float) num6, (float) num6, 1f ); this.txセンサ光.vcScaleRatio = new Vector3D<float>( (float) num6, (float) num6, 1f );
this.txセンサ光.Opacity = (int) ( 255.0 * ( 1.0 - num5 ) ); this.txセンサ光.Opacity = (int) ( 255.0 * ( 1.0 - num5 ) );
this.txセンサ光.t2D描画( num9, num10, this.rcセンサ光 ); this.txセンサ光.t2D描画( num9, num10, this.rcセンサ光 );
} }
@ -317,7 +317,7 @@ namespace TJAPlayer3
} }
private unsafe void t描画処理_プレビュー画像() private unsafe void t描画処理_プレビュー画像()
{ {
if( !TJAPlayer3.stage選曲.bスクロール中 && ( ( ( this.ct遅延表示 != null ) && ( this.ct遅延表示.CurrentValue > 0 ) ) && !this.b新しいプレビューファイルをまだ読み込んでいない ) ) if( !TJAPlayer3.stageSongSelect.bCurrentlyScrolling && ( ( ( this.ct遅延表示 != null ) && ( this.ct遅延表示.CurrentValue > 0 ) ) && !this.b新しいプレビューファイルをまだ読み込んでいない ) )
{ {
int x = this.n本体X + 0x12; int x = this.n本体X + 0x12;
int y = this.n本体Y + 0x10; int y = this.n本体Y + 0x10;
@ -349,8 +349,8 @@ namespace TJAPlayer3
y += ( 400 - ( (int) ( height * num4 ) ) ) / 2; y += ( 400 - ( (int) ( height * num4 ) ) ) / 2;
this.r表示するプレビュー画像.Opacity = (int) ( 255f * num3 ); this.r表示するプレビュー画像.Opacity = (int) ( 255f * num3 );
this.r表示するプレビュー画像.vc拡大縮小倍率.X = num4 * xRatio; this.r表示するプレビュー画像.vcScaleRatio.X = num4 * xRatio;
this.r表示するプレビュー画像.vc拡大縮小倍率.Y = num4 * xRatio; this.r表示するプレビュー画像.vcScaleRatio.Y = num4 * xRatio;
// this.r表示するプレビュー画像.t2D描画( x + 22, y + 12, new Rectangle( 0, 0, width, height ) ); // this.r表示するプレビュー画像.t2D描画( x + 22, y + 12, new Rectangle( 0, 0, width, height ) );

16
OpenTaiko/src/Stages/05.SongSelect/CActSelectPresound.cs
View File

@ -14,7 +14,7 @@ namespace TJAPlayer3
{ {
base.IsDeActivated = true; base.IsDeActivated = true;
} }
public void tサウンド停止() public void tStopSound()
{ {
if( this.sound != null ) if( this.sound != null )
{ {
@ -25,11 +25,11 @@ namespace TJAPlayer3
} }
public void t選択曲が変更された() public void t選択曲が変更された()
{ {
Cスコア cスコア = TJAPlayer3.stage選曲.r現在選択中のスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア;
if( ( cスコア != null ) && ( ( !( cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.strBGMファイル名 ).Equals( this.str現在のファイル名 ) || ( this.sound == null ) ) || !this.sound.IsPlaying ) ) if( ( cスコア != null ) && ( ( !( cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.strBGMファイル名 ).Equals( this.str現在のファイル名 ) || ( this.sound == null ) ) || !this.sound.IsPlaying ) )
{ {
this.tサウンド停止(); this.tStopSound();
this.tBGMフェードイン開始(); this.tBGMフェードイン開始();
this.long再生位置 = -1; this.long再生位置 = -1;
if( ( cスコア.譜面情報.strBGMファイル名 != null ) && ( cスコア.譜面情報.strBGMファイル名.Length > 0 ) ) if( ( cスコア.譜面情報.strBGMファイル名 != null ) && ( cスコア.譜面情報.strBGMファイル名.Length > 0 ) )
@ -72,7 +72,7 @@ namespace TJAPlayer3
} }
public override void DeActivate() public override void DeActivate()
{ {
this.tサウンド停止(); this.tStopSound();
this.ct再生待ちウェイト = null; this.ct再生待ちウェイト = null;
this.ctBGMフェードイン用 = null; this.ctBGMフェードイン用 = null;
this.ctBGMフェードアウト用 = null; this.ctBGMフェードアウト用 = null;
@ -104,7 +104,7 @@ namespace TJAPlayer3
if (this.sound != null) if (this.sound != null)
{ {
Cスコア cスコア = TJAPlayer3.stage選曲.r現在選択中のスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア;
if (long再生位置 == -1) if (long再生位置 == -1)
{ {
this.long再生開始時のシステム時刻 = SoundManager.PlayTimer.SystemTimeMs; this.long再生開始時のシステム時刻 = SoundManager.PlayTimer.SystemTimeMs;
@ -162,8 +162,8 @@ namespace TJAPlayer3
} }
private void tプレビューサウンドの作成() private void tプレビューサウンドの作成()
{ {
Cスコア cスコア = TJAPlayer3.stage選曲.r現在選択中のスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア;
if( ( cスコア != null ) && !string.IsNullOrEmpty( cスコア.譜面情報.strBGMファイル名 ) && TJAPlayer3.stage選曲.ePhaseID != CStage.EPhase.SongSelect_FadeOutToNowLoading ) if( ( cスコア != null ) && !string.IsNullOrEmpty( cスコア.譜面情報.strBGMファイル名 ) && TJAPlayer3.stageSongSelect.ePhaseID != CStage.EPhase.SongSelect_FadeOutToNowLoading )
{ {
string strPreviewFilename = cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.Presound; string strPreviewFilename = cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.Presound;
try try
@ -222,7 +222,7 @@ namespace TJAPlayer3
if( !this.ct再生待ちウェイト.IsUnEnded ) if( !this.ct再生待ちウェイト.IsUnEnded )
{ {
this.ct再生待ちウェイト.Stop(); this.ct再生待ちウェイト.Stop();
if( !TJAPlayer3.stage選曲.bスクロール中 ) if( !TJAPlayer3.stageSongSelect.bCurrentlyScrolling )
{ {
this.tプレビューサウンドの作成(); this.tプレビューサウンドの作成();
} }

2
OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs
View File

@ -104,7 +104,7 @@ namespace TJAPlayer3
} }
// メソッド // メソッド
public override void tActivatePopupMenu( E楽器パート einst ) public override void tActivatePopupMenu( EInstrumentPad einst )
{ {
this.CActSelectQuickConfigMain(); this.CActSelectQuickConfigMain();
base.tActivatePopupMenu( einst ); base.tActivatePopupMenu( einst );

2
OpenTaiko/src/Stages/05.SongSelect/CActSelectShowCurrentPosition.cs
View File

@ -59,7 +59,7 @@ namespace TJAPlayer3
//this.txScrollBar.t2D描画( CDTXMania.app.Device, (int)(1280 - ((429.0f / 100.0f ) * CDTXMania.stage選曲.ct登場時アニメ用共通.n現在の値)), 164, new Rectangle( 0, 0, 352, 26 ) ); //移動後のxは851 //this.txScrollBar.t2D描画( CDTXMania.app.Device, (int)(1280 - ((429.0f / 100.0f ) * CDTXMania.stage選曲.ct登場時アニメ用共通.n現在の値)), 164, new Rectangle( 0, 0, 352, 26 ) ); //移動後のxは851
#endregion #endregion
#region [ スクロール地点の描画 (計算はCActSelect曲リストで行う。スクロール位置と選曲項目の同期のため。)#27648 ] #region [ スクロール地点の描画 (計算はCActSelect曲リストで行う。スクロール位置と選曲項目の同期のため。)#27648 ]
int py = TJAPlayer3.stage選曲.nスクロールバー相対y座標; int py = TJAPlayer3.stageSongSelect.nスクロールバー相対y座標;
if( py <= 336 && py >= 0 ) if( py <= 336 && py >= 0 )
{ {
//this.txScrollBar.t2D描画( CDTXMania.app.Device, (int)( 1280 - 4 - (( 424.0f / 100.0f ) * CDTXMania.stage選曲.ct登場時アニメ用共通.n現在の値 ) ) + py, 164, new Rectangle( 352, 0, 26, 26 ) );//856 //this.txScrollBar.t2D描画( CDTXMania.app.Device, (int)( 1280 - 4 - (( 424.0f / 100.0f ) * CDTXMania.stage選曲.ct登場時アニメ用共通.n現在の値 ) ) + py, 164, new Rectangle( 352, 0, 26, 26 ) );//856

18
OpenTaiko/src/Stages/05.SongSelect/CActSelectSongInfo.cs
View File

@ -51,27 +51,27 @@ namespace TJAPlayer3
public override int Draw() public override int Draw()
{ {
if (TJAPlayer3.stage選曲.r現在選択中の曲 != null && TJAPlayer3.stage選曲.r現在選択中の曲.eノード種別 == C曲リストノード.Eノード種別.SCORE) if (TJAPlayer3.stageSongSelect.rNowSelectedSong != null && TJAPlayer3.stageSongSelect.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE)
{ {
int[] bpms = new int[3] { int[] bpms = new int[3] {
(int)TJAPlayer3.stage選曲.r現在選択中の曲.arスコア[TJAPlayer3.stage選曲.act曲リスト.tFetchDifficulty(TJAPlayer3.stage選曲.r現在選択中の曲)].譜面情報.BaseBpm, (int)TJAPlayer3.stageSongSelect.rNowSelectedSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(TJAPlayer3.stageSongSelect.rNowSelectedSong)].譜面情報.BaseBpm,
(int)TJAPlayer3.stage選曲.r現在選択中の曲.arスコア[TJAPlayer3.stage選曲.act曲リスト.tFetchDifficulty(TJAPlayer3.stage選曲.r現在選択中の曲)].譜面情報.MinBpm, (int)TJAPlayer3.stageSongSelect.rNowSelectedSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(TJAPlayer3.stageSongSelect.rNowSelectedSong)].譜面情報.MinBpm,
(int)TJAPlayer3.stage選曲.r現在選択中の曲.arスコア[TJAPlayer3.stage選曲.act曲リスト.tFetchDifficulty(TJAPlayer3.stage選曲.r現在選択中の曲)].譜面情報.MaxBpm (int)TJAPlayer3.stageSongSelect.rNowSelectedSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(TJAPlayer3.stageSongSelect.rNowSelectedSong)].譜面情報.MaxBpm
}; };
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
tBPMNumberDraw(TJAPlayer3.Skin.SongSelect_Bpm_X[i], TJAPlayer3.Skin.SongSelect_Bpm_Y[i], bpms[i]); tBPMNumberDraw(TJAPlayer3.Skin.SongSelect_Bpm_X[i], TJAPlayer3.Skin.SongSelect_Bpm_Y[i], bpms[i]);
} }
if (TJAPlayer3.stage選曲.act曲リスト.ttkSelectedSongMaker != null && TJAPlayer3.Skin.SongSelect_Maker_Show) if (TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongMaker != null && TJAPlayer3.Skin.SongSelect_Maker_Show)
{ {
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(TJAPlayer3.stage選曲.act曲リスト.ttkSelectedSongMaker).t2D拡大率考慮描画(CTexture.RefPnt.Left, TJAPlayer3.Skin.SongSelect_Maker[0], TJAPlayer3.Skin.SongSelect_Maker[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongMaker).t2D拡大率考慮描画(CTexture.RefPnt.Left, TJAPlayer3.Skin.SongSelect_Maker[0], TJAPlayer3.Skin.SongSelect_Maker[1]);
} }
if (TJAPlayer3.stage選曲.act曲リスト.ttkSelectedSongBPM != null && TJAPlayer3.Skin.SongSelect_BPM_Text_Show) if (TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongBPM != null && TJAPlayer3.Skin.SongSelect_BPM_Text_Show)
{ {
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(TJAPlayer3.stage選曲.act曲リスト.ttkSelectedSongBPM).t2D拡大率考慮描画(CTexture.RefPnt.Left, TJAPlayer3.Skin.SongSelect_BPM_Text[0], TJAPlayer3.Skin.SongSelect_BPM_Text[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongBPM).t2D拡大率考慮描画(CTexture.RefPnt.Left, TJAPlayer3.Skin.SongSelect_BPM_Text[0], TJAPlayer3.Skin.SongSelect_BPM_Text[1]);
} }
if (TJAPlayer3.stage選曲.r現在選択中の曲.bExplicit == true) if (TJAPlayer3.stageSongSelect.rNowSelectedSong.bExplicit == true)
TJAPlayer3.Tx.SongSelect_Explicit?.t2D描画(TJAPlayer3.Skin.SongSelect_Explicit[0], TJAPlayer3.Skin.SongSelect_Explicit[1]); TJAPlayer3.Tx.SongSelect_Explicit?.t2D描画(TJAPlayer3.Skin.SongSelect_Explicit[0], TJAPlayer3.Skin.SongSelect_Explicit[1]);
} }

2
OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs
View File

@ -53,7 +53,7 @@ namespace TJAPlayer3
public override int Draw() public override int Draw()
{ {
tFloorNumberDraw(TJAPlayer3.Skin.SongSelect_FloorNum_X, TJAPlayer3.Skin.SongSelect_FloorNum_Y, TJAPlayer3.stage選曲.r現在選択中の曲.nTotalFloor); tFloorNumberDraw(TJAPlayer3.Skin.SongSelect_FloorNum_X, TJAPlayer3.Skin.SongSelect_FloorNum_Y, TJAPlayer3.stageSongSelect.rNowSelectedSong.nTotalFloor);
return 0; return 0;
} }

628
OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs
View File

File diff suppressed because it is too large Load Diff

14
OpenTaiko/src/Stages/05.SongSelect/CActSelect演奏履歴パネル.cs
View File

@ -68,8 +68,8 @@ namespace TJAPlayer3
} }
public void t選択曲が変更された() public void t選択曲が変更された()
{ {
Cスコア cスコア = TJAPlayer3.stage選曲.r現在選択中のスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア;
if( ( cスコア != null ) && !TJAPlayer3.stage選曲.bスクロール中 ) if( ( cスコア != null ) && !TJAPlayer3.stageSongSelect.bCurrentlyScrolling )
{ {
try try
{ {
@ -82,7 +82,7 @@ namespace TJAPlayer3
{ {
SKBitmap image = ft表示用フォント.DrawText(cスコア.譜面情報.演奏履歴[ i ], Color.Yellow); SKBitmap image = ft表示用フォント.DrawText(cスコア.譜面情報.演奏履歴[ i ], Color.Yellow);
var tex = new CTexture( image ); var tex = new CTexture( image );
tex.vc拡大縮小倍率 = new Vector3D<float>( 0.5f, 0.5f, 1f ); tex.vcScaleRatio = new Vector3D<float>( 0.5f, 0.5f, 1f );
this.tx文字列パネル.Add(tex); this.tx文字列パネル.Add(tex);
image.Dispose(); image.Dispose();
} }
@ -152,14 +152,14 @@ namespace TJAPlayer3
this.ct登場アニメ用.Tick(); this.ct登場アニメ用.Tick();
int x = 980; int x = 980;
int y = 350; int y = 350;
if (TJAPlayer3.stage選曲.r現在選択中のスコア != null && this.ct登場アニメ用.CurrentValue >= 2000 && TJAPlayer3.stage選曲.r現在選択中の曲.eノード種別 == C曲リストノード.Eノード種別.SCORE) if (TJAPlayer3.stageSongSelect.r現在選択中のスコア != null && this.ct登場アニメ用.CurrentValue >= 2000 && TJAPlayer3.stageSongSelect.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE)
{ {
//CDTXMania.Tx.SongSelect_ScoreWindow_Text.n透明度 = ct登場アニメ用.n現在の値 - 1745; //CDTXMania.Tx.SongSelect_ScoreWindow_Text.n透明度 = ct登場アニメ用.n現在の値 - 1745;
if (TJAPlayer3.Tx.SongSelect_ScoreWindow[TJAPlayer3.stage選曲.n現在選択中の曲の難易度] != null) if (TJAPlayer3.Tx.SongSelect_ScoreWindow[TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度] != null)
{ {
//CDTXMania.Tx.SongSelect_ScoreWindow[CDTXMania.stage選曲.n現在選択中の曲の難易度].n透明度 = ct登場アニメ用.n現在の値 - 1745; //CDTXMania.Tx.SongSelect_ScoreWindow[CDTXMania.stage選曲.n現在選択中の曲の難易度].n透明度 = ct登場アニメ用.n現在の値 - 1745;
TJAPlayer3.Tx.SongSelect_ScoreWindow[TJAPlayer3.stage選曲.n現在選択中の曲の難易度].t2D描画(x, y); TJAPlayer3.Tx.SongSelect_ScoreWindow[TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度].t2D描画(x, y);
this.t小文字表示(x + 56, y + 160, string.Format("{0,7:######0}", TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nハイスコア[TJAPlayer3.stage選曲.n現在選択中の曲の難易度].ToString())); this.t小文字表示(x + 56, y + 160, string.Format("{0,7:######0}", TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nハイスコア[TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度].ToString()));
TJAPlayer3.Tx.SongSelect_ScoreWindow_Text.t2D描画(x + 236, y + 166, new Rectangle(0, 36, 32, 30)); TJAPlayer3.Tx.SongSelect_ScoreWindow_Text.t2D描画(x + 236, y + 166, new Rectangle(0, 36, 32, 30));
} }
} }

122
OpenTaiko/src/Stages/05.SongSelect/CActSelect難易度選択画面.cs
View File

@ -61,7 +61,7 @@ namespace TJAPlayer3
} }
else if (n現在の選択行[player] >= 5) else if (n現在の選択行[player] >= 5)
{ {
if (TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[4] < 0 || TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[3] < 0) if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[4] < 0 || TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[3] < 0)
return; return;
if (nスイッチカウント < 0) if (nスイッチカウント < 0)
@ -77,13 +77,13 @@ namespace TJAPlayer3
if (n現在の選択行[i] == 5) if (n現在の選択行[i] == 5)
{ {
// Extreme to Extra // Extreme to Extra
TJAPlayer3.stage選曲.actExExtraTransAnime.BeginAnime(true); TJAPlayer3.stageSongSelect.actExExtraTransAnime.BeginAnime(true);
n現在の選択行[i] = 6; n現在の選択行[i] = 6;
} }
else if (n現在の選択行[i] == 6) else if (n現在の選択行[i] == 6)
{ {
//Extra to Extreme //Extra to Extreme
TJAPlayer3.stage選曲.actExExtraTransAnime.BeginAnime(false); TJAPlayer3.stageSongSelect.actExExtraTransAnime.BeginAnime(false);
n現在の選択行[i] = 5; n現在の選択行[i] = 5;
} }
} }
@ -110,8 +110,8 @@ namespace TJAPlayer3
public void t選択画面初期化() public void t選択画面初期化()
{ {
this.txTitle = TJAPlayer3.tテクスチャの生成(pfTitle.DrawText(TJAPlayer3.stage選曲.r現在選択中の曲.strタイトル, Color.White, Color.Black, null, 30 )); this.txTitle = TJAPlayer3.tテクスチャの生成(pfTitle.DrawText(TJAPlayer3.stageSongSelect.rNowSelectedSong.strタイトル, Color.White, Color.Black, null, 30 ));
this.txSubTitle = TJAPlayer3.tテクスチャの生成(pfSubTitle.DrawText(TJAPlayer3.stage選曲.r現在選択中の曲.strサブタイトル, Color.White, Color.Black, null, 30)); this.txSubTitle = TJAPlayer3.tテクスチャの生成(pfSubTitle.DrawText(TJAPlayer3.stageSongSelect.rNowSelectedSong.strサブタイトル, Color.White, Color.Black, null, 30));
this.n現在の選択行 = new int[5]; this.n現在の選択行 = new int[5];
this.bSelect[0] = false; this.bSelect[0] = false;
@ -120,7 +120,7 @@ namespace TJAPlayer3
this.bSelect[3] = false; this.bSelect[3] = false;
this.bSelect[4] = false; this.bSelect[4] = false;
this.b裏譜面 = (TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0 && TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] < 0); this.b裏譜面 = (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0 && TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] < 0);
this.IsFirstDraw = true; this.IsFirstDraw = true;
} }
@ -191,8 +191,8 @@ namespace TJAPlayer3
ctBarAnime[i].Tick(); ctBarAnime[i].Tick();
} }
bool uraExists = TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0; bool uraExists = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0;
bool omoteExists = TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] >= 0; bool omoteExists = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] >= 0;
#region [ キー入力 ] #region [ キー入力 ]
@ -211,63 +211,63 @@ namespace TJAPlayer3
switch (i) switch (i)
{ {
case 0: case 0:
right = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)); right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow));
left = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)); left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow));
decide = (TJAPlayer3.Pad.b押されたDGB(Eパッド.Decide) || decide = (TJAPlayer3.Pad.bPressedDGB(EPad.Decide) ||
(TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))); (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)));
cancel = (TJAPlayer3.Pad.b押されたDGB(Eパッド.Cancel) || TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)); cancel = (TJAPlayer3.Pad.bPressedDGB(EPad.Cancel) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape));
break; break;
case 1: case 1:
if (!TJAPlayer3.ConfigIni.bAIBattleMode) if (!TJAPlayer3.ConfigIni.bAIBattleMode)
{ {
right = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue2P)); right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P));
left = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue2P)); left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P));
decide = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed2P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed2P)); decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P));
} }
break; break;
case 2: case 2:
right = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue3P)); right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue3P));
left = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue3P)); left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue3P));
decide = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed3P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed3P)); decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed3P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed3P));
break; break;
case 3: case 3:
right = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue4P)); right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue4P));
left = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue4P)); left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue4P));
decide = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed4P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed4P)); decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed4P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed4P));
break; break;
case 4: case 4:
right = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue5P)); right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue5P));
left = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue5P)); left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue5P));
decide = (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed5P) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed5P)); decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed5P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed5P));
break; break;
} }
if (right) if (right)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
this.t次に移動(i); this.t次に移動(i);
} }
else if (left) else if (left)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
this.t前に移動(i); this.t前に移動(i);
} }
if (decide) if (decide)
{ {
if (n現在の選択行[i] == 0) if (n現在の選択行[i] == 0)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.stage選曲.act曲リスト.ctBarOpen.Start(100, 260, 2, TJAPlayer3.Timer); TJAPlayer3.stageSongSelect.actSongList.ctBarOpen.Start(100, 260, 2, TJAPlayer3.Timer);
this.bIsDifficltSelect = false; this.bIsDifficltSelect = false;
} }
else if (n現在の選択行[i] == 1) else if (n現在の選択行[i] == 1)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
bOption[i] = true; bOption[i] = true;
} }
else else
{ {
if (TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[n現在の選択行[i] - 2] > 0) if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[n現在の選択行[i] - 2] > 0)
{ {
//TJAPlayer3.stage選曲.ctDonchan_Jump[0].t開始(0, SongSelect_Donchan_Jump.Length - 1, 1000 / 45, TJAPlayer3.Timer); //TJAPlayer3.stage選曲.ctDonchan_Jump[0].t開始(0, SongSelect_Donchan_Jump.Length - 1, 1000 / 45, TJAPlayer3.Timer);
@ -299,7 +299,7 @@ namespace TJAPlayer3
} }
else else
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
} }
for (int i2 = 0; i2 < TJAPlayer3.ConfigIni.nPlayerCount; i2++) for (int i2 = 0; i2 < TJAPlayer3.ConfigIni.nPlayerCount; i2++)
@ -315,26 +315,26 @@ namespace TJAPlayer3
CMenuCharacter.tMenuResetTimer(i2, CMenuCharacter.ECharacterAnimation.START); CMenuCharacter.tMenuResetTimer(i2, CMenuCharacter.ECharacterAnimation.START);
if (TJAPlayer3.ConfigIni.bAIBattleMode) if (TJAPlayer3.ConfigIni.bAIBattleMode)
{ {
TJAPlayer3.stage選曲.t曲を選択する(n現在の選択行[0] - 2, i2); TJAPlayer3.stageSongSelect.t曲を選択する(n現在の選択行[0] - 2, i2);
} }
else else
{ {
TJAPlayer3.stage選曲.t曲を選択する(n現在の選択行[i2] - 2, i2); TJAPlayer3.stageSongSelect.t曲を選択する(n現在の選択行[i2] - 2, i2);
} }
} }
} }
else else
{ {
CMenuCharacter.tMenuResetTimer(i, CMenuCharacter.ECharacterAnimation.WAIT); CMenuCharacter.tMenuResetTimer(i, CMenuCharacter.ECharacterAnimation.WAIT);
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
} }
} }
} }
} }
if (cancel) if (cancel)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
TJAPlayer3.stage選曲.act曲リスト.ctBarOpen.Start(100, 260, 2, TJAPlayer3.Timer); TJAPlayer3.stageSongSelect.actSongList.ctBarOpen.Start(100, 260, 2, TJAPlayer3.Timer);
this.bIsDifficltSelect = false; this.bIsDifficltSelect = false;
} }
} }
@ -349,20 +349,20 @@ namespace TJAPlayer3
// int boxType = nStrジャンルtoNum(TJAPlayer3.stage選曲.r現在選択中の曲.strジャンル); // int boxType = nStrジャンルtoNum(TJAPlayer3.stage選曲.r現在選択中の曲.strジャンル);
var difficulty_back = HGenreBar.tGetGenreBar(TJAPlayer3.stage選曲.r現在選択中の曲.BoxType, TJAPlayer3.Tx.Difficulty_Back); var difficulty_back = HGenreBar.tGetGenreBar(TJAPlayer3.stageSongSelect.rNowSelectedSong.BoxType, TJAPlayer3.Tx.Difficulty_Back);
difficulty_back.Opacity = difficulty_back.Opacity =
(TJAPlayer3.stage選曲.act曲リスト.ctDifficultyIn.CurrentValue - 1255); (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255);
TJAPlayer3.Tx.Difficulty_Bar.Opacity = (TJAPlayer3.stage選曲.act曲リスト.ctDifficultyIn.CurrentValue - 1255); TJAPlayer3.Tx.Difficulty_Bar.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255);
TJAPlayer3.Tx.Difficulty_Number.Opacity = (TJAPlayer3.stage選曲.act曲リスト.ctDifficultyIn.CurrentValue - 1255); TJAPlayer3.Tx.Difficulty_Number.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255);
TJAPlayer3.Tx.Difficulty_Crown.Opacity = (TJAPlayer3.stage選曲.act曲リスト.ctDifficultyIn.CurrentValue - 1255); TJAPlayer3.Tx.Difficulty_Crown.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255);
TJAPlayer3.Tx.SongSelect_ScoreRank.vc拡大縮小倍率.X = 0.65f; TJAPlayer3.Tx.SongSelect_ScoreRank.vcScaleRatio.X = 0.65f;
TJAPlayer3.Tx.SongSelect_ScoreRank.vc拡大縮小倍率.Y = 0.65f; TJAPlayer3.Tx.SongSelect_ScoreRank.vcScaleRatio.Y = 0.65f;
TJAPlayer3.Tx.SongSelect_ScoreRank.Opacity = (TJAPlayer3.stage選曲.act曲リスト.ctDifficultyIn.CurrentValue - 1255); TJAPlayer3.Tx.SongSelect_ScoreRank.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255);
TJAPlayer3.Tx.Difficulty_Star.Opacity = (TJAPlayer3.stage選曲.act曲リスト.ctDifficultyIn.CurrentValue - 1255); TJAPlayer3.Tx.Difficulty_Star.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255);
difficulty_back.color4 = CConversion.ColorToColor4(TJAPlayer3.stage選曲.r現在選択中の曲.BoxColor); difficulty_back.color4 = CConversion.ColorToColor4(TJAPlayer3.stageSongSelect.rNowSelectedSong.BoxColor);
difficulty_back.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Difficulty_Back[0], TJAPlayer3.Skin.SongSelect_Difficulty_Back[1]); difficulty_back.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Difficulty_Back[0], TJAPlayer3.Skin.SongSelect_Difficulty_Back[1]);
@ -396,7 +396,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i][3])); //閉じる TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i][3])); //閉じる
} }
exextraAnimation = TJAPlayer3.stage選曲.actExExtraTransAnime.Draw(); exextraAnimation = TJAPlayer3.stageSongSelect.actExExtraTransAnime.Draw();
for (int i = 0; i <= (int)Difficulty.Edit; i++) for (int i = 0; i <= (int)Difficulty.Edit; i++)
{ {
@ -406,8 +406,8 @@ namespace TJAPlayer3
continue; continue;
int screenPos = Math.Min((int)Difficulty.Oni, i); int screenPos = Math.Min((int)Difficulty.Oni, i);
int level = TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[i]; int level = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i];
bool avaliable = TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[i] >= 0; bool avaliable = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i] >= 0;
if (avaliable) if (avaliable)
TJAPlayer3.Tx.Difficulty_Bar.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); TJAPlayer3.Tx.Difficulty_Bar.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f);
@ -435,21 +435,21 @@ namespace TJAPlayer3
int p = TJAPlayer3.GetActualPlayer(j); int p = TJAPlayer3.GetActualPlayer(j);
Cスコア.ST譜面情報 idx = TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報; Cスコア.ST譜面情報 idx = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報;
var GPInfo = TJAPlayer3.stage選曲.r現在選択中のスコア.GPInfo[p]; var GPInfo = TJAPlayer3.stageSongSelect.r現在選択中のスコア.GPInfo[p];
//Difficulty_Crown.t2D描画(445 + screenPos * 144, 284, new RectangleF(idx.nクリア[i] * 24.5f, 0, 24.5f, 26)); //Difficulty_Crown.t2D描画(445 + screenPos * 144, 284, new RectangleF(idx.nクリア[i] * 24.5f, 0, 24.5f, 26));
int crown_width = TJAPlayer3.Tx.Difficulty_Crown.szテクスチャサイズ.Width / 4; int crown_width = TJAPlayer3.Tx.Difficulty_Crown.szTextureSize.Width / 4;
int crown_height = TJAPlayer3.Tx.Difficulty_Crown.szテクスチャサイズ.Height; int crown_height = TJAPlayer3.Tx.Difficulty_Crown.szTextureSize.Height;
TJAPlayer3.Tx.Difficulty_Crown.t2D描画( TJAPlayer3.Tx.Difficulty_Crown.t2D描画(
TJAPlayer3.Skin.SongSelect_Difficulty_Crown_X[j][i], TJAPlayer3.Skin.SongSelect_Difficulty_Crown_X[j][i],
TJAPlayer3.Skin.SongSelect_Difficulty_Crown_Y[j][i], TJAPlayer3.Skin.SongSelect_Difficulty_Crown_Y[j][i],
new RectangleF(GPInfo.nClear[i] * crown_width, 0, crown_width, crown_height)); new RectangleF(GPInfo.nClear[i] * crown_width, 0, crown_width, crown_height));
int scoreRank_width = TJAPlayer3.Tx.SongSelect_ScoreRank.szテクスチャサイズ.Width; int scoreRank_width = TJAPlayer3.Tx.SongSelect_ScoreRank.szTextureSize.Width;
int scoreRank_height = TJAPlayer3.Tx.SongSelect_ScoreRank.szテクスチャサイズ.Height / 7; int scoreRank_height = TJAPlayer3.Tx.SongSelect_ScoreRank.szTextureSize.Height / 7;
if (GPInfo.nScoreRank[i] != 0) if (GPInfo.nScoreRank[i] != 0)
TJAPlayer3.Tx.SongSelect_ScoreRank.t2D描画( TJAPlayer3.Tx.SongSelect_ScoreRank.t2D描画(
@ -464,11 +464,11 @@ namespace TJAPlayer3
} }
if (level >= 0 && (!(i >= (int)Difficulty.Oni && exextraAnimation > 0))) if (level >= 0 && (!(i >= (int)Difficulty.Oni && exextraAnimation > 0)))
t小文字表示(TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nレベル[i], t小文字表示(TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i],
TJAPlayer3.Skin.SongSelect_Difficulty_Number_X[i], TJAPlayer3.Skin.SongSelect_Difficulty_Number_X[i],
TJAPlayer3.Skin.SongSelect_Difficulty_Number_Y[i], TJAPlayer3.Skin.SongSelect_Difficulty_Number_Y[i],
i, i,
TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.nLevelIcon[i] TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[i]
); );
if (!(i >= (int)Difficulty.Oni && exextraAnimation > 0)) if (!(i >= (int)Difficulty.Oni && exextraAnimation > 0))
@ -489,7 +489,7 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.stage選曲.r現在選択中のスコア.譜面情報.b譜面分岐[i]) if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.b譜面分岐[i])
TJAPlayer3.Tx.SongSelect_Branch_Text?.t2D描画( TJAPlayer3.Tx.SongSelect_Branch_Text?.t2D描画(
TJAPlayer3.Skin.SongSelect_Difficulty_Bar_X[i + 2] + TJAPlayer3.Skin.SongSelect_Branch_Text_Offset[0], TJAPlayer3.Skin.SongSelect_Difficulty_Bar_X[i + 2] + TJAPlayer3.Skin.SongSelect_Branch_Text_Offset[0],
@ -626,7 +626,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Difficulty_Number_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); TJAPlayer3.Tx.Difficulty_Number_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height));
} }
} }
TJAPlayer3.stage選曲.act曲リスト.tDisplayLevelIcon((int)icon_coords[0], (int)icon_coords[1], icon, TJAPlayer3.Tx.Difficulty_Number_Icon); TJAPlayer3.stageSongSelect.actSongList.tDisplayLevelIcon((int)icon_coords[0], (int)icon_coords[1], icon, TJAPlayer3.Tx.Difficulty_Number_Icon);
} }
private bool isOnOption() private bool isOnOption()
@ -636,7 +636,7 @@ namespace TJAPlayer3
public int nStrジャンルtoNum(string strジャンル) public int nStrジャンルtoNum(string strジャンル)
{ {
return TJAPlayer3.stage選曲.act曲リスト.nStrジャンルtoNumBox(strジャンル); return TJAPlayer3.stageSongSelect.actSongList.nStrジャンルtoNumBox(strジャンル);
} }
//----------------- //-----------------
#endregion #endregion

2
OpenTaiko/src/Stages/05.SongSelect/CActSortSongs.cs
View File

@ -29,7 +29,7 @@ namespace TJAPlayer3
// メソッド // メソッド
public void tActivatePopupMenu( E楽器パート einst, ref CActSelect曲リスト ca ) public void tActivatePopupMenu( EInstrumentPad einst, ref CActSelect曲リスト ca )
{ {
this.act曲リスト = ca; this.act曲リスト = ca;
base.tActivatePopupMenu( einst ); base.tActivatePopupMenu( einst );

526
OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs
View File

File diff suppressed because it is too large Load Diff

76
OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs
View File

@ -45,7 +45,7 @@ namespace TJAPlayer3
this.sd読み込み音 = null; this.sd読み込み音 = null;
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] >= 5 || TJAPlayer3.ConfigIni.nPlayerCount != 1) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] >= 5 || TJAPlayer3.ConfigIni.nPlayerCount != 1)
{ {
TJAPlayer3.ConfigIni.bTokkunMode = false; TJAPlayer3.ConfigIni.bTokkunMode = false;
} }
@ -66,7 +66,7 @@ namespace TJAPlayer3
} }
else else
{ {
string strDTXファイルパス = TJAPlayer3.stage選曲.r確定されたスコア.ファイル情報.ファイルの絶対パス; string strDTXファイルパス = TJAPlayer3.stageSongSelect.r確定されたスコア.ファイル情報.ファイルの絶対パス;
var strフォルダ名 = Path.GetDirectoryName(strDTXファイルパス) + Path.DirectorySeparatorChar; var strフォルダ名 = Path.GetDirectoryName(strDTXファイルパス) + Path.DirectorySeparatorChar;
@ -81,7 +81,7 @@ namespace TJAPlayer3
} }
else else
{ {
var 譜面情報 = TJAPlayer3.stage選曲.r確定されたスコア.譜面情報; var 譜面情報 = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報;
this.str曲タイトル = 譜面情報.タイトル; this.str曲タイトル = 譜面情報.タイトル;
this.strサブタイトル = 譜面情報.strサブタイトル; this.strサブタイトル = 譜面情報.strサブタイトル;
} }
@ -101,9 +101,9 @@ namespace TJAPlayer3
float wait = 600f; float wait = 600f;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
wait = 1000f; wait = 1000f;
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
wait = 1200f; wait = 1200f;
this.ct待機 = new CCounter( 0, wait, 5, TJAPlayer3.Timer ); this.ct待機 = new CCounter( 0, wait, 5, TJAPlayer3.Timer );
@ -132,7 +132,7 @@ namespace TJAPlayer3
{ {
this.txタイトル = new CTexture( bmpSongTitle ); this.txタイトル = new CTexture( bmpSongTitle );
txタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, TJAPlayer3.Skin.SongLoading_Title_MaxSize); txタイトル.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, TJAPlayer3.Skin.SongLoading_Title_MaxSize);
} }
using (var bmpSongSubTitle = this.pfSUBTITLE.DrawText( サブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_ForeColor, TJAPlayer3.Skin.SongLoading_SubTitle_BackColor, null, 30 )) using (var bmpSongSubTitle = this.pfSUBTITLE.DrawText( サブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_ForeColor, TJAPlayer3.Skin.SongLoading_SubTitle_BackColor, null, 30 ))
@ -140,7 +140,7 @@ namespace TJAPlayer3
{ {
this.txサブタイトル = new CTexture( bmpSongSubTitle ); this.txサブタイトル = new CTexture( bmpSongSubTitle );
txサブタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txサブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_MaxSize); txサブタイトル.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txサブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_MaxSize);
} }
} }
else else
@ -217,7 +217,7 @@ namespace TJAPlayer3
//----------------------------- //-----------------------------
if( base.IsFirstDraw ) if( base.IsFirstDraw )
{ {
Cスコア cスコア1 = TJAPlayer3.stage選曲.r確定されたスコア; Cスコア cスコア1 = TJAPlayer3.stageSongSelect.r確定されたスコア;
if( this.sd読み込み音 != null ) if( this.sd読み込み音 != null )
{ {
if( TJAPlayer3.Skin.sound曲読込開始音.bExclusive && ( CSkin.CSystemSound.r最後に再生した排他システムサウンド != null ) ) if( TJAPlayer3.Skin.sound曲読込開始音.bExclusive && ( CSkin.CSystemSound.r最後に再生した排他システムサウンド != null ) )
@ -256,7 +256,7 @@ namespace TJAPlayer3
} }
#endregion #endregion
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
void drawPlate() void drawPlate()
{ {
@ -283,7 +283,7 @@ namespace TJAPlayer3
int y = 720 - 45; int y = 720 - 45;
if (this.txタイトル != null) if (this.txタイトル != null)
{ {
int nサブタイトル補正 = string.IsNullOrEmpty(TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0; int nサブタイトル補正 = string.IsNullOrEmpty(TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0;
this.txタイトル.Opacity = 255; this.txタイトル.Opacity = 255;
if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left) if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left)
@ -292,11 +292,11 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right)
{ {
this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X - (this.txタイトル.sz画像サイズ.Width * txタイトル.vc拡大縮小倍率.X), TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X - (this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正);
} }
else else
{ {
this.txタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_Title_X - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vc拡大縮小倍率.X) / 2)), TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); this.txタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_Title_X - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正);
} }
} }
if (this.txサブタイトル != null) if (this.txサブタイトル != null)
@ -308,11 +308,11 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right)
{ {
this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vc拡大縮小倍率.X), TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2));
} }
else else
{ {
this.txサブタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_SubTitle_X - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vc拡大縮小倍率.X) / 2)), TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); this.txサブタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_SubTitle_X - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2));
} }
} }
} }
@ -342,7 +342,7 @@ namespace TJAPlayer3
int y = 720 - 45; int y = 720 - 45;
if (this.txタイトル != null) if (this.txタイトル != null)
{ {
int nサブタイトル補正 = string.IsNullOrEmpty(TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0; int nサブタイトル補正 = string.IsNullOrEmpty(TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0;
this.txタイトル.Opacity = 255; this.txタイトル.Opacity = 255;
if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left) if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left)
@ -351,11 +351,11 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right)
{ {
this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X_AI - (this.txタイトル.sz画像サイズ.Width * txタイトル.vc拡大縮小倍率.X), TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X_AI - (this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正);
} }
else else
{ {
this.txタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_Title_X_AI - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vc拡大縮小倍率.X) / 2)), TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); this.txタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_Title_X_AI - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正);
} }
} }
if (this.txサブタイトル != null) if (this.txサブタイトル != null)
@ -367,11 +367,11 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right)
{ {
this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X_AI - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vc拡大縮小倍率.X), TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X_AI - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2));
} }
else else
{ {
this.txサブタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_SubTitle_X_AI - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vc拡大縮小倍率.X) / 2)), TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); this.txサブタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_SubTitle_X_AI - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2));
} }
} }
} }
@ -380,7 +380,7 @@ namespace TJAPlayer3
//----------------------------- //-----------------------------
this.ct曲名表示.Tick(); this.ct曲名表示.Tick();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
#region [Tower loading screen] #region [Tower loading screen]
@ -389,19 +389,19 @@ namespace TJAPlayer3
int xFactor = 0; int xFactor = 0;
float yFactor = 1f; float yFactor = 1f;
int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTowerType); int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType);
if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn) if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn)
currentTowerType = 0; currentTowerType = 0;
if (TJAPlayer3.Tx.TowerResult_Background != null && currentTowerType < TJAPlayer3.Tx.TowerResult_Tower.Length && TJAPlayer3.Tx.TowerResult_Tower[currentTowerType] != null) if (TJAPlayer3.Tx.TowerResult_Background != null && currentTowerType < TJAPlayer3.Tx.TowerResult_Tower.Length && TJAPlayer3.Tx.TowerResult_Tower[currentTowerType] != null)
{ {
xFactor = (TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Width - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szテクスチャサイズ.Width) / 2; xFactor = (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Width - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Width) / 2;
yFactor = TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szテクスチャサイズ.Height / (float)TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Height; yFactor = TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Height / (float)TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height;
} }
float pos = (TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Height - TJAPlayer3.Skin.Resolution[1]) - float pos = (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height - TJAPlayer3.Skin.Resolution[1]) -
((ct待機.CurrentValue <= 1200 ? ct待機.CurrentValue / 10f : 120) / 120f * (TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Height - TJAPlayer3.Skin.Resolution[1])); ((ct待機.CurrentValue <= 1200 ? ct待機.CurrentValue / 10f : 120) / 120f * (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height - TJAPlayer3.Skin.Resolution[1]));
TJAPlayer3.Tx.TowerResult_Background?.t2D描画(0, -1 * pos); TJAPlayer3.Tx.TowerResult_Background?.t2D描画(0, -1 * pos);
@ -452,11 +452,11 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Tile_Black != null) if (TJAPlayer3.Tx.Tile_Black != null)
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = (int)(ct待機.CurrentValue <= 51 ? (255 - ct待機.CurrentValue / 0.2f) : (this.ct待機.CurrentValue - 949) / 0.2); TJAPlayer3.Tx.Tile_Black.Opacity = (int)(ct待機.CurrentValue <= 51 ? (255 - ct待機.CurrentValue / 0.2f) : (this.ct待機.CurrentValue - 949) / 0.2);
for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size
{ {
for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size
{ {
TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height);
} }
} }
} }
@ -479,7 +479,7 @@ namespace TJAPlayer3
TimeSpan span; TimeSpan span;
str = null; str = null;
if( !TJAPlayer3.bコンパクトモード ) if( !TJAPlayer3.bコンパクトモード )
str = TJAPlayer3.stage選曲.r確定されたスコア.ファイル情報.ファイルの絶対パス; str = TJAPlayer3.stageSongSelect.r確定されたスコア.ファイル情報.ファイルの絶対パス;
else else
str = TJAPlayer3.strコンパクトモードファイル; str = TJAPlayer3.strコンパクトモードファイル;
@ -491,15 +491,15 @@ namespace TJAPlayer3
//if( CDTXMania.DTX == null ) //if( CDTXMania.DTX == null )
{ {
TJAPlayer3.DTX = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 0, true, TJAPlayer3.stage選曲.n確定された曲の難易度[0]); TJAPlayer3.DTX = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 0, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]);
if ( TJAPlayer3.ConfigIni.nPlayerCount >= 2 ) if ( TJAPlayer3.ConfigIni.nPlayerCount >= 2 )
TJAPlayer3.DTX_2P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 1, true, TJAPlayer3.stage選曲.n確定された曲の難易度[1]); TJAPlayer3.DTX_2P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 1, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[1]);
if (TJAPlayer3.ConfigIni.nPlayerCount >= 3) if (TJAPlayer3.ConfigIni.nPlayerCount >= 3)
TJAPlayer3.DTX_3P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 2, true, TJAPlayer3.stage選曲.n確定された曲の難易度[2]); TJAPlayer3.DTX_3P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 2, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[2]);
if (TJAPlayer3.ConfigIni.nPlayerCount >= 4) if (TJAPlayer3.ConfigIni.nPlayerCount >= 4)
TJAPlayer3.DTX_4P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 3, true, TJAPlayer3.stage選曲.n確定された曲の難易度[3]); TJAPlayer3.DTX_4P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 3, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[3]);
if (TJAPlayer3.ConfigIni.nPlayerCount >= 5) if (TJAPlayer3.ConfigIni.nPlayerCount >= 5)
TJAPlayer3.DTX_5P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 4, true, TJAPlayer3.stage選曲.n確定された曲の難易度[4]); TJAPlayer3.DTX_5P = new CDTX(str, false, 1.0, ini.stファイル.BGMAdjust, 0, 4, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[4]);
if (TJAPlayer3.DTX.listErrors.Count != 0) if (TJAPlayer3.DTX.listErrors.Count != 0)
{ {
@ -521,7 +521,7 @@ namespace TJAPlayer3
// 段位認定モード用。 // 段位認定モード用。
#region [dan setup] #region [dan setup]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan && TJAPlayer3.DTX.List_DanSongs != null) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan && TJAPlayer3.DTX.List_DanSongs != null)
{ {
var titleForeColor = TJAPlayer3.Skin.Game_DanC_Title_ForeColor; var titleForeColor = TJAPlayer3.Skin.Game_DanC_Title_ForeColor;
@ -536,7 +536,7 @@ namespace TJAPlayer3
using (var bmpSongTitle = pfDanTitle.DrawText(TJAPlayer3.DTX.List_DanSongs[i].Title, titleForeColor, titleBackColor, null, 30)) using (var bmpSongTitle = pfDanTitle.DrawText(TJAPlayer3.DTX.List_DanSongs[i].Title, titleForeColor, titleBackColor, null, 30))
{ {
TJAPlayer3.DTX.List_DanSongs[i].TitleTex = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false); TJAPlayer3.DTX.List_DanSongs[i].TitleTex = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false);
TJAPlayer3.DTX.List_DanSongs[i].TitleTex.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref TJAPlayer3.DTX.List_DanSongs[i].TitleTex, TJAPlayer3.Skin.Game_DanC_Title_MaxWidth); TJAPlayer3.DTX.List_DanSongs[i].TitleTex.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref TJAPlayer3.DTX.List_DanSongs[i].TitleTex, TJAPlayer3.Skin.Game_DanC_Title_MaxWidth);
} }
} }
@ -545,7 +545,7 @@ namespace TJAPlayer3
using (var bmpSongSubTitle = pfDanSubTitle.DrawText(TJAPlayer3.DTX.List_DanSongs[i].SubTitle, subtitleForeColor, subtitleBackColor, null, 30)) using (var bmpSongSubTitle = pfDanSubTitle.DrawText(TJAPlayer3.DTX.List_DanSongs[i].SubTitle, subtitleForeColor, subtitleBackColor, null, 30))
{ {
TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex = TJAPlayer3.tテクスチャの生成(bmpSongSubTitle, false); TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex = TJAPlayer3.tテクスチャの生成(bmpSongSubTitle, false);
TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex, TJAPlayer3.Skin.Game_DanC_SubTitle_MaxWidth); TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex, TJAPlayer3.Skin.Game_DanC_SubTitle_MaxWidth);
} }
} }
@ -668,7 +668,7 @@ namespace TJAPlayer3
/// <returns></returns> /// <returns></returns>
protected bool tキー入力() protected bool tキー入力()
{ {
IInputDevice keyboard = TJAPlayer3.Input管理.Keyboard; IInputDevice keyboard = TJAPlayer3.InputManager.Keyboard;
if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) ) // escape (exit) if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) ) // escape (exit)
{ {
return true; return true;

8
OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs
View File

@ -51,8 +51,8 @@ namespace TJAPlayer3
this.rVD.GetNowFrame(ref this.tx描画用); this.rVD.GetNowFrame(ref this.tx描画用);
this.tx描画用.vc拡大縮小倍率.X = this.ratio1; this.tx描画用.vcScaleRatio.X = this.ratio1;
this.tx描画用.vc拡大縮小倍率.Y = this.ratio1; this.tx描画用.vcScaleRatio.Y = this.ratio1;
if (TJAPlayer3.ConfigIni.eClipDispType.HasFlag(EClipDispType.背景のみ)) if (TJAPlayer3.ConfigIni.eClipDispType.HasFlag(EClipDispType.背景のみ))
{ {
@ -70,8 +70,8 @@ namespace TJAPlayer3
float[] fRatio = new float[] { 640.0f - 4.0f, 360.0f - 4.0f }; //中央下表示 float[] fRatio = new float[] { 640.0f - 4.0f, 360.0f - 4.0f }; //中央下表示
float ratio = Math.Min((float)(fRatio[0] / this.rVD.FrameSize.Width), (float)(fRatio[1] / this.rVD.FrameSize.Height)); float ratio = Math.Min((float)(fRatio[0] / this.rVD.FrameSize.Width), (float)(fRatio[1] / this.rVD.FrameSize.Height));
this.tx描画用.vc拡大縮小倍率.X = ratio; this.tx描画用.vcScaleRatio.X = ratio;
this.tx描画用.vc拡大縮小倍率.Y = ratio; this.tx描画用.vcScaleRatio.Y = ratio;
this.tx描画用.t2D拡大率考慮描画(CTexture.RefPnt.Down, SampleFramework.GameWindowSize.Width / 2, SampleFramework.GameWindowSize.Height); this.tx描画用.t2D拡大率考慮描画(CTexture.RefPnt.Down, SampleFramework.GameWindowSize.Width / 2, SampleFramework.GameWindowSize.Height);
} }

28
OpenTaiko/src/Stages/07.Game/CAct演奏Combo共通.cs
View File

@ -539,8 +539,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Taiko_Combo[0] != null) if (TJAPlayer3.Tx.Taiko_Combo[0] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue];
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0]; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0];
TJAPlayer3.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1])); TJAPlayer3.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1]));
} }
} }
@ -552,8 +552,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Taiko_Combo[0] != null) if (TJAPlayer3.Tx.Taiko_Combo[0] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue];
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0]; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0];
TJAPlayer3.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1])); TJAPlayer3.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1]));
} }
} }
@ -562,8 +562,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Taiko_Combo[2] != null) if (TJAPlayer3.Tx.Taiko_Combo[2] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue];
TJAPlayer3.Tx.Taiko_Combo[2].vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling; TJAPlayer3.Tx.Taiko_Combo[2].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling;
TJAPlayer3.Tx.Taiko_Combo[2].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0]; TJAPlayer3.Tx.Taiko_Combo[2].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0];
TJAPlayer3.Tx.Taiko_Combo[2].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1])); TJAPlayer3.Tx.Taiko_Combo[2].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1]));
} }
@ -575,16 +575,16 @@ namespace TJAPlayer3
if (nCombo値 >= 300 && TJAPlayer3.Tx.Taiko_Combo[3] != null) if (nCombo値 >= 300 && TJAPlayer3.Tx.Taiko_Combo[3] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0];
TJAPlayer3.Tx.Taiko_Combo[3].vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1] + yScalling; TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1] + yScalling;
TJAPlayer3.Tx.Taiko_Combo[3].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1]; TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1];
var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0;
TJAPlayer3.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); TJAPlayer3.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1]));
} }
else if (TJAPlayer3.Tx.Taiko_Combo[1] != null) else if (TJAPlayer3.Tx.Taiko_Combo[1] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0];
TJAPlayer3.Tx.Taiko_Combo[1].vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1] + yScalling; TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1] + yScalling;
TJAPlayer3.Tx.Taiko_Combo[1].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1]; TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1];
var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0;
TJAPlayer3.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); TJAPlayer3.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1]));
} }
@ -596,16 +596,16 @@ namespace TJAPlayer3
if (nCombo値 >= 300 && TJAPlayer3.Tx.Taiko_Combo[3] != null) if (nCombo値 >= 300 && TJAPlayer3.Tx.Taiko_Combo[3] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0];
TJAPlayer3.Tx.Taiko_Combo[3].vc拡大縮小倍率.Y = 1.0f + yScalling; TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.Y = 1.0f + yScalling;
TJAPlayer3.Tx.Taiko_Combo[3].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[2]; TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[2];
var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0;
TJAPlayer3.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); TJAPlayer3.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1]));
} }
else if (TJAPlayer3.Tx.Taiko_Combo[1] != null) else if (TJAPlayer3.Tx.Taiko_Combo[1] != null)
{ {
var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0];
TJAPlayer3.Tx.Taiko_Combo[1].vc拡大縮小倍率.Y = 1.0f + yScalling; TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.Y = 1.0f + yScalling;
TJAPlayer3.Tx.Taiko_Combo[1].vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[2]; TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[2];
var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0;
TJAPlayer3.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); TJAPlayer3.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1]));
} }

8
OpenTaiko/src/Stages/07.Game/CAct演奏PauseMenu.cs
View File

@ -22,7 +22,7 @@ namespace TJAPlayer3
{ {
this.bEsc有効 = false; this.bEsc有効 = false;
lci = new List<List<List<CItemBase>>>(); // この画面に来る度に、メニューを作り直す。 lci = new List<List<List<CItemBase>>>(); // この画面に来る度に、メニューを作り直す。
for ( int nConfSet = 0; nConfSet < (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan ? 3 : 2); nConfSet++ ) for ( int nConfSet = 0; nConfSet < (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan ? 3 : 2); nConfSet++ )
{ {
lci.Add( new List<List<CItemBase>>() ); // ConfSet用の3つ分の枠。 lci.Add( new List<List<CItemBase>>() ); // ConfSet用の3つ分の枠。
for ( int nInst = 0; nInst < 3; nInst++ ) for ( int nInst = 0; nInst < 3; nInst++ )
@ -40,7 +40,7 @@ namespace TJAPlayer3
#region [ 共通 SET切り替え/More/Return ] #region [ 共通 SET切り替え/More/Return ]
l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(900), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" })); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(900), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" }));
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(901), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" })); if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(901), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "" }));
l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(902), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "", "" })); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString(902), CItemBase.Eパネル種別.通常, 0, "", "", new string[] { "", "" }));
#endregion #endregion
@ -48,7 +48,7 @@ namespace TJAPlayer3
} }
// メソッド // メソッド
public override void tActivatePopupMenu( E楽器パート einst ) public override void tActivatePopupMenu( EInstrumentPad einst )
{ {
this.CAct演奏PauseMenuMain(); this.CAct演奏PauseMenuMain();
CActSelectPopupMenu.b選択した = false; CActSelectPopupMenu.b選択した = false;
@ -93,7 +93,7 @@ namespace TJAPlayer3
break; break;
case (int) EOrder.Redoing: case (int) EOrder.Redoing:
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
this.bやり直しを選択した = true; this.bやり直しを選択した = true;
CActSelectPopupMenu.b選択した = true; CActSelectPopupMenu.b選択した = true;

10
OpenTaiko/src/Stages/07.Game/CAct演奏ゲージ共通.cs
View File

@ -76,7 +76,7 @@ namespace TJAPlayer3
get; get;
private set; private set;
} }
public bool IsFailed(E楽器パート part) // 閉店状態になったかどうか public bool IsFailed(EInstrumentPad part) // 閉店状態になったかどうか
{ {
if (bRisky) if (bRisky)
{ {
@ -84,7 +84,7 @@ namespace TJAPlayer3
} }
return this.db現在のゲージ値[(int)part] <= GAUGE_MIN; return this.db現在のゲージ値[(int)part] <= GAUGE_MIN;
} }
public bool IsDanger(E楽器パート part) // DANGERかどうか public bool IsDanger(EInstrumentPad part) // DANGERかどうか
{ {
if (bRisky) if (bRisky)
{ {
@ -140,7 +140,7 @@ namespace TJAPlayer3
float gaugeRate = 0f; float gaugeRate = 0f;
float dbDamageRate = 2.0f; float dbDamageRate = 2.0f;
int nanidou = TJAPlayer3.stage選曲.n確定された曲の難易度[nPlayer]; int nanidou = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer];
switch (this.DTX[nPlayer].LEVELtaiko[nanidou]) switch (this.DTX[nPlayer].LEVELtaiko[nanidou])
{ {
@ -397,7 +397,7 @@ namespace TJAPlayer3
this.db現在のゲージ値[nPlayer] = Math.Max(0, this.db現在のゲージ値[nPlayer] - HGaugeMethods.FuserollDamage); this.db現在のゲージ値[nPlayer] = Math.Max(0, this.db現在のゲージ値[nPlayer] - HGaugeMethods.FuserollDamage);
} }
public void Damage(E楽器パート screenmode, E楽器パート part, ENoteJudge e今回の判定, int nPlayer) public void Damage(EInstrumentPad screenmode, EInstrumentPad part, ENoteJudge e今回の判定, int nPlayer)
{ {
float fDamage; float fDamage;
int nコース = (int)TJAPlayer3.stage演奏ドラム画面.n現在のコース[nPlayer]; int nコース = (int)TJAPlayer3.stage演奏ドラム画面.n現在のコース[nPlayer];
@ -444,7 +444,7 @@ namespace TJAPlayer3
var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character]; var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character];
int nanidou = TJAPlayer3.stage選曲.n確定された曲の難易度[nPlayer]; int nanidou = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer];
int level = this.DTX[nPlayer].LEVELtaiko[nanidou]; int level = this.DTX[nPlayer].LEVELtaiko[nanidou];
switch (chara.effect.tGetGaugeType()) switch (chara.effect.tGetGaugeType())

34
OpenTaiko/src/Stages/07.Game/CAct演奏スコア共通.cs
View File

@ -173,15 +173,15 @@ namespace TJAPlayer3
1f 1f
}; };
public double Get( E楽器パート part, int player ) public double Get( EInstrumentPad part, int player )
{ {
return this.n現在の本当のスコア[ player ][ (int) part ]; return this.n現在の本当のスコア[ player ][ (int) part ];
} }
public void Set( E楽器パート part, double nScore, int player ) public void Set( EInstrumentPad part, double nScore, int player )
{ {
//現状、TAIKOパートでの演奏記録を結果ステージに持っていけないので、ドラムパートにも加算することでお茶を濁している。 //現状、TAIKOパートでの演奏記録を結果ステージに持っていけないので、ドラムパートにも加算することでお茶を濁している。
if( part == E楽器パート.TAIKO ) if( part == EInstrumentPad.TAIKO )
part = E楽器パート.DRUMS; part = EInstrumentPad.DRUMS;
int nPart = (int) part; int nPart = (int) part;
if( this.n現在の本当のスコア[ player ][ nPart ] != nScore ) if( this.n現在の本当のスコア[ player ][ nPart ] != nScore )
@ -195,8 +195,8 @@ namespace TJAPlayer3
} }
} }
if( part == E楽器パート.DRUMS ) if( part == EInstrumentPad.DRUMS )
part = E楽器パート.TAIKO; part = EInstrumentPad.TAIKO;
nPart = (int) part; nPart = (int) part;
if( this.n現在の本当のスコア[ player ][ nPart ] != nScore ) if( this.n現在の本当のスコア[ player ][ nPart ] != nScore )
@ -217,18 +217,18 @@ namespace TJAPlayer3
/// <param name="part"></param> /// <param name="part"></param>
/// <param name="bAutoPlay"></param> /// <param name="bAutoPlay"></param>
/// <param name="delta"></param> /// <param name="delta"></param>
public void Add( E楽器パート part, STAUTOPLAY bAutoPlay, long delta, int player ) public void Add( EInstrumentPad part, STAUTOPLAY bAutoPlay, long delta, int player )
{ {
if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) return; if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) return;
double rev = 1.0; double rev = 1.0;
delta = (long)(delta * TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, player)); delta = (long)(delta * TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, player));
switch ( part ) switch ( part )
{ {
#region [ Unknown ] #region [ Unknown ]
case E楽器パート.UNKNOWN: case EInstrumentPad.UNKNOWN:
throw new ArgumentException(); throw new ArgumentException();
#endregion #endregion
} }
@ -280,7 +280,7 @@ namespace TJAPlayer3
} }
} }
this.Set( E楽器パート.TAIKO, this.Get( E楽器パート.TAIKO, player ) + 10000, player ); this.Set( EInstrumentPad.TAIKO, this.Get( EInstrumentPad.TAIKO, player ) + 10000, player );
} }
// CActivity 実装 // CActivity 実装
@ -355,11 +355,11 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Taiko_Score[0].Opacity = alpha; TJAPlayer3.Tx.Taiko_Score[0].Opacity = alpha;
if (TJAPlayer3.ConfigIni.SimpleMode) if (TJAPlayer3.ConfigIni.SimpleMode)
{ {
TJAPlayer3.Tx.Taiko_Score[0].vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Taiko_Score[0].vcScaleRatio.Y = 1;
} }
else else
{ {
TJAPlayer3.Tx.Taiko_Score[0].vc拡大縮小倍率.Y = ScoreScale[this.ct点数アニメタイマ[player].CurrentValue]; TJAPlayer3.Tx.Taiko_Score[0].vcScaleRatio.Y = ScoreScale[this.ct点数アニメタイマ[player].CurrentValue];
} }
TJAPlayer3.Tx.Taiko_Score[0].t2D拡大率考慮下基準描画( x , y, rectangle ); TJAPlayer3.Tx.Taiko_Score[0].t2D拡大率考慮下基準描画( x , y, rectangle );
@ -371,7 +371,7 @@ namespace TJAPlayer3
//this.txScore.color4 = new SlimDX.Color4( 1.0f, 0.5f, 0.4f ); //this.txScore.color4 = new SlimDX.Color4( 1.0f, 0.5f, 0.4f );
//this.txScore.color4 = CDTXMania.Skin.cScoreColor1P; //this.txScore.color4 = CDTXMania.Skin.cScoreColor1P;
TJAPlayer3.Tx.Taiko_Score[1].Opacity = alpha; TJAPlayer3.Tx.Taiko_Score[1].Opacity = alpha;
TJAPlayer3.Tx.Taiko_Score[1].vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Taiko_Score[1].vcScaleRatio.Y = 1;
TJAPlayer3.Tx.Taiko_Score[1].t2D拡大率考慮下基準描画( x, y, rectangle ); TJAPlayer3.Tx.Taiko_Score[1].t2D拡大率考慮下基準描画( x, y, rectangle );
} }
break; break;
@ -381,7 +381,7 @@ namespace TJAPlayer3
//this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f );
//this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P;
TJAPlayer3.Tx.Taiko_Score[2].Opacity = alpha; TJAPlayer3.Tx.Taiko_Score[2].Opacity = alpha;
TJAPlayer3.Tx.Taiko_Score[2].vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Taiko_Score[2].vcScaleRatio.Y = 1;
TJAPlayer3.Tx.Taiko_Score[2].t2D拡大率考慮下基準描画(x, y, rectangle); TJAPlayer3.Tx.Taiko_Score[2].t2D拡大率考慮下基準描画(x, y, rectangle);
} }
break; break;
@ -391,7 +391,7 @@ namespace TJAPlayer3
//this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f );
//this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P;
TJAPlayer3.Tx.Taiko_Score[3].Opacity = alpha; TJAPlayer3.Tx.Taiko_Score[3].Opacity = alpha;
TJAPlayer3.Tx.Taiko_Score[3].vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Taiko_Score[3].vcScaleRatio.Y = 1;
TJAPlayer3.Tx.Taiko_Score[3].t2D拡大率考慮下基準描画(x, y, rectangle); TJAPlayer3.Tx.Taiko_Score[3].t2D拡大率考慮下基準描画(x, y, rectangle);
} }
break; break;
@ -401,7 +401,7 @@ namespace TJAPlayer3
//this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f );
//this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P;
TJAPlayer3.Tx.Taiko_Score[4].Opacity = alpha; TJAPlayer3.Tx.Taiko_Score[4].Opacity = alpha;
TJAPlayer3.Tx.Taiko_Score[4].vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Taiko_Score[4].vcScaleRatio.Y = 1;
TJAPlayer3.Tx.Taiko_Score[4].t2D拡大率考慮下基準描画(x, y, rectangle); TJAPlayer3.Tx.Taiko_Score[4].t2D拡大率考慮下基準描画(x, y, rectangle);
} }
break; break;
@ -411,7 +411,7 @@ namespace TJAPlayer3
//this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f );
//this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P;
TJAPlayer3.Tx.Taiko_Score[5].Opacity = alpha; TJAPlayer3.Tx.Taiko_Score[5].Opacity = alpha;
TJAPlayer3.Tx.Taiko_Score[5].vc拡大縮小倍率.Y = 1; TJAPlayer3.Tx.Taiko_Score[5].vcScaleRatio.Y = 1;
TJAPlayer3.Tx.Taiko_Score[5].t2D拡大率考慮下基準描画(x, y, rectangle); TJAPlayer3.Tx.Taiko_Score[5].t2D拡大率考慮下基準描画(x, y, rectangle);
} }
break; break;

30
OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs
View File

@ -63,7 +63,7 @@ namespace TJAPlayer3
/// <param name="songName">曲名</param> /// <param name="songName">曲名</param>
/// <param name="genreName">ジャンル名</param> /// <param name="genreName">ジャンル名</param>
/// <param name="stageText">曲数</param> /// <param name="stageText">曲数</param>
public void SetPanelString(string songName, string genreName, string stageText = null, C曲リストノード songNode = null) public void SetPanelString(string songName, string genreName, string stageText = null, CSongListNode songNode = null)
{ {
if( base.IsActivated ) if( base.IsActivated )
{ {
@ -78,14 +78,14 @@ namespace TJAPlayer3
} }
if (txMusicName != null) if (txMusicName != null)
{ {
this.txMusicName.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName); this.txMusicName.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName);
} }
SKBitmap bmpDiff; SKBitmap bmpDiff;
string strDiff = ""; string strDiff = "";
if (TJAPlayer3.Skin.eDiffDispMode == E難易度表示タイプ.n曲目に表示) if (TJAPlayer3.Skin.eDiffDispMode == E難易度表示タイプ.n曲目に表示)
{ {
switch (TJAPlayer3.stage選曲.n確定された曲の難易度[0]) switch (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0])
{ {
case 0: case 0:
strDiff = "かんたん "; strDiff = "かんたん ";
@ -177,15 +177,15 @@ namespace TJAPlayer3
{ {
if (TJAPlayer3.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Left) if (TJAPlayer3.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Left)
{ {
this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X , TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szテクスチャサイズ.Height)); this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X , TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height));
} }
else if (TJAPlayer3.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Right) else if (TJAPlayer3.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Right)
{ {
this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X - this.tx歌詞テクスチャ.szテクスチャサイズ.Width, TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szテクスチャサイズ.Height)); this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X - this.tx歌詞テクスチャ.szTextureSize.Width, TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height));
} }
else else
{ {
this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X - (this.tx歌詞テクスチャ.szテクスチャサイズ.Width / 2), TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szテクスチャサイズ.Height)); this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X - (this.tx歌詞テクスチャ.szTextureSize.Width / 2), TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height));
} }
} }
} }
@ -246,7 +246,7 @@ namespace TJAPlayer3
if( this.txGENRE != null ) if( this.txGENRE != null )
{ {
this.txGENRE.t2D描画(TJAPlayer3.Skin.Game_Genre_X, TJAPlayer3.Skin.Game_Genre_Y); this.txGENRE.t2D描画(TJAPlayer3.Skin.Game_Genre_X, TJAPlayer3.Skin.Game_Genre_Y);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkGENRE).t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Game_Genre_X + TJAPlayer3.Skin.Game_GenreText_Offset[0], TJAPlayer3.Skin.Game_Genre_Y + TJAPlayer3.Skin.Game_GenreText_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkGENRE).t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Game_Genre_X + TJAPlayer3.Skin.Game_GenreText_Offset[0], TJAPlayer3.Skin.Game_Genre_Y + TJAPlayer3.Skin.Game_GenreText_Offset[1]);
} }
if( this.txStage != null ) if( this.txStage != null )
this.txStage.t2D描画( TJAPlayer3.Skin.Game_Genre_X, TJAPlayer3.Skin.Game_Genre_Y ); this.txStage.t2D描画( TJAPlayer3.Skin.Game_Genre_X, TJAPlayer3.Skin.Game_Genre_Y );
@ -255,13 +255,13 @@ namespace TJAPlayer3
{ {
if( this.txMusicName != null ) if( this.txMusicName != null )
{ {
float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szテクスチャサイズ.Width; float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szTextureSize.Width;
if (this.txMusicName.szテクスチャサイズ.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth) if (this.txMusicName.szTextureSize.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth)
fRate = 1.0f; fRate = 1.0f;
this.txMusicName.vc拡大縮小倍率.X = fRate; this.txMusicName.vcScaleRatio.X = fRate;
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szテクスチャサイズ.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y); this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szTextureSize.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y);
} }
} }
else else
@ -298,13 +298,13 @@ namespace TJAPlayer3
} }
if (this.txMusicName != null) if (this.txMusicName != null)
{ {
float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szテクスチャサイズ.Width; float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szTextureSize.Width;
if (this.txMusicName.szテクスチャサイズ.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth) if (this.txMusicName.szTextureSize.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth)
fRate = 1.0f; fRate = 1.0f;
this.txMusicName.vc拡大縮小倍率.X = fRate; this.txMusicName.vcScaleRatio.X = fRate;
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szテクスチャサイズ.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y); this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szTextureSize.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y);
} }
} }
} }

6
OpenTaiko/src/Stages/07.Game/CInvisibleChip.cs
View File

@ -63,7 +63,7 @@ namespace TJAPlayer3
/// まだSemi-Invisibleを開始していなければ、開始する /// まだSemi-Invisibleを開始していなければ、開始する
/// </summary> /// </summary>
/// <param name="eInst"></param> /// <param name="eInst"></param>
public void StartSemiInvisible( E楽器パート eInst ) public void StartSemiInvisible( EInstrumentPad eInst )
{ {
int nInst = (int) eInst; int nInst = (int) eInst;
if ( !b演奏チップが１つでもバーを通過した[ nInst ] ) if ( !b演奏チップが１つでもバーを通過した[ nInst ] )
@ -80,7 +80,7 @@ namespace TJAPlayer3
/// 一時的にチップを表示するモードを開始する /// 一時的にチップを表示するモードを開始する
/// </summary> /// </summary>
/// <param name="eInst">楽器パート</param> /// <param name="eInst">楽器パート</param>
public void ShowChipTemporally( E楽器パート eInst ) public void ShowChipTemporally( EInstrumentPad eInst )
{ {
ccounter[ (int) eInst ].Start( 0, nDisplayTimeMs + nFadeoutTimeMs + 1, 1, TJAPlayer3.Timer ); ccounter[ (int) eInst ].Start( 0, nDisplayTimeMs + nFadeoutTimeMs + 1, 1, TJAPlayer3.Timer );
} }
@ -97,7 +97,7 @@ namespace TJAPlayer3
internal EChipInvisibleState SetInvisibleStatus( ref CDTX.CChip cc ) internal EChipInvisibleState SetInvisibleStatus( ref CDTX.CChip cc )
{ {
if ( cc.e楽器パート == E楽器パート.UNKNOWN ) if ( cc.e楽器パート == EInstrumentPad.UNKNOWN )
{ {
return EChipInvisibleState.SHOW; return EChipInvisibleState.SHOW;
} }

200
OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -26,9 +26,9 @@ namespace TJAPlayer3
//if ( ) //if ( )
{ {
Drums.nスコア = (long) this.actScore.Get( E楽器パート.DRUMS, 0 ); Drums.nスコア = (long) this.actScore.Get( EInstrumentPad.DRUMS, 0 );
Drums.dbゲーム型スキル値 = CScoreIni.tゲーム型スキルを計算して返す(TJAPlayer3.DTX.LEVEL.Drums, TJAPlayer3.DTX.n可視チップ数.Drums, this.nヒット数_Auto含まない.Drums.Perfect, this.actCombo.n現在のコンボ数.最高値[0], E楽器パート.DRUMS, bIsAutoPlay); Drums.dbゲーム型スキル値 = CScoreIni.tゲーム型スキルを計算して返す(TJAPlayer3.DTX.LEVEL.Drums, TJAPlayer3.DTX.n可視チップ数.Drums, this.nヒット数_Auto含まない.Drums.Perfect, this.actCombo.n現在のコンボ数.最高値[0], EInstrumentPad.DRUMS, bIsAutoPlay);
Drums.db演奏型スキル値 = CScoreIni.t演奏型スキルを計算して返す( TJAPlayer3.DTX.n可視チップ数.Drums, this.nヒット数_Auto含まない.Drums.Perfect, this.nヒット数_Auto含まない.Drums.Great, this.nヒット数_Auto含まない.Drums.Good, this.nヒット数_Auto含まない.Drums.Poor, this.nヒット数_Auto含まない.Drums.Miss, E楽器パート.DRUMS, bIsAutoPlay ); Drums.db演奏型スキル値 = CScoreIni.t演奏型スキルを計算して返す( TJAPlayer3.DTX.n可視チップ数.Drums, this.nヒット数_Auto含まない.Drums.Perfect, this.nヒット数_Auto含まない.Drums.Great, this.nヒット数_Auto含まない.Drums.Good, this.nヒット数_Auto含まない.Drums.Poor, this.nヒット数_Auto含まない.Drums.Miss, EInstrumentPad.DRUMS, bIsAutoPlay );
Drums.nPerfect数 = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Perfect : this.nヒット数_Auto含まない.Drums.Perfect; Drums.nPerfect数 = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Perfect : this.nヒット数_Auto含まない.Drums.Perfect;
Drums.nGreat数 = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Great : this.nヒット数_Auto含まない.Drums.Great; Drums.nGreat数 = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Great : this.nヒット数_Auto含まない.Drums.Great;
Drums.nGood数 = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Good : this.nヒット数_Auto含まない.Drums.Good; Drums.nGood数 = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Good : this.nヒット数_Auto含まない.Drums.Good;
@ -77,9 +77,9 @@ namespace TJAPlayer3
Drums.fゲージ = (float)this.actGauge.db現在のゲージ値[ 0 ]; Drums.fゲージ = (float)this.actGauge.db現在のゲージ値[ 0 ];
if( !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]) if( !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0])
{ {
Drums.nハイスコア = TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.nハイスコア; //2015.06.16 kairera0467 他難易度の上書き防止。 Drums.nハイスコア = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.nハイスコア; //2015.06.16 kairera0467 他難易度の上書き防止。
if( TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.nハイスコア[ TJAPlayer3.stage選曲.n確定された曲の難易度[0]] < (int)this.actScore.Get( E楽器パート.DRUMS, 0 ) ) if( TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.nハイスコア[ TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]] < (int)this.actScore.Get( EInstrumentPad.DRUMS, 0 ) )
Drums.nハイスコア[ TJAPlayer3.stage選曲.n確定された曲の難易度[0]] = (int)this.actScore.Get( E楽器パート.DRUMS, 0 ); Drums.nハイスコア[ TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]] = (int)this.actScore.Get( EInstrumentPad.DRUMS, 0 );
} }
var danC = TJAPlayer3.stage演奏ドラム画面.actDan.GetExam(); var danC = TJAPlayer3.stage演奏ドラム画面.actDan.GetExam();
for (int i = 0; i < danC.Length; i++) for (int i = 0; i < danC.Length; i++)
@ -542,16 +542,16 @@ namespace TJAPlayer3
#endregion #endregion
// Note // Note
if(TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
n良 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; n良 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
nCombo = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; nCombo = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
nHighestCombo = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; nHighestCombo = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
n可 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; n可 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
n不可 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; n不可 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
n連打 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; n連打 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
nADLIB = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; nADLIB = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
nMine = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; nMine = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
} }
@ -1185,7 +1185,7 @@ namespace TJAPlayer3
{ {
bool _timingzonesAreEasy = false; bool _timingzonesAreEasy = false;
int diff = TJAPlayer3.stage選曲.n確定された曲の難易度[nPlayer]; int diff = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer];
// Diff = Normal or Easy // Diff = Normal or Easy
if (diff <= (int)Difficulty.Normal) if (diff <= (int)Difficulty.Normal)
@ -1197,7 +1197,7 @@ namespace TJAPlayer3
if (diff == (int)Difficulty.Dan) if (diff == (int)Difficulty.Dan)
{ {
int _nb = TJAPlayer3.stage演奏ドラム画面.actDan.NowShowingNumber; int _nb = TJAPlayer3.stage演奏ドラム画面.actDan.NowShowingNumber;
var _danSongs = TJAPlayer3.stage選曲.r確定された曲.DanSongs; var _danSongs = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs;
if (_nb < _danSongs.Count) if (_nb < _danSongs.Count)
{ {
@ -1211,7 +1211,7 @@ namespace TJAPlayer3
// Diff = Tower and SIDE is Normal // Diff = Tower and SIDE is Normal
if (diff == (int)Difficulty.Tower) if (diff == (int)Difficulty.Tower)
{ {
_timingzonesAreEasy = TJAPlayer3.stage選曲.r確定された曲.nSide == CDTX.ESide.eNormal; _timingzonesAreEasy = TJAPlayer3.stageSongSelect.rChoosenSong.nSide == CDTX.ESide.eNormal;
} }
return _timingzonesAreEasy; return _timingzonesAreEasy;
@ -1417,9 +1417,9 @@ namespace TJAPlayer3
{ {
this.actStatusPanels.tラベル名からステータスパネルを決定する( null ); this.actStatusPanels.tラベル名からステータスパネルを決定する( null );
} }
else if ( TJAPlayer3.stage選曲.r確定された曲 != null ) else if ( TJAPlayer3.stageSongSelect.rChoosenSong != null )
{ {
this.actStatusPanels.tラベル名からステータスパネルを決定する( TJAPlayer3.stage選曲.r確定された曲.ar難易度ラベル[ TJAPlayer3.stage選曲.n確定された曲の難易度[0]] ); this.actStatusPanels.tラベル名からステータスパネルを決定する( TJAPlayer3.stageSongSelect.rChoosenSong.ar難易度ラベル[ TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]] );
} }
} }
@ -1468,7 +1468,7 @@ namespace TJAPlayer3
pChip.nRollCount++; pChip.nRollCount++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.n連打[actDan.NowShowingNumber]++; this.n連打[actDan.NowShowingNumber]++;
this.n現在の連打数[ nPlayer ]++; this.n現在の連打数[ nPlayer ]++;
@ -1478,7 +1478,7 @@ namespace TJAPlayer3
this.CSectionScore[nPlayer].nRoll++; this.CSectionScore[nPlayer].nRoll++;
this.n合計連打数[ nPlayer ]++; this.n合計連打数[ nPlayer ]++;
if(TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) this.actRollChara.Start(nPlayer); if(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) this.actRollChara.Start(nPlayer);
//2017.01.28 DD CDTXから直接呼び出す //2017.01.28 DD CDTXから直接呼び出す
if (!TJAPlayer3.ConfigIni.ShinuchiMode) //2018.03.11 kairera0467 チップに埋め込んだフラグから読み取る if (!TJAPlayer3.ConfigIni.ShinuchiMode) //2018.03.11 kairera0467 チップに埋め込んだフラグから読み取る
@ -1489,17 +1489,17 @@ namespace TJAPlayer3
if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1) if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1)
{ {
if (pChip.nチャンネル番号 == 0x15) if (pChip.nチャンネル番号 == 0x15)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(300 * 1.2f), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(300 * 1.2f), nPlayer);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(360 * 1.2f), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(360 * 1.2f), nPlayer);
} }
// 新配点 // 新配点
else else
{ {
if (pChip.nチャンネル番号 == 0x15) if (pChip.nチャンネル番号 == 0x15)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(100 * 1.2f), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(100 * 1.2f), nPlayer);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(200 * 1.2f), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(200 * 1.2f), nPlayer);
} }
} }
else //non-Shin'uchi / non-GoGo-Time　／　真打OFF・非ゴーゴータイム else //non-Shin'uchi / non-GoGo-Time　／　真打OFF・非ゴーゴータイム
@ -1508,17 +1508,17 @@ namespace TJAPlayer3
if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1) if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1)
{ {
if (pChip.nチャンネル番号 == 0x15) if (pChip.nチャンネル番号 == 0x15)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(300L), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(300L), nPlayer);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(360L), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(360L), nPlayer);
} }
// 新配点 // 新配点
else else
{ {
if (pChip.nチャンネル番号 == 0x15) if (pChip.nチャンネル番号 == 0x15)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(100L), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(100L), nPlayer);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, (long)(200L), nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(200L), nPlayer);
} }
} }
} }
@ -1528,17 +1528,17 @@ namespace TJAPlayer3
if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1) if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1)
{ {
if (pChip.nチャンネル番号 == 0x15) if (pChip.nチャンネル番号 == 0x15)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 100L, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 100L, nPlayer);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 100L, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 100L, nPlayer);
} }
// 新配点 // 新配点
else else
{ {
if (pChip.nチャンネル番号 == 0x15) if (pChip.nチャンネル番号 == 0x15)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 100L, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 100L, nPlayer);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 100L, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 100L, nPlayer);
} }
} }
@ -1676,7 +1676,7 @@ namespace TJAPlayer3
this.n風船残り[player] = balloon - rollCount; this.n風船残り[player] = balloon - rollCount;
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.n連打[actDan.NowShowingNumber]++; this.n連打[actDan.NowShowingNumber]++;
this.CBranchScore[player].nRoll++; this.CBranchScore[player].nRoll++;
this.CChartScore[player].nRoll++; this.CChartScore[player].nRoll++;
@ -1693,21 +1693,21 @@ namespace TJAPlayer3
if (pChip.bGOGOTIME) //non-Shin'uchi / GoGo-Time　／　真打OFF・ゴーゴータイム if (pChip.bGOGOTIME) //non-Shin'uchi / GoGo-Time　／　真打OFF・ゴーゴータイム
{ {
if (balloon == rollCount) if (balloon == rollCount)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 6000L, player); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 6000L, player);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 360L, player); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 360L, player);
} }
else //non-Shin'uchi / non-GoGo-Time　／　真打OFF・非ゴーゴータイム else //non-Shin'uchi / non-GoGo-Time　／　真打OFF・非ゴーゴータイム
{ {
if (balloon == rollCount) if (balloon == rollCount)
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 5000L, player); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 5000L, player);
else else
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 300L, player); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 300L, player);
} }
} }
else //Shin'uchi　／　真打 else //Shin'uchi　／　真打
{ {
this.actScore.Add(E楽器パート.TAIKO, this.bIsAutoPlay, 100L, player); this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, 100L, player);
} }
//CDTXMania.Skin.soundRed.t再生する(); //CDTXMania.Skin.soundRed.t再生する();
this.soundRed[pChip.nPlayerSide]?.PlayStart(); this.soundRed[pChip.nPlayerSide]?.PlayStart();
@ -1780,11 +1780,11 @@ namespace TJAPlayer3
protected abstract ENoteJudge tチップのヒット処理( long nHitTime, CDTX.CChip pChip, bool bCorrectLane ); protected abstract ENoteJudge tチップのヒット処理( long nHitTime, CDTX.CChip pChip, bool bCorrectLane );
protected ENoteJudge tチップのヒット処理( long nHitTime, CDTX.CChip pChip, E楽器パート screenmode, bool bCorrectLane, int nNowInput ) protected ENoteJudge tチップのヒット処理( long nHitTime, CDTX.CChip pChip, EInstrumentPad screenmode, bool bCorrectLane, int nNowInput )
{ {
return tチップのヒット処理( nHitTime, pChip, screenmode, bCorrectLane, nNowInput, 0 ); return tチップのヒット処理( nHitTime, pChip, screenmode, bCorrectLane, nNowInput, 0 );
} }
protected unsafe ENoteJudge tチップのヒット処理(long nHitTime, CDTX.CChip pChip, E楽器パート screenmode, bool bCorrectLane, int nNowInput, int nPlayer, bool rollEffectHit = false) protected unsafe ENoteJudge tチップのヒット処理(long nHitTime, CDTX.CChip pChip, EInstrumentPad screenmode, bool bCorrectLane, int nNowInput, int nPlayer, bool rollEffectHit = false)
{ {
//unsafeコードにつき、デバッグ中の変更厳禁! //unsafeコードにつき、デバッグ中の変更厳禁!
@ -1813,11 +1813,11 @@ namespace TJAPlayer3
ENoteJudge eJudgeResult = ENoteJudge.Auto; ENoteJudge eJudgeResult = ENoteJudge.Auto;
switch (pChip.e楽器パート) switch (pChip.e楽器パート)
{ {
case E楽器パート.DRUMS: case EInstrumentPad.DRUMS:
case E楽器パート.GUITAR: case EInstrumentPad.GUITAR:
case E楽器パート.BASS: case EInstrumentPad.BASS:
break; break;
case E楽器パート.TAIKO: case EInstrumentPad.TAIKO:
{ {
//連打が短すぎると発声されない //連打が短すぎると発声されない
eJudgeResult = (bCorrectLane)? this.e指定時刻からChipのJUDGEを返す( nHitTime, pChip, nPlayer ) : ENoteJudge.Miss; eJudgeResult = (bCorrectLane)? this.e指定時刻からChipのJUDGEを返す( nHitTime, pChip, nPlayer ) : ENoteJudge.Miss;
@ -2002,7 +2002,7 @@ namespace TJAPlayer3
this.CChartScore[nPlayer].nADLIB++; this.CChartScore[nPlayer].nADLIB++;
this.CSectionScore[nPlayer].nADLIB++; this.CSectionScore[nPlayer].nADLIB++;
this.CBranchScore[nPlayer].nADLIB++; this.CBranchScore[nPlayer].nADLIB++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.nADLIB[actDan.NowShowingNumber]++; this.nADLIB[actDan.NowShowingNumber]++;
} }
break; break;
@ -2021,7 +2021,7 @@ namespace TJAPlayer3
this.CChartScore[nPlayer].nMine++; this.CChartScore[nPlayer].nMine++;
this.CSectionScore[nPlayer].nMine++; this.CSectionScore[nPlayer].nMine++;
this.CBranchScore[nPlayer].nMine++; this.CBranchScore[nPlayer].nMine++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.nMine[actDan.NowShowingNumber]++; this.nMine[actDan.NowShowingNumber]++;
} }
break; break;
@ -2046,7 +2046,7 @@ namespace TJAPlayer3
break; break;
} }
if ((pChip.e楽器パート != E楽器パート.UNKNOWN)) if ((pChip.e楽器パート != EInstrumentPad.UNKNOWN))
{ {
if (NotesManager.IsMissableNote(pChip)) if (NotesManager.IsMissableNote(pChip))
{ {
@ -2179,11 +2179,11 @@ namespace TJAPlayer3
switch ( pChip.e楽器パート ) switch ( pChip.e楽器パート )
{ {
case E楽器パート.DRUMS: case EInstrumentPad.DRUMS:
case E楽器パート.GUITAR: case EInstrumentPad.GUITAR:
case E楽器パート.BASS: case EInstrumentPad.BASS:
break; break;
case E楽器パート.TAIKO: case EInstrumentPad.TAIKO:
if( !bAutoPlay ) if( !bAutoPlay )
{ {
if(NotesManager.IsGenericRoll(pChip)) if(NotesManager.IsGenericRoll(pChip))
@ -2204,7 +2204,7 @@ namespace TJAPlayer3
if ( nPlayer == 0 ) this.nヒット数_Auto含まない.Drums.Perfect++; if ( nPlayer == 0 ) this.nヒット数_Auto含まない.Drums.Perfect++;
this.actCombo.n現在のコンボ数[nPlayer]++; this.actCombo.n現在のコンボ数[nPlayer]++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
this.n良[actDan.NowShowingNumber]++; this.n良[actDan.NowShowingNumber]++;
this.tIncreaseComboDan(actDan.NowShowingNumber); this.tIncreaseComboDan(actDan.NowShowingNumber);
@ -2245,7 +2245,7 @@ namespace TJAPlayer3
if ( nPlayer == 0 ) this.nヒット数_Auto含まない.Drums.Great++; if ( nPlayer == 0 ) this.nヒット数_Auto含まない.Drums.Great++;
this.actCombo.n現在のコンボ数[ nPlayer ]++; this.actCombo.n現在のコンボ数[ nPlayer ]++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
this.n可[actDan.NowShowingNumber]++; this.n可[actDan.NowShowingNumber]++;
this.tIncreaseComboDan(actDan.NowShowingNumber); this.tIncreaseComboDan(actDan.NowShowingNumber);
@ -2280,12 +2280,12 @@ namespace TJAPlayer3
if(!NotesManager.IsMissableNote(pChip) && !bBombHit) if(!NotesManager.IsMissableNote(pChip) && !bBombHit)
break; break;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
CFloorManagement.damage(); CFloorManagement.damage();
if (!bBombHit) if (!bBombHit)
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.n不可[actDan.NowShowingNumber]++; this.n不可[actDan.NowShowingNumber]++;
this.CBranchScore[nPlayer].nMiss++; this.CBranchScore[nPlayer].nMiss++;
@ -2297,7 +2297,7 @@ namespace TJAPlayer3
} }
this.actCombo.n現在のコンボ数[ nPlayer ] = 0; this.actCombo.n現在のコンボ数[ nPlayer ] = 0;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.nCombo[actDan.NowShowingNumber] = 0; this.nCombo[actDan.NowShowingNumber] = 0;
this.actComboVoice.tReset(nPlayer); this.actComboVoice.tReset(nPlayer);
@ -2322,7 +2322,7 @@ namespace TJAPlayer3
if (NotesManager.IsADLIB(pChip)) if (NotesManager.IsADLIB(pChip))
break; break;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
this.n良[actDan.NowShowingNumber]++; this.n良[actDan.NowShowingNumber]++;
this.tIncreaseComboDan(actDan.NowShowingNumber); this.tIncreaseComboDan(actDan.NowShowingNumber);
@ -2364,7 +2364,7 @@ namespace TJAPlayer3
{ {
if (!NotesManager.IsGenericRoll(pChip)) if (!NotesManager.IsGenericRoll(pChip))
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
this.n可[actDan.NowShowingNumber]++; this.n可[actDan.NowShowingNumber]++;
this.tIncreaseComboDan(actDan.NowShowingNumber); this.tIncreaseComboDan(actDan.NowShowingNumber);
@ -2409,12 +2409,12 @@ namespace TJAPlayer3
if (!NotesManager.IsMissableNote(pChip) && !bBombHit) if (!NotesManager.IsMissableNote(pChip) && !bBombHit)
break; break;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
CFloorManagement.damage(); CFloorManagement.damage();
if (!bBombHit) if (!bBombHit)
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.n不可[actDan.NowShowingNumber]++; this.n不可[actDan.NowShowingNumber]++;
@ -2425,7 +2425,7 @@ namespace TJAPlayer3
} }
this.actCombo.n現在のコンボ数[ nPlayer ] = 0; this.actCombo.n現在のコンボ数[ nPlayer ] = 0;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.nCombo[actDan.NowShowingNumber] = 0; this.nCombo[actDan.NowShowingNumber] = 0;
this.actComboVoice.tReset(nPlayer); this.actComboVoice.tReset(nPlayer);
@ -2507,11 +2507,11 @@ namespace TJAPlayer3
default: default:
break; break;
} }
if ( ( ( pChip.e楽器パート != E楽器パート.UNKNOWN ) ) && ( eJudgeResult != ENoteJudge.Miss ) && ( eJudgeResult != ENoteJudge.Bad ) && ( eJudgeResult != ENoteJudge.Poor ) && (NotesManager.IsMissableNote(pChip)) ) if ( ( ( pChip.e楽器パート != EInstrumentPad.UNKNOWN ) ) && ( eJudgeResult != ENoteJudge.Miss ) && ( eJudgeResult != ENoteJudge.Bad ) && ( eJudgeResult != ENoteJudge.Poor ) && (NotesManager.IsMissableNote(pChip)) )
{ {
int nCombos = this.actCombo.n現在のコンボ数[nPlayer]; int nCombos = this.actCombo.n現在のコンボ数[nPlayer];
long nInit = TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stage選曲.n確定された曲の難易度[nPlayer]]; long nInit = TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]];
long nDiff = TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stage選曲.n確定された曲の難易度[nPlayer]]; long nDiff = TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]];
long nAddScore = 0; long nAddScore = 0;
if ( TJAPlayer3.ConfigIni.ShinuchiMode ) //2016.07.04 kairera0467 真打モード。 if ( TJAPlayer3.ConfigIni.ShinuchiMode ) //2016.07.04 kairera0467 真打モード。
@ -2524,7 +2524,7 @@ namespace TJAPlayer3
nAddScore = (long)nAddScore * 10; nAddScore = (long)nAddScore * 10;
} }
this.actScore.Add( E楽器パート.TAIKO, bIsAutoPlay, (long)nAddScore, nPlayer ); this.actScore.Add( EInstrumentPad.TAIKO, bIsAutoPlay, (long)nAddScore, nPlayer );
} }
else if( TJAPlayer3.DTX.nScoreModeTmp == 2 ) else if( TJAPlayer3.DTX.nScoreModeTmp == 2 )
{ {
@ -2580,7 +2580,7 @@ namespace TJAPlayer3
nAddScore = nAddScore * 2; nAddScore = nAddScore * 2;
} }
this.actScore.Add(E楽器パート.TAIKO, bIsAutoPlay, nAddScore, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, bIsAutoPlay, nAddScore, nPlayer);
//this.actScore.Add( E楽器パート.DRUMS, bIsAutoPlay, nAddScore ); //this.actScore.Add( E楽器パート.DRUMS, bIsAutoPlay, nAddScore );
} }
else if (TJAPlayer3.DTX.nScoreModeTmp == 1) else if (TJAPlayer3.DTX.nScoreModeTmp == 1)
@ -2647,7 +2647,7 @@ namespace TJAPlayer3
nAddScore = nAddScore * 2; nAddScore = nAddScore * 2;
} }
this.actScore.Add(E楽器パート.TAIKO, bIsAutoPlay, nAddScore, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, bIsAutoPlay, nAddScore, nPlayer);
} }
else else
{ {
@ -2684,7 +2684,7 @@ namespace TJAPlayer3
nAddScore = nAddScore * 2; nAddScore = nAddScore * 2;
} }
this.actScore.Add(E楽器パート.TAIKO, bIsAutoPlay, nAddScore, nPlayer); this.actScore.Add(EInstrumentPad.TAIKO, bIsAutoPlay, nAddScore, nPlayer);
//this.actScore.Add( E楽器パート.DRUMS, bIsAutoPlay, nAddScore ); //this.actScore.Add( E楽器パート.DRUMS, bIsAutoPlay, nAddScore );
} }
@ -2699,10 +2699,10 @@ namespace TJAPlayer3
return ENoteJudge.Auto; return ENoteJudge.Auto;
} }
protected abstract void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, E楽器パート part); protected abstract void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, EInstrumentPad part);
protected abstract void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, E楽器パート part, int nLane); protected abstract void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, EInstrumentPad part, int nLane);
protected void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, E楽器パート part, int nLane, E楽器パート screenmode) protected void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, EInstrumentPad part, int nLane, EInstrumentPad screenmode)
{ {
cInvisibleChip.StartSemiInvisible( part ); cInvisibleChip.StartSemiInvisible( part );
cInvisibleChip.ShowChipTemporally( part ); cInvisibleChip.ShowChipTemporally( part );
@ -2711,12 +2711,12 @@ namespace TJAPlayer3
actGauge.Damage(screenmode, part, ENoteJudge.Miss, 0); actGauge.Damage(screenmode, part, ENoteJudge.Miss, 0);
switch ( part ) switch ( part )
{ {
case E楽器パート.DRUMS: case EInstrumentPad.DRUMS:
case E楽器パート.GUITAR: case EInstrumentPad.GUITAR:
case E楽器パート.BASS: case EInstrumentPad.BASS:
break; break;
case E楽器パート.TAIKO: case EInstrumentPad.TAIKO:
this.actCombo.n現在のコンボ数.P1 = 0; this.actCombo.n現在のコンボ数.P1 = 0;
this.actCombo.n現在のコンボ数.P2 = 0; this.actCombo.n現在のコンボ数.P2 = 0;
this.actCombo.n現在のコンボ数.P3 = 0; this.actCombo.n現在のコンボ数.P3 = 0;
@ -3201,7 +3201,7 @@ namespace TJAPlayer3
{ {
// Inputs // Inputs
IInputDevice keyboard = TJAPlayer3.Input管理.Keyboard; IInputDevice keyboard = TJAPlayer3.InputManager.Keyboard;
if ( ( !this.bPAUSE && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) if ( ( !this.bPAUSE && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) )
{ {
@ -3248,11 +3248,11 @@ namespace TJAPlayer3
} }
*/ */
else if ( ( base.ePhaseID == CStage.EPhase.Common_NORMAL ) && ( keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) || TJAPlayer3.Pad.b押されたGB( Eパッド.FT ) ) && !this.actPauseMenu.bIsActivePopupMenu ) else if ( ( base.ePhaseID == CStage.EPhase.Common_NORMAL ) && ( keyboard.KeyPressed( (int)SlimDXKeys.Key.Escape ) || TJAPlayer3.Pad.bPressedGB( EPad.FT ) ) && !this.actPauseMenu.bIsActivePopupMenu )
{ // escape (exit) { // escape (exit)
if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE == false) if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE == false)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
SoundManager.PlayTimer.Pause(); SoundManager.PlayTimer.Pause();
TJAPlayer3.Timer.Pause(); TJAPlayer3.Timer.Pause();
@ -3266,7 +3266,7 @@ namespace TJAPlayer3
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D1 ) ) else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D1 ) )
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
//listBRANCHを廃止したため強制分岐の開始値を //listBRANCHを廃止したため強制分岐の開始値を
//rc演奏用タイマ.n現在時刻msから引っ張ることに //rc演奏用タイマ.n現在時刻msから引っ張ることに
@ -3292,7 +3292,7 @@ namespace TJAPlayer3
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D2 ) ) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D2 ) ) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen.
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
//listBRANCHを廃止したため強制分岐の開始値を //listBRANCHを廃止したため強制分岐の開始値を
//rc演奏用タイマ.n現在時刻msから引っ張ることに //rc演奏用タイマ.n現在時刻msから引っ張ることに
@ -3318,7 +3318,7 @@ namespace TJAPlayer3
} }
else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D3 ) ) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. else if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.D3 ) ) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen.
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
//listBRANCHを廃止したため強制分岐の開始値を //listBRANCHを廃止したため強制分岐の開始値を
//rc演奏用タイマ.n現在時刻msから引っ張ることに //rc演奏用タイマ.n現在時刻msから引っ張ることに
@ -3419,7 +3419,7 @@ namespace TJAPlayer3
#endregion #endregion
} }
protected void t入力メソッド記憶( E楽器パート part ) protected void t入力メソッド記憶( EInstrumentPad part )
{ {
if ( TJAPlayer3.Pad.st検知したデバイス.Keyboard ) if ( TJAPlayer3.Pad.st検知したデバイス.Keyboard )
{ {
@ -3458,7 +3458,7 @@ namespace TJAPlayer3
&& ( ( this.actStageFailed.Draw() != 0 ) && ( ( this.actStageFailed.Draw() != 0 )
&& ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) )
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージクリア; this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージクリア;
} }
@ -3491,9 +3491,9 @@ namespace TJAPlayer3
: string.IsNullOrEmpty( TJAPlayer3.DTX.PANEL ) ? TJAPlayer3.DTX.TITLE: TJAPlayer3.DTX.PANEL; : string.IsNullOrEmpty( TJAPlayer3.DTX.PANEL ) ? TJAPlayer3.DTX.TITLE: TJAPlayer3.DTX.PANEL;
this.actPanel.SetPanelString( panelString, this.actPanel.SetPanelString( panelString,
TJAPlayer3.stage選曲.r確定された曲.str本当のジャンル, TJAPlayer3.stageSongSelect.rChoosenSong.str本当のジャンル,
TJAPlayer3.Skin.Game_StageText, TJAPlayer3.Skin.Game_StageText,
songNode: TJAPlayer3.stage選曲.r確定された曲); songNode: TJAPlayer3.stageSongSelect.rChoosenSong);
} }
@ -3513,7 +3513,7 @@ namespace TJAPlayer3
this.actScore.Draw(); this.actScore.Draw();
} }
protected bool t進行描画_チップ( E楽器パート ePlayMode, int nPlayer ) protected bool t進行描画_チップ( EInstrumentPad ePlayMode, int nPlayer )
{ {
if ( ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED ) || ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) if ( ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED ) || ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED_FadeOut ) )
{ {
@ -3624,7 +3624,7 @@ namespace TJAPlayer3
{ {
pChip.IsMissed = true; pChip.IsMissed = true;
pChip.eNoteState = ENoteState.bad; pChip.eNoteState = ENoteState.bad;
this.tチップのヒット処理(n現在時刻ms, pChip, E楽器パート.TAIKO, false, 0, nPlayer); this.tチップのヒット処理(n現在時刻ms, pChip, EInstrumentPad.TAIKO, false, 0, nPlayer);
} }
} }
} }
@ -3653,7 +3653,7 @@ namespace TJAPlayer3
//( ( pChip.n発声時刻ms <= CSound管理.rc演奏用タイマ.n現在時刻ms && pChip.nノーツ終了時刻ms >= CSound管理.rc演奏用タイマ.n現在時刻ms ) ) ) //( ( pChip.n発声時刻ms <= CSound管理.rc演奏用タイマ.n現在時刻ms && pChip.nノーツ終了時刻ms >= CSound管理.rc演奏用タイマ.n現在時刻ms ) ) )
{ {
if( bAutoPlay ) if( bAutoPlay )
this.tチップのヒット処理( n現在時刻ms, cChipCurrentlyInProcess, E楽器パート.TAIKO, false, 0, nPlayer ); this.tチップのヒット処理( n現在時刻ms, cChipCurrentlyInProcess, EInstrumentPad.TAIKO, false, 0, nPlayer );
} }
} }
} }
@ -3831,12 +3831,12 @@ namespace TJAPlayer3
this.CChartScore[nPlayer].nMine++; this.CChartScore[nPlayer].nMine++;
this.CSectionScore[nPlayer].nMine++; this.CSectionScore[nPlayer].nMine++;
this.CBranchScore[nPlayer].nMine++; this.CBranchScore[nPlayer].nMine++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
CFloorManagement.damage(); CFloorManagement.damage();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.nMine[actDan.NowShowingNumber]++; this.nMine[actDan.NowShowingNumber]++;
this.actCombo.n現在のコンボ数[nPlayer] = 0; this.actCombo.n現在のコンボ数[nPlayer] = 0;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
this.nCombo[actDan.NowShowingNumber] = 0; this.nCombo[actDan.NowShowingNumber] = 0;
this.actComboVoice.tReset(nPlayer); this.actComboVoice.tReset(nPlayer);
this.bIsMiss[nPlayer] = true; this.bIsMiss[nPlayer] = true;
@ -4453,7 +4453,7 @@ namespace TJAPlayer3
newTx.Opacity = oldTx.Opacity; newTx.Opacity = oldTx.Opacity;
newTx.fZ軸中心回転 = oldTx.fZ軸中心回転; newTx.fZ軸中心回転 = oldTx.fZ軸中心回転;
newTx.vc拡大縮小倍率 = oldTx.vc拡大縮小倍率; newTx.vcScaleRatio = oldTx.vcScaleRatio;
oldTx.UpdateTexture(newTx, newTx.sz画像サイズ.Width, newTx.sz画像サイズ.Height); oldTx.UpdateTexture(newTx, newTx.sz画像サイズ.Width, newTx.sz画像サイズ.Height);
} }
@ -4471,7 +4471,7 @@ namespace TJAPlayer3
originalTx.Opacity = oldTx.Opacity; originalTx.Opacity = oldTx.Opacity;
originalTx.fZ軸中心回転 = oldTx.fZ軸中心回転; originalTx.fZ軸中心回転 = oldTx.fZ軸中心回転;
originalTx.vc拡大縮小倍率 = oldTx.vc拡大縮小倍率; originalTx.vcScaleRatio = oldTx.vcScaleRatio;
oldTx.UpdateTexture(originalTx, originalTx.sz画像サイズ.Width, originalTx.sz画像サイズ.Height); oldTx.UpdateTexture(originalTx, originalTx.sz画像サイズ.Width, originalTx.sz画像サイズ.Height);
} }
@ -4907,7 +4907,7 @@ namespace TJAPlayer3
return false; return false;
} }
protected bool t進行描画_チップ_連打( E楽器パート ePlayMode, int nPlayer ) protected bool t進行描画_チップ_連打( EInstrumentPad ePlayMode, int nPlayer )
{ {
if ( ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED ) || ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) if ( ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED ) || ( base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED_FadeOut ) )
{ {
@ -4951,14 +4951,14 @@ namespace TJAPlayer3
if ( !pChip.bHit ) if ( !pChip.bHit )
{ {
bool bRollChip = NotesManager.IsGenericRoll(pChip);// pChip.nチャンネル番号 >= 0x15 && pChip.nチャンネル番号 <= 0x19; bool bRollChip = NotesManager.IsGenericRoll(pChip);// pChip.nチャンネル番号 >= 0x15 && pChip.nチャンネル番号 <= 0x19;
if( bRollChip && ( ( pChip.e楽器パート != E楽器パート.UNKNOWN ) ) ) if( bRollChip && ( ( pChip.e楽器パート != EInstrumentPad.UNKNOWN ) ) )
{ {
int instIndex = (int) pChip.e楽器パート; int instIndex = (int) pChip.e楽器パート;
if( pChip.nバーからの距離dot[instIndex] < -40 ) if( pChip.nバーからの距離dot[instIndex] < -40 )
{ {
if ( this.e指定時刻からChipのJUDGEを返す( n現在時刻ms, pChip, nPlayer ) == ENoteJudge.Miss ) if ( this.e指定時刻からChipのJUDGEを返す( n現在時刻ms, pChip, nPlayer ) == ENoteJudge.Miss )
{ {
this.tチップのヒット処理( n現在時刻ms, pChip, E楽器パート.TAIKO, false, 0, nPlayer ); this.tチップのヒット処理( n現在時刻ms, pChip, EInstrumentPad.TAIKO, false, 0, nPlayer );
} }
} }
} }
@ -5422,7 +5422,7 @@ namespace TJAPlayer3
nCurrentKusudamaCount = 0; nCurrentKusudamaCount = 0;
nCurrentKusudamaRollCount = 0; nCurrentKusudamaRollCount = 0;
this.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stage選曲.n確定された曲の難易度[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]); this.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]);
this.nHand = new int[]{ 0, 0, 0, 0, 0 }; this.nHand = new int[]{ 0, 0, 0, 0, 0 };
} }
@ -5748,7 +5748,7 @@ namespace TJAPlayer3
try try
{ {
if( !String.IsNullOrEmpty( bgfilename ) ) if( !String.IsNullOrEmpty( bgfilename ) )
this.tx背景 = TJAPlayer3.tテクスチャの生成( TJAPlayer3.stage選曲.r確定されたスコア.ファイル情報.フォルダの絶対パス + bgfilename ); this.tx背景 = TJAPlayer3.tテクスチャの生成( TJAPlayer3.stageSongSelect.r確定されたスコア.ファイル情報.フォルダの絶対パス + bgfilename );
else else
this.tx背景 = TJAPlayer3.tテクスチャの生成( CSkin.Path( DefaultBgFilename ) ); this.tx背景 = TJAPlayer3.tテクスチャの生成( CSkin.Path( DefaultBgFilename ) );
} }

16
OpenTaiko/src/Stages/07.Game/C演奏判定ライン座標共通.cs
View File

@ -127,12 +127,12 @@ namespace TJAPlayer3
/// <param name="bGRmode">GRmodeか否か</param> /// <param name="bGRmode">GRmodeか否か</param>
/// <param name="bReverse">Reverseか否か</param> /// <param name="bReverse">Reverseか否か</param>
/// <returns></returns> /// <returns></returns>
public int n判定ラインY座標( E楽器パート eInst, bool bGRmode, bool bReverse ) public int n判定ラインY座標( EInstrumentPad eInst, bool bGRmode, bool bReverse )
{ {
return n判定ラインY座標( eInst, bGRmode, bReverse, false ); return n判定ラインY座標( eInst, bGRmode, bReverse, false );
} }
public int n判定ラインY座標( E楽器パート eInst, bool bGRmode, bool bReverse, bool bWailingFrame ) public int n判定ラインY座標( EInstrumentPad eInst, bool bGRmode, bool bReverse, bool bWailingFrame )
{ {
return n判定ラインY座標( eInst, bGRmode, bReverse, bWailingFrame, false ); return n判定ラインY座標( eInst, bGRmode, bReverse, bWailingFrame, false );
} }
@ -146,13 +146,13 @@ namespace TJAPlayer3
/// <param name="bWailingFrame">Wailing枠の座標か、判定ラインの座標か</param> /// <param name="bWailingFrame">Wailing枠の座標か、判定ラインの座標か</param>
/// <param name="b補正あり">プレーヤーのライン表示位置補正情報を加えるかどうか</param> /// <param name="b補正あり">プレーヤーのライン表示位置補正情報を加えるかどうか</param>
/// <returns></returns> /// <returns></returns>
public int n判定ラインY座標( E楽器パート eInst, bool bGRmode, bool bReverse, bool bWailingFrame, bool b補正あり ) public int n判定ラインY座標( EInstrumentPad eInst, bool bGRmode, bool bReverse, bool bWailingFrame, bool b補正あり )
{ {
if ( eInst == E楽器パート.DRUMS ) if ( eInst == EInstrumentPad.DRUMS )
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
else if ( eInst == E楽器パート.UNKNOWN ) else if ( eInst == EInstrumentPad.UNKNOWN )
{ {
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
@ -177,13 +177,13 @@ namespace TJAPlayer3
} }
} }
public int n演奏RGBボタンY座標( E楽器パート eInst, bool bGRmode, bool bReverse ) public int n演奏RGBボタンY座標( EInstrumentPad eInst, bool bGRmode, bool bReverse )
{ {
if ( eInst == E楽器パート.DRUMS ) if ( eInst == EInstrumentPad.DRUMS )
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
else if ( eInst == E楽器パート.UNKNOWN ) else if ( eInst == EInstrumentPad.UNKNOWN )
{ {
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }

16
OpenTaiko/src/Stages/07.Game/Taiko/AIBattle.cs
View File

@ -56,12 +56,12 @@ namespace TJAPlayer3
TJAPlayer3.Tx.AIBattle_SectionTime_Panel?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Panel[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Panel[1]); TJAPlayer3.Tx.AIBattle_SectionTime_Panel?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Panel[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Panel[1]);
TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[1], TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[1],
new System.Drawing.RectangleF(0, 0, TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base.szテクスチャサイズ.Width, TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base.szテクスチャサイズ.Height)); new System.Drawing.RectangleF(0, 0, TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base.szTextureSize.Width, TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base.szTextureSize.Height));
void drawBar(CTexture barTex, float length) void drawBar(CTexture barTex, float length)
{ {
barTex?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[1], barTex?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[1],
new System.Drawing.RectangleF(0, 0, barTex.szテクスチャサイズ.Width * length, barTex.szテクスチャサイズ.Height)); new System.Drawing.RectangleF(0, 0, barTex.szTextureSize.Width * length, barTex.szTextureSize.Height));
} }
var nowSection = TJAPlayer3.stage演奏ドラム画面.NowAIBattleSection; var nowSection = TJAPlayer3.stage演奏ドラム画面.NowAIBattleSection;
@ -83,8 +83,8 @@ namespace TJAPlayer3
{ {
int upDown = (i % 2); int upDown = (i % 2);
int base_width = TJAPlayer3.Tx.AIBattle_Batch_Base.szテクスチャサイズ.Width / 6; int base_width = TJAPlayer3.Tx.AIBattle_Batch_Base.szTextureSize.Width / 6;
int base_height = TJAPlayer3.Tx.AIBattle_Batch_Base.szテクスチャサイズ.Height; int base_height = TJAPlayer3.Tx.AIBattle_Batch_Base.szTextureSize.Height;
int base_x = TJAPlayer3.Skin.Game_AIBattle_Batch_Base[0] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[0] * i); int base_x = TJAPlayer3.Skin.Game_AIBattle_Batch_Base[0] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[0] * i);
int base_y = TJAPlayer3.Skin.Game_AIBattle_Batch_Base[1] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[1] * upDown); int base_y = TJAPlayer3.Skin.Game_AIBattle_Batch_Base[1] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[1] * upDown);
@ -114,8 +114,8 @@ namespace TJAPlayer3
int upDown = (i % 2); int upDown = (i % 2);
int width = TJAPlayer3.Tx.AIBattle_Batch.szテクスチャサイズ.Width / 6; int width = TJAPlayer3.Tx.AIBattle_Batch.szTextureSize.Width / 6;
int height = TJAPlayer3.Tx.AIBattle_Batch.szテクスチャサイズ.Height / 2; int height = TJAPlayer3.Tx.AIBattle_Batch.szTextureSize.Height / 2;
float value = 0.0f; float value = 0.0f;
@ -161,8 +161,8 @@ namespace TJAPlayer3
float size_y = TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[1] + float size_y = TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[1] +
((TJAPlayer3.Skin.Game_AIBattle_Batch_Size[1] - TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[1]) * value); ((TJAPlayer3.Skin.Game_AIBattle_Batch_Size[1] - TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[1]) * value);
TJAPlayer3.Tx.AIBattle_Batch.vc拡大縮小倍率.X = (size_x / (float)width) + inScale; TJAPlayer3.Tx.AIBattle_Batch.vcScaleRatio.X = (size_x / (float)width) + inScale;
TJAPlayer3.Tx.AIBattle_Batch.vc拡大縮小倍率.Y = (size_y / (float)height) + inScale; TJAPlayer3.Tx.AIBattle_Batch.vcScaleRatio.Y = (size_y / (float)height) + inScale;
switch (section.End) switch (section.End)
{ {

6
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsDancer.cs
View File

@ -22,7 +22,7 @@ namespace TJAPlayer3
{ {
//this.ct踊り子モーション = new CCounter(); //this.ct踊り子モーション = new CCounter();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower || TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
return; return;
var preset = HScenePreset.GetBGPreset(); var preset = HScenePreset.GetBGPreset();
@ -116,7 +116,7 @@ namespace TJAPlayer3
public override void DeActivate() public override void DeActivate()
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower || TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
return; return;
//this.ct踊り子モーション = null; //this.ct踊り子モーション = null;
@ -148,7 +148,7 @@ namespace TJAPlayer3
this.IsFirstDraw = true; this.IsFirstDraw = true;
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
if (TJAPlayer3.ConfigIni.ShowDancer && (this.ar踊り子モーション番号.Length - 1) != 0) if (TJAPlayer3.ConfigIni.ShowDancer && (this.ar踊り子モーション番号.Length - 1) != 0)
{ {

2
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsFooter.cs
View File

@ -62,7 +62,7 @@ namespace TJAPlayer3
{ {
if (this.Mob_Footer != null) if (this.Mob_Footer != null)
{ {
this.Mob_Footer.t2D描画(0, TJAPlayer3.Skin.Resolution[1] - this.Mob_Footer.szテクスチャサイズ.Height); this.Mob_Footer.t2D描画(0, TJAPlayer3.Skin.Resolution[1] - this.Mob_Footer.szTextureSize.Height);
} }
return base.Draw(); return base.Draw();
} }

2
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMob.cs
View File

@ -63,7 +63,7 @@ namespace TJAPlayer3
{ {
if(!TJAPlayer3.stage演奏ドラム画面.bDoublePlay) if(!TJAPlayer3.stage演奏ドラム画面.bDoublePlay)
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) MobScript?.Update(); if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) MobScript?.Update();
MobScript?.Draw(); MobScript?.Draw();

40
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs
View File

@ -115,7 +115,7 @@ namespace TJAPlayer3
{ {
case 0: case 0:
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
tex = TJAPlayer3.Tx.Taiko_Background[2]; tex = TJAPlayer3.Tx.Taiko_Background[2];
} }
@ -259,10 +259,10 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Taiko_Don_Left.Opacity = getMTaikoOpacity(this.stパッド状態[2 + playerShift].n明るさ); TJAPlayer3.Tx.Taiko_Don_Left.Opacity = getMTaikoOpacity(this.stパッド状態[2 + playerShift].n明るさ);
TJAPlayer3.Tx.Taiko_Don_Right.Opacity = getMTaikoOpacity(this.stパッド状態[3 + playerShift].n明るさ); TJAPlayer3.Tx.Taiko_Don_Right.Opacity = getMTaikoOpacity(this.stパッド状態[3 + playerShift].n明るさ);
TJAPlayer3.Tx.Taiko_Ka_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Taiko_Ka_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height));
TJAPlayer3.Tx.Taiko_Ka_Right.t2D描画(taiko_x + TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, taiko_y, new Rectangle(TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Taiko_Ka_Right.t2D描画(taiko_x + TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, taiko_y, new Rectangle(TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height));
TJAPlayer3.Tx.Taiko_Don_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Taiko_Don_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height));
TJAPlayer3.Tx.Taiko_Don_Right.t2D描画(taiko_x + TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, taiko_y, new Rectangle(TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Taiko_Don_Right.t2D描画(taiko_x + TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, taiko_y, new Rectangle(TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height));
} }
} }
else if (_gt == EGameType.KONGA) else if (_gt == EGameType.KONGA)
@ -347,16 +347,16 @@ namespace TJAPlayer3
if ( this.After[ i ] - this.Before[ i ] >= 0 ) if ( this.After[ i ] - this.Before[ i ] >= 0 )
{ {
//レベルアップ //レベルアップ
TJAPlayer3.Tx.Taiko_LevelUp.vc拡大縮小倍率.X = fScale; TJAPlayer3.Tx.Taiko_LevelUp.vcScaleRatio.X = fScale;
TJAPlayer3.Tx.Taiko_LevelUp.vc拡大縮小倍率.Y = fScale; TJAPlayer3.Tx.Taiko_LevelUp.vcScaleRatio.Y = fScale;
TJAPlayer3.Tx.Taiko_LevelUp.Opacity = nAlpha; TJAPlayer3.Tx.Taiko_LevelUp.Opacity = nAlpha;
TJAPlayer3.Tx.Taiko_LevelUp.t2D拡大率考慮中央基準描画(levelChange_x, TJAPlayer3.Tx.Taiko_LevelUp.t2D拡大率考慮中央基準描画(levelChange_x,
levelChange_y); levelChange_y);
} }
else else
{ {
TJAPlayer3.Tx.Taiko_LevelDown.vc拡大縮小倍率.X = fScale; TJAPlayer3.Tx.Taiko_LevelDown.vcScaleRatio.X = fScale;
TJAPlayer3.Tx.Taiko_LevelDown.vc拡大縮小倍率.Y = fScale; TJAPlayer3.Tx.Taiko_LevelDown.vcScaleRatio.Y = fScale;
TJAPlayer3.Tx.Taiko_LevelDown.Opacity = nAlpha; TJAPlayer3.Tx.Taiko_LevelDown.Opacity = nAlpha;
TJAPlayer3.Tx.Taiko_LevelDown.t2D拡大率考慮中央基準描画(levelChange_x, TJAPlayer3.Tx.Taiko_LevelDown.t2D拡大率考慮中央基準描画(levelChange_x,
levelChange_y); levelChange_y);
@ -400,9 +400,9 @@ namespace TJAPlayer3
ModIcons.tDisplayMods(modIcons_x, modIcons_y, i); ModIcons.tDisplayMods(modIcons_x, modIcons_y, i);
if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null) if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] != null)
{ {
TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].t2D描画( TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画(
couse_symbol_x, couse_symbol_x,
couse_symbol_y couse_symbol_y
); );
@ -613,12 +613,12 @@ namespace TJAPlayer3
} }
if (TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null) if (TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] != null)
{ {
int originX = 0; int originX = 0;
int originY = 0; int originY = 0;
int width = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].szテクスチャサイズ.Width; int width = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Width;
int height = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].szテクスチャサイズ.Height; int height = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Height;
if (TJAPlayer3.ConfigIni.nPlayerCount == 5) if (TJAPlayer3.ConfigIni.nPlayerCount == 5)
{ {
@ -635,18 +635,18 @@ namespace TJAPlayer3
height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[3]; height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[3];
} }
TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].t2D描画( TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画(
couse_symbol_x, couse_symbol_x,
couse_symbol_y, couse_symbol_y,
new System.Drawing.RectangleF(originX, originY, width, height)); new System.Drawing.RectangleF(originX, originY, width, height));
} }
if (TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null && !TJAPlayer3.ConfigIni.SimpleMode) if (TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] != null && !TJAPlayer3.ConfigIni.SimpleMode)
{ {
int originX = 0; int originX = 0;
int originY = 0; int originY = 0;
int width = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].szテクスチャサイズ.Width; int width = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Width;
int height = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].szテクスチャサイズ.Height; int height = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Height;
if (TJAPlayer3.ConfigIni.nPlayerCount == 5) if (TJAPlayer3.ConfigIni.nPlayerCount == 5)
{ {
@ -663,8 +663,8 @@ namespace TJAPlayer3
height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[3]; height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[3];
} }
TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].Opacity = 255 - (int)((ctSymbolFlash[i].CurrentValue / 1000.0) * 255); TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].Opacity = 255 - (int)((ctSymbolFlash[i].CurrentValue / 1000.0) * 255);
TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stage選曲.n確定された曲の難易度[i]].t2D描画( TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画(
couse_symbol_x, couse_symbol_x,
couse_symbol_y, couse_symbol_y,
new System.Drawing.RectangleF(originX, originY, width, height)); new System.Drawing.RectangleF(originX, originY, width, height));

40
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs
View File

@ -149,7 +149,7 @@ namespace TJAPlayer3
break; break;
// Blinking animation during invincibility frames // Blinking animation during invincibility frames
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
if (CFloorManagement.isBlinking() == true) if (CFloorManagement.isBlinking() == true)
break; break;
@ -520,11 +520,11 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.bAIBattleMode) if (TJAPlayer3.ConfigIni.bAIBattleMode)
{ {
chara_x += TJAPlayer3.Skin.Game_AIBattle_CharaMove * TJAPlayer3.stage演奏ドラム画面.AIBattleState; chara_x += TJAPlayer3.Skin.Game_AIBattle_CharaMove * TJAPlayer3.stage演奏ドラム画面.AIBattleState;
chara_y -= nowChara.szテクスチャサイズ.Height * charaScale; // Center down chara_y -= nowChara.szTextureSize.Height * charaScale; // Center down
} }
nowChara.vc拡大縮小倍率.X = charaScale; nowChara.vcScaleRatio.X = charaScale;
nowChara.vc拡大縮小倍率.Y = charaScale; nowChara.vcScaleRatio.Y = charaScale;
if (flipX) if (flipX)
{ {
@ -535,8 +535,8 @@ namespace TJAPlayer3
nowChara.t2D描画(chara_x, chara_y); nowChara.t2D描画(chara_x, chara_y);
} }
nowChara.vc拡大縮小倍率.X = 1.0f; nowChara.vcScaleRatio.X = 1.0f;
nowChara.vc拡大縮小倍率.Y = 1.0f; nowChara.vcScaleRatio.Y = 1.0f;
} }
if ((this.b風船連打中[i] != true && CharaAction_Balloon_Delay[i].IsEnded) || TJAPlayer3.ConfigIni.nPlayerCount > 2) if ((this.b風船連打中[i] != true && CharaAction_Balloon_Delay[i].IsEnded) || TJAPlayer3.ConfigIni.nPlayerCount > 2)
@ -615,8 +615,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity;
TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(
TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x,
TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y);
@ -642,8 +642,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity;
TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(
TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x,
TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y);
@ -663,8 +663,8 @@ namespace TJAPlayer3
{ {
if (TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(
TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x,
TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y);
@ -687,8 +687,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity;
TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
if (i % 2 == 0) if (i % 2 == 0)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuOutX, kusu_chara_y - kusuOutY); TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuOutX, kusu_chara_y - kusuOutY);
@ -728,8 +728,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity;
TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
if (i % 2 == 0) if (i % 2 == 0)
@ -759,8 +759,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
if (i % 2 == 0) if (i % 2 == 0)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY); TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY);
@ -796,8 +796,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) if (TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.X = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale;
TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale;
if (i % 2 == 0) if (i % 2 == 0)
{ {
TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY); TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY);

48
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲージ.cs
View File

@ -162,11 +162,11 @@ namespace TJAPlayer3
*/ */
// No gauge if tower // No gauge if tower
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower || TJAPlayer3.ConfigIni.bTokkunMode) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || TJAPlayer3.ConfigIni.bTokkunMode)
return 0; return 0;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
#region [Regular gauges] #region [Regular gauges]
@ -225,7 +225,7 @@ namespace TJAPlayer3
#region [Gauge base] #region [Gauge base]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
if (TJAPlayer3.P1IsBlue()) if (TJAPlayer3.P1IsBlue())
{ {
@ -273,7 +273,7 @@ namespace TJAPlayer3
y = gauge_y[0]; y = gauge_y[0];
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
if (TJAPlayer3.P1IsBlue()) if (TJAPlayer3.P1IsBlue())
TJAPlayer3.Tx.Gauge_Dan[5]?.t2D描画(x, y, new Rectangle(0, 0, nRectX[0], TJAPlayer3.Skin.Game_Gauge_Rect[3])); TJAPlayer3.Tx.Gauge_Dan[5]?.t2D描画(x, y, new Rectangle(0, 0, nRectX[0], TJAPlayer3.Skin.Game_Gauge_Rect[3]));
@ -311,37 +311,37 @@ namespace TJAPlayer3
this.ct虹透明度.TickLoop(); this.ct虹透明度.TickLoop();
if (TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue] != null) if (TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue] != null)
{ {
TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vcScaleRatio.X = scale;
TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vcScaleRatio.Y = scale;
TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].vcScaleRatio.X = scale;
TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].vcScaleRatio.Y = scale;
bool smart = TJAPlayer3.ConfigIni.nPlayerCount > 2 || TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan; bool smart = TJAPlayer3.ConfigIni.nPlayerCount > 2 || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan;
TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].Opacity = 255; TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].Opacity = 255;
TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].t2D描画(x, y + (smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0), TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].t2D描画(x, y + (smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0),
new RectangleF(0, new RectangleF(0,
smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0, smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0,
TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szテクスチャサイズ.Width, TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Width,
smart ? TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szテクスチャサイズ.Height - (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szテクスチャサイズ.Height)); smart ? TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Height - (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Height));
TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].Opacity = (ct虹透明度.CurrentValue * 255 / (int)ct虹透明度.EndValue) / 1; TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].Opacity = (ct虹透明度.CurrentValue * 255 / (int)ct虹透明度.EndValue) / 1;
TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].t2D描画(x, y + (smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0), TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].t2D描画(x, y + (smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0),
new RectangleF(0, new RectangleF(0,
smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0, smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0,
TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szテクスチャサイズ.Width, TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Width,
smart ? TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szテクスチャサイズ.Height - (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szテクスチャサイズ.Height)); smart ? TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Height - (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Height));
} }
} }
#endregion #endregion
TJAPlayer3.Tx.Gauge_Line[0].vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Gauge_Line[0].vcScaleRatio.X = scale;
TJAPlayer3.Tx.Gauge_Line[0].vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Gauge_Line[0].vcScaleRatio.Y = scale;
TJAPlayer3.Tx.Gauge_Line[0].t2D描画(x, y); TJAPlayer3.Tx.Gauge_Line[0].t2D描画(x, y);
} }
@ -354,8 +354,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Gauge_Soul_Fire != null) if (TJAPlayer3.Tx.Gauge_Soul_Fire != null)
{ {
//仮置き //仮置き
int soulfire_width = TJAPlayer3.Tx.Gauge_Soul_Fire.szテクスチャサイズ.Width / 8; int soulfire_width = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Width / 8;
int soulfire_height = TJAPlayer3.Tx.Gauge_Soul_Fire.szテクスチャサイズ.Height; int soulfire_height = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Height;
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break;
@ -390,8 +390,8 @@ namespace TJAPlayer3
{ {
this.ct炎.TickLoop(); this.ct炎.TickLoop();
TJAPlayer3.Tx.Gauge_Soul_Fire.vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Gauge_Soul_Fire.vcScaleRatio.X = scale;
TJAPlayer3.Tx.Gauge_Soul_Fire.vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Gauge_Soul_Fire.vcScaleRatio.Y = scale;
TJAPlayer3.Tx.Gauge_Soul_Fire.t2D描画(x, y, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height)); TJAPlayer3.Tx.Gauge_Soul_Fire.t2D描画(x, y, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height));
} }
@ -400,7 +400,7 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Gauge_Soul != null) if (TJAPlayer3.Tx.Gauge_Soul != null)
{ {
//仮置き //仮置き
int soul_height = TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Height / 2; int soul_height = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Height / 2;
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break;
@ -431,16 +431,16 @@ namespace TJAPlayer3
} }
} }
TJAPlayer3.Tx.Gauge_Soul.vc拡大縮小倍率.X = scale; TJAPlayer3.Tx.Gauge_Soul.vcScaleRatio.X = scale;
TJAPlayer3.Tx.Gauge_Soul.vc拡大縮小倍率.Y = scale; TJAPlayer3.Tx.Gauge_Soul.vcScaleRatio.Y = scale;
if (this.db現在のゲージ値[i] >= 80.0) if (this.db現在のゲージ値[i] >= 80.0)
{ {
TJAPlayer3.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, 0, TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Width, soul_height)); TJAPlayer3.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, 0, TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width, soul_height));
} }
else else
{ {
TJAPlayer3.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, soul_height, TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Width, soul_height)); TJAPlayer3.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, soul_height, TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width, soul_height));
} }
} }
} }

10
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs
View File

@ -265,7 +265,7 @@ namespace TJAPlayer3
}; };
//★10の場合超激辛モードになる。 //★10の場合超激辛モードになる。
if( TJAPlayer3.DTX.LEVELtaiko[ TJAPlayer3.stage選曲.n確定された曲の難易度[0]] >= 10 ) if( TJAPlayer3.DTX.LEVELtaiko[ TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]] >= 10 )
{ {
#region[ 超激辛 ] #region[ 超激辛 ]
this.st叩ききりまショー.b超激辛 = true; this.st叩ききりまショー.b超激辛 = true;
@ -499,7 +499,7 @@ namespace TJAPlayer3
string str表示する残り時間 = ( this.st叩ききりまショー.ct残り時間.CurrentValue < 1000 ) ? "25" : ( ( 26000 - this.st叩ききりまショー.ct残り時間.CurrentValue ) / 1000 ).ToString(); string str表示する残り時間 = ( this.st叩ききりまショー.ct残り時間.CurrentValue < 1000 ) ? "25" : ( ( 26000 - this.st叩ききりまショー.ct残り時間.CurrentValue ) / 1000 ).ToString();
if (TJAPlayer3.Tx.GameMode_Timer_Frame != null) if (TJAPlayer3.Tx.GameMode_Timer_Frame != null)
this.t小文字表示( 230 + (str表示する残り時間.Length * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0] / 4 ), 84 + TJAPlayer3.Tx.GameMode_Timer_Frame.szテクスチャサイズ.Height / 2 , string.Format("{0,2:#0}", str表示する残り時間 )); this.t小文字表示( 230 + (str表示する残り時間.Length * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0] / 4 ), 84 + TJAPlayer3.Tx.GameMode_Timer_Frame.szTextureSize.Height / 2 , string.Format("{0,2:#0}", str表示する残り時間 ));
} }
if( !this.st叩ききりまショー.ct加算審査中.IsStoped ) if( !this.st叩ききりまショー.ct加算審査中.IsStoped )
@ -870,8 +870,8 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 128; TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 128;
if (this.st叩ききりまショー.b加算アニメ中) if (this.st叩ききりまショー.b加算アニメ中)
TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 0; TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 0;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1f;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = 1f;
TJAPlayer3.Tx.Taiko_Combo[0].t2D中心基準描画( x, y, rectangle ); TJAPlayer3.Tx.Taiko_Combo[0].t2D中心基準描画( x, y, rectangle );
} }
break; break;
@ -892,7 +892,7 @@ namespace TJAPlayer3
Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_Score_Size[0] * i, 0, TJAPlayer3.Skin.Game_Score_Size[0], TJAPlayer3.Skin.Game_Score_Size[1]); Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_Score_Size[0] * i, 0, TJAPlayer3.Skin.Game_Score_Size[0], TJAPlayer3.Skin.Game_Score_Size[1]);
if (TJAPlayer3.Tx.Taiko_Score[0] != null ) if (TJAPlayer3.Tx.Taiko_Score[0] != null )
{ {
TJAPlayer3.Tx.Taiko_Score[0].vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.Taiko_Score[0].vcScaleRatio.Y = 1f;
TJAPlayer3.Tx.Taiko_Score[0].t2D描画( x, y, rectangle ); TJAPlayer3.Tx.Taiko_Score[0].t2D描画( x, y, rectangle );
} }
} }

6
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsコンボ吹き出し.cs
View File

@ -126,8 +126,8 @@ namespace TJAPlayer3
if( this.ct進行[ i ].IsTicked ) if( this.ct進行[ i ].IsTicked )
{ {
int plate_width = TJAPlayer3.Tx.Balloon_Combo[j].szテクスチャサイズ.Width / 3; int plate_width = TJAPlayer3.Tx.Balloon_Combo[j].szTextureSize.Width / 3;
int plate_height = TJAPlayer3.Tx.Balloon_Combo[j].szテクスチャサイズ.Height; int plate_height = TJAPlayer3.Tx.Balloon_Combo[j].szTextureSize.Height;
TJAPlayer3.Tx.Balloon_Combo[ j ].t2D描画( TJAPlayer3.Skin.Game_Balloon_Combo_X[ i ], TJAPlayer3.Skin.Game_Balloon_Combo_Y[ i ], new RectangleF(NowDrawBalloon * plate_width, 0, plate_width, plate_height) ); TJAPlayer3.Tx.Balloon_Combo[ j ].t2D描画( TJAPlayer3.Skin.Game_Balloon_Combo_X[ i ], TJAPlayer3.Skin.Game_Balloon_Combo_Y[ i ], new RectangleF(NowDrawBalloon * plate_width, 0, plate_width, plate_height) );
if( this.nCombo_渡[ i ] < 1000 ) //2016.08.23 kairera0467 仮実装。 if( this.nCombo_渡[ i ] < 1000 ) //2016.08.23 kairera0467 仮実装。
{ {
@ -138,7 +138,7 @@ namespace TJAPlayer3
else else
{ {
this.t小文字表示( TJAPlayer3.Skin.Game_Balloon_Combo_Number_Ex_X[ i], TJAPlayer3.Skin.Game_Balloon_Combo_Number_Ex_Y[ i ], this.nCombo_渡[ i ], j ); this.t小文字表示( TJAPlayer3.Skin.Game_Balloon_Combo_Number_Ex_X[ i], TJAPlayer3.Skin.Game_Balloon_Combo_Number_Ex_Y[ i ], this.nCombo_渡[ i ], j );
TJAPlayer3.Tx.Balloon_Number_Combo.vc拡大縮小倍率.X = 1.0f; TJAPlayer3.Tx.Balloon_Number_Combo.vcScaleRatio.X = 1.0f;
TJAPlayer3.Tx.Balloon_Number_Combo.t2D描画( TJAPlayer3.Skin.Game_Balloon_Combo_Text_Ex_X[ i] + 6 - NowDrawBalloon * 3, TJAPlayer3.Skin.Game_Balloon_Combo_Text_Ex_Y[ i ], TJAPlayer3.Tx.Balloon_Number_Combo.t2D描画( TJAPlayer3.Skin.Game_Balloon_Combo_Text_Ex_X[ i] + 6 - NowDrawBalloon * 3, TJAPlayer3.Skin.Game_Balloon_Combo_Text_Ex_Y[ i ],
new Rectangle(TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[0], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[1], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[2], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[3])); new Rectangle(TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[0], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[1], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[2], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[3]));
} }

24
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsスコアランク.cs
View File

@ -82,16 +82,16 @@ namespace TJAPlayer3
tex.Opacity = 255; tex.Opacity = 255;
float newSize = 1.0f + (float)Math.Sin((cct.CurrentValue - 255) * (Math.PI / 180)) * 0.2f; float newSize = 1.0f + (float)Math.Sin((cct.CurrentValue - 255) * (Math.PI / 180)) * 0.2f;
tex.vc拡大縮小倍率.X = newSize; tex.vcScaleRatio.X = newSize;
tex.vc拡大縮小倍率.Y = newSize; tex.vcScaleRatio.Y = newSize;
x = 0; x = 0;
y = 0; y = 0;
} }
if (cct.CurrentValue > 255 + 180 && cct.CurrentValue <= 2745) if (cct.CurrentValue > 255 + 180 && cct.CurrentValue <= 2745)
{ {
tex.Opacity = 255; tex.Opacity = 255;
tex.vc拡大縮小倍率.X = 1.0f; tex.vcScaleRatio.X = 1.0f;
tex.vc拡大縮小倍率.Y = 1.0f; tex.vcScaleRatio.Y = 1.0f;
x = 0; x = 0;
y = 0; y = 0;
} }
@ -128,12 +128,12 @@ namespace TJAPlayer3
switch (mode) switch (mode)
{ {
case 1: case 1:
width = tex.szテクスチャサイズ.Width / 7; width = tex.szTextureSize.Width / 7;
height = tex.szテクスチャサイズ.Height; height = tex.szTextureSize.Height;
break; break;
default: default:
width = tex.szテクスチャサイズ.Width; width = tex.szTextureSize.Width;
height = tex.szテクスチャサイズ.Height / 7; height = tex.szTextureSize.Height / 7;
break; break;
} }
@ -145,14 +145,14 @@ namespace TJAPlayer3
public override int Draw() public override int Draw()
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
float x = 0; float x = 0;
float y = 0; float y = 0;
for (int i = 0; i < 7; i++) for (int i = 0; i < 7; i++)
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
{ {
for (int player = 0; player < 5; player++) for (int player = 0; player < 5; player++)
@ -206,11 +206,11 @@ namespace TJAPlayer3
} }
#endregion #endregion
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
#region [Tower score ranks] #region [Tower score ranks]
double progress = CFloorManagement.LastRegisteredFloor / ((double)TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor); double progress = CFloorManagement.LastRegisteredFloor / ((double)TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor);
bool[] conditions = bool[] conditions =
{ {

16
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs
View File

@ -238,10 +238,10 @@ namespace TJAPlayer3
{ {
if( !base.IsDeActivated ) if( !base.IsDeActivated )
{ {
int nWidth = (TJAPlayer3.Tx.Effects_Hit_Explosion.szテクスチャサイズ.Width / 7); int nWidth = (TJAPlayer3.Tx.Effects_Hit_Explosion.szTextureSize.Width / 7);
int nHeight = (TJAPlayer3.Tx.Effects_Hit_Explosion.szテクスチャサイズ.Height / 4); int nHeight = (TJAPlayer3.Tx.Effects_Hit_Explosion.szTextureSize.Height / 4);
int nBombWidth = (TJAPlayer3.Tx.Effects_Hit_Bomb.szテクスチャサイズ.Width / 7); int nBombWidth = (TJAPlayer3.Tx.Effects_Hit_Bomb.szTextureSize.Width / 7);
int nBombHeight = (TJAPlayer3.Tx.Effects_Hit_Bomb.szテクスチャサイズ.Height / 4); int nBombHeight = (TJAPlayer3.Tx.Effects_Hit_Bomb.szTextureSize.Height / 4);
for ( int i = 0; i < 3 * 4; i++ ) for ( int i = 0; i < 3 * 4; i++ )
{ {
if( this.st状態[ i ].b使用中 ) if( this.st状態[ i ].b使用中 )
@ -367,11 +367,11 @@ namespace TJAPlayer3
x += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(this.st状態[i].nPlayer); x += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(this.st状態[i].nPlayer);
y += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(this.st状態[i].nPlayer); y += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(this.st状態[i].nPlayer);
x -= (TJAPlayer3.Tx.Effects_Hit_Explosion_Big.szテクスチャサイズ.Width * (f倍率 - 1.0f) / 2.0f); x -= (TJAPlayer3.Tx.Effects_Hit_Explosion_Big.szTextureSize.Width * (f倍率 - 1.0f) / 2.0f);
y -= (TJAPlayer3.Tx.Effects_Hit_Explosion_Big.szテクスチャサイズ.Height * (f倍率 - 1.0f) / 2.0f); y -= (TJAPlayer3.Tx.Effects_Hit_Explosion_Big.szTextureSize.Height * (f倍率 - 1.0f) / 2.0f);
TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vc拡大縮小倍率.X = f倍率; TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vcScaleRatio.X = f倍率;
TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vc拡大縮小倍率.Y = f倍率; TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vcScaleRatio.Y = f倍率;
TJAPlayer3.Tx.Effects_Hit_Explosion_Big.t2D描画(x, y); TJAPlayer3.Tx.Effects_Hit_Explosion_Big.t2D描画(x, y);
} }
break; break;

22
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsレーン太鼓.cs
View File

@ -281,27 +281,27 @@ namespace TJAPlayer3
if (this.ctゴーゴー.CurrentValue <= 4) if (this.ctゴーゴー.CurrentValue <= 4)
{ {
TJAPlayer3.Tx.Lane_Background_GoGo.vc拡大縮小倍率.Y = 0.2f; TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.2f;
TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 54); TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 54);
} }
else if (this.ctゴーゴー.CurrentValue <= 5) else if (this.ctゴーゴー.CurrentValue <= 5)
{ {
TJAPlayer3.Tx.Lane_Background_GoGo.vc拡大縮小倍率.Y = 0.4f; TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.4f;
TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 40); TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 40);
} }
else if (this.ctゴーゴー.CurrentValue <= 6) else if (this.ctゴーゴー.CurrentValue <= 6)
{ {
TJAPlayer3.Tx.Lane_Background_GoGo.vc拡大縮小倍率.Y = 0.6f; TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.6f;
TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 26); TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 26);
} }
else if (this.ctゴーゴー.CurrentValue <= 8) else if (this.ctゴーゴー.CurrentValue <= 8)
{ {
TJAPlayer3.Tx.Lane_Background_GoGo.vc拡大縮小倍率.Y = 0.8f; TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.8f;
TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 13); TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 13);
} }
else if (this.ctゴーゴー.CurrentValue >= 9) else if (this.ctゴーゴー.CurrentValue >= 9)
{ {
TJAPlayer3.Tx.Lane_Background_GoGo.vc拡大縮小倍率.Y = 1.0f; TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 1.0f;
TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i]); TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i]);
} }
} }
@ -666,7 +666,7 @@ namespace TJAPlayer3
{ {
tex = TJAPlayer3.Tx.Taiko_Frame[5]; tex = TJAPlayer3.Tx.Taiko_Frame[5];
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
tex = TJAPlayer3.Tx.Taiko_Frame[2]; tex = TJAPlayer3.Tx.Taiko_Frame[2];
} }
@ -818,8 +818,8 @@ namespace TJAPlayer3
//this.ctゴーゴー.n現在の値 = 6; //this.ctゴーゴー.n現在の値 = 6;
int width = TJAPlayer3.Tx.Effects_Fire.szテクスチャサイズ.Width / 7; int width = TJAPlayer3.Tx.Effects_Fire.szTextureSize.Width / 7;
int height = TJAPlayer3.Tx.Effects_Fire.szテクスチャサイズ.Height; int height = TJAPlayer3.Tx.Effects_Fire.szTextureSize.Height;
float x = -(width * (f倍率 - 1.0f) / 2.0f); float x = -(width * (f倍率 - 1.0f) / 2.0f);
float y = -(height * (f倍率 - 1.0f) / 2.0f); float y = -(height * (f倍率 - 1.0f) / 2.0f);
@ -840,8 +840,8 @@ namespace TJAPlayer3
y += TJAPlayer3.Skin.Game_Effect_Fire_Y[i]; y += TJAPlayer3.Skin.Game_Effect_Fire_Y[i];
} }
TJAPlayer3.Tx.Effects_Fire.vc拡大縮小倍率.X = f倍率; TJAPlayer3.Tx.Effects_Fire.vcScaleRatio.X = f倍率;
TJAPlayer3.Tx.Effects_Fire.vc拡大縮小倍率.Y = f倍率; TJAPlayer3.Tx.Effects_Fire.vcScaleRatio.Y = f倍率;
TJAPlayer3.Tx.Effects_Fire.t2D描画(x, y, TJAPlayer3.Tx.Effects_Fire.t2D描画(x, y,
new Rectangle(width * (this.ctゴーゴー炎.CurrentValue), 0, width, height)); new Rectangle(width * (this.ctゴーゴー炎.CurrentValue), 0, width, height));
@ -953,7 +953,7 @@ namespace TJAPlayer3
public void GOGOSTART() public void GOGOSTART()
{ {
this.ctゴーゴー = new CCounter(0, 17, 18, TJAPlayer3.Timer); this.ctゴーゴー = new CCounter(0, 17, 18, TJAPlayer3.Timer);
if(TJAPlayer3.ConfigIni.nPlayerCount == 1 && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) TJAPlayer3.stage演奏ドラム画面.GoGoSplash.StartSplash(); if(TJAPlayer3.ConfigIni.nPlayerCount == 1 && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) TJAPlayer3.stage演奏ドラム画面.GoGoSplash.StartSplash();
} }

4
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums判定文字列.cs
View File

@ -109,8 +109,8 @@ namespace TJAPlayer3
return; return;
} }
int height = TJAPlayer3.Tx.Judge.szテクスチャサイズ.Height / 5; int height = TJAPlayer3.Tx.Judge.szTextureSize.Height / 5;
judgeAnime.rc = new Rectangle(0, (int)njudge * height, TJAPlayer3.Tx.Judge.szテクスチャサイズ.Width, height); judgeAnime.rc = new Rectangle(0, (int)njudge * height, TJAPlayer3.Tx.Judge.szTextureSize.Width, height);
JudgeAnimes[player].Add(judgeAnime); JudgeAnimes[player].Add(judgeAnime);
} }

20
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums演奏終了演出.cs
View File

@ -40,7 +40,7 @@ namespace TJAPlayer3
*/ */
// モードの決定。クリア失敗・フルコンボも事前に作っとく。 // モードの決定。クリア失敗・フルコンボも事前に作っとく。
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
if (CFloorManagement.CurrentNumberOfLives > 0) if (CFloorManagement.CurrentNumberOfLives > 0)
{ {
@ -57,7 +57,7 @@ namespace TJAPlayer3
else else
this.Mode[0] = EndMode.Tower_Dropout; this.Mode[0] = EndMode.Tower_Dropout;
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
// 段位認定モード。 // 段位認定モード。
if (!TJAPlayer3.stage演奏ドラム画面.actDan.GetFailedAllChallenges()) if (!TJAPlayer3.stage演奏ドラム画面.actDan.GetFailedAllChallenges())
@ -147,7 +147,7 @@ namespace TJAPlayer3
var origindir = CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.END}"); var origindir = CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.END}");
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
Tower_DropoutScript = new EndAnimeScript($@"{origindir}Tower_Dropout{Path.DirectorySeparatorChar}Script.lua"); Tower_DropoutScript = new EndAnimeScript($@"{origindir}Tower_Dropout{Path.DirectorySeparatorChar}Script.lua");
Tower_DropoutScript.Init(); Tower_DropoutScript.Init();
@ -166,7 +166,7 @@ namespace TJAPlayer3
this.soundTowerTopFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_FullCombo.ogg"), ESoundGroup.SoundEffect); this.soundTowerTopFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_FullCombo.ogg"), ESoundGroup.SoundEffect);
this.soundTowerTopPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Perfect.ogg"), ESoundGroup.SoundEffect); this.soundTowerTopPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Perfect.ogg"), ESoundGroup.SoundEffect);
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
Dan_FailScript = new EndAnimeScript($@"{origindir}Dan_Fail{Path.DirectorySeparatorChar}Script.lua"); Dan_FailScript = new EndAnimeScript($@"{origindir}Dan_Fail{Path.DirectorySeparatorChar}Script.lua");
Dan_FailScript.Init(); Dan_FailScript.Init();
@ -240,14 +240,14 @@ namespace TJAPlayer3
{ {
this.ct進行メイン = null; this.ct進行メイン = null;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
Tower_DropoutScript.Dispose(); Tower_DropoutScript.Dispose();
Tower_TopReached_PassScript.Dispose(); Tower_TopReached_PassScript.Dispose();
Tower_TopReached_FullComboScript.Dispose(); Tower_TopReached_FullComboScript.Dispose();
Tower_TopReached_PerfectScript.Dispose(); Tower_TopReached_PerfectScript.Dispose();
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
Dan_FailScript.Dispose(); Dan_FailScript.Dispose();
Dan_Red_PassScript.Dispose(); Dan_Red_PassScript.Dispose();
@ -906,15 +906,15 @@ namespace TJAPlayer3
if (count <= 11) if (count <= 11)
{ {
TJAPlayer3.Tx.End_Star.vc拡大縮小倍率.X = count * 0.09f; TJAPlayer3.Tx.End_Star.vcScaleRatio.X = count * 0.09f;
TJAPlayer3.Tx.End_Star.vc拡大縮小倍率.Y = count * 0.09f; TJAPlayer3.Tx.End_Star.vcScaleRatio.Y = count * 0.09f;
TJAPlayer3.Tx.End_Star.Opacity = 255; TJAPlayer3.Tx.End_Star.Opacity = 255;
TJAPlayer3.Tx.End_Star.t2D拡大率考慮中央基準描画(x, y); TJAPlayer3.Tx.End_Star.t2D拡大率考慮中央基準描画(x, y);
} }
else if (count <= 20) else if (count <= 20)
{ {
TJAPlayer3.Tx.End_Star.vc拡大縮小倍率.X = 1.0f; TJAPlayer3.Tx.End_Star.vcScaleRatio.X = 1.0f;
TJAPlayer3.Tx.End_Star.vc拡大縮小倍率.Y = 1.0f; TJAPlayer3.Tx.End_Star.vcScaleRatio.Y = 1.0f;
TJAPlayer3.Tx.End_Star.Opacity = (int)(255 - (255.0f / 9.0f) * (count - 11)); TJAPlayer3.Tx.End_Star.Opacity = (int)(255 - (255.0f / 9.0f) * (count - 11));
TJAPlayer3.Tx.End_Star.t2D拡大率考慮中央基準描画(x, y); TJAPlayer3.Tx.End_Star.t2D拡大率考慮中央基準描画(x, y);
} }

46
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums特訓モード.cs
View File

@ -66,7 +66,7 @@ namespace TJAPlayer3
var current = ((double)(pChip.db発声時刻ms * TJAPlayer3.ConfigIni.SongPlaybackSpeed)); var current = ((double)(pChip.db発声時刻ms * TJAPlayer3.ConfigIni.SongPlaybackSpeed));
var width = 0; var width = 0;
if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szテクスチャサイズ.Width; if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Width;
this.gogoXList.Add((int)(width * (current / length))); this.gogoXList.Add((int)(width * (current / length)));
} }
@ -78,7 +78,7 @@ namespace TJAPlayer3
this.n小節の総数 = measureCount; this.n小節の総数 = measureCount;
if (TJAPlayer3.Tx.Tokkun_Background_Up != null) this.ct背景スクロールタイマー = new CCounter(1, TJAPlayer3.Tx.Tokkun_Background_Up.szテクスチャサイズ.Width, 16, TJAPlayer3.Timer); if (TJAPlayer3.Tx.Tokkun_Background_Up != null) this.ct背景スクロールタイマー = new CCounter(1, TJAPlayer3.Tx.Tokkun_Background_Up.szTextureSize.Width, 16, TJAPlayer3.Timer);
} }
public override void DeActivate() public override void DeActivate()
@ -113,7 +113,7 @@ namespace TJAPlayer3
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "TRAINING MODE (BETA)"); TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "TRAINING MODE (BETA)");
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Space)|| TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed2P)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Space)|| TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -126,7 +126,7 @@ namespace TJAPlayer3
this.t演奏を停止する(); this.t演奏を停止する();
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -154,7 +154,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.PageDown)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.PageDown))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -168,7 +168,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.sound特訓スクロール音.tPlay(); TJAPlayer3.Skin.sound特訓スクロール音.tPlay();
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -197,7 +197,7 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.PageUp)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.PageUp))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -211,7 +211,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.sound特訓スクロール音.tPlay(); TJAPlayer3.Skin.sound特訓スクロール音.tPlay();
} }
} }
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue2P)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -222,7 +222,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue2P)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -233,7 +233,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Home)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Home))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -247,7 +247,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.End)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.End))
{ {
if (this.b特訓PAUSE) if (this.b特訓PAUSE)
{ {
@ -261,7 +261,7 @@ namespace TJAPlayer3
} }
} }
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.A)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.A))
this.t現在の位置にジャンプポイントを設定する(); this.t現在の位置にジャンプポイントを設定する();
if (this.bスクロール中) if (this.bスクロール中)
@ -297,13 +297,13 @@ namespace TJAPlayer3
var currentWhite = (double)(this.n最終演奏位置ms); var currentWhite = (double)(this.n最終演奏位置ms);
var percentageWhite = currentWhite / length; var percentageWhite = currentWhite / length;
if (TJAPlayer3.Tx.Tokkun_ProgressBarWhite != null) TJAPlayer3.Tx.Tokkun_ProgressBarWhite.t2D描画(TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0], TJAPlayer3.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(TJAPlayer3.Tx.Tokkun_ProgressBarWhite.szテクスチャサイズ.Width * percentageWhite), TJAPlayer3.Tx.Tokkun_ProgressBarWhite.szテクスチャサイズ.Height)); if (TJAPlayer3.Tx.Tokkun_ProgressBarWhite != null) TJAPlayer3.Tx.Tokkun_ProgressBarWhite.t2D描画(TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0], TJAPlayer3.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(TJAPlayer3.Tx.Tokkun_ProgressBarWhite.szTextureSize.Width * percentageWhite), TJAPlayer3.Tx.Tokkun_ProgressBarWhite.szTextureSize.Height));
if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) TJAPlayer3.Tx.Tokkun_ProgressBar.t2D描画(TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0], TJAPlayer3.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(TJAPlayer3.Tx.Tokkun_ProgressBar.szテクスチャサイズ.Width * percentage), TJAPlayer3.Tx.Tokkun_ProgressBar.szテクスチャサイズ.Height)); if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) TJAPlayer3.Tx.Tokkun_ProgressBar.t2D描画(TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0], TJAPlayer3.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Width * percentage), TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Height));
if (TJAPlayer3.Tx.Tokkun_GoGoPoint != null) if (TJAPlayer3.Tx.Tokkun_GoGoPoint != null)
{ {
foreach (int xpos in gogoXList) foreach (int xpos in gogoXList)
{ {
TJAPlayer3.Tx.Tokkun_GoGoPoint.t2D描画(xpos + TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0] - (TJAPlayer3.Tx.Tokkun_GoGoPoint.szテクスチャサイズ.Width / 2), TJAPlayer3.Skin.Game_Training_GoGoPoint_Y); TJAPlayer3.Tx.Tokkun_GoGoPoint.t2D描画(xpos + TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0] - (TJAPlayer3.Tx.Tokkun_GoGoPoint.szTextureSize.Width / 2), TJAPlayer3.Skin.Game_Training_GoGoPoint_Y);
} }
} }
@ -312,10 +312,10 @@ namespace TJAPlayer3
foreach (STJUMPP xpos in JumpPointList) foreach (STJUMPP xpos in JumpPointList)
{ {
var width = 0; var width = 0;
if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szテクスチャサイズ.Width; if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Width;
int x = (int)((double)width * ((double)xpos.Time / (double)length)); int x = (int)((double)width * ((double)xpos.Time / (double)length));
TJAPlayer3.Tx.Tokkun_JumpPoint.t2D描画(x + TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0] - (TJAPlayer3.Tx.Tokkun_JumpPoint.szテクスチャサイズ.Width / 2), TJAPlayer3.Skin.Game_Training_JumpPoint_Y); TJAPlayer3.Tx.Tokkun_JumpPoint.t2D描画(x + TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0] - (TJAPlayer3.Tx.Tokkun_JumpPoint.szTextureSize.Width / 2), TJAPlayer3.Skin.Game_Training_JumpPoint_Y);
} }
} }
@ -328,13 +328,13 @@ namespace TJAPlayer3
{ {
this.ct背景スクロールタイマー.TickLoop(); this.ct背景スクロールタイマー.TickLoop();
double TexSize = TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tokkun_Background_Up.szテクスチャサイズ.Width; double TexSize = TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tokkun_Background_Up.szTextureSize.Width;
// 1280をテクスチャサイズで割ったものを切り上げて、プラス+1足す。 // 1280をテクスチャサイズで割ったものを切り上げて、プラス+1足す。
int ForLoop = (int)Math.Ceiling(TexSize) + 1; int ForLoop = (int)Math.Ceiling(TexSize) + 1;
TJAPlayer3.Tx.Tokkun_Background_Up.t2D描画(0 - this.ct背景スクロールタイマー.CurrentValue, TJAPlayer3.Skin.Background_Scroll_Y[0]); TJAPlayer3.Tx.Tokkun_Background_Up.t2D描画(0 - this.ct背景スクロールタイマー.CurrentValue, TJAPlayer3.Skin.Background_Scroll_Y[0]);
for (int l = 1; l < ForLoop + 1; l++) for (int l = 1; l < ForLoop + 1; l++)
{ {
TJAPlayer3.Tx.Tokkun_Background_Up.t2D描画(+(l * TJAPlayer3.Tx.Tokkun_Background_Up.szテクスチャサイズ.Width) - this.ct背景スクロールタイマー.CurrentValue, TJAPlayer3.Skin.Background_Scroll_Y[0]); TJAPlayer3.Tx.Tokkun_Background_Up.t2D描画(+(l * TJAPlayer3.Tx.Tokkun_Background_Up.szTextureSize.Width) - this.ct背景スクロールタイマー.CurrentValue, TJAPlayer3.Skin.Background_Scroll_Y[0]);
} }
} }
@ -356,7 +356,7 @@ namespace TJAPlayer3
foreach (char c in maxMeasureStr) foreach (char c in maxMeasureStr)
{ {
var currentNum = int.Parse(c.ToString()); var currentNum = int.Parse(c.ToString());
TJAPlayer3.Tx.Tokkun_SmallNumber.t2D描画(x, TJAPlayer3.Skin.Game_Training_MaxMeasureCount_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_SmallNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_SmallNumber_Width, TJAPlayer3.Tx.Tokkun_SmallNumber.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Tokkun_SmallNumber.t2D描画(x, TJAPlayer3.Skin.Game_Training_MaxMeasureCount_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_SmallNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_SmallNumber_Width, TJAPlayer3.Tx.Tokkun_SmallNumber.szTextureSize.Height));
x += TJAPlayer3.Skin.Game_Training_SmallNumber_Width - 2; x += TJAPlayer3.Skin.Game_Training_SmallNumber_Width - 2;
} }
} }
@ -369,7 +369,7 @@ namespace TJAPlayer3
foreach (char c in measureStr) foreach (char c in measureStr)
{ {
var currentNum = int.Parse(c.ToString()); var currentNum = int.Parse(c.ToString());
TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, TJAPlayer3.Skin.Game_Training_CurrentMeasureCount_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, TJAPlayer3.Skin.Game_Training_CurrentMeasureCount_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szTextureSize.Height));
x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2; x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2;
} }
@ -381,7 +381,7 @@ namespace TJAPlayer3
var playSpdStr = Decimal.Round((decimal)playSpdI, 1, MidpointRounding.AwayFromZero).ToString(); var playSpdStr = Decimal.Round((decimal)playSpdI, 1, MidpointRounding.AwayFromZero).ToString();
var decimalStr = (playSpdStr == "0") ? "0" : playSpdStr[2].ToString(); var decimalStr = (playSpdStr == "0") ? "0" : playSpdStr[2].ToString();
TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[0], TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * int.Parse(decimalStr), 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[0], TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * int.Parse(decimalStr), 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szTextureSize.Height));
x = TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[0] - 25; x = TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[0] - 25;
@ -390,7 +390,7 @@ namespace TJAPlayer3
foreach (char c in ((int)playSpd).ToString()) foreach (char c in ((int)playSpd).ToString())
{ {
var currentNum = int.Parse(c.ToString()); var currentNum = int.Parse(c.ToString());
TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szテクスチャサイズ.Height)); TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szTextureSize.Height));
x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2; x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2;
} }
} }

84
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums背景.cs
View File

@ -55,11 +55,11 @@ namespace TJAPlayer3
var bgOrigindir = CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.BACKGROUND}"); var bgOrigindir = CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.BACKGROUND}");
var preset = HScenePreset.GetBGPreset(); var preset = HScenePreset.GetBGPreset();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
bgOrigindir += "Tower"; bgOrigindir += "Tower";
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
bgOrigindir += "Dan"; bgOrigindir += "Dan";
} }
@ -140,48 +140,48 @@ namespace TJAPlayer3
// Scale tower chara // Scale tower chara
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Standing[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Standing[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Climbing[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Climbing[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Running[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Running[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Clear[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Clear[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Fail[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Fail[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Standing_Tired[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Standing_Tired[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Climbing_Tired[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Climbing_Tired[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Running_Tired[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Running_Tired[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Clear_Tired[currentCharacter]) foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Clear_Tired[currentCharacter])
{ {
texture.vc拡大縮小倍率.X = resolutionScaleX; texture.vcScaleRatio.X = resolutionScaleX;
texture.vc拡大縮小倍率.Y = resolutionScaleY; texture.vcScaleRatio.Y = resolutionScaleY;
} }
this.ctSlideAnimation = new CCounter(); this.ctSlideAnimation = new CCounter();
@ -247,13 +247,13 @@ namespace TJAPlayer3
{ {
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) UpScript?.Update(); if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) UpScript?.Update();
UpScript?.Draw(); UpScript?.Draw();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
#region [Tower animations variables] #region [Tower animations variables]
this.bFloorChanged = CFloorManagement.LastRegisteredFloor > 0 && (CFloorManagement.LastRegisteredFloor < TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1); this.bFloorChanged = CFloorManagement.LastRegisteredFloor > 0 && (CFloorManagement.LastRegisteredFloor < TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1);
int maxFloor = TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor; int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor;
int nightTime = Math.Max(140, maxFloor / 2); int nightTime = Math.Max(140, maxFloor / 2);
currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f);
@ -262,10 +262,10 @@ namespace TJAPlayer3
#region [Tower background informations] #region [Tower background informations]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkTouTatsuKaiSuu).t2D描画(TJAPlayer3.Skin.Game_Tower_Font_TouTatsuKaiSuu[0], TJAPlayer3.Skin.Game_Tower_Font_TouTatsuKaiSuu[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkTouTatsuKaiSuu).t2D描画(TJAPlayer3.Skin.Game_Tower_Font_TouTatsuKaiSuu[0], TJAPlayer3.Skin.Game_Tower_Font_TouTatsuKaiSuu[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkKai).t2D描画(TJAPlayer3.Skin.Game_Tower_Font_Kai[0], TJAPlayer3.Skin.Game_Tower_Font_Kai[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkKai).t2D描画(TJAPlayer3.Skin.Game_Tower_Font_Kai[0], TJAPlayer3.Skin.Game_Tower_Font_Kai[1]);
this.ct炎.TickLoop(); this.ct炎.TickLoop();
CFloorManagement.loopFrames(); CFloorManagement.loopFrames();
@ -279,11 +279,11 @@ namespace TJAPlayer3
int len = floorStr.Length; int len = floorStr.Length;
int digitLength = TJAPlayer3.Tx.Taiko_Combo[0].szテクスチャサイズ.Width / 10; int digitLength = TJAPlayer3.Tx.Taiko_Combo[0].szTextureSize.Width / 10;
TJAPlayer3.Tx.Taiko_Combo[0].color4 = new Color4(1f, 0.6f, 0.2f, 1f); TJAPlayer3.Tx.Taiko_Combo[0].color4 = new Color4(1f, 0.6f, 0.2f, 1f);
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.X = 1.4f; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = 1.4f;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.Y = 1.4f; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1.4f;
for (int idx = len - 1; idx >= 0; idx--) for (int idx = len - 1; idx >= 0; idx--)
{ {
@ -292,20 +292,20 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Taiko_Combo[0].t2D描画(TJAPlayer3.Skin.Game_Tower_Floor_Number[0] - ((digitLength - 8) * (len - idx) * 1.4f), TJAPlayer3.Tx.Taiko_Combo[0].t2D描画(TJAPlayer3.Skin.Game_Tower_Floor_Number[0] - ((digitLength - 8) * (len - idx) * 1.4f),
TJAPlayer3.Skin.Game_Tower_Floor_Number[1], TJAPlayer3.Skin.Game_Tower_Floor_Number[1],
new Rectangle(digitLength * currentNum, 0, new Rectangle(digitLength * currentNum, 0,
digitLength, TJAPlayer3.Tx.Taiko_Combo[0].szテクスチャサイズ.Height)); digitLength, TJAPlayer3.Tx.Taiko_Combo[0].szTextureSize.Height));
} }
#endregion #endregion
#region [Life Tamashii icon] #region [Life Tamashii icon]
int soulfire_width = TJAPlayer3.Tx.Gauge_Soul_Fire.szテクスチャサイズ.Width / 8; int soulfire_width = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Width / 8;
int soulfire_height = TJAPlayer3.Tx.Gauge_Soul_Fire.szテクスチャサイズ.Height; int soulfire_height = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Height;
int soul_height = TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Height / 2; int soul_height = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Height / 2;
TJAPlayer3.Tx.Gauge_Soul_Fire?.t2D描画(TJAPlayer3.Skin.Gauge_Soul_Fire_X_Tower, TJAPlayer3.Skin.Gauge_Soul_Fire_Y_Tower, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height)); TJAPlayer3.Tx.Gauge_Soul_Fire?.t2D描画(TJAPlayer3.Skin.Gauge_Soul_Fire_X_Tower, TJAPlayer3.Skin.Gauge_Soul_Fire_Y_Tower, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height));
TJAPlayer3.Tx.Gauge_Soul?.t2D描画(TJAPlayer3.Skin.Gauge_Soul_X_Tower, TJAPlayer3.Skin.Gauge_Soul_Y_Tower, new Rectangle(0, soul_height, TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Width, soul_height)); TJAPlayer3.Tx.Gauge_Soul?.t2D描画(TJAPlayer3.Skin.Gauge_Soul_X_Tower, TJAPlayer3.Skin.Gauge_Soul_Y_Tower, new Rectangle(0, soul_height, TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width, soul_height));
#endregion #endregion
@ -329,8 +329,8 @@ namespace TJAPlayer3
: new Color4(1f, 0.2f, 0.2f, 1f)); : new Color4(1f, 0.2f, 0.2f, 1f));
TJAPlayer3.Tx.Taiko_Combo[0].color4 = lifeColor; TJAPlayer3.Tx.Taiko_Combo[0].color4 = lifeColor;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.X = 1.1f; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = 1.1f;
TJAPlayer3.Tx.Taiko_Combo[0].vc拡大縮小倍率.Y = 1.1f; TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1.1f;
for (int idx = 0; idx < len; idx++) for (int idx = 0; idx < len; idx++)
{ {
@ -339,7 +339,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Taiko_Combo[0].t2D描画(TJAPlayer3.Skin.Game_Tower_Life_Number[0] + ((digitLength - 8) * (len - idx) * 1.1f), TJAPlayer3.Tx.Taiko_Combo[0].t2D描画(TJAPlayer3.Skin.Game_Tower_Life_Number[0] + ((digitLength - 8) * (len - idx) * 1.1f),
TJAPlayer3.Skin.Game_Tower_Life_Number[1], TJAPlayer3.Skin.Game_Tower_Life_Number[1],
new Rectangle(digitLength * currentNum, 0, new Rectangle(digitLength * currentNum, 0,
digitLength, TJAPlayer3.Tx.Taiko_Combo[0].szテクスチャサイズ.Height)); digitLength, TJAPlayer3.Tx.Taiko_Combo[0].szTextureSize.Height));
} }
TJAPlayer3.Tx.Taiko_Combo[0].color4 = new Color4(1f, 1f, 1f, 1f); TJAPlayer3.Tx.Taiko_Combo[0].color4 = new Color4(1f, 1f, 1f, 1f);
@ -357,15 +357,15 @@ namespace TJAPlayer3
#region [Lower background] #region [Lower background]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
int maxFloor = TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor; int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor;
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, maxFloor.ToString()); TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, maxFloor.ToString());
int nightTime = Math.Max(140, maxFloor / 2); int nightTime = Math.Max(140, maxFloor / 2);
int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTowerType); int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType);
if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn) if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn)
currentTowerType = 0; currentTowerType = 0;
@ -438,13 +438,13 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase]?.t2D下中央基準描画( TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase]?.t2D下中央基準描画(
TJAPlayer3.Skin.Game_Tower_Floors_Body[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange, TJAPlayer3.Skin.Game_Tower_Floors_Body[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange,
TJAPlayer3.Skin.Game_Tower_Floors_Body[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange, TJAPlayer3.Skin.Game_Tower_Floors_Body[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange,
new Rectangle(0, originY, TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase].szテクスチャサイズ.Width, TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase].szテクスチャサイズ.Height - originY)); new Rectangle(0, originY, TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase].szTextureSize.Width, TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase].szTextureSize.Height - originY));
else if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 == maxFloor) else if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 == maxFloor)
{ {
TJAPlayer3.Tx.Tower_Top[currentTower]?.t2D下中央基準描画( TJAPlayer3.Tx.Tower_Top[currentTower]?.t2D下中央基準描画(
TJAPlayer3.Skin.Game_Tower_Floors_Body[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange, TJAPlayer3.Skin.Game_Tower_Floors_Body[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange,
TJAPlayer3.Skin.Game_Tower_Floors_Body[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange, TJAPlayer3.Skin.Game_Tower_Floors_Body[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange,
new Rectangle(0, originY, TJAPlayer3.Tx.Tower_Top[currentTower].szテクスチャサイズ.Width, TJAPlayer3.Tx.Tower_Top[currentTower].szテクスチャサイズ.Height - originY)); new Rectangle(0, originY, TJAPlayer3.Tx.Tower_Top[currentTower].szTextureSize.Width, TJAPlayer3.Tx.Tower_Top[currentTower].szTextureSize.Height - originY));
} }
// Next deco // Next deco
@ -588,7 +588,7 @@ namespace TJAPlayer3
#endregion #endregion
} }
else if (!TJAPlayer3.stage演奏ドラム画面.bDoublePlay && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) else if (!TJAPlayer3.stage演奏ドラム画面.bDoublePlay && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan)
{ {
if (!IsDownNotFound) if (!IsDownNotFound)
{ {

8
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums連打.cs
View File

@ -155,8 +155,8 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 255; TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 255;
} }
float width = TJAPlayer3.Tx.Balloon_Roll.szテクスチャサイズ.Width / 5.0f; float width = TJAPlayer3.Tx.Balloon_Roll.szTextureSize.Width / 5.0f;
float height = TJAPlayer3.Tx.Balloon_Roll.szテクスチャサイズ.Height; float height = TJAPlayer3.Tx.Balloon_Roll.szTextureSize.Height;
TJAPlayer3.Tx.Balloon_Roll?.t2D描画(TJAPlayer3.Skin.Game_Balloon_Roll_Frame_X[player], TJAPlayer3.Skin.Game_Balloon_Roll_Frame_Y[player], new RectangleF(0 + bNowRollAnime * width, 0, width, height)); TJAPlayer3.Tx.Balloon_Roll?.t2D描画(TJAPlayer3.Skin.Game_Balloon_Roll_Frame_X[player], TJAPlayer3.Skin.Game_Balloon_Roll_Frame_Y[player], new RectangleF(0 + bNowRollAnime * width, 0, width, height));
this.t文字表示(TJAPlayer3.Skin.Game_Balloon_Roll_Number_X[player], TJAPlayer3.Skin.Game_Balloon_Roll_Number_Y[player], n連打数, player); this.t文字表示(TJAPlayer3.Skin.Game_Balloon_Roll_Number_X[player], TJAPlayer3.Skin.Game_Balloon_Roll_Number_Y[player], n連打数, player);
@ -209,8 +209,8 @@ namespace TJAPlayer3
private void t文字表示( int x, int y, int num, int nPlayer) private void t文字表示( int x, int y, int num, int nPlayer)
{ {
TJAPlayer3.Tx.Balloon_Number_Roll.vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Balloon_Roll_Number_Scale; TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Roll_Number_Scale;
TJAPlayer3.Tx.Balloon_Number_Roll.vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Balloon_Roll_Number_Scale + RollScale[this.ct連打アニメ[nPlayer].CurrentValue]; TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Roll_Number_Scale + RollScale[this.ct連打アニメ[nPlayer].CurrentValue];
int[] nums = CConversion.SeparateDigits(num); int[] nums = CConversion.SeparateDigits(num);
for (int j = 0; j < nums.Length; j++) for (int j = 0; j < nums.Length; j++)

4
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs
View File

@ -193,13 +193,13 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type]?.t2D描画(RollCharas[i].X, RollCharas[i].Y); TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type]?.t2D描画(RollCharas[i].X, RollCharas[i].Y);
// 画面外にいたら描画をやめさせる // 画面外にいたら描画をやめさせる
if (RollCharas[i].X < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szテクスチャサイズ.Width || RollCharas[i].X > TJAPlayer3.Skin.Resolution[0]) if (RollCharas[i].X < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szTextureSize.Width || RollCharas[i].X > TJAPlayer3.Skin.Resolution[0])
{ {
RollCharas[i].Counter.Stop(); RollCharas[i].Counter.Stop();
RollCharas[i].IsUsing = false; RollCharas[i].IsUsing = false;
} }
if (RollCharas[i].Y < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szテクスチャサイズ.Height || RollCharas[i].Y > TJAPlayer3.Skin.Resolution[1]) if (RollCharas[i].Y < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szTextureSize.Height || RollCharas[i].Y > TJAPlayer3.Skin.Resolution[1])
{ {
RollCharas[i].Counter.Stop(); RollCharas[i].Counter.Stop();
RollCharas[i].IsUsing = false; RollCharas[i].IsUsing = false;

12
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums風船.cs
View File

@ -306,8 +306,8 @@ namespace TJAPlayer3
private void tKusudamaNumber(int num) private void tKusudamaNumber(int num)
{ {
if (TJAPlayer3.Tx.Kusudama_Number == null) return; if (TJAPlayer3.Tx.Kusudama_Number == null) return;
TJAPlayer3.Tx.Kusudama_Number.vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; TJAPlayer3.Tx.Kusudama_Number.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale;
TJAPlayer3.Tx.Kusudama_Number.vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; TJAPlayer3.Tx.Kusudama_Number.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale;
int x = TJAPlayer3.Skin.Game_Kusudama_Number_X; int x = TJAPlayer3.Skin.Game_Kusudama_Number_X;
int y = TJAPlayer3.Skin.Game_Kusudama_Number_Y; int y = TJAPlayer3.Skin.Game_Kusudama_Number_Y;
@ -327,8 +327,8 @@ namespace TJAPlayer3
private void tFuseNumber(int x, int y, int num, int nPlayer) private void tFuseNumber(int x, int y, int num, int nPlayer)
{ {
if (TJAPlayer3.Tx.Fuse_Number == null) return; if (TJAPlayer3.Tx.Fuse_Number == null) return;
TJAPlayer3.Tx.Fuse_Number.vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; TJAPlayer3.Tx.Fuse_Number.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale;
TJAPlayer3.Tx.Fuse_Number.vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue]; TJAPlayer3.Tx.Fuse_Number.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue];
_nbDisplay(TJAPlayer3.Tx.Fuse_Number, num, x, y); _nbDisplay(TJAPlayer3.Tx.Fuse_Number, num, x, y);
} }
@ -336,8 +336,8 @@ namespace TJAPlayer3
private void t文字表示(int x, int y, int num, int nPlayer) private void t文字表示(int x, int y, int num, int nPlayer)
{ {
if (TJAPlayer3.Tx.Balloon_Number_Roll == null) return; if (TJAPlayer3.Tx.Balloon_Number_Roll == null) return;
TJAPlayer3.Tx.Balloon_Number_Roll.vc拡大縮小倍率.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale;
TJAPlayer3.Tx.Balloon_Number_Roll.vc拡大縮小倍率.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue]; TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue];
_nbDisplay(TJAPlayer3.Tx.Balloon_Number_Roll, num, x, y); _nbDisplay(TJAPlayer3.Tx.Balloon_Number_Roll, num, x, y);
} }

238
OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
View File

@ -195,7 +195,7 @@ namespace TJAPlayer3
this.bフィルイン中 = false; this.bフィルイン中 = false;
this.n待機中の大音符の座標 = 0; this.n待機中の大音符の座標 = 0;
this.actGame.t叩ききりまショー_初期化(); this.actGame.t叩ききりまショー_初期化();
base.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stage選曲.n確定された曲の難易度[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]); base.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]);
#region [ branch ] #region [ branch ]
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
@ -277,17 +277,17 @@ namespace TJAPlayer3
"+" "+"
}; };
int level = TJAPlayer3.stage選曲.r確定された曲.nLevel[diff]; int level = TJAPlayer3.stageSongSelect.rChoosenSong.nLevel[diff];
CDTX.ELevelIcon levelIcon = TJAPlayer3.stage選曲.r確定された曲.nLevelIcon[diff]; CDTX.ELevelIcon levelIcon = TJAPlayer3.stageSongSelect.rChoosenSong.nLevelIcon[diff];
return (diffArr[Math.Min(diff, 6)] + "Lv." + level + diffArrIcon[(int)levelIcon]); return (diffArr[Math.Min(diff, 6)] + "Lv." + level + diffArrIcon[(int)levelIcon]);
} }
// Discord Presence の更新 // Discord Presence の更新
string Details = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stage選曲.r確定された曲.strタイトル string Details = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stageSongSelect.rChoosenSong.strタイトル
+ diffToString(TJAPlayer3.stage選曲.n確定された曲の難易度[0]) : ""; + diffToString(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) : "";
var difficultyName = TJAPlayer3.DifficultyNumberToEnum(TJAPlayer3.stage選曲.n確定された曲の難易度[0]).ToString(); var difficultyName = TJAPlayer3.DifficultyNumberToEnum(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]).ToString();
TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() TJAPlayer3.DiscordClient?.SetPresence(new RichPresence()
{ {
@ -297,7 +297,7 @@ namespace TJAPlayer3
Assets = new Assets() Assets = new Assets()
{ {
SmallImageKey = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? difficultyName.ToLower() : "", SmallImageKey = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? difficultyName.ToLower() : "",
SmallImageText = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? String.Format("COURSE:{0} ({1})", difficultyName, TJAPlayer3.stage選曲.n確定された曲の難易度[0]) : "", SmallImageText = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? String.Format("COURSE:{0} ({1})", difficultyName, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) : "",
LargeImageKey = TJAPlayer3.LargeImageKey, LargeImageKey = TJAPlayer3.LargeImageKey,
LargeImageText = TJAPlayer3.LargeImageText, LargeImageText = TJAPlayer3.LargeImageText,
} }
@ -443,9 +443,9 @@ namespace TJAPlayer3
base.IsFirstDraw = false; base.IsFirstDraw = false;
} }
#endregion #endregion
if ( ( ( TJAPlayer3.ConfigIni.nRisky != 0 && this.actGauge.IsFailed( E楽器パート.TAIKO ) ) if ( ( ( TJAPlayer3.ConfigIni.nRisky != 0 && this.actGauge.IsFailed( EInstrumentPad.TAIKO ) )
|| this.actGame.st叩ききりまショー.ct残り時間.IsEnded || this.actGame.st叩ききりまショー.ct残り時間.IsEnded
|| (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower && CFloorManagement.CurrentNumberOfLives <= 0)) || (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower && CFloorManagement.CurrentNumberOfLives <= 0))
&& ( base.ePhaseID == CStage.EPhase.Common_NORMAL )) && ( base.ePhaseID == CStage.EPhase.Common_NORMAL ))
{ {
this.actStageFailed.Start(); this.actStageFailed.Start();
@ -527,18 +527,18 @@ namespace TJAPlayer3
for ( int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++ ) for ( int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++ )
{ {
// bIsFinishedPlaying = this.t進行描画_チップ(E楽器パート.DRUMS, i); // bIsFinishedPlaying = this.t進行描画_チップ(E楽器パート.DRUMS, i);
bool btmp = this.t進行描画_チップ(E楽器パート.DRUMS, i); bool btmp = this.t進行描画_チップ(EInstrumentPad.DRUMS, i);
if (btmp == true) if (btmp == true)
ifp[i] = true; ifp[i] = true;
#if DEBUG #if DEBUG
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.D0)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.D0))
{ {
ifp[i] = true; ifp[i] = true;
} }
#endif #endif
this.t進行描画_チップ_連打( E楽器パート.DRUMS, i ); this.t進行描画_チップ_連打( EInstrumentPad.DRUMS, i );
} }
this.actMtaiko.Draw(); this.actMtaiko.Draw();
@ -595,7 +595,7 @@ namespace TJAPlayer3
actChara.OnDraw_Balloon(); actChara.OnDraw_Balloon();
// Floor voice // Floor voice
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
this.actComboVoice.tPlayFloorSound(); this.actComboVoice.tPlayFloorSound();
this.t全体制御メソッド(); this.t全体制御メソッド();
@ -723,12 +723,12 @@ namespace TJAPlayer3
public PuchiChara PuchiChara; public PuchiChara PuchiChara;
public CAct演奏Drumsスコアランク ScoreRank; public CAct演奏Drumsスコアランク ScoreRank;
private bool bフィルイン中; private bool bフィルイン中;
private readonly Eパッド[] eチャンネルtoパッド = new Eパッド[] private readonly EPad[] eチャンネルtoパッド = new EPad[]
{ {
Eパッド.HH, Eパッド.SD, Eパッド.BD, Eパッド.HT, EPad.HH, EPad.SD, EPad.BD, EPad.HT,
Eパッド.LT, Eパッド.CY, Eパッド.FT, Eパッド.HHO, EPad.LT, EPad.CY, EPad.FT, EPad.HHO,
Eパッド.RD, Eパッド.UNKNOWN, Eパッド.UNKNOWN, Eパッド.LC, EPad.RD, EPad.UNKNOWN, EPad.UNKNOWN, EPad.LC,
Eパッド.LP, Eパッド.LBD EPad.LP, EPad.LBD
}; };
private int[] nチャンネルtoX座標 = new int[] { 370, 470, 582, 527, 645, 748, 694, 373, 815, 298, 419, 419 }; private int[] nチャンネルtoX座標 = new int[] { 370, 470, 582, 527, 645, 748, 694, 373, 815, 298, 419, 419 };
private CCounter ct手つなぎ; private CCounter ct手つなぎ;
@ -759,20 +759,20 @@ namespace TJAPlayer3
protected override ENoteJudge tチップのヒット処理( long nHitTime, CDTX.CChip pChip, bool bCorrectLane ) protected override ENoteJudge tチップのヒット処理( long nHitTime, CDTX.CChip pChip, bool bCorrectLane )
{ {
ENoteJudge eJudgeResult = tチップのヒット処理( nHitTime, pChip, E楽器パート.DRUMS, bCorrectLane, 0 ); ENoteJudge eJudgeResult = tチップのヒット処理( nHitTime, pChip, EInstrumentPad.DRUMS, bCorrectLane, 0 );
// #24074 2011.01.23 add ikanick // #24074 2011.01.23 add ikanick
if( pChip.nコース == this.n現在のコース[ 0 ] && NotesManager.IsMissableNote(pChip) && pChip.bShow == true && eJudgeResult != ENoteJudge.Auto ) if( pChip.nコース == this.n現在のコース[ 0 ] && NotesManager.IsMissableNote(pChip) && pChip.bShow == true && eJudgeResult != ENoteJudge.Auto )
this.actGame.t叩ききりまショー_判定から各数値を増加させる( eJudgeResult, (int)( nHitTime - pChip.n発声時刻ms ) ); this.actGame.t叩ききりまショー_判定から各数値を増加させる( eJudgeResult, (int)( nHitTime - pChip.n発声時刻ms ) );
return eJudgeResult; return eJudgeResult;
} }
protected override void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, E楽器パート part) protected override void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, EInstrumentPad part)
{ {
this.tチップのヒット処理_BadならびにTight時のMiss(eCourse, part, 0, E楽器パート.DRUMS); this.tチップのヒット処理_BadならびにTight時のMiss(eCourse, part, 0, EInstrumentPad.DRUMS);
} }
protected override void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, E楽器パート part, int nLane) protected override void tチップのヒット処理_BadならびにTight時のMiss(CDTX.ECourse eCourse, EInstrumentPad part, int nLane)
{ {
this.tチップのヒット処理_BadならびにTight時のMiss(eCourse, part, nLane, E楽器パート.DRUMS); this.tチップのヒット処理_BadならびにTight時のMiss(eCourse, part, nLane, EInstrumentPad.DRUMS);
} }
private int ChannelNumToFlyNoteNum(CDTX.CChip pChip, int nPlayer, bool b両手入力 = false, int nInput = 0) private int ChannelNumToFlyNoteNum(CDTX.CChip pChip, int nPlayer, bool b両手入力 = false, int nInput = 0)
@ -809,45 +809,45 @@ namespace TJAPlayer3
return nFly; return nFly;
} }
private bool tドラムヒット処理( long nHitTime, Eパッド type, CDTX.CChip pChip, bool b両手入力, int nPlayer ) private bool tドラムヒット処理( long nHitTime, EPad type, CDTX.CChip pChip, bool b両手入力, int nPlayer )
{ {
int nInput = 0; int nInput = 0;
switch( type ) switch( type )
{ {
case Eパッド.LRed: case EPad.LRed:
case Eパッド.RRed: case EPad.RRed:
case Eパッド.LRed2P: case EPad.LRed2P:
case Eパッド.RRed2P: case EPad.RRed2P:
case Eパッド.LRed3P: case EPad.LRed3P:
case Eパッド.RRed3P: case EPad.RRed3P:
case Eパッド.LRed4P: case EPad.LRed4P:
case Eパッド.RRed4P: case EPad.RRed4P:
case Eパッド.LRed5P: case EPad.LRed5P:
case Eパッド.RRed5P: case EPad.RRed5P:
nInput = 0; nInput = 0;
if( b両手入力 ) if( b両手入力 )
nInput = 2; nInput = 2;
break; break;
case Eパッド.LBlue: case EPad.LBlue:
case Eパッド.RBlue: case EPad.RBlue:
case Eパッド.LBlue2P: case EPad.LBlue2P:
case Eパッド.RBlue2P: case EPad.RBlue2P:
case Eパッド.LBlue3P: case EPad.LBlue3P:
case Eパッド.RBlue3P: case EPad.RBlue3P:
case Eパッド.LBlue4P: case EPad.LBlue4P:
case Eパッド.RBlue4P: case EPad.RBlue4P:
case Eパッド.LBlue5P: case EPad.LBlue5P:
case Eパッド.RBlue5P: case EPad.RBlue5P:
nInput = 1; nInput = 1;
if( b両手入力 ) if( b両手入力 )
nInput = 3; nInput = 3;
break; break;
case Eパッド.CLAP: case EPad.CLAP:
case Eパッド.CLAP2P: case EPad.CLAP2P:
case Eパッド.CLAP3P: case EPad.CLAP3P:
case Eパッド.CLAP4P: case EPad.CLAP4P:
case Eパッド.CLAP5P: case EPad.CLAP5P:
nInput = 4; nInput = 4;
break; break;
} }
@ -860,7 +860,7 @@ namespace TJAPlayer3
if (NotesManager.IsGenericRoll(pChip) && !NotesManager.IsRollEnd(pChip)) if (NotesManager.IsGenericRoll(pChip) && !NotesManager.IsRollEnd(pChip))
{ {
this.tチップのヒット処理( nHitTime, pChip, E楽器パート.TAIKO, true, nInput, nPlayer ); this.tチップのヒット処理( nHitTime, pChip, EInstrumentPad.TAIKO, true, nInput, nPlayer );
return true; return true;
} }
@ -880,7 +880,7 @@ namespace TJAPlayer3
return false; return false;
} }
this.tチップのヒット処理( nHitTime, pChip, E楽器パート.TAIKO, true, nInput, nPlayer ); this.tチップのヒット処理( nHitTime, pChip, EInstrumentPad.TAIKO, true, nInput, nPlayer );
if( ( e判定 != ENoteJudge.Poor ) && ( e判定 != ENoteJudge.Miss ) ) if( ( e判定 != ENoteJudge.Poor ) && ( e判定 != ENoteJudge.Miss ) )
{ {
@ -911,7 +911,7 @@ namespace TJAPlayer3
} }
protected override void t進行描画_DANGER() protected override void t進行描画_DANGER()
{ {
this.actDANGER.t進行描画( this.actGauge.IsDanger(E楽器パート.DRUMS), false, false ); this.actDANGER.t進行描画( this.actGauge.IsDanger(EInstrumentPad.DRUMS), false, false );
} }
private void t進行描画_グラフ() private void t進行描画_グラフ()
@ -958,15 +958,15 @@ namespace TJAPlayer3
// Input adjust deprecated // Input adjust deprecated
var nInputAdjustTimeMs = 0; // TJAPlayer3.ConfigIni.nInputAdjustTimeMs; var nInputAdjustTimeMs = 0; // TJAPlayer3.ConfigIni.nInputAdjustTimeMs;
for( int nPad = 0; nPad < (int) Eパッド.MAX; nPad++ ) // #27029 2012.1.4 from: <10 to <=10; Eパッドの要素が１つ（HP）増えたため。 for( int nPad = 0; nPad < (int) EPad.MAX; nPad++ ) // #27029 2012.1.4 from: <10 to <=10; Eパッドの要素が１つ（HP）増えたため。
// 2012.1.5 yyagi: (int)Eパッド.MAX に変更。Eパッドの要素数への依存を無くすため。 // 2012.1.5 yyagi: (int)Eパッド.MAX に変更。Eパッドの要素数への依存を無くすため。
{ {
List<STInputEvent> listInputEvent = TJAPlayer3.Pad.GetEvents( E楽器パート.DRUMS, (Eパッド) nPad ); List<STInputEvent> listInputEvent = TJAPlayer3.Pad.GetEvents( EInstrumentPad.DRUMS, (EPad) nPad );
if( ( listInputEvent == null ) || ( listInputEvent.Count == 0 ) ) if( ( listInputEvent == null ) || ( listInputEvent.Count == 0 ) )
continue; continue;
this.t入力メソッド記憶( E楽器パート.DRUMS ); this.t入力メソッド記憶( EInstrumentPad.DRUMS );
foreach( STInputEvent inputEvent in listInputEvent ) foreach( STInputEvent inputEvent in listInputEvent )
{ {
@ -1230,7 +1230,7 @@ namespace TJAPlayer3
this.soundBlue[4]?.PlayStart(); this.soundBlue[4]?.PlayStart();
break; break;
// Clap // Clap
case (int)Eパッド.CLAP: case (int)EPad.CLAP:
if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(0)] == EGameType.KONGA) if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(0)] == EGameType.KONGA)
{ {
nLane = (int)PlayerLane.FlashType.Clap; nLane = (int)PlayerLane.FlashType.Clap;
@ -1246,7 +1246,7 @@ namespace TJAPlayer3
nLane = (int)PlayerLane.FlashType.Total; nLane = (int)PlayerLane.FlashType.Total;
} }
break; break;
case (int)Eパッド.CLAP2P: case (int)EPad.CLAP2P:
if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA)
{ {
nLane = (int)PlayerLane.FlashType.Clap; nLane = (int)PlayerLane.FlashType.Clap;
@ -1262,7 +1262,7 @@ namespace TJAPlayer3
nLane = (int)PlayerLane.FlashType.Total; nLane = (int)PlayerLane.FlashType.Total;
} }
break; break;
case (int)Eパッド.CLAP3P: case (int)EPad.CLAP3P:
if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA)
{ {
nLane = (int)PlayerLane.FlashType.Clap; nLane = (int)PlayerLane.FlashType.Clap;
@ -1278,7 +1278,7 @@ namespace TJAPlayer3
nLane = (int)PlayerLane.FlashType.Total; nLane = (int)PlayerLane.FlashType.Total;
} }
break; break;
case (int)Eパッド.CLAP4P: case (int)EPad.CLAP4P:
if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA)
{ {
nLane = (int)PlayerLane.FlashType.Clap; nLane = (int)PlayerLane.FlashType.Clap;
@ -1294,7 +1294,7 @@ namespace TJAPlayer3
nLane = (int)PlayerLane.FlashType.Total; nLane = (int)PlayerLane.FlashType.Total;
} }
break; break;
case (int)Eパッド.CLAP5P: case (int)EPad.CLAP5P:
if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA)
{ {
nLane = (int)PlayerLane.FlashType.Clap; nLane = (int)PlayerLane.FlashType.Clap;
@ -1341,28 +1341,28 @@ namespace TJAPlayer3
break; break;
} }
switch (((Eパッド)nPad)) switch (((EPad)nPad))
{ {
case Eパッド.LRed: case EPad.LRed:
case Eパッド.LRed2P: case EPad.LRed2P:
case Eパッド.LRed3P: case EPad.LRed3P:
case Eパッド.LRed4P: case EPad.LRed4P:
case Eパッド.LRed5P: case EPad.LRed5P:
case Eパッド.RRed: case EPad.RRed:
case Eパッド.RRed2P: case EPad.RRed2P:
case Eパッド.RRed3P: case EPad.RRed3P:
case Eパッド.RRed4P: case EPad.RRed4P:
case Eパッド.RRed5P: case EPad.RRed5P:
case Eパッド.LBlue: case EPad.LBlue:
case Eパッド.LBlue2P: case EPad.LBlue2P:
case Eパッド.LBlue3P: case EPad.LBlue3P:
case Eパッド.LBlue4P: case EPad.LBlue4P:
case Eパッド.LBlue5P: case EPad.LBlue5P:
case Eパッド.RBlue: case EPad.RBlue:
case Eパッド.RBlue2P: case EPad.RBlue2P:
case Eパッド.RBlue3P: case EPad.RBlue3P:
case Eパッド.RBlue4P: case EPad.RBlue4P:
case Eパッド.RBlue5P: case EPad.RBlue5P:
{ {
// Regular notes // Regular notes
@ -1370,29 +1370,29 @@ namespace TJAPlayer3
#region [Fetch values] #region [Fetch values]
// Flatten pads from 8 to 4 // Flatten pads from 8 to 4
var _pad = (Eパッド)nPad; var _pad = (EPad)nPad;
if ((Eパッド)nPad == Eパッド.LRed2P) _pad = Eパッド.LRed; if ((EPad)nPad == EPad.LRed2P) _pad = EPad.LRed;
if ((Eパッド)nPad == Eパッド.RRed2P) _pad = Eパッド.RRed; if ((EPad)nPad == EPad.RRed2P) _pad = EPad.RRed;
if ((Eパッド)nPad == Eパッド.LBlue2P) _pad = Eパッド.LBlue; if ((EPad)nPad == EPad.LBlue2P) _pad = EPad.LBlue;
if ((Eパッド)nPad == Eパッド.RBlue2P) _pad = Eパッド.RBlue; if ((EPad)nPad == EPad.RBlue2P) _pad = EPad.RBlue;
if ((Eパッド)nPad == Eパッド.LRed3P) _pad = Eパッド.LRed; if ((EPad)nPad == EPad.LRed3P) _pad = EPad.LRed;
if ((Eパッド)nPad == Eパッド.RRed3P) _pad = Eパッド.RRed; if ((EPad)nPad == EPad.RRed3P) _pad = EPad.RRed;
if ((Eパッド)nPad == Eパッド.LBlue3P) _pad = Eパッド.LBlue; if ((EPad)nPad == EPad.LBlue3P) _pad = EPad.LBlue;
if ((Eパッド)nPad == Eパッド.RBlue3P) _pad = Eパッド.RBlue; if ((EPad)nPad == EPad.RBlue3P) _pad = EPad.RBlue;
if ((Eパッド)nPad == Eパッド.LRed4P) _pad = Eパッド.LRed; if ((EPad)nPad == EPad.LRed4P) _pad = EPad.LRed;
if ((Eパッド)nPad == Eパッド.RRed4P) _pad = Eパッド.RRed; if ((EPad)nPad == EPad.RRed4P) _pad = EPad.RRed;
if ((Eパッド)nPad == Eパッド.LBlue4P) _pad = Eパッド.LBlue; if ((EPad)nPad == EPad.LBlue4P) _pad = EPad.LBlue;
if ((Eパッド)nPad == Eパッド.RBlue4P) _pad = Eパッド.RBlue; if ((EPad)nPad == EPad.RBlue4P) _pad = EPad.RBlue;
if ((Eパッド)nPad == Eパッド.LRed5P) _pad = Eパッド.LRed; if ((EPad)nPad == EPad.LRed5P) _pad = EPad.LRed;
if ((Eパッド)nPad == Eパッド.RRed5P) _pad = Eパッド.RRed; if ((EPad)nPad == EPad.RRed5P) _pad = EPad.RRed;
if ((Eパッド)nPad == Eパッド.LBlue5P) _pad = Eパッド.LBlue; if ((EPad)nPad == EPad.LBlue5P) _pad = EPad.LBlue;
if ((Eパッド)nPad == Eパッド.RBlue5P) _pad = Eパッド.RBlue; if ((EPad)nPad == EPad.RBlue5P) _pad = EPad.RBlue;
bool _isLeftPad = _pad == Eパッド.LRed || _pad == Eパッド.LBlue; bool _isLeftPad = _pad == EPad.LRed || _pad == EPad.LBlue;
bool _isBlue = _pad == Eパッド.RBlue || _pad == Eパッド.LBlue; bool _isBlue = _pad == EPad.RBlue || _pad == EPad.LBlue;
int waitInstr = _isLeftPad ? 2 : 1; int waitInstr = _isLeftPad ? 2 : 1;
int waitRec = waitInstr == 2 ? 1 : 2; int waitRec = waitInstr == 2 ? 1 : 2;
@ -1505,13 +1505,13 @@ namespace TJAPlayer3
} }
case Eパッド.CLAP: case EPad.CLAP:
case Eパッド.CLAP2P: case EPad.CLAP2P:
case Eパッド.CLAP3P: case EPad.CLAP3P:
case Eパッド.CLAP4P: case EPad.CLAP4P:
case Eパッド.CLAP5P: case EPad.CLAP5P:
{ {
var _pad = (Eパッド)nPad; var _pad = (EPad)nPad;
// Process konga clap // Process konga clap
if (e判定 != ENoteJudge.Miss && _isClapKonga) if (e判定 != ENoteJudge.Miss && _isClapKonga)
@ -1542,13 +1542,13 @@ namespace TJAPlayer3
if (e判定 != ENoteJudge.Miss && NotesManager.IsADLIB(chipNoHit)) if (e判定 != ENoteJudge.Miss && NotesManager.IsADLIB(chipNoHit))
{ {
this.tドラムヒット処理(nTime, (Eパッド)nPad, chipNoHit, false, nUsePlayer); this.tドラムヒット処理(nTime, (EPad)nPad, chipNoHit, false, nUsePlayer);
bHitted = true; bHitted = true;
} }
if (e判定 != ENoteJudge.Miss && NotesManager.IsMine(chipNoHit)) if (e判定 != ENoteJudge.Miss && NotesManager.IsMine(chipNoHit))
{ {
this.tドラムヒット処理(nTime, (Eパッド)nPad, chipNoHit, false, nUsePlayer); this.tドラムヒット処理(nTime, (EPad)nPad, chipNoHit, false, nUsePlayer);
bHitted = true; bHitted = true;
} }
@ -1821,7 +1821,7 @@ namespace TJAPlayer3
int pad = nPad; // 以下、nPad の代わりに pad を用いる。（成りすまし用） int pad = nPad; // 以下、nPad の代わりに pad を用いる。（成りすまし用）
// BAD or TIGHT 時の処理。 // BAD or TIGHT 時の処理。
if (TJAPlayer3.ConfigIni.bTight && !b連打中[nUsePlayer]) // 18/8/13 - 連打時にこれが発動すると困る!!! (AioiLight) if (TJAPlayer3.ConfigIni.bTight && !b連打中[nUsePlayer]) // 18/8/13 - 連打時にこれが発動すると困る!!! (AioiLight)
this.tチップのヒット処理_BadならびにTight時のMiss(chipNoHit.nコース, E楽器パート.DRUMS, 0, E楽器パート.TAIKO); this.tチップのヒット処理_BadならびにTight時のMiss(chipNoHit.nコース, EInstrumentPad.DRUMS, 0, EInstrumentPad.TAIKO);
//----------------------------- //-----------------------------
#endregion #endregion
} }
@ -1909,7 +1909,7 @@ namespace TJAPlayer3
int n大音符 = (pChip.nチャンネル番号 == 0x11 || pChip.nチャンネル番号 == 0x12 ? 2 : 0); int n大音符 = (pChip.nチャンネル番号 == 0x11 || pChip.nチャンネル番号 == 0x12 ? 2 : 0);
this.tチップのヒット処理(pChip.n発声時刻ms, pChip, E楽器パート.TAIKO, true, nLane + n大音符, nPlayer, false); this.tチップのヒット処理(pChip.n発声時刻ms, pChip, EInstrumentPad.TAIKO, true, nLane + n大音符, nPlayer, false);
this.tサウンド再生(pChip, nPlayer); this.tサウンド再生(pChip, nPlayer);
return; return;
} }
@ -2433,9 +2433,9 @@ namespace TJAPlayer3
if (!NotesManager.IsFuzeRoll(pChip)) if (!NotesManager.IsFuzeRoll(pChip))
{ {
TJAPlayer3.Tx.SENotes[(int)_gt].vc拡大縮小倍率.X = x末端 - x - 44 - _shift; TJAPlayer3.Tx.SENotes[(int)_gt].vcScaleRatio.X = x末端 - x - 44 - _shift;
TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x + 90 + _shift, y + nSenotesY, new Rectangle(_60_cut, 8 * _size[1], 1, _size[1])); TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x + 90 + _shift, y + nSenotesY, new Rectangle(_60_cut, 8 * _size[1], 1, _size[1]));
TJAPlayer3.Tx.SENotes[(int)_gt].vc拡大縮小倍率.X = 1.0f; TJAPlayer3.Tx.SENotes[(int)_gt].vcScaleRatio.X = 1.0f;
TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x + 30 + _shift, y + nSenotesY, new Rectangle(0, 8 * _size[1], _60_cut, _size[1])); TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x + 30 + _shift, y + nSenotesY, new Rectangle(0, 8 * _size[1], _60_cut, _size[1]));
TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x - (_shift / 13), y + nSenotesY, new Rectangle(0, _size[1] * pChip.nSenote, _size[0], _size[1])); TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x - (_shift / 13), y + nSenotesY, new Rectangle(0, _size[1] * pChip.nSenote, _size[0], _size[1]));
} }
@ -2472,7 +2472,7 @@ namespace TJAPlayer3
{ {
//大きい連打か小さい連打かの区別方法を考えてなかったよちくしょう //大きい連打か小さい連打かの区別方法を考えてなかったよちくしょう
if (TJAPlayer3.Tx.Notes[(int)_gt] != null) if (TJAPlayer3.Tx.Notes[(int)_gt] != null)
TJAPlayer3.Tx.Notes[(int)_gt].vc拡大縮小倍率.X = 1.0f; TJAPlayer3.Tx.Notes[(int)_gt].vcScaleRatio.X = 1.0f;
int n = 0; int n = 0;
switch (pChip.n連打音符State) switch (pChip.n連打音符State)
{ {
@ -2506,7 +2506,7 @@ namespace TJAPlayer3
((nPlayer != 1 ? TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] : ((nPlayer != 1 ? TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] :
(TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode)) || (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode)) ||
puchichara.effect.Autoroll > 0)) puchichara.effect.Autoroll > 0))
this.tチップのヒット処理(pChip.n発声時刻ms, pChip, E楽器パート.TAIKO, false, 0, nPlayer, puchichara.effect.Autoroll > 0); this.tチップのヒット処理(pChip.n発声時刻ms, pChip, EInstrumentPad.TAIKO, false, 0, nPlayer, puchichara.effect.Autoroll > 0);
} }
} }
#endregion #endregion
@ -2570,12 +2570,12 @@ namespace TJAPlayer3
if( pChip.bBranch ) if( pChip.bBranch )
{ {
//this.tx小節線_branch.t2D描画( CDTXMania.app.Device, x - 3, y, new Rectangle( 0, 0, 3, 130 ) ); //this.tx小節線_branch.t2D描画( CDTXMania.app.Device, x - 3, y, new Rectangle( 0, 0, 3, 130 ) );
TJAPlayer3.Tx.Bar_Branch?.t2D描画( x + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar_Branch.szテクスチャサイズ.Width) / 2), y, new Rectangle( 0, 0, TJAPlayer3.Tx.Bar_Branch.szテクスチャサイズ.Width, TJAPlayer3.Skin.Game_Notes_Size[1]) ); TJAPlayer3.Tx.Bar_Branch?.t2D描画( x + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar_Branch.szTextureSize.Width) / 2), y, new Rectangle( 0, 0, TJAPlayer3.Tx.Bar_Branch.szTextureSize.Width, TJAPlayer3.Skin.Game_Notes_Size[1]) );
} }
else else
{ {
//this.tx小節線.t2D描画( CDTXMania.app.Device, x - 3, y, new Rectangle( 0, 0, 3, 130 ) ); //this.tx小節線.t2D描画( CDTXMania.app.Device, x - 3, y, new Rectangle( 0, 0, 3, 130 ) );
TJAPlayer3.Tx.Bar?.t2D描画( x + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar.szテクスチャサイズ.Width) / 2), y, new Rectangle( 0, 0, TJAPlayer3.Tx.Bar.szテクスチャサイズ.Width, TJAPlayer3.Skin.Game_Notes_Size[1]) ); TJAPlayer3.Tx.Bar?.t2D描画( x + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar.szTextureSize.Width) / 2), y, new Rectangle( 0, 0, TJAPlayer3.Tx.Bar.szTextureSize.Width, TJAPlayer3.Skin.Game_Notes_Size[1]) );
} }
} }
} }
@ -2651,7 +2651,7 @@ namespace TJAPlayer3
{ {
if (!_isSwapNote) if (!_isSwapNote)
{ {
this.tドラムヒット処理(chipNoHit.nProcessTime, Eパッド.RRed, chipNoHit, false, i); this.tドラムヒット処理(chipNoHit.nProcessTime, EPad.RRed, chipNoHit, false, i);
//this.nWaitButton = 0; //this.nWaitButton = 0;
this.nStoredHit[i] = 0; this.nStoredHit[i] = 0;
chipNoHit.bHit = true; chipNoHit.bHit = true;
@ -2668,11 +2668,11 @@ namespace TJAPlayer3
//string strNull = "Found"; //string strNull = "Found";
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1))
{ {
if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE == false) if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE == false)
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
SoundManager.PlayTimer.Pause(); SoundManager.PlayTimer.Pause();
TJAPlayer3.Timer.Pause(); TJAPlayer3.Timer.Pause();

132
OpenTaiko/src/Stages/07.Game/Taiko/Dan_Cert.cs
View File

@ -58,19 +58,19 @@ namespace TJAPlayer3
for (int j = 0; j < CExamInfo.cMaxExam; j++) for (int j = 0; j < CExamInfo.cMaxExam; j++)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[0].Dan_C[j] != null) if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[0].Dan_C[j] != null)
{ {
Challenge[j] = TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[j]; Challenge[j] = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j];
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count - 1].Dan_C[j] != null if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count - 1].Dan_C[j] != null
&& TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count > 1) // Individual exams, not counted if dan is only a single song && TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count > 1) // Individual exams, not counted if dan is only a single song
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[j].GetExamRange() == Exam.Range.Less) if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].GetExamRange() == Exam.Range.Less)
{ {
TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[j].Amount = TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[j].Value[0]; TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Amount = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Value[0];
} }
else else
{ {
TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[j].Amount = 0; TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Amount = 0;
} }
ExamChange[j] = true; ExamChange[j] = true;
@ -79,7 +79,7 @@ namespace TJAPlayer3
} }
} }
ScreenPoint = new double[] { TJAPlayer3.Skin.Game_Lane_X[0] - TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, TJAPlayer3.Skin.Resolution[0] }; ScreenPoint = new double[] { TJAPlayer3.Skin.Game_Lane_X[0] - TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Skin.Resolution[0] };
TJAPlayer3.stage演奏ドラム画面.ReSetScore(TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].ScoreInit, TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].ScoreDiff); TJAPlayer3.stage演奏ドラム画面.ReSetScore(TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].ScoreInit, TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].ScoreDiff);
@ -104,11 +104,11 @@ namespace TJAPlayer3
{ {
if(TJAPlayer3.DTX.Dan_C[i] != null) Challenge[i] = new Dan_C(TJAPlayer3.DTX.Dan_C[i]); if(TJAPlayer3.DTX.Dan_C[i] != null) Challenge[i] = new Dan_C(TJAPlayer3.DTX.Dan_C[i]);
for (int j = 0; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; j++) for (int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[j].Dan_C[i] != null) if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] != null)
{ {
TJAPlayer3.stage選曲.r確定された曲.DanSongs[j].Dan_C[i] = new Dan_C(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j].Dan_C[i]); TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] = new Dan_C(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i]);
} }
} }
} }
@ -120,7 +120,7 @@ namespace TJAPlayer3
// 始点を決定する。 // 始点を決定する。
// ExamCount = 0; // ExamCount = 0;
songsnotesremain = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; songsnotesremain = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
this.ct虹アニメ = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn - 1, 30, TJAPlayer3.Timer); this.ct虹アニメ = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn - 1, 30, TJAPlayer3.Timer);
this.ct虹透明度 = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Rainbow_Timer - 1, 1, TJAPlayer3.Timer); this.ct虹透明度 = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Rainbow_Timer - 1, 1, TJAPlayer3.Timer);
@ -143,9 +143,9 @@ namespace TJAPlayer3
Status[i].Timer_Failed = new CCounter(); Status[i].Timer_Failed = new CCounter();
} }
IsEnded = new bool[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; IsEnded = new bool[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) IsAnimating = true; if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) IsAnimating = true;
Dan_Plate = TJAPlayer3.tテクスチャの生成(Path.GetDirectoryName(TJAPlayer3.DTX.strファイル名の絶対パス) + @$"{Path.DirectorySeparatorChar}Dan_Plate.png"); Dan_Plate = TJAPlayer3.tテクスチャの生成(Path.GetDirectoryName(TJAPlayer3.DTX.strファイル名の絶対パス) + @$"{Path.DirectorySeparatorChar}Dan_Plate.png");
@ -157,7 +157,7 @@ namespace TJAPlayer3
for (int i = 0; i < CExamInfo.cMaxExam; i++) for (int i = 0; i < CExamInfo.cMaxExam; i++)
{ {
if (Challenge[i] == null || !Challenge[i].GetEnable()) continue; if (Challenge[i] == null || !Challenge[i].GetEnable()) continue;
if (ExamChange[i] && Challenge[i] != TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[i]) continue; if (ExamChange[i] && Challenge[i] != TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[i]) continue;
var oldReached = Challenge[i].GetReached(); var oldReached = Challenge[i].GetReached();
var isChangedAmount = false; var isChangedAmount = false;
@ -388,7 +388,7 @@ namespace TJAPlayer3
public override int Draw() public override int Draw()
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) return base.Draw(); if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) return base.Draw();
Counter_In?.Tick(); Counter_In?.Tick();
Counter_Wait?.Tick(); Counter_Wait?.Tick();
Counter_Out?.Tick(); Counter_Out?.Tick();
@ -449,8 +449,8 @@ namespace TJAPlayer3
ScreenPoint[1] += ((TJAPlayer3.Skin.Resolution[0] / 2 + TJAPlayer3.Skin.Game_Lane_X[0] / 2) - ScreenPoint[1]) / 180.0; ScreenPoint[1] += ((TJAPlayer3.Skin.Resolution[0] / 2 + TJAPlayer3.Skin.Game_Lane_X[0] / 2) - ScreenPoint[1]) / 180.0;
} }
Counter_In_Old = Counter_In.CurrentValue; Counter_In_Old = Counter_In.CurrentValue;
TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(0, 0, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Height)); TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(0, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height));
TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, 0, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Height)); TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height));
//CDTXMania.act文字コンソール.tPrint(0, 420, C文字コンソール.Eフォント種別.白, String.Format("{0} : {1}", ScreenPoint[0], ScreenPoint[1])); //CDTXMania.act文字コンソール.tPrint(0, 420, C文字コンソール.Eフォント種別.白, String.Format("{0} : {1}", ScreenPoint[0], ScreenPoint[1]));
} }
if (Counter_In.IsEnded) if (Counter_In.IsEnded)
@ -477,11 +477,11 @@ namespace TJAPlayer3
for (int j = 0; j < CExamInfo.cMaxExam; j++) for (int j = 0; j < CExamInfo.cMaxExam; j++)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[0].Dan_C[j] != null) if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[0].Dan_C[j] != null)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count - 1].Dan_C[j] != null) //個別の条件がありますよー if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count - 1].Dan_C[j] != null) //個別の条件がありますよー
{ {
Challenge[j] = TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[j]; Challenge[j] = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j];
ExamChange[j] = true; ExamChange[j] = true;
} }
} }
@ -524,9 +524,9 @@ namespace TJAPlayer3
if (Counter_Out.IsUnEnded) if (Counter_Out.IsUnEnded)
{ {
ScreenPoint[0] = TJAPlayer3.Skin.Game_Lane_X[0] - Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500; ScreenPoint[0] = TJAPlayer3.Skin.Game_Lane_X[0] - Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500;
ScreenPoint[1] = TJAPlayer3.Skin.Game_Lane_X[0] + TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2 + Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500; ScreenPoint[1] = TJAPlayer3.Skin.Game_Lane_X[0] + TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2 + Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500;
TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(0, 0, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Height)); TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(0, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height));
TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, 0, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.DanC_Screen.szテクスチャサイズ.Height)); TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height));
//CDTXMania.act文字コンソール.tPrint(0, 420, C文字コンソール.Eフォント種別.白, String.Format("{0} : {1}", ScreenPoint[0], ScreenPoint[1])); //CDTXMania.act文字コンソール.tPrint(0, 420, C文字コンソール.Eフォント種別.白, String.Format("{0} : {1}", ScreenPoint[0], ScreenPoint[1]));
} }
if (Counter_Out.IsEnded) if (Counter_Out.IsEnded)
@ -621,9 +621,9 @@ namespace TJAPlayer3
#region [Gauge base] #region [Gauge base]
if (!isSmallGauge) if (!isSmallGauge)
TJAPlayer3.Tx.DanC_Base?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? TJAPlayer3.Tx.DanC_Base.szテクスチャサイズ.Height / 2 : 0, TJAPlayer3.Tx.DanC_Base.szテクスチャサイズ.Width, TJAPlayer3.Tx.DanC_Base.szテクスチャサイズ.Height / 2)); TJAPlayer3.Tx.DanC_Base?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? TJAPlayer3.Tx.DanC_Base.szTextureSize.Height / 2 : 0, TJAPlayer3.Tx.DanC_Base.szTextureSize.Width, TJAPlayer3.Tx.DanC_Base.szTextureSize.Height / 2));
else else
TJAPlayer3.Tx.DanC_Base_Small?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? TJAPlayer3.Tx.DanC_Base_Small.szテクスチャサイズ.Height / 2 : 0, TJAPlayer3.Tx.DanC_Base_Small.szテクスチャサイズ.Width, TJAPlayer3.Tx.DanC_Base_Small.szテクスチャサイズ.Height / 2)); TJAPlayer3.Tx.DanC_Base_Small?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? TJAPlayer3.Tx.DanC_Base_Small.szTextureSize.Height / 2 : 0, TJAPlayer3.Tx.DanC_Base_Small.szTextureSize.Width, TJAPlayer3.Tx.DanC_Base_Small.szTextureSize.Height / 2));
#endregion #endregion
@ -638,28 +638,28 @@ namespace TJAPlayer3
if (ExamChange[i] == true) if (ExamChange[i] == true)
{ {
for (int j = 1; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; j++) for (int j = 1; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++)
{ {
if (!(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i] != null && TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[i] != null)) if (!(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i] != null && TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[i] != null))
continue; continue;
// rainbowBetterSuccess (bool) : is current minibar better success ? | drawGaugeTypetwo (int) : Gauge style [0,2] // rainbowBetterSuccess (bool) : is current minibar better success ? | drawGaugeTypetwo (int) : Gauge style [0,2]
#region [Success type variables] #region [Success type variables]
bool rainbowBetterSuccess = GetExamStatus(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success bool rainbowBetterSuccess = GetExamStatus(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success
&& GetExamConfirmStatus(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i]); && GetExamConfirmStatus(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]);
int amountToPercent; int amountToPercent;
int drawGaugeTypetwo = 0; int drawGaugeTypetwo = 0;
if (!rainbowBetterSuccess) if (!rainbowBetterSuccess)
{ {
amountToPercent = TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i].GetAmountToPercent(); amountToPercent = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent();
if (amountToPercent >= 100) if (amountToPercent >= 100)
drawGaugeTypetwo = 2; drawGaugeTypetwo = 2;
else if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i].GetExamRange() == Exam.Range.More && amountToPercent >= 70 || amountToPercent > 70) else if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetExamRange() == Exam.Range.More && amountToPercent >= 70 || amountToPercent > 70)
drawGaugeTypetwo = 1; drawGaugeTypetwo = 1;
} }
@ -721,7 +721,7 @@ namespace TJAPlayer3
if (NowShowingNumber >= j && (j - NowShowingNumber) > -2) if (NowShowingNumber >= j && (j - NowShowingNumber) > -2)
{ {
// Determine bars width // Determine bars width
TJAPlayer3.Tx.DanC_SmallBase.vc拡大縮小倍率.X = isSmallGauge ? 0.34f : 1f; TJAPlayer3.Tx.DanC_SmallBase.vcScaleRatio.X = isSmallGauge ? 0.34f : 1f;
int smallBarGap = (int)(33f * TJAPlayer3.Skin.Resolution[1] / 720f); int smallBarGap = (int)(33f * TJAPlayer3.Skin.Resolution[1] / 720f);
@ -741,30 +741,30 @@ namespace TJAPlayer3
// Display bar content // Display bar content
if (rainbowBetterSuccess) if (rainbowBetterSuccess)
{ {
TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vc拡大縮小倍率.X = 0.23875f * TJAPlayer3.Tx.DanC_SmallBase.vc拡大縮小倍率.X * (isSmallGauge ? 0.94f : 1f); TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.X = 0.23875f * TJAPlayer3.Tx.DanC_SmallBase.vcScaleRatio.X * (isSmallGauge ? 0.94f : 1f);
TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vc拡大縮小倍率.Y = 0.35185f; TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.Y = 0.35185f;
TJAPlayer3.Tx.Gauge_Dan_Rainbow[0]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2, TJAPlayer3.Tx.Gauge_Dan_Rainbow[0]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2,
new Rectangle(0, 0, (int)(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].szテクスチャサイズ.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].szテクスチャサイズ.Height)); new Rectangle(0, 0, (int)(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].szTextureSize.Height));
} }
else else
{ {
TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].vc拡大縮小倍率.X = 0.23875f * TJAPlayer3.Tx.DanC_SmallBase.vc拡大縮小倍率.X * (isSmallGauge ? 0.94f : 1f); TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].vcScaleRatio.X = 0.23875f * TJAPlayer3.Tx.DanC_SmallBase.vcScaleRatio.X * (isSmallGauge ? 0.94f : 1f);
TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].vc拡大縮小倍率.Y = 0.35185f; TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].vcScaleRatio.Y = 0.35185f;
TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2, TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2,
new Rectangle(0, 0, (int)(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].szテクスチャサイズ.Width / 100.0)), TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].szテクスチャサイズ.Height)); new Rectangle(0, 0, (int)(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].szTextureSize.Height));
} }
int _tmpMiniPadding = (int)(14f * TJAPlayer3.Skin.Resolution[0] / 1280f); int _tmpMiniPadding = (int)(14f * TJAPlayer3.Skin.Resolution[0] / 1280f);
// Usually +23 for gold and +17 for white, to test // Usually +23 for gold and +17 for white, to test
DrawMiniNumber( DrawMiniNumber(
TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i].GetAmount(), TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmount(),
miniBarPositionX + 11, miniBarPositionX + 11,
miniBarPositionY + 20, miniBarPositionY + 20,
_tmpMiniPadding, _tmpMiniPadding,
TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i]); TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]);
CActSelect段位リスト.tDisplayDanIcon(j, miniBarPositionX + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset_Mini[0], miniBarPositionY + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset_Mini[1], miniIconOpacity, 0.5f, false); CActSelect段位リスト.tDisplayDanIcon(j, miniBarPositionX + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset_Mini[0], miniBarPositionY + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset_Mini[1], miniIconOpacity, 0.5f, false);
@ -902,11 +902,11 @@ namespace TJAPlayer3
{ {
#region [Rainbow gauge display] #region [Rainbow gauge display]
TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].vc拡大縮小倍率.X = xExtend; TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].vcScaleRatio.X = xExtend;
// Reset base since it was used for minibars // Reset base since it was used for minibars
TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vc拡大縮小倍率.X = xExtend; TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.X = xExtend;
TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vc拡大縮小倍率.Y = 1.0f; TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.Y = 1.0f;
if (Counter_Wait != null && !(Counter_Wait.CurrentValue <= 1055 && Counter_Wait.CurrentValue >= 800 - 255)) if (Counter_Wait != null && !(Counter_Wait.CurrentValue <= 1055 && Counter_Wait.CurrentValue >= 800 - 255))
{ {
@ -915,7 +915,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex]?.t2D拡大率考慮下基準描画( TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex]?.t2D拡大率考慮下基準描画(
barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1], barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1],
new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szテクスチャサイズ.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szテクスチャサイズ.Height)); new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Height));
if (Counter_Wait != null && !(Counter_Wait.CurrentValue <= 1055 && Counter_Wait.CurrentValue >= 800 - 255)) if (Counter_Wait != null && !(Counter_Wait.CurrentValue <= 1055 && Counter_Wait.CurrentValue >= 800 - 255))
{ {
@ -924,7 +924,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase]?.t2D拡大率考慮下基準描画( TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase]?.t2D拡大率考慮下基準描画(
barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1], barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1],
new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase].szテクスチャサイズ.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szテクスチャサイズ.Height)); new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Height));
#endregion #endregion
} }
@ -932,11 +932,11 @@ namespace TJAPlayer3
{ {
#region [Regular gauge display] #region [Regular gauge display]
TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].vc拡大縮小倍率.X = xExtend; TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].vcScaleRatio.X = xExtend;
TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].vc拡大縮小倍率.Y = 1.0f; TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].vcScaleRatio.Y = 1.0f;
TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo]?.t2D拡大率考慮下基準描画( TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo]?.t2D拡大率考慮下基準描画(
barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1], barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1],
new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].szテクスチャサイズ.Width / 100.0)), TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].szテクスチャサイズ.Height)); new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].szTextureSize.Height));
#endregion #endregion
} }
@ -981,12 +981,12 @@ namespace TJAPlayer3
int offset = TJAPlayer3.Skin.Game_DanC_Exam_Offset[0]; int offset = TJAPlayer3.Skin.Game_DanC_Exam_Offset[0];
TJAPlayer3.Tx.DanC_ExamType.vc拡大縮小倍率.X = 1.0f; TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.X = 1.0f;
TJAPlayer3.Tx.DanC_ExamType.vc拡大縮小倍率.Y = 1.0f; TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.Y = 1.0f;
// Exam range (Less than/More) // Exam range (Less than/More)
TJAPlayer3.Tx.DanC_ExamRange?.t2D拡大率考慮下基準描画( TJAPlayer3.Tx.DanC_ExamRange?.t2D拡大率考慮下基準描画(
barXOffset + offset - TJAPlayer3.Tx.DanC_ExamRange.szテクスチャサイズ.Width, barXOffset + offset - TJAPlayer3.Tx.DanC_ExamRange.szTextureSize.Width,
lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1],
new Rectangle(0, TJAPlayer3.Skin.Game_DanC_ExamRange_Size[1] * (int)dan_C[i].GetExamRange(), TJAPlayer3.Skin.Game_DanC_ExamRange_Size[0], TJAPlayer3.Skin.Game_DanC_ExamRange_Size[1])); new Rectangle(0, TJAPlayer3.Skin.Game_DanC_ExamRange_Size[1] * (int)dan_C[i].GetExamRange(), TJAPlayer3.Skin.Game_DanC_ExamRange_Size[0], TJAPlayer3.Skin.Game_DanC_ExamRange_Size[1]));
@ -1003,7 +1003,7 @@ namespace TJAPlayer3
int _offexX = (int)(22f * TJAPlayer3.Skin.Resolution[0] / 1280f); int _offexX = (int)(22f * TJAPlayer3.Skin.Resolution[0] / 1280f);
int _offexY = (int)(48f * TJAPlayer3.Skin.Resolution[1] / 720f); int _offexY = (int)(48f * TJAPlayer3.Skin.Resolution[1] / 720f);
int _examX = barXOffset + TJAPlayer3.Skin.Game_DanC_Exam_Offset[0] - TJAPlayer3.Tx.DanC_ExamType.szテクスチャサイズ.Width + _offexX; int _examX = barXOffset + TJAPlayer3.Skin.Game_DanC_Exam_Offset[0] - TJAPlayer3.Tx.DanC_ExamType.szTextureSize.Width + _offexX;
int _examY = lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1] - _offexY; int _examY = lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1] - _offexY;
// Exam type flag // Exam type flag
@ -1013,7 +1013,7 @@ namespace TJAPlayer3
new Rectangle(0, 0, TJAPlayer3.Skin.Game_DanC_ExamType_Size[0], TJAPlayer3.Skin.Game_DanC_ExamType_Size[1])); new Rectangle(0, 0, TJAPlayer3.Skin.Game_DanC_ExamType_Size[0], TJAPlayer3.Skin.Game_DanC_ExamType_Size[1]));
if ((int)dan_C[i].GetExamType() < this.ttkExams.Length) if ((int)dan_C[i].GetExamType() < this.ttkExams.Length)
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[(int)dan_C[i].GetExamType()]).t2D拡大率考慮中央基準描画( TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkExams[(int)dan_C[i].GetExamType()]).t2D拡大率考慮中央基準描画(
_examX + TJAPlayer3.Skin.Game_DanC_ExamType_Size[0] / 2, _examX + TJAPlayer3.Skin.Game_DanC_ExamType_Size[0] / 2,
_examY - TJAPlayer3.Skin.Game_DanC_ExamType_Size[1] / 2); _examY - TJAPlayer3.Skin.Game_DanC_ExamType_Size[1] / 2);
@ -1029,7 +1029,7 @@ namespace TJAPlayer3
#region [Failed condition box] #region [Failed condition box]
TJAPlayer3.Tx.DanC_Failed.vc拡大縮小倍率.X = isSmallGauge ? 0.33f : 1f; TJAPlayer3.Tx.DanC_Failed.vcScaleRatio.X = isSmallGauge ? 0.33f : 1f;
if (dan_C[i].GetReached()) if (dan_C[i].GetReached())
{ {
@ -1055,7 +1055,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + 4, TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + 4,
TJAPlayer3.Skin.Game_DanC_Y[0]); TJAPlayer3.Skin.Game_DanC_Y[0]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[(int)Exam.Type.Gauge]).t2D拡大率考慮中央基準描画( TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkExams[(int)Exam.Type.Gauge]).t2D拡大率考慮中央基準描画(
TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + _offexX, TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + _offexX,
TJAPlayer3.Skin.Game_DanC_Y[0] + _offexY); TJAPlayer3.Skin.Game_DanC_Y[0] + _offexY);
@ -1109,8 +1109,8 @@ namespace TJAPlayer3
Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_Number_Size[0] * number - 1, GetExamConfirmStatus(dan_c) ? TJAPlayer3.Skin.Game_DanC_Number_Size[1] : 0, TJAPlayer3.Skin.Game_DanC_Number_Size[0], TJAPlayer3.Skin.Game_DanC_Number_Size[1]); Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_Number_Size[0] * number - 1, GetExamConfirmStatus(dan_c) ? TJAPlayer3.Skin.Game_DanC_Number_Size[1] : 0, TJAPlayer3.Skin.Game_DanC_Number_Size[0], TJAPlayer3.Skin.Game_DanC_Number_Size[1]);
if (TJAPlayer3.Tx.DanC_Number != null) if (TJAPlayer3.Tx.DanC_Number != null)
{ {
TJAPlayer3.Tx.DanC_Number.vc拡大縮小倍率.X = scaleX; TJAPlayer3.Tx.DanC_Number.vcScaleRatio.X = scaleX;
TJAPlayer3.Tx.DanC_Number.vc拡大縮小倍率.Y = scaleY + scaleJump; TJAPlayer3.Tx.DanC_Number.vcScaleRatio.Y = scaleY + scaleJump;
} }
TJAPlayer3.Tx.DanC_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); TJAPlayer3.Tx.DanC_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle);
notesRemainDigit--; notesRemainDigit--;
@ -1125,8 +1125,8 @@ namespace TJAPlayer3
Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_Small_Number_Size[0] * number - 1, 0, TJAPlayer3.Skin.Game_DanC_Small_Number_Size[0], TJAPlayer3.Skin.Game_DanC_Small_Number_Size[1]); Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_Small_Number_Size[0] * number - 1, 0, TJAPlayer3.Skin.Game_DanC_Small_Number_Size[0], TJAPlayer3.Skin.Game_DanC_Small_Number_Size[1]);
if (TJAPlayer3.Tx.DanC_Small_Number != null) if (TJAPlayer3.Tx.DanC_Small_Number != null)
{ {
TJAPlayer3.Tx.DanC_Small_Number.vc拡大縮小倍率.X = scaleX; TJAPlayer3.Tx.DanC_Small_Number.vcScaleRatio.X = scaleX;
TJAPlayer3.Tx.DanC_Small_Number.vc拡大縮小倍率.Y = scaleY + scaleJump; TJAPlayer3.Tx.DanC_Small_Number.vcScaleRatio.Y = scaleY + scaleJump;
} }
TJAPlayer3.Tx.DanC_Small_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); TJAPlayer3.Tx.DanC_Small_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle);
notesRemainDigit--; notesRemainDigit--;
@ -1162,11 +1162,11 @@ namespace TJAPlayer3
{ {
if (Challenge[i] == null) continue; if (Challenge[i] == null) continue;
for(int j = 0; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; j++ ) for(int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++ )
{ {
if(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j].Dan_C[i] != null) if(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] != null)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[j].Dan_C[i].GetReached()) isFailed = true; if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i].GetReached()) isFailed = true;
} }
} }
if (Challenge[i].GetReached()) isFailed = true; if (Challenge[i].GetReached()) isFailed = true;
@ -1189,12 +1189,12 @@ namespace TJAPlayer3
if (ExamChange[i] == true) if (ExamChange[i] == true)
{ {
for (int j = 1; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; j++) for (int j = 1; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++)
{ {
if (!(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i] != null)) if (!(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i] != null))
continue; continue;
bool rainbowBetterSuccess = GetExamStatus(TJAPlayer3.stage選曲.r確定された曲.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success; bool rainbowBetterSuccess = GetExamStatus(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success;
if (!rainbowBetterSuccess) status = Exam.Status.Success; if (!rainbowBetterSuccess) status = Exam.Status.Success;
} }

4
OpenTaiko/src/Stages/07.Game/Taiko/EndAnimeScript.cs
View File

@ -45,9 +45,9 @@ namespace TJAPlayer3
{ {
float currentFloorPositionMax140 = 0; float currentFloorPositionMax140 = 0;
if (TJAPlayer3.stage選曲.r確定された曲.arスコア[5] != null) if (TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5] != null)
{ {
int maxFloor = TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor; int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor;
int nightTime = Math.Max(140, maxFloor / 2); int nightTime = Math.Max(140, maxFloor / 2);
currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f);

24
OpenTaiko/src/Stages/07.Game/Taiko/NotesManager.cs
View File

@ -108,29 +108,29 @@ namespace TJAPlayer3
public static bool IsExpectedPad(int stored, int hit, CDTX.CChip chip, EGameType gt) public static bool IsExpectedPad(int stored, int hit, CDTX.CChip chip, EGameType gt)
{ {
var inPad = (Eパッド)hit; var inPad = (EPad)hit;
var onPad = (Eパッド)stored; var onPad = (EPad)stored;
if (chip == null) return false; if (chip == null) return false;
if (IsBigKaTaiko(chip, gt)) if (IsBigKaTaiko(chip, gt))
{ {
return (inPad == Eパッド.LBlue && onPad == Eパッド.RBlue) return (inPad == EPad.LBlue && onPad == EPad.RBlue)
|| (inPad == Eパッド.RBlue && onPad == Eパッド.LBlue); || (inPad == EPad.RBlue && onPad == EPad.LBlue);
} }
if (IsBigDonTaiko(chip, gt)) if (IsBigDonTaiko(chip, gt))
{ {
return (inPad == Eパッド.LRed && onPad == Eパッド.RRed) return (inPad == EPad.LRed && onPad == EPad.RRed)
|| (inPad == Eパッド.RRed && onPad == Eパッド.LRed); || (inPad == EPad.RRed && onPad == EPad.LRed);
} }
if (IsSwapNote(chip, gt)) if (IsSwapNote(chip, gt))
{ {
bool hitBlue = inPad == Eパッド.LBlue || inPad == Eパッド.RBlue; bool hitBlue = inPad == EPad.LBlue || inPad == EPad.RBlue;
bool hitRed = inPad == Eパッド.LRed || inPad == Eパッド.RRed; bool hitRed = inPad == EPad.LRed || inPad == EPad.RRed;
bool storedBlue = onPad == Eパッド.LBlue || onPad == Eパッド.RBlue; bool storedBlue = onPad == EPad.LBlue || onPad == EPad.RBlue;
bool storedRed = onPad == Eパッド.LRed || onPad == Eパッド.RRed; bool storedRed = onPad == EPad.LRed || onPad == EPad.RRed;
return (storedRed && hitBlue) return (storedRed && hitBlue)
|| (storedBlue && hitRed); || (storedBlue && hitRed);
@ -443,7 +443,7 @@ namespace TJAPlayer3
_texarr.color4 = normalColor; _texarr.color4 = normalColor;
// Body // Body
_texarr.vc拡大縮小倍率.X = (float)div; _texarr.vcScaleRatio.X = (float)div;
_texarr.fZ軸中心回転 = (float)theta; _texarr.fZ軸中心回転 = (float)theta;
//var _x0 = x + _adjust; //var _x0 = x + _adjust;
//var _y0 = y + 0f; //var _y0 = y + 0f;
@ -455,7 +455,7 @@ namespace TJAPlayer3
//t2D拡大率考慮中央基準描画 t2D中心基準描画 //t2D拡大率考慮中央基準描画 t2D中心基準描画
// Tail // Tail
_texarr.vc拡大縮小倍率.X = 1.0f; _texarr.vcScaleRatio.X = 1.0f;
//var _x0 = x末端 + _adjust; //var _x0 = x末端 + _adjust;
//var _y0 = y末端 + 0f; //var _y0 = y末端 + 0f;
var _d = _adjust; var _d = _adjust;

16
OpenTaiko/src/Stages/07.Game/Taiko/Rainbow.cs
View File

@ -91,15 +91,15 @@ namespace TJAPlayer3
if (this.Rainbow1P[f].Counter.CurrentValue < 82) if (this.Rainbow1P[f].Counter.CurrentValue < 82)
{ {
int nRectX = ((this.Rainbow1P[f].Counter.CurrentValue * TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Width) / 85); int nRectX = ((this.Rainbow1P[f].Counter.CurrentValue * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85);
TJAPlayer3.Tx.Effects_Rainbow.t2D描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0], TJAPlayer3.Skin.Game_Effect_Rainbow_Y[0], TJAPlayer3.Tx.Effects_Rainbow.t2D描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0], TJAPlayer3.Skin.Game_Effect_Rainbow_Y[0],
new Rectangle(0, 0, nRectX, TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Height)); new Rectangle(0, 0, nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height));
} }
else if (this.Rainbow1P[f].Counter.CurrentValue >= 82) else if (this.Rainbow1P[f].Counter.CurrentValue >= 82)
{ {
int nRectX = (((this.Rainbow1P[f].Counter.CurrentValue - 82) * TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Width) / 85); int nRectX = (((this.Rainbow1P[f].Counter.CurrentValue - 82) * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85);
TJAPlayer3.Tx.Effects_Rainbow.t2D描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0] + nRectX, TJAPlayer3.Skin.Game_Effect_Rainbow_Y[0], TJAPlayer3.Tx.Effects_Rainbow.t2D描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0] + nRectX, TJAPlayer3.Skin.Game_Effect_Rainbow_Y[0],
new Rectangle(nRectX, 0, TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Width - nRectX, TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Height)); new Rectangle(nRectX, 0, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width - nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height));
} }
} }
@ -123,15 +123,15 @@ namespace TJAPlayer3
if (this.Rainbow2P[f].Counter.CurrentValue < 82) if (this.Rainbow2P[f].Counter.CurrentValue < 82)
{ {
int nRectX = ((this.Rainbow2P[f].Counter.CurrentValue * TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Width) / 85); int nRectX = ((this.Rainbow2P[f].Counter.CurrentValue * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85);
TJAPlayer3.Tx.Effects_Rainbow.t2D上下反転描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0], TJAPlayer3.Skin.Game_Effect_Rainbow_Y[1], TJAPlayer3.Tx.Effects_Rainbow.t2D上下反転描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0], TJAPlayer3.Skin.Game_Effect_Rainbow_Y[1],
new Rectangle(0, 0, nRectX, TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Height)); new Rectangle(0, 0, nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height));
} }
else if (this.Rainbow2P[f].Counter.CurrentValue >= 82) else if (this.Rainbow2P[f].Counter.CurrentValue >= 82)
{ {
int nRectX = (((this.Rainbow2P[f].Counter.CurrentValue - 82) * TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Width) / 85); int nRectX = (((this.Rainbow2P[f].Counter.CurrentValue - 82) * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85);
TJAPlayer3.Tx.Effects_Rainbow.t2D上下反転描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0] + nRectX, TJAPlayer3.Skin.Game_Effect_Rainbow_Y[1], TJAPlayer3.Tx.Effects_Rainbow.t2D上下反転描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0] + nRectX, TJAPlayer3.Skin.Game_Effect_Rainbow_Y[1],
new Rectangle(nRectX, 0, TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Width - nRectX, TJAPlayer3.Tx.Effects_Rainbow.szテクスチャサイズ.Height)); new Rectangle(nRectX, 0, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width - nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height));
} }
} }

12
OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs
View File

@ -58,8 +58,8 @@ namespace TJAPlayer3
{ {
if (Textures[fileName] != null) if (Textures[fileName] != null)
{ {
Textures[fileName].vc拡大縮小倍率.X = (float)xscale; Textures[fileName].vcScaleRatio.X = (float)xscale;
Textures[fileName].vc拡大縮小倍率.Y = (float)yscale; Textures[fileName].vcScaleRatio.Y = (float)yscale;
} }
} }
public void SetRotation(double angle, string fileName) public void SetRotation(double angle, string fileName)
@ -121,7 +121,7 @@ namespace TJAPlayer3
{ {
if (Textures[fileName] != null) if (Textures[fileName] != null)
{ {
return Textures[fileName].szテクスチャサイズ.Width; return Textures[fileName].szTextureSize.Width;
} }
return -1; return -1;
} }
@ -130,7 +130,7 @@ namespace TJAPlayer3
{ {
if (Textures[fileName] != null) if (Textures[fileName] != null)
{ {
return Textures[fileName].szテクスチャサイズ.Height; return Textures[fileName].szTextureSize.Height;
} }
return -1; return -1;
} }
@ -272,9 +272,9 @@ namespace TJAPlayer3
{ {
float currentFloorPositionMax140 = 0; float currentFloorPositionMax140 = 0;
if (TJAPlayer3.stage選曲.r確定された曲 != null && TJAPlayer3.stage選曲.r確定された曲.arスコア[5] != null) if (TJAPlayer3.stageSongSelect.rChoosenSong != null && TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5] != null)
{ {
int maxFloor = TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor; int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor;
int nightTime = Math.Max(140, maxFloor / 2); int nightTime = Math.Max(140, maxFloor / 2);
currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f);

190
OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs
View File

@ -169,7 +169,7 @@ namespace TJAPlayer3
public void tSkipResultAnimations() public void tSkipResultAnimations()
{ {
TJAPlayer3.stage結果.Background.SkipAnimation(); TJAPlayer3.stage結果.Background.SkipAnimation();
ct全体進行.CurrentValue = (int)MountainAppearValue; ctMainCounter.CurrentValue = (int)MountainAppearValue;
for (int i = 0; i < b音声再生.Length; i++) for (int i = 0; i < b音声再生.Length; i++)
{ {
@ -214,7 +214,7 @@ namespace TJAPlayer3
} }
} }
ct全体進行 = new CCounter(0, 50000, 1, TJAPlayer3.Timer); ctMainCounter = new CCounter(0, 50000, 1, TJAPlayer3.Timer);
ctゲージアニメ = new CCounter[5]; ctゲージアニメ = new CCounter[5];
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
@ -309,7 +309,7 @@ namespace TJAPlayer3
} }
this.ct表示用.Tick(); this.ct表示用.Tick();
ct全体進行.Tick(); ctMainCounter.Tick();
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
ctゲージアニメ[i].Tick(); ctゲージアニメ[i].Tick();
@ -326,7 +326,7 @@ namespace TJAPlayer3
// this.PuchiChara.IdleAnimation(); // this.PuchiChara.IdleAnimation();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
{ {
int[] namePlate_x = new int[5]; int[] namePlate_x = new int[5];
int[] namePlate_y = new int[5]; int[] namePlate_y = new int[5];
@ -416,7 +416,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.nPlayerCount == 5) if (TJAPlayer3.ConfigIni.nPlayerCount == 5)
{ {
_frame.vc拡大縮小倍率.X = 0.5f; _frame.vcScaleRatio.X = 0.5f;
bar_x = TJAPlayer3.Skin.Result_DifficultyBar_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; bar_x = TJAPlayer3.Skin.Result_DifficultyBar_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos];
bar_y = TJAPlayer3.Skin.Result_DifficultyBar_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; bar_y = TJAPlayer3.Skin.Result_DifficultyBar_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos];
gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos];
@ -424,7 +424,7 @@ namespace TJAPlayer3
} }
else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3)
{ {
_frame.vc拡大縮小倍率.X = 0.5f; _frame.vcScaleRatio.X = 0.5f;
bar_x = TJAPlayer3.Skin.Result_DifficultyBar_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; bar_x = TJAPlayer3.Skin.Result_DifficultyBar_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos];
bar_y = TJAPlayer3.Skin.Result_DifficultyBar_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; bar_y = TJAPlayer3.Skin.Result_DifficultyBar_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos];
gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos];
@ -432,7 +432,7 @@ namespace TJAPlayer3
} }
else else
{ {
_frame.vc拡大縮小倍率.X = 1.0f; _frame.vcScaleRatio.X = 1.0f;
bar_x = TJAPlayer3.Skin.Result_DifficultyBar_X[pos] + uioffset_x; bar_x = TJAPlayer3.Skin.Result_DifficultyBar_X[pos] + uioffset_x;
bar_y = TJAPlayer3.Skin.Result_DifficultyBar_Y[pos]; bar_y = TJAPlayer3.Skin.Result_DifficultyBar_Y[pos];
gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_X[pos] + uioffset_x; gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_X[pos] + uioffset_x;
@ -440,13 +440,13 @@ namespace TJAPlayer3
} }
TJAPlayer3.Tx.Result_Diff_Bar.t2D描画(bar_x, bar_y, TJAPlayer3.Tx.Result_Diff_Bar.t2D描画(bar_x, bar_y,
new RectangleF(0, TJAPlayer3.stage選曲.n確定された曲の難易度[i] * TJAPlayer3.Skin.Result_DifficultyBar_Size[1], TJAPlayer3.Skin.Result_DifficultyBar_Size[0], TJAPlayer3.Skin.Result_DifficultyBar_Size[1])); new RectangleF(0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i] * TJAPlayer3.Skin.Result_DifficultyBar_Size[1], TJAPlayer3.Skin.Result_DifficultyBar_Size[0], TJAPlayer3.Skin.Result_DifficultyBar_Size[1]));
_frame.t2D描画(gauge_base_x, gauge_base_y); _frame.t2D描画(gauge_base_x, gauge_base_y);
_frame.vc拡大縮小倍率.X = 1.0f; _frame.vcScaleRatio.X = 1.0f;
} }
if (ct全体進行.CurrentValue >= 2000) if (ctMainCounter.CurrentValue >= 2000)
{ {
#region [ Gauge updates ] #region [ Gauge updates ]
@ -460,7 +460,7 @@ namespace TJAPlayer3
if (!ctゲージアニメ[i].IsTicked) if (!ctゲージアニメ[i].IsTicked)
{ {
ctゲージアニメ[i].Start(0, gaugeValues[i] / 2, 59, TJAPlayer3.Timer); ctゲージアニメ[i].Start(0, gaugeValues[i] / 2, 59, TJAPlayer3.Timer);
if (ct全体進行.CurrentValue >= MountainAppearValue) if (ctMainCounter.CurrentValue >= MountainAppearValue)
ctゲージアニメ[i].CurrentValue = (int)ctゲージアニメ[i].EndValue; ctゲージアニメ[i].CurrentValue = (int)ctゲージアニメ[i].EndValue;
} }
@ -498,7 +498,7 @@ namespace TJAPlayer3
#endregion #endregion
} }
if (ct全体進行.CurrentValue >= 2000) if (ctMainCounter.CurrentValue >= 2000)
{ {
// Change score kiroku to total scores to have the contents for both players, unbloat it // Change score kiroku to total scores to have the contents for both players, unbloat it
{ {
@ -599,7 +599,7 @@ namespace TJAPlayer3
for (int k = 0; k < 7; k++) for (int k = 0; k < 7; k++)
{ {
if (ct全体進行.CurrentValue >= AnimeCount + (Interval * k)) if (ctMainCounter.CurrentValue >= AnimeCount + (Interval * k))
{ {
float numScale = 1.0f; float numScale = 1.0f;
@ -611,16 +611,16 @@ namespace TJAPlayer3
{ {
numScale = TJAPlayer3.Skin.Result_Number_Scale_4P; numScale = TJAPlayer3.Skin.Result_Number_Scale_4P;
} }
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.X = ct全体進行.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f; TJAPlayer3.Tx.Result_Number.vcScaleRatio.X = ctMainCounter.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f;
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.Y = ct全体進行.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f; TJAPlayer3.Tx.Result_Number.vcScaleRatio.Y = ctMainCounter.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f;
if ((k != 5 || TJAPlayer3.Skin.Result_ADLib_Show) && (k != 6 || TJAPlayer3.Skin.Result_Bomb_Show)) if ((k != 5 || TJAPlayer3.Skin.Result_ADLib_Show) && (k != 6 || TJAPlayer3.Skin.Result_Bomb_Show))
{ {
this.t小文字表示(num_x[k][pos] + uioffset_x, num_y[k][pos], scoresArr[k], numScale); this.t小文字表示(num_x[k][pos] + uioffset_x, num_y[k][pos], scoresArr[k], numScale);
} }
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.Result_Number.vcScaleRatio.X = 1f;
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.Result_Number.vcScaleRatio.Y = 1f;
if (!this.b音声再生[1 + k]) if (!this.b音声再生[1 + k])
{ {
@ -639,7 +639,7 @@ namespace TJAPlayer3
#region [ Score display ] #region [ Score display ]
if (ct全体進行.CurrentValue >= AnimeCount + Interval * 4 + 840) if (ctMainCounter.CurrentValue >= AnimeCount + Interval * 4 + 840)
{ {
float numScale = 1.0f; float numScale = 1.0f;
int score_x; int score_x;
@ -664,12 +664,12 @@ namespace TJAPlayer3
int AnimeCount1 = AnimeCount + Interval * 4 + 840; int AnimeCount1 = AnimeCount + Interval * 4 + 840;
TJAPlayer3.Tx.Result_Score_Number.vc拡大縮小倍率.X = ct全体進行.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ct全体進行.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f : TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.X = ctMainCounter.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f :
ct全体進行.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ct全体進行.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f; ctMainCounter.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f;
TJAPlayer3.Tx.Result_Score_Number.vc拡大縮小倍率.Y = ct全体進行.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ct全体進行.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f : TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.Y = ctMainCounter.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f :
ct全体進行.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ct全体進行.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f; ctMainCounter.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f;
this.tスコア文字表示(score_x, score_y, (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, i), numScale);// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString())); this.tスコア文字表示(score_x, score_y, (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, i), numScale);// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString()));
if (!b音声再生[8]) if (!b音声再生[8])
{ {
@ -700,8 +700,8 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.Result_AIBattle_Panel_AI.t2D描画(0, 0); TJAPlayer3.Tx.Result_AIBattle_Panel_AI.t2D描画(0, 0);
int batch_width = TJAPlayer3.Tx.Result_AIBattle_Batch.szテクスチャサイズ.Width / 3; int batch_width = TJAPlayer3.Tx.Result_AIBattle_Batch.szTextureSize.Width / 3;
int batch_height = TJAPlayer3.Tx.Result_AIBattle_Batch.szテクスチャサイズ.Height; int batch_height = TJAPlayer3.Tx.Result_AIBattle_Batch.szTextureSize.Height;
for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count; i++) for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count; i++)
@ -724,15 +724,15 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = opacityCounter; TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = opacityCounter;
TJAPlayer3.Tx.Result_AIBattle_SectionPlate.Opacity = opacityCounter; TJAPlayer3.Tx.Result_AIBattle_SectionPlate.Opacity = opacityCounter;
if (TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkAISection[i]) != null) if (TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkAISection[i]) != null)
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkAISection[i]).Opacity = opacityCounter; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkAISection[i]).Opacity = opacityCounter;
} }
else else
{ {
TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = 255 - opacityCounter; TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = 255 - opacityCounter;
TJAPlayer3.Tx.Result_AIBattle_SectionPlate.Opacity = 255 - opacityCounter; TJAPlayer3.Tx.Result_AIBattle_SectionPlate.Opacity = 255 - opacityCounter;
if (TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkAISection[i]) != null) if (TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkAISection[i]) != null)
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkAISection[i]).Opacity = 255 - opacityCounter; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkAISection[i]).Opacity = 255 - opacityCounter;
} }
TJAPlayer3.Tx.Result_AIBattle_Batch.t2D描画(x, y, new RectangleF(batch_width * 0, 0, batch_width, batch_height)); TJAPlayer3.Tx.Result_AIBattle_Batch.t2D描画(x, y, new RectangleF(batch_width * 0, 0, batch_width, batch_height));
@ -751,17 +751,17 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Result_AIBattle_SectionPlate.t2D描画(x + TJAPlayer3.Skin.Result_AIBattle_SectionPlate_Offset[0], y + TJAPlayer3.Skin.Result_AIBattle_SectionPlate_Offset[1]); TJAPlayer3.Tx.Result_AIBattle_SectionPlate.t2D描画(x + TJAPlayer3.Skin.Result_AIBattle_SectionPlate_Offset[0], y + TJAPlayer3.Skin.Result_AIBattle_SectionPlate_Offset[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkAISection[i])?.t2D中心基準描画(x + TJAPlayer3.Skin.Result_AIBattle_SectionText_Offset[0], y + TJAPlayer3.Skin.Result_AIBattle_SectionText_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkAISection[i])?.t2D中心基準描画(x + TJAPlayer3.Skin.Result_AIBattle_SectionText_Offset[0], y + TJAPlayer3.Skin.Result_AIBattle_SectionText_Offset[1]);
} }
if (ct全体進行.CurrentValue >= MountainAppearValue) if (ctMainCounter.CurrentValue >= MountainAppearValue)
{ {
float flagScale = 2.0f - (Math.Min(Math.Max(ct全体進行.CurrentValue - MountainAppearValue, 0), 200) / 200.0f); float flagScale = 2.0f - (Math.Min(Math.Max(ctMainCounter.CurrentValue - MountainAppearValue, 0), 200) / 200.0f);
CTexture tex = TJAPlayer3.stage結果.bClear[0] ? TJAPlayer3.Tx.Result_AIBattle_WinFlag_Clear : TJAPlayer3.Tx.Result_AIBattle_WinFlag_Lose; CTexture tex = TJAPlayer3.stage結果.bClear[0] ? TJAPlayer3.Tx.Result_AIBattle_WinFlag_Clear : TJAPlayer3.Tx.Result_AIBattle_WinFlag_Lose;
tex.vc拡大縮小倍率.X = flagScale; tex.vcScaleRatio.X = flagScale;
tex.vc拡大縮小倍率.Y = flagScale; tex.vcScaleRatio.Y = flagScale;
tex.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_AIBattle_WinFlag[0], TJAPlayer3.Skin.Result_AIBattle_WinFlag[1]); tex.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_AIBattle_WinFlag[0], TJAPlayer3.Skin.Result_AIBattle_WinFlag[1]);
} }
@ -784,7 +784,7 @@ namespace TJAPlayer3
if (is2PSide) if (is2PSide)
pos = 1; pos = 1;
if (ct全体進行.CurrentValue >= MountainAppearValue) if (ctMainCounter.CurrentValue >= MountainAppearValue)
{ {
#region [Mountain animation counter setup] #region [Mountain animation counter setup]
@ -822,7 +822,7 @@ namespace TJAPlayer3
//int chara_x = TJAPlayer3.Skin.Characters_Result_X[_charaId][pos]; //int chara_x = TJAPlayer3.Skin.Characters_Result_X[_charaId][pos];
//int chara_y = TJAPlayer3.Skin.Characters_Result_Y[_charaId][pos]; //int chara_y = TJAPlayer3.Skin.Characters_Result_Y[_charaId][pos];
int chara_x = namePlate_x[pos] - (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] ? uioffset_x : 0) + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2; int chara_x = namePlate_x[pos] - (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] ? uioffset_x : 0) + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2;
int chara_y = namePlate_y[pos]; int chara_y = namePlate_y[pos];
int p1chara_x = is2PSide ? TJAPlayer3.Skin.Resolution[0] / 2 : 0; int p1chara_x = is2PSide ? TJAPlayer3.Skin.Resolution[0] / 2 : 0;
@ -837,8 +837,8 @@ namespace TJAPlayer3
var tex = pos == 0 ? TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId] : TJAPlayer3.Tx.Characters_Result_Clear_2P[_charaId]; var tex = pos == 0 ? TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId] : TJAPlayer3.Tx.Characters_Result_Clear_2P[_charaId];
if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && tex != null) if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && tex != null)
{ {
tex.vc拡大縮小倍率.X = renderRatioX; tex.vcScaleRatio.X = renderRatioX;
tex.vc拡大縮小倍率.Y = renderRatioY; tex.vcScaleRatio.Y = renderRatioY;
if (is2PSide) if (is2PSide)
{ {
tex.t2D左右反転描画(p1chara_x, p1chara_y); tex.t2D左右反転描画(p1chara_x, p1chara_y);
@ -854,8 +854,8 @@ namespace TJAPlayer3
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED, pos); CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED, pos);
if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId] != null) if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId] != null)
{ {
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.X = renderRatioX; TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.X = renderRatioX;
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.Y = renderRatioY; TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.Y = renderRatioY;
if (is2PSide) if (is2PSide)
{ {
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y); TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y);
@ -871,8 +871,8 @@ namespace TJAPlayer3
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED_IN, pos); CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED_IN, pos);
if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI) if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI)
{ {
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.X = renderRatioX; TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.X = renderRatioX;
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.Y = renderRatioY; TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.Y = renderRatioY;
if (is2PSide) if (is2PSide)
{ {
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y); TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y);
@ -903,7 +903,7 @@ namespace TJAPlayer3
#endregion #endregion
if (ct全体進行.CurrentValue >= MountainAppearValue) if (ctMainCounter.CurrentValue >= MountainAppearValue)
{ {
float AddCount = 135; float AddCount = 135;
@ -914,11 +914,11 @@ namespace TJAPlayer3
if (gaugeValues[p] >= 80.0f && TJAPlayer3.ConfigIni.nPlayerCount <= 2) if (gaugeValues[p] >= 80.0f && TJAPlayer3.ConfigIni.nPlayerCount <= 2)
{ {
TJAPlayer3.Tx.Result_Flower.vc拡大縮小倍率.X = 0.6f * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); TJAPlayer3.Tx.Result_Flower.vcScaleRatio.X = 0.6f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Flower.vc拡大縮小倍率.Y = 0.6f * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); TJAPlayer3.Tx.Result_Flower.vcScaleRatio.Y = 0.6f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
int flower_width = TJAPlayer3.Tx.Result_Flower.szテクスチャサイズ.Width; int flower_width = TJAPlayer3.Tx.Result_Flower.szTextureSize.Width;
int flower_height = TJAPlayer3.Tx.Result_Flower.szテクスチャサイズ.Height / 2; int flower_height = TJAPlayer3.Tx.Result_Flower.szTextureSize.Height / 2;
TJAPlayer3.Tx.Result_Flower.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Flower_X[pos], TJAPlayer3.Skin.Result_Flower_Y[pos], TJAPlayer3.Tx.Result_Flower.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Flower_X[pos], TJAPlayer3.Skin.Result_Flower_Y[pos],
new Rectangle(0, 0, flower_width, flower_height)); new Rectangle(0, 0, flower_width, flower_height));
@ -951,8 +951,8 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Result_Flower_Rotate[i].Opacity = (255 * CurrentGradiant) / ApparitionFade; TJAPlayer3.Tx.Result_Flower_Rotate[i].Opacity = (255 * CurrentGradiant) / ApparitionFade;
} }
TJAPlayer3.Tx.Result_Flower_Rotate[i].vc拡大縮小倍率.X = 0.6f; TJAPlayer3.Tx.Result_Flower_Rotate[i].vcScaleRatio.X = 0.6f;
TJAPlayer3.Tx.Result_Flower_Rotate[i].vc拡大縮小倍率.Y = 0.6f; TJAPlayer3.Tx.Result_Flower_Rotate[i].vcScaleRatio.Y = 0.6f;
TJAPlayer3.Tx.Result_Flower_Rotate[i].fZ軸中心回転 = (float)(FlowerTime - ApparitionTimeStamps[i]) / (FlowerRotationSpeeds[i] * 360f); TJAPlayer3.Tx.Result_Flower_Rotate[i].fZ軸中心回転 = (float)(FlowerTime - ApparitionTimeStamps[i]) / (FlowerRotationSpeeds[i] * 360f);
TJAPlayer3.Tx.Result_Flower_Rotate[i].t2D中心基準描画(TJAPlayer3.Skin.Result_Flower_Rotate_X[pos][i], TJAPlayer3.Skin.Result_Flower_Rotate_Y[pos][i]); TJAPlayer3.Tx.Result_Flower_Rotate[i].t2D中心基準描画(TJAPlayer3.Skin.Result_Flower_Rotate_X[pos][i], TJAPlayer3.Skin.Result_Flower_Rotate_Y[pos][i]);
@ -978,8 +978,8 @@ namespace TJAPlayer3
else else
TJAPlayer3.Tx.Result_Shine.Opacity = (255 * Math.Min(Quadrant500, 500 - Quadrant500)) / ShinePFade; TJAPlayer3.Tx.Result_Shine.Opacity = (255 * Math.Min(Quadrant500, 500 - Quadrant500)) / ShinePFade;
TJAPlayer3.Tx.Result_Shine.vc拡大縮小倍率.X = 0.15f; TJAPlayer3.Tx.Result_Shine.vcScaleRatio.X = 0.15f;
TJAPlayer3.Tx.Result_Shine.vc拡大縮小倍率.Y = 0.15f; TJAPlayer3.Tx.Result_Shine.vcScaleRatio.Y = 0.15f;
TJAPlayer3.Tx.Result_Shine.t2D中心基準描画(TJAPlayer3.Skin.Result_PlateShine_X[pos][i], TJAPlayer3.Skin.Result_PlateShine_Y[pos][i]); TJAPlayer3.Tx.Result_Shine.t2D中心基準描画(TJAPlayer3.Skin.Result_PlateShine_X[pos][i], TJAPlayer3.Skin.Result_PlateShine_Y[pos][i]);
} }
@ -1035,19 +1035,19 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) if (TJAPlayer3.ConfigIni.nPlayerCount <= 2)
{ {
int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szテクスチャサイズ.Width / 4; int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szTextureSize.Width / 4;
int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szテクスチャサイズ.Height / 3; int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szTextureSize.Height / 3;
TJAPlayer3.Tx.Result_Speech_Bubble[pos].vc拡大縮小倍率.X = 0.9f * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); TJAPlayer3.Tx.Result_Speech_Bubble[pos].vcScaleRatio.X = 0.9f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Speech_Bubble[pos].vc拡大縮小倍率.Y = 0.9f * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); TJAPlayer3.Tx.Result_Speech_Bubble[pos].vcScaleRatio.Y = 0.9f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Speech_Bubble[pos].t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Speech_Bubble_X[pos], TJAPlayer3.Skin.Result_Speech_Bubble_Y[pos], TJAPlayer3.Tx.Result_Speech_Bubble[pos].t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Speech_Bubble_X[pos], TJAPlayer3.Skin.Result_Speech_Bubble_Y[pos],
new Rectangle(Mood * speechBuddle_width, RandomText * speechBuddle_height, speechBuddle_width, speechBuddle_height)); new Rectangle(Mood * speechBuddle_width, RandomText * speechBuddle_height, speechBuddle_width, speechBuddle_height));
} }
int speech_vubble_index = TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? pos : 2; int speech_vubble_index = TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? pos : 2;
if (TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index] != null) if (TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index] != null)
{ {
int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szテクスチャサイズ.Width; int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szTextureSize.Width;
int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szテクスチャサイズ.Height / 6; int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szTextureSize.Height / 6;
int speech_bubble_x; int speech_bubble_x;
int speech_bubble_y; int speech_bubble_y;
@ -1077,14 +1077,14 @@ namespace TJAPlayer3
scale = 1.0f; scale = 1.0f;
} }
TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vc拡大縮小倍率.X = 0.9f * scale * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vcScaleRatio.X = 0.9f * scale * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vc拡大縮小倍率.Y = 0.9f * scale * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vcScaleRatio.Y = 0.9f * scale * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].t2D拡大率考慮中央基準描画(speech_bubble_x, speech_bubble_y, TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].t2D拡大率考慮中央基準描画(speech_bubble_x, speech_bubble_y,
new Rectangle(0, MoodV2 * speechBuddle_height, speechBuddle_width, speechBuddle_height)); new Rectangle(0, MoodV2 * speechBuddle_height, speechBuddle_width, speechBuddle_height));
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vc拡大縮小倍率.X = scale; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vcScaleRatio.X = scale;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vc拡大縮小倍率.Y = scale; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vcScaleRatio.Y = scale;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).t2D拡大率考慮中央基準描画( TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).t2D拡大率考慮中央基準描画(
speech_bubble_x + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[0] * scale), speech_bubble_x + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[0] * scale),
speech_bubble_y + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[1] * scale)); speech_bubble_y + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[1] * scale));
} }
@ -1113,34 +1113,34 @@ namespace TJAPlayer3
if (ct全体進行.CurrentValue >= ScoreApparitionTimeStamp + 1000) if (ctMainCounter.CurrentValue >= ScoreApparitionTimeStamp + 1000)
{ {
//if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) //if (TJAPlayer3.ConfigIni.nPlayerCount <= 2)
{ {
#region [Score rank apparition] #region [Score rank apparition]
int scoreRank_width = TJAPlayer3.Tx.Result_ScoreRankEffect.szテクスチャサイズ.Width / 7; int scoreRank_width = TJAPlayer3.Tx.Result_ScoreRankEffect.szTextureSize.Width / 7;
int scoreRank_height = TJAPlayer3.Tx.Result_ScoreRankEffect.szテクスチャサイズ.Height / 4; int scoreRank_height = TJAPlayer3.Tx.Result_ScoreRankEffect.szTextureSize.Height / 4;
if (ct全体進行.CurrentValue <= ScoreApparitionTimeStamp + 1180) if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 1180)
{ {
TJAPlayer3.Tx.Result_ScoreRankEffect.Opacity = (int)((ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 1000)) / 180.0f * 255.0f); TJAPlayer3.Tx.Result_ScoreRankEffect.Opacity = (int)((ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1000)) / 180.0f * 255.0f);
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.X = 1.0f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f;
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.Y = 1.0f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f;
} }
else if (ct全体進行.CurrentValue <= ScoreApparitionTimeStamp + 1270) else if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 1270)
{ {
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.X = 0.5f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f;
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.Y = 0.5f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f;
} }
else else
{ {
TJAPlayer3.Tx.Result_ScoreRankEffect.Opacity = 255; TJAPlayer3.Tx.Result_ScoreRankEffect.Opacity = 255;
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 1f;
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 1f;
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage結果.nスコアランク[p] > 0) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stage結果.nスコアランク[p] > 0)
{ {
int CurrentFlash = 0; int CurrentFlash = 0;
int[] FlashTimes = { 1500, 1540, 1580, 1620, 1660, 1700, 1740, 1780 }; int[] FlashTimes = { 1500, 1540, 1580, 1620, 1660, 1700, 1740, 1780 };
@ -1174,7 +1174,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Result_ScoreRankEffect.t2D拡大率考慮中央基準描画(scoreRankEffect_x, scoreRankEffect_y, TJAPlayer3.Tx.Result_ScoreRankEffect.t2D拡大率考慮中央基準描画(scoreRankEffect_x, scoreRankEffect_y,
new Rectangle((TJAPlayer3.stage結果.nスコアランク[p] - 1) * scoreRank_width, CurrentFlash * scoreRank_height, scoreRank_width, scoreRank_height)); new Rectangle((TJAPlayer3.stage結果.nスコアランク[p] - 1) * scoreRank_width, CurrentFlash * scoreRank_height, scoreRank_width, scoreRank_height));
if (!b音声再生[9] && ct全体進行.CurrentValue >= ScoreApparitionTimeStamp + 1180) if (!b音声再生[9] && ctMainCounter.CurrentValue >= ScoreApparitionTimeStamp + 1180)
{ {
TJAPlayer3.Skin.soundRankIn.tPlay(); TJAPlayer3.Skin.soundRankIn.tPlay();
b音声再生[9] = true; b音声再生[9] = true;
@ -1186,36 +1186,36 @@ namespace TJAPlayer3
} }
if (ct全体進行.CurrentValue >= ScoreApparitionTimeStamp + 2500) if (ctMainCounter.CurrentValue >= ScoreApparitionTimeStamp + 2500)
{ {
//if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) //if (TJAPlayer3.ConfigIni.nPlayerCount <= 2)
{ {
#region [Crown apparition] #region [Crown apparition]
int crownEffect_width = TJAPlayer3.Tx.Result_CrownEffect.szテクスチャサイズ.Width / 3; int crownEffect_width = TJAPlayer3.Tx.Result_CrownEffect.szTextureSize.Width / 3;
int crownEffect_height = TJAPlayer3.Tx.Result_CrownEffect.szテクスチャサイズ.Height / 4; int crownEffect_height = TJAPlayer3.Tx.Result_CrownEffect.szTextureSize.Height / 4;
if (ct全体進行.CurrentValue <= ScoreApparitionTimeStamp + 2680) if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 2680)
{ {
TJAPlayer3.Tx.Result_CrownEffect.Opacity = (int)((ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 2500)) / 180.0f * 255.0f); TJAPlayer3.Tx.Result_CrownEffect.Opacity = (int)((ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2500)) / 180.0f * 255.0f);
TJAPlayer3.Tx.Result_CrownEffect.vc拡大縮小倍率.X = 1.0f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f; TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.X = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f;
TJAPlayer3.Tx.Result_CrownEffect.vc拡大縮小倍率.Y = 1.0f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f; TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.Y = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f;
} }
else if (ct全体進行.CurrentValue <= ScoreApparitionTimeStamp + 2770) else if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 2770)
{ {
TJAPlayer3.Tx.Result_CrownEffect.vc拡大縮小倍率.X = 0.5f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f; TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f;
TJAPlayer3.Tx.Result_CrownEffect.vc拡大縮小倍率.Y = 0.5f + (float)Math.Sin((float)(ct全体進行.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f; TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f;
} }
else else
{ {
TJAPlayer3.Tx.Result_CrownEffect.Opacity = 255; TJAPlayer3.Tx.Result_CrownEffect.Opacity = 255;
TJAPlayer3.Tx.Result_CrownEffect.vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.X = 1f;
TJAPlayer3.Tx.Result_CrownEffect.vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.Y = 1f;
} }
int ClearType = TJAPlayer3.stage結果.nクリア[p] - 1; int ClearType = TJAPlayer3.stage結果.nクリア[p] - 1;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)(Difficulty.Dan) && ClearType >= 0) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)(Difficulty.Dan) && ClearType >= 0)
{ {
int CurrentFlash = 0; int CurrentFlash = 0;
int[] FlashTimes = { 2000, 2040, 2080, 2120, 2160, 2200, 2240, 2280 }; int[] FlashTimes = { 2000, 2040, 2080, 2120, 2160, 2200, 2240, 2280 };
@ -1249,7 +1249,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Result_CrownEffect.t2D拡大率考慮中央基準描画(crownEffect_x, crownEffect_y, TJAPlayer3.Tx.Result_CrownEffect.t2D拡大率考慮中央基準描画(crownEffect_x, crownEffect_y,
new Rectangle(ClearType * crownEffect_width, CurrentFlash * crownEffect_height, crownEffect_width, crownEffect_height)); new Rectangle(ClearType * crownEffect_width, CurrentFlash * crownEffect_height, crownEffect_width, crownEffect_height));
if (!b音声再生[10] && ct全体進行.CurrentValue >= ScoreApparitionTimeStamp + 2680) if (!b音声再生[10] && ctMainCounter.CurrentValue >= ScoreApparitionTimeStamp + 2680)
{ {
TJAPlayer3.Skin.soundCrownIn.tPlay(); TJAPlayer3.Skin.soundCrownIn.tPlay();
b音声再生[10] = true; b音声再生[10] = true;
@ -1288,7 +1288,7 @@ namespace TJAPlayer3
public Point pt; public Point pt;
} }
public CCounter ct全体進行; public CCounter ctMainCounter;
public CCounter[] ctゲージアニメ; public CCounter[] ctゲージアニメ;
private CCounter ct虹ゲージアニメ; private CCounter ct虹ゲージアニメ;
private CCounter ctSoul; private CCounter ctSoul;
@ -1363,8 +1363,8 @@ namespace TJAPlayer3
public void t小文字表示(int x, int y, int num, float scale) public void t小文字表示(int x, int y, int num, float scale)
{ {
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.X *= scale; TJAPlayer3.Tx.Result_Number.vcScaleRatio.X *= scale;
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.Y *= scale; TJAPlayer3.Tx.Result_Number.vcScaleRatio.Y *= scale;
int[] nums = CConversion.SeparateDigits(num); int[] nums = CConversion.SeparateDigits(num);
for (int j = 0; j < nums.Length; j++) for (int j = 0; j < nums.Length; j++)
{ {
@ -1411,8 +1411,8 @@ namespace TJAPlayer3
public void tスコア文字表示(int x, int y, int num, float scale) public void tスコア文字表示(int x, int y, int num, float scale)
{ {
TJAPlayer3.Tx.Result_Score_Number.vc拡大縮小倍率.X *= scale; TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.X *= scale;
TJAPlayer3.Tx.Result_Score_Number.vc拡大縮小倍率.Y *= scale; TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.Y *= scale;
int[] nums = CConversion.SeparateDigits(num); int[] nums = CConversion.SeparateDigits(num);
for (int j = 0; j < nums.Length; j++) for (int j = 0; j < nums.Length; j++)
{ {

6
OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs
View File

@ -43,7 +43,7 @@ namespace TJAPlayer3
{ {
this.txMusicName = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false); this.txMusicName = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false);
txMusicName.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName, TJAPlayer3.Skin.Result_MusicName_MaxSize); txMusicName.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName, TJAPlayer3.Skin.Result_MusicName_MaxSize);
} }
base.Activate(); base.Activate();
@ -83,7 +83,7 @@ namespace TJAPlayer3
if (TJAPlayer3.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Center) if (TJAPlayer3.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Center)
{ {
this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * txMusicName.vc拡大縮小倍率.X) / 2), TJAPlayer3.Skin.Result_MusicName_Y); this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X - ((this.txMusicName.szTextureSize.Width * txMusicName.vcScaleRatio.X) / 2), TJAPlayer3.Skin.Result_MusicName_Y);
} }
else if (TJAPlayer3.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Left) else if (TJAPlayer3.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Left)
{ {
@ -91,7 +91,7 @@ namespace TJAPlayer3
} }
else else
{ {
this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X - this.txMusicName.szテクスチャサイズ.Width * txMusicName.vc拡大縮小倍率.X, TJAPlayer3.Skin.Result_MusicName_Y); this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X - this.txMusicName.szTextureSize.Width * txMusicName.vcScaleRatio.X, TJAPlayer3.Skin.Result_MusicName_Y);
} }
if( !this.ct登場用.IsEnded ) if( !this.ct登場用.IsEnded )

318
OpenTaiko/src/Stages/08.Result/CStage結果.cs
View File

@ -70,7 +70,7 @@ namespace TJAPlayer3
public int GetTowerScoreRank() public int GetTowerScoreRank()
{ {
int tmpClear = 0; int tmpClear = 0;
double progress = CFloorManagement.LastRegisteredFloor / ((double)TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor); double progress = CFloorManagement.LastRegisteredFloor / ((double)TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor);
// Clear badges : 10% (E), 25% (D), 50% (C), 75% (B), Clear (A), FC (S), DFC (X) // Clear badges : 10% (E), 25% (D), 50% (C), 75% (B), Clear (A), FC (S), DFC (X)
bool[] conditions = bool[] conditions =
@ -107,7 +107,7 @@ namespace TJAPlayer3
Trace.TraceInformation("結果ステージを活性化します。"); Trace.TraceInformation("結果ステージを活性化します。");
Trace.Indent(); Trace.Indent();
b最近遊んだ曲追加済み = false; bAddedToRecentlyPlayedSongs = false;
try try
{ {
int[] ClearStatus_Replay = new int[5] { 0, 0, 0, 0, 0 }; int[] ClearStatus_Replay = new int[5] { 0, 0, 0, 0, 0 };
@ -172,7 +172,7 @@ namespace TJAPlayer3
#endregion #endregion
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
{ {
for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++) for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++)
{ {
@ -189,7 +189,7 @@ namespace TJAPlayer3
} }
} }
if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, p) < 500000) if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, p) < 500000)
{ {
this.nスコアランク[p] = 0; this.nスコアランク[p] = 0;
} }
@ -199,7 +199,7 @@ namespace TJAPlayer3
for (int i = 0; i < 7; i++) for (int i = 0; i < 7; i++)
{ {
if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, p) >= sr[i]) if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, p) >= sr[i])
{ {
this.nスコアランク[p] = i + 1; this.nスコアランク[p] = i + 1;
} }
@ -270,7 +270,7 @@ namespace TJAPlayer3
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
{ {
// Regular (Ensou game) Score and Score Rank saves // Regular (Ensou game) Score and Score Rank saves
@ -278,11 +278,11 @@ namespace TJAPlayer3
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
int diff = TJAPlayer3.stage選曲.n確定された曲の難易度[i]; int diff = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i];
var clear = Math.Max(ini[i].stセクション[0].nクリア[diff], this.nクリア[i]); var clear = Math.Max(ini[i].stセクション[0].nクリア[diff], this.nクリア[i]);
var scoreRank = Math.Max(ini[i].stセクション[0].nスコアランク[diff], this.nスコアランク[i]); var scoreRank = Math.Max(ini[i].stセクション[0].nスコアランク[diff], this.nスコアランク[i]);
var highscore = Math.Max(ini[i].stセクション[0].nハイスコア[diff], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, i)); var highscore = Math.Max(ini[i].stセクション[0].nハイスコア[diff], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, i));
ClearStatus_Replay[i] = this.nクリア[i]; ClearStatus_Replay[i] = this.nクリア[i];
ScoreRank_Replay[i] = this.nスコアランク[i]; ScoreRank_Replay[i] = this.nスコアランク[i];
@ -301,7 +301,7 @@ namespace TJAPlayer3
#endregion #endregion
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
/* == Specific format for DaniDoujou charts == /* == Specific format for DaniDoujou charts ==
** **
@ -343,18 +343,18 @@ namespace TJAPlayer3
if (isAutoDisabled(0)) if (isAutoDisabled(0))
{ {
ini[0].stセクション[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], clearValue); ini[0].stセクション[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], clearValue);
ini[0].stセクション[0].nハイスコア[0] = Math.Max(ini[0].stセクション[0].nハイスコア[0], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0)); ; ini[0].stセクション[0].nハイスコア[0] = Math.Max(ini[0].stセクション[0].nハイスコア[0], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0)); ;
ClearStatus_Replay[0] = clearValue; ClearStatus_Replay[0] = clearValue;
#region [ Update Dan Dojo exam results ] #region [ Update Dan Dojo exam results ]
for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++)
{ {
for (int j = 0; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C.Length; j++) for (int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C.Length; j++)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j] != null && TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetCleared()[0]) if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j] != null && TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetCleared()[0])
{ {
int amount = TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetAmount(); int amount = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetAmount();
int current = -1; int current = -1;
try try
{ {
@ -375,11 +375,11 @@ namespace TJAPlayer3
{ {
ini[0].stセクション[0].nExamResult[i][j] = amount; ini[0].stセクション[0].nExamResult[i][j] = amount;
} }
else if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.More) else if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.More)
{ {
ini[0].stセクション[0].nExamResult[i][j] = (amount > current) ? amount : current; ini[0].stセクション[0].nExamResult[i][j] = (amount > current) ? amount : current;
} }
else if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.Less) else if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.Less)
{ {
ini[0].stセクション[0].nExamResult[i][j] = (amount < current) ? amount : current; ini[0].stセクション[0].nExamResult[i][j] = (amount < current) ? amount : current;
} }
@ -405,7 +405,7 @@ namespace TJAPlayer3
TJAPlayer3.SaveFile); TJAPlayer3.SaveFile);
*/ */
this.newGradeGranted = TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].tUpdateDanTitle(TJAPlayer3.stage選曲.r確定された曲.strタイトル.Substring(0, 2), this.newGradeGranted = TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].tUpdateDanTitle(TJAPlayer3.stageSongSelect.rChoosenSong.strタイトル.Substring(0, 2),
clearValue % 2 == 0, clearValue % 2 == 0,
(clearValue - 1) / 2); (clearValue - 1) / 2);
} }
@ -413,7 +413,7 @@ namespace TJAPlayer3
#endregion #endregion
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
// Clear if top reached, then FC or DFC like any regular chart // Clear if top reached, then FC or DFC like any regular chart
// Score Rank cointains highest reached floor // Score Rank cointains highest reached floor
@ -426,7 +426,7 @@ namespace TJAPlayer3
{ {
ini[0].stセクション[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], tmpClear); ini[0].stセクション[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], tmpClear);
ini[0].stセクション[0].nスコアランク[0] = Math.Max(ini[0].stセクション[0].nスコアランク[0], CFloorManagement.LastRegisteredFloor); ini[0].stセクション[0].nスコアランク[0] = Math.Max(ini[0].stセクション[0].nスコアランク[0], CFloorManagement.LastRegisteredFloor);
ini[0].stセクション[0].nハイスコア[0] = Math.Max(ini[0].stセクション[0].nハイスコア[0], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0)); ; ini[0].stセクション[0].nハイスコア[0] = Math.Max(ini[0].stセクション[0].nハイスコア[0], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0)); ;
ClearStatus_Replay[0] = tmpClear; ClearStatus_Replay[0] = tmpClear;
@ -474,14 +474,14 @@ namespace TJAPlayer3
"+" "+"
}; };
int level = TJAPlayer3.stage選曲.r確定された曲.nLevel[diff]; int level = TJAPlayer3.stageSongSelect.rChoosenSong.nLevel[diff];
CDTX.ELevelIcon levelIcon = TJAPlayer3.stage選曲.r確定された曲.nLevelIcon[diff]; CDTX.ELevelIcon levelIcon = TJAPlayer3.stageSongSelect.rChoosenSong.nLevelIcon[diff];
return (diffArr[Math.Min(diff, 6)] + "Lv." + level + diffArrIcon[(int)levelIcon]); return (diffArr[Math.Min(diff, 6)] + "Lv." + level + diffArrIcon[(int)levelIcon]);
} }
string Details = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stage選曲.r確定された曲.strタイトル string Details = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stageSongSelect.rChoosenSong.strタイトル
+ diffToString(TJAPlayer3.stage選曲.n確定された曲の難易度[0]) : ""; + diffToString(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) : "";
// Discord Presenseの更新 // Discord Presenseの更新
TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() TJAPlayer3.DiscordClient?.SetPresence(new RichPresence()
@ -520,11 +520,11 @@ namespace TJAPlayer3
float[] modMultipliers = float[] modMultipliers =
{ {
TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 0), TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 0),
TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 1), TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 1),
TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 2), TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 2),
TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 3), TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 3),
TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 4) TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 4)
}; };
float getCoinMul(int player) float getCoinMul(int player)
@ -536,16 +536,16 @@ namespace TJAPlayer3
return chara.GetEffectCoinMultiplier() * puchichara.GetEffectCoinMultiplier(); return chara.GetEffectCoinMultiplier() * puchichara.GetEffectCoinMultiplier();
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
diffModifier = 3; diffModifier = 3;
int stars = TJAPlayer3.stage選曲.r確定された曲.arスコア[(int)Difficulty.Tower].譜面情報.nレベル[(int)Difficulty.Tower]; int stars = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nレベル[(int)Difficulty.Tower];
starRate = Math.Min(10, stars) / 2; starRate = Math.Min(10, stars) / 2;
redStarRate = Math.Max(0, stars - 10) * 4; redStarRate = Math.Max(0, stars - 10) * 4;
int maxFloors = TJAPlayer3.stage選曲.r確定された曲.arスコア[(int)Difficulty.Tower].譜面情報.nTotalFloor; int maxFloors = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nTotalFloor;
double floorRate = Math.Pow(CFloorManagement.LastRegisteredFloor / (double)maxFloors, 2); double floorRate = Math.Pow(CFloorManagement.LastRegisteredFloor / (double)maxFloors, 2);
double lengthBonus = Math.Max(1, maxFloors / 140.0); double lengthBonus = Math.Max(1, maxFloors / 140.0);
@ -567,7 +567,7 @@ namespace TJAPlayer3
this.nEarnedMedalsCount[0] = 5 + (int)((diffModifier * (starRate + redStarRate)) * (floorRate * lengthBonus)) + clearModifier; this.nEarnedMedalsCount[0] = 5 + (int)((diffModifier * (starRate + redStarRate)) * (floorRate * lengthBonus)) + clearModifier;
this.nEarnedMedalsCount[0] = Math.Max(5, (int)(this.nEarnedMedalsCount[0] * modMultipliers[0] * getCoinMul(0))); this.nEarnedMedalsCount[0] = Math.Max(5, (int)(this.nEarnedMedalsCount[0] * modMultipliers[0] * getCoinMul(0)));
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
int partialScore = 0; int partialScore = 0;
@ -596,12 +596,12 @@ namespace TJAPlayer3
#region [Partial scores] #region [Partial scores]
for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[i] != null) if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i] != null)
{ {
int diff = TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Difficulty; int diff = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Difficulty;
int stars = TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Level; int stars = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Level;
diffModifier = Math.Max(1, Math.Min(3, diff)); diffModifier = Math.Max(1, Math.Min(3, diff));
@ -627,8 +627,8 @@ namespace TJAPlayer3
{ {
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
int diff = TJAPlayer3.stage選曲.n確定された曲の難易度[i]; int diff = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i];
int stars = TJAPlayer3.stage選曲.r確定された曲.arスコア[diff].譜面情報.nレベル[diff]; int stars = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[diff].譜面情報.nレベル[diff];
diffModifier = Math.Max(1, Math.Min(3, diff)); diffModifier = Math.Max(1, Math.Min(3, diff));
@ -713,8 +713,8 @@ namespace TJAPlayer3
} }
} }
if (TJAPlayer3.stage選曲.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, i) == 1f) if (TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, i) == 1f)
_sf.tUpdateSongClearStatus(TJAPlayer3.stage選曲.r確定された曲, _cs, TJAPlayer3.stage選曲.n確定された曲の難易度[i]); _sf.tUpdateSongClearStatus(TJAPlayer3.stageSongSelect.rChoosenSong, _cs, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]);
} }
} }
@ -773,7 +773,7 @@ namespace TJAPlayer3
#endregion #endregion
TJAPlayer3.stage選曲.act曲リスト.bFirstCrownLoad = false; TJAPlayer3.stageSongSelect.actSongList.bFirstCrownLoad = false;
this.ctPhase1 = null; this.ctPhase1 = null;
this.ctPhase2 = null; this.ctPhase2 = null;
@ -789,7 +789,7 @@ namespace TJAPlayer3
ctWork_Plate = new CCounter(0, 4000, 1, TJAPlayer3.Timer); ctWork_Plate = new CCounter(0, 4000, 1, TJAPlayer3.Timer);
if (TJAPlayer3.Tx.TowerResult_Background != null) if (TJAPlayer3.Tx.TowerResult_Background != null)
ctTower_Animation = new CCounter(0, TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Height - TJAPlayer3.Skin.Resolution[1], 25, TJAPlayer3.Timer); ctTower_Animation = new CCounter(0, TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height - TJAPlayer3.Skin.Resolution[1], 25, TJAPlayer3.Timer);
else else
ctTower_Animation = new CCounter(); ctTower_Animation = new CCounter();
@ -800,9 +800,9 @@ namespace TJAPlayer3
b音声再生 = false; b音声再生 = false;
this.EndAnime = false; this.EndAnime = false;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
this.ttkMaxFloors = new TitleTextureKey("/" + TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTotalFloor.ToString() + CLangManager.LangInstance.GetString(1001), pfTowerText48, Color.Black, Color.Transparent, 700); this.ttkMaxFloors = new TitleTextureKey("/" + TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor.ToString() + CLangManager.LangInstance.GetString(1001), pfTowerText48, Color.Black, Color.Transparent, 700);
this.ttkToutatsu = new TitleTextureKey(CLangManager.LangInstance.GetString(1000), pfTowerText48, Color.White, Color.Black, 700); this.ttkToutatsu = new TitleTextureKey(CLangManager.LangInstance.GetString(1000), pfTowerText48, Color.White, Color.Black, 700);
this.ttkTen = new TitleTextureKey(CLangManager.LangInstance.GetString(1002), pfTowerText, Color.Black, Color.Transparent, 700); this.ttkTen = new TitleTextureKey(CLangManager.LangInstance.GetString(1002), pfTowerText, Color.Black, Color.Transparent, 700);
this.ttkReachedFloor = new TitleTextureKey(CFloorManagement.LastRegisteredFloor.ToString(), pfTowerText72, Color.Orange, Color.Black, 700); this.ttkReachedFloor = new TitleTextureKey(CFloorManagement.LastRegisteredFloor.ToString(), pfTowerText72, Color.Orange, Color.Black, 700);
@ -810,7 +810,7 @@ namespace TJAPlayer3
this.ttkRemaningLifes = new TitleTextureKey(CFloorManagement.CurrentNumberOfLives.ToString() + " / " + CFloorManagement.MaxNumberOfLives.ToString(), pfTowerText, Color.Black, Color.Transparent, 700); this.ttkRemaningLifes = new TitleTextureKey(CFloorManagement.CurrentNumberOfLives.ToString() + " / " + CFloorManagement.MaxNumberOfLives.ToString(), pfTowerText, Color.Black, Color.Transparent, 700);
this.ttkScoreCount = new TitleTextureKey(TJAPlayer3.stage結果.st演奏記録.Drums.nスコア.ToString(), pfTowerText, Color.Black, Color.Transparent, 700); this.ttkScoreCount = new TitleTextureKey(TJAPlayer3.stage結果.st演奏記録.Drums.nスコア.ToString(), pfTowerText, Color.Black, Color.Transparent, 700);
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
Background = new ResultBG(CSkin.Path($@"{TextureLoader.BASE}{TextureLoader.DANRESULT}Script.lua")); Background = new ResultBG(CSkin.Path($@"{TextureLoader.BASE}{TextureLoader.DANRESULT}Script.lua"));
Background.Init(); Background.Init();
@ -827,13 +827,13 @@ namespace TJAPlayer3
Background.Init(); Background.Init();
} }
this.ttkDanTitles = new TitleTextureKey[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count]; this.ttkDanTitles = new TitleTextureKey[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count];
for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++)
{ {
this.ttkDanTitles[i] = new TitleTextureKey(TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].bTitleShow this.ttkDanTitles[i] = new TitleTextureKey(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].bTitleShow
? "???" ? "???"
: TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Title, : TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Title,
pfDanTitles, pfDanTitles,
Color.White, Color.White,
Color.Black, Color.Black,
@ -846,7 +846,7 @@ namespace TJAPlayer3
Trace.Unindent(); Trace.Unindent();
} }
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
bgmResultIn.tPlay(); bgmResultIn.tPlay();
} }
public override void DeActivate() public override void DeActivate()
@ -880,13 +880,13 @@ namespace TJAPlayer3
public override void ReleaseManagedResource() public override void ReleaseManagedResource()
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
TJAPlayer3.tDisposeSafely(ref pfTowerText); TJAPlayer3.tDisposeSafely(ref pfTowerText);
TJAPlayer3.tDisposeSafely(ref pfTowerText48); TJAPlayer3.tDisposeSafely(ref pfTowerText48);
TJAPlayer3.tDisposeSafely(ref pfTowerText72); TJAPlayer3.tDisposeSafely(ref pfTowerText72);
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
TJAPlayer3.tDisposeSafely(ref pfDanTitles); TJAPlayer3.tDisposeSafely(ref pfDanTitles);
} }
@ -934,7 +934,7 @@ namespace TJAPlayer3
Background?.Update(); Background?.Update();
Background?.Draw(); Background?.Draw();
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
{ {
#region [Ensou game result screen] #region [Ensou game result screen]
@ -1224,13 +1224,13 @@ namespace TJAPlayer3
} }
else else
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
double screen_ratio_x = TJAPlayer3.Skin.Resolution[0] / 1280.0; double screen_ratio_x = TJAPlayer3.Skin.Resolution[0] / 1280.0;
#region [Counter processings] #region [Counter processings]
int songCount = TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; int songCount = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count;
/* /*
** 1600 => Dan plate ** 1600 => Dan plate
@ -1328,8 +1328,8 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.DanResult_Rank.Opacity = 255; TJAPlayer3.Tx.DanResult_Rank.Opacity = 255;
int rank_width = TJAPlayer3.Tx.DanResult_Rank.szテクスチャサイズ.Width / 7; int rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7;
int rank_height = TJAPlayer3.Tx.DanResult_Rank.szテクスチャサイズ.Height; int rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height;
if (examStatus != Exam.Status.Failure) if (examStatus != Exam.Status.Failure)
{ {
@ -1340,18 +1340,18 @@ namespace TJAPlayer3
if (unitsBeforeAppearance >= 90) if (unitsBeforeAppearance >= 90)
{ {
TJAPlayer3.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f); TJAPlayer3.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f);
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.X = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f;
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.Y = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f;
} }
else if (unitsBeforeAppearance > 0) else if (unitsBeforeAppearance > 0)
{ {
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.X = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f;
TJAPlayer3.Tx.Result_ScoreRankEffect.vc拡大縮小倍率.Y = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f; TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f;
} }
else else
{ {
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1f;
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1f;
} }
#endregion #endregion
@ -1390,8 +1390,8 @@ namespace TJAPlayer3
TJAPlayer3.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f); TJAPlayer3.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f);
} }
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1f;
TJAPlayer3.Tx.DanResult_Rank.vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1f;
#endregion #endregion
@ -1434,15 +1434,15 @@ namespace TJAPlayer3
int xFactor = 0; int xFactor = 0;
float yFactor = 1f; float yFactor = 1f;
int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stage選曲.r確定された曲.arスコア[5].譜面情報.nTowerType); int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType);
if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn_Result) if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn_Result)
currentTowerType = 0; currentTowerType = 0;
if (TJAPlayer3.Tx.TowerResult_Background != null && TJAPlayer3.Tx.TowerResult_Tower[currentTowerType] != null) if (TJAPlayer3.Tx.TowerResult_Background != null && TJAPlayer3.Tx.TowerResult_Tower[currentTowerType] != null)
{ {
xFactor = (TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Width - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szテクスチャサイズ.Width) / 2; xFactor = (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Width - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Width) / 2;
yFactor = TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szテクスチャサイズ.Height / (float)TJAPlayer3.Tx.TowerResult_Background.szテクスチャサイズ.Height; yFactor = TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Height / (float)TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height;
} }
TJAPlayer3.Tx.TowerResult_Background?.t2D描画(0, -1 * this.ctTower_Animation.CurrentValue); TJAPlayer3.Tx.TowerResult_Background?.t2D描画(0, -1 * this.ctTower_Animation.CurrentValue);
@ -1461,12 +1461,12 @@ namespace TJAPlayer3
if (sc >= 0 && TJAPlayer3.Tx.TowerResult_ScoreRankEffect != null) if (sc >= 0 && TJAPlayer3.Tx.TowerResult_ScoreRankEffect != null)
{ {
int scoreRankEffect_width = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szテクスチャサイズ.Width / 7; int scoreRankEffect_width = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szTextureSize.Width / 7;
int scoreRankEffect_height = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szテクスチャサイズ.Height; int scoreRankEffect_height = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szTextureSize.Height;
TJAPlayer3.Tx.TowerResult_ScoreRankEffect.Opacity = 255; TJAPlayer3.Tx.TowerResult_ScoreRankEffect.Opacity = 255;
TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vc拡大縮小倍率.X = 1f; TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = 1f;
TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vc拡大縮小倍率.Y = 1f; TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = 1f;
TJAPlayer3.Tx.TowerResult_ScoreRankEffect.t2D拡大率考慮中央基準描画( TJAPlayer3.Tx.TowerResult_ScoreRankEffect.t2D拡大率考慮中央基準描画(
TJAPlayer3.Skin.TowerResult_ScoreRankEffect[0], TJAPlayer3.Skin.TowerResult_ScoreRankEffect[0],
TJAPlayer3.Skin.TowerResult_ScoreRankEffect[1], TJAPlayer3.Skin.TowerResult_ScoreRankEffect[1],
@ -1479,21 +1479,21 @@ namespace TJAPlayer3
#region [Text elements] #region [Text elements]
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkToutatsu)?.t2D描画(TJAPlayer3.Skin.TowerResult_Toutatsu[0], TJAPlayer3.Skin.TowerResult_Toutatsu[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkToutatsu)?.t2D描画(TJAPlayer3.Skin.TowerResult_Toutatsu[0], TJAPlayer3.Skin.TowerResult_Toutatsu[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkMaxFloors)?.t2D描画(TJAPlayer3.Skin.TowerResult_MaxFloors[0], TJAPlayer3.Skin.TowerResult_MaxFloors[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkMaxFloors)?.t2D描画(TJAPlayer3.Skin.TowerResult_MaxFloors[0], TJAPlayer3.Skin.TowerResult_MaxFloors[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkTen)?.t2D描画(TJAPlayer3.Skin.TowerResult_Ten[0], TJAPlayer3.Skin.TowerResult_Ten[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkTen)?.t2D描画(TJAPlayer3.Skin.TowerResult_Ten[0], TJAPlayer3.Skin.TowerResult_Ten[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkScore)?.t2D描画(TJAPlayer3.Skin.TowerResult_Score[0], TJAPlayer3.Skin.TowerResult_Score[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkScore)?.t2D描画(TJAPlayer3.Skin.TowerResult_Score[0], TJAPlayer3.Skin.TowerResult_Score[1]);
CTexture tmpScoreCount = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkScoreCount); CTexture tmpScoreCount = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkScoreCount);
CTexture tmpCurrentFloor = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkReachedFloor); CTexture tmpCurrentFloor = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkReachedFloor);
CTexture tmpRemainingLifes = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkRemaningLifes); CTexture tmpRemainingLifes = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkRemaningLifes);
tmpCurrentFloor?.t2D描画(TJAPlayer3.Skin.TowerResult_CurrentFloor[0] - tmpCurrentFloor.szテクスチャサイズ.Width, TJAPlayer3.Skin.TowerResult_CurrentFloor[1]); tmpCurrentFloor?.t2D描画(TJAPlayer3.Skin.TowerResult_CurrentFloor[0] - tmpCurrentFloor.szTextureSize.Width, TJAPlayer3.Skin.TowerResult_CurrentFloor[1]);
tmpScoreCount?.t2D描画(TJAPlayer3.Skin.TowerResult_ScoreCount[0] - tmpScoreCount.szテクスチャサイズ.Width, TJAPlayer3.Skin.TowerResult_ScoreCount[1]); tmpScoreCount?.t2D描画(TJAPlayer3.Skin.TowerResult_ScoreCount[0] - tmpScoreCount.szTextureSize.Width, TJAPlayer3.Skin.TowerResult_ScoreCount[1]);
tmpRemainingLifes?.t2D描画(TJAPlayer3.Skin.TowerResult_RemainingLifes[0] - tmpRemainingLifes.szテクスチャサイズ.Width, TJAPlayer3.Skin.TowerResult_RemainingLifes[1]); tmpRemainingLifes?.t2D描画(TJAPlayer3.Skin.TowerResult_RemainingLifes[0] - tmpRemainingLifes.szTextureSize.Width, TJAPlayer3.Skin.TowerResult_RemainingLifes[1]);
int soul_width = TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Width; int soul_width = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width;
int soul_height = TJAPlayer3.Tx.Gauge_Soul.szテクスチャサイズ.Height / 2; int soul_height = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Height / 2;
TJAPlayer3.Tx.Gauge_Soul?.t2D描画(TJAPlayer3.Skin.TowerResult_Gauge_Soul[0], TJAPlayer3.Skin.TowerResult_Gauge_Soul[1], new Rectangle(0, 0, soul_width, soul_height)); TJAPlayer3.Tx.Gauge_Soul?.t2D描画(TJAPlayer3.Skin.TowerResult_Gauge_Soul[0], TJAPlayer3.Skin.TowerResult_Gauge_Soul[1], new Rectangle(0, 0, soul_width, soul_height));
@ -1536,7 +1536,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break;
int pos = i; int pos = i;
if (TJAPlayer3.P1IsBlue() && TJAPlayer3.stage選曲.n確定された曲の難易度[0] < (int)Difficulty.Tower) if (TJAPlayer3.P1IsBlue() && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] < (int)Difficulty.Tower)
pos = 1; pos = 1;
int namePlate_x; int namePlate_x;
@ -1619,42 +1619,42 @@ namespace TJAPlayer3
{ {
if (base.ePhaseID == CStage.EPhase.Common_NORMAL) if (base.ePhaseID == CStage.EPhase.Common_NORMAL)
{ {
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape))
{ {
#region [ Return to song select screen (Faster method) ] #region [ Return to song select screen (Faster method) ]
bgmResultLoop.tStop(); bgmResultLoop.tStop();
TJAPlayer3.Skin.bgmDanResult.tStop(); TJAPlayer3.Skin.bgmDanResult.tStop();
TJAPlayer3.Skin.bgmTowerResult.tStop(); TJAPlayer3.Skin.bgmTowerResult.tStop();
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
actFI.tフェードアウト開始(); actFI.tフェードアウト開始();
if (TJAPlayer3.latestSongSelect == TJAPlayer3.stage選曲)// TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) if (TJAPlayer3.latestSongSelect == TJAPlayer3.stageSongSelect)// TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan)
if (TJAPlayer3.stage選曲.r現在選択中の曲.r親ノード != null) if (TJAPlayer3.stageSongSelect.rNowSelectedSong.rParentNode != null)
TJAPlayer3.stage選曲.act曲リスト.tBOXを出る(); TJAPlayer3.stageSongSelect.actSongList.tCloseBOX();
t後処理(); tPostprocessing();
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
this.eフェードアウト完了時の戻り値 = E戻り値.完了; this.eフェードアウト完了時の戻り値 = E戻り値.完了;
#endregion #endregion
} }
if (((TJAPlayer3.Pad.b押されたDGB(Eパッド.CY) if (((TJAPlayer3.Pad.bPressedDGB(EPad.CY)
|| TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RD)) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD))
|| (TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LC) || (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC)
|| (TJAPlayer3.Pad.b押されたDGB(Eパッド.Decide) || (TJAPlayer3.Pad.bPressedDGB(EPad.Decide)
|| TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))))) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))))
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
#region [ Skip animations ] #region [ Skip animations ]
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] < (int)Difficulty.Tower if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] < (int)Difficulty.Tower
&& this.actParameterPanel.ct全体進行.CurrentValue < this.actParameterPanel.MountainAppearValue) && this.actParameterPanel.ctMainCounter.CurrentValue < this.actParameterPanel.MountainAppearValue)
{ {
this.actParameterPanel.tSkipResultAnimations(); this.actParameterPanel.tSkipResultAnimations();
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan
&& (ctPhase1 != null && ctPhase1.IsUnEnded)) && (ctPhase1 != null && ctPhase1.IsUnEnded))
{ {
ctPhase1.CurrentValue = (int)ctPhase1.EndValue; ctPhase1.CurrentValue = (int)ctPhase1.EndValue;
@ -1666,8 +1666,8 @@ namespace TJAPlayer3
{ {
if (!mqModals.tIsQueueEmpty(0) if (!mqModals.tIsQueueEmpty(0)
&& ( && (
TJAPlayer3.Pad.b押されたDGB(Eパッド.Decide) TJAPlayer3.Pad.bPressedDGB(EPad.Decide)
|| TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)
) )
) )
{ {
@ -1680,11 +1680,11 @@ namespace TJAPlayer3
actFI.tフェードアウト開始(); actFI.tフェードアウト開始();
if (TJAPlayer3.latestSongSelect == TJAPlayer3.stage選曲) if (TJAPlayer3.latestSongSelect == TJAPlayer3.stageSongSelect)
if (TJAPlayer3.stage選曲.r現在選択中の曲.r親ノード != null) if (TJAPlayer3.stageSongSelect.rNowSelectedSong.rParentNode != null)
TJAPlayer3.stage選曲.act曲リスト.tBOXを出る(); TJAPlayer3.stageSongSelect.actSongList.tCloseBOX();
t後処理(); tPostprocessing();
{ {
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
@ -1699,51 +1699,51 @@ namespace TJAPlayer3
} }
} }
else if ((TJAPlayer3.ConfigIni.nPlayerCount > 1 && ( else if ((TJAPlayer3.ConfigIni.nPlayerCount > 1 && (
TJAPlayer3.Pad.b押されたDGB(Eパッド.LRed2P) TJAPlayer3.Pad.bPressedDGB(EPad.LRed2P)
|| TJAPlayer3.Pad.b押されたDGB(Eパッド.RRed2P) || TJAPlayer3.Pad.bPressedDGB(EPad.RRed2P)
))) { ))) {
if (!mqModals.tIsQueueEmpty(1) && this.actParameterPanel.ct全体進行.CurrentValue >= this.actParameterPanel.MountainAppearValue) if (!mqModals.tIsQueueEmpty(1) && this.actParameterPanel.ctMainCounter.CurrentValue >= this.actParameterPanel.MountainAppearValue)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
displayedModals[1] = mqModals.tPopModal(1); displayedModals[1] = mqModals.tPopModal(1);
displayedModals[1]?.tPlayModalSfx(); displayedModals[1]?.tPlayModalSfx();
} }
} }
else if ((TJAPlayer3.ConfigIni.nPlayerCount > 2 && ( else if ((TJAPlayer3.ConfigIni.nPlayerCount > 2 && (
TJAPlayer3.Pad.b押されたDGB(Eパッド.LRed3P) TJAPlayer3.Pad.bPressedDGB(EPad.LRed3P)
|| TJAPlayer3.Pad.b押されたDGB(Eパッド.RRed3P) || TJAPlayer3.Pad.bPressedDGB(EPad.RRed3P)
))) )))
{ {
if (!mqModals.tIsQueueEmpty(2) && this.actParameterPanel.ct全体進行.CurrentValue >= this.actParameterPanel.MountainAppearValue) if (!mqModals.tIsQueueEmpty(2) && this.actParameterPanel.ctMainCounter.CurrentValue >= this.actParameterPanel.MountainAppearValue)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
displayedModals[2] = mqModals.tPopModal(2); displayedModals[2] = mqModals.tPopModal(2);
displayedModals[2]?.tPlayModalSfx(); displayedModals[2]?.tPlayModalSfx();
} }
} }
else if ((TJAPlayer3.ConfigIni.nPlayerCount > 3 && ( else if ((TJAPlayer3.ConfigIni.nPlayerCount > 3 && (
TJAPlayer3.Pad.b押されたDGB(Eパッド.LRed4P) TJAPlayer3.Pad.bPressedDGB(EPad.LRed4P)
|| TJAPlayer3.Pad.b押されたDGB(Eパッド.RRed4P) || TJAPlayer3.Pad.bPressedDGB(EPad.RRed4P)
))) )))
{ {
if (!mqModals.tIsQueueEmpty(3) && this.actParameterPanel.ct全体進行.CurrentValue >= this.actParameterPanel.MountainAppearValue) if (!mqModals.tIsQueueEmpty(3) && this.actParameterPanel.ctMainCounter.CurrentValue >= this.actParameterPanel.MountainAppearValue)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
displayedModals[3] = mqModals.tPopModal(3); displayedModals[3] = mqModals.tPopModal(3);
displayedModals[3]?.tPlayModalSfx(); displayedModals[3]?.tPlayModalSfx();
} }
} }
else if ((TJAPlayer3.ConfigIni.nPlayerCount > 4 && ( else if ((TJAPlayer3.ConfigIni.nPlayerCount > 4 && (
TJAPlayer3.Pad.b押されたDGB(Eパッド.LRed5P) TJAPlayer3.Pad.bPressedDGB(EPad.LRed5P)
|| TJAPlayer3.Pad.b押されたDGB(Eパッド.RRed5P) || TJAPlayer3.Pad.bPressedDGB(EPad.RRed5P)
))) )))
{ {
if (!mqModals.tIsQueueEmpty(4) && this.actParameterPanel.ct全体進行.CurrentValue >= this.actParameterPanel.MountainAppearValue) if (!mqModals.tIsQueueEmpty(4) && this.actParameterPanel.ctMainCounter.CurrentValue >= this.actParameterPanel.MountainAppearValue)
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
displayedModals[4] = mqModals.tPopModal(4); displayedModals[4] = mqModals.tPopModal(4);
displayedModals[4]?.tPlayModalSfx(); displayedModals[4]?.tPlayModalSfx();
@ -1751,12 +1751,12 @@ namespace TJAPlayer3
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) ||
TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange))
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
#region [ Phase 2 (Swap freely between Exams and Songs) ] #region [ Phase 2 (Swap freely between Exams and Songs) ]
@ -1770,7 +1770,7 @@ namespace TJAPlayer3
else else
examsShift = -examsShift; examsShift = -examsShift;
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
#endregion #endregion
@ -1818,7 +1818,7 @@ namespace TJAPlayer3
totalHit, 1.0f); totalHit, 1.0f);
// Large digits // Large digits
this.actParameterPanel.tスコア文字表示(TJAPlayer3.Skin.DanResult_Score[0] + offset, TJAPlayer3.Skin.DanResult_Score[1], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0), 1.0f); this.actParameterPanel.tスコア文字表示(TJAPlayer3.Skin.DanResult_Score[0] + offset, TJAPlayer3.Skin.DanResult_Score[1], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0), 1.0f);
#endregion #endregion
@ -1856,18 +1856,18 @@ namespace TJAPlayer3
int baseY = 100 + 183 * i; int baseY = 100 + 183 * i;
*/ */
var song = TJAPlayer3.stage選曲.r確定された曲.DanSongs[i]; var song = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i];
// TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(scroll + 377, 180 + i * 73, new Rectangle(song.Difficulty * 53, 0, 53, 53)); // TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(scroll + 377, 180 + i * 73, new Rectangle(song.Difficulty * 53, 0, 53, 53));
int songPanel_main_width = TJAPlayer3.Tx.DanResult_SongPanel_Main.szテクスチャサイズ.Width; int songPanel_main_width = TJAPlayer3.Tx.DanResult_SongPanel_Main.szTextureSize.Width;
int songPanel_main_height = TJAPlayer3.Tx.DanResult_SongPanel_Main.szテクスチャサイズ.Height / 3; int songPanel_main_height = TJAPlayer3.Tx.DanResult_SongPanel_Main.szTextureSize.Height / 3;
TJAPlayer3.Tx.DanResult_SongPanel_Main.Opacity = opacity; TJAPlayer3.Tx.DanResult_SongPanel_Main.Opacity = opacity;
TJAPlayer3.Tx.DanResult_SongPanel_Main.t2D描画(TJAPlayer3.Skin.DanResult_SongPanel_Main_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_SongPanel_Main_Y[drawPos], new Rectangle(0, songPanel_main_height * Math.Min(i, 2), songPanel_main_width, songPanel_main_height)); TJAPlayer3.Tx.DanResult_SongPanel_Main.t2D描画(TJAPlayer3.Skin.DanResult_SongPanel_Main_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_SongPanel_Main_Y[drawPos], new Rectangle(0, songPanel_main_height * Math.Min(i, 2), songPanel_main_width, songPanel_main_height));
int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szテクスチャサイズ.Width / 5; int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5;
int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szテクスチャサイズ.Height; int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = opacity; TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = opacity;
TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.Skin.DanResult_Difficulty_Cymbol_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_Difficulty_Cymbol_Y[drawPos], new Rectangle(song.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.Skin.DanResult_Difficulty_Cymbol_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_Difficulty_Cymbol_Y[drawPos], new Rectangle(song.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height));
@ -1904,8 +1904,8 @@ namespace TJAPlayer3
this.actParameterPanel.t小文字表示(num_x[j] + offset, num_y[j], scoresArr[j], 1.0f); this.actParameterPanel.t小文字表示(num_x[j] + offset, num_y[j], scoresArr[j], 1.0f);
TJAPlayer3.Tx.Result_Number.Opacity = 255; TJAPlayer3.Tx.Result_Number.Opacity = 255;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkDanTitles[i]).Opacity = opacity; TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkDanTitles[i]).Opacity = opacity;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkDanTitles[i]).t2D描画(TJAPlayer3.Skin.DanResult_DanTitles_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_DanTitles_Y[drawPos]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkDanTitles[i]).t2D描画(TJAPlayer3.Skin.DanResult_DanTitles_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_DanTitles_Y[drawPos]);
CActSelect段位リスト.tDisplayDanIcon(i + 1, TJAPlayer3.Skin.DanResult_DanIcon_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_DanIcon_Y[drawPos], opacity, 1.0f); CActSelect段位リスト.tDisplayDanIcon(i + 1, TJAPlayer3.Skin.DanResult_DanIcon_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_DanIcon_Y[drawPos], opacity, 1.0f);
@ -1914,20 +1914,20 @@ namespace TJAPlayer3
#endregion #endregion
public void t後処理() public void tPostprocessing()
{ {
if (!b最近遊んだ曲追加済み) if (!bAddedToRecentlyPlayedSongs)
{ {
#region [ Apply new local status for song select screens ] #region [ Apply new local status for song select screens ]
//--------------------- //---------------------
if (!TJAPlayer3.bコンパクトモード) if (!TJAPlayer3.bコンパクトモード)
{ {
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan && TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Tower) if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower)
{ {
#region [Update status] #region [Update status]
Cスコア cScore = TJAPlayer3.stage選曲.r確定されたスコア; Cスコア cScore = TJAPlayer3.stageSongSelect.r確定されたスコア;
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
@ -1937,24 +1937,24 @@ namespace TJAPlayer3
int actualPlayer = TJAPlayer3.GetActualPlayer(i); int actualPlayer = TJAPlayer3.GetActualPlayer(i);
if (cScore.GPInfo[actualPlayer].nClear[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] < nクリア[i]) if (cScore.GPInfo[actualPlayer].nClear[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] < nクリア[i])
cScore.GPInfo[actualPlayer].nClear[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] = nクリア[i]; cScore.GPInfo[actualPlayer].nClear[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] = nクリア[i];
if (cScore.GPInfo[actualPlayer].nScoreRank[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] < nスコアランク[i]) if (cScore.GPInfo[actualPlayer].nScoreRank[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] < nスコアランク[i])
cScore.GPInfo[actualPlayer].nScoreRank[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] = nスコアランク[i]; cScore.GPInfo[actualPlayer].nScoreRank[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] = nスコアランク[i];
if (cScore.GPInfo[actualPlayer].nHighScore[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] < (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, i)) if (cScore.GPInfo[actualPlayer].nHighScore[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] < (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, i))
cScore.GPInfo[actualPlayer].nHighScore[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, i); cScore.GPInfo[actualPlayer].nHighScore[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, i);
} }
#endregion #endregion
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan)
{ {
#region [Dan update status] #region [Dan update status]
Cスコア cスコア = TJAPlayer3.stage選曲.r確定されたスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r確定されたスコア;
Exam.Status examStatus = TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C); Exam.Status examStatus = TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C);
@ -1986,19 +1986,19 @@ namespace TJAPlayer3
{ {
cスコア.GPInfo[actualPlayer].nClear[0] = Math.Max(cスコア.GPInfo[actualPlayer].nClear[0], clearValue); cスコア.GPInfo[actualPlayer].nClear[0] = Math.Max(cスコア.GPInfo[actualPlayer].nClear[0], clearValue);
if (cスコア.GPInfo[actualPlayer].nHighScore[0] < (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0)) if (cスコア.GPInfo[actualPlayer].nHighScore[0] < (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0))
cスコア.GPInfo[actualPlayer].nHighScore[0] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0); cスコア.GPInfo[actualPlayer].nHighScore[0] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0);
} }
#endregion #endregion
//cスコア.譜面情報.nクリア[0] = Math.Max(cスコア.譜面情報.nクリア[0], clearValue); //cスコア.譜面情報.nクリア[0] = Math.Max(cスコア.譜面情報.nクリア[0], clearValue);
} }
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower)
{ {
#region [Update Tower status] #region [Update Tower status]
Cスコア cスコア = TJAPlayer3.stage選曲.r確定されたスコア; Cスコア cスコア = TJAPlayer3.stageSongSelect.r確定されたスコア;
int actualPlayer = TJAPlayer3.SaveFile; int actualPlayer = TJAPlayer3.SaveFile;
int tmpClear = GetTowerScoreRank(); int tmpClear = GetTowerScoreRank();
@ -2008,8 +2008,8 @@ namespace TJAPlayer3
cスコア.GPInfo[actualPlayer].nClear[0] = Math.Max(cスコア.GPInfo[actualPlayer].nClear[0], tmpClear); cスコア.GPInfo[actualPlayer].nClear[0] = Math.Max(cスコア.GPInfo[actualPlayer].nClear[0], tmpClear);
cスコア.GPInfo[actualPlayer].nScoreRank[0] = Math.Max(cスコア.GPInfo[actualPlayer].nScoreRank[0], CFloorManagement.LastRegisteredFloor); cスコア.GPInfo[actualPlayer].nScoreRank[0] = Math.Max(cスコア.GPInfo[actualPlayer].nScoreRank[0], CFloorManagement.LastRegisteredFloor);
if (cスコア.GPInfo[actualPlayer].nHighScore[0] < (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0)) if (cスコア.GPInfo[actualPlayer].nHighScore[0] < (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0))
cスコア.GPInfo[actualPlayer].nHighScore[0] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(E楽器パート.DRUMS, 0); cスコア.GPInfo[actualPlayer].nHighScore[0] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0);
} }
#endregion #endregion
@ -2020,9 +2020,9 @@ namespace TJAPlayer3
// Song added to recently added songs here // Song added to recently added songs here
TJAPlayer3.RecentlyPlayedSongs.tAddChart(TJAPlayer3.stage選曲.r確定された曲.uniqueId.data.id); TJAPlayer3.RecentlyPlayedSongs.tAddChart(TJAPlayer3.stageSongSelect.rChoosenSong.uniqueId.data.id);
b最近遊んだ曲追加済み = true; bAddedToRecentlyPlayedSongs = true;
} }
} }
@ -2038,7 +2038,7 @@ namespace TJAPlayer3
#region [ private ] #region [ private ]
//----------------- //-----------------
public bool b最近遊んだ曲追加済み; public bool bAddedToRecentlyPlayedSongs;
public bool b音声再生; public bool b音声再生;
public bool EndAnime; public bool EndAnime;
@ -2091,7 +2091,7 @@ namespace TJAPlayer3
ctDanSongInfoChange.CurrentValue = 0; ctDanSongInfoChange.CurrentValue = 0;
nNowDanSongInfo++; nNowDanSongInfo++;
if (nNowDanSongInfo >= Math.Ceiling(TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count / 3.0)) if (nNowDanSongInfo >= Math.Ceiling(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count / 3.0))
{ {
nNowDanSongInfo = 0; nNowDanSongInfo = 0;
} }
@ -2204,7 +2204,7 @@ namespace TJAPlayer3
{ {
if (this.b新記録ランク[i] == true || this.b新記録スキル[i] == true) if (this.b新記録ランク[i] == true || this.b新記録スキル[i] == true)
{ {
string strPart = ((E楽器パート)(i)).ToString(); string strPart = ((EInstrumentPad)(i)).ToString();
string strRank = ((CScoreIni.ERANK)(this.nランク値[i])).ToString(); string strRank = ((CScoreIni.ERANK)(this.nランク値[i])).ToString();
string strFullPath = TJAPlayer3.DTX.strファイル名の絶対パス + "." + datetime + "_" + strPart + "_" + strRank + ".png"; string strFullPath = TJAPlayer3.DTX.strファイル名の絶対パス + "." + datetime + "_" + strPart + "_" + strRank + ".png";
//Surface.ToFile( pSurface, strFullPath, ImageFileFormat.Png ); //Surface.ToFile( pSurface, strFullPath, ImageFileFormat.Png );

62
OpenTaiko/src/Stages/11.Heya/CStageHeya.cs
View File

@ -201,8 +201,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent] != null) if (TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent] != null)
{ {
TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent].vc拡大縮小倍率.X = renderRatioX; TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent].vcScaleRatio.X = renderRatioX;
TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent].vc拡大縮小倍率.Y = renderRatioY; TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent].vcScaleRatio.Y = renderRatioY;
} }
if (iCurrentMenu == 0 || iCurrentMenu == 1) TJAPlayer3.Tx.Heya_Render_Field?.t2D描画(0, 0); if (iCurrentMenu == 0 || iCurrentMenu == 1) TJAPlayer3.Tx.Heya_Render_Field?.t2D描画(0, 0);
if (iCurrentMenu == 0) TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].render?.t2D描画(0, 0); if (iCurrentMenu == 0) TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].render?.t2D描画(0, 0);
@ -216,7 +216,7 @@ 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.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkMainMenuOpt[i]);
if (iCurrentMenu != -1 || iMainMenuCurrent != i) if (iCurrentMenu != -1 || iMainMenuCurrent != i)
{ {
@ -265,8 +265,8 @@ namespace TJAPlayer3
{ {
float puchiScale = TJAPlayer3.Skin.Resolution[1] / 1080.0f; float puchiScale = TJAPlayer3.Skin.Resolution[1] / 1080.0f;
TJAPlayer3.Tx.Puchichara[pos].tx.vc拡大縮小倍率.X = puchiScale; TJAPlayer3.Tx.Puchichara[pos].tx.vcScaleRatio.X = puchiScale;
TJAPlayer3.Tx.Puchichara[pos].tx.vc拡大縮小倍率.Y = puchiScale; TJAPlayer3.Tx.Puchichara[pos].tx.vcScaleRatio.Y = puchiScale;
} }
TJAPlayer3.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0], TJAPlayer3.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0],
@ -282,7 +282,7 @@ namespace TJAPlayer3
if (ttkPuchiCharaNames[pos] != null) if (ttkPuchiCharaNames[pos] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaNames[pos]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkPuchiCharaNames[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0], tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]); scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]);
@ -290,7 +290,7 @@ namespace TJAPlayer3
if (ttkPuchiCharaAuthors[pos] != null) if (ttkPuchiCharaAuthors[pos] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaAuthors[pos]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkPuchiCharaAuthors[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0], tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]); scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]);
@ -342,8 +342,8 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null) if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null)
{ {
TJAPlayer3.Tx.Characters_Heya_Preview[pos].vc拡大縮小倍率.X = charaRatioX; TJAPlayer3.Tx.Characters_Heya_Preview[pos].vcScaleRatio.X = charaRatioX;
TJAPlayer3.Tx.Characters_Heya_Preview[pos].vc拡大縮小倍率.Y = charaRatioY; TJAPlayer3.Tx.Characters_Heya_Preview[pos].vcScaleRatio.Y = charaRatioY;
} }
TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0], TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0],
@ -355,7 +355,7 @@ namespace TJAPlayer3
if (ttkCharacterNames[pos] != null) if (ttkCharacterNames[pos] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCharacterNames[pos]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkCharacterNames[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0], tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]); scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]);
@ -363,7 +363,7 @@ namespace TJAPlayer3
if (ttkCharacterAuthors[pos] != null) if (ttkCharacterAuthors[pos] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCharacterAuthors[pos]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkCharacterAuthors[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0], tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]); scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]);
@ -387,7 +387,7 @@ 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.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkDanTitles[pos]);
if (i != 0) if (i != 0)
{ {
@ -411,8 +411,8 @@ namespace TJAPlayer3
var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2)); var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2));
TJAPlayer3.NamePlate.tNamePlateDisplayNamePlateBase( TJAPlayer3.NamePlate.tNamePlateDisplayNamePlateBase(
scroll.Item1 - TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2, scroll.Item1 - TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2,
scroll.Item2 - TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Height / 24, scroll.Item2 - TJAPlayer3.Tx.NamePlateBase.szTextureSize.Height / 24,
(8 + danGrade)); (8 + danGrade));
TJAPlayer3.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.White); TJAPlayer3.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.White);
@ -432,7 +432,7 @@ 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.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkTitles[pos]);
if (i != 0) if (i != 0)
{ {
@ -480,7 +480,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Heya_Box?.t2D描画(0, 0); TJAPlayer3.Tx.Heya_Box?.t2D描画(0, 0);
if (this.ttkInfoSection != null) if (this.ttkInfoSection != null)
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection) TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(this.ttkInfoSection)
.t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Heya_InfoSection[0], TJAPlayer3.Skin.Heya_InfoSection[1]); .t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Heya_InfoSection[0], TJAPlayer3.Skin.Heya_InfoSection[1]);
} }
@ -508,7 +508,7 @@ namespace TJAPlayer3
//int chara_x = (int)(TJAPlayer3.Skin.Characters_Menu_X[_charaId][0] + (-200 + DonchanX)); //int chara_x = (int)(TJAPlayer3.Skin.Characters_Menu_X[_charaId][0] + (-200 + DonchanX));
//int chara_y = (int)(TJAPlayer3.Skin.Characters_Menu_Y[_charaId][0] - DonchanY); //int chara_y = (int)(TJAPlayer3.Skin.Characters_Menu_Y[_charaId][0] - DonchanY);
int chara_x = (int)DonchanX + TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2; int chara_x = (int)DonchanX + TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2;
int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] - (int)DonchanY; int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] - (int)DonchanY;
int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0]; int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0];
@ -534,26 +534,26 @@ namespace TJAPlayer3
#region [ Inputs ] #region [ Inputs ]
if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange))
{ {
if (this.tMove(1)) if (this.tMove(1))
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange))
{ {
if (this.tMove(-1)) if (this.tMove(-1))
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide))
{ {
#region [Decide] #region [Decide]
@ -683,7 +683,7 @@ namespace TJAPlayer3
} }
if (ess == ESelectStatus.SELECTED) if (ess == ESelectStatus.SELECTED)
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
else if (ess == ESelectStatus.FAILED) else if (ess == ESelectStatus.FAILED)
TJAPlayer3.Skin.soundError.tPlay(); TJAPlayer3.Skin.soundError.tPlay();
else else
@ -692,11 +692,11 @@ namespace TJAPlayer3
#endregion #endregion
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Cancel)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel))
{ {
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
if (iCurrentMenu == -1) if (iCurrentMenu == -1)
{ {
@ -792,8 +792,8 @@ namespace TJAPlayer3
private bool tMove(int off) private bool tMove(int off)
{ {
if (ScrollCounter.CurrentValue < ScrollCounter.EndValue if (ScrollCounter.CurrentValue < ScrollCounter.EndValue
&& (TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) && (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow)
|| TJAPlayer3.Input管理.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow))) || TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow)))
return false; return false;
ScrollMode = off; ScrollMode = off;

60
OpenTaiko/src/Stages/12.OnlineLounge/CStageOnlineLounge.cs
View File

@ -170,7 +170,7 @@ namespace TJAPlayer3
for (int i = 0; i < _ref.Length; i++) for (int i = 0; i < _ref.Length; i++)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_ref[i]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_ref[i]);
if (_selector != i) if (_selector != i)
{ {
@ -207,8 +207,8 @@ namespace TJAPlayer3
{ {
int pos = (_ref.Length * 5 + _selector + i) % _ref.Length; int pos = (_ref.Length * 5 + _selector + i) % _ref.Length;
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_ref[pos]); CTexture tmpTex = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(_ref[pos]);
CTexture tmpSubtitle = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCDNSongSubtitles[pos]); CTexture tmpSubtitle = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(ttkCDNSongSubtitles[pos]);
var _color = CConversion.ColorToColor4(Color.DarkGray); var _color = CConversion.ColorToColor4(Color.DarkGray);
@ -265,7 +265,7 @@ namespace TJAPlayer3
if (song_.charter != null && song_.charter.charter_name != null && song_.charter.charter_name != "") if (song_.charter != null && song_.charter.charter_name != null && song_.charter.charter_name != "")
{ {
var charter_ = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( var charter_ = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey("Charter : " + song_.charter.charter_name, this.pfOLFontLarge, Color.White, Color.Black, 1000)); new TitleTextureKey("Charter : " + song_.charter.charter_name, this.pfOLFontLarge, Color.White, Color.Black, 1000));
charter_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Charter[0], TJAPlayer3.Skin.OnlineLounge_Context_Charter[1]); charter_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Charter[0], TJAPlayer3.Skin.OnlineLounge_Context_Charter[1]);
} }
@ -276,7 +276,7 @@ namespace TJAPlayer3
if (song_.Genre != null && song_.Genre.genre != null && song_.Genre.genre != "") if (song_.Genre != null && song_.Genre.genre != null && song_.Genre.genre != "")
{ {
var genre_ = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( var genre_ = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey(song_.Genre.genre, this.pfOLFontLarge, Color.White, Color.Black, 1000)); new TitleTextureKey(song_.Genre.genre, this.pfOLFontLarge, Color.White, Color.Black, 1000));
genre_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Genre[0], TJAPlayer3.Skin.OnlineLounge_Context_Genre[1]); genre_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Genre[0], TJAPlayer3.Skin.OnlineLounge_Context_Genre[1]);
} }
@ -298,7 +298,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[0] + column, TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[0] + column,
TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[1] + row); TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[1] + row);
var difnb_ = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( var difnb_ = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey(diff.ToString(), this.pfOLFontLarge, (diff > 10) ? Color.Red : Color.White, Color.Black, 1000)); new TitleTextureKey(diff.ToString(), this.pfOLFontLarge, (diff > 10) ? Color.Red : Color.White, Color.Black, 1000));
difnb_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Level[0] + column, TJAPlayer3.Skin.OnlineLounge_Context_Level[1] + row); difnb_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Level[0] + column, TJAPlayer3.Skin.OnlineLounge_Context_Level[1] + row);
} }
@ -319,7 +319,7 @@ namespace TJAPlayer3
{ {
TJAPlayer3.Tx.OnlineLounge_Box.t2D描画(0, 0); TJAPlayer3.Tx.OnlineLounge_Box.t2D描画(0, 0);
var text = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( var text = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey("Downloading...", this.pfOLFontLarge, Color.White, Color.Black, 1000)); new TitleTextureKey("Downloading...", this.pfOLFontLarge, Color.White, Color.Black, 1000));
text.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Downloading[0], TJAPlayer3.Skin.OnlineLounge_Downloading[1]); text.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Downloading[0], TJAPlayer3.Skin.OnlineLounge_Downloading[1]);
} }
@ -332,31 +332,31 @@ namespace TJAPlayer3
//if (!IsDownloading) //if (!IsDownloading)
{ {
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange))
{ {
if (this.tMove(1)) if (this.tMove(1))
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange))
{ {
if (this.tMove(-1)) if (this.tMove(-1))
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Cancel)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel))
{ {
#region [Fast return (Escape)] #region [Fast return (Escape)]
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
if (currentMenu == ECurrentMenu.MAIN) if (currentMenu == ECurrentMenu.MAIN)
{ {
@ -387,8 +387,8 @@ namespace TJAPlayer3
#endregion #endregion
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide))
{ {
#region [Decide] #region [Decide]
@ -402,7 +402,7 @@ namespace TJAPlayer3
if (currentMenu == ECurrentMenu.RETURN) if (currentMenu == ECurrentMenu.RETURN)
{ {
// Quit // Quit
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
TJAPlayer3.Skin.soundOnlineLoungeBGM?.tStop(); TJAPlayer3.Skin.soundOnlineLoungeBGM?.tStop();
this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle; this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle;
this.actFOtoTitle.tフェードアウト開始(); this.actFOtoTitle.tフェードアウト開始();
@ -410,7 +410,7 @@ namespace TJAPlayer3
} }
else else
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
} }
} }
else else
@ -425,12 +425,12 @@ namespace TJAPlayer3
{ {
currentMenu = ECurrentMenu.CDN_OPTION; currentMenu = ECurrentMenu.CDN_OPTION;
dbCDNData = dbCDN.data.ElementAt(CDNSelectIndex - 1).Value; dbCDNData = dbCDN.data.ElementAt(CDNSelectIndex - 1).Value;
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
} }
else else
{ {
currentMenu = ECurrentMenu.MAIN; currentMenu = ECurrentMenu.MAIN;
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
} }
} }
else if (currentMenu == ECurrentMenu.CDN_OPTION) else if (currentMenu == ECurrentMenu.CDN_OPTION)
@ -438,7 +438,7 @@ namespace TJAPlayer3
// CDN Option Menu // CDN Option Menu
currentMenu = cdnOptMenu[cdnOptMenuIndex]; currentMenu = cdnOptMenu[cdnOptMenuIndex];
if (currentMenu == ECurrentMenu.CDN_SELECT) if (currentMenu == ECurrentMenu.CDN_SELECT)
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
else else
{ {
if (currentMenu == ECurrentMenu.CDN_SONGS) if (currentMenu == ECurrentMenu.CDN_SONGS)
@ -470,7 +470,7 @@ namespace TJAPlayer3
#endregion #endregion
} }
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
} }
} }
@ -478,7 +478,7 @@ namespace TJAPlayer3
{ {
if (this.cdnSongListIndex == 0) if (this.cdnSongListIndex == 0)
{ {
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
currentMenu = ECurrentMenu.CDN_OPTION; currentMenu = ECurrentMenu.CDN_OPTION;
} }
else else
@ -495,7 +495,7 @@ namespace TJAPlayer3
} }
else else
{ {
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
System.Threading.Thread download = System.Threading.Thread download =
new System.Threading.Thread(new System.Threading.ThreadStart(DownloadSong)); new System.Threading.Thread(new System.Threading.ThreadStart(DownloadSong));
download.Start(); download.Start();
@ -611,13 +611,13 @@ namespace TJAPlayer3
} }
// Fetch closest Download folder node // Fetch closest Download folder node
C曲リストノード downloadBox = null; CSongListNode downloadBox = null;
for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++) for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++)
{ {
if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == "Download") if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == "Download")
{ {
downloadBox = TJAPlayer3.Songs管理.list曲ルート[i]; downloadBox = TJAPlayer3.Songs管理.list曲ルート[i];
if (downloadBox.r親ノード != null) downloadBox = downloadBox.r親ノード; if (downloadBox.rParentNode != null) downloadBox = downloadBox.rParentNode;
break; break;
} }
} }
@ -634,11 +634,11 @@ namespace TJAPlayer3
Directory.CreateDirectory(genredPath); Directory.CreateDirectory(genredPath);
// Search a corresponding box-def if exists // Search a corresponding box-def if exists
C曲リストノード correspondingBox = null; CSongListNode correspondingBox = null;
for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++) for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++)
{ {
if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == song.Genre.genre if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == song.Genre.genre
&& TJAPlayer3.Songs管理.list曲ルート[i].eノード種別 == C曲リストノード.Eノード種別.BOX) && TJAPlayer3.Songs管理.list曲ルート[i].eノード種別 == CSongListNode.ENodeType.BOX)
correspondingBox = TJAPlayer3.Songs管理.list曲ルート[i]; correspondingBox = TJAPlayer3.Songs管理.list曲ルート[i];
} }

86
OpenTaiko/src/Stages/13.TowerSelect/CStageTowerSelect.cs
View File

@ -97,17 +97,17 @@ namespace TJAPlayer3
{ {
int returnTitle() int returnTitle()
{ {
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle; this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle;
this.actFOtoTitle.tフェードアウト開始(); this.actFOtoTitle.tフェードアウト開始();
base.ePhaseID = CStage.EPhase.Common_FADEOUT; base.ePhaseID = CStage.EPhase.Common_FADEOUT;
return 0; return 0;
} }
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange))
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
if (nCurrentSongIndex < BarInfos.Length - 1) if (nCurrentSongIndex < BarInfos.Length - 1)
{ {
@ -115,10 +115,10 @@ namespace TJAPlayer3
} }
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange))
{ {
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
if (nCurrentSongIndex > 0) if (nCurrentSongIndex > 0)
{ {
@ -126,39 +126,39 @@ namespace TJAPlayer3
} }
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Cancel)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel))
{ {
#region [Fast return (Escape)] #region [Fast return (Escape)]
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
returnTitle(); returnTitle();
#endregion #endregion
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide))
{ {
#region [Decide] #region [Decide]
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
switch(currentSong.eノード種別) switch(currentSong.eノード種別)
{ {
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
tSelectSong(); tSelectSong();
break; break;
case C曲リストノード.Eノード種別.RANDOM: case CSongListNode.ENodeType.RANDOM:
tSelectSongRandomly(); tSelectSongRandomly();
break; break;
case C曲リストノード.Eノード種別.BOX: case CSongListNode.ENodeType.BOX:
tOpenFolder(currentSong); tOpenFolder(currentSong);
break; break;
case C曲リストノード.Eノード種別.BACKBOX: case CSongListNode.ENodeType.BACKBOX:
{ {
if (TJAPlayer3.Songs管理.list曲ルート.Contains(currentSong.r親ノード) && currentSong.r親ノード.strジャンル == "太鼓タワー") if (TJAPlayer3.Songs管理.list曲ルート.Contains(currentSong.rParentNode) && currentSong.rParentNode.strジャンル == "太鼓タワー")
{ {
returnTitle(); returnTitle();
} }
@ -205,18 +205,18 @@ namespace TJAPlayer3
{ {
public string strTitle; public string strTitle;
public string strSubTitle; public string strSubTitle;
public C曲リストノード.Eノード種別 eノード種別; public CSongListNode.ENodeType eノード種別;
public CActSelect曲リスト.TitleTextureKey ttkTitle; public CActSelect曲リスト.TitleTextureKey ttkTitle;
public CActSelect曲リスト.TitleTextureKey ttkSubTitle; public CActSelect曲リスト.TitleTextureKey ttkSubTitle;
} }
public void tSelectSong() public void tSelectSong()
{ {
TJAPlayer3.stage選曲.r確定された曲 = listSongs[nCurrentSongIndex]; TJAPlayer3.stageSongSelect.rChoosenSong = listSongs[nCurrentSongIndex];
TJAPlayer3.stage選曲.r確定されたスコア = listSongs[nCurrentSongIndex].arスコア[(int)Difficulty.Tower]; TJAPlayer3.stageSongSelect.r確定されたスコア = listSongs[nCurrentSongIndex].arスコア[(int)Difficulty.Tower];
TJAPlayer3.stage選曲.n確定された曲の難易度[0] = (int)Difficulty.Tower; TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Tower;
TJAPlayer3.stage選曲.str確定された曲のジャンル = listSongs[nCurrentSongIndex].strジャンル; TJAPlayer3.stageSongSelect.str確定された曲のジャンル = listSongs[nCurrentSongIndex].strジャンル;
if ((TJAPlayer3.stage選曲.r確定された曲 != null) && (TJAPlayer3.stage選曲.r確定されたスコア != null)) if ((TJAPlayer3.stageSongSelect.rChoosenSong != null) && (TJAPlayer3.stageSongSelect.r確定されたスコア != null))
{ {
this.eフェードアウト完了時の戻り値 = EReturnValue.SongChoosen; this.eフェードアウト完了時の戻り値 = EReturnValue.SongChoosen;
this.actFOtoNowLoading.tフェードアウト開始(); // #27787 2012.3.10 yyagi 曲決定時の画面フェードアウトの省略 this.actFOtoNowLoading.tフェードアウト開始(); // #27787 2012.3.10 yyagi 曲決定時の画面フェードアウトの省略
@ -229,7 +229,7 @@ namespace TJAPlayer3
private bool tSelectSongRandomly() private bool tSelectSongRandomly()
{ {
var mandatoryDiffs = new List<int>(); var mandatoryDiffs = new List<int>();
C曲リストノード song = currentSong; CSongListNode song = currentSong;
song.stackランダム演奏番号.Clear(); song.stackランダム演奏番号.Clear();
song.listランダム用ノードリスト = null; song.listランダム用ノードリスト = null;
@ -238,8 +238,8 @@ namespace TJAPlayer3
{ {
if (song.listランダム用ノードリスト == null) if (song.listランダム用ノードリスト == null)
{ {
List<C曲リストノード> songs = new List<C曲リストノード>(); List<CSongListNode> songs = new List<CSongListNode>();
TJAPlayer3.stage選曲.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.r親ノード, ref songs, ref mandatoryDiffs, true, Difficulty.Tower); TJAPlayer3.stageSongSelect.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.rParentNode, ref songs, ref mandatoryDiffs, true, Difficulty.Tower);
song.listランダム用ノードリスト = songs; song.listランダム用ノードリスト = songs;
} }
int count = song.listランダム用ノードリスト.Count; int count = song.listランダム用ノードリスト.Count;
@ -278,11 +278,11 @@ namespace TJAPlayer3
} }
// Third assignment // Third assignment
TJAPlayer3.stage選曲.r確定された曲 = song.listランダム用ノードリスト[song.stackランダム演奏番号.Pop()]; TJAPlayer3.stageSongSelect.rChoosenSong = song.listランダム用ノードリスト[song.stackランダム演奏番号.Pop()];
TJAPlayer3.stage選曲.n確定された曲の難易度[0] = (int)Difficulty.Tower; TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Tower;
TJAPlayer3.stage選曲.r確定されたスコア = TJAPlayer3.stage選曲.r確定された曲.arスコア[TJAPlayer3.stage選曲.act曲リスト.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(TJAPlayer3.stage選曲.r確定された曲)]; TJAPlayer3.stageSongSelect.r確定されたスコア = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(TJAPlayer3.stageSongSelect.rChoosenSong)];
TJAPlayer3.stage選曲.str確定された曲のジャンル = TJAPlayer3.stage選曲.r確定された曲.strジャンル; TJAPlayer3.stageSongSelect.str確定された曲のジャンル = TJAPlayer3.stageSongSelect.rChoosenSong.strジャンル;
//TJAPlayer3.Skin.sound曲決定音.t再生する(); //TJAPlayer3.Skin.sound曲決定音.t再生する();
@ -322,22 +322,22 @@ namespace TJAPlayer3
{ {
switch(barInfo.eノード種別) switch(barInfo.eノード種別)
{ {
case C曲リストノード.Eノード種別.SCORE: case CSongListNode.ENodeType.SCORE:
TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y);
break; break;
case C曲リストノード.Eノード種別.RANDOM: case CSongListNode.ENodeType.RANDOM:
TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y);
break; break;
case C曲リストノード.Eノード種別.BOX: case CSongListNode.ENodeType.BOX:
TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y);
break; break;
case C曲リストノード.Eノード種別.BACKBOX: case CSongListNode.ENodeType.BACKBOX:
TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y);
break; break;
} }
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(barInfo.ttkTitle).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.TowerSelect_Title_Offset[0], y + TJAPlayer3.Skin.TowerSelect_Title_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(barInfo.ttkTitle).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.TowerSelect_Title_Offset[0], y + TJAPlayer3.Skin.TowerSelect_Title_Offset[1]);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(barInfo.ttkSubTitle).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.TowerSelect_SubTitle_Offset[0], y + TJAPlayer3.Skin.TowerSelect_SubTitle_Offset[1]); TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(barInfo.ttkSubTitle).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.TowerSelect_SubTitle_Offset[0], y + TJAPlayer3.Skin.TowerSelect_SubTitle_Offset[1]);
} }
private void tUpdateBarInfos() private void tUpdateBarInfos()
@ -346,17 +346,17 @@ namespace TJAPlayer3
tSetBarInfos(); tSetBarInfos();
} }
private void tOpenFolder(C曲リストノード song) private void tOpenFolder(CSongListNode song)
{ {
nCurrentSongIndex = 0; nCurrentSongIndex = 0;
listSongs = song.list子リスト; listSongs = song.list子リスト;
tUpdateBarInfos(); tUpdateBarInfos();
} }
private void tCloseFolder(C曲リストノード song) private void tCloseFolder(CSongListNode song)
{ {
nCurrentSongIndex = 0; nCurrentSongIndex = 0;
listSongs = song.r親ノード.r親ノード.list子リスト; listSongs = song.rParentNode.rParentNode.list子リスト;
tUpdateBarInfos(); tUpdateBarInfos();
} }
@ -366,7 +366,7 @@ namespace TJAPlayer3
{ {
BarInfos[i] = new BarInfo(); BarInfos[i] = new BarInfo();
BarInfo bar = BarInfos[i]; BarInfo bar = BarInfos[i];
C曲リストノード song = listSongs[i]; CSongListNode song = listSongs[i];
bar.strTitle = song.strタイトル; bar.strTitle = song.strタイトル;
bar.strSubTitle = song.strサブタイトル; bar.strSubTitle = song.strサブタイトル;
@ -378,7 +378,7 @@ namespace TJAPlayer3
} }
private BarInfo[] BarInfos; private BarInfo[] BarInfos;
private List<C曲リストノード> listSongs; private List<CSongListNode> listSongs;
private ScriptBG Background; private ScriptBG Background;
@ -390,7 +390,7 @@ namespace TJAPlayer3
public CActFIFOBlack actFOtoTitle; public CActFIFOBlack actFOtoTitle;
private int nCurrentSongIndex; private int nCurrentSongIndex;
private C曲リストノード currentSong private CSongListNode currentSong
{ {
get get
{ {

8
OpenTaiko/src/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs
View File

@ -94,7 +94,7 @@ namespace TJAPlayer3
Submenus = new (int, CTexture)[_count]; Submenus = new (int, CTexture)[_count];
Submenus[0].Item1 = -1; Submenus[0].Item1 = -1;
Submenus[0].Item2 = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( Submenus[0].Item2 = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey(CLangManager.LangInstance.GetString(401), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); new TitleTextureKey(CLangManager.LangInstance.GetString(401), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000));
for (int i = 1; i < _count; i++) for (int i = 1; i < _count; i++)
@ -102,7 +102,7 @@ namespace TJAPlayer3
int _idx = i - 1; // Excluding return int _idx = i - 1; // Excluding return
var _menu = _current.Menus[_idx]; var _menu = _current.Menus[_idx];
Submenus[i].Item1 = _menu.Key; Submenus[i].Item1 = _menu.Key;
Submenus[i].Item2 = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( Submenus[i].Item2 = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey(_GetSectionContents(_menu.Key, true), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); new TitleTextureKey(_GetSectionContents(_menu.Key, true), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000));
} }
} }
@ -124,7 +124,7 @@ namespace TJAPlayer3
{ {
var _page = _current.Pages[i]; var _page = _current.Pages[i];
Pages[i].Item1 = _page; Pages[i].Item1 = _page;
Pages[i].Item2 = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( Pages[i].Item2 = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey(_GetSectionContents(_page, false), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); new TitleTextureKey(_GetSectionContents(_page, false), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000));
Pages[i].Item3 = TJAPlayer3.tテクスチャの生成(_GetImagePath(_page)); Pages[i].Item3 = TJAPlayer3.tテクスチャの生成(_GetImagePath(_page));
} }
@ -199,7 +199,7 @@ namespace TJAPlayer3
private void tUpdatePageIndex() private void tUpdatePageIndex()
{ {
PageText = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( PageText = TJAPlayer3.stageSongSelect.actSongList.ResolveTitleTexture(
new TitleTextureKey((PageIndex + 1).ToString() + "/" + Pages.Length.ToString(), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); new TitleTextureKey((PageIndex + 1).ToString() + "/" + Pages.Length.ToString(), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000));
} }

30
OpenTaiko/src/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs
View File

@ -93,8 +93,8 @@ namespace TJAPlayer3
_page.Item2?.t2D中心基準描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[1]); _page.Item2?.t2D中心基準描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[1]);
if (_page.Item3 != null) if (_page.Item3 != null)
{ {
_page.Item3.vc拡大縮小倍率.X = TJAPlayer3.Skin.Resolution[0] / (2f * _page.Item3.szテクスチャサイズ.Width); _page.Item3.vcScaleRatio.X = TJAPlayer3.Skin.Resolution[0] / (2f * _page.Item3.szTextureSize.Width);
_page.Item3.vc拡大縮小倍率.Y = TJAPlayer3.Skin.Resolution[1] / (2f * _page.Item3.szテクスチャサイズ.Height); _page.Item3.vcScaleRatio.Y = TJAPlayer3.Skin.Resolution[1] / (2f * _page.Item3.szTextureSize.Height);
_page.Item3.t2D描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[1]); _page.Item3.t2D描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[1]);
} }
_controler.PageText?.t2D下中央基準描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[1]); _controler.PageText?.t2D下中央基準描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[1]);
@ -135,37 +135,37 @@ namespace TJAPlayer3
#region [Inputs] #region [Inputs]
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RightChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange))
{ {
_controler.tHandleRight(); _controler.tHandleRight();
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LeftChange)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange))
{ {
_controler.tHandleLeft(); _controler.tHandleLeft();
TJAPlayer3.Skin.sound変更音.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Cancel)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel))
{ {
_backToMain = _controler.tHandleBack(); _backToMain = _controler.tHandleBack();
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
} }
else if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.Decide)) TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide))
{ {
var (_b1, _b2) = _controler.tHandleEnter(); var (_b1, _b2) = _controler.tHandleEnter();
_backToMain = _b2; _backToMain = _b2;
if (_b1) if (_b1)
TJAPlayer3.Skin.sound決定音.tPlay(); TJAPlayer3.Skin.soundDecideSFX.tPlay();
else else
TJAPlayer3.Skin.sound取消音.tPlay(); TJAPlayer3.Skin.soundCancelSFX.tPlay();
} }
#endregion #endregion

6
OpenTaiko/src/Stages/CActDFPFont.cs
View File

@ -60,7 +60,7 @@ namespace TJAPlayer3
CTexture texture = b強調 ? TJAPlayer3.Tx.Config_Font_Bold : TJAPlayer3.Tx.Config_Font; CTexture texture = b強調 ? TJAPlayer3.Tx.Config_Font_Bold : TJAPlayer3.Tx.Config_Font;
if( texture != null ) if( texture != null )
{ {
texture.vc拡大縮小倍率 = new Vector3D<float>( fScale, fScale, 1f ); texture.vcScaleRatio = new Vector3D<float>( fScale, fScale, 1f );
foreach( char ch in str ) foreach( char ch in str )
{ {
foreach( ST文字領域 st文字領域 in this.st文字領域 ) foreach( ST文字領域 st文字領域 in this.st文字領域 )
@ -559,8 +559,8 @@ namespace TJAPlayer3
st文字領域Array[0x5e].ch = '`'; st文字領域Array[0x5e].ch = '`';
st文字領域Array[0x5e].rc = new Rectangle(69, 226, 14, 29); st文字領域Array[0x5e].rc = new Rectangle(69, 226, 14, 29);
float scaleX = TJAPlayer3.Tx.Config_Font.szテクスチャサイズ.Width / 256.0f; float scaleX = TJAPlayer3.Tx.Config_Font.szTextureSize.Width / 256.0f;
float scaleY = TJAPlayer3.Tx.Config_Font.szテクスチャサイズ.Height / 256.0f; float scaleY = TJAPlayer3.Tx.Config_Font.szTextureSize.Height / 256.0f;
for (int i = 0; i < st文字領域Array.Length; i++) for (int i = 0; i < st文字領域Array.Length; i++)
{ {

6
OpenTaiko/src/Stages/CActFIFOBlack.cs
View File

@ -49,11 +49,11 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Tile_Black != null) if (TJAPlayer3.Tx.Tile_Black != null)
{ {
TJAPlayer3.Tx.Tile_Black.Opacity = ( this.mode == EFIFOモード.フェードイン ) ? ( ( ( 100 - this.counter.CurrentValue ) * 0xff ) / 100 ) : ( ( this.counter.CurrentValue * 0xff ) / 100 ); TJAPlayer3.Tx.Tile_Black.Opacity = ( this.mode == EFIFOモード.フェードイン ) ? ( ( ( 100 - this.counter.CurrentValue ) * 0xff ) / 100 ) : ( ( this.counter.CurrentValue * 0xff ) / 100 );
for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size
{ {
for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size
{ {
TJAPlayer3.Tx.Tile_Black.t2D描画( i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); TJAPlayer3.Tx.Tile_Black.t2D描画( i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height);
} }
} }
} }

Some files were not shown because too many files have changed in this diff Show More