diff --git a/DTXMania/Code/Stage/07.Performance/DrumsScreen/CActPerfDrumsGauge.cs b/DTXMania/Code/Stage/07.Performance/DrumsScreen/CActPerfDrumsGauge.cs index d04405ec..79e84b54 100644 --- a/DTXMania/Code/Stage/07.Performance/DrumsScreen/CActPerfDrumsGauge.cs +++ b/DTXMania/Code/Stage/07.Performance/DrumsScreen/CActPerfDrumsGauge.cs @@ -73,7 +73,8 @@ public override int OnUpdateAndDraw() { base.txフレーム.Drums.tDraw2D(CDTXMania.app.Device, base.n本体X.Drums, (CDTXMania.ConfigIni.bReverse.Drums ? 28 : 626), new Rectangle(0, 0, base.txフレーム.Drums.szImageSize.Width, 47)); base.txハイスピ.vcScaleRatio = new Vector3(0.76190476190476190476190476190476f, 0.66666666666666666666666666666667f, 1.0f); - base.txハイスピ.tDraw2D(CDTXMania.app.Device, -37 + base.n本体X.Drums + base.txフレーム.Drums.szImageSize.Width, (CDTXMania.ConfigIni.bReverse.Drums ? 35 : 634), new Rectangle(0, CDTXMania.ConfigIni.nScrollSpeed.Drums * 48, 42, 48)); + int speedTexturePosY = CDTXMania.ConfigIni.nScrollSpeed.Drums * 48 > 20 * 48 ? 20 * 48 : CDTXMania.ConfigIni.nScrollSpeed.Drums * 48; + base.txハイスピ.tDraw2D(CDTXMania.app.Device, -37 + base.n本体X.Drums + base.txフレーム.Drums.szImageSize.Width, (CDTXMania.ConfigIni.bReverse.Drums ? 35 : 634), new Rectangle(0, speedTexturePosY, 42, 48)); if (base.db現在のゲージ値.Drums == 1.0 && base.txフルゲージ != null) { base.txフルゲージ.tDraw2D(CDTXMania.app.Device, 20 + base.n本体X.Drums, (CDTXMania.ConfigIni.bReverse.Drums ? 37 : 635), new Rectangle(0, 0, base.txフレーム.Drums.szImageSize.Width - 63, 31)); diff --git a/DTXMania/Code/Stage/07.Performance/GuitarScreen/CActPerfGuitarGauge.cs b/DTXMania/Code/Stage/07.Performance/GuitarScreen/CActPerfGuitarGauge.cs index 2d7e1360..54be466d 100644 --- a/DTXMania/Code/Stage/07.Performance/GuitarScreen/CActPerfGuitarGauge.cs +++ b/DTXMania/Code/Stage/07.Performance/GuitarScreen/CActPerfGuitarGauge.cs @@ -83,7 +83,8 @@ public override int OnUpdateAndDraw() { base.txフレーム.Guitar.tDraw2D(CDTXMania.app.Device, base.n本体X.Guitar, 0, new Rectangle(0, 0, base.txフレーム.Guitar.szImageSize.Width, 68)); base.txハイスピ.vcScaleRatio = new Vector3(0.76190476190476190476190476190476f, 0.66666666666666666666666666666667f, 1.0f); - base.txハイスピ.tDraw2D(CDTXMania.app.Device, - 36 + base.n本体X.Guitar + base.txフレーム.Guitar.szImageSize.Width, 30, new Rectangle(0, CDTXMania.ConfigIni.nScrollSpeed.Guitar * 48, 42, 48)); + int speedTexturePosY = CDTXMania.ConfigIni.nScrollSpeed.Guitar * 48 > 20 * 48 ? 20 * 48 : CDTXMania.ConfigIni.nScrollSpeed.Guitar * 48; + base.txハイスピ.tDraw2D(CDTXMania.app.Device, - 36 + base.n本体X.Guitar + base.txフレーム.Guitar.szImageSize.Width, 30, new Rectangle(0, speedTexturePosY, 42, 48)); if (base.db現在のゲージ値.Guitar == 1.0 && base.txフルゲージ != null) { base.txフルゲージ.tDraw2D(CDTXMania.app.Device, 6 + base.n本体X.Guitar, 31, new Rectangle(0, 0, base.txフレーム.Guitar.szImageSize.Width - 48, 30)); @@ -112,7 +113,8 @@ public override int OnUpdateAndDraw() { base.txフレーム.Bass.tDraw2D(CDTXMania.app.Device, base.n本体X.Bass - base.txフレーム.Bass.szImageSize.Width, 0, new Rectangle(0, 0, base.txフレーム.Bass.szImageSize.Width, 68)); base.txハイスピ.vcScaleRatio = new Vector3(0.76190476190476190476190476190476f, 0.66666666666666666666666666666667f, 1.0f); - base.txハイスピ.tDraw2D(CDTXMania.app.Device, 4 + base.n本体X.Bass - base.txフレーム.Bass.szImageSize.Width, 30, new Rectangle(0, CDTXMania.ConfigIni.nScrollSpeed.Bass * 48, 42, 48)); + int speedTexturePosY = CDTXMania.ConfigIni.nScrollSpeed.Bass * 48 > 20 * 48 ? 20 * 48 : CDTXMania.ConfigIni.nScrollSpeed.Bass * 48; + base.txハイスピ.tDraw2D(CDTXMania.app.Device, 4 + base.n本体X.Bass - base.txフレーム.Bass.szImageSize.Width, 30, new Rectangle(0, speedTexturePosY, 42, 48)); if (base.db現在のゲージ値.Bass == 1.0 && base.txフルゲージ != null) { base.txフルゲージ.tDraw2D(CDTXMania.app.Device, 42 + base.n本体X.Bass - base.txフレーム.Bass.szImageSize.Width, 31, new Rectangle(0, 0, base.txフレーム.Bass.szImageSize.Width - 48, 30)); diff --git a/DTXMania/Code/Stage/08.Result/CActResultImage.cs b/DTXMania/Code/Stage/08.Result/CActResultImage.cs index 3c260541..e9fe6e99 100644 --- a/DTXMania/Code/Stage/08.Result/CActResultImage.cs +++ b/DTXMania/Code/Stage/08.Result/CActResultImage.cs @@ -163,7 +163,8 @@ public override void OnManagedCreateResources() bitmap3.Dispose(); Bitmap bitmap4 = new Bitmap(0x2a, 0x30); graphics = Graphics.FromImage(bitmap4); - graphics.DrawImage(this.iDrumSpeed, new Rectangle(0, 0, 0x2a, 0x30), new Rectangle(0, CDTXMania.ConfigIni.nScrollSpeed.Drums * 0x30, 0x2a, 0x30), GraphicsUnit.Pixel); + int speedTexturePosY = CDTXMania.ConfigIni.nScrollSpeed.Drums * 48 > 20 * 48 ? 20 * 48 : CDTXMania.ConfigIni.nScrollSpeed.Drums * 48; + graphics.DrawImage(this.iDrumSpeed, new Rectangle(0, 0, 0x2a, 0x30), new Rectangle(0, speedTexturePosY, 0x2a, 0x30), GraphicsUnit.Pixel); this.txDrumSpeed = new CTexture(CDTXMania.app.Device, bitmap4, CDTXMania.TextureFormat, false); graphics.Dispose(); //graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default; diff --git a/Runtime/System/Graphics/7_panel_icons.jpg b/Runtime/System/Graphics/7_panel_icons.jpg index cc8992b2..722faa84 100644 Binary files a/Runtime/System/Graphics/7_panel_icons.jpg and b/Runtime/System/Graphics/7_panel_icons.jpg differ