chore: 修改版本不一致描述,提前 return 位置

This commit is contained in:
uye
2024-10-29 18:03:40 +08:00
parent e2e73a8937
commit 12da3b36d8
6 changed files with 16 additions and 15 deletions

View File

@@ -519,7 +519,7 @@ As of now (V9.1.28), the emulator version only supports 720P, 900P, and 1080P re
<system:String x:Key="Pormpt2">It's Sunday: don't forget about Annihilation</system:String>
<!-- !FightSettings -->
<!-- Logs -->
<system:String x:Key="VersionMismatch">UI and Core versions mismatch: {0} and {1}, which may result in unpredictable behavior. Please refrain from manually replacing files.</system:String>
<system:String x:Key="VersionMismatch">UI and Core versions mismatch: {0} and {1}, which may cause unpredictable behavior. Please do not manually replace files or occupy files during updates.\n\nPlease download the full package and overwrite the contents of the current folder.</system:String>
<system:String x:Key="ConnectingToEmulator">Connecting to emulator……</system:String>
<system:String x:Key="UnselectedTask">Unselected task</system:String>
<system:String x:Key="Running">Running……</system:String>

View File

@@ -522,7 +522,7 @@ C:\\leidian\\LDPlayer9
<system:String x:Key="Pormpt2">日曜です。殲滅作戦は忘れてないですか〜</system:String>
<!-- !戦闘設定 -->
<!-- Logs -->
<system:String x:Key="VersionMismatch">UI と Core のバージョンが一致しません: {0} および {1}、予測不可能な動作の原因となる可能性があります。ファイルを手動で置換しないでください。</system:String>
<system:String x:Key="VersionMismatch">UI と Core のバージョンが一致しません: {0} {1}、予測不可能な動作を引き起こす可能性があります。ファイルを手動で置き換えたり、更新中にファイルを占有しないでください。\n\n完全なパッケージをダウンロードして、現在のフォルダーの内容を上書きしてください。</system:String>
<system:String x:Key="ConnectingToEmulator">エミュレータ接続中……</system:String>
<system:String x:Key="UnselectedTask">タスクが選択されていません</system:String>
<system:String x:Key="Running">動作中……</system:String>

View File

@@ -522,7 +522,7 @@ C:\\leidian\\LDPlayer9
<system:String x:Key="Pormpt2">일요일입니다. 섬멸 작전을 잊지 마세요~</system:String>
<!-- !작전 설정 -->
<!-- 로그 -->
<system:String x:Key="VersionMismatch">UI Core 버전 불일치: {0} 및 {1}로 인해 문제가 발생할 수 있습니다. 파일을 수동으로 교체하지 마세요</system:String>
<system:String x:Key="VersionMismatch">UI Core 버전이 일치하지 않습니다: {0} 및 {1}, 예측할 수 없는 동작을 유발할 수 있습니다. 파일을 수동으로 교체하거나 업데이트 중에 파일을 점유하지 마십시오.\n\n전체 패키지를 다운로드하여 현재 폴더의 내용을 덮어쓰십시오.</system:String>
<system:String x:Key="ConnectingToEmulator">에뮬레이터에 연결 중……</system:String>
<system:String x:Key="UnselectedTask">선택된 작업이 없습니다</system:String>
<system:String x:Key="Running">실행 중……</system:String>

View File

@@ -521,7 +521,7 @@ C:\\leidian\\LDPlayer9。\n
<system:String x:Key="Pormpt2">周日了,记得打剿灭哦~</system:String>
<!-- !战斗设置 -->
<!-- 日志 -->
<system:String x:Key="VersionMismatch">UI 和 Core 版本不一致: {0} 和 {1},可能导致不可预测的行为,请勿手动替换文件。</system:String>
<system:String x:Key="VersionMismatch">UI 和 Core 版本不一致: {0} 和 {1},可能导致不可预测的行为,请勿手动替换文件或者在更新时占用文件。\n\n请下载完整包并覆盖当前文件夹下的内容。</system:String>
<system:String x:Key="ConnectingToEmulator">正在连接模拟器……</system:String>
<system:String x:Key="UnselectedTask">未选择任务</system:String>
<system:String x:Key="Running">正在运行中……</system:String>

View File

@@ -521,7 +521,7 @@ C:\\leidian\\LDPlayer9。\n
<system:String x:Key="Pormpt2">週日了,記得打剿滅喔 ~</system:String>
<!-- !戰鬥設定 -->
<!-- 日誌 -->
<system:String x:Key="VersionMismatch">UI 和 Core 版本不一致: {0} 和 {1},可能導致不可預測的行為,請勿手動替換文件。</system:String>
<system:String x:Key="VersionMismatch">UI 和 Core 版本不一致: {0} 和 {1},可能導致不可預測的行為,請勿手動替換文件或者在更新時佔用文件。\n\n請下載完整包並覆蓋當前文件夾下的內容。</system:String>
<system:String x:Key="ConnectingToEmulator">正在連接模擬器……</system:String>
<system:String x:Key="UnselectedTask">未選擇任務</system:String>
<system:String x:Key="Running">正在運行中……</system:String>

View File

@@ -1152,16 +1152,6 @@ namespace MaaWpfGui.ViewModels.UI
return;
}
MainTasksCompletedCount = 0;
_runningState.SetIdle(false);
// 虽然更改时已经保存过了,不过保险起见在点击开始之后再次保存任务和基建列表
TaskItemSelectionChanged();
Instances.SettingsViewModel.InfrastOrderSelectionChanged();
InfrastTaskRunning = true;
ClearLog();
var buildDateTimeLong = SettingsViewModel.BuildDateTimeCurrentCultureString;
@@ -1178,6 +1168,17 @@ namespace MaaWpfGui.ViewModels.UI
return;
}
MainTasksCompletedCount = 0;
// 所有提前 return 都要放在 _runningState.SetIdle(false) 之前,否则会导致无法再次点击开始
_runningState.SetIdle(false);
// 虽然更改时已经保存过了,不过保险起见在点击开始之后再次保存任务和基建列表
TaskItemSelectionChanged();
Instances.SettingsViewModel.InfrastOrderSelectionChanged();
InfrastTaskRunning = true;
await Task.Run(() => Instances.SettingsViewModel.RunScript("StartsWithScript"));
AddLog(LocalizationHelper.GetString("ConnectingToEmulator"));