#34801 チップ画像と描画を修正。

git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/trunk@864 16f42ceb-6dc6-49c8-ba94-f2d53467949d

diff --git a/DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CStage演奏ドラム画面.cs b/DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CStage演奏ドラム画面.cs
index c806daa..a6e8dc1 100644 (file)
--- a/DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CStage演奏ドラム画面.cs
+++ b/DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CStage演奏ドラム画面.cs
@@ -1931,7 +1931,8 @@ namespace DTXMania
                                        int num9 = this.ctチップ模様アニメ.Drums.n現在の値;\r
                                        switch ( pChip.nチャンネル番号 )\r
                                        {\r
-                                               case 0x11:      // HH\r
+                                                       // HH\r
+                                               case 0x11:\r
                                                        x += (int) ( 0x10 * Scale.X ) - ( (int) ( ( 32.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
@@ -1948,15 +1949,24 @@ namespace DTXMania
                                                        }\r
                                                        break;\r
 \r
-                                               case 0x12:      // SD\r
+                                                       // SD\r
+                                               case 0x12:\r
                                                        x += (int) ( 0x10 * Scale.X ) - ( (int) ( ( 32.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0x4c * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x20 * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0x4c * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x20 * Scale.X ),\r
+                                                                               (int) ( 18 ) ) );\r
                                                        }\r
                                                        break;\r
-\r
-                                               case 0x13:      // BD\r
+                                               \r
+                                                       // BD\r
+                                               case 0x13:\r
                                                        x += (int) ( 0x16 * Scale.X ) - ( (int) ( ( 44.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
@@ -1973,63 +1983,154 @@ namespace DTXMania
                                                        }\r
                                                        break;\r
 \r
+                                                       // HT\r
                                                case 0x14:\r
                                                        x += (int) ( 0x10 * Scale.X ) - ( (int) ( ( 32.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0x6c * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x20 * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0x6c * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x20 * Scale.X ),\r
+                                                                               (int) ( 18 ) ) );\r
                                                        }\r
                                                        break;\r
 \r
+                                                       // LT\r
                                                case 0x15:\r
                                                        x += (int) ( 0x10 * Scale.X ) - ( (int) ( ( 32.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 140 * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x20 * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 140 * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x20 * Scale.X ),\r
+                                                                               (int) ( 18 ) ) );\r
                                                        }\r
                                                        break;\r
 \r
+                                                       // CY\r
                                                case 0x16:\r
                                                        x += (int) ( 0x13 * Scale.X ) - ( (int) ( ( 38.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 0x15 * Scale.Y, new Rectangle( (int) ( 0xcc * Scale.X ), (int) ( 0x158 * Scale.Y ), (int) ( 0x26 * Scale.X ), (int) ( 0x24 * Scale.Y ) ) );\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0xcc * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x26 * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 46,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0xcc * Scale.X ),\r
+                                                                               (int) ( 786 ),\r
+                                                                               (int) ( 0x26 * Scale.X ),\r
+                                                                               (int) ( 78 ) ) );\r
+\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9, \r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0xcc * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x26 * Scale.X ),\r
+                                                                               (int) ( 18 ) ) );\r
                                                        }\r
                                                        break;\r
 \r
+                                                       // FT\r
                                                case 0x17:\r
                                                        x += (int) ( 0x10 * Scale.X ) - ( (int) ( ( 32.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0xac * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x20 * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle( \r
+                                                                               (int) ( 0xac * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x20 * Scale.X ),\r
+                                                                               (int) ( 18 ) ) );\r
                                                        }\r
                                                        break;\r
 \r
+                                                       // HHO\r
                                                case 0x18:\r
                                                        x += (int) ( 13 * Scale.X ) - ( (int) ( ( 26.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0xf2 * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x1a * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 9 * Scale.Y, new Rectangle( (int) ( 0xf2 * Scale.X ), (int) ( 0x158 * Scale.Y ), (int) ( 0x1a * Scale.X ), (int) ( 0x12 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0xf2 * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x1a * Scale.X ),\r
+                                                                               (int) ( 18 )\r
+                                                                               ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 16,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0xf2 * Scale.X ),\r
+                                                                               (int) ( 790 ),\r
+                                                                               (int) ( 0x1a * Scale.X ),\r
+                                                                               (int) ( 30 )\r
+                                                                               ) );\r
                                                        }\r
                                                        break;\r
 \r
+                                                       // RCY\r
                                                case 0x19:\r
                                                        x += (int) ( 13 * Scale.X ) - ( (int) ( ( 26.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0xf2 * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x1a * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 9 * Scale.Y, new Rectangle( (int) ( 0xf2 * Scale.X ), (int) ( 0x158 * Scale.Y ), (int) ( 0x1a * Scale.X ), (int) ( 0x12 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle( \r
+                                                                               (int) ( 0xf2 * Scale.X ),\r
+                                                                               (int) ( num9 * ( 18 - 2 ) ),\r
+                                                                               (int) ( 0x1a * Scale.X ),\r
+                                                                               (int) ( 18 )\r
+                                                                               ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 16,\r
+                                                                       new Rectangle( \r
+                                                                               (int) ( 0xf2 * Scale.X ), \r
+                                                                               (int) ( 790 ),\r
+                                                                               (int) ( 0x1a * Scale.X ),\r
+                                                                               (int) ( 30 )\r
+                                                                               ) );\r
                                                        }\r
                                                        break;\r
 \r
+                                                       // LCY\r
                                                case 0x1a:\r
                                                        x += (int) ( 0x13 * Scale.X ) - ( (int) ( ( 38.0 * pChip.dbチップサイズ倍率 * Scale.X ) / 2.0 ) );\r
                                                        if ( this.txチップ != null )\r
                                                        {\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 0x15 * Scale.Y, new Rectangle( (int) ( 0xcc * Scale.X ), (int) ( 0x158 * Scale.Y ), (int) ( 0x26 * Scale.X ), (int) ( 0x24 * Scale.Y ) ) );\r
-                                                               this.txチップ.t2D描画( CDTXMania.app.Device, x, y - 4 * Scale.Y, new Rectangle( (int) ( 0xcc * Scale.X ), (int) ( num9 * 7 * Scale.Y ), (int) ( 0x26 * Scale.X ), (int) ( 8 * Scale.Y ) ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 46,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0xcc * Scale.X ),\r
+                                                                               (int) ( 786 ),\r
+                                                                               (int) ( 0x26 * Scale.X ),\r
+                                                                               (int) ( 78 )\r
+                                                                               ) );\r
+                                                               this.txチップ.t2D描画( CDTXMania.app.Device,\r
+                                                                       x,\r
+                                                                       y - 9,\r
+                                                                       new Rectangle(\r
+                                                                               (int) ( 0xcc * Scale.X ),\r
+                                                                               (int) ( num9 * (18 - 2) ),\r
+                                                                               (int) ( 0x26 * Scale.X ),\r
+                                                                               (int) ( 18 )\r
+                                                                               ) );\r
                                                        }\r
                                                        break;\r
                                        }\r

diff --git a/実行時フォルダ/System/Default/Graphics/ScreenPlayDrums chips.png b/実行時フォルダ/System/Default/Graphics/ScreenPlayDrums chips.png
index 7bc2ebb..bc55ec2 100644 (file)
Binary files a/実行時フォルダ/System/Default/Graphics/ScreenPlayDrums chips.png and b/実行時フォルダ/System/Default/Graphics/ScreenPlayDrums chips.png differ