diff --git a/FDK19/コード/00.共通/CWin32.cs b/FDK19/コード/00.共通/CWin32.cs index 94b272ff..8af9cdd1 100644 --- a/FDK19/コード/00.共通/CWin32.cs +++ b/FDK19/コード/00.共通/CWin32.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; diff --git a/FDK19/コード/01.フレームワーク/Core/GameWindowSize.cs b/FDK19/コード/01.フレームワーク/Core/GameWindowSize.cs index 2d7a1c58..bd06fa4f 100644 --- a/FDK19/コード/01.フレームワーク/Core/GameWindowSize.cs +++ b/FDK19/コード/01.フレームワーク/Core/GameWindowSize.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SampleFramework { diff --git a/FDK19/コード/02.入力/CInputJoystick.cs b/FDK19/コード/02.入力/CInputJoystick.cs index 90889d5e..b75bce10 100644 --- a/FDK19/コード/02.入力/CInputJoystick.cs +++ b/FDK19/コード/02.入力/CInputJoystick.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Diagnostics; diff --git a/FDK19/コード/03.サウンド/CSound.cs b/FDK19/コード/03.サウンド/CSound.cs index c478c5bb..d5f77cc5 100644 --- a/FDK19/コード/03.サウンド/CSound.cs +++ b/FDK19/コード/03.サウンド/CSound.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Runtime.InteropServices; diff --git a/FDK19/コード/03.サウンド/CSoundDeviceASIO.cs b/FDK19/コード/03.サウンド/CSoundDeviceASIO.cs index 8012b8e7..0803774d 100644 --- a/FDK19/コード/03.サウンド/CSoundDeviceASIO.cs +++ b/FDK19/コード/03.サウンド/CSoundDeviceASIO.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Diagnostics; diff --git a/FDK19/コード/03.サウンド/CSoundDeviceWASAPI.cs b/FDK19/コード/03.サウンド/CSoundDeviceWASAPI.cs index 8e1cd920..9c87baf8 100644 --- a/FDK19/コード/03.サウンド/CSoundDeviceWASAPI.cs +++ b/FDK19/コード/03.サウンド/CSoundDeviceWASAPI.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Diagnostics; diff --git a/TJAPlayer3/Common/C定数.cs b/TJAPlayer3/Common/C定数.cs index 5b5aa8e5..156fe0c2 100644 --- a/TJAPlayer3/Common/C定数.cs +++ b/TJAPlayer3/Common/C定数.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; diff --git a/TJAPlayer3/GlobalSuppressions.cs b/TJAPlayer3/GlobalSuppressions.cs index 92c01f87..18f85b89 100644 Binary files a/TJAPlayer3/GlobalSuppressions.cs and b/TJAPlayer3/GlobalSuppressions.cs differ diff --git a/TJAPlayer3/I18N/CLang_en.cs b/TJAPlayer3/I18N/CLang_en.cs index 85a70893..6896ecbe 100644 --- a/TJAPlayer3/I18N/CLang_en.cs +++ b/TJAPlayer3/I18N/CLang_en.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/TJAPlayer3/I18N/CLang_es.cs b/TJAPlayer3/I18N/CLang_es.cs index db671720..3509250b 100644 --- a/TJAPlayer3/I18N/CLang_es.cs +++ b/TJAPlayer3/I18N/CLang_es.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/TJAPlayer3/I18N/CLang_jp.cs b/TJAPlayer3/I18N/CLang_jp.cs index 8db26928..5a1e7596 100644 --- a/TJAPlayer3/I18N/CLang_jp.cs +++ b/TJAPlayer3/I18N/CLang_jp.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/TJAPlayer3/I18N/CLang_zh.cs b/TJAPlayer3/I18N/CLang_zh.cs index 307d0202..f344264e 100644 --- a/TJAPlayer3/I18N/CLang_zh.cs +++ b/TJAPlayer3/I18N/CLang_zh.cs @@ -1,4 +1,4 @@ -// Created by WHMHammer on Feb. 14th, 2022 +// Created by WHMHammer on Feb. 14th, 2022 // Translated from CLang_en.cs using System; diff --git a/TJAPlayer3/Songs/CDTX.cs b/TJAPlayer3/Songs/CDTX.cs index 3cbbff8a..f3665319 100644 --- a/TJAPlayer3/Songs/CDTX.cs +++ b/TJAPlayer3/Songs/CDTX.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; @@ -2974,18 +2974,18 @@ namespace TJAPlayer3 // str = strInput.Replace(Environment.NewLine, "\n"); // str = str.Replace('\t', ' '); - unsafe - { - fixed (char *s = str) - { - for (int i = 0; i < str.Length; i++) - { - if (s[i] == '\t') - s[i] = ' '; - else if (s[i] == '\r') - s[i] = '\n'; - } - } + unsafe + { + fixed (char *s = str) + { + for (int i = 0; i < str.Length; i++) + { + if (s[i] == '\t') + s[i] = ' '; + else if (s[i] == '\r') + s[i] = '\n'; + } + } } if (nMode == 0) @@ -3070,9 +3070,9 @@ namespace TJAPlayer3 private void t入力_V4(string strInput, int difficulty) { if (!String.IsNullOrEmpty(strInput)) //空なら通さない - { - - //2017.01.31 DD カンマのみの行を0,に置き換え + { + + //2017.01.31 DD カンマのみの行を0,に置き換え strInput = regexForPrefixingCommaStartingLinesWithZero.Replace(strInput, "0,"); //2017.02.03 DD ヘッダ内にある命令以外の文字列を削除 @@ -3099,7 +3099,7 @@ namespace TJAPlayer3 int idx = strSplitした譜面[i].IndexOf("//"); if (idx >= 0) - strSplitした譜面[i] = strSplitした譜面[i].Substring(0, idx); + strSplitした譜面[i] = strSplitした譜面[i].Substring(0, idx); } //空のstring配列を詰める strSplitした譜面 = this.t空のstring配列を詰めたstring配列を返す(strSplitした譜面); @@ -3346,22 +3346,22 @@ namespace TJAPlayer3 } } return result.ToArray(); - } - - - - - - - + } + + + + + + + /// /// 譜面読み込みメソッドV4で使用。 /// /// private void t命令を挿入する(string InputText) - { + { #region [Split comma and arguments values] - + string[] SplitComma(string input) { var result = new List(); @@ -3410,10 +3410,10 @@ namespace TJAPlayer3 } char[] chDelimiter = new char[] { ' ' }; - string[] strArray = null; - + string[] strArray = null; + #endregion - + if (command == "#START") { //#STARTと同時に鳴らすのはどうかと思うけどしゃーなしだな。 @@ -4502,9 +4502,9 @@ namespace TJAPlayer3 } - if (this.n参照中の難易度 == (int)Difficulty.Dan) - { - this.nDan_NotesCount[DanSongs.Number - 1]++; + if (this.n参照中の難易度 == (int)Difficulty.Dan) + { + this.nDan_NotesCount[DanSongs.Number - 1]++; } @@ -4515,13 +4515,13 @@ namespace TJAPlayer3 { //風船はこのままでも機能しているので何もしない. - if (this.b最初の分岐である == false) - { - this.n風船数[(int)this.n現在のコース]++; + if (this.b最初の分岐である == false) + { + this.n風船数[(int)this.n現在のコース]++; } - else - { - this.n風船数[3]++; + else + { + this.n風船数[3]++; } } @@ -4823,9 +4823,9 @@ namespace TJAPlayer3 //Lengthのチェックをされる前ににif文を入れています。 this.bHasBranch[this.n参照中の難易度] = true; - if (this.n参照中の難易度 == (int)Difficulty.Dan) - { - this.bHasBranchDan[this.bHasBranchDan.Length - 1] = true; + if (this.n参照中の難易度 == (int)Difficulty.Dan) + { + this.bHasBranchDan[this.bHasBranchDan.Length - 1] = true; } } @@ -4918,15 +4918,15 @@ namespace TJAPlayer3 var tt = (int)Convert.ToDouble(strCommandParam); this.TOWERTYPE = tt; } - else if (strCommandName.Equals("DANTICK")) - { - var tick = (int)Convert.ToDouble(strCommandParam); - this.DANTICK = tick; + else if (strCommandName.Equals("DANTICK")) + { + var tick = (int)Convert.ToDouble(strCommandParam); + this.DANTICK = tick; } - else if (strCommandName.Equals("DANTICKCOLOR")) - { - var tickcolor = ColorTranslator.FromHtml(strCommandParam); - this.DANTICKCOLOR = tickcolor; + else if (strCommandName.Equals("DANTICKCOLOR")) + { + var tickcolor = ColorTranslator.FromHtml(strCommandParam); + this.DANTICKCOLOR = tickcolor; } else if (strCommandName.Equals("BPM")) { @@ -4997,10 +4997,10 @@ namespace TJAPlayer3 this.listBPM[0].bpm_change_bmscroll_time = -2000 * this.dbNowBPM / 15000; if (this.bOFFSETの値がマイナスである == true) - this.nOFFSET = this.nOFFSET * -1; //OFFSETは秒を加算するので、必ず正の数にすること。 - //tbOFFSET.Text = strCommandParam; - - // Substract global offset + this.nOFFSET = this.nOFFSET * -1; //OFFSETは秒を加算するので、必ず正の数にすること。 + //tbOFFSET.Text = strCommandParam; + + // Substract global offset this.nOFFSET += ((this.bOFFSETの値がマイナスである == true) ? -TJAPlayer3.ConfigIni.nGlobalOffsetMs : TJAPlayer3.ConfigIni.nGlobalOffsetMs); } else if (strCommandName.Equals("MOVIEOFFSET")) diff --git a/TJAPlayer3/Songs/CSong管理.cs b/TJAPlayer3/Songs/CSong管理.cs index c54a3a12..16304d22 100644 --- a/TJAPlayer3/Songs/CSong管理.cs +++ b/TJAPlayer3/Songs/CSong管理.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Text; diff --git a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs index c0cfe256..d1cb8ac9 100644 --- a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs +++ b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs @@ -1,4 +1,4 @@ -using FDK; +using FDK; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/TJAPlayer3/Stages/04.Config/CActConfigList.cs b/TJAPlayer3/Stages/04.Config/CActConfigList.cs index a4f9b9b4..9d5d4529 100644 --- a/TJAPlayer3/Stages/04.Config/CActConfigList.cs +++ b/TJAPlayer3/Stages/04.Config/CActConfigList.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Text; diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelectPresound.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelectPresound.cs index 23880e16..d27eb0f0 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelectPresound.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelectPresound.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Diagnostics; diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs index ce75097d..43f02232 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Globalization; diff --git a/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs b/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs index 01d6bb58..3a3bd2ff 100644 --- a/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs +++ b/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; diff --git a/TJAPlayer3/Stages/07.Game/CAct演奏パネル文字列.cs b/TJAPlayer3/Stages/07.Game/CAct演奏パネル文字列.cs index 05d44179..ce16387d 100644 --- a/TJAPlayer3/Stages/07.Game/CAct演奏パネル文字列.cs +++ b/TJAPlayer3/Stages/07.Game/CAct演奏パネル文字列.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs index a7269a22..d894edda 100644 --- a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs +++ b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs index a181a560..b31ab5a6 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs index 0950b541..9b6b50d5 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs index 85294139..c5812078 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/FireWorks.cs b/TJAPlayer3/Stages/07.Game/Taiko/FireWorks.cs index 52f8a5cc..323c5331 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/FireWorks.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/FireWorks.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/FlyingNotes.cs b/TJAPlayer3/Stages/07.Game/Taiko/FlyingNotes.cs index c378656c..aafb68b6 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/FlyingNotes.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/FlyingNotes.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/Rainbow.cs b/TJAPlayer3/Stages/07.Game/Taiko/Rainbow.cs index c8bc2e50..557292de 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/Rainbow.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/Rainbow.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Drawing; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/TaikoLaneFlash.cs b/TJAPlayer3/Stages/07.Game/Taiko/TaikoLaneFlash.cs index a9ae3682..d83ff69d 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/TaikoLaneFlash.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/TaikoLaneFlash.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; diff --git a/TJAPlayer3/Stages/11.Heya/CStageHeya.cs b/TJAPlayer3/Stages/11.Heya/CStageHeya.cs index c44bd653..179ef517 100644 --- a/TJAPlayer3/Stages/11.Heya/CStageHeya.cs +++ b/TJAPlayer3/Stages/11.Heya/CStageHeya.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +6,7 @@ using System.Threading.Tasks; using System.Drawing; using FDK; using SharpDX; -using static TJAPlayer3.CActSelectȃXg; +using static TJAPlayer3.CActSelect曲リスト; using Rectangle = System.Drawing.Rectangle; using RectangleF = System.Drawing.RectangleF; @@ -18,22 +18,22 @@ namespace TJAPlayer3 { public CStageHeya() { - base.eXe[WID = EXe[W.Heya; - base.etF[YID = CStage.EtF[Y._ʏ; + base.eステージID = Eステージ.Heya; + base.eフェーズID = CStage.Eフェーズ.共通_通常状態; - base.listqActivities.Add(this.actFOtoTitle = new CActFIFOBlack()); + base.list子Activities.Add(this.actFOtoTitle = new CActFIFOBlack()); - base.listqActivities.Add(this.PuchiChara = new PuchiChara()); + base.list子Activities.Add(this.PuchiChara = new PuchiChara()); } - public override void On() + public override void On活性化() { - if (base.bĂ) + if (base.b活性化してる) return; - base.etF[YID = CStage.EtF[Y._ʏ; - this.etF[hAEg̖߂l = E߂l.p; + base.eフェーズID = CStage.Eフェーズ.共通_通常状態; + this.eフェードアウト完了時の戻り値 = E戻り値.継続; ctDonchan_In = new CCounter(); ctDonchan_Normal = new CCounter(0, TJAPlayer3.Tx.SongSelect_Donchan_Normal.Length - 1, 1000 / 45, TJAPlayer3.Timer); @@ -70,7 +70,7 @@ namespace TJAPlayer3 this.ttkDanTitles = new TitleTextureKey[amount]; // Silver Shinjin (default rank) always avaliable by default - this.ttkDanTitles[0] = new TitleTextureKey("Vl", this.pfHeyaFont, Color.White, Color.Black, 1000); + this.ttkDanTitles[0] = new TitleTextureKey("新人", this.pfHeyaFont, Color.White, Color.Black, 1000); int idx = 1; if (TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer] != null) @@ -96,7 +96,7 @@ namespace TJAPlayer3 this.ttkTitles = new TitleTextureKey[amount]; // Wood shojinsha (default title) always avaliable by default - this.ttkTitles[0] = new TitleTextureKey("S", this.pfHeyaFont, Color.Black, Color.Transparent, 1000); + this.ttkTitles[0] = new TitleTextureKey("初心者", this.pfHeyaFont, Color.Black, Color.Transparent, 1000); idx = 1; if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null) @@ -155,30 +155,30 @@ namespace TJAPlayer3 this.PuchiChara.IdleAnimation(); - base.On(); + base.On活性化(); } - public override void On񊈐() + public override void On非活性化() { - base.On񊈐(); + base.On非活性化(); } - public override void OnManaged\[X̍쐬() + public override void OnManagedリソースの作成() { - base.OnManaged\[X̍쐬(); + base.OnManagedリソースの作成(); } - public override void OnManaged\[X̉() + public override void OnManagedリソースの解放() { - base.OnManaged\[X̉(); + base.OnManagedリソースの解放(); } - public override int Onis`() + public override int On進行描画() { - ctDonchan_Normal.tisLoop(); - ctDonchan_In.tis(); + ctDonchan_Normal.t進行Loop(); + ctDonchan_In.t進行(); - TJAPlayer3.Tx.Heya_Background.t2D`(TJAPlayer3.app.Device, 0, 0); + TJAPlayer3.Tx.Heya_Background.t2D描画(TJAPlayer3.app.Device, 0, 0); #region [Menus display] @@ -186,21 +186,21 @@ namespace TJAPlayer3 for (int i = 0; i < this.ttkMainMenuOpt.Length; i++) { - CTexture tmpTex = TJAPlayer3.stageI.actȃXg.ResolveTitleTexture(this.ttkMainMenuOpt[i]); + CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkMainMenuOpt[i]); if (iCurrentMenu != -1 || iMainMenuCurrent != i) { - tmpTex.color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = Cϊ.ColorToColor4(Color.DarkGray); + tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray); } else { - tmpTex.color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = Cϊ.ColorToColor4(Color.White); + tmpTex.color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White); } - TJAPlayer3.Tx.Heya_Side_Menu.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 164, 26 + 80 * i); - tmpTex.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 164, 40 + 80 * i); + TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 26 + 80 * i); + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 40 + 80 * i); } #endregion @@ -215,40 +215,40 @@ namespace TJAPlayer3 if (i != 0) { - TJAPlayer3.Tx.PuchiChara.color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Lock.color4 = Cϊ.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Heya_Lock.color4 = C変換.ColorToColor4(Color.DarkGray); } else { - TJAPlayer3.Tx.PuchiChara.color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Lock.color4 = Cϊ.ColorToColor4(Color.White); + TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.Heya_Lock.color4 = C変換.ColorToColor4(Color.White); } - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 620 + 302 * i, 200); + TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200); int puriColumn = pos % 5; int puriRow = pos / 5; - TJAPlayer3.Tx.PuchiChara.t2Dg嗦l`(TJAPlayer3.app.Device, 620 + 302 * i, 320 + (int)(PuchiChara.sineY), - new Rectangle((PuchiChara.Counter.n݂̒l + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0], + TJAPlayer3.Tx.PuchiChara.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 320 + (int)(PuchiChara.sineY), + new Rectangle((PuchiChara.Counter.n現在の値 + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0], puriRow * TJAPlayer3.Skin.Game_PuchiChara[1], TJAPlayer3.Skin.Game_PuchiChara[0], TJAPlayer3.Skin.Game_PuchiChara[1])); - TJAPlayer3.Tx.PuchiChara.color4 = Cϊ.ColorToColor4(Color.White); + TJAPlayer3.Tx.PuchiChara.color4 = C変換.ColorToColor4(Color.White); if (ttkPuchiCharaNames[pos] != null) { - CTexture tmpTex = TJAPlayer3.stageI.actȃXg.ResolveTitleTexture(ttkPuchiCharaNames[pos]); + CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaNames[pos]); - tmpTex.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 620 + 302 * i, 448); + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 448); } if (puchiUnlockables.ContainsKey(pos) && !TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Contains(pos)) - TJAPlayer3.Tx.Heya_Lock?.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 620 + 302 * i, 200); + TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200); } @@ -267,22 +267,22 @@ namespace TJAPlayer3 if (i != 0) { if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null) - TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = Cϊ.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.DarkGray); } else { if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null) - TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = Cϊ.ColorToColor4(Color.White); + TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.color4 = C変換.ColorToColor4(Color.White); } - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 620 + 302 * i, 200); + TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 200); - TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2Dg嗦l`(TJAPlayer3.app.Device, 620 + 302 * i, 320); + TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 620 + 302 * i, 320); if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null) - TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = Cϊ.ColorToColor4(Color.White); + TJAPlayer3.Tx.Characters_Heya_Preview[pos].color4 = C変換.ColorToColor4(Color.White); } } @@ -296,36 +296,36 @@ namespace TJAPlayer3 { int pos = (this.ttkDanTitles.Length * 5 + iDanTitleCurrent + i) % this.ttkDanTitles.Length; - CTexture tmpTex = TJAPlayer3.stageI.actȃXg.ResolveTitleTexture(this.ttkDanTitles[pos]); + CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkDanTitles[pos]); if (i != 0) { - tmpTex.color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.NamePlateBase.color4 = Cϊ.ColorToColor4(Color.DarkGray); + tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.DarkGray); } else { - tmpTex.color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.NamePlateBase.color4 = Cϊ.ColorToColor4(Color.White); + tmpTex.color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White); } int danGrade = 0; if (pos > 0) { - danGrade = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[pos].str].clearStatus; + danGrade = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[pos].str文字].clearStatus; } - TJAPlayer3.Tx.Heya_Side_Menu.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i); + TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i); - TJAPlayer3.Tx.NamePlateBase.t2Dg嗦l㒆`(TJAPlayer3.app.Device, + TJAPlayer3.Tx.NamePlateBase.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 718 + -10 * Math.Abs(i), 331 + 70 * i, new RectangleF(0, (8 + danGrade) * 54, 220, 54)); - TJAPlayer3.Tx.NamePlateBase.color4 = Cϊ.ColorToColor4(Color.White); + TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White); - tmpTex.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i); + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i); } @@ -341,37 +341,37 @@ namespace TJAPlayer3 { int pos = (this.ttkTitles.Length * 5 + iTitleCurrent + i) % this.ttkTitles.Length; - CTexture tmpTex = TJAPlayer3.stageI.actȃXg.ResolveTitleTexture(this.ttkTitles[pos]); + CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkTitles[pos]); if (i != 0) { - tmpTex.color4 = Cϊ.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = Cϊ.ColorToColor4(Color.DarkGray); + tmpTex.color4 = C変換.ColorToColor4(Color.DarkGray); + TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.DarkGray); } else { - tmpTex.color4 = Cϊ.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = Cϊ.ColorToColor4(Color.White); + tmpTex.color4 = C変換.ColorToColor4(Color.White); + TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White); } - TJAPlayer3.Tx.Heya_Side_Menu.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i); + TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 340 + 70 * i); int iType = -1; if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null && - TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[pos].str)) - iType = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[pos].str].iType; + TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[pos].str文字)) + iType = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[pos].str文字].iType; else if (pos == 0) iType = 0; if (iType >= 0 && iType < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title) { - TJAPlayer3.Tx.NamePlate_Title[iType][TJAPlayer3.NamePlate.ctAnimatedNamePlateTitle.n݂̒l % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[iType]].t2Dg嗦l㒆`(TJAPlayer3.app.Device, + TJAPlayer3.Tx.NamePlate_Title[iType][TJAPlayer3.NamePlate.ctAnimatedNamePlateTitle.n現在の値 % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[iType]].t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 348 + 70 * i); } - tmpTex.t2Dg嗦l㒆`(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i); + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 + -10 * Math.Abs(i), 354 + 70 * i); } } @@ -385,41 +385,41 @@ namespace TJAPlayer3 if (iCurrentMenu >= 0) { - if (this.ttkInfoSection != null && this.ttkInfoSection.str != "") - TJAPlayer3.Tx.Heya_Box?.t2D`(TJAPlayer3.app.Device, 0, 0); + if (this.ttkInfoSection != null && this.ttkInfoSection.str文字 != "") + TJAPlayer3.Tx.Heya_Box?.t2D描画(TJAPlayer3.app.Device, 0, 0); if (this.ttkInfoSection != null) - TJAPlayer3.stageI.actȃXg.ResolveTitleTexture(this.ttkInfoSection) - .t2Dg嗦l㒆`(TJAPlayer3.app.Device, 620, 560); + TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection) + .t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620, 560); } #endregion #region [General Don animations] - if (!ctDonchan_In.bJn) + if (!ctDonchan_In.b開始した) { - TJAPlayer3.Skin.soundHeyaBGM.tĐ(); - ctDonchan_In.tJn(0, 180, 1.25f, TJAPlayer3.Timer); + TJAPlayer3.Skin.soundHeyaBGM.t再生する(); + ctDonchan_In.t開始(0, 180, 1.25f, TJAPlayer3.Timer); } TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] + 5, 0); - #region [ ǂ񂿂֘A ] + #region [ どんちゃん関連 ] - if (ctDonchan_In.n݂̒l != 90) + if (ctDonchan_In.n現在の値 != 90) { float DonchanX = 0f, DonchanY = 0f; - DonchanX = (float)Math.Sin(ctDonchan_In.n݂̒l / 2 * (Math.PI / 180)) * 200f; - DonchanY = ((float)Math.Sin((90 + (ctDonchan_In.n݂̒l / 2)) * (Math.PI / 180)) * 150f); + DonchanX = (float)Math.Sin(ctDonchan_In.n現在の値 / 2 * (Math.PI / 180)) * 200f; + DonchanY = ((float)Math.Sin((90 + (ctDonchan_In.n現在の値 / 2)) * (Math.PI / 180)) * 150f); - TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n݂̒l].Opacity = ctDonchan_In.n݂̒l * 2; - TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n݂̒l].t2D`(TJAPlayer3.app.Device, -200 + DonchanX, 336 - DonchanY); + TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].Opacity = ctDonchan_In.n現在の値 * 2; + TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].t2D描画(TJAPlayer3.app.Device, -200 + DonchanX, 336 - DonchanY); #region [PuchiChara] - this.PuchiChara.Onis`(0 + 100, 336 + 230, false); + this.PuchiChara.On進行描画(0 + 100, 336 + 230, false); #endregion } @@ -428,29 +428,29 @@ namespace TJAPlayer3 #endregion - #region [ L[֘A ] + #region [ キー関連 ] - if (TJAPlayer3.InputǗ.Keyboard.bL[ꂽ((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bꂽ(Eyp[g.DRUMS, Epbh.RBlue)) + if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.RightArrow) || + TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue)) { if (this.tMove(1)) { - TJAPlayer3.Skin.soundύX.tĐ(); + TJAPlayer3.Skin.sound変更音.t再生する(); } } - else if (TJAPlayer3.InputǗ.Keyboard.bL[ꂽ((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bꂽ(Eyp[g.DRUMS, Epbh.LBlue)) + else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.LeftArrow) || + TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LBlue)) { if (this.tMove(-1)) { - TJAPlayer3.Skin.soundύX.tĐ(); + TJAPlayer3.Skin.sound変更音.t再生する(); } } - else if (TJAPlayer3.InputǗ.Keyboard.bL[ꂽ((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bꂽ(Eyp[g.DRUMS, Epbh.LRed) || - TJAPlayer3.Pad.bꂽ(Eyp[g.DRUMS, Epbh.RRed)) + else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.Return) || + TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.LRed) || + TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RRed)) { #region [Decide] @@ -460,10 +460,10 @@ namespace TJAPlayer3 // Return to main menu if (iCurrentMenu == -1 && iMainMenuCurrent == 0) { - TJAPlayer3.Skin.soundHeyaBGM.t~(); - this.etF[hAEg̖߂l = E߂l.^Cgɖ߂; - this.actFOtoTitle.ttF[hAEgJn(); - base.etF[YID = CStage.EtF[Y._tF[hAEg; + TJAPlayer3.Skin.soundHeyaBGM.t停止する(); + this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; + this.actFOtoTitle.tフェードアウト開始(); + base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト; } else if (iCurrentMenu == -1) @@ -515,11 +515,11 @@ namespace TJAPlayer3 if (iDanTitleCurrent > 0) { - iG = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str].isGold; - cs = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str].clearStatus; + iG = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str文字].isGold; + cs = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[iDanTitleCurrent].str文字].clearStatus; } - TJAPlayer3.NamePlateConfig.data.Dan[iPlayer] = this.ttkDanTitles[iDanTitleCurrent].str; + TJAPlayer3.NamePlateConfig.data.Dan[iPlayer] = this.ttkDanTitles[iDanTitleCurrent].str文字; TJAPlayer3.NamePlateConfig.data.DanGold[iPlayer] = iG; TJAPlayer3.NamePlateConfig.data.DanType[iPlayer] = cs; @@ -533,11 +533,11 @@ namespace TJAPlayer3 else if (iCurrentMenu == 3) { - TJAPlayer3.NamePlateConfig.data.Title[iPlayer] = this.ttkTitles[iTitleCurrent].str; + TJAPlayer3.NamePlateConfig.data.Title[iPlayer] = this.ttkTitles[iTitleCurrent].str文字; if (TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer] != null - && TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[iTitleCurrent].str)) - TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[iTitleCurrent].str].iType; + && TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer].ContainsKey(this.ttkTitles[iTitleCurrent].str文字)) + TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = TJAPlayer3.NamePlateConfig.data.NamePlateTitles[iPlayer][this.ttkTitles[iTitleCurrent].str文字].iType; else if (iTitleCurrent == 0) TJAPlayer3.NamePlateConfig.data.TitleType[iPlayer] = 0; else @@ -552,26 +552,26 @@ namespace TJAPlayer3 } if (ess == ESelectStatus.SELECTED) - TJAPlayer3.Skin.sound艹.tĐ(); + TJAPlayer3.Skin.sound決定音.t再生する(); else if (ess == ESelectStatus.FAILED) - TJAPlayer3.Skin.soundError.tĐ(); + TJAPlayer3.Skin.soundError.t再生する(); else - TJAPlayer3.Skin.SoundBanapas.tĐ(); // To change with a more appropriate sfx sooner or later + TJAPlayer3.Skin.SoundBanapas.t再生する(); // To change with a more appropriate sfx sooner or later #endregion } - else if (TJAPlayer3.InputǗ.Keyboard.bL[ꂽ((int)SlimDXKeys.Key.Escape)) + else if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.Escape)) { - TJAPlayer3.Skin.sound.tĐ(); + TJAPlayer3.Skin.sound取消音.t再生する(); if (iCurrentMenu == -1) { - TJAPlayer3.Skin.soundHeyaBGM.t~(); - this.etF[hAEg̖߂l = E߂l.^Cgɖ߂; - this.actFOtoTitle.ttF[hAEgJn(); - base.etF[YID = CStage.EtF[Y._tF[hAEg; + TJAPlayer3.Skin.soundHeyaBGM.t停止する(); + this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; + this.actFOtoTitle.tフェードアウト開始(); + base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト; } else { @@ -586,25 +586,25 @@ namespace TJAPlayer3 #endregion - switch (base.etF[YID) + switch (base.eフェーズID) { - case CStage.EtF[Y._tF[hAEg: - if (this.actFOtoTitle.Onis`() == 0) + case CStage.Eフェーズ.共通_フェードアウト: + if (this.actFOtoTitle.On進行描画() == 0) { break; } - return (int)this.etF[hAEg̖߂l; + return (int)this.eフェードアウト完了時の戻り値; } return 0; } - public enum E߂l : int + public enum E戻り値 : int { - p, - ^Cgɖ߂, - IȂ + 継続, + タイトルに戻る, + 選曲した } public bool bInSongPlayed; @@ -724,7 +724,7 @@ namespace TJAPlayer3 private int iPuchiCharaCount; private int iCharacterCount; - public E߂l etF[hAEg̖߂l; + public E戻り値 eフェードアウト完了時の戻り値; public CActFIFOBlack actFOtoTitle; }