Skip to content

Merge:'chroe/patch0510'| 0510的01功能更新 #279

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
sunyink merged 5 commits into from
May 11, 2026
Merged

Merge:'chroe/patch0510'| 0510的01功能更新 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03b8425
chore:增加Task默认预设,提升便捷性
sunyink May 10, 2026
efd78cc
fix：卡带选择器.补patch复位。
sunyink May 10, 2026
0e9751e
fix：公告注入.把自搓语法标记改为正式MD语法和YAML标记。
sunyink May 10, 2026
41ae566
fix：#279评审.公告注入的代码重复/CRLF 换行问题。
sunyink May 11, 2026
99b9ab6
Merge branch 'main' into chroe/patch0510
sunyink May 11, 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
184 changes: 184 additions & 0 deletions assets/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,6 +1688,190 @@
]
}
},
"preset": [
{
"name": "日常-尽快完成",
"description": "快!",
"task": [
{
"name": "[全局]启动脚本(置顶)",
"enabled": true,
"option": {
"前置助手": "按需"
}
},
{
"name": "[执行]快速狩猎扫荡",
"enabled": true
},
{
"name": "[执行]装备制作&炼制日常",
"enabled": true,
"option": {
"精炼按自定义标志排序": "Yes",
"仅精炼<17 或 <10": "低于17阶"
}
},
{
"name": "[执行]白嫖抽卡",
"enabled": true
},
{
"name": "[执行]地图采集[单章]",
"enabled": true,
"option": {"简单类跳过": "Yes"}
},
{
"name": "[执行]竞技场",
"enabled": true
},
{
"name": "[执行]赛季活动快速战斗",
"enabled": true
},
{
"name": "[执行]周常任务",
"enabled": true
},
{
"name": "[领取]日常任务",
"enabled": true
},
{
"name": "[领取]任务页(每日/每周)",
"enabled": true
},
{
"name": "[领取]通行证奖励",
"enabled": true
},
{
"name": "[领取]领取邮件",
"enabled": true
},
{
"name": "[执行]肉鸽塔每日快速战斗",
"enabled": false
},
{
"name": "[执行]商店套利",
"enabled": true
},
{
"name": "[执行]地图采集[完整]",
"enabled": true,
"option": {"简单类跳过": "Yes"}
},
{
"name": "[全局]结束游戏",
"enabled": true
}
]
},
{
"name": "日常-费时细致",
"description": "",
"task": [
{
"name": "[全局]启动脚本(置顶)",
"enabled": true,
"option": {
"前置助手": "按需"
}
},
{
"name": "[执行]快速狩猎扫荡",
"enabled": true
},
{
"name": "[执行]装备制作&炼制日常",
"enabled": true,
"option": {
"精炼按自定义标志排序": "Yes",
"仅精炼<17 或 <10": "低于17阶"
}
},
{
"name": "[执行]白嫖抽卡",
"enabled": true,
"option": {
"一键速抽": "No",
"高级抽卡-按需|强制": "Yes",
"5星必出保留": "Yes"
}
},
{
"name": "[执行]地图采集[单章]",
"enabled": true
},
{
"name": "[执行]竞技场",
"enabled": true,
"option": {"竞技场战斗倍数": "1倍"}
},
{
"name": "[执行]赛季活动快速战斗",
"enabled": true
},
{
"name": "[执行]周常任务",
"enabled": true
},
{
"name": "[领取]日常任务",
"enabled": true,
"option": {"餐馆自动升级": "Yes"}
},
{
"name": "[领取]任务页(每日/每周)",
"enabled": true
},
{
"name": "[领取]通行证奖励",
"enabled": true
},
{
"name": "[领取]领取邮件",
"enabled": true
},
{
"name": "[执行]肉鸽塔每日快速战斗",
"enabled": true
},
{
"name": "[执行]商店套利",
"enabled": true
},
{
"name": "[执行]地图采集[完整]",
"enabled": true,
"option": {"简单类跳过": "Yes"}
},
{
"name": "[全局]结束游戏",
"enabled": true
}
]
},
{
"name": "小工具",
"description": "非日常",
"task": [
{
"name": "[半自动]自动钓鱼",
"enabled": false
},
{
"name": "[特殊]半自动操作",
"enabled": false
},
{
"name": "[手动]生活技能刷级",
"enabled": false
}
]
}
],
"agent": {
"child_exec": "python",
"child_args": [
Expand Down
15 changes: 15 additions & 0 deletions assets/resource/base/pipeline/Collect_Launcher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,11 @@
255
],
"count": 200,
"action": "Custom",
"custom_action": "RestoreNode",
"custom_action_param": {
"node": "Collect_LocatePackFrame_Smart_Swip"
},
"anchor": {
"LocSmartSwip_Limit Ctr": "Collect_Loc_Swip_1Page"
},
Expand All @@ -340,6 +345,11 @@
255
],
"count": 300,
"action": "Custom",
"custom_action": "RestoreNode",
"custom_action_param": {
"node": "Collect_LocatePackFrame_Smart_Swip"
},
"anchor": {
"LocSmartSwip_Limit Ctr": "Collect_Loc_Swip_1Page"
},
Expand All @@ -362,6 +372,11 @@
255
],
"count": 500,
"action": "Custom",
"custom_action": "RestoreNode",
"custom_action_param": {
"node": "Collect_LocatePackFrame_Smart_Swip"
},
"anchor": {
"LocSmartSwip_Limit Ctr": "Collect_Loc_Swip_1Page"
},
Expand Down
88 changes: 47 additions & 41 deletions release/app_msg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,47 @@
# ════════════════════════════════════════════════════════════════
# 公告草稿 · 注入目标：应用内公告 (1.公告.md)
# ════════════════════════════════════════════════════════════════
#
# 【格式规范】
# 每段内容块前须标注目标版本标记，CI 脚本按顺序拼接所有匹配
# 当前版本类型的块，整体注入到公告文件的 Msg-Anch 锚点。
#
# 标记格式：
# <!-- target: <版本类型> [, <版本类型>] -->
# 内容…
#
# 版本类型：
# all · 所有版本（stable / beta / alpha / ci）
# stable · 正式版
# beta · 公测版
# alpha · 内测版
# ci · 开发版
#
# 【叠加示例】（示例中用 [target:...] 代替真实标记，避免被脚本误解析，实操时改成注释形式。）
# <!-- # [target: all] -->
# 这段所有版本都会看到
#
# <!-- # [target: beta] -->
# 这段只有 beta 版能看到
#
# → stable 收到：第 1 段
# → beta 收到：第 1 段 + 第 2 段
# → ci 收到：第 1 段
#
# 【使用方法】
# 1. 在本文件末尾按格式写好内容块
# 2. 将改动合并入主分支，下次对应版本 CI 自动注入
# 3. 发版后请清空内容块（保留本段注释），防止旧通知重复注入
#
# ⚠️ 若版本类型标识（stable/beta/alpha/ci）发生变更，
# 需同步修改 scripts/inject_announcement.py 中的 _get_tag_type()
# ════════════════════════════════════════════════════════════════
<!-- target: all -->
> 热更新后任务顺序混乱的，可以点列表上方的重置小按钮
> 当前游戏魔兽推荐配队只能配1队，疑似bug。推荐摆烂流的也手动配队一次。
<!--
════════════════════════════════════════════════════════════════
公告草稿 · 注入目标：应用内公告 (1.公告.md)
════════════════════════════════════════════════════════════════

【格式规范】
每段内容块前须标注目标版本标记，CI 脚本按顺序拼接所有匹配
当前版本类型的块，整体注入到公告文件的 Msg-Anch 锚点。

标记格式：
---target: <版本类型> [, <版本类型>]---
内容…
---end---

版本类型：
all · 所有版本（stable / beta / alpha / ci）
stable · 正式版
beta · 公测版
alpha · 内测版
ci · 开发版

【叠加示例】
---target: all---
这段所有版本都会看到
---end---

---target: beta---
这段只有 beta 版能看到
---end---

→ stable 收到：第 1 段
→ beta 收到：第 1 段 + 第 2 段
→ ci 收到：第 1 段

【使用方法】
1. 在本文件末尾按格式写好内容块
2. 将改动合并入主分支，下次对应版本 CI 自动注入
3. 发版后请清空内容块（保留本段注释），防止旧通知重复注入

⚠️ 若版本类型标识（stable/beta/alpha/ci）发生变更，
需同步修改 scripts/inject_announcement.py 中的 _get_tag_type()
════════════════════════════════════════════════════════════════
-->
---target: all---
> 任务顺序混乱的，可以点列表上方的重置小按钮。
> 新增任务预设功能。
---end---
Loading
Loading