#31820 rev651のコミット漏れ分を追加。
#xxxxx DTXCの実行時フォルダの整理(dllフォルダにDLLをまとめた。ただしxadec.dllのみはDTXV.exeと同じフォルダに置く必要あり。)
@@ -156,10 +156,14 @@ | ||
156 | 156 | num6 = CDTXMania.ConfigIni.bReverse.Guitar ? ( ( ( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Guitar ) == E判定文字表示位置.レーン上 ) ? 240 : 100 ) + ( this.n文字の縦表示位置[ j ] * 0x20 ) ) : ( ( ( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Guitar ) == E判定文字表示位置.レーン上 ) ? 180 : 300 ) + ( this.n文字の縦表示位置[ j ] * 0x20 ) ); |
157 | 157 | } |
158 | 158 | } |
159 | - int xc = (int)( ( ( ( num5 + base.st状態[ j ].n相対X座標 ) + ( this.stレーンサイズ[ j ].w / 2 ) ) ) * Scale.X ); // Xcenter座標 | |
160 | - int x = xc - ( (int) ( ( (256f/2) * base.st状態[ j ].fX方向拡大率 ) * ( ( j < 10 ) ? 1.0 : 0.7 ) ) ); | |
161 | - int y = (int)( ( num6 + base.st状態[ j ].n相対Y座標 ) * Scale.Y ) - ( (int) ( ( ( (256f/3) * base.st状態[ j ].fY方向拡大率 ) * ( ( j < 10 ) ? 1.0 : 0.7 ) ) / 2.0 ) ); | |
162 | - if( base.tx判定文字列[ index ] != null ) | |
159 | + int xc = (int) ( ( ( ( num5 + base.st状態[ j ].n相対X座標 ) + ( this.stレーンサイズ[ j ].w / 2 ) ) ) * Scale.X ); // Xcenter座標 | |
160 | + int x = xc - ( (int) ( ( ( 256f / 2 ) * base.st状態[ j ].fX方向拡大率 ) * ( ( j < 10 ) ? 1.0 : 0.7 ) ) ); | |
161 | + int y = (int) ( ( num6 + base.st状態[ j ].n相対Y座標 ) * Scale.Y ) - ( (int) ( ( ( ( 256f / 3 ) * base.st状態[ j ].fY方向拡大率 ) * ( ( j < 10 ) ? 1.0 : 0.7 ) ) / 2.0 ) ); | |
162 | + //int xc = ( ( num5 + base.st状態[ j ].n相対X座標 ) + ( this.stレーンサイズ[ j ].w / 2 ) ); // Xcenter座標 | |
163 | + //int x = xc - ( (int) ( ( 64f * base.st状態[ j ].fX方向拡大率 ) * ( ( j < 10 ) ? 1.0 : 0.7 ) ) ); | |
164 | + //int y = ( num6 + base.st状態[ j ].n相対Y座標 ) - ( (int) ( ( ( 43f * base.st状態[ j ].fY方向拡大率 ) * ( ( j < 10 ) ? 1.0 : 0.7 ) ) / 2.0 ) ); | |
165 | + | |
166 | + if ( base.tx判定文字列[ index ] != null ) | |
163 | 167 | { |
164 | 168 | base.tx判定文字列[ index ].n透明度 = base.st状態[ j ].n透明度; |
165 | 169 | base.tx判定文字列[ index ].vc拡大縮小倍率 = new Vector3( (float) ( base.st状態[ j ].fX方向拡大率 * ( ( j < 10 ) ? 1.0 : 0.7 ) ), (float) ( base.st状態[ j ].fY方向拡大率 * ( ( j < 10 ) ? 1.0 : 0.7 ) ), 1f ); |
@@ -182,12 +186,12 @@ | ||
182 | 186 | { |
183 | 187 | minus = true; |
184 | 188 | } |
185 | - x = xc - strDispLag.Length * 15 / 2; | |
189 | + x = xc - (int) ( ( strDispLag.Length * 15 / 2 ) * Scale.X ); | |
186 | 190 | for ( int i = 0; i < strDispLag.Length; i++ ) |
187 | 191 | { |
188 | 192 | int p = ( strDispLag[ i ] == '-' ) ? 11 : (int) ( strDispLag[ i ] - '0' ); //int.Parse(strDispLag[i]); |
189 | 193 | p += minus ? 0 : 12; // change color if it is minus value |
190 | - base.txlag数値.t2D描画( CDTXMania.app.Device, (x + offsetX) * Scale.X, (y + 34) * Scale.Y, base.stLag数値[ p ].rc ); | |
194 | + base.txlag数値.t2D描画( CDTXMania.app.Device, x + offsetX * Scale.X, y + 34 * Scale.Y, base.stLag数値[ p ].rc ); | |
191 | 195 | offsetX += 12; // 15 -> 12 |
192 | 196 | } |
193 | 197 | } |
@@ -194,7 +198,7 @@ | ||
194 | 198 | } |
195 | 199 | #endregion |
196 | 200 | } |
197 | - // Label_07FC: ; | |
201 | + // Label_07FC: ; | |
198 | 202 | } |
199 | 203 | } |
200 | 204 | } |
@@ -120,11 +120,11 @@ | ||
120 | 120 | if( !base.st状態[ j ].ct進行.b停止中 ) |
121 | 121 | { |
122 | 122 | int index = base.st判定文字列[ (int) base.st状態[ j ].judge ].n画像番号; |
123 | - int num5 = 0; | |
124 | - int num6 = 0; | |
123 | + int baseX = 0; | |
124 | + int baseY = 0; | |
125 | 125 | if( j >= 8 ) |
126 | 126 | { |
127 | - if( j == 11 ) | |
127 | + if( j == 11 ) // Bass | |
128 | 128 | { |
129 | 129 | if( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Bass ) == E判定文字表示位置.表示OFF ) |
130 | 130 | { |
@@ -131,10 +131,10 @@ | ||
131 | 131 | // goto Label_06B7; |
132 | 132 | continue; |
133 | 133 | } |
134 | - num5 = ( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Bass ) == E判定文字表示位置.レーン上 ) ? this.stレーンサイズ[ j ].x : 0x163; | |
135 | - num6 = CDTXMania.ConfigIni.bReverse.Bass ? 0x12b : 190; | |
134 | + baseX = ( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Bass ) == E判定文字表示位置.レーン上 ) ? this.stレーンサイズ[ j ].x : 0x163; | |
135 | + baseY = CDTXMania.ConfigIni.bReverse.Bass ? 0x12b : 190; | |
136 | 136 | } |
137 | - else if( j == 10 ) | |
137 | + else if( j == 10 ) // Guitar | |
138 | 138 | { |
139 | 139 | if( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Guitar ) == E判定文字表示位置.表示OFF ) |
140 | 140 | { |
@@ -141,12 +141,12 @@ | ||
141 | 141 | // goto Label_06B7; |
142 | 142 | continue; |
143 | 143 | } |
144 | - num5 = ( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Guitar ) == E判定文字表示位置.レーン上 ) ? this.stレーンサイズ[ j ].x : 0xaf; | |
145 | - num6 = CDTXMania.ConfigIni.bReverse.Guitar ? 0x12b : 190; | |
144 | + baseX = ( ( (E判定文字表示位置) CDTXMania.ConfigIni.判定文字表示位置.Guitar ) == E判定文字表示位置.レーン上 ) ? this.stレーンサイズ[ j ].x : 0xaf; | |
145 | + baseY = CDTXMania.ConfigIni.bReverse.Guitar ? 0x12b : 190; | |
146 | 146 | } |
147 | - int xc = (int) ( ( ( ( num5 + base.st状態[ j ].n相対X座標 ) + ( this.stレーンサイズ[ j ].w / 2 ) ) ) * Scale.X ); | |
148 | - int x = xc - ( (int) ( ( ( (256f/2) * base.st状態[ j ].fX方向拡大率 ) * 0.8 ) / 2.0 ) ); | |
149 | - int y = (int) ( ( num6 + base.st状態[ j ].n相対Y座標 ) * Scale.Y ) - ( (int) ( ( ( (256f/3) * base.st状態[ j ].fY方向拡大率 ) * 0.8 ) / 2.0 ) ); | |
147 | + int xc = (int) ( ( ( ( baseX + base.st状態[ j ].n相対X座標 ) + ( this.stレーンサイズ[ j ].w / 2 ) ) ) * Scale.X ); | |
148 | + int x = xc - (int) ( ( (256f/2) * base.st状態[ j ].fX方向拡大率 ) * 0.8 ); | |
149 | + int y = (int) ( ( baseY + base.st状態[ j ].n相対Y座標 ) * Scale.Y ) - ( (int) ( ( ( (256f/3) * base.st状態[ j ].fY方向拡大率 ) * 0.8 ) / 2.0 ) ); | |
150 | 150 | if( base.tx判定文字列[ index ] != null ) |
151 | 151 | { |
152 | 152 | base.tx判定文字列[ index ].n透明度 = base.st状態[ j ].n透明度; |
@@ -169,12 +169,12 @@ | ||
169 | 169 | { |
170 | 170 | minus = true; |
171 | 171 | } |
172 | - x = xc - strDispLag.Length * 15 / 2; | |
172 | + x = xc - (int) ( ( strDispLag.Length * 15 / 2 ) * Scale.X ); | |
173 | 173 | for ( int i = 0; i < strDispLag.Length; i++ ) |
174 | 174 | { |
175 | 175 | int p = ( strDispLag[ i ] == '-' ) ? 11 : (int) ( strDispLag[ i ] - '0' ); //int.Parse(strDispLag[i]); |
176 | 176 | p += minus ? 0 : 12; // change color if it is minus value |
177 | - base.txlag数値.t2D描画( CDTXMania.app.Device, x + offsetX, y + 35, base.stLag数値[ p ].rc ); | |
177 | + base.txlag数値.t2D描画( CDTXMania.app.Device, x + offsetX * Scale.X, y + 35 * Scale.Y, base.stLag数値[ p ].rc ); | |
178 | 178 | offsetX += 15; |
179 | 179 | } |
180 | 180 | } |
@@ -56,13 +56,6 @@ | ||
56 | 56 | { |
57 | 57 | this.st判定文字列 = new ST判定文字列[ 7 ]; |
58 | 58 | Rectangle[] r = new Rectangle[] { |
59 | - //new Rectangle( 0, (int)(0 * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)), // Perfect | |
60 | - //new Rectangle( 0, (int)(0x2b * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)), // Great | |
61 | - //new Rectangle( 0, (int)(0x56 * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)), // Good | |
62 | - //new Rectangle( 0, (int)(0 * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)), // Poor | |
63 | - //new Rectangle( 0, (int)(0x2b * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)), // Miss | |
64 | - //new Rectangle( 0, (int)(0x56 * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)), // Bad | |
65 | - //new Rectangle( 0, (int)(0 * Scale.Y), (int)(0x80 * Scale.X), (int)(0x2a * Scale.Y)) // Auto | |
66 | 59 | new Rectangle( 0, 256 / 3 * 0, 256, 256 / 3 ), // Perfect |
67 | 60 | new Rectangle( 0, 256 / 3 * 1, 256, 256 / 3 ), // Great |
68 | 61 | new Rectangle( 0, 256 / 3 * 2, 256, 256 / 3 ), // Good |
@@ -0,0 +1,8 @@ | ||
1 | +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> | |
2 | +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | |
3 | + <noInheritable></noInheritable> | |
4 | + <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity> | |
5 | + <file name="msvcr80.dll" hash="4be3fcf046c4941d7b439da6eb642431b5ff497a" hashalg="SHA1"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>Q4Uf5GRMCh6zH+gPQnd38fABXvo=</dsig:DigestValue></asmv2:hash></file> | |
6 | + <file name="msvcp80.dll" hash="f96d6d587819a28ad84cd32783968c7f75169a49" hashalg="SHA1"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>lzYUrJYi1eqc3Wj+vOMljRlkCLY=</dsig:DigestValue></asmv2:hash></file> | |
7 | + <file name="msvcm80.dll" hash="b8f788f913a88543f10e1b400e9ae3896676c903" hashalg="SHA1"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>BMaQ6zIuI2qb7Sk3oEQwxv2jsT0=</dsig:DigestValue></asmv2:hash></file> | |
8 | +</assembly> | |
\ No newline at end of file |
@@ -0,0 +1,6 @@ | ||
1 | +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> | |
2 | +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | |
3 | + <noInheritable></noInheritable> | |
4 | + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity> | |
5 | + <file name="msvcr90.dll" hashalg="SHA1" hash="7021457b391b35606e708c69987e4b6f606609ee"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>S83+LBs1RkUxSkzia1WysaAhLbk=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="88549dd3ce8eaa62ca8aad0e96ddd9fec2203628"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>cKyCmIKF+fcGn6qaBhKuun+wAcQ=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="65ef374affa5b48827e539b35b3275c201b41fc9"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>r+4y/NnOFgaANxNXoHL1jF95DUg=</dsig:DigestValue></asmv2:hash></file> | |
6 | +</assembly> | |
\ No newline at end of file |