From e0f484d304739d95d6be650c68aee35700be755a Mon Sep 17 00:00:00 2001 From: Ji Mao Cai <44921326+jinghero@users.noreply.github.com> Date: Sun, 6 Sep 2026 22:30:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(maa):=20=E8=AE=A1=E5=88=92=E8=A1=A8?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=B8=8D=E5=86=8D=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BA=93=E5=AD=98=E4=BF=9D=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++-- app/task/MAA/AutoProxy.py | 2 -- frontend/src/views/EditView/User/MAAUserEdit.vue | 1 - .../src/views/MAAUserEdit/TaskPipelineSection.vue | 9 +++------ .../src/views/MAAUserEdit/taskSummaries.test.ts | 15 +++++---------- frontend/src/views/MAAUserEdit/taskSummaries.ts | 3 +-- res/version.json | 5 +++-- 7 files changed, 15 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79fd39813..a2971f8c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,11 +32,12 @@ ### 破坏性变更 -- 森空岛获取凭据改为扫码登录，完善游戏社区签到、云游戏时长判断与日常便笺展示 +- 森空岛获取凭据改为扫码登录，完善游戏社区签到、云游戏时长判断与日常便笺展示 by [@Lance0174](https://github.com/Lance0174) - MFW 项目新增了自动更新时机设置，升级后**已有脚本一律默认为「运行前更新」**；不需要的话在项目配置里改成「不更新」 by [@qiyinxi](https://github.com/qiyinxi) - HSR 专项脚本页的「游戏启动参数」已移除，**旧配置中的该项会在下次保存时自动清除**；窗口大小改由「1920×1080 窗口模式」开关控制 by [@qiyinxi](https://github.com/qiyinxi) - MAA 专项代理接管配置时**会强制开启「开始唤醒」的账号切换开关**，以确保按用户配置的账号切号；用户未填写账号时仍不会切号 by [@qiyinxi](https://github.com/qiyinxi) - MAA、SRC、MaaEnd 与 OK-NTE 用户页的「简洁 / 详细」配置模式**更名为「脚本 / 用户」**，含义不变，旧配置自动迁移 by [@qiyinxi](https://github.com/qiyinxi) +- MAA 计划表模式下不再强制关闭「库存保持」；此前在固定关卡模式开启过该开关的用户升级后会自动生效，**库存保持会先于理智作战执行**，不需要的话请在用户编辑页关闭 ### 本次亮点 @@ -157,7 +158,7 @@ - MFW专项 修复脚本侧强制停止任务（如 MaaEnd 分辨率不达标时的强停）被记成「任务完成」的问题：现在被强停的任务按失败记录，本轮剩余任务不再投递，不会再出现整轮一件事没做却报成全部成功 by [@qiyinxi](https://github.com/qiyinxi) - MAA专项 修复 MAA 卡死后不会被判定为超时、任务一直挂着的问题：MAA 每隔一段时间输出的日志停滞提示被当成任务仍在推进，把超时计时反复重置，剿灭等超时阈值长于提示间隔的模式永远等不到超时；现已识别新旧两版 MAA 的该提示，MAA 的五种界面语言均生效 by [@qiyinxi](https://github.com/qiyinxi) - MAA专项 修复关闭理智作战后活动关优先任务一并从任务队列中消失的问题 by [@1w1w11w1](https://github.com/1w1w11w1) by [@qiyinxi](https://github.com/qiyinxi) -- BetterGI专项、ZZZ-OD专项 修复任务出错时提示送不到前端、用户看到的报错与实际出错原因无关的问题 +- BetterGI专项、ZZZ-OD专项 修复任务出错时提示送不到前端、用户看到的报错与实际出错原因无关的问题 by [@qiyinxi](https://github.com/qiyinxi) ### 开发流程 diff --git a/app/task/MAA/AutoProxy.py b/app/task/MAA/AutoProxy.py index 4aa3aa691..141a81589 100644 --- a/app/task/MAA/AutoProxy.py +++ b/app/task/MAA/AutoProxy.py @@ -631,8 +631,6 @@ async def main_task(self): task: self.cur_user_config.get("Task", f"If{task}") for task in MAA_TASKS } - if self.cur_user_config.get("Info", "StageMode") != "Fixed": - self.task_dict["DepotMaintain"] = False elif self.mode == "Annihilation": self.task_dict = { task: bool(task in ("StartUp", "Fight")) for task in MAA_TASKS diff --git a/frontend/src/views/EditView/User/MAAUserEdit.vue b/frontend/src/views/EditView/User/MAAUserEdit.vue index abf78a999..203791b67 100644 --- a/frontend/src/views/EditView/User/MAAUserEdit.vue +++ b/frontend/src/views/EditView/User/MAAUserEdit.vue @@ -55,7 +55,6 @@ - + ('formData', { required: true }) const props = defineProps<{ loading: boolean - isPlanMode: boolean stageOptions: any[] activityStageOptions: Array<{ label: string; value: number }> activityStageLoading: boolean @@ -420,7 +418,6 @@ const infrastSummary = computed(() => { const depotSummary = computed(() => summarizeDepot( - props.isPlanMode, formData.value.Task.IfDepotMaintain, formData.value.Task.DepotMaintainPlans ) diff --git a/frontend/src/views/MAAUserEdit/taskSummaries.test.ts b/frontend/src/views/MAAUserEdit/taskSummaries.test.ts index b72395924..09faba3d6 100644 --- a/frontend/src/views/MAAUserEdit/taskSummaries.test.ts +++ b/frontend/src/views/MAAUserEdit/taskSummaries.test.ts @@ -49,22 +49,17 @@ describe('activity summary', () => { }) describe('depot summary', () => { - it('explains that plan mode disables inventory maintenance', () => { - expect(summarizeDepot(true, true, '[{"Stage":"CE-6"}]')).toBe('计划模式下不可用') - }) - it('counts configured plans', () => { - expect(summarizeDepot(false, true, '[{"a":1},{"b":2}]')).toBe('2 项计划') + expect(summarizeDepot(true, '[{"a":1},{"b":2}]')).toBe('2 项计划') }) it('treats malformed or empty plan JSON as no plans', () => { - expect(summarizeDepot(false, true, 'not json')).toBe('尚未添加计划') - expect(summarizeDepot(false, true, '')).toBe('尚未添加计划') + expect(summarizeDepot(true, 'not json')).toBe('尚未添加计划') + expect(summarizeDepot(true, '')).toBe('尚未添加计划') }) - it('stays empty when switched off, but keeps explaining plan mode', () => { - expect(summarizeDepot(false, false, '[{"a":1}]')).toBe('') - expect(summarizeDepot(true, false, '[]')).toBe('计划模式下不可用') + it('stays empty when switched off', () => { + expect(summarizeDepot(false, '[{"a":1}]')).toBe('') }) }) diff --git a/frontend/src/views/MAAUserEdit/taskSummaries.ts b/frontend/src/views/MAAUserEdit/taskSummaries.ts index e8b34c2c5..b23fb4532 100644 --- a/frontend/src/views/MAAUserEdit/taskSummaries.ts +++ b/frontend/src/views/MAAUserEdit/taskSummaries.ts @@ -58,8 +58,7 @@ export const summarizeActivity = (options: { return `${options.stageLabel ?? '未选择'} · 理智药 ${options.medicine}` } -export const summarizeDepot = (isPlanMode: boolean, enabled: boolean, plansJson: string) => { - if (isPlanMode) return '计划模式下不可用' +export const summarizeDepot = (enabled: boolean, plansJson: string) => { if (!enabled) return '' let count = 0 try { diff --git a/res/version.json b/res/version.json index fb7cd493e..26bd1eacb 100644 --- a/res/version.json +++ b/res/version.json @@ -3,11 +3,12 @@ "version_info": { "v5.5.0-beta.3": { "破坏性变更": [ - "森空岛获取凭据改为扫码登录，完善游戏社区签到、云游戏时长判断与日常便笺展示 by [@qiyinxi](https://github.com/qiyinxi)", + "森空岛获取凭据改为扫码登录，完善游戏社区签到、云游戏时长判断与日常便笺展示 by [@Lance0174](https://github.com/Lance0174)", "MFW 项目新增了自动更新时机设置，升级后**已有脚本一律默认为「运行前更新」**；不需要的话在项目配置里改成「不更新」 by [@qiyinxi](https://github.com/qiyinxi)", "HSR 专项脚本页的「游戏启动参数」已移除，**旧配置中的该项会在下次保存时自动清除**；窗口大小改由「1920×1080 窗口模式」开关控制 by [@qiyinxi](https://github.com/qiyinxi)", "MAA 专项代理接管配置时**会强制开启「开始唤醒」的账号切换开关**，以确保按用户配置的账号切号；用户未填写账号时仍不会切号 by [@qiyinxi](https://github.com/qiyinxi)", - "MAA、SRC、MaaEnd 与 OK-NTE 用户页的「简洁 / 详细」配置模式**更名为「脚本 / 用户」**，含义不变，旧配置自动迁移 by [@qiyinxi](https://github.com/qiyinxi)" + "MAA、SRC、MaaEnd 与 OK-NTE 用户页的「简洁 / 详细」配置模式**更名为「脚本 / 用户」**，含义不变，旧配置自动迁移 by [@qiyinxi](https://github.com/qiyinxi)", + "MAA 计划表模式下不再强制关闭「库存保持」；此前在固定关卡模式开启过该开关的用户升级后会自动生效，**库存保持会先于理智作战执行**，不需要的话请在用户编辑页关闭" ], "本次亮点": [ "新增绝区零一条龙（ZZZ-OD）专项适配，支持用户独立模式与直控模式 by [@qiyinxi](https://github.com/qiyinxi)",