diff --git a/resource/global/txwy/resource/tasks.json b/resource/global/txwy/resource/tasks.json
index 6524f32e22..0653e67638 100644
--- a/resource/global/txwy/resource/tasks.json
+++ b/resource/global/txwy/resource/tasks.json
@@ -2087,6 +2087,112 @@
["深埋迷境", "_SKIP_"]
]
},
+ "Reclamation2Begin": {
+ "text": ["開", "始"]
+ },
+ "Reclamation2BeginContinue": {
+ "text": ["繼", "續"]
+ },
+ "Reclamation2BeginStage": {
+ "text": ["眾人", "匯聚", "後舍"]
+ },
+ "Reclamation2Birdland": {
+ "text": ["聚羽", "之地", "捕獵區"]
+ },
+ "Reclamation2ClickDrop": {
+ "text": ["行動", "結束"]
+ },
+ "Reclamation2CopiousCoppice": {
+ "text": ["木", "林", "資源區"],
+ "ocrReplace": [[".*源區", "資源區"]]
+ },
+ "Reclamation2DeleteArchiveEnterConfirm": {
+ "text": ["刪除"]
+ },
+ "Reclamation2DeleteArchiveLastConfirm": {
+ "text": ["確認", "刪除"]
+ },
+ "Reclamation2ExAssemblyStationOcr": {
+ "text": ["組裝台"]
+ },
+ "Reclamation2ExBegin": {
+ "text": ["繼", "續", "演", "算"]
+ },
+ "Reclamation2ExClickProduct": {
+ "text": ["螢光棒"]
+ },
+ "Reclamation2ExDeleteArchiveConfirm": {
+ "text": ["確認", "刪除"]
+ },
+ "Reclamation2ExDeleteArchiveEnter": {
+ "text": ["刪除"]
+ },
+ "Reclamation2ExManufactureConfirm": {
+ "text": ["開始組裝", "組裝"]
+ },
+ "Reclamation2ExManufactureConfirmClickToContinue": {
+ "text": ["點擊", "空白", "繼續"]
+ },
+ "Reclamation2ExReadArchiveConfirm": {
+ "text": ["確認"]
+ },
+ "Reclamation2ExReadArchiveEnter": {
+ "text": ["讀取"]
+ },
+ "Reclamation2ExReadArchiveSelectDay": {
+ "text": ["生息", "日"]
+ },
+ "Reclamation2ExReadArchiveSelectDayConfirm": {
+ "text": ["點擊", "確認"]
+ },
+ "Reclamation2ExSkipDays2ExSkipTime": {
+ "text": ["消磨", "時間"]
+ },
+ "Reclamation2ExSkipDays2ExSkipTimeConfig": {
+ "text": ["確認"]
+ },
+ "Reclamation2ExSkipDaysAward2": {
+ "text": ["點擊", "任意處", "繼續"]
+ },
+ "Reclamation2ExSkipDaysBeginNewDay": {
+ "text": ["開", "啟", "今", "日"]
+ },
+ "Reclamation2ProsperityMaxDeleteArchiveEnterConfirm": {
+ "text": ["刪除"]
+ },
+ "Reclamation2ProsperityMaxDeleteArchiveLastConfirm1": {
+ "text": ["確認", "刪除"]
+ },
+ "Reclamation2ProsperityMaxDeleteArchiveLastConfirm2": {
+ "text": ["確認", "刪除"]
+ },
+ "Reclamation2ProsperityMaxSkipDayClickContinue": {
+ "text": ["點擊", "任意處", "繼續"]
+ },
+ "Reclamation2SkipDayClickContinue": {
+ "text": ["點擊", "任意處", "繼續"]
+ },
+ "Reclamation2SkipTimeSkip": {
+ "text": ["消磨", "時間"]
+ },
+ "Reclamation2SkipTimeSkipConfirm": {
+ "text": ["確認"]
+ },
+ "Reclamation2StageEnter": {
+ "text": ["開始", "行動"]
+ },
+ "Reclamation2StageFight": {
+ "text": ["開始", "行動"]
+ },
+ "Reclamation2StageFightConfirm": {
+ "text": ["確認"]
+ },
+ "Reclamation2StageLeaveConfirm": {
+ "text": ["確認", "離開"]
+ },
+ "Reclamation2StageSquadClearConfirm": {
+ "text": ["確認"]
+ },
"Fire@Reclamation@ClickAnyZoneOcr": {
"text": ["區", "Zone"]
},
@@ -2148,36 +2254,36 @@
"text": ["開始行動", "決斷"]
},
"Tales@RA@CancelEnterBuildMode": {
- "text": ["进入建造"]
+ "text": ["進入建造"]
},
"Tales@RA@ClickGatheringOfFeathers": {
"text": ["聚羽之地"]
},
"Tales@RA@ClickShrubberyGalore": {
- "text": ["丰饶灌木林"]
+ "text": ["豐饒灌木林", "木林"]
},
"Tales@RA@ConfirmSquad": {
- "text": ["开始行动"]
+ "text": ["開始行動", "開始"]
},
"Tales@RA@ConfirmToLoadSave": {
- "text": ["点击确认"]
+ "text": ["點擊確認", "確認"]
},
"Tales@RA@EnterNode": {
- "text": ["开始行动"]
+ "text": ["開始行動", "開始"]
},
"Tales@RA@FinishCalc": {
- "text": ["点击任意处继续"]
+ "text": ["點擊任意處繼續", "任意"]
},
"Tales@RA@PIS-Resume": {
- "text": ["继续演算"]
+ "text": ["繼續演算", "演算"]
},
"Tales@RA@PNS-ClickBaseCamp": {
- "text": ["众人会聚之地"]
+ "text": ["眾人會聚之地", "眾人"]
},
"Tales@RA@PNS-Commence": {
"text": ["演算", "開始"]
},
"Tales@RA@ResourceGained": {
- "text": ["点击空白处继续"]
+ "text": ["點擊空白處繼續", "空白"]
}
}
diff --git a/resource/global/txwy/resource/template/Tales@RA@Navigation-FromTodoList.png b/resource/global/txwy/resource/template/Tales@RA@Navigation-FromTodoList.png
new file mode 100644
index 0000000000..33f3c4170f
Binary files /dev/null and b/resource/global/txwy/resource/template/Tales@RA@Navigation-FromTodoList.png differ
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 38338d5aa6..1bfd1543e0 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -460,8 +460,8 @@ V9.1.28 前的模擬器版本僅支持 720P 900P 1080P 分辨率，V9.1.29 後
生息演算主題
沙中之火
沙洲遺聞
- 無存檔，通過進出關卡刷生息點數
- 有存檔，通過組裝支援道具刷生息點數
+ 無存檔，透過進出關卡刷生息點數
+ 有存檔，透過組裝支援道具刷生息點數
增加方式
連點
長按
@@ -926,18 +926,18 @@ V9.1.28 前的模擬器版本僅支持 720P 900P 1080P 分辨率，V9.1.29 後
-目前生息演算的支援仍處於早期階段，使用時請注意以下幾點：
+目前生息演算的支援仍處於中期階段，使用時請注意以下幾點：
- 通過開局刷點數：(小心已有存檔被刪除)
- 0. 點數刷滿後會輸出“任務完成”，自動停止任務
- 1. 理論上可以在生息演算開局刷點數流程的任意位置開始任務，不論是否有存檔
- 2. 理論上編隊內可以有幹員，但沒測試，不推薦
- 3. 導航還沒寫，不能從生息演算以外的位置開始任務
- 4. 如果任務過程中報錯、點數沒刷滿就任務完成，請前往GitHub提交issue
+ 透過開局刷點數：(小心已有存檔被刪除)
+ 1. 點數刷滿後會輸出 “任務完成”，自動停止任務
+ 2. 不要在生息演算的編隊中有幹員的情況下使用
+ 3. 手動確認存檔情況並刪除，以免 MAA 刪除你的珍貴存檔
+ 4. 導航還沒寫，不能從生息演算以外的位置開始任務
+ 5. 如果任務過程中報錯、點數沒刷滿就任務完成，請前往 GitHub 提交 issue
- 有存檔通過製造刷點數（高級設定）：
+ 有存檔透過製造刷點數（高級設定）：
1. 要求是結算後的第一天，且後續三天沒有敵襲進入駐紮地
- 2. 必须在進入大地圖後的介面開始（能看到駐紮地的介面）
+ 2. 必須在進入大地圖後的界面開始（能看到駐紮地的介面）
3. 如果能製造的數量剛好是 99 的倍數會卡住，在存檔前可以先用掉一點，這個之後再修
牛牛，我太想進步了！你看，又急
diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index aac353ae58..2d8ec288ea 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -645,13 +645,9 @@ namespace MaaWpfGui.ViewModels.UI
"Mall",
"Mission",
"AutoRoguelike",
+ "Reclamation"
];
- if (SettingsViewModel.GameSettings.ClientType is not "txwy")
- {
- taskList.Add("Reclamation");
- }
-
var tempOrderList = new List(new DragItemViewModel[taskList.Count]);
var nonOrderList = new List();
for (int i = 0; i != taskList.Count; ++i)