1
0
mirror of synced 2025-02-07 06:41:24 +01:00

Feature/import score ini (#674)

* Add button in setting to import scores

* Change description and add to all lang.json files

* Revert name change

* Run dotnet format

---------

Co-authored-by: 0auBSQ <58159635+0auBSQ@users.noreply.github.com>
This commit is contained in:
Ashiro12138 2024-09-27 19:26:48 +10:00 committed by GitHub
parent 0ff4869cb9
commit 35664808bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 3600 additions and 3577 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
{
{
// The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
@ -579,4 +579,4 @@
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial",
"BoxFontName": "font.ttf"
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -3,4 +3,4 @@
public double deltaTime => OpenTaiko.FPS.DeltaTime;
public int fps => OpenTaiko.FPS.NowFPS;
}
}
}

View File

@ -12,4 +12,4 @@
this.dir = dir;
}
}
}
}

View File

@ -287,8 +287,8 @@ namespace OpenTaiko {
if (OpenTaiko.Songs管理.list曲ルート_Dan.Count > 0 && OpenTaiko.ConfigIni.nPlayerCount == 1)
operationSucceded = true;
} else if (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].implemented == true
&& (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]]._1pRestricted == false
|| OpenTaiko.ConfigIni.nPlayerCount == 1))
&& (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]]._1pRestricted == false
|| OpenTaiko.ConfigIni.nPlayerCount == 1))
operationSucceded = true;
if (operationSucceded == true) {

View File

@ -62,6 +62,10 @@ namespace OpenTaiko {
CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_RELOADSONGCACHE_DESC"));
this.list項目リスト.Add(this.iSystemHardReloadDTX);
this.isSystemImportingScore = new CItemBase(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_IMPORTSCOREINI"), CItemBase.EPanelType.Normal,
CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_IMPORTSCOREINI_DESC"));
this.list項目リスト.Add(this.isSystemImportingScore);
this.iSystemLanguage = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANGUAGE"), CItemList.EPanelType.Normal, CLangManager.langToInt(OpenTaiko.ConfigIni.sLang),
CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANGUAGE_DESC"),
CLangManager.Languages);
@ -658,7 +662,7 @@ namespace OpenTaiko {
} else if (this.list項目リスト[this.n現在の選択項目] == this.iDrumsGoToCalibration) {
OpenTaiko.stageコンフィグ.actCalibrationMode.Start();
} else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignDrumsReturnToMenu ||
this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingReturnToMenu) // #24525 2011.3.15 yyagi
this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingReturnToMenu) // #24525 2011.3.15 yyagi
{
t項目リストの設定_Drums();
}
@ -700,6 +704,10 @@ namespace OpenTaiko {
// TJAPlayer3.stage選曲.Refresh(TJAPlayer3.EnumSongs.Songs管理, true);
OpenTaiko.stageSongSelect.actSongList.ResetSongIndex();
} else if (this.list項目リスト[this.n現在の選択項目] == this.isSystemImportingScore) {
// Running in a separate thread so the game doesn't freeze
Thread thread = new Thread(CScoreIni_Importer.ImportScoreInisToSavesDb3);
thread.Start();
}
#endregion
}
@ -1670,6 +1678,7 @@ namespace OpenTaiko {
private CItemList iSystemSkinSubfolder; // #28195 2012.5.2 yyagi
private CItemBase iSystemReloadDTX; // #32081 2013.10.21 yyagi
private CItemBase iSystemHardReloadDTX;
private CItemBase isSystemImportingScore;
//private CItemInteger iSystemMasterVolume; // #33700 2014.4.26 yyagi
private int t前の項目(int nItem) {
@ -1741,7 +1750,7 @@ namespace OpenTaiko {
OpenTaiko.ConfigIni.nSoundDeviceType = this.iSystemSoundType.n現在選択されている項目番号; // #24820 2013.1.3 yyagi
OpenTaiko.ConfigIni.nBassBufferSizeMs = this.iSystemBassBufferSizeMs.n現在の値; // #24820 2013.1.15 yyagi
OpenTaiko.ConfigIni.nWASAPIBufferSizeMs = this.iSystemWASAPIBufferSizeMs.n現在の値; // #24820 2013.1.15 yyagi
// CDTXMania.ConfigIni.nASIOBufferSizeMs = this.iSystemASIOBufferSizeMs.n現在の値; // #24820 2013.1.3 yyagi
// CDTXMania.ConfigIni.nASIOBufferSizeMs = this.iSystemASIOBufferSizeMs.n現在の値; // #24820 2013.1.3 yyagi
OpenTaiko.ConfigIni.nASIODevice = this.iSystemASIODevice.n現在選択されている項目番号; // #24820 2013.1.17 yyagi
OpenTaiko.ConfigIni.bUseOSTimer = this.iSystemSoundTimerType.bON; // #33689 2014.6.17 yyagi
@ -1792,7 +1801,7 @@ namespace OpenTaiko {
OpenTaiko.ConfigIni.n表示可能な最小コンボ数.Drums = this.iSystemMinComboDrums.n現在の値;
OpenTaiko.ConfigIni.nRisky = this.iSystemRisky.n現在の値; // #23559 2911.7.27 yyagi
//CDTXMania.ConfigIni.e判定表示優先度.Drums = (E判定表示優先度) this.iDrumsJudgeDispPriority.n現在選択されている項目番号;
//CDTXMania.ConfigIni.e判定表示優先度.Drums = (E判定表示優先度) this.iDrumsJudgeDispPriority.n現在選択されている項目番号;
OpenTaiko.ConfigIni.bBranchGuide = this.iTaikoBranchGuide.bON;
OpenTaiko.ConfigIni.nDefaultCourse = this.iTaikoDefaultCourse.n現在選択されている項目番号;

View File

@ -295,8 +295,8 @@ namespace OpenTaiko {
int flag = (this.n現在のメニュー番号 == i) ? 1 : 0;
txMenuItemLeft[i, flag].t2D中心基準描画(OpenTaiko.Skin.Config_Item_X[i] + OpenTaiko.Skin.Config_Item_Font_Offset[0], OpenTaiko.Skin.Config_Item_Y[i] + OpenTaiko.Skin.Config_Item_Font_Offset[1]); //55
//txMenuItem.Dispose();
//menuY += stepY;
//txMenuItem.Dispose();
//menuY += stepY;
}
//---------------------
#endregion

View File

@ -383,7 +383,7 @@ namespace OpenTaiko {
private void tDrawDanSelectedLevel(float Anime, int modifier = 0) {
int scroll = OpenTaiko.Skin.Resolution[0] * modifier;
int currentSong = Math.Clamp(n現在の選択行 + modifier, 0, stバー情報.Length - 1);
bool over4 = false;
bool over4 = false;
switch (stバー情報[currentSong].eード種別) {
case CSongListNode.ENodeType.SCORE: {

View File

@ -204,7 +204,7 @@ namespace OpenTaiko {
if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) {
this..n現在の選択行 = 0;
this..n現在の選択行 = 0;
return returnTitle();
}
}

View File

@ -365,7 +365,7 @@ namespace OpenTaiko {
int n少し戻ってから演奏開始Chip = OpenTaiko.stage演奏ドラム画面.n現在のトップChip;
OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = 0;
OpenTaiko.stage演奏ドラム画面.t数値の初期化(true, true);
OpenTaiko.stage演奏ドラム画面.Activate();