OSDN Git Service

続・演奏画面のリファクタ。ドラムとギター画面で共通で使用しているメソッドを1つにまとめる作業。まだ完全には作業完了していない。少しずつ慎重に進めます。
authoryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Thu, 17 Feb 2011 15:14:07 +0000 (15:14 +0000)
committeryyagi <yyagi@16f42ceb-6dc6-49c8-ba94-f2d53467949d>
Thu, 17 Feb 2011 15:14:07 +0000 (15:14 +0000)
git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/trunk@118 16f42ceb-6dc6-49c8-ba94-f2d53467949d

DTXManiaプロジェクト/コード/ステージ/07.演奏/CStage演奏画面共通.cs
DTXManiaプロジェクト/コード/ステージ/07.演奏/ギター画面/CAct演奏GuitarWailingBonus.cs
DTXManiaプロジェクト/コード/ステージ/07.演奏/ギター画面/CStage演奏ギター画面.cs
DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CAct演奏DrumsWailingBonus.cs
DTXManiaプロジェクト/コード/ステージ/07.演奏/ドラム画面/CStage演奏ドラム画面.cs

index 896b50b..9cc56c9 100644 (file)
@@ -54,7 +54,26 @@ namespace DTXMania
                        this.bIsAutoPlay = CDTXMania.ConfigIni.bAutoPlay;                                                                       // #24239 2011.1.23 yyagi\r
                }\r
 \r
+               public override void OnManagedリソースの作成()\r
+               {\r
+                       if ( !base.b活性化してない )\r
+                       {\r
+                               this.t背景テクスチャの生成();\r
 \r
+                               this.txWailing枠 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing cursor.png" ) );\r
+\r
+                               base.OnManagedリソースの作成();\r
+                       }\r
+               }\r
+               public override void OnManagedリソースの解放()\r
+               {\r
+                       if ( !base.b活性化してない )\r
+                       {\r
+                               CDTXMania.tテクスチャの解放( ref this.tx背景 );\r
+                               CDTXMania.tテクスチャの解放( ref this.txWailing枠 );\r
+                               base.OnManagedリソースの解放();\r
+                       }\r
+               }\r
 \r
                // その他\r
 \r
@@ -222,11 +241,20 @@ namespace DTXMania
                        }\r
                }\r
 \r
+               protected CAct演奏AVI actAVI;\r
+               protected CAct演奏BGA actBGA;\r
                protected CActFIFOBlack actFI;\r
                protected CActFIFOBlack actFO;\r
                protected CActFIFOWhite actFOClear;\r
                protected CAct演奏ゲージ actGauge;\r
 \r
+               protected CAct演奏パネル文字列 actPanel;\r
+               protected CAct演奏演奏情報 actPlayInfo;\r
+\r
+               protected CAct演奏ステージ失敗 actStageFailed;\r
+\r
+               protected CAct演奏WailingBonus actWailingBonus;\r
+               protected CAct演奏スクロール速度 act譜面スクロール速度;\r
                protected bool bPAUSE;\r
                protected STDGBVALUE<bool> b演奏にMIDI入力を使った;\r
                protected STDGBVALUE<bool> b演奏にキーボードを使った;\r
@@ -239,8 +267,9 @@ namespace DTXMania
 \r
                protected CDTX.CChip r次にくるギターChip;\r
                protected CDTX.CChip r次にくるベースChip;\r
+               protected CTexture txWailing枠;\r
 \r
-\r
+               protected CTexture tx背景;\r
                protected STDGBVALUE<int> nInputAdjustTimeMs;           // #23580 2011.1.3 yyagi\r
                protected CConfigIni.STAUTOPLAY bIsAutoPlay;            // #24239 2011.1.23 yyagi\r
 \r
@@ -596,7 +625,85 @@ namespace DTXMania
                }\r
 \r
 \r
+               protected abstract void t進行描画・AVI();\r
+               protected void t進行描画・AVI(int x, int y)\r
+               {\r
+                       if ( ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( !CDTXMania.ConfigIni.bストイックモード && CDTXMania.ConfigIni.bAVI有効 ) )\r
+                       {\r
+                               this.actAVI.t進行描画( x, y );\r
+                       }\r
+               }\r
+               protected abstract void t進行描画・BGA();\r
+               protected void t進行描画・BGA(int x, int y)\r
+               {\r
+                       if ( ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( !CDTXMania.ConfigIni.bストイックモード && CDTXMania.ConfigIni.bBGA有効 ) )\r
+                       {\r
+                               this.actBGA.t進行描画( x, y );\r
+                       }\r
+               }\r
+\r
+               protected void t進行描画・MIDIBGM()\r
+               {\r
+                       if ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED )\r
+                       {\r
+                               CStage.Eフェーズ eフェーズid1 = base.eフェーズID;\r
+                       }\r
+               }\r
+\r
+               protected void t進行描画・STAGEFAILED()\r
+               {\r
+                       if ( ( ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED ) || ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( ( this.actStageFailed.On進行描画() != 0 ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
+                       {\r
+                               this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージ失敗;\r
+                               base.eフェーズID = CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト;\r
+                               this.actFO.tフェードアウト開始();\r
+                       }\r
+               }\r
+               protected void t進行描画・WailingBonus()\r
+               {\r
+                       if ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
+                       {\r
+                               this.actWailingBonus.On進行描画();\r
+                       }\r
+               }\r
+               protected abstract void t進行描画・Wailing枠();\r
+               protected void t進行描画・Wailing枠(int GtWailingFrameX, int BsWailingFrameX, int GtWailingFrameY, int BsWailingFrameY)\r
+               {\r
+                       if ( ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) && CDTXMania.ConfigIni.bGuitar有効 )\r
+                       {\r
+                               if ( CDTXMania.DTX.bチップがある.Guitar && ( this.txWailing枠 != null ) )\r
+                               {\r
+                                       this.txWailing枠.t2D描画( CDTXMania.app.Device, GtWailingFrameX, GtWailingFrameY );\r
+                               }\r
+                               if ( CDTXMania.DTX.bチップがある.Bass && ( this.txWailing枠 != null ) )\r
+                               {\r
+                                       this.txWailing枠.t2D描画( CDTXMania.app.Device, BsWailingFrameX, BsWailingFrameY );\r
+                               }\r
+                       }\r
+               }\r
+\r
+\r
+               protected abstract void t進行描画・パネル文字列();\r
+               protected void t進行描画・パネル文字列(int x, int y)\r
+               {\r
+                       if ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
+                       {\r
+                               this.actPanel.t進行描画( x, y );\r
+                       }\r
+               }\r
+               protected void tパネル文字列の設定()\r
+               {\r
+                       this.actPanel.SetPanelString( string.IsNullOrEmpty( CDTXMania.DTX.PANEL ) ? CDTXMania.DTX.TITLE : CDTXMania.DTX.PANEL );\r
+               }\r
+\r
 \r
+               protected void t進行描画・ゲージ()\r
+               {\r
+                       if ( ( ( CDTXMania.ConfigIni.eDark != Eダークモード.HALF ) && ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) ) && ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
+                       {\r
+                               this.actGauge.On進行描画();\r
+                       }\r
+               }\r
 \r
                protected bool t進行描画・フェードイン・アウト()\r
                {\r
@@ -626,10 +733,119 @@ namespace DTXMania
                \r
                        }\r
                        return false;\r
-               }               \r
+               }\r
 \r
-       \r
+               protected abstract void t進行描画・演奏情報();\r
+               protected void t進行描画・演奏情報(int x, int y)\r
+               {\r
+                       if ( !CDTXMania.ConfigIni.b演奏情報を表示しない )\r
+                       {\r
+                               this.actPlayInfo.t進行描画( x, y );\r
+                       }\r
+               }\r
+               protected void t進行描画・背景()\r
+               {\r
+                       if ( CDTXMania.ConfigIni.eDark == Eダークモード.OFF )\r
+                       {\r
+                               if ( this.tx背景 != null )\r
+                               {\r
+                                       this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               CDTXMania.app.Device.Clear( ClearFlags.ZBuffer | ClearFlags.Target, Color.Black, 0f, 0 );\r
+                       }\r
+               }\r
                \r
+               protected void t進行描画・譜面スクロール速度()\r
+               {\r
+                       this.act譜面スクロール速度.On進行描画();\r
+               }\r
+\r
+               protected abstract void t背景テクスチャの生成();      // overwrited by a successor\r
+               protected void t背景テクスチャの生成( string DefaultBgFilename, Rectangle bgrect, string bgfilename )\r
+               {\r
+                       Bitmap image = null;\r
+                       bool flag = true;\r
+\r
+                       if ( bgfilename != null && File.Exists( bgfilename ) )\r
+                       {\r
+                               try\r
+                               {\r
+                                       Bitmap bitmap2 = null;\r
+                                       bitmap2 = new Bitmap( bgfilename );\r
+                                       if ( ( bitmap2.Size.Width == 0 ) && ( bitmap2.Size.Height == 0 ) )\r
+                                       {\r
+                                               this.tx背景 = null;\r
+                                               return;\r
+                                       }\r
+                                       Bitmap bitmap3 = new Bitmap( 640, 480 );\r
+                                       Graphics graphics = Graphics.FromImage( bitmap3 );\r
+                                       for ( int i = 0; i < 480; i += bitmap2.Size.Height )\r
+                                       {\r
+                                               for ( int j = 0; j < 640; j += bitmap2.Size.Width )\r
+                                               {\r
+                                                       graphics.DrawImage( bitmap2, j, i, bitmap2.Width, bitmap2.Height );\r
+                                               }\r
+                                       }\r
+                                       graphics.Dispose();\r
+                                       bitmap2.Dispose();\r
+                                       image = new Bitmap( CSkin.Path( DefaultBgFilename ) );\r
+                                       graphics = Graphics.FromImage( image );\r
+                                       ColorMatrix matrix2 = new ColorMatrix();\r
+                                       matrix2.Matrix00 = 1f;\r
+                                       matrix2.Matrix11 = 1f;\r
+                                       matrix2.Matrix22 = 1f;\r
+                                       matrix2.Matrix33 = ( (float) CDTXMania.ConfigIni.n背景の透過度 ) / 255f;\r
+                                       matrix2.Matrix44 = 1f;\r
+                                       ColorMatrix newColorMatrix = matrix2;\r
+                                       ImageAttributes imageAttr = new ImageAttributes();\r
+                                       imageAttr.SetColorMatrix( newColorMatrix );\r
+                                       graphics.DrawImage( bitmap3, new Rectangle( 0, 0, 640, 480 ), 0, 0, 640, 480, GraphicsUnit.Pixel, imageAttr );\r
+                                       imageAttr.Dispose();\r
+                                       graphics.DrawImage( bitmap3, bgrect, bgrect.X, bgrect.Y, bgrect.Width, bgrect.Height, GraphicsUnit.Pixel );\r
+                                       graphics.Dispose();\r
+                                       bitmap3.Dispose();\r
+                                       flag = false;\r
+                               }\r
+                               catch\r
+                               {\r
+                                       Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { bgfilename } );\r
+                               }\r
+                       }\r
+                       if ( flag )\r
+                       {\r
+                               bgfilename = CSkin.Path( DefaultBgFilename );\r
+                               try\r
+                               {\r
+                                       image = new Bitmap( bgfilename );\r
+                               }\r
+                               catch\r
+                               {\r
+                                       Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { bgfilename } );\r
+                                       this.tx背景 = null;\r
+                                       return;\r
+                               }\r
+                       }\r
+                       if ( ( CDTXMania.DTX.listBMP.Count > 0 ) || ( CDTXMania.DTX.listBMPTEX.Count > 0 ) )\r
+                       {\r
+                               Graphics graphics2 = Graphics.FromImage( image );\r
+                               graphics2.FillRectangle( Brushes.Black, bgrect.X, bgrect.Y, bgrect.Width, bgrect.Height );\r
+                               graphics2.Dispose();\r
+                       }\r
+                       try\r
+                       {\r
+                               this.tx背景 = new CTexture( CDTXMania.app.Device, image, CDTXMania.TextureFormat );\r
+                       }\r
+                       catch ( CTextureCreateFailedException )\r
+                       {\r
+                               Trace.TraceError( "背景テクスチャの生成に失敗しました。" );\r
+                               this.tx背景 = null;\r
+                       }\r
+                       image.Dispose();\r
+               }\r
+\r
 \r
 #if true               // DAMAGELEVELTUNING\r
 #region [ DAMAGELEVELTUNING ]\r
index e46a25e..56657c9 100644 (file)
@@ -6,7 +6,7 @@ using FDK;
 \r
 namespace DTXMania\r
 {\r
-       internal class CAct演奏GuitarWailingBonus : CActivity\r
+       internal class CAct演奏GuitarWailingBonus : CAct演奏WailingBonus\r
        {\r
                // メソッド\r
 \r
@@ -14,11 +14,11 @@ namespace DTXMania
                {\r
                        base.b活性化してない = true;\r
                }\r
-               public void Start( E楽器パート part )\r
-               {\r
-                       this.Start( part, null );\r
-               }\r
-               public void Start( E楽器パート part, CDTX.CChip r歓声Chip )\r
+               //public override void Start( E楽器パート part )\r
+               //{\r
+               //    this.Start( part, null );\r
+               //}\r
+               public override void Start( E楽器パート part, CDTX.CChip r歓声Chip )\r
                {\r
                        if( part != E楽器パート.DRUMS )\r
                        {\r
@@ -58,22 +58,6 @@ namespace DTXMania
                        }\r
                        base.On活性化();\r
                }\r
-               public override void OnManagedリソースの作成()\r
-               {\r
-                       if( !base.b活性化してない )\r
-                       {\r
-                               this.txWailingBonus = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing bonus.png" ) );\r
-                               base.OnManagedリソースの作成();\r
-                       }\r
-               }\r
-               public override void OnManagedリソースの解放()\r
-               {\r
-                       if( !base.b活性化してない )\r
-                       {\r
-                               CDTXMania.tテクスチャの解放( ref this.txWailingBonus );\r
-                               base.OnManagedリソースの解放();\r
-                       }\r
-               }\r
                public override int On進行描画()\r
                {\r
                        if( !base.b活性化してない )\r
@@ -164,15 +148,5 @@ namespace DTXMania
                        }\r
                        return 0;\r
                }\r
-               \r
-\r
-               // その他\r
-\r
-               #region [ private ]\r
-               //-----------------\r
-               private CCounter[,] ct進行用 = new CCounter[ 3, 4 ];\r
-               private CTexture txWailingBonus;\r
-               //-----------------\r
-               #endregion\r
        }\r
 }\r
index 2d47f86..87204d7 100644 (file)
@@ -225,10 +225,10 @@ namespace DTXMania
                {\r
                        if( !base.b活性化してない )\r
                        {\r
-                               this.t背景テクスチャの生成();\r
+                               //this.t背景テクスチャの生成();\r
                                this.txチップ = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlayGuitar chips.png" ) );\r
                                this.txヒットバー = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlayGuitar hit-bar.png" ) );\r
-                               this.txWailing枠 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing cursor.png" ) );\r
+                               //this.txWailing枠 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing cursor.png" ) );\r
                                base.OnManagedリソースの作成();\r
                        }\r
                }\r
@@ -236,10 +236,10 @@ namespace DTXMania
                {\r
                        if( !base.b活性化してない )\r
                        {\r
-                               CDTXMania.tテクスチャの解放( ref this.tx背景 );\r
+                               //CDTXMania.tテクスチャの解放( ref this.tx背景 );\r
                                CDTXMania.tテクスチャの解放( ref this.txチップ );\r
                                CDTXMania.tテクスチャの解放( ref this.txヒットバー );\r
-                               CDTXMania.tテクスチャの解放( ref this.txWailing枠 );\r
+                               //CDTXMania.tテクスチャの解放( ref this.txWailing枠 );\r
                                base.OnManagedリソースの解放();\r
                        }\r
                }\r
@@ -534,8 +534,8 @@ namespace DTXMania
                //    }\r
                //}\r
 \r
-               private CAct演奏AVI actAVI;\r
-               private CAct演奏BGA actBGA;\r
+               //private CAct演奏AVI actAVI;\r
+               //private CAct演奏BGA actBGA;\r
                private CAct演奏Guitarチップファイア actChipFire;\r
                private CAct演奏Guitarコンボ actCombo;\r
                //private CActFIFOBlack actFI;\r
@@ -544,14 +544,14 @@ namespace DTXMania
                //private CAct演奏Guitarゲージ actGauge;\r
                private CAct演奏Guitar判定文字列 actJudgeString;\r
                private CAct演奏GuitarレーンフラッシュGB actLaneFlushGB;\r
-               private CAct演奏パネル文字列 actPanel;\r
-               private CAct演奏演奏情報 actPlayInfo;\r
+               //private CAct演奏パネル文字列 actPanel;\r
+               //private CAct演奏演奏情報 actPlayInfo;\r
                private CAct演奏GuitarRGB actRGB;\r
                private CAct演奏Guitarスコア actScore;\r
-               private CAct演奏ステージ失敗 actStageFailed;\r
+               //private CAct演奏ステージ失敗 actStageFailed;\r
                private CAct演奏Guitarステータスパネル actStatusPanels;\r
-               private CAct演奏GuitarWailingBonus actWailingBonus;\r
-               private CAct演奏スクロール速度 act譜面スクロール速度;\r
+               //private CAct演奏GuitarWailingBonus actWailingBonus;\r
+               //private CAct演奏スクロール速度 act譜面スクロール速度;\r
                //private bool bPAUSE;\r
                //private STDGBVALUE<bool> b演奏にMIDI入力を使った;\r
                //private STDGBVALUE<bool> b演奏にキーボードを使った;\r
@@ -581,10 +581,10 @@ namespace DTXMania
                private CDTX.CChip r現在の空うちベースChip;\r
                //private CDTX.CChip r次にくるギターChip;\r
                //private CDTX.CChip r次にくるベースChip;\r
-               private CTexture txWailing枠;\r
+               //private CTexture txWailing枠;\r
                private CTexture txチップ;\r
                private CTexture txヒットバー;\r
-               private CTexture tx背景;\r
+               //private CTexture tx背景;\r
                // private STDGBVALUE<int> nInputAdjustTimeMs;          // #23580 2011.1.3 yyagi\r
                //private STDGBVALUE<bool> bIsAutoPlay;                         // #24239 2011.1.23 yyagi\r
 \r
@@ -1089,34 +1089,28 @@ namespace DTXMania
                                        return;\r
                        }\r
                }\r
-               private void tパネル文字列の設定()\r
+               //private void tパネル文字列の設定()\r
+               //{\r
+               //    this.actPanel.SetPanelString( string.IsNullOrEmpty( CDTXMania.DTX.PANEL ) ? CDTXMania.DTX.TITLE : CDTXMania.DTX.PANEL );\r
+               //}\r
+               protected override void t進行描画・AVI()\r
                {\r
-                       this.actPanel.SetPanelString( string.IsNullOrEmpty( CDTXMania.DTX.PANEL ) ? CDTXMania.DTX.TITLE : CDTXMania.DTX.PANEL );\r
+                       base.t進行描画・AVI( 0xb5, 50 );\r
                }\r
-               private void t進行描画・AVI()\r
+               protected override void t進行描画・BGA()\r
                {\r
-                       if( ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( !CDTXMania.ConfigIni.bストイックモード && CDTXMania.ConfigIni.bAVI有効 ) )\r
-                       {\r
-                               this.actAVI.t進行描画( 0xb5, 50 );\r
-                       }\r
-               }\r
-               private void t進行描画・BGA()\r
-               {\r
-                       if( ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( !CDTXMania.ConfigIni.bストイックモード && CDTXMania.ConfigIni.bBGA有効 ) )\r
-                       {\r
-                               this.actBGA.t進行描画( 0xb5, 50 );\r
-                       }\r
+                       base.t進行描画・BGA( 0xb5, 50 );\r
                }\r
                private void t進行描画・DANGER()\r
                {\r
                }\r
-               private void t進行描画・MIDIBGM()\r
-               {\r
-                       if( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED )\r
-                       {\r
-                               CStage.Eフェーズ eフェーズid1 = base.eフェーズID;\r
-                       }\r
-               }\r
+               //private void t進行描画・MIDIBGM()\r
+               //{\r
+               //    if( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED )\r
+               //    {\r
+               //        CStage.Eフェーズ eフェーズid1 = base.eフェーズID;\r
+               //    }\r
+               //}\r
                private void t進行描画・RGBボタン()\r
                {\r
                        if( CDTXMania.ConfigIni.eDark != Eダークモード.FULL )\r
@@ -1124,35 +1118,28 @@ namespace DTXMania
                                this.actRGB.On進行描画();\r
                        }\r
                }\r
-               private void t進行描画・STAGEFAILED()\r
-               {\r
-                       if( ( ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED ) || ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( ( this.actStageFailed.On進行描画() != 0 ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
-                       {\r
-                               this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージ失敗;\r
-                               base.eフェーズID = CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト;\r
-                               this.actFO.tフェードアウト開始();\r
-                       }\r
-               }\r
-               private void t進行描画・WailingBonus()\r
-               {\r
-                       if( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
-                       {\r
-                               this.actWailingBonus.On進行描画();\r
-                       }\r
-               }\r
-               private void t進行描画・Wailing枠()\r
+               //private void t進行描画・STAGEFAILED()\r
+               //{\r
+               //    if( ( ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED ) || ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( ( this.actStageFailed.On進行描画() != 0 ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
+               //    {\r
+               //        this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージ失敗;\r
+               //        base.eフェーズID = CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト;\r
+               //        this.actFO.tフェードアウト開始();\r
+               //    }\r
+               //}\r
+               //private void t進行描画・WailingBonus()\r
+               //{\r
+               //    if( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
+               //    {\r
+               //        this.actWailingBonus.On進行描画();\r
+               //    }\r
+               //}\r
+               protected override void t進行描画・Wailing枠()\r
                {\r
-                       if( ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) && CDTXMania.ConfigIni.bGuitar有効 )\r
-                       {\r
-                               if( CDTXMania.DTX.bチップがある.Guitar && ( this.txWailing枠 != null ) )\r
-                               {\r
-                                       this.txWailing枠.t2D描画( CDTXMania.app.Device, 0x8b, CDTXMania.ConfigIni.bReverse.Guitar ? 340 : 11 );\r
-                               }\r
-                               if( CDTXMania.DTX.bチップがある.Bass && ( this.txWailing枠 != null ) )\r
-                               {\r
-                                       this.txWailing枠.t2D描画( CDTXMania.app.Device, 0x251, CDTXMania.ConfigIni.bReverse.Bass ? 340 : 11 );\r
-                               }\r
-                       }\r
+                       base.t進行描画・Wailing枠( 0x8b, 0x251,\r
+                               CDTXMania.ConfigIni.bReverse.Guitar ? 340 : 11,\r
+                               CDTXMania.ConfigIni.bReverse.Bass ?   340 : 11\r
+                       );\r
                }\r
                private void t進行描画・ギターベース判定ライン()\r
                {\r
@@ -1182,13 +1169,13 @@ namespace DTXMania
                                }\r
                        }\r
                }\r
-               private void t進行描画・ゲージ()\r
-               {\r
-                       if( ( ( CDTXMania.ConfigIni.eDark != Eダークモード.HALF ) && ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) ) && ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
-                       {\r
-                               this.actGauge.On進行描画();\r
-                       }\r
-               }\r
+               //private void t進行描画・ゲージ()\r
+               //{\r
+               //    if( ( ( CDTXMania.ConfigIni.eDark != Eダークモード.HALF ) && ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) ) && ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
+               //    {\r
+               //        this.actGauge.On進行描画();\r
+               //    }\r
+               //}\r
                private void t進行描画・コンボ()\r
                {\r
                        this.actCombo.On進行描画();\r
@@ -1906,12 +1893,9 @@ namespace DTXMania
                {\r
                        this.actChipFire.On進行描画();\r
                }\r
-               private void t進行描画・パネル文字列()\r
+               protected override void t進行描画・パネル文字列()\r
                {\r
-                       if( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
-                       {\r
-                               this.actPanel.t進行描画( 0xb5, 430 );\r
-                       }\r
+                       base.t進行描画・パネル文字列( 0xb5, 430 );\r
                }\r
                //private bool t進行描画・フェードイン・アウト()\r
                //{\r
@@ -1948,35 +1932,32 @@ namespace DTXMania
                                this.actLaneFlushGB.On進行描画();\r
                        }\r
                }\r
-               private void t進行描画・演奏情報()\r
+               protected override void t進行描画・演奏情報()\r
                {\r
-                       if( !CDTXMania.ConfigIni.b演奏情報を表示しない )\r
-                       {\r
-                               this.actPlayInfo.t進行描画( 0xb5, 50 );\r
-                       }\r
-               }\r
-               private void t進行描画・背景()\r
-               {\r
-                       if( CDTXMania.ConfigIni.eDark == Eダークモード.OFF )\r
-                       {\r
-                               if( this.tx背景 != null )\r
-                               {\r
-                                       this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );\r
-                               }\r
-                       }\r
-                       else\r
-                       {\r
-                               CDTXMania.app.Device.Clear( ClearFlags.ZBuffer | ClearFlags.Target, Color.Black, 0f, 0 );\r
-                       }\r
+                       base.t進行描画・演奏情報( 0xb5, 50 );\r
                }\r
+               //private void t進行描画・背景()\r
+               //{\r
+               //    if( CDTXMania.ConfigIni.eDark == Eダークモード.OFF )\r
+               //    {\r
+               //        if( this.tx背景 != null )\r
+               //        {\r
+               //            this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );\r
+               //        }\r
+               //    }\r
+               //    else\r
+               //    {\r
+               //        CDTXMania.app.Device.Clear( ClearFlags.ZBuffer | ClearFlags.Target, Color.Black, 0f, 0 );\r
+               //    }\r
+               //}\r
                private void t進行描画・判定文字列()\r
                {\r
                        this.actJudgeString.On進行描画();\r
                }\r
-               private void t進行描画・譜面スクロール速度()\r
-               {\r
-                       this.act譜面スクロール速度.On進行描画();\r
-               }\r
+               //private void t進行描画・譜面スクロール速度()\r
+               //{\r
+               //    this.act譜面スクロール速度.On進行描画();\r
+               //}\r
                //private void t入力メソッド記憶( E楽器パート part )\r
                //{\r
                //    if( CDTXMania.Pad.st検知したデバイス.Keyboard )\r
@@ -2281,103 +2262,126 @@ namespace DTXMania
                                }\r
                        }\r
                }\r
-               private void t背景テクスチャの生成()\r
+\r
+               protected override void t背景テクスチャの生成()\r
                {\r
-                       Bitmap image = null;\r
-                       string path = "";\r
-                       bool flag = true;\r
-                       if( !CDTXMania.ConfigIni.bストイックモード )\r
+                       Rectangle bgrect = new Rectangle( 181, 50, 278, 355 );\r
+                       string DefaultBgFilename = @"Graphics\ScreenPlayGuitar background.jpg";\r
+                       string BgFilename = "";\r
+                       string BACKGROUND = null;\r
+                       if ( ( CDTXMania.DTX.BACKGROUND_GR != null ) && ( CDTXMania.DTX.BACKGROUND_GR.Length > 0 ) )\r
                        {\r
-                               string bACKGROUND = null;\r
-                               if( ( CDTXMania.DTX.BACKGROUND_GR != null ) && ( CDTXMania.DTX.BACKGROUND_GR.Length > 0 ) )\r
-                               {\r
-                                       bACKGROUND = CDTXMania.DTX.BACKGROUND_GR;\r
-                               }\r
-                               else if( ( CDTXMania.DTX.BACKGROUND != null ) && ( CDTXMania.DTX.BACKGROUND.Length > 0 ) )\r
-                               {\r
-                                       bACKGROUND = CDTXMania.DTX.BACKGROUND;\r
-                               }\r
-                               if( ( bACKGROUND != null ) && ( bACKGROUND.Length > 0 ) )\r
-                               {\r
-                                       path = CDTXMania.DTX.strフォルダ名 + bACKGROUND;\r
-                                       if( File.Exists( path ) )\r
-                                       {\r
-                                               try\r
-                                               {\r
-                                                       Bitmap bitmap2 = null;\r
-                                                       bitmap2 = new Bitmap( path );\r
-                                                       if( ( bitmap2.Size.Width == 0 ) && ( bitmap2.Size.Height == 0 ) )\r
-                                                       {\r
-                                                               this.tx背景 = null;\r
-                                                               return;\r
-                                                       }\r
-                                                       Bitmap bitmap3 = new Bitmap( 640, 480 );\r
-                                                       Graphics graphics = Graphics.FromImage( bitmap3 );\r
-                                                       for( int i = 0; i < 480; i += bitmap2.Size.Height )\r
-                                                       {\r
-                                                               for( int j = 0; j < 640; j += bitmap2.Size.Width )\r
-                                                               {\r
-                                                                       graphics.DrawImage( bitmap2, j, i, bitmap2.Width, bitmap2.Height );\r
-                                                               }\r
-                                                       }\r
-                                                       graphics.Dispose();\r
-                                                       bitmap2.Dispose();\r
-                                                       image = new Bitmap( CSkin.Path( @"Graphics\\ScreenPlayGuitar background.jpg" ) );\r
-                                                       graphics = Graphics.FromImage( image );\r
-                                                       ColorMatrix matrix2 = new ColorMatrix();\r
-                                                       matrix2.Matrix00 = 1f;\r
-                                                       matrix2.Matrix11 = 1f;\r
-                                                       matrix2.Matrix22 = 1f;\r
-                                                       matrix2.Matrix33 = ( (float) CDTXMania.ConfigIni.n背景の透過度 ) / 255f;\r
-                                                       matrix2.Matrix44 = 1f;\r
-                                                       ColorMatrix newColorMatrix = matrix2;\r
-                                                       ImageAttributes imageAttr = new ImageAttributes();\r
-                                                       imageAttr.SetColorMatrix( newColorMatrix );\r
-                                                       graphics.DrawImage( bitmap3, new Rectangle( 0, 0, 640, 480 ), 0, 0, 640, 480, GraphicsUnit.Pixel, imageAttr );\r
-                                                       imageAttr.Dispose();\r
-                                                       graphics.DrawImage( bitmap3, new Rectangle( 0xb5, 50, 0x116, 0x163 ), 0xb5, 50, 0x116, 0x163, GraphicsUnit.Pixel );\r
-                                                       graphics.Dispose();\r
-                                                       bitmap3.Dispose();\r
-                                                       flag = false;\r
-                                               }\r
-                                               catch\r
-                                               {\r
-                                                       Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-                       if( flag )\r
-                       {\r
-                               path = CSkin.Path( @"Graphics\ScreenPlayGuitar background.jpg" );\r
-                               try\r
-                               {\r
-                                       image = new Bitmap( path );\r
-                               }\r
-                               catch\r
-                               {\r
-                                       Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
-                                       this.tx背景 = null;\r
-                                       return;\r
-                               }\r
+                               BACKGROUND = CDTXMania.DTX.BACKGROUND_GR;\r
                        }\r
-                       if( ( CDTXMania.DTX.listBMP.Count > 0 ) || ( CDTXMania.DTX.listBMPTEX.Count > 0 ) )\r
+                       else if ( ( CDTXMania.DTX.BACKGROUND != null ) && ( CDTXMania.DTX.BACKGROUND.Length > 0 ) )\r
                        {\r
-                               Graphics graphics2 = Graphics.FromImage( image );\r
-                               graphics2.FillRectangle( Brushes.Black, 0xb5, 50, 0x116, 0x163 );\r
-                               graphics2.Dispose();\r
+                               BACKGROUND = CDTXMania.DTX.BACKGROUND;\r
                        }\r
-                       try\r
+                       if ( ( BACKGROUND != null ) && ( BACKGROUND.Length > 0 ) )\r
                        {\r
-                               this.tx背景 = new CTexture( CDTXMania.app.Device, image, CDTXMania.TextureFormat );\r
+                               BgFilename = CDTXMania.DTX.strフォルダ名 + BACKGROUND;\r
                        }\r
-                       catch( CTextureCreateFailedException )\r
-                       {\r
-                               Trace.TraceError( "背景テクスチャの生成に失敗しました。" );\r
-                               this.tx背景 = null;\r
-                       }\r
-                       image.Dispose();\r
+                       base.t背景テクスチャの生成( DefaultBgFilename, bgrect, BgFilename );\r
                }\r
+\r
+\r
+               //private void t背景テクスチャの生成()\r
+               //{\r
+               //    Bitmap image = null;\r
+               //    string path = "";\r
+               //    bool flag = true;\r
+               //    if( !CDTXMania.ConfigIni.bストイックモード )\r
+               //    {\r
+               //        string bACKGROUND = null;\r
+               //        if( ( CDTXMania.DTX.BACKGROUND_GR != null ) && ( CDTXMania.DTX.BACKGROUND_GR.Length > 0 ) )\r
+               //        {\r
+               //            bACKGROUND = CDTXMania.DTX.BACKGROUND_GR;\r
+               //        }\r
+               //        else if( ( CDTXMania.DTX.BACKGROUND != null ) && ( CDTXMania.DTX.BACKGROUND.Length > 0 ) )\r
+               //        {\r
+               //            bACKGROUND = CDTXMania.DTX.BACKGROUND;\r
+               //        }\r
+               //        if( ( bACKGROUND != null ) && ( bACKGROUND.Length > 0 ) )\r
+               //        {\r
+               //            path = CDTXMania.DTX.strフォルダ名 + bACKGROUND;\r
+               //            if( File.Exists( path ) )\r
+               //            {\r
+               //                try\r
+               //                {\r
+               //                    Bitmap bitmap2 = null;\r
+               //                    bitmap2 = new Bitmap( path );\r
+               //                    if( ( bitmap2.Size.Width == 0 ) && ( bitmap2.Size.Height == 0 ) )\r
+               //                    {\r
+               //                        this.tx背景 = null;\r
+               //                        return;\r
+               //                    }\r
+               //                    Bitmap bitmap3 = new Bitmap( 640, 480 );\r
+               //                    Graphics graphics = Graphics.FromImage( bitmap3 );\r
+               //                    for( int i = 0; i < 480; i += bitmap2.Size.Height )\r
+               //                    {\r
+               //                        for( int j = 0; j < 640; j += bitmap2.Size.Width )\r
+               //                        {\r
+               //                            graphics.DrawImage( bitmap2, j, i, bitmap2.Width, bitmap2.Height );\r
+               //                        }\r
+               //                    }\r
+               //                    graphics.Dispose();\r
+               //                    bitmap2.Dispose();\r
+               //                    image = new Bitmap( CSkin.Path( @"Graphics\\ScreenPlayGuitar background.jpg" ) );\r
+               //                    graphics = Graphics.FromImage( image );\r
+               //                    ColorMatrix matrix2 = new ColorMatrix();\r
+               //                    matrix2.Matrix00 = 1f;\r
+               //                    matrix2.Matrix11 = 1f;\r
+               //                    matrix2.Matrix22 = 1f;\r
+               //                    matrix2.Matrix33 = ( (float) CDTXMania.ConfigIni.n背景の透過度 ) / 255f;\r
+               //                    matrix2.Matrix44 = 1f;\r
+               //                    ColorMatrix newColorMatrix = matrix2;\r
+               //                    ImageAttributes imageAttr = new ImageAttributes();\r
+               //                    imageAttr.SetColorMatrix( newColorMatrix );\r
+               //                    graphics.DrawImage( bitmap3, new Rectangle( 0, 0, 640, 480 ), 0, 0, 640, 480, GraphicsUnit.Pixel, imageAttr );\r
+               //                    imageAttr.Dispose();\r
+               //                    graphics.DrawImage( bitmap3, new Rectangle( 0xb5, 50, 0x116, 0x163 ), 0xb5, 50, 0x116, 0x163, GraphicsUnit.Pixel );\r
+               //                    graphics.Dispose();\r
+               //                    bitmap3.Dispose();\r
+               //                    flag = false;\r
+               //                }\r
+               //                catch\r
+               //                {\r
+               //                    Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
+               //                }\r
+               //            }\r
+               //        }\r
+               //    }\r
+               //    if( flag )\r
+               //    {\r
+               //        path = CSkin.Path( @"Graphics\ScreenPlayGuitar background.jpg" );\r
+               //        try\r
+               //        {\r
+               //            image = new Bitmap( path );\r
+               //        }\r
+               //        catch\r
+               //        {\r
+               //            Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
+               //            this.tx背景 = null;\r
+               //            return;\r
+               //        }\r
+               //    }\r
+               //    if( ( CDTXMania.DTX.listBMP.Count > 0 ) || ( CDTXMania.DTX.listBMPTEX.Count > 0 ) )\r
+               //    {\r
+               //        Graphics graphics2 = Graphics.FromImage( image );\r
+               //        graphics2.FillRectangle( Brushes.Black, 0xb5, 50, 0x116, 0x163 );\r
+               //        graphics2.Dispose();\r
+               //    }\r
+               //    try\r
+               //    {\r
+               //        this.tx背景 = new CTexture( CDTXMania.app.Device, image, CDTXMania.TextureFormat );\r
+               //    }\r
+               //    catch( CTextureCreateFailedException )\r
+               //    {\r
+               //        Trace.TraceError( "背景テクスチャの生成に失敗しました。" );\r
+               //        this.tx背景 = null;\r
+               //    }\r
+               //    image.Dispose();\r
+               //}\r
 //#if true     // DAMAGELEVELTUNING\r
 //        // ----------------------------------\r
 //        public float[,] fDamageGaugeDelta = {                        // #23625 2011.1.10 ickw_284: tuned damage/recover factors\r
index a85b7c4..fa1de32 100644 (file)
@@ -6,7 +6,7 @@ using FDK;
 \r
 namespace DTXMania\r
 {\r
-       internal class CAct演奏DrumsWailingBonus : CActivity\r
+       internal class CAct演奏DrumsWailingBonus : CAct演奏WailingBonus\r
        {\r
                // コンストラクタ\r
 \r
@@ -18,11 +18,11 @@ namespace DTXMania
                \r
                // メソッド\r
 \r
-               public void Start( E楽器パート part )\r
-               {\r
-                       this.Start( part, null );\r
-               }\r
-               public void Start( E楽器パート part, CDTX.CChip r歓声Chip )\r
+               //public override void Start( E楽器パート part )\r
+               //{\r
+               //    this.Start( part, null );\r
+               //}\r
+               public override void Start( E楽器パート part, CDTX.CChip r歓声Chip )\r
                {\r
                        if( ( part == E楽器パート.GUITAR ) || ( part == E楽器パート.BASS ) )\r
                        {\r
@@ -73,22 +73,7 @@ namespace DTXMania
                        }\r
                        base.On非活性化();\r
                }\r
-               public override void OnManagedリソースの作成()\r
-               {\r
-                       if( !base.b活性化してない )\r
-                       {\r
-                               this.txWailingBonus = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing bonus.png" ) );\r
-                               base.OnManagedリソースの作成();\r
-                       }\r
-               }\r
-               public override void OnManagedリソースの解放()\r
-               {\r
-                       if( !base.b活性化してない )\r
-                       {\r
-                               CDTXMania.tテクスチャの解放( ref this.txWailingBonus );\r
-                               base.OnManagedリソースの解放();\r
-                       }\r
-               }\r
+\r
                public override int On進行描画()\r
                {\r
                        if( !base.b活性化してない )\r
@@ -167,15 +152,5 @@ namespace DTXMania
                        }\r
                        return 0;\r
                }\r
-\r
-\r
-               // その他\r
-\r
-               #region [ private ]\r
-               //-----------------\r
-               private CCounter[,] ct進行用 = new CCounter[ 3, 4 ];\r
-               private CTexture txWailingBonus;\r
-               //-----------------\r
-               #endregion\r
        }\r
 }\r
index a8f97c5..c1ff570 100644 (file)
@@ -325,11 +325,11 @@ namespace DTXMania
                {\r
                        if( !base.b活性化してない )\r
                        {\r
-                               this.t背景テクスチャの生成();\r
+                               //this.t背景テクスチャの生成();\r
                                this.txチップ = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlayDrums chips.png" ) );\r
                                this.txヒットバー = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlayDrums hit-bar.png" ) );\r
                                this.txヒットバーGB = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlayDrums hit-bar guitar.png" ) );\r
-                               this.txWailing枠 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing cursor.png" ) );\r
+                               //this.txWailing枠 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlay wailing cursor.png" ) );\r
                                this.txレーンフレームGB = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenPlayDrums lane parts guitar.png" ) );\r
                                if( this.txレーンフレームGB != null )\r
                                {\r
@@ -342,12 +342,12 @@ namespace DTXMania
                {\r
                        if( !base.b活性化してない )\r
                        {\r
-                               CDTXMania.tテクスチャの解放( ref this.tx背景 );\r
+                               //CDTXMania.tテクスチャの解放( ref this.tx背景 );\r
                                CDTXMania.tテクスチャの解放( ref this.txヒットバー );\r
                                CDTXMania.tテクスチャの解放( ref this.txヒットバーGB );\r
                                CDTXMania.tテクスチャの解放( ref this.txチップ );\r
                                CDTXMania.tテクスチャの解放( ref this.txレーンフレームGB );\r
-                               CDTXMania.tテクスチャの解放( ref this.txWailing枠 );\r
+                               //CDTXMania.tテクスチャの解放( ref this.txWailing枠 );\r
                                base.OnManagedリソースの解放();\r
                        }\r
                }\r
@@ -590,8 +590,8 @@ namespace DTXMania
                //    }\r
                //}\r
 \r
-               private CAct演奏AVI actAVI;\r
-               private CAct演奏BGA actBGA;\r
+               //private CAct演奏AVI actAVI;\r
+               //private CAct演奏BGA actBGA;\r
                private CAct演奏DrumsチップファイアD actChipFireD;\r
                private CAct演奏DrumsチップファイアGB actChipFireGB;\r
                private CAct演奏DrumsコンボDGB actCOMBO;\r
@@ -605,14 +605,14 @@ namespace DTXMania
                private CAct演奏DrumsレーンフラッシュD actLaneFlushD;\r
                private CAct演奏DrumsレーンフラッシュGB actLaneFlushGB;\r
                private CAct演奏Drumsパッド actPad;\r
-               private CAct演奏パネル文字列 actPanel;\r
-               private CAct演奏演奏情報 actPlayInfo;\r
+               //private CAct演奏パネル文字列 actPanel;\r
+               //private CAct演奏演奏情報 actPlayInfo;\r
                private CAct演奏DrumsRGB actRGB;\r
                private CAct演奏Drumsスコア actScore;\r
-               private CAct演奏ステージ失敗 actStageFailed;\r
+               //private CAct演奏ステージ失敗 actStageFailed;\r
                private CAct演奏Drumsステータスパネル actStatusPanels;\r
-               private CAct演奏DrumsWailingBonus actWailingBonus;\r
-               private CAct演奏スクロール速度 act譜面スクロール速度;\r
+               //private CAct演奏DrumsWailingBonus actWailingBonus;\r
+               //private CAct演奏スクロール速度 act譜面スクロール速度;\r
                //private bool bPAUSE;\r
                private bool bフィルイン中;\r
 //             private STDGBVALUE<bool> b演奏にMIDI入力を使った;\r
@@ -645,12 +645,12 @@ namespace DTXMania
                private CDTX.CChip r現在の空うちベースChip;\r
                //private CDTX.CChip r次にくるギターChip;\r
                //private CDTX.CChip r次にくるベースChip;\r
-               private CTexture txWailing枠;\r
+               //private CTexture txWailing枠;\r
                private CTexture txチップ;\r
                private CTexture txヒットバー;\r
                private CTexture txヒットバーGB;\r
                private CTexture txレーンフレームGB;\r
-               private CTexture tx背景;\r
+               //private CTexture tx背景;\r
                // private STDGBVALUE<int> nInputAdjustTimeMs;                  // #23580 2011.1.3 yyagi\r
                //private CConfigIni.STAUTOPLAY bIsAutoPlay;                    // #24239 2011.1.23 yyagi\r
 \r
@@ -1434,10 +1434,10 @@ namespace DTXMania
                        }\r
                        return true;\r
                }\r
-               private void tパネル文字列の設定()\r
-               {\r
-                       this.actPanel.SetPanelString( string.IsNullOrEmpty( CDTXMania.DTX.PANEL ) ? CDTXMania.DTX.TITLE : CDTXMania.DTX.PANEL );\r
-               }\r
+               //private void tパネル文字列の設定()\r
+               //{\r
+               //    this.actPanel.SetPanelString( string.IsNullOrEmpty( CDTXMania.DTX.PANEL ) ? CDTXMania.DTX.TITLE : CDTXMania.DTX.PANEL );\r
+               //}\r
                //private void tキー入力()\r
                //{\r
                //    IInputDevice keyboard = CDTXMania.Input管理.Keyboard;\r
@@ -1510,31 +1510,25 @@ namespace DTXMania
                }\r
 \r
        \r
-               private void t進行描画・AVI()\r
+               protected override void t進行描画・AVI()\r
                {\r
-                       if( ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( !CDTXMania.ConfigIni.bストイックモード && CDTXMania.ConfigIni.bAVI有効 ) )\r
-                       {\r
-                               this.actAVI.t進行描画( 0x152, 0x39 );\r
-                       }\r
+                       base.t進行描画・AVI( 0x152, 0x39 );\r
                }\r
-               private void t進行描画・BGA()\r
+               protected override void t進行描画・BGA()\r
                {\r
-                       if( ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( !CDTXMania.ConfigIni.bストイックモード && CDTXMania.ConfigIni.bBGA有効 ) )\r
-                       {\r
-                               this.actBGA.t進行描画( 0x152, 0x39 );\r
-                       }\r
+                       base.t進行描画・BGA( 0x152, 0x39 );\r
                }\r
                private void t進行描画・DANGER()\r
                {\r
                        this.actDANGER.t進行描画( this.actGauge.db現在のゲージ値.Drums < 0.3 );\r
                }\r
-               private void t進行描画・MIDIBGM()\r
-               {\r
-                       if( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED )\r
-                       {\r
-                               CStage.Eフェーズ eフェーズid1 = base.eフェーズID;\r
-                       }\r
-               }\r
+               //private void t進行描画・MIDIBGM()\r
+               //{\r
+               //    if( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED )\r
+               //    {\r
+               //        CStage.Eフェーズ eフェーズid1 = base.eフェーズID;\r
+               //    }\r
+               //}\r
                private void t進行描画・RGBボタン()\r
                {\r
                        if( CDTXMania.ConfigIni.eDark != Eダークモード.FULL )\r
@@ -1542,35 +1536,28 @@ namespace DTXMania
                                this.actRGB.On進行描画();\r
                        }\r
                }\r
-               private void t進行描画・STAGEFAILED()\r
-               {\r
-                       if( ( ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED ) || ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( ( this.actStageFailed.On進行描画() != 0 ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
-                       {\r
-                               this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージ失敗;\r
-                               base.eフェーズID = CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト;\r
-                               this.actFO.tフェードアウト開始();\r
-                       }\r
-               }\r
-               private void t進行描画・WailingBonus()\r
+               //private void t進行描画・STAGEFAILED()\r
+               //{\r
+               //    if( ( ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED ) || ( base.eフェーズID == CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) && ( ( this.actStageFailed.On進行描画() != 0 ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
+               //    {\r
+               //        this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージ失敗;\r
+               //        base.eフェーズID = CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト;\r
+               //        this.actFO.tフェードアウト開始();\r
+               //    }\r
+               //}\r
+               //private void t進行描画・WailingBonus()\r
+               //{\r
+               //    if( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
+               //    {\r
+               //        this.actWailingBonus.On進行描画();\r
+               //    }\r
+               //}\r
+               protected override void t進行描画・Wailing枠()\r
                {\r
-                       if( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
-                       {\r
-                               this.actWailingBonus.On進行描画();\r
-                       }\r
-               }\r
-               private void t進行描画・Wailing枠()\r
-               {\r
-                       if( ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) && CDTXMania.ConfigIni.bGuitar有効 )\r
-                       {\r
-                               if( CDTXMania.DTX.bチップがある.Guitar && ( this.txWailing枠 != null ) )\r
-                               {\r
-                                       this.txWailing枠.t2D描画( CDTXMania.app.Device, 0x24b, CDTXMania.ConfigIni.bReverse.Guitar ? ( 400 - this.txWailing枠.sz画像サイズ.Height ) : 0x45 );\r
-                               }\r
-                               if( CDTXMania.DTX.bチップがある.Bass && ( this.txWailing枠 != null ) )\r
-                               {\r
-                                       this.txWailing枠.t2D描画( CDTXMania.app.Device, 0x1de, CDTXMania.ConfigIni.bReverse.Bass ? ( 400 - this.txWailing枠.sz画像サイズ.Height ) : 0x45 );\r
-                               }\r
-                       }\r
+                       base.t進行描画・Wailing枠( 0x24b, 0x1de,\r
+                               CDTXMania.ConfigIni.bReverse.Guitar ? ( 400 - this.txWailing枠.sz画像サイズ.Height ) : 0x45,\r
+                               CDTXMania.ConfigIni.bReverse.Bass ? ( 400 - this.txWailing枠.sz画像サイズ.Height ) : 0x45\r
+                       );\r
                }\r
                private void t進行描画・ギターベースフレーム()\r
                {\r
@@ -1638,13 +1625,13 @@ namespace DTXMania
                                }\r
                        }\r
                }\r
-               private void t進行描画・ゲージ()\r
-               {\r
-                       if( ( ( CDTXMania.ConfigIni.eDark != Eダークモード.HALF ) && ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) ) && ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
-                       {\r
-                               this.actGauge.On進行描画();\r
-                       }\r
-        }\r
+               //private void t進行描画・ゲージ()\r
+               //{\r
+               //    if( ( ( CDTXMania.ConfigIni.eDark != Eダークモード.HALF ) && ( CDTXMania.ConfigIni.eDark != Eダークモード.FULL ) ) && ( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) ) )\r
+               //    {\r
+               //        this.actGauge.On進行描画();\r
+               //    }\r
+               //}\r
         // #24074 2011.01.23 add ikanick\r
         private void t進行描画・グラフ()        \r
         {\r
@@ -2599,12 +2586,9 @@ namespace DTXMania
                                this.actPad.On進行描画();\r
                        }\r
                }\r
-               private void t進行描画・パネル文字列()\r
+               protected override void t進行描画・パネル文字列()\r
                {\r
-                       if( ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED ) && ( base.eフェーズID != CStage.Eフェーズ.演奏_STAGE_FAILED_フェードアウト ) )\r
-                       {\r
-                               this.actPanel.t進行描画( 0x150, 0x1ab );\r
-                       }\r
+                       base.t進行描画・パネル文字列( 0x150, 0x1ab );\r
                }\r
                //private bool t進行描画・フェードイン・アウト()\r
                //{\r
@@ -2648,27 +2632,24 @@ namespace DTXMania
                                this.actLaneFlushGB.On進行描画();\r
                        }\r
                }\r
-               private void t進行描画・演奏情報()\r
-               {\r
-                       if( !CDTXMania.ConfigIni.b演奏情報を表示しない )\r
-                       {\r
-                               this.actPlayInfo.t進行描画( 0x152, 0x39 );\r
-                       }\r
-               }\r
-               private void t進行描画・背景()\r
+               protected override void t進行描画・演奏情報()\r
                {\r
-                       if( CDTXMania.ConfigIni.eDark == Eダークモード.OFF )\r
-                       {\r
-                               if( this.tx背景 != null )\r
-                               {\r
-                                       this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );\r
-                               }\r
-                       }\r
-                       else\r
-                       {\r
-                               CDTXMania.app.Device.Clear( ClearFlags.ZBuffer | ClearFlags.Target, Color.Black, 0f, 0 );\r
-                       }\r
+                       base.t進行描画・演奏情報( 0x152, 0x39 );\r
                }\r
+               //private void t進行描画・背景()\r
+               //{\r
+               //    if( CDTXMania.ConfigIni.eDark == Eダークモード.OFF )\r
+               //    {\r
+               //        if( this.tx背景 != null )\r
+               //        {\r
+               //            this.tx背景.t2D描画( CDTXMania.app.Device, 0, 0 );\r
+               //        }\r
+               //    }\r
+               //    else\r
+               //    {\r
+               //        CDTXMania.app.Device.Clear( ClearFlags.ZBuffer | ClearFlags.Target, Color.Black, 0f, 0 );\r
+               //    }\r
+               //}\r
                private void t進行描画・判定ライン()\r
                {\r
                        if( CDTXMania.ConfigIni.eDark != Eダークモード.FULL )\r
@@ -2697,10 +2678,10 @@ namespace DTXMania
                                this.actJudgeString.On進行描画();\r
                        }\r
                }\r
-               private void t進行描画・譜面スクロール速度()\r
-               {\r
-                       this.act譜面スクロール速度.On進行描画();\r
-               }\r
+               //private void t進行描画・譜面スクロール速度()\r
+               //{\r
+               //    this.act譜面スクロール速度.On進行描画();\r
+               //}\r
                //private void t入力メソッド記憶( E楽器パート part )\r
                //{\r
                //    if( CDTXMania.Pad.st検知したデバイス.Keyboard )\r
@@ -4201,92 +4182,105 @@ namespace DTXMania
                                }\r
                        }\r
                }\r
-               private void t背景テクスチャの生成()\r
+\r
+               protected override void t背景テクスチャの生成()\r
                {\r
-                       Bitmap image = null;\r
-                       string path = "";\r
-                       bool flag = true;\r
-                       if( ( ( CDTXMania.DTX.BACKGROUND != null ) && ( CDTXMania.DTX.BACKGROUND.Length > 0 ) ) && !CDTXMania.ConfigIni.bストイックモード )\r
-                       {\r
-                               path = CDTXMania.DTX.strフォルダ名 + CDTXMania.DTX.BACKGROUND;\r
-                               if( File.Exists( path ) )\r
-                               {\r
-                                       try\r
-                                       {\r
-                                               Bitmap bitmap2 = null;\r
-                                               bitmap2 = new Bitmap( path );\r
-                                               if( ( bitmap2.Size.Width == 0 ) && ( bitmap2.Size.Height == 0 ) )\r
-                                               {\r
-                                                       this.tx背景 = null;\r
-                                                       return;\r
-                                               }\r
-                                               Bitmap bitmap3 = new Bitmap( 640, 480 );\r
-                                               Graphics graphics = Graphics.FromImage( bitmap3 );\r
-                                               for( int i = 0; i < 480; i += bitmap2.Size.Height )\r
-                                               {\r
-                                                       for( int j = 0; j < 640; j += bitmap2.Size.Width )\r
-                                                       {\r
-                                                               graphics.DrawImage( bitmap2, j, i, bitmap2.Width, bitmap2.Height );\r
-                                                       }\r
-                                               }\r
-                                               graphics.Dispose();\r
-                                               bitmap2.Dispose();\r
-                                               image = new Bitmap( CSkin.Path( @"Graphics\ScreenPlayDrums background.jpg" ) );\r
-                                               graphics = Graphics.FromImage( image );\r
-                                               ColorMatrix matrix2 = new ColorMatrix();\r
-                                               matrix2.Matrix00 = 1f;\r
-                                               matrix2.Matrix11 = 1f;\r
-                                               matrix2.Matrix22 = 1f;\r
-                                               matrix2.Matrix33 = ( (float) CDTXMania.ConfigIni.n背景の透過度 ) / 255f;\r
-                                               matrix2.Matrix44 = 1f;\r
-                                               ColorMatrix newColorMatrix = matrix2;\r
-                                               ImageAttributes imageAttr = new ImageAttributes();\r
-                                               imageAttr.SetColorMatrix( newColorMatrix );\r
-                                               graphics.DrawImage( bitmap3, new Rectangle( 0, 0, 640, 480 ), 0, 0, 640, 480, GraphicsUnit.Pixel, imageAttr );\r
-                                               imageAttr.Dispose();\r
-                                               graphics.DrawImage( bitmap3, new Rectangle( 0x152, 0x39, 0x116, 0x163 ), 0x152, 0x39, 0x116, 0x163, GraphicsUnit.Pixel );\r
-                                               graphics.Dispose();\r
-                                               bitmap3.Dispose();\r
-                                               flag = false;\r
-                                       }\r
-                                       catch\r
-                                       {\r
-                                               Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
-                                       }\r
-                               }\r
-                       }\r
-                       if( flag )\r
-                       {\r
-                               path = CSkin.Path( @"Graphics\ScreenPlayDrums background.jpg" );\r
-                               try\r
-                               {\r
-                                       image = new Bitmap( path );\r
-                               }\r
-                               catch\r
-                               {\r
-                                       Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
-                                       this.tx背景 = null;\r
-                                       return;\r
-                               }\r
-                       }\r
-                       if( ( CDTXMania.DTX.listBMP.Count > 0 ) || ( CDTXMania.DTX.listBMPTEX.Count > 0 ) )\r
+                       Rectangle bgrect = new Rectangle( 338, 57, 278, 355 );\r
+                       string DefaultBgFilename = @"Graphics\ScreenPlayDrums background.jpg";\r
+                       string BgFilename = "";\r
+                       if ( ( ( CDTXMania.DTX.BACKGROUND != null ) && ( CDTXMania.DTX.BACKGROUND.Length > 0 ) ) && !CDTXMania.ConfigIni.bストイックモード )\r
                        {\r
-                               Graphics graphics2 = Graphics.FromImage( image );\r
-                               graphics2.FillRectangle( Brushes.Black, 0x152, 0x39, 0x116, 0x163 );\r
-                               graphics2.Dispose();\r
+                               BgFilename = CDTXMania.DTX.strフォルダ名 + CDTXMania.DTX.BACKGROUND;\r
                        }\r
-                       try\r
-                       {\r
-                               this.tx背景 = new CTexture( CDTXMania.app.Device, image, CDTXMania.TextureFormat );\r
-                       }\r
-                       catch( CTextureCreateFailedException )\r
-                       {\r
-                               Trace.TraceError( "背景テクスチャの生成に失敗しました。" );\r
-                               this.tx背景 = null;\r
-                       }\r
-                       image.Dispose();\r
+                       base.t背景テクスチャの生成( DefaultBgFilename, bgrect, BgFilename );\r
                }\r
 \r
+               //private void t背景テクスチャの生成()\r
+               //{\r
+               //    Bitmap image = null;\r
+               //    string path = "";\r
+               //    bool flag = true;\r
+               //    if( ( ( CDTXMania.DTX.BACKGROUND != null ) && ( CDTXMania.DTX.BACKGROUND.Length > 0 ) ) && !CDTXMania.ConfigIni.bストイックモード )\r
+               //    {\r
+               //        path = CDTXMania.DTX.strフォルダ名 + CDTXMania.DTX.BACKGROUND;\r
+               //        if( File.Exists( path ) )\r
+               //        {\r
+               //            try\r
+               //            {\r
+               //                Bitmap bitmap2 = null;\r
+               //                bitmap2 = new Bitmap( path );\r
+               //                if( ( bitmap2.Size.Width == 0 ) && ( bitmap2.Size.Height == 0 ) )\r
+               //                {\r
+               //                    this.tx背景 = null;\r
+               //                    return;\r
+               //                }\r
+               //                Bitmap bitmap3 = new Bitmap( 640, 480 );\r
+               //                Graphics graphics = Graphics.FromImage( bitmap3 );\r
+               //                for( int i = 0; i < 480; i += bitmap2.Size.Height )\r
+               //                {\r
+               //                    for( int j = 0; j < 640; j += bitmap2.Size.Width )\r
+               //                    {\r
+               //                        graphics.DrawImage( bitmap2, j, i, bitmap2.Width, bitmap2.Height );\r
+               //                    }\r
+               //                }\r
+               //                graphics.Dispose();\r
+               //                bitmap2.Dispose();\r
+               //                image = new Bitmap( CSkin.Path( @"Graphics\ScreenPlayDrums background.jpg" ) );\r
+               //                graphics = Graphics.FromImage( image );\r
+               //                ColorMatrix matrix2 = new ColorMatrix();\r
+               //                matrix2.Matrix00 = 1f;\r
+               //                matrix2.Matrix11 = 1f;\r
+               //                matrix2.Matrix22 = 1f;\r
+               //                matrix2.Matrix33 = ( (float) CDTXMania.ConfigIni.n背景の透過度 ) / 255f;\r
+               //                matrix2.Matrix44 = 1f;\r
+               //                ColorMatrix newColorMatrix = matrix2;\r
+               //                ImageAttributes imageAttr = new ImageAttributes();\r
+               //                imageAttr.SetColorMatrix( newColorMatrix );\r
+               //                graphics.DrawImage( bitmap3, new Rectangle( 0, 0, 640, 480 ), 0, 0, 640, 480, GraphicsUnit.Pixel, imageAttr );\r
+               //                imageAttr.Dispose();\r
+               //                graphics.DrawImage( bitmap3, new Rectangle( 0x152, 0x39, 0x116, 0x163 ), 0x152, 0x39, 0x116, 0x163, GraphicsUnit.Pixel );\r
+               //                graphics.Dispose();\r
+               //                bitmap3.Dispose();\r
+               //                flag = false;\r
+               //            }\r
+               //            catch\r
+               //            {\r
+               //                Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
+               //            }\r
+               //        }\r
+               //    }\r
+               //    if( flag )\r
+               //    {\r
+               //        path = CSkin.Path( @"Graphics\ScreenPlayDrums background.jpg" );\r
+               //        try\r
+               //        {\r
+               //            image = new Bitmap( path );\r
+               //        }\r
+               //        catch\r
+               //        {\r
+               //            Trace.TraceError( "背景画像の読み込みに失敗しました。({0})", new object[] { path } );\r
+               //            this.tx背景 = null;\r
+               //            return;\r
+               //        }\r
+               //    }\r
+               //    if( ( CDTXMania.DTX.listBMP.Count > 0 ) || ( CDTXMania.DTX.listBMPTEX.Count > 0 ) )\r
+               //    {\r
+               //        Graphics graphics2 = Graphics.FromImage( image );\r
+               //        graphics2.FillRectangle( Brushes.Black, 0x152, 0x39, 0x116, 0x163 );\r
+               //        graphics2.Dispose();\r
+               //    }\r
+               //    try\r
+               //    {\r
+               //        this.tx背景 = new CTexture( CDTXMania.app.Device, image, CDTXMania.TextureFormat );\r
+               //    }\r
+               //    catch( CTextureCreateFailedException )\r
+               //    {\r
+               //        Trace.TraceError( "背景テクスチャの生成に失敗しました。" );\r
+               //        this.tx背景 = null;\r
+               //    }\r
+               //    image.Dispose();\r
+               //}\r
+\r
 \r
 //#if true             // DAMAGELEVELTUNING\r
 //        // ----------------------------------\r