Skip to content

chore(deps-dev): bump @nekosu/prettier-plugin-maafw-sort from 1.0.6 to 1.1.0 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
APPLe-DF merged 3 commits into from
Oct 12, 2026
Merged

chore(deps-dev): bump @nekosu/prettier-plugin-maafw-sort from 1.0.6 to 1.1.0 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e478908
chore(deps-dev): bump @nekosu/prettier-plugin-maafw-sort
dependabot[bot] Oct 8, 2026
b13cca3
merge: sync main (sass/katex/sass-embedded bumps)
APPLe-DF Oct 12, 2026
f9b16a0
style: sort interface and tasks json per maafw-sort 1.1.0
APPLe-DF Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -45,12 +45,6 @@
]
}
],
"group": [
{
"name": "Daily",
"label": "日常任务"
}
],
"agent": [
{
"child_exec": "uv",
Expand All @@ -64,6 +58,12 @@
"identifier": "maakedr_agent"
}
],
"group": [
{
"name": "Daily",
"label": "日常任务"
}
],
"import": [
"./tasks/startup.json",
"./tasks/farm_resources.json",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
47 changes: 19 additions & 28 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions tasks/claim_rewards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"name": "领取奖励",
"entry": "ClaimRewards",
"default_check": true,
"group": ["Daily"],
"description": "一键领取各类奖励。包含每日/每周/军旅成就奖励、战令通行证奖励、邮箱奖励、资源派遣奖励、高级账号商店每日奖励。支持各奖励类型独立开关",
"group": ["Daily"],
"option": [
"claim_dispatch",
"claim_daily_rewards",
Expand All @@ -19,7 +19,6 @@
"claim_dispatch": {
"type": "switch",
"label": "派遣任务领取",
"default_case": "Yes",
"cases": [
{
"name": "Yes",
Expand All @@ -35,13 +34,13 @@
}
}
}
]
],
"default_case": "Yes"
},
"dispatch_redeploy": {
"type": "switch",
"label": "再次派遣",
"description": "领取奖励后选择再次派遣，否则直接关闭",
"default_case": "Yes",
"cases": [
{
"name": "Yes"
Expand All @@ -67,12 +66,12 @@
}
}
}
]
],
"default_case": "Yes"
},
"claim_daily_rewards": {
"type": "switch",
"label": "每日/每周/军旅成就奖励",
"default_case": "Yes",
"cases": [
{
"name": "Yes"
Expand All @@ -85,12 +84,12 @@
}
}
}
]
],
"default_case": "Yes"
},
"claim_battle_pass": {
"type": "switch",
"label": "战令通行证奖励",
"default_case": "Yes",
"cases": [
{
"name": "Yes"
Expand All @@ -103,12 +102,12 @@
}
}
}
]
],
"default_case": "Yes"
},
"claim_mailbox": {
"type": "switch",
"label": "邮箱奖励",
"default_case": "Yes",
"cases": [
{
"name": "Yes"
Expand All @@ -121,12 +120,12 @@
}
}
}
]
],
"default_case": "Yes"
},
"claim_premium_shop": {
"type": "switch",
"label": "高级账号商店每日奖励",
"default_case": "No",
"cases": [
{
"name": "No",
Expand All @@ -139,7 +138,8 @@
{
"name": "Yes"
}
]
],
"default_case": "No"
}
}
}
24 changes: 12 additions & 12 deletions tasks/event_stage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,37 @@
"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]}",
"next": [
"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",
Expand Down Expand Up @@ -91,12 +90,12 @@
}
}
}
]
],
"default_case": "EX2-1"
},
"event_sweep_count": {
"type": "select",
"label": "扫荡次数",
"default_case": "3次",
"cases": [
{
"name": "1次",
Expand Down Expand Up @@ -134,7 +133,8 @@
}
}
}
]
],
"default_case": "3次"
}
}
}
Loading
Loading