chore: bundle evbunpack tool and add EVB control/launch fixes
- Add Enigma Virtual Box (EVB) engine support: detection, badge, unpack/restore UI - Bundle evbunpack.exe under Engines/Evb/Tools/evbunpack (Apache-2.0, with LICENSE/README) - Copy Engines\\**\\Tools\\** to build output via csproj (publish already covered by publish.ps1) - Throttle evbunpack progress reporting and shorten timeout to stop UI freeze - Rename original packed exe to .glbak and write a completion marker; make Restore reverse it - Launch the unpacked exe from _evb_extracted so script mods apply - Replace EVB MessageBox dialogs with readable log summaries - Remove obsolete boxed/7zip extraction code (NwjsPackageUnpacker, TkoolPackagedExtractionService)
This commit is contained in:
1 parent
8cea2a147d
commit
05e7bdb3c0
23 files changed
+1542
-1288
No files matched your search
+104
-44
@@ -116,13 +116,112 @@ namespace GameLauncher.Engines.Tkool
|
||||
|
||||
// ================= 単体exe梱包(FOSSIL / boxed)関連プロパティ =================
|
||||
// js/plugins.js がディスク上に無く、exeへ埋め込まれている形態を識別します。
|
||||
// 注: boxed の埋め込みコンテナ展開(旧 _extracted 展開)は廃止しました。
|
||||
// 単体exeは「起動のみ対応」として扱い、展開・注入は行いません。
|
||||
private bool _isFossilSingleExe;
|
||||
private bool _isBoxedExe;
|
||||
private bool _isStandaloneExeExtracted;
|
||||
private string? _standaloneExtractedDirPath;
|
||||
private string? _standaloneBackupPath;
|
||||
private string? _boxedPayloadEntryPath;
|
||||
private bool _canExtractViaExternalTool;
|
||||
|
||||
// ================= Enigma Virtual Box (EVB) 梱包関連プロパティ =================
|
||||
// EVB でパックされた exe を evbunpack で解凍した状態を識別します。
|
||||
// 他エンジンのゲームへは一切影響しません(このゲームフォルダ内でのみ扱う)。
|
||||
private bool _isEvbPacked;
|
||||
private bool _isEvbExtracted;
|
||||
private string? _evbExtractedDirPath;
|
||||
private string? _evbBackupPath;
|
||||
private string _evbUnderlyingEngine = string.Empty;
|
||||
|
||||
/// <summary>Enigma Virtual Box でパックされた exe を持つゲームかどうか</summary>
|
||||
public bool IsEvbPacked
|
||||
{
|
||||
get => _isEvbPacked;
|
||||
set { if (_isEvbPacked != value) { _isEvbPacked = value; OnPropertyChanged(); OnPropertyChanged(nameof(EvbBadgeVisibility)); OnPropertyChanged(nameof(IsEvb)); } }
|
||||
}
|
||||
|
||||
/// <summary>EVB 解凍済み(_evb_extracted に出力済み)かどうか</summary>
|
||||
public bool IsEvbExtracted
|
||||
{
|
||||
get => _isEvbExtracted;
|
||||
set { if (_isEvbExtracted != value) { _isEvbExtracted = value; OnPropertyChanged(); OnPropertyChanged(nameof(EvbDetailStatusText)); } }
|
||||
}
|
||||
|
||||
/// <summary>EVB 解凍先ディレクトリ(ゲームフォルダ内 _evb_extracted)</summary>
|
||||
public string? EvbExtractedDirPath
|
||||
{
|
||||
get => _evbExtractedDirPath;
|
||||
set { if (_evbExtractedDirPath != value) { _evbExtractedDirPath = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
/// <summary>EVB 解凍時に作成した元 exe のバックアップパス(*.glbak)</summary>
|
||||
public string? EvbBackupPath
|
||||
{
|
||||
get => _evbBackupPath;
|
||||
set { if (_evbBackupPath != value) { _evbBackupPath = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
/// <summary>EVB 解凍後に再判定された本来のエンジン名</summary>
|
||||
public string EvbUnderlyingEngine
|
||||
{
|
||||
get => _evbUnderlyingEngine;
|
||||
set { if (_evbUnderlyingEngine != value) { _evbUnderlyingEngine = value; OnPropertyChanged(); OnPropertyChanged(nameof(EvbDetailStatusText)); } }
|
||||
}
|
||||
|
||||
/// <summary>EVB として扱うか(UI バッジ判定用)</summary>
|
||||
public override bool IsEvb => IsEvbPacked;
|
||||
|
||||
/// <summary>EVB バッジの可視性</summary>
|
||||
public Visibility EvbBadgeVisibility => IsEvbPacked ? Visibility.Visible : Visibility.Collapsed;
|
||||
|
||||
/// <summary>EVB バッジのテキスト</summary>
|
||||
public string EvbBadgeText => "EVB";
|
||||
|
||||
/// <summary>EVB 未解凍のときだけ「要解凍」を強調表示するための可視性(一目で分かる導線)</summary>
|
||||
public Visibility EvbNeedsUnpackVisibility => (IsEvbPacked && !IsEvbExtracted) ? Visibility.Visible : Visibility.Collapsed;
|
||||
|
||||
/// <summary>
|
||||
/// Evb 解凍ツール(evbunpack.exe)が未配置かどうか。
|
||||
/// 選択時のガイドで「README.md を参照してください」と案内するために使用します。
|
||||
/// </summary>
|
||||
public bool IsEvbToolMissing => IsEvbPacked && !Engines.Evb.EvbUnpackerToolProvider.IsAvailable();
|
||||
|
||||
/// <summary>EVB 詳細状態テキスト</summary>
|
||||
public string EvbDetailStatusText
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!IsEvbPacked)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
var engine = string.IsNullOrWhiteSpace(EvbUnderlyingEngine) ? "未判定" : EvbUnderlyingEngine;
|
||||
if (IsEvbToolMissing)
|
||||
{
|
||||
return "evbunpack.exe が未配置です。Engines/Evb/Tools/evbunpack/README.md を参照してください。";
|
||||
}
|
||||
return IsEvbExtracted
|
||||
? $"Enigma Virtual Box パック済み(解凍済み / 本来: {engine})"
|
||||
: $"Enigma Virtual Box パック済み(未解凍 / 本来: {engine})";
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// EVB 解凍後の起動に使う実行ファイルを解決します。
|
||||
/// 解凍済み(_evb_extracted に完了マーカーがある)なら、その配下の exe を起動対象とし、
|
||||
/// 未解凍なら元の exe を返します。他ゲームには影響しません。
|
||||
/// </summary>
|
||||
public string ResolveLaunchExecutable()
|
||||
{
|
||||
if (!IsEvbPacked || !IsEvbExtracted)
|
||||
{
|
||||
return ExecutablePath;
|
||||
}
|
||||
|
||||
var outputDir = !string.IsNullOrEmpty(EvbExtractedDirPath)
|
||||
? EvbExtractedDirPath!
|
||||
: GameLauncher.Engines.Evb.EvbUnpackService.GetExtractedDir(RootDirectory);
|
||||
|
||||
var exe = GameLauncher.Engines.Evb.EvbUnpackService.FindLaunchExecutable(outputDir);
|
||||
return string.IsNullOrEmpty(exe) ? ExecutablePath : exe!;
|
||||
}
|
||||
|
||||
/// <summary>FOSSIL形態(FOSSILindex.html + 単体Game.exe、data/System.json はディスク上)かどうか</summary>
|
||||
public bool IsFossilSingleExe
|
||||
@@ -141,45 +240,6 @@ namespace GameLauncher.Engines.Tkool
|
||||
/// <summary>いずれかの単体exe梱包形態(FOSSIL / boxed)かどうか</summary>
|
||||
public bool IsStandaloneExePackage => IsFossilSingleExe || IsBoxedExe;
|
||||
|
||||
/// <summary>単体exe梱包ゲームを _extracted へ展開済みかどうか</summary>
|
||||
public bool IsStandaloneExeExtracted
|
||||
{
|
||||
get => _isStandaloneExeExtracted;
|
||||
set { if (_isStandaloneExeExtracted != value) { _isStandaloneExeExtracted = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
/// <summary>展開先ディレクトリ(ゲームフォルダ内 _extracted)</summary>
|
||||
public string? StandaloneExtractedDirPath
|
||||
{
|
||||
get => _standaloneExtractedDirPath;
|
||||
set { if (_standaloneExtractedDirPath != value) { _standaloneExtractedDirPath = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
/// <summary>exe内コンテナ改変時のバックアップパス(*.glbak)</summary>
|
||||
public string? StandaloneBackupPath
|
||||
{
|
||||
get => _standaloneBackupPath;
|
||||
set { if (_standaloneBackupPath != value) { _standaloneBackupPath = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
/// <summary>boxed exe内で注入対象とするコンテナ内エントリ(例: js/plugins.js)</summary>
|
||||
public string? BoxedPayloadEntryPath
|
||||
{
|
||||
get => _boxedPayloadEntryPath;
|
||||
set { if (_boxedPayloadEntryPath != value) { _boxedPayloadEntryPath = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 外部アンパッカー(Tools\7zr.exe 等)による展開を試行できる可能性があるか。
|
||||
/// 標準ZIP署名が未確定でも、boxed命名exeが存在する場合に true となり「展開試行可」を示す。
|
||||
/// 実際に展開可能かは実行時(ExtractPackageNw)に確定する。
|
||||
/// </summary>
|
||||
public bool CanExtractViaExternalTool
|
||||
{
|
||||
get => _canExtractViaExternalTool;
|
||||
set { if (_canExtractViaExternalTool != value) { _canExtractViaExternalTool = value; OnPropertyChanged(); } }
|
||||
}
|
||||
|
||||
public override GameEngineKind EngineKind => EngineType switch
|
||||
{
|
||||
TkoolEngineType.Tyrano => GameEngineKind.Tyrano,
|
||||
|
||||
Reference in new issue
Block a user