feat: ツクールVX/VX Ace改造対応、Backupsフォルダ統一、全エンジンの種類別一覧表示タブの実装

This commit is contained in:
armonica committed 2026-10-04 19:28:36 +09:00
1 parent 7ac4dbc825
commit bc5ba43ce7
14 files changed
+2157 -130

No files matched your search

+241 -79
View File
@@ -30,6 +30,7 @@ namespace GameLauncher
private readonly TyranoModService _tyranoModService = new();
private readonly AsarArchiveService _asarService = new();
private readonly UnitySaveManagerService _unitySaveService = new();
private readonly RgssModService _rgssModService = new();
private readonly ObservableCollection<GameItemBase> _games = [];
private ListCollectionView _gamesView = null!;
@@ -68,6 +69,20 @@ namespace GameLauncher
#region 設定のロード & セーブ
private void btnOpenConfig_Click(object sender, RoutedEventArgs e)
{
var dialog = new ConfigDialog(_config)
{
Owner = this
};
if (dialog.ShowDialog() == true)
{
SaveConfig();
AppendLog($"[設定変更] 設定を保存しました。(RGSS Extractor: {_config.RgssExtractorPath})");
}
}
private void LoadConfig()
{
try
@@ -82,12 +97,7 @@ namespace GameLauncher
_gameComparer.SortOrder = _config.SortOrder;
ApplySortOrderToComboBox(_config.SortOrder);
// タブ復元
if (_config.SelectedTab == 1) tabTkool.IsChecked = true;
else if (_config.SelectedTab == 2) tabUnity.IsChecked = true;
else tabAll.IsChecked = true;
// フィルター復元
// フィルター設定の復元
RestoreFilterSettings();
}
}
@@ -99,20 +109,30 @@ namespace GameLauncher
private void RestoreFilterSettings()
{
// ツクールフィルター
if (_config.TkoolEngineFilter == "MV") rbTkoolMV.IsChecked = true;
else if (_config.TkoolEngineFilter == "MZ") rbTkoolMZ.IsChecked = true;
else if (_config.TkoolEngineFilter == "Tyrano") rbTkoolTyrano.IsChecked = true;
else rbTkoolAll.IsChecked = true;
switch (_config.SelectedTab)
{
case 1: tabMV.IsChecked = true; break;
case 2: tabMZ.IsChecked = true; break;
case 3: tabVXAce.IsChecked = true; break;
case 4: tabVX.IsChecked = true; break;
case 5: tabTyrano.IsChecked = true; break;
case 6: tabUnity.IsChecked = true; break;
default: tabAll.IsChecked = true; break;
}
chkFilterModdedOnly.IsChecked = _config.TkoolFilterModdedOnly;
chkFilterAsarOnly.IsChecked = _config.TkoolFilterAsarOnly;
if (pnlUnityBackendFilter != null)
{
pnlUnityBackendFilter.Visibility = tabUnity.IsChecked == true ? Visibility.Visible : Visibility.Collapsed;
}
// Unityフィルター
if (_config.UnityBackendFilter == "IL2CPP") rbUnityIL2CPP.IsChecked = true;
else if (_config.UnityBackendFilter == "Mono") rbUnityMono.IsChecked = true;
else rbUnityAll.IsChecked = true;
chkFilterModdedOnly.IsChecked = _config.TkoolFilterModdedOnly;
chkFilterAsarOnly.IsChecked = _config.TkoolFilterAsarOnly;
chkFilterRgssOnly.IsChecked = _config.TkoolFilterRgssOnly;
chkFilterSaveOnly.IsChecked = _config.UnityFilterSaveOnly;
}
@@ -123,13 +143,21 @@ namespace GameLauncher
try
{
_config.SortOrder = _gameComparer.SortOrder;
_config.SelectedTab = tabTkool.IsChecked == true ? 1 : (tabUnity.IsChecked == true ? 2 : 0);
_config.TkoolEngineFilter = rbTkoolMV.IsChecked == true ? "MV" : (rbTkoolMZ.IsChecked == true ? "MZ" : (rbTkoolTyrano.IsChecked == true ? "Tyrano" : "All"));
int tabIndex = 0;
if (tabMV.IsChecked == true) tabIndex = 1;
else if (tabMZ.IsChecked == true) tabIndex = 2;
else if (tabVXAce.IsChecked == true) tabIndex = 3;
else if (tabVX.IsChecked == true) tabIndex = 4;
else if (tabTyrano.IsChecked == true) tabIndex = 5;
else if (tabUnity.IsChecked == true) tabIndex = 6;
_config.SelectedTab = tabIndex;
_config.UnityBackendFilter = rbUnityIL2CPP.IsChecked == true ? "IL2CPP" : (rbUnityMono.IsChecked == true ? "Mono" : "All");
_config.TkoolFilterModdedOnly = chkFilterModdedOnly.IsChecked == true;
_config.TkoolFilterAsarOnly = chkFilterAsarOnly.IsChecked == true;
_config.UnityBackendFilter = rbUnityIL2CPP.IsChecked == true ? "IL2CPP" : (rbUnityMono.IsChecked == true ? "Mono" : "All");
_config.TkoolFilterRgssOnly = chkFilterRgssOnly.IsChecked == true;
_config.UnityFilterSaveOnly = chkFilterSaveOnly.IsChecked == true;
var options = new JsonSerializerOptions
@@ -171,6 +199,15 @@ namespace GameLauncher
}
}
foreach (var rgssPlugin in TkoolGameItem.DefaultRgssPlugins)
{
if (!_config.DefaultPluginSettings.ContainsKey(rgssPlugin.Id))
{
_config.DefaultPluginSettings[rgssPlugin.Id] = true;
modified = true;
}
}
if (modified || !File.Exists(_configFilePath))
{
SaveConfig();
@@ -376,70 +413,50 @@ namespace GameLauncher
}
}
// 2. メインタブフィルター
if (tabTkool.IsChecked == true)
// 2. エンジンの種類フィルター
if (tabMV.IsChecked == true)
{
if (game is not TkoolGameItem tg) return false;
// ツクールサブフィルター
if (rbTkoolMV.IsChecked == true && tg.EngineType != TkoolEngineType.MV) return false;
if (rbTkoolMZ.IsChecked == true && tg.EngineType != TkoolEngineType.MZ) return false;
if (rbTkoolTyrano.IsChecked == true && tg.EngineType != TkoolEngineType.Tyrano) return false;
if (chkFilterModdedOnly.IsChecked == true && !tg.IsModded) return false;
if (chkFilterAsarOnly.IsChecked == true && !tg.IsAsar) return false;
if (game is not TkoolGameItem tg || tg.EngineType != TkoolEngineType.MV) return false;
}
else if (tabMZ.IsChecked == true)
{
if (game is not TkoolGameItem tg || tg.EngineType != TkoolEngineType.MZ) return false;
}
else if (tabVXAce.IsChecked == true)
{
if (game is not TkoolGameItem tg || tg.EngineType != TkoolEngineType.VXAce) return false;
}
else if (tabVX.IsChecked == true)
{
if (game is not TkoolGameItem tg || tg.EngineType != TkoolEngineType.VX) return false;
}
else if (tabTyrano.IsChecked == true)
{
if (game is not TkoolGameItem tg || tg.EngineType != TkoolEngineType.Tyrano) return false;
}
else if (tabUnity.IsChecked == true)
{
if (game is not UnityGameItem ug) return false;
// Unityサブフィルター
if (rbUnityIL2CPP.IsChecked == true && ug.BackendType != UnityBackendType.IL2CPP) return false;
if (rbUnityMono.IsChecked == true && ug.BackendType != UnityBackendType.Mono) return false;
if (chkFilterSaveOnly.IsChecked == true && !ug.HasSaveData) return false;
}
else
{
// 「すべて」タブ
if (chkFilterAllModded.IsChecked == true)
{
if (game is not TkoolGameItem tg || !tg.IsModded) return false;
}
if (chkFilterAllAsar.IsChecked == true)
{
if (game is not TkoolGameItem tg || !tg.IsAsar) return false;
}
if (chkFilterAllSave.IsChecked == true)
{
if (game is not UnityGameItem ug || !ug.HasSaveData) return false;
}
}
// 3. 追加属性フィルター(全タブ共通)
if (chkFilterModdedOnly.IsChecked == true && !game.IsModded) return false;
if (chkFilterAsarOnly.IsChecked == true && (game is not TkoolGameItem tgAsar || !tgAsar.IsAsar)) return false;
if (chkFilterRgssOnly.IsChecked == true && (game is not TkoolGameItem tgRgss || !tgRgss.HasRgssArchive)) return false;
if (chkFilterSaveOnly.IsChecked == true && (game is not UnityGameItem ugSave || !ugSave.HasSaveData)) return false;
return true;
}
private void MainTab_Checked(object sender, RoutedEventArgs e)
private void EngineTab_Checked(object sender, RoutedEventArgs e)
{
if (!_isInitialized) return;
if (pnlTkoolFilters == null || pnlUnityFilters == null || pnlAllFilters == null) return;
if (tabTkool.IsChecked == true)
if (pnlUnityBackendFilter != null)
{
pnlTkoolFilters.Visibility = Visibility.Visible;
pnlUnityFilters.Visibility = Visibility.Collapsed;
pnlAllFilters.Visibility = Visibility.Collapsed;
}
else if (tabUnity.IsChecked == true)
{
pnlTkoolFilters.Visibility = Visibility.Collapsed;
pnlUnityFilters.Visibility = Visibility.Visible;
pnlAllFilters.Visibility = Visibility.Collapsed;
}
else
{
pnlTkoolFilters.Visibility = Visibility.Collapsed;
pnlUnityFilters.Visibility = Visibility.Collapsed;
pnlAllFilters.Visibility = Visibility.Visible;
pnlUnityBackendFilter.Visibility = tabUnity.IsChecked == true ? Visibility.Visible : Visibility.Collapsed;
}
_gamesView?.Refresh();
@@ -486,12 +503,13 @@ namespace GameLauncher
int total = _games.Count;
int visible = _gamesView?.Count ?? 0;
int tkoolCount = _games.Count(g => g is TkoolGameItem tg && tg.EngineType != TkoolEngineType.Tyrano);
int tkoolCount = _games.Count(g => g is TkoolGameItem tg && tg.EngineType != TkoolEngineType.Tyrano && !tg.IsRgss);
int rgssCount = _games.Count(g => g is TkoolGameItem tg && tg.IsRgss);
int tyranoCount = _games.Count(g => g is TkoolGameItem tg && tg.EngineType == TkoolEngineType.Tyrano);
int unityCount = _games.Count(g => g is UnityGameItem);
lblStatusSummary.Text = $"総ゲーム数: {total} 件 | 表示: {visible} 件";
lblStatusBreakdown.Text = $"(ツクール: {tkoolCount}, ティラノ: {tyranoCount}, Unity: {unityCount})";
lblStatusBreakdown.Text = $"(ツクールMV/MZ: {tkoolCount}, ツクールVX系: {rgssCount}, ティラノ: {tyranoCount}, Unity: {unityCount})";
}
#endregion
@@ -613,8 +631,23 @@ namespace GameLauncher
}
}
// スクリプト改造の適用または復元
if (tg.EngineType == TkoolEngineType.Tyrano)
// RGSSゲーム(ツクールVX / VX Ace)の場合
if (tg.IsRgss)
{
var (success, msg) = await _rgssModService.ApplyOrRestoreModAsync(tg, tg.PluginSettings, _config.RgssExtractorPath);
AppendLog($"[RGSS改造処理] {tg.Title}: {msg}");
if (!success && tg.ApplyMod)
{
var res = MessageBox.Show(
$"スクリプト改造の適用中に警告/エラーが発生しました:\n{msg}\n\nこのまま通常(未改造)でゲームを起動しますか?",
"RGSS改造警告",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
if (res != MessageBoxResult.Yes) return;
}
}
// スクリプト改造の適用または復元(ティラノ)
else if (tg.EngineType == TkoolEngineType.Tyrano)
{
if (tg.ApplyMod)
{
@@ -627,6 +660,7 @@ namespace GameLauncher
AppendLog($"[ティラノ復元] {tg.Title}: {msg}");
}
}
// スクリプト改造の適用または復元(ツクールMV/MZ)
else
{
var (success, msg) = _modService.ApplyOrRestoreMod(tg, _config.DefaultPluginSettings);
@@ -655,7 +689,8 @@ namespace GameLauncher
// ツクール/ティラノ等のWebランタイム(NW.js / Chromium)ゲームの場合、
// GameLauncher.exe のあるフォルダ配下の Profiles フォルダに隔離した専用プロファイルディレクトリを指定して起動
if (game is TkoolGameItem tg)
// ※RGSS(DirectX/Ruby)やUnity等のネイティブアプリには引数を付与しない
if (game is TkoolGameItem tg && !tg.IsRgss)
{
try
{
@@ -699,19 +734,48 @@ namespace GameLauncher
// ツクール専用メニュー
menuTkoolOpenFolder.Visibility = isTkool ? Visibility.Visible : Visibility.Collapsed;
menuTkoolOpenProfile.Visibility = isTkool ? Visibility.Visible : Visibility.Collapsed;
menuTkoolOpenPluginsJs.Visibility = isTkool ? Visibility.Visible : Visibility.Collapsed;
menuTkoolRestoreOriginal.Visibility = isTkool ? Visibility.Visible : Visibility.Collapsed;
if (selected is TkoolGameItem tg && tg.IsAsar)
if (selected is TkoolGameItem tg)
{
menuTkoolExtractAsar.Visibility = !tg.IsAsarExtracted ? Visibility.Visible : Visibility.Collapsed;
menuTkoolRestoreAsar.Visibility = tg.IsAsarExtracted ? Visibility.Visible : Visibility.Collapsed;
// ASAR メニュー
if (tg.IsAsar)
{
menuTkoolExtractAsar.Visibility = !tg.IsAsarExtracted ? Visibility.Visible : Visibility.Collapsed;
menuTkoolRestoreAsar.Visibility = tg.IsAsarExtracted ? Visibility.Visible : Visibility.Collapsed;
}
else
{
menuTkoolExtractAsar.Visibility = Visibility.Collapsed;
menuTkoolRestoreAsar.Visibility = Visibility.Collapsed;
}
// RGSS メニュー
if (tg.IsRgss && tg.HasRgssArchive)
{
menuTkoolExtractRgss.Visibility = !tg.IsRgssExtracted ? Visibility.Visible : Visibility.Collapsed;
menuTkoolRestoreRgss.Visibility = tg.IsRgssExtracted ? Visibility.Visible : Visibility.Collapsed;
}
else
{
menuTkoolExtractRgss.Visibility = Visibility.Collapsed;
menuTkoolRestoreRgss.Visibility = Visibility.Collapsed;
}
// plugins.js は MV/MZ のみ
menuTkoolOpenPluginsJs.Visibility = (tg.IsMV || tg.IsMZ) && File.Exists(tg.PluginsJsPath) ? Visibility.Visible : Visibility.Collapsed;
// 専用プロファイルフォルダは Chromium/NW.js 系(MV/MZ/Tyrano)のみ
menuTkoolOpenProfile.Visibility = !tg.IsRgss ? Visibility.Visible : Visibility.Collapsed;
}
else
{
menuTkoolExtractAsar.Visibility = Visibility.Collapsed;
menuTkoolRestoreAsar.Visibility = Visibility.Collapsed;
menuTkoolExtractRgss.Visibility = Visibility.Collapsed;
menuTkoolRestoreRgss.Visibility = Visibility.Collapsed;
menuTkoolOpenPluginsJs.Visibility = Visibility.Collapsed;
menuTkoolOpenProfile.Visibility = Visibility.Collapsed;
}
// Unity専用メニュー
@@ -724,7 +788,7 @@ namespace GameLauncher
#endregion
#region ツクール専用機能 (ASAR解凍・復元・MOD解除・Profile)
#region ツクール専用機能 (ASAR解凍・復元・RGSS抽出・復元・MOD解除・Profile)
private async void btnExtractAsar_Click(object sender, RoutedEventArgs e)
{
@@ -849,6 +913,102 @@ namespace GameLauncher
}
}
#region RGSS スクリプト抽出・復元
private async void btnExtractRgss_Click(object sender, RoutedEventArgs e)
{
if (lstGames.SelectedItem is TkoolGameItem tg)
{
await ExtractRgssForGame(tg);
}
}
private async void MenuExtractRgss_Click(object sender, RoutedEventArgs e)
{
if (lstGames.SelectedItem is TkoolGameItem tg)
{
await ExtractRgssForGame(tg);
}
}
private async Task ExtractRgssForGame(TkoolGameItem tg)
{
if (!tg.IsRgss) return;
btnExtractRgss.IsEnabled = false;
pbRgssProgress.Visibility = Visibility.Visible;
pbRgssProgress.IsIndeterminate = true;
lblRgssProgressStatus.Visibility = Visibility.Visible;
lblRgssProgressStatus.Text = "RGSSスクリプトを抽出中...";
AppendLog($"[RGSS抽出開始] {tg.Title} (アーカイブ: {tg.RgssArchivePath})");
var (success, message) = await _rgssModService.ExtractScriptsAsync(tg, _config.RgssExtractorPath);
pbRgssProgress.Visibility = Visibility.Collapsed;
lblRgssProgressStatus.Visibility = Visibility.Collapsed;
btnExtractRgss.IsEnabled = true;
if (success)
{
_scannerService.SaveCache(_games);
AppendLog($"[RGSS抽出成功] {message}");
MessageBox.Show(message, "RGSS スクリプト抽出完了", MessageBoxButton.OK, MessageBoxImage.Information);
}
else
{
AppendLog($"[RGSS抽出失敗] {message}");
MessageBox.Show(message, "RGSS スクリプト抽出エラー", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
private void btnRestoreRgss_Click(object sender, RoutedEventArgs e)
{
if (lstGames.SelectedItem is TkoolGameItem tg)
{
RestoreRgssForGame(tg);
}
}
private void MenuRestoreRgss_Click(object sender, RoutedEventArgs e)
{
if (lstGames.SelectedItem is TkoolGameItem tg)
{
RestoreRgssForGame(tg);
}
}
private void RestoreRgssForGame(TkoolGameItem tg)
{
if (!tg.IsRgss) return;
var confirm = MessageBox.Show(
"抽出したスクリプト(Data\\Scripts)や改造を元に戻し、元のアーカイブ暗号化状態に戻しますか?",
"RGSSスクリプト復元の確認",
MessageBoxButton.YesNo,
MessageBoxImage.Question);
if (confirm != MessageBoxResult.Yes) return;
AppendLog($"[RGSS復元開始] {tg.Title}");
var (success, message) = _rgssModService.RestoreOriginal(tg);
if (success)
{
tg.IsModded = false;
_scannerService.SaveCache(_games);
AppendLog($"[RGSS復元成功] {message}");
MessageBox.Show(message, "RGSS 復元完了", MessageBoxButton.OK, MessageBoxImage.Information);
}
else
{
AppendLog($"[RGSS復元失敗] {message}");
MessageBox.Show(message, "RGSS 復元エラー", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
#endregion
private void btnRestoreOriginal_Click(object sender, RoutedEventArgs e)
{
if (lstGames.SelectedItem is TkoolGameItem tg)
@@ -867,9 +1027,11 @@ namespace GameLauncher
private void RestoreOriginalMod(TkoolGameItem tg)
{
var result = tg.EngineType == TkoolEngineType.Tyrano
? _tyranoModService.RestoreOriginal(tg)
: _modService.RestoreOriginal(tg);
var result = tg.IsRgss
? _rgssModService.RestoreOriginal(tg)
: (tg.EngineType == TkoolEngineType.Tyrano
? _tyranoModService.RestoreOriginal(tg)
: _modService.RestoreOriginal(tg));
tg.IsModded = false;
AppendLog($"[改造解除] {tg.Title}: {result.Message}");