OSDN Git Service

#36043 CDTXMania 内の app 以外の static メンバをインスタンスメンバにし、appを介してアクセスするように変更。CChipのメンバの多くをpr...
[dtxmania/dtxmania.git] / DTXManiaプロジェクト / コード / ステージ / 08.結果 / CActResultParameterPanel.cs
index 1af4167..c2efc6b 100644 (file)
@@ -12,7 +12,6 @@ namespace DTXMania
        internal class CActResultParameterPanel : CActivity\r
        {\r
                // コンストラクタ\r
-\r
                public CActResultParameterPanel()\r
                {\r
                        ST文字位置[] st文字位置Array = new ST文字位置[ 11 ];\r
@@ -138,7 +137,7 @@ namespace DTXMania
                        }\r
                        if( this.sdDTXで指定されたフルコンボ音 != null )\r
                        {\r
-                               CDTXMania.Sound管理.tサウンドを破棄する( this.sdDTXで指定されたフルコンボ音 );\r
+                               CDTXMania.app.Sound管理.tサウンドを破棄する( this.sdDTXで指定されたフルコンボ音 );\r
                                this.sdDTXで指定されたフルコンボ音 = null;\r
                        }\r
                        base.On非活性化();\r
@@ -147,11 +146,11 @@ namespace DTXMania
                {\r
                        if( !base.b活性化してない )\r
                        {\r
-                               this.txパネル本体 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult parameter panel.png" ), true );\r
-                               this.tx文字[ 0 ] = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult parameter numbers.png" ) );\r
-                               this.tx文字[ 1 ] = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult parameter numbers em.png" ) );\r
-                               this.txFullCombo = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult fullcombo.png" ) );\r
-                               this.txWhite = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\Tile white 64x64.png" ) );\r
+                               this.txパネル本体 = TextureFactory.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult parameter panel.png" ), true );\r
+                               this.tx文字[ 0 ] = TextureFactory.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult parameter numbers.png" ) );\r
+                               this.tx文字[ 1 ] = TextureFactory.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult parameter numbers em.png" ) );\r
+                               this.txFullCombo = TextureFactory.tテクスチャの生成( CSkin.Path( @"Graphics\ScreenResult fullcombo.png" ) );\r
+                               this.txWhite = TextureFactory.tテクスチャの生成( CSkin.Path( @"Graphics\Tile white 64x64.png" ) );\r
                                base.OnManagedリソースの作成();\r
                        }\r
                }\r
@@ -159,11 +158,11 @@ namespace DTXMania
                {\r
                        if( !base.b活性化してない )\r
                        {\r
-                               CDTXMania.tテクスチャの解放( ref this.txパネル本体 );\r
-                               CDTXMania.tテクスチャの解放( ref this.tx文字[ 0 ] );\r
-                               CDTXMania.tテクスチャの解放( ref this.tx文字[ 1 ] );\r
-                               CDTXMania.tテクスチャの解放( ref this.txFullCombo );\r
-                               CDTXMania.tテクスチャの解放( ref this.txWhite );\r
+                               TextureFactory.tテクスチャの解放( ref this.txパネル本体 );\r
+                               TextureFactory.tテクスチャの解放( ref this.tx文字[ 0 ] );\r
+                               TextureFactory.tテクスチャの解放( ref this.tx文字[ 1 ] );\r
+                               TextureFactory.tテクスチャの解放( ref this.txFullCombo );\r
+                               TextureFactory.tテクスチャの解放( ref this.txWhite );\r
                                base.OnManagedリソースの解放();\r
                        }\r
                }\r
@@ -175,7 +174,7 @@ namespace DTXMania
                        }\r
                        if( base.b初めての進行描画 )\r
                        {\r
-                               this.ct表示用 = new CCounter( 0, 0x3e7, 2, CDTXMania.Timer );\r
+                               this.ct表示用 = new CCounter( 0, 0x3e7, 2, CDTXMania.app.Timer );\r
                                base.b初めての進行描画 = false;\r
                        }\r
                        this.ct表示用.t進行();\r
@@ -195,55 +194,55 @@ namespace DTXMania
                                int y = this.n本体Y + pointArray[ i ].Y;\r
                                if( num >= 0 )\r
                                {\r
-                                       this.t大文字表示( x, y, CDTXMania.stage結果.st演奏記録[ i ].nPerfect数.ToString( "00000" ) );\r
+                                       this.t大文字表示( x, y, CDTXMania.app.stage結果.st演奏記録[ i ].nPerfect数.ToString( "00000" ) );\r
                                }\r
                                if( num >= 100 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(0x16 * Scale.Y), CDTXMania.stage結果.st演奏記録[ i ].nGreat数.ToString( "00000" ) );\r
+                                       this.t大文字表示(x, y + (int)(0x16 * Scale.Y), CDTXMania.app.stage結果.st演奏記録[i].nGreat数.ToString("00000"));\r
                                }\r
                                if( num >= 200 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(0x2c * Scale.Y), CDTXMania.stage結果.st演奏記録[ i ].nGood数.ToString( "00000" ) );\r
+                                       this.t大文字表示(x, y + (int)(0x2c * Scale.Y), CDTXMania.app.stage結果.st演奏記録[i].nGood数.ToString("00000"));\r
                                }\r
                                if( num >= 300 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(0x42 * Scale.Y), CDTXMania.stage結果.st演奏記録[ i ].nPoor数.ToString( "00000" ) );\r
+                                       this.t大文字表示(x, y + (int)(0x42 * Scale.Y), CDTXMania.app.stage結果.st演奏記録[i].nPoor数.ToString("00000"));\r
                                }\r
                                if( num >= 400 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(0x58 * Scale.Y), CDTXMania.stage結果.st演奏記録[ i ].nMiss数.ToString( "00000" ) );\r
+                                       this.t大文字表示(x, y + (int)(0x58 * Scale.Y), CDTXMania.app.stage結果.st演奏記録[i].nMiss数.ToString("00000"));\r
                                }\r
                                if( num >= 0 )\r
                                {\r
-                                       this.t小文字表示( x + (int) ( 0x30 * Scale.X ), y, string.Format( "{0,3:##0}%", CDTXMania.stage結果.fPerfect率[ i ] ) );\r
+                                       this.t小文字表示(x + (int)(0x30 * Scale.X), y, string.Format("{0,3:##0}%", CDTXMania.app.stage結果.fPerfect率[i]));\r
                                }\r
                                if( num >= 100 )\r
                                {\r
-                                       this.t小文字表示( x + (int)(0x30 * Scale.X), y + (int)(0x16 * Scale.Y), string.Format( "{0,3:##0}%", CDTXMania.stage結果.fGreat率[ i ] ) );\r
+                                       this.t小文字表示(x + (int)(0x30 * Scale.X), y + (int)(0x16 * Scale.Y), string.Format("{0,3:##0}%", CDTXMania.app.stage結果.fGreat率[i]));\r
                                }\r
                                if( num >= 200 )\r
                                {\r
-                                       this.t小文字表示( x + (int)(0x30 * Scale.X), y + (int)(0x2c * Scale.Y), string.Format( "{0,3:##0}%", CDTXMania.stage結果.fGood率[ i ] ) );\r
+                                       this.t小文字表示(x + (int)(0x30 * Scale.X), y + (int)(0x2c * Scale.Y), string.Format("{0,3:##0}%", CDTXMania.app.stage結果.fGood率[i]));\r
                                }\r
                                if( num >= 300 )\r
                                {\r
-                                       this.t小文字表示( x + (int)(0x30 * Scale.X), y + (int)(0x42 * Scale.Y), string.Format( "{0,3:##0}%", CDTXMania.stage結果.fPoor率[ i ] ) );\r
+                                       this.t小文字表示(x + (int)(0x30 * Scale.X), y + (int)(0x42 * Scale.Y), string.Format("{0,3:##0}%", CDTXMania.app.stage結果.fPoor率[i]));\r
                                }\r
                                if( num >= 400 )\r
                                {\r
-                                       this.t小文字表示( x + (int)(0x30 * Scale.X), y + (int)(0x58 * Scale.Y), string.Format( "{0,3:##0}%", CDTXMania.stage結果.fMiss率[ i ] ) );\r
+                                       this.t小文字表示(x + (int)(0x30 * Scale.X), y + (int)(0x58 * Scale.Y), string.Format("{0,3:##0}%", CDTXMania.app.stage結果.fMiss率[i]));\r
                                }\r
                                if( num >= 500 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(110 * Scale.Y), string.Format( "{0,9:########0}", CDTXMania.stage結果.st演奏記録[ i ].n最大コンボ数 ) );\r
+                                       this.t大文字表示(x, y + (int)(110 * Scale.Y), string.Format("{0,9:########0}", CDTXMania.app.stage結果.st演奏記録[i].n最大コンボ数));\r
                                }\r
                                if( num >= 600 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(0x84 * Scale.Y), CDTXMania.stage結果.st演奏記録[ i ].nスコア.ToString( "000000000" ), CDTXMania.stage結果.b新記録スコア[ i ] );\r
+                                       this.t大文字表示(x, y + (int)(0x84 * Scale.Y), CDTXMania.app.stage結果.st演奏記録[i].nスコア.ToString("000000000"), CDTXMania.app.stage結果.b新記録スコア[i]);\r
                                }\r
                                if( num >= 700 )\r
                                {\r
-                                       this.t大文字表示( x - (int)(11 * Scale.X), y + (int)(0x9a * Scale.Y), string.Format( "{0,9:#####0.00}", CDTXMania.stage結果.st演奏記録[ i ].db演奏型スキル値 ), CDTXMania.stage結果.b新記録スキル[ i ] );\r
+                                       this.t大文字表示(x - (int)(11 * Scale.X), y + (int)(0x9a * Scale.Y), string.Format("{0,9:#####0.00}", CDTXMania.app.stage結果.st演奏記録[i].db演奏型スキル値), CDTXMania.app.stage結果.b新記録スキル[i]);\r
                                }\r
                                if( num >= 700 )\r
                                {\r
@@ -251,7 +250,7 @@ namespace DTXMania
                                }\r
                                if( num >= 800 )\r
                                {\r
-                                       this.t大文字表示( x, y + (int)(0xb0 * Scale.Y), string.Format( "{0,9:########0}", CDTXMania.stage結果.n演奏回数[ i ] ) );\r
+                                       this.t大文字表示(x, y + (int)(0xb0 * Scale.Y), string.Format("{0,9:########0}", CDTXMania.app.stage結果.n演奏回数[i]));\r
                                }\r
                        }\r
                        if( this.ct表示用.n現在の値 < 900 )\r
@@ -293,7 +292,7 @@ namespace DTXMania
                        {\r
                                for( int j = 0; j < 3; j++ )\r
                                {\r
-                                       if( CDTXMania.stage結果.st演奏記録[ j ].bフルコンボである )\r
+                                       if (CDTXMania.app.stage結果.st演奏記録[j].bフルコンボである)\r
                                        {\r
                                                if( this.ct表示用.b終了値に達した )\r
                                                {\r
@@ -307,16 +306,16 @@ namespace DTXMania
                                                        }\r
                                                        if( !this.bフルコンボ音再生済み )\r
                                                        {\r
-                                                               if( ( ( CDTXMania.DTX.SOUND_FULLCOMBO != null ) && ( CDTXMania.DTX.SOUND_FULLCOMBO.Length > 0 ) ) && File.Exists( CDTXMania.DTX.strフォルダ名 + CDTXMania.DTX.SOUND_FULLCOMBO ) )\r
+                                                               if( ( ( CDTXMania.app.DTX.SOUND_FULLCOMBO != null ) && ( CDTXMania.app.DTX.SOUND_FULLCOMBO.Length > 0 ) ) && File.Exists( CDTXMania.app.DTX.strフォルダ名 + CDTXMania.app.DTX.SOUND_FULLCOMBO ) )\r
                                                                {\r
                                                                        try\r
                                                                        {\r
                                                                                if( this.sdDTXで指定されたフルコンボ音 != null )\r
                                                                                {\r
-                                                                                       CDTXMania.Sound管理.tサウンドを破棄する( this.sdDTXで指定されたフルコンボ音 );\r
+                                                                                       CDTXMania.app.Sound管理.tサウンドを破棄する( this.sdDTXで指定されたフルコンボ音 );\r
                                                                                        this.sdDTXで指定されたフルコンボ音 = null;\r
                                                                                }\r
-                                                                               this.sdDTXで指定されたフルコンボ音 = CDTXMania.Sound管理.tサウンドを生成する( CDTXMania.DTX.strフォルダ名 + CDTXMania.DTX.SOUND_FULLCOMBO );\r
+                                                                               this.sdDTXで指定されたフルコンボ音 = CDTXMania.app.Sound管理.tサウンドを生成する( CDTXMania.app.DTX.strフォルダ名 + CDTXMania.app.DTX.SOUND_FULLCOMBO );\r
                                                                                if( this.sdDTXで指定されたフルコンボ音 != null )\r
                                                                                {\r
                                                                                        this.sdDTXで指定されたフルコンボ音.t再生を開始する();\r
@@ -328,7 +327,7 @@ namespace DTXMania
                                                                }\r
                                                                else\r
                                                                {\r
-                                                                       CDTXMania.Skin.soundフルコンボ音.t再生する();\r
+                                                                       CDTXMania.app.Skin.soundフルコンボ音.t再生する();\r
                                                                }\r
                                                                this.bフルコンボ音再生済み = true;\r
                                                        }\r