diff --git a/interface.json b/interface.json index bbfd8cf..8d31570 100644 --- a/interface.json +++ b/interface.json @@ -2,12 +2,12 @@ "interface_version": 2, "name": "maakedr", "label": "MaaKEDR", - "version": "v1.5.6", + "title": "MaaKEDR v1.5.6", "icon": "logo.ico", - "github": "https://github.com/APPLe-DF/MaaKEDR", "mirrorchyan_rid": "MaaKEDR", "mirrorchyan_multiplatform": true, - "title": "MaaKEDR v1.5.6", + "github": "https://github.com/APPLe-DF/MaaKEDR", + "version": "v1.5.6", "contact": "CONTACT", "license": "LICENSE", "welcome": "./resource/announcement/1.简介.md", @@ -45,12 +45,6 @@ ] } ], - "group": [ - { - "name": "Daily", - "label": "日常任务" - } - ], "agent": [ { "child_exec": "uv", @@ -64,6 +58,12 @@ "identifier": "maakedr_agent" } ], + "group": [ + { + "name": "Daily", + "label": "日常任务" + } + ], "import": [ "./tasks/startup.json", "./tasks/farm_resources.json", diff --git a/package.json b/package.json index 0feba73..cd008be 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "devDependencies": { "@nekosu/maa-tools": "1.1.3", - "@nekosu/prettier-plugin-maafw-sort": "1.0.6", + "@nekosu/prettier-plugin-maafw-sort": "1.1.0", "@vue/runtime-core": "^3.5.43", "@vuepress/bundler-vite": "2.0.0-rc.30", "ajv": "8.20.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2cebe00..646fbb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: 1.1.3 version: 1.1.3 '@nekosu/prettier-plugin-maafw-sort': - specifier: 1.0.6 - version: 1.0.6 + specifier: 1.1.0 + version: 1.1.0 '@vue/runtime-core': specifier: ^3.5.43 version: 3.5.43 @@ -124,16 +124,16 @@ packages: resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==} engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@8.0.0': - resolution: {integrity: sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==} + '@babel/helper-string-parser@8.0.6': + resolution: {integrity: sha512-+6HYEBnsDRZHJtUTAEfMQd0zMDqdFHS7C+5vAsEZqBUr3vEMWOWlHJ0Jz1gS8jJIlCvLsuA6ivmeoqzH936YcA==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/helper-validator-identifier@7.29.7': resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@8.0.4': - resolution: {integrity: sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==} + '@babel/helper-validator-identifier@8.0.6': + resolution: {integrity: sha512-HYx0YmuchRxRSpnjvcNffnPS8DCauKNmnumIuHG3jnQAVewRA7kfJGwF13ayEpSZs7s4R/oBH4eppuXcAQd5JQ==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/parser@7.29.8': @@ -146,16 +146,12 @@ packages: engines: {node: ^22.18.0 || >=24.11.0} hasBin: true - '@babel/types@7.29.7': - resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==} - engines: {node: '>=6.9.0'} - '@babel/types@7.29.8': resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} engines: {node: '>=6.9.0'} - '@babel/types@8.0.4': - resolution: {integrity: sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==} + '@babel/types@8.0.6': + resolution: {integrity: sha512-c+xgSWboV2pdwXP67BUWDVRHi2BO5Q3KwxyFVs7taVTY+fsK47/L51ZXQoV9rozHJDNHvJ4v4WEsI/IlxV2l2A==} engines: {node: ^22.18.0 || >=24.11.0} '@bufbuild/protobuf@2.16.0': @@ -649,8 +645,8 @@ packages: '@nekosu/maa-version-manager@1.1.0': resolution: {integrity: sha512-WB2rHQYFUK+e49+dTd7KW0k17OWM3H89jkTgH092iOH/pmOqBIBAzanUSKw5yEwI1ikhY+IRa75b1zhKh+wjNA==} - '@nekosu/prettier-plugin-maafw-sort@1.0.6': - resolution: {integrity: sha512-KuWR3y4pyFx5/3tPryDWyLS9DWiplTZLOhOco/7qxjFWtfvg/eNFwMUr88nrqMfFK6GMh8aw34LDewhG9aGrkw==} + '@nekosu/prettier-plugin-maafw-sort@1.1.0': + resolution: {integrity: sha512-txHyLHjC7RcGPpvVIgugbaVx466jSTb9zl59BUGoK7/jHrkamHFsHAaUKotYvvHvcNe7Q9fxn9lEfDyHlKD09A==} '@nekosu/simple-parser@1.0.0': resolution: {integrity: sha512-Jf3tGs3/0D8XJtjRguInFh8ofGdCk6PcDK2V7HEZTXA4RN/9kk527I6pAX4zqPEUU8ISNu8dCR9F+KAn1U6tdg==} @@ -3715,7 +3711,7 @@ snapshots: '@babel/generator@8.0.0': dependencies: '@babel/parser': 8.0.4 - '@babel/types': 8.0.4 + '@babel/types': 8.0.6 '@jridgewell/gen-mapping': 0.3.13 '@jridgewell/trace-mapping': 0.3.31 '@types/jsesc': 2.5.1 @@ -3723,11 +3719,11 @@ snapshots: '@babel/helper-string-parser@7.29.7': {} - '@babel/helper-string-parser@8.0.0': {} + '@babel/helper-string-parser@8.0.6': {} '@babel/helper-validator-identifier@7.29.7': {} - '@babel/helper-validator-identifier@8.0.4': {} + '@babel/helper-validator-identifier@8.0.6': {} '@babel/parser@7.29.8': dependencies: @@ -3735,22 +3731,17 @@ snapshots: '@babel/parser@8.0.4': dependencies: - '@babel/types': 8.0.4 - - '@babel/types@7.29.7': - dependencies: - '@babel/helper-string-parser': 7.29.7 - '@babel/helper-validator-identifier': 7.29.7 + '@babel/types': 8.0.6 '@babel/types@7.29.8': dependencies: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@babel/types@8.0.4': + '@babel/types@8.0.6': dependencies: - '@babel/helper-string-parser': 8.0.0 - '@babel/helper-validator-identifier': 8.0.4 + '@babel/helper-string-parser': 8.0.6 + '@babel/helper-validator-identifier': 8.0.6 '@bufbuild/protobuf@2.16.0': {} @@ -4149,9 +4140,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@nekosu/prettier-plugin-maafw-sort@1.0.6': + '@nekosu/prettier-plugin-maafw-sort@1.1.0': dependencies: - '@babel/types': 7.29.7 + '@babel/types': 7.29.8 '@nekosu/simple-parser@1.0.0': {} diff --git a/tasks/claim_rewards.json b/tasks/claim_rewards.json index 8e9ec2d..dbfd31e 100644 --- a/tasks/claim_rewards.json +++ b/tasks/claim_rewards.json @@ -4,8 +4,8 @@ "name": "领取奖励", "entry": "ClaimRewards", "default_check": true, - "group": ["Daily"], "description": "一键领取各类奖励。包含每日/每周/军旅成就奖励、战令通行证奖励、邮箱奖励、资源派遣奖励、高级账号商店每日奖励。支持各奖励类型独立开关", + "group": ["Daily"], "option": [ "claim_dispatch", "claim_daily_rewards", @@ -19,7 +19,6 @@ "claim_dispatch": { "type": "switch", "label": "派遣任务领取", - "default_case": "Yes", "cases": [ { "name": "Yes", @@ -35,13 +34,13 @@ } } } - ] + ], + "default_case": "Yes" }, "dispatch_redeploy": { "type": "switch", "label": "再次派遣", "description": "领取奖励后选择再次派遣，否则直接关闭", - "default_case": "Yes", "cases": [ { "name": "Yes" @@ -67,12 +66,12 @@ } } } - ] + ], + "default_case": "Yes" }, "claim_daily_rewards": { "type": "switch", "label": "每日/每周/军旅成就奖励", - "default_case": "Yes", "cases": [ { "name": "Yes" @@ -85,12 +84,12 @@ } } } - ] + ], + "default_case": "Yes" }, "claim_battle_pass": { "type": "switch", "label": "战令通行证奖励", - "default_case": "Yes", "cases": [ { "name": "Yes" @@ -103,12 +102,12 @@ } } } - ] + ], + "default_case": "Yes" }, "claim_mailbox": { "type": "switch", "label": "邮箱奖励", - "default_case": "Yes", "cases": [ { "name": "Yes" @@ -121,12 +120,12 @@ } } } - ] + ], + "default_case": "Yes" }, "claim_premium_shop": { "type": "switch", "label": "高级账号商店每日奖励", - "default_case": "No", "cases": [ { "name": "No", @@ -139,7 +138,8 @@ { "name": "Yes" } - ] + ], + "default_case": "No" } } } diff --git a/tasks/event_stage.json b/tasks/event_stage.json index 96d1cde..a5bca06 100644 --- a/tasks/event_stage.json +++ b/tasks/event_stage.json @@ -4,14 +4,10 @@ "name": "活动关卡刷取", "entry": "EventStage.EventHub", "default_check": false, + "description": "自动刷取活动关卡（雪松）。活动关卡不消耗体力，每日扫荡次数上限为 3。当前支持 EX2-1 / EX2-2 / EX3-1 / EX4-1，需要先完成耀斑活动全部关卡（含EX）。", "group": [ "Daily" ], - "description": "自动刷取活动关卡（雪松）。活动关卡不消耗体力，每日扫荡次数上限为 3。当前支持 EX2-1 / EX2-2 / EX3-1 / EX4-1，需要先完成耀斑活动全部关卡（含EX）。", - "option": [ - "event_stage", - "event_sweep_count" - ], "pipeline_override": { "EventStage.EventHub": { "custom_recognition_param": "{\"activity_next\":\"EventStage.ClickJourney\",\"global_next\":\"EventStage.Start\",\"other_next\":\"EventStage.EnsureHome\",\"activity_template\":\"flare_home.png\",\"global_template\":\"main_option.png\",\"global_roi\":[1199,6,77,83],\"template_roi\":[0,0,1280,720]}", @@ -19,23 +15,26 @@ "EventStage.ClickJourney" ] } - } + }, + "option": [ + "event_stage", + "event_sweep_count" + ] }, { "name": "活动商店兑换", "entry": "EventStage.EventHubShop", "default_check": false, + "description": "进入活动商店兑换定额保障商品，自动跳过已售罄商品并依次确认购买。", "group": [ "Daily" - ], - "description": "进入活动商店兑换定额保障商品，自动跳过已售罄商品并依次确认购买。" + ] } ], "option": { "event_stage": { "type": "select", "label": "活动关卡", - "default_case": "EX2-1", "cases": [ { "name": "EX2-1", @@ -91,12 +90,12 @@ } } } - ] + ], + "default_case": "EX2-1" }, "event_sweep_count": { "type": "select", "label": "扫荡次数", - "default_case": "3次", "cases": [ { "name": "1次", @@ -134,7 +133,8 @@ } } } - ] + ], + "default_case": "3次" } } } diff --git a/tasks/farm_remaining_stamina.json b/tasks/farm_remaining_stamina.json index 3f07f76..fe53081 100644 --- a/tasks/farm_remaining_stamina.json +++ b/tasks/farm_remaining_stamina.json @@ -4,13 +4,10 @@ "name": "剩余体力刷取", "entry": "FarmResources.EnsureHome", "default_check": false, + "description": "仅刷剩余体力（固定清空体力模式）：刷到体力不足自动减次退出，榨干剩余体力。需选择刷取板块", "group": [ "Daily" ], - "description": "仅刷剩余体力（固定清空体力模式）：刷到体力不足自动减次退出，榨干剩余体力。需选择刷取板块", - "option": [ - "remaining_farm_category" - ], "pipeline_override": { "FarmResources.QuickBattle": { "next": [ @@ -50,14 +47,16 @@ "Common.CheckHomePage" ] } - } + }, + "option": [ + "remaining_farm_category" + ] } ], "option": { "remaining_farm_category": { "type": "select", "label": "刷取板块", - "default_case": "资源收集", "cases": [ { "name": "资源收集", @@ -87,12 +86,12 @@ } } } - ] + ], + "default_case": "资源收集" }, "remaining_farm_resource_type": { "type": "select", "label": "资源类型", - "default_case": "特别军费行动", "cases": [ { "name": "特别军费行动", @@ -150,12 +149,12 @@ } } } - ] + ], + "default_case": "特别军费行动" }, "remaining_farm_skill_type": { "type": "select", "label": "技能类型", - "default_case": "基础技能演练", "cases": [ { "name": "基础技能演练", @@ -185,12 +184,12 @@ } } } - ] + ], + "default_case": "基础技能演练" }, "remaining_farm_resource_stage_1": { "type": "select", "label": "关卡选择", - "default_case": "1-1", "cases": [ { "name": "1-1", @@ -247,12 +246,12 @@ } } } - ] + ], + "default_case": "1-1" }, "remaining_farm_resource_stage_2": { "type": "select", "label": "关卡选择", - "default_case": "2-1", "cases": [ { "name": "2-1", @@ -295,12 +294,12 @@ } } } - ] + ], + "default_case": "2-1" }, "remaining_farm_resource_stage_3": { "type": "select", "label": "关卡选择", - "default_case": "3-1", "cases": [ { "name": "3-1", @@ -343,12 +342,12 @@ } } } - ] + ], + "default_case": "3-1" }, "remaining_farm_resource_stage_4": { "type": "select", "label": "关卡选择", - "default_case": "4-1", "cases": [ { "name": "4-1", @@ -405,12 +404,12 @@ } } } - ] + ], + "default_case": "4-1" }, "remaining_farm_skill_stage_1": { "type": "select", "label": "关卡选择", - "default_case": "基础训练1", "cases": [ { "name": "基础训练1", @@ -479,12 +478,12 @@ } } } - ] + ], + "default_case": "基础训练1" }, "remaining_farm_skill_stage_2": { "type": "select", "label": "关卡选择", - "default_case": "专业训练1", "cases": [ { "name": "专业训练1", @@ -553,7 +552,8 @@ } } } - ] + ], + "default_case": "专业训练1" } } } diff --git a/tasks/farm_resources.json b/tasks/farm_resources.json index 4128d49..57bf1fb 100644 --- a/tasks/farm_resources.json +++ b/tasks/farm_resources.json @@ -4,10 +4,10 @@ "name": "资源刷取", "entry": "FarmResources.EnsureHome", "default_check": true, + "description": "自动刷取资源关卡。支持资源收集(特别军费行动/作战体能训练/兵种能力评级/载具对抗演练)和技能演练(基础技能/专业技能)。支持普通次数模式与清空体力模式", "group": [ "Daily" ], - "description": "自动刷取资源关卡。支持资源收集(特别军费行动/作战体能训练/兵种能力评级/载具对抗演练)和技能演练(基础技能/专业技能)。支持普通次数模式与清空体力模式", "option": [ "farm_battle_mode", "farm_category" @@ -18,7 +18,6 @@ "farm_battle_mode": { "type": "select", "label": "战斗模式", - "default_case": "单次战斗", "cases": [ { "name": "单次战斗", @@ -71,12 +70,12 @@ } } } - ] + ], + "default_case": "单次战斗" }, "farm_battle_count": { "type": "select", "label": "战斗次数", - "default_case": "1次", "cases": [ { "name": "1次", @@ -141,12 +140,12 @@ } } } - ] + ], + "default_case": "1次" }, "farm_category": { "type": "select", "label": "刷取板块", - "default_case": "资源收集", "cases": [ { "name": "资源收集", @@ -176,12 +175,12 @@ } } } - ] + ], + "default_case": "资源收集" }, "farm_resource_type": { "type": "select", "label": "资源类型", - "default_case": "特别军费行动", "cases": [ { "name": "特别军费行动", @@ -239,12 +238,12 @@ } } } - ] + ], + "default_case": "特别军费行动" }, "farm_skill_type": { "type": "select", "label": "技能类型", - "default_case": "基础技能演练", "cases": [ { "name": "基础技能演练", @@ -274,12 +273,12 @@ } } } - ] + ], + "default_case": "基础技能演练" }, "farm_resource_stage_1": { "type": "select", "label": "关卡选择", - "default_case": "1-1", "cases": [ { "name": "1-1", @@ -336,12 +335,12 @@ } } } - ] + ], + "default_case": "1-1" }, "farm_resource_stage_2": { "type": "select", "label": "关卡选择", - "default_case": "2-1", "cases": [ { "name": "2-1", @@ -384,12 +383,12 @@ } } } - ] + ], + "default_case": "2-1" }, "farm_resource_stage_3": { "type": "select", "label": "关卡选择", - "default_case": "3-1", "cases": [ { "name": "3-1", @@ -432,12 +431,12 @@ } } } - ] + ], + "default_case": "3-1" }, "farm_resource_stage_4": { "type": "select", "label": "关卡选择", - "default_case": "4-1", "cases": [ { "name": "4-1", @@ -494,12 +493,12 @@ } } } - ] + ], + "default_case": "4-1" }, "farm_skill_stage_1": { "type": "select", "label": "关卡选择", - "default_case": "基础训练1", "cases": [ { "name": "基础训练1", @@ -568,12 +567,12 @@ } } } - ] + ], + "default_case": "基础训练1" }, "farm_skill_stage_2": { "type": "select", "label": "关卡选择", - "default_case": "专业训练1", "cases": [ { "name": "专业训练1", @@ -642,7 +641,8 @@ } } } - ] + ], + "default_case": "专业训练1" } } } diff --git a/tasks/pvp.json b/tasks/pvp.json index d92df30..a6bd998 100644 --- a/tasks/pvp.json +++ b/tasks/pvp.json @@ -4,8 +4,8 @@ "name": "玩家对战", "entry": "PVP.EnsureHome", "default_check": true, - "group": ["Daily"], "description": "自动进行玩家对战。支持多场次循环，识别战斗结果、积分和排名变化", + "group": ["Daily"], "option": [ "pvp_battle_count" ] @@ -16,7 +16,6 @@ "type": "select", "label": "战斗次数", "description": "每天 5 次 PVP 机会；高级账号含首次失败保护（首次失败不消耗次数），最多可打 6 场，打满请选「6次」", - "default_case": "1次", "cases": [ { "name": "1次", @@ -85,7 +84,8 @@ } } } - ] + ], + "default_case": "1次" } } } diff --git a/tasks/stamina_info.json b/tasks/stamina_info.json index 14e284d..a3831ad 100644 --- a/tasks/stamina_info.json +++ b/tasks/stamina_info.json @@ -4,8 +4,8 @@ "name": "体力信息", "entry": "StaminaInfo.EnsureHome", "default_check": true, - "group": ["Daily"], - "description": "读取主界面体力并输出回满剩余时间与具体回满时间（建议作为最后一个任务运行，需处于主界面）" + "description": "读取主界面体力并输出回满剩余时间与具体回满时间（建议作为最后一个任务运行，需处于主界面）", + "group": ["Daily"] } ] } diff --git a/tasks/startup.json b/tasks/startup.json index 272ede3..f0cd216 100644 --- a/tasks/startup.json +++ b/tasks/startup.json @@ -4,8 +4,8 @@ "name": "启动游戏", "entry": "LaunchGame", "default_check": true, - "group": ["Daily"], - "description": "自动启动游戏并进入主界面。包含游戏进程启动、开始游戏点击、每日登录奖励处理" + "description": "自动启动游戏并进入主界面。包含游戏进程启动、开始游戏点击、每日登录奖励处理", + "group": ["Daily"] } ] }