diff --git a/resource/global/txwy/resource/tasks.json b/resource/global/txwy/resource/tasks.json index 1a5ff5e686..94aa9a871a 100644 --- a/resource/global/txwy/resource/tasks.json +++ b/resource/global/txwy/resource/tasks.json @@ -127,6 +127,22 @@ "復刻" ] }, + "CF-Open": { + "text": [ + "落葉", + "逐火", + "活動", + "開放" + ] + }, + "CFChapterToCF": { + "text": [ + "蒼暮", + "山地", + "工池", + "工地" + ] + }, "WB-Open": { "text": [ "登臨意", @@ -4670,5 +4686,130 @@ "_exit" ] ] + }, + "Reclamation@ClickAnyZoneOcr": { + "text": [ + "區", + "Zone" + ] + }, + "Reclamation@ConfirmStart": { + "text": [ + "演算", + "開始" + ] + }, + "Reclamation@DoManufacture": { + "text": [ + "開", + "始" + ] + }, + "Reclamation@EmptyInitUnits": { + "text": [ + "請選擇", + "参加", + "演算" + ] + }, + "Reclamation@EnterSmeltGoldPage": { + "text": [ + "粗製", + "赤金" + ] + }, + "Reclamation@ExitLevelConfirm": { + "text": [ + "確認", + "離開" + ] + }, + "Reclamation@GiveupAlgorithm": { + "text": [ + "放", + "棄" + ] + }, + "Reclamation@GiveupClickEmergencyExit": { + "text": [ + "緊急", + "撤退" + ] + }, + "Reclamation@GiveupCrossdomainPageFlag": { + "text": [ + "確認", + "帶走", + "緊急", + "撤退" + ] + }, + "Reclamation@GiveupTakeNothing": { + "text": [ + "確認", + "撤退" + ] + }, + "Reclamation@LabClickAssembleable": { + "text": [ + "可", + "組", + "裝" + ] + }, + "Reclamation@LabClickDetailView": { + "text": [ + "詳", + "情", + "視", + "圖" + ] + }, + "Reclamation@LevelComplete": { + "text": [ + "結束", + "MISSION", + "RESULTS" + ] + }, + "Reclamation@Liaison": { + "text": [ + "聯絡員" + ] + }, + "Reclamation@ManufactureIncrease": { + "text": [ + "開", + "始" + ] + }, + "Reclamation@ManufactureSufficientMaterial": { + "text": [ + "開", + "始" + ] + }, + "Reclamation@PrepareAction": { + "text": [ + "行動準備" + ] + }, + "Reclamation@SkipAnnounce": { + "text": [ + "跳過", + "SKIP" + ] + }, + "Reclamation@SkipDailyReport": { + "text": [ + "今日", + "日報" + ] + }, + "Reclamation@StartActionEnter": { + "text": [ + "開始行動", + "決斷" + ] } } \ No newline at end of file diff --git a/resource/global/txwy/resource/template/Reclamation@ClickChooseInitUnits.png b/resource/global/txwy/resource/template/Reclamation@ClickChooseInitUnits.png new file mode 100644 index 0000000000..9e2b405336 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@ClickChooseInitUnits.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@ConfirmStart.png b/resource/global/txwy/resource/template/Reclamation@ConfirmStart.png new file mode 100644 index 0000000000..88ec7daa0f Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@ConfirmStart.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@Emergency.png b/resource/global/txwy/resource/template/Reclamation@Emergency.png new file mode 100644 index 0000000000..9a278d1bf3 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@Emergency.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@ExitLevelConfirm.png b/resource/global/txwy/resource/template/Reclamation@ExitLevelConfirm.png new file mode 100644 index 0000000000..8c568db059 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@ExitLevelConfirm.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@ExitLevelWithEnermyConfirm.png b/resource/global/txwy/resource/template/Reclamation@ExitLevelWithEnermyConfirm.png new file mode 100644 index 0000000000..1a324f40e6 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@ExitLevelWithEnermyConfirm.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@FormationConfirm.png b/resource/global/txwy/resource/template/Reclamation@FormationConfirm.png new file mode 100644 index 0000000000..baba0a38d9 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@FormationConfirm.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@GiveupSkipConfirm.png b/resource/global/txwy/resource/template/Reclamation@GiveupSkipConfirm.png new file mode 100644 index 0000000000..6adac9c8c9 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@GiveupSkipConfirm.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@InitSupplyAll.png b/resource/global/txwy/resource/template/Reclamation@InitSupplyAll.png new file mode 100644 index 0000000000..15fde3dea5 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@InitSupplyAll.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@NextDay.png b/resource/global/txwy/resource/template/Reclamation@NextDay.png new file mode 100644 index 0000000000..898d4631de Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@NextDay.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@StartActionConfirm.png b/resource/global/txwy/resource/template/Reclamation@StartActionConfirm.png new file mode 100644 index 0000000000..0402ed2791 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@StartActionConfirm.png differ diff --git a/resource/global/txwy/resource/template/Reclamation@StartAlgorithm.png b/resource/global/txwy/resource/template/Reclamation@StartAlgorithm.png new file mode 100644 index 0000000000..8803c82db1 Binary files /dev/null and b/resource/global/txwy/resource/template/Reclamation@StartAlgorithm.png differ diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 7e6007d476..d527f7075c 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -367,9 +367,7 @@ namespace MaaWpfGui.ViewModels.UI // "ReclamationAlgorithm", }; var clientType = Instances.SettingsViewModel.ClientType; - // condition: clientType == "txwy" && DateTime.Now < new DateTime(2023, 01, 12) - // wait for someone to adapt this for txwy. - if (false) + if (clientType == "txwy" && DateTime.Now < new DateTime(2024, 01, 06)) { taskList.Add("ReclamationAlgorithm"); }