diff --git a/.claude/skills/maa-issue-log-analysis/KNOWLEDGE.md b/.claude/skills/maa-issue-log-analysis/KNOWLEDGE.md
index 28075ebb59..a306d54534 100644
--- a/.claude/skills/maa-issue-log-analysis/KNOWLEDGE.md
+++ b/.claude/skills/maa-issue-log-analysis/KNOWLEDGE.md
@@ -37,3 +37,8 @@
- 不要把维护者评论、机器人评论、或单张截图当成最终结论；必须回到日志和代码确认状态是怎么变化的。
- 对状态型 UI，先回答“日志里的行为是否符合设计”，再回答“这个设计是否符合用户预期”。
- 不要只看最终现象；要结合配置、`gui.log`、`asst.log`、资源任务和当前代码一起判断。
+
+## MAA multi-opening and multi-account management
+
+- MAA 在设计上仅针对单账号使用。若你需要同时管理多个游戏账号（多开），官方并未提供内置支持，但可以通过复制多份 MAA 程序到不同文件夹的方式实现变通
+- 不考虑多开相关实现
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5481af08..4fad10a1d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## v6.10.0-beta.2
+
+### 新增 | New
+
+* 生息演算支持不同分辨率 @ABA2396
+
+### 改进 | Improved
+
+* 减少中间状态 @ABA2396
+
+### 其他 | Other
+
+* 欠费下小猫 @ABA2396
+* 快速下小猫 @ABA2396
+* 加快下一轮循环 @ABA2396
+* 提升对话速度 @ABA2396
+* 添加描述 @ABA2396
+
## v6.10.0-beta.1
### 新增 | New
diff --git a/resource/tasks/RA/Reclamation3.json b/resource/tasks/RA/Reclamation3.json
index 1893533664..b323a8cd68 100644
--- a/resource/tasks/RA/Reclamation3.json
+++ b/resource/tasks/RA/Reclamation3.json
@@ -46,31 +46,24 @@
"text": ["开始建设"],
"roi": [984, 607, 138, 47],
"postDelay": 10000,
- "next": ["RelaunchAnchor@RA@PNS-WaitSkip"]
+ "next": ["#self", "RelaunchAnchor@RA@PNS-WaitSkip"]
},
"RelaunchAnchor@RA@PNS-WaitSkip": {
"doc": "步骤 6 前等待剧情跳过",
"algorithm": "JustReturn",
"postDelay": 1000,
- "next": [
- "RelaunchAnchor@RA@PNS-SkipPlot",
- "#self"
- ]
+ "next": ["RelaunchAnchor@RA@PNS-SkipPlot", "#self"]
},
"RelaunchAnchor@RA@PNS-SkipPlot": {
- "doc": "步骤 6：OCR 识别 <跳过> 并点击",
+ "doc": "步骤 7：OCR 识别 <跳过> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["跳过"],
"roi": [1140, 30, 67, 43],
- "next": [
- "RelaunchAnchor@RA@PNS-SkipPlotConfirm",
- "#self",
- "RelaunchAnchor@RA@PNS-WaitGatheringBasePrompt"
- ]
+ "next": ["RelaunchAnchor@RA@PNS-SkipPlotConfirm", "#self", "RelaunchAnchor@RA@PNS-WaitGatheringBasePrompt"]
},
"RelaunchAnchor@RA@PNS-SkipPlotConfirm": {
- "doc": "步骤 7：OCR 识别 <是否跳过剧情>，点击偏移位置占位",
+ "doc": "步骤 8：OCR 识别 <是否跳过剧情>，点击偏移位置占位",
"algorithm": "OcrDetect",
"action": "ClickRect",
"text": ["是否跳过剧情"],
@@ -79,74 +72,81 @@
"next": ["#self", "RelaunchAnchor@RA@PNS-WaitGatheringBasePrompt"]
},
"RelaunchAnchor@RA@PNS-WaitGatheringBasePrompt": {
- "doc": "步骤 8 前等待 <请部署罗德岛采集基站> 出现",
+ "doc": "步骤 9 前等待 <请部署罗德岛采集基站> 出现",
"algorithm": "JustReturn",
- "postDelay": 1000,
"next": ["RelaunchAnchor@RA@PNS-DeployGatheringBasePrompt", "#self"]
},
"RelaunchAnchor@RA@PNS-DeployGatheringBasePrompt": {
- "doc": "步骤 8：OCR 等待 <请部署罗德岛采集基站>",
+ "doc": "步骤 9：OCR 等待 <请部署罗德岛采集基站>",
"algorithm": "OcrDetect",
"action": "DoNothing",
"text": ["请部署", "罗德岛", "采集基站"],
"roi": [520, 54, 247, 38],
+ "next": ["RelaunchAnchor@RA@PNS-AlignMap"]
+ },
+ "RelaunchAnchor@RA@PNS-AlignMap": {
+ "doc": "步骤 10：JustReturn 的 Swipe，对齐地图",
+ "algorithm": "JustReturn",
+ "action": "Swipe",
+ "specificRect": [120, 580, 1, 1],
+ "rectMove": [1920, 0, 1, 1],
+ "specialParams": [500, 0, 3, 0],
"next": ["RelaunchAnchor@RA@PNS-DeployGatheringBaseSwipe"]
},
"RelaunchAnchor@RA@PNS-DeployGatheringBaseSwipe": {
- "doc": "步骤 9：JustReturn 的 Swipe，占位部署采集基站",
+ "doc": "步骤 11：JustReturn 的 Swipe，占位部署采集基站",
"algorithm": "JustReturn",
"action": "Swipe",
"specificRect": [530, 630, 10, 10],
- "rectMove": [680, 465, 1, 1],
+ "rectMove": [960, 290, 1, 1],
"specialParams": [500, 0, 3, 0],
"postDelay": 8000,
"next": ["RelaunchAnchor@RA@PNS-DoubleSpeed"]
},
"RelaunchAnchor@RA@PNS-DoubleSpeed": {
- "doc": "步骤9.1，开启二倍速",
+ "doc": "步骤 12：开启二倍速",
"algorithm": "JustReturn",
"action": "ClickRect",
"specificRect": [1090, 40, 20, 20],
"next": ["RelaunchAnchor@RA@PNS-DeployGatheringBaseWait"]
},
"RelaunchAnchor@RA@PNS-DeployGatheringBaseWait": {
- "doc": "步骤 9：部署采集基站后的占位等待 x 秒",
+ "doc": "步骤 13：部署采集基站后的占位等待 x 秒",
"algorithm": "JustReturn",
- "postDelay": 8000,
+ "postDelay": 4000,
+ "next": ["RelaunchAnchor@RA@PNS-AlignMap2"]
+ },
+ "RelaunchAnchor@RA@PNS-AlignMap2": {
+ "doc": "步骤 14：JustReturn 的 Swipe，对齐地图",
+ "baseTask": "RelaunchAnchor@RA@PNS-AlignMap",
"next": ["RelaunchAnchor@RA@PNS-DeployOperatorSwipe"]
},
"RelaunchAnchor@RA@PNS-DeployOperatorSwipe": {
- "doc": "步骤 9：JustReturn 的 Swipe，占位部署干员",
+ "doc": "步骤 15：JustReturn 的 Swipe，占位部署干员",
"algorithm": "JustReturn",
"action": "Swipe",
"specificRect": [1120, 630, 10, 10],
- "rectMove": [450, 460, 1, 1],
+ "rectMove": [745, 300, 1, 1],
"specialParams": [500, 0, 3, 0],
"next": ["RelaunchAnchor@RA@PNS-DeployOperatorDirection"]
},
"RelaunchAnchor@RA@PNS-DeployOperatorDirection": {
- "doc": "步骤 9：JustReturn 的 Swipe，占位确认干员朝向",
+ "doc": "步骤 16：JustReturn 的 Swipe，占位确认干员朝向",
"algorithm": "JustReturn",
"action": "Swipe",
- "specificRect": [450, 460, 1, 1],
- "rectMove": [1450, 460, 10, 10],
+ "specificRect": [745, 300, 1, 1],
+ "rectMove": [1745, 300, 10, 10],
"specialParams": [300, 0, 3, 0],
"next": ["RelaunchAnchor@RA@PNS-DeployOperatorWait"]
},
"RelaunchAnchor@RA@PNS-DeployOperatorWait": {
- "doc": "步骤 9：部署干员后的占位等待 x 秒",
+ "doc": "步骤 17：部署干员后的占位等待 x 秒",
"algorithm": "JustReturn",
"postDelay": 10000,
- "next": ["RelaunchAnchor@RA@PNS-WaitMissionIcon1"]
- },
- "RelaunchAnchor@RA@PNS-WaitMissionIcon1": {
- "doc": "步骤 10 前等待任务图标出现",
- "algorithm": "JustReturn",
- "postDelay": 1000,
- "next": ["RelaunchAnchor@RA@PNS-MissionIcon1", "#self"]
+ "next": ["RelaunchAnchor@RA@PNS-MissionIcon1"]
},
"RelaunchAnchor@RA@PNS-MissionIcon1": {
- "doc": "步骤 10：模板匹配任务图标并点击",
+ "doc": "步骤 18：模板匹配任务图标并点击",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@MissionIcon.png",
@@ -154,7 +154,7 @@
"next": ["RelaunchAnchor@RA@PNS-DeliverWood5", "#self"]
},
"RelaunchAnchor@RA@PNS-DeliverWood5": {
- "doc": "步骤 11：OCR 识别 <交付5份木材> 并点击",
+ "doc": "步骤 19：OCR 识别 <交付5份木材> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["木材"],
@@ -162,7 +162,7 @@
"next": ["RelaunchAnchor@RA@PNS-ConfirmWoodMission", "#self"]
},
"RelaunchAnchor@RA@PNS-ConfirmWoodMission": {
- "doc": "步骤 12：OCR 识别 <确认> 并点击",
+ "doc": "步骤 20：OCR 识别 <确认> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["确认"],
@@ -171,7 +171,7 @@
"next": ["RelaunchAnchor@RA@PNS-DeliverWood", "#self"]
},
"RelaunchAnchor@RA@PNS-DeliverWood": {
- "doc": "步骤 13：OCR 识别 <交付木材> 并点击",
+ "doc": "步骤 21：OCR 识别 <交付木材> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["交付木材"],
@@ -179,26 +179,20 @@
"next": ["RelaunchAnchor@RA@PNS-WaitWoodDialogue"]
},
"RelaunchAnchor@RA@PNS-WaitWoodDialogue": {
- "doc": "步骤 14 前等待说话标识或制造标识出现",
+ "doc": "步骤 22 前等待说话标识或制造标识出现",
"algorithm": "JustReturn",
- "postDelay": 1000,
- "next": [
- "RelaunchAnchor@RA@PNS-WoodDialogue",
- "RelaunchAnchor@RA@PNS-ManufactureIcon",
- "#self"
- ]
+ "next": ["RelaunchAnchor@RA@PNS-WoodDialogue", "RelaunchAnchor@RA@PNS-ManufactureIcon", "#self"]
},
"RelaunchAnchor@RA@PNS-WoodDialogue": {
- "doc": "步骤 14：模板匹配说话标识，持续点击到没有这个标识，间隔 1 秒",
+ "doc": "步骤 22：模板匹配说话标识，持续点击到没有这个标识",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@DialogueMarker.png",
"roi": [363, 456, 144, 139],
- "postDelay": 1000,
"next": ["#self", "RelaunchAnchor@RA@PNS-WaitWoodDialogue"]
},
"RelaunchAnchor@RA@PNS-ManufactureIcon": {
- "doc": "步骤 15：模板匹配制造标识并点击",
+ "doc": "步骤 23：模板匹配制造标识并点击",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@ManufactureIcon.png",
@@ -206,7 +200,7 @@
"next": ["RelaunchAnchor@RA@PNS-CommunicationStation", "#self"]
},
"RelaunchAnchor@RA@PNS-CommunicationStation": {
- "doc": "步骤 16：OCR 识别 <通讯基站> 并点击",
+ "doc": "步骤 24：OCR 识别 <通讯基站> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["通讯基站"],
@@ -214,7 +208,7 @@
"next": ["RelaunchAnchor@RA@PNS-StartBuildingStation", "#self"]
},
"RelaunchAnchor@RA@PNS-StartBuildingStation": {
- "doc": "步骤 17：OCR 识别 <开始建造> 并点击",
+ "doc": "步骤 25：OCR 识别 <开始建造> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["开始建造"],
@@ -222,7 +216,7 @@
"next": ["RelaunchAnchor@RA@PNS-BlankContinue", "#self"]
},
"RelaunchAnchor@RA@PNS-BlankContinue": {
- "doc": "步骤 18：OCR 识别 <点击空白处继续> 并点击",
+ "doc": "步骤 26：OCR 识别 <点击空白处继续> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["点击空白处继续"],
@@ -230,21 +224,15 @@
"next": ["#self", "RelaunchAnchor@RA@PNS-ExitConstruction"]
},
"RelaunchAnchor@RA@PNS-ExitConstruction": {
- "doc": "步骤 18.1：OCR 识别退出 <建造> 并点击",
+ "doc": "步骤 27：OCR 识别退出 <建造> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["建造"],
"roi": [125, 70, 70, 45],
- "next": ["#self", "RelaunchAnchor@RA@PNS-WaitMissionIcon2"]
- },
- "RelaunchAnchor@RA@PNS-WaitMissionIcon2": {
- "doc": "步骤 20 前等待任务图标出现",
- "algorithm": "JustReturn",
- "postDelay": 1000,
- "next": ["RelaunchAnchor@RA@PNS-MissionIcon2", "#self"]
+ "next": ["#self", "RelaunchAnchor@RA@PNS-MissionIcon2"]
},
"RelaunchAnchor@RA@PNS-MissionIcon2": {
- "doc": "步骤 20：模板匹配任务图标并点击",
+ "doc": "步骤 28：模板匹配任务图标并点击",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@MissionIcon.png",
@@ -252,7 +240,7 @@
"next": ["RelaunchAnchor@RA@PNS-CraftOwnCommStation1", "#self"]
},
"RelaunchAnchor@RA@PNS-CraftOwnCommStation1": {
- "doc": "步骤 21：OCR 识别 <制作并拥有1个通讯基站> 并点击",
+ "doc": "步骤 29：OCR 识别 <制作并拥有1个通讯基站> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["制作并拥有", "通讯基站"],
@@ -260,7 +248,7 @@
"next": ["RelaunchAnchor@RA@PNS-ConfirmCommMission", "#self"]
},
"RelaunchAnchor@RA@PNS-ConfirmCommMission": {
- "doc": "步骤 22：OCR 识别 <确认> 并点击",
+ "doc": "步骤 30：OCR 识别 <确认> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["确认"],
@@ -268,7 +256,7 @@
"next": ["RelaunchAnchor@RA@PNS-CraftOwnCommStation", "#self"]
},
"RelaunchAnchor@RA@PNS-CraftOwnCommStation": {
- "doc": "步骤 23：OCR 识别 <制作并拥有通讯基站> 并点击",
+ "doc": "步骤 31：OCR 识别 <制作并拥有通讯基站> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["制作并拥有", "通讯基站"],
@@ -276,49 +264,45 @@
"next": ["RelaunchAnchor@RA@PNS-WaitFirstCommDialogue"]
},
"RelaunchAnchor@RA@PNS-WaitFirstCommDialogue": {
- "doc": "步骤 24 前等待第一段说话标识出现",
+ "doc": "步骤 32 前等待第一段说话标识出现",
"algorithm": "JustReturn",
- "postDelay": 1000,
"next": ["RelaunchAnchor@RA@PNS-FirstCommDialogue", "#self"]
},
"RelaunchAnchor@RA@PNS-FirstCommDialogue": {
- "doc": "步骤 24：模板匹配说话标识，持续点击到没有这个标识，间隔 1 秒",
+ "doc": "步骤 33：模板匹配说话标识，持续点击到没有这个标识",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@DialogueMarker.png",
"roi": [0, 0, 0, 0],
- "postDelay": 1000,
"next": ["#self", "RelaunchAnchor@RA@PNS-WaitSecondCommDialogue"]
},
"RelaunchAnchor@RA@PNS-WaitSecondCommDialogue": {
- "doc": "步骤 25：模板匹配等待第二段说话标识出现",
+ "doc": "步骤 34：模板匹配等待第二段说话标识出现",
"algorithm": "JustReturn",
- "postDelay": 1000,
"next": ["RelaunchAnchor@RA@PNS-SecondCommDialogue", "#self"]
},
"RelaunchAnchor@RA@PNS-SecondCommDialogue": {
- "doc": "步骤 26：模板匹配说话标识，持续点击到没有这个标识，间隔 1 秒",
+ "doc": "步骤 35：模板匹配说话标识，持续点击到没有这个标识",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@DialogueMarker.png",
"roi": [0, 0, 0, 0],
- "postDelay": 1000,
"next": ["#self", "RelaunchAnchor@RA@PNS-WaitBeforeSettlement"]
},
"RelaunchAnchor@RA@PNS-WaitBeforeSettlement": {
- "doc": "步骤 27：占位等待 x 秒",
+ "doc": "步骤 36：占位等待 x 秒",
"algorithm": "JustReturn",
"postDelay": 10000,
"next": ["RelaunchAnchor@RA@PNS-WaitMissionIcon3"]
},
"RelaunchAnchor@RA@PNS-WaitMissionIcon3": {
- "doc": "步骤 27 后等待任务图标出现",
+ "doc": "步骤 37 前等待任务图标出现",
"algorithm": "JustReturn",
"postDelay": 1000,
"next": ["RelaunchAnchor@RA@PNS-MissionIcon3", "#self"]
},
"RelaunchAnchor@RA@PNS-MissionIcon3": {
- "doc": "步骤 27：模板匹配任务图标并点击",
+ "doc": "步骤 37：模板匹配任务图标并点击",
"algorithm": "MatchTemplate",
"action": "ClickSelf",
"template": "RelaunchAnchor@RA@MissionIcon.png",
@@ -326,7 +310,7 @@
"next": ["RelaunchAnchor@RA@PNS-DeliverStone10", "#self"]
},
"RelaunchAnchor@RA@PNS-DeliverStone10": {
- "doc": "步骤 28：OCR 识别 <交付10份石材> 并点击",
+ "doc": "步骤 38：OCR 识别 <交付10份石材> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["石材"],
@@ -334,7 +318,7 @@
"next": ["RelaunchAnchor@RA@PNS-ConfirmSettlement", "#self"]
},
"RelaunchAnchor@RA@PNS-ConfirmSettlement": {
- "doc": "步骤 29：OCR 识别 <确认> 并点击",
+ "doc": "步骤 39：OCR 识别 <确认> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["确认"],
@@ -342,7 +326,7 @@
"next": ["RelaunchAnchor@RA@PNS-DeliverStone", "#self"]
},
"RelaunchAnchor@RA@PNS-DeliverStone": {
- "doc": "步骤 29.1：OCR 识别 <交付石材> 并点击",
+ "doc": "步骤 40：OCR 识别 <交付石材> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["交付石材"],
@@ -350,30 +334,39 @@
"next": ["RelaunchAnchor@RA@PNS-SettleNow", "#self"]
},
"RelaunchAnchor@RA@PNS-SettleNow": {
- "doc": "步骤 30：OCR 识别 <立即结算> 并点击",
+ "doc": "步骤 41：OCR 识别 <立即结算> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["立即结算"],
"roi": [918, 459, 137, 50],
- "postDelay": 10000,
+ "postDelay": 5000,
+ "next": ["#self", "RelaunchAnchor@RA@PNS-WaitContinueAfterSettlement"]
+ },
+ "RelaunchAnchor@RA@PNS-WaitContinueAfterSettlement": {
+ "doc": "步骤 42 前等待结算完成",
+ "algorithm": "JustReturn",
"next": ["RelaunchAnchor@RA@PNS-ContinueAfterSettlement", "#self"]
},
"RelaunchAnchor@RA@PNS-ContinueAfterSettlement": {
- "doc": "步骤 31：OCR 识别 <点击继续> 并点击",
+ "doc": "步骤 42：OCR 识别 <点击继续> 并点击",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["点击继续"],
"roi": [605, 664, 113, 44],
- "postDelay": 5000,
+ "postDelay": 2000,
+ "next": ["#self", "RelaunchAnchor@RA@PNS-WaitFinishConstruction"]
+ },
+ "RelaunchAnchor@RA@PNS-WaitFinishConstruction": {
+ "doc": "步骤 43 前等待 <完成建设> 出现",
+ "algorithm": "JustReturn",
"next": ["RelaunchAnchor@RA@PNS-FinishConstruction", "#self"]
},
"RelaunchAnchor@RA@PNS-FinishConstruction": {
- "doc": "步骤 32：OCR 识别 <完成建设> 并点击，然后回到步骤 1",
+ "doc": "步骤 43：OCR 识别 <完成建设> 并点击，然后回到步骤 1",
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": ["完成建设"],
"roi": [595, 662, 124, 43],
- "postDelay": 5000,
"next": ["RelaunchAnchor@RA@PNS-RA1", "#self"]
}
}
diff --git a/src/MAAUnified b/src/MAAUnified
index b51fbd9209..1ee09448b3 160000
--- a/src/MAAUnified
+++ b/src/MAAUnified
@@ -1 +1 @@
-Subproject commit b51fbd92098cf9779f63f5e8a74de861feb31ced
+Subproject commit 1ee09448b3eb2f12e20f5ad186eaa322ce62aa9c
diff --git a/src/MaaMacGui b/src/MaaMacGui
index 7eed483002..5310fcf571 160000
--- a/src/MaaMacGui
+++ b/src/MaaMacGui
@@ -1 +1 @@
-Subproject commit 7eed4830027010efb4f8218b1f29ad51dc77d3d4
+Subproject commit 5310fcf571606f852cad3db7f1fdc5c967da7053
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 8f318d294a..c706795006 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -1471,6 +1471,8 @@ Relaunch Anchor - Assisted Construction Mode:
1. Manually enter RA-1, complete the tutorial, and return to the map
2. After that, the task can be started when "Start Construction" appears at the bottom-right after clicking RA-1
+ Note: If the "Start with Extra Device" technology is unlocked, this task will not work properly
+
Task flow:
Automatically executes farming, construction, resource delivery, and settlement loop
@@ -2012,4 +2014,3 @@ These locations are too high-level and can lead to file overwrites, config write
Emulator selection cancelled
-
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index c718ea7544..d2636ac84e 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -1472,6 +1472,8 @@ DEBUGディレクトリに保存される画像には数量制限があり、超
1. 手動でRA-1に入り、チュートリアルを完了してマップに戻る
2. 以降、RA-1をクリックした後に右下に「建設開始」が表示されたらタスクを開始可能
+ 注意：「初期追加携帯装置」のテクノロジーをアンロックしていると正常に動作しません
+
タスクの流れ：
精耕細作、建設、資源納入、決済を自動実行
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 80789c4831..d2249241e4 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -1473,6 +1473,8 @@ DEBUG 디렉토리에 저장된 이미지는 수량 제한이 있으며 초과
1. 수동으로 RA-1에 진입하여 튜토리얼을 완료하고 맵으로 돌아옵니다
2. 이후 RA-1 클릭 후 오른쪽 아래에 "건설 시작"이 나타나면 작업을 시작할 수 있습니다
+ 참고: "초기 추가 장비 휴대" 기술을 해제한 경우 정상 작동하지 않습니다
+
작업 흐름：
정경세작, 건설, 자원 납품, 결제를 자동 실행
@@ -2013,4 +2015,3 @@ MAA를 독립된 새 폴더에 압축 해제하거나, MAA에 속하지 않는 D
에뮬레이터 선택이 취소되었습니다
-
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 2e88b2a0da..38fb3ddbd5 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -1472,6 +1472,8 @@ DEBUG 目录下保存的图片有数量限制，超出后会自动清理旧图
1. 手动进入 RA-1，完成新手教程，直到回到大地图
2. 之后每次任务均可在 RA-1 右下角出现“开启建设”时启动
+ 注意：如果已解锁开局额外携带装置的科技，将无法正常使用
+
任务流程：
自动执行精耕细作、建设、交付资源、结算循环
@@ -2013,4 +2015,3 @@ DEBUG 目录下保存的图片有数量限制，超出后会自动清理旧图
已取消选择模拟器
-
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index e9c28b79d8..5c6838e530 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -1472,6 +1472,8 @@ DEBUG 目錄下儲存的圖片有數量限制，超出後會自動清理舊圖
1. 手動進入 RA-1，完成新手教學，直到回到大地圖
2. 之後每次任務均可在 RA-1 右下角出現「開啟建設」時啟動
+ 注意：如果已解鎖開局額外攜帶裝置的科技，將無法正常使用
+
任務流程：
自動執行精耕細作、建設、交付資源、結算循環
@@ -2013,4 +2015,3 @@ DEBUG 目錄下儲存的圖片有數量限制，超出後會自動清理舊圖
已取消選擇模擬器
-
diff --git a/src/maa-cli b/src/maa-cli
index 9cf2e2efe6..5d0638ca4c 160000
--- a/src/maa-cli
+++ b/src/maa-cli
@@ -1 +1 @@
-Subproject commit 9cf2e2efe6b213f025c8a868c263e878673862b4
+Subproject commit 5d0638ca4c1f9607f4a771d32a5c2b75556e6df4