diff --git a/installer/AppShell.xaml b/installer/AppShell.xaml index cecf050f..224bae85 100755 --- a/installer/AppShell.xaml +++ b/installer/AppShell.xaml @@ -16,9 +16,9 @@ - + ContentTemplate="{DataTemplate local:LoginPage}"/>--> diff --git a/installer/Page/HelpPage.xaml b/installer/Page/HelpPage.xaml index b4b16294..cee5bcc0 100644 --- a/installer/Page/HelpPage.xaml +++ b/installer/Page/HelpPage.xaml @@ -5,103 +5,103 @@ x:Class="installer.Page.HelpPage" Title="Help"> - + + + + + + \ No newline at end of file diff --git a/installer/ViewModel/HelpViewModel.cs b/installer/ViewModel/HelpViewModel.cs index fc54d582..fbab8808 100644 --- a/installer/ViewModel/HelpViewModel.cs +++ b/installer/ViewModel/HelpViewModel.cs @@ -24,7 +24,7 @@ public HelpViewModel() new HelpMessage { Title = "选择安装路径", - Content = "> 下载功能需要选择空文件夹路径,否则该路径下所有文件将丢失。" + Content = "> 下载功能需要选择空文件夹路径。" }, new HelpMessage { @@ -35,11 +35,6 @@ public HelpViewModel() { Title = "更新", Content = "> 更新前请先进行检查更新操作。" - }, - new HelpMessage - { - Title = "按钮全部不可用", - Content = "> 如果选择的文件夹之前曾经下载过THUAI7,那么请在“文档-THUAI7-config.json”中添加项“\"Installed\": true”" } }); @@ -85,7 +80,7 @@ public HelpMessage(string? t = null, string? c = null) } public string? Title { get; set; } public string? Content { get; set; } - public string TitleSize { get; } = "20"; + public string TitleSize { get; } = "18"; public string ContentSize { get; } = "16"; } } diff --git a/installer/ViewModel/InstallViewModel.cs b/installer/ViewModel/InstallViewModel.cs index 1fe7b09f..bb5564f7 100644 --- a/installer/ViewModel/InstallViewModel.cs +++ b/installer/ViewModel/InstallViewModel.cs @@ -236,6 +236,7 @@ private void BrowseBtnClicked() else { DownloadEnabled = true; + CheckEnabled = true; } BrowseEnabled = true; }); diff --git a/installer/ViewModel/LaunchViewModel.cs b/installer/ViewModel/LaunchViewModel.cs index e6aa53a4..6fa70aea 100644 --- a/installer/ViewModel/LaunchViewModel.cs +++ b/installer/ViewModel/LaunchViewModel.cs @@ -72,7 +72,6 @@ public string? Mode set { mode = value; - OnPropertyChanged(); if (mode == "Playback") { playbackFileChanged = true; @@ -96,6 +95,7 @@ public string? Mode PlaybackVisible = false; DebugVisible = false; } + OnPropertyChanged(); } } @@ -483,7 +483,7 @@ private void Start() var py = Process.Start(new ProcessStartInfo() { FileName = "cmd.exe", - Arguments = "/c python" + Arguments = "/c python " + Path.Combine(Downloader.Data.Config.InstallPath, "CAPI", "python", "PyAPI", "main.py") + $" -I {IP} -P {Port} -t {teamID} -p {playerID} -o" });