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
+56
-40
@@ -8,8 +8,8 @@
|
||||
xmlns:models="clr-namespace:GameLauncher.Models"
|
||||
mc:Ignorable="d"
|
||||
Title="統合ゲームランチャー (Game Launcher)"
|
||||
Height="840" Width="1280"
|
||||
MinHeight="620" MinWidth="960"
|
||||
Height="780" Width="1120"
|
||||
MinHeight="580" MinWidth="900"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Background="#181820"
|
||||
Foreground="#E0E0E6"
|
||||
@@ -351,8 +351,8 @@
|
||||
|
||||
<!-- 設定ボタン & 再スキャンボタン -->
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<Button x:Name="btnOpenConfig" Style="{StaticResource ModernButton}" Content="⚙ 設定" Margin="0,0,8,0" Click="btnOpenConfig_Click"/>
|
||||
<Button x:Name="btnRescan" Style="{StaticResource ModernButton}" Content="🔄 再スキャン" Click="btnRescan_Click"/>
|
||||
<Button x:Name="btnOpenConfig" Style="{StaticResource ModernButton}" Content="⚙" ToolTip="設定" Padding="10,8" Margin="0,0,6,0" Click="btnOpenConfig_Click"/>
|
||||
<Button x:Name="btnRescan" Style="{StaticResource ModernButton}" Content="🔄" ToolTip="再スキャン" Padding="10,8" Click="btnRescan_Click"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
@@ -368,15 +368,15 @@
|
||||
<!-- エンジンの種類セレクター(全エンジン常時表示ピル型タブ) -->
|
||||
<Border Grid.Column="0" Background="#12121A" CornerRadius="8" Padding="3" Margin="0,0,14,0" BorderBrush="#303040" BorderThickness="1">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<RadioButton x:Name="tabAll" Style="{StaticResource NavTabRadioButton}" Content="🎮⚡ すべて" IsChecked="True" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabMV" Style="{StaticResource NavTabRadioButton}" Content="ツクールMV" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabMZ" Style="{StaticResource NavTabRadioButton}" Content="ツクールMZ" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabVXAce" Style="{StaticResource NavTabRadioButton}" Content="ツクールVX Ace" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabVX" Style="{StaticResource NavTabRadioButton}" Content="ツクールVX" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabTyrano" Style="{StaticResource NavTabRadioButton}" Content="ティラノ" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabWolf" Style="{StaticResource NavTabRadioButton}" Content="🐺 ウディタ" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabSrpg" Style="{StaticResource NavTabRadioButton}" Content="🛡️ SRPG Studio" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabUnity" Style="{StaticResource NavTabRadioButton}" Content="⚡ Unity" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="11,6"/>
|
||||
<RadioButton x:Name="tabAll" Style="{StaticResource NavTabRadioButton}" Content="すべて" ToolTip="すべて" IsChecked="True" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabMV" Style="{StaticResource NavTabRadioButton}" Content="MV" ToolTip="ツクールMV" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabMZ" Style="{StaticResource NavTabRadioButton}" Content="MZ" ToolTip="ツクールMZ" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabVXAce" Style="{StaticResource NavTabRadioButton}" Content="VX Ace" ToolTip="ツクールVX Ace" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabVX" Style="{StaticResource NavTabRadioButton}" Content="VX" ToolTip="ツクールVX" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabTyrano" Style="{StaticResource NavTabRadioButton}" Content="ティラノ" ToolTip="ティラノスクリプト" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabWolf" Style="{StaticResource NavTabRadioButton}" Content="ウディタ" ToolTip="WOLF RPGエディター" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabSrpg" Style="{StaticResource NavTabRadioButton}" Content="SRPG" ToolTip="SRPG Studio" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
<RadioButton x:Name="tabUnity" Style="{StaticResource NavTabRadioButton}" Content="Unity" ToolTip="Unity" GroupName="MainEngineTabs" Checked="EngineTab_Checked" Padding="9,5"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
@@ -674,6 +674,20 @@
|
||||
<TextBlock Text="{Binding RgssBadgeText}" FontSize="10" FontWeight="Bold" Foreground="#FFFFFF"/>
|
||||
</Border>
|
||||
|
||||
<!-- Enigma Virtual Box (EVB) バッジ -->
|
||||
<Border Background="#6C5CE7" CornerRadius="4" Padding="6,2" Margin="0,0,6,0"
|
||||
ToolTip="Enigma Virtual Box でパックされています。選択して「📦 EVBを解凍」を押してください。"
|
||||
Visibility="{Binding EvbBadgeVisibility}">
|
||||
<TextBlock Text="{Binding EvbBadgeText}" FontSize="10" FontWeight="Bold" Foreground="#FFFFFF"/>
|
||||
</Border>
|
||||
|
||||
<!-- EVB 未解凍のときだけ「要解凍」を強調表示(一目で分かる導線) -->
|
||||
<Border Background="#FDCB6E" CornerRadius="4" Padding="6,2" Margin="0,0,6,0"
|
||||
ToolTip="選択して「📦 EVBを解凍」を押すと、同梱の evbunpack で解凍できます。"
|
||||
Visibility="{Binding EvbNeedsUnpackVisibility}">
|
||||
<TextBlock Text="要解凍" FontSize="10" FontWeight="Bold" Foreground="#3A2A00"/>
|
||||
</Border>
|
||||
|
||||
<!-- 改造適用中インジケータ(ツクール専用) -->
|
||||
<Border Background="{StaticResource BadgeModdedBg}" CornerRadius="4" Padding="6,2" Margin="0,0,6,0">
|
||||
<Border.Style>
|
||||
@@ -732,9 +746,15 @@
|
||||
HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
|
||||
|
||||
<!-- 右側:詳細 & 操作パネル -->
|
||||
<Border Grid.Column="2" Background="{StaticResource SidePanelBg}" Padding="20">
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
|
||||
<Grid x:Name="pnlGameDetails" Margin="0,0,14,0">
|
||||
<Border Grid.Column="2" Background="{StaticResource SidePanelBg}" Padding="12,10">
|
||||
<DockPanel>
|
||||
<!-- 詳細パネルの開閉トグル(コンパクト化のため既定は展開、必要時に折りたたみ) -->
|
||||
<Button x:Name="btnToggleDetails" DockPanel.Dock="Top"
|
||||
Style="{StaticResource ModernButton}" Padding="8,4" FontSize="11"
|
||||
HorizontalAlignment="Right" Margin="0,0,0,6"
|
||||
Content="▾ 詳細を折りたたむ" Click="btnToggleDetails_Click"/>
|
||||
<ScrollViewer x:Name="scvDetails" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
|
||||
<Grid x:Name="pnlGameDetails" Margin="0,0,4,0">
|
||||
<!-- 未選択時メッセージ -->
|
||||
<StackPanel x:Name="pnlNoSelection" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,80,0,0" Opacity="0.6">
|
||||
<TextBlock Text="👈" FontSize="44" HorizontalAlignment="Center" Margin="0,0,0,10"/>
|
||||
@@ -990,39 +1010,34 @@
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 単体exe梱包(FOSSIL / boxed)管理セクション -->
|
||||
<Border Background="#1E1E2E" BorderBrush="#00B894" BorderThickness="1.5" CornerRadius="8" Padding="14" Margin="0,0,0,14">
|
||||
<Border.Style>
|
||||
<Style TargetType="Border">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding SelectedItem.IsFossilSingleExe, ElementName=lstGames}" Value="True">
|
||||
<Setter Property="Visibility" Value="Visible"/>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding SelectedItem.IsBoxedExe, ElementName=lstGames}" Value="True">
|
||||
<Setter Property="Visibility" Value="Visible"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Border.Style>
|
||||
<!-- Enigma Virtual Box (EVB) 梱包管理セクション(IsEvbPacked時のみ表示) -->
|
||||
<Border Background="#1E1E2E" BorderBrush="#A29BFE" BorderThickness="1.5" CornerRadius="8" Padding="14" Margin="0,0,0,14"
|
||||
Visibility="{Binding SelectedItem.EvbBadgeVisibility, ElementName=lstGames}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,6">
|
||||
<TextBlock Text="🧊 単体exe梱包ゲーム管理" FontSize="13" FontWeight="Bold" Foreground="#55EFC4"/>
|
||||
<TextBlock Text="🧩 Enigma Virtual Box (EVB) 管理" FontSize="13" FontWeight="Bold" Foreground="#A29BFE"/>
|
||||
</StackPanel>
|
||||
<TextBlock Text="FOSSIL / boxed 形態のツクールMZゲームです。改造ONで _extracted へ展開し、JSへ可逆的に注入します(.glbak で復元可能)。"
|
||||
<TextBlock Text="{Binding SelectedItem.EvbDetailStatusText, ElementName=lstGames}"
|
||||
FontSize="11" Foreground="{StaticResource TextSecondary}" TextWrapping="Wrap" Margin="0,0,0,10"/>
|
||||
<TextBlock Text="展開は「組み込みZIP展開 → 外部アンパッカー委譲(Tools\ の 7zr.exe。未配置なら自動取得)」の順で試行します。展開できない場合は起動のみ対応になります。"
|
||||
FontSize="10" Foreground="#74B9FF" TextWrapping="Wrap" Margin="0,0,0,10"/>
|
||||
<!-- 一目で分かる操作ガイド(手順を明示) -->
|
||||
<Border Background="#2A2450" BorderBrush="#6C5CE7" BorderThickness="1" CornerRadius="6" Padding="10,8" Margin="0,0,0,10">
|
||||
<StackPanel>
|
||||
<TextBlock Text="このゲームは EVB でパックされています" FontSize="11" FontWeight="Bold" Foreground="#C7BFFF" TextWrapping="Wrap"/>
|
||||
<TextBlock Text="① 下の「📦 EVBを解凍」を押すと、同梱の evbunpack が自動で実行されます。" FontSize="10" Foreground="#E0E0E6" TextWrapping="Wrap" Margin="0,4,0,0"/>
|
||||
<TextBlock Text="② 解凍後は本来のエンジン(例: ツクールMZ)が自動判定され、改造が使えるようになります。" FontSize="10" Foreground="#E0E0E6" TextWrapping="Wrap" Margin="0,2,0,0"/>
|
||||
<TextBlock Text="③ 元のexeは .glbak としてバックアップされ、「↩ 解凍を元に戻す」で復元できます。" FontSize="10" Foreground="#E0E0E6" TextWrapping="Wrap" Margin="0,2,0,0"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Grid Margin="0,0,0,4">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="8"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button x:Name="btnExtractStandalone" Grid.Column="0" Style="{StaticResource ModernButton}"
|
||||
Content="📦 埋め込みを展開" Click="btnExtractStandalone_Click"/>
|
||||
<Button x:Name="btnRestoreStandalone" Grid.Column="2" Style="{StaticResource ModernButton}"
|
||||
Content="↩ 改造を元に戻す" Click="btnRestoreStandalone_Click"/>
|
||||
<Button x:Name="btnEvbUnpack" Grid.Column="0" Style="{StaticResource ModernButton}"
|
||||
Content="📦 EVBを解凍" Click="btnEvbUnpack_Click"/>
|
||||
<Button x:Name="btnEvbRestore" Grid.Column="2" Style="{StaticResource ModernButton}"
|
||||
Content="↩ 解凍を元に戻す" Click="btnEvbRestore_Click"/>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
@@ -1384,7 +1399,8 @@
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</ScrollViewer>
|
||||
</DockPanel>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
||||
|
||||
Reference in new issue
Block a user