Skip to content

Merge:'hotfix/patch0517'| 一些质量更新 #285

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 18, 2026
Merged

Merge:'hotfix/patch0517'| 一些质量更新 #285

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
c4ec0da
chore:base.global.稍微扩大pin的roi提升稳健性
sunyink May 17, 2026
189ca3f
fix:魔兽.按键亮度识别问题
sunyink May 17, 2026
cca158a
chore:节点名称将非 ASCII 的「」,调整为<> 。
sunyink May 17, 2026
f3de3c9
fix:自动魔兽.快速战斗成功后,不结束、再判定一次。如果已打死就再打下一级。
sunyink May 17, 2026
d5a69cf
chore:赛季活动,加一些回调
sunyink May 18, 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
16 changes: 8 additions & 8 deletions assets/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
"狩猎场",
"圣石洞穴属性"
],
"description": "消耗每日免费米饭与火把，依次扫荡冒险航线·狩猎场、圣石洞穴。<br><span style=\"background-color:rgba(255,160,0,0.2)\"><b>注意：</b>请确认目标狩猎场已通关，且冒险航线「哥布林遗迹」已完成。</span>"
"description": "消耗每日免费米饭与火把，依次扫荡冒险航线·狩猎场、圣石洞穴。<br><span style=\"background-color:rgba(255,160,0,0.2)\"><b>注意：</b>请确认目标狩猎场已通关，且冒险航线<哥布林遗迹>已完成。</span>"
},
{
"name": "[执行]地图采集[单章]",
"entry": "Collect_StartGame_HomePage_OnlyOnce",
"controller": ["Adb"],
"default_check": true,
"description": "「地图采集[完整]」的单卡带模式，满足日常任务所需即停止。",
"description": "<地图采集[完整]>的单卡带模式，满足日常任务所需即停止。",
"option": [
"采集卡带屏蔽",
"第三图采集额外等待"
Expand All @@ -77,7 +77,7 @@
"entry": "Equip_HomePage",
"controller": ["Adb"],
"default_check": true,
"description": "依次执行：<b>N稀有短剑打造</b> → <b>强化</b>与<b>分解</b> → <b>精炼</b>。<br>精炼仅以 SR 或 UR 稀有度装备为对象；首次运行无需提前锁定装备，非正常锁定的装备可能导致流程失败。<br><span style=\"background-color:rgba(255,160,0,0.2)\"><b>组合技：</b>同时启用「精炼等级上限过滤」与「精炼排序」，可构造低等级优先强化队列——当前首位装备超出等级限制后，自动推进到下一优先装备。</span>",
"description": "依次执行：<b>N稀有短剑打造</b> → <b>强化</b>与<b>分解</b> → <b>精炼</b>。<br>精炼仅以 SR 或 UR 稀有度装备为对象；首次运行无需提前锁定装备，非正常锁定的装备可能导致流程失败。<br><span style=\"background-color:rgba(255,160,0,0.2)\"><b>组合技：</b>同时启用<精炼等级上限过滤>与<精炼排序>，可构造低等级优先强化队列——当前首位装备超出等级限制后，自动推进到下一优先装备。</span>",
"option": [
"精炼装备阶级",
"仅精炼<17 或 <10",
Expand All @@ -93,7 +93,7 @@
"option": [
"一键速抽"
],
"description": "<b>白嫖抽卡：</b>每日免费一次的<span style=\"background-color:Silver; color:Black; border-radius:3px; padding:0 3px;\">角色</span>、<span style=\"background-color:Silver; color:Black; border-radius:3px; padding:0 3px;\">专属装备</span>抽取。<br><br>关闭「一键速抽」后，可启用保底留存、90钻付费抽等高级功能。<br><br><span style=\"color:Crimson;font-size:14px\"><b>付费钻是危险功能</b><br>务必仔细确认，平时常闭。脚本协议不承担其使用责任！<br>打开此<span style=\"background-color:Silver; color:Black; border-radius:3px; padding:0 3px;\">总开关</span>，则是你知晓并自行承担相关风险的意思表示！</span><br><br><img src=\"resource/image/GUI/CHAGA_Doc.png\" width=\"150\" />"
"description": "<b>白嫖抽卡：</b>每日免费一次的<span style=\"background-color:Silver; color:Black; border-radius:3px; padding:0 3px;\">角色</span>、<span style=\"background-color:Silver; color:Black; border-radius:3px; padding:0 3px;\">专属装备</span>抽取。<br><br>关闭<一键速抽>后，可启用保底留存、90钻付费抽等高级功能。<br><br><span style=\"color:Crimson;font-size:14px\"><b>付费钻是危险功能</b><br>务必仔细确认，平时常闭。脚本协议不承担其使用责任！<br>打开此<span style=\"background-color:Silver; color:Black; border-radius:3px; padding:0 3px;\">总开关</span>，则是你知晓并自行承担相关风险的意思表示！</span><br><br><img src=\"resource/image/GUI/CHAGA_Doc.png\" width=\"150\" />"
},
{
"name": "[执行]竞技场",
Expand Down Expand Up @@ -349,7 +349,7 @@
]
},
"狩猎场": {
"description": "是否扫荡狩猎场。<br>关闭时跳过；若同时选了「优先双倍」但当日无双倍图，仍会补打狩猎场。",
"description": "是否扫荡狩猎场。<br>关闭时跳过；若同时选了<优先双倍>但当日无双倍图，仍会补打狩猎场。",
"type": "switch",
"cases": [
{
Expand Down Expand Up @@ -757,7 +757,7 @@
},
"仅精炼<17 或 <10": {
"label": "精炼等级上限过滤",
"description": "仅对精炼等级低于阈值的装备执行精炼，等级达标的跳过。<br>配合「精炼排序」可实现按优先级逐步推进的强化队列。",
"description": "仅对精炼等级低于阈值的装备执行精炼，等级达标的跳过。<br>配合<精炼排序>可实现按优先级逐步推进的强化队列。",
"cases": [
{
"name": "关闭"
Expand Down Expand Up @@ -853,7 +853,7 @@
"一键速抽": {
"type": "switch",
"label": "一键速抽(启用将禁用高级功能)",
"description": "利用「所有免费抽抽乐」一键完成全部免费抽。<br>开：快捷但禁用保底留存与90钻付费抽。<br>关：启用高级抽卡流程，子项可见。",
"description": "利用<所有免费抽抽乐>一键完成全部免费抽。<br>开：快捷但禁用保底留存与90钻付费抽。<br>关：启用高级抽卡流程，子项可见。",
"cases": [
{
"name": "Yes",
Expand Down Expand Up @@ -881,7 +881,7 @@
]
},
"高级抽卡-按需|强制": {
"description": "关：默认流程检测到问题时自动启用。<br>开：从头调用高级抽卡流程，可配合「5星必出保留」使用。",
"description": "关：默认流程检测到问题时自动启用。<br>开：从头调用高级抽卡流程，可配合<5星必出保留>使用。",
"type": "switch",
"cases": [
{
Expand Down
32 changes: 16 additions & 16 deletions assets/resource/base/pipeline/Arbitrage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2588,14 +2588,14 @@
"desc": "确认出售子菜单已弹出",
"recognition": "Or",
"any_of": [
"Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_01",
"Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_02"
"Rec_<Arbitrage_Sell_Item_SellMenu>_Ocr_01",
"Rec_<Arbitrage_Sell_Item_SellMenu>_Ocr_02"
],
"next": [
"Arbitrage_Sell_Item_Number"
]
},
"Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_01": {
"Rec_<Arbitrage_Sell_Item_SellMenu>_Ocr_01": {
"recognition": "OCR",
"roi": [
810,
Expand All @@ -2607,7 +2607,7 @@
"出售"
]
},
"Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_02": {
"Rec_<Arbitrage_Sell_Item_SellMenu>_Ocr_02": {
"recognition": "OCR",
"roi": [
264,
Expand Down Expand Up @@ -2823,7 +2823,7 @@
"Shop/cook_Sparkling Griddle Shrimp.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand Down Expand Up @@ -2851,7 +2851,7 @@
"Shop/cook_Transparent Salad.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand Down Expand Up @@ -2879,7 +2879,7 @@
"Shop/cook_Hellfire Gimbap.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand Down Expand Up @@ -2938,7 +2938,7 @@
"Shop/cook_Lugas Ginseng Skewer.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand Down Expand Up @@ -2966,7 +2966,7 @@
"Shop/cook_Coal Cookies.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -2993,7 +2993,7 @@
"Shop/cook_Honey Butter Almonds.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -3020,7 +3020,7 @@
"Shop/cook_Mayo Triangle Rice Ball.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -3047,7 +3047,7 @@
"Shop/cook_Caviar Omurice.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -3074,7 +3074,7 @@
"Shop/cook_Fried Salmon Bento.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -3101,7 +3101,7 @@
"Shop/cook_Sangria.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -3128,7 +3128,7 @@
"Shop/cook_Honey Baked Apple.png"
]
},
"Sub_「Arbitrage_Cooking」_Clr"
"Sub_<Arbitrage_Cooking>_Clr"
],
"action": "Click",
"post_delay": 1000,
Expand All @@ -3137,7 +3137,7 @@
],
"focus": "Arb.料理制作:[1级]烤蜂蜜苹果"
},
"Sub_「Arbitrage_Cooking」_Clr": {
"Sub_<Arbitrage_Cooking>_Clr": {
"recognition": "ColorMatch",
"roi": "Templateroi",
"method": 40,
Expand Down
16 changes: 8 additions & 8 deletions assets/resource/base/pipeline/AutoBattle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"AutoBattle_Is_Auto": {
"recognition": "Or",
"any_of": [
"Rec_「AutoBattle_Is_Auto」_Ocr_01",
"Rec_「AutoBattle_Is_Auto」_Ocr_02"
"Rec_<AutoBattle_Is_Auto>_Ocr_01",
"Rec_<AutoBattle_Is_Auto>_Ocr_02"
],
"post_delay": 5000,
"next": [
Expand All @@ -24,7 +24,7 @@
"AutoBattle_Is_Auto"
]
},
"Rec_「AutoBattle_Is_Auto」_Ocr_01": {
"Rec_<AutoBattle_Is_Auto>_Ocr_01": {
"desc": "[识别]自动战斗判定,位置1-右下",
"recognition": "OCR",
"roi": [
Expand All @@ -36,7 +36,7 @@
"expected": ["自动战斗中"],
"only_rec": true
},
"Rec_「AutoBattle_Is_Auto」_Ocr_02": {
"Rec_<AutoBattle_Is_Auto>_Ocr_02": {
"desc": "[识别]自动战斗判定,位置2-左下",
"recognition": "OCR",
"roi": [
Expand All @@ -51,12 +51,12 @@
"desc": "当前在非自动战斗界面",
"recognition": "Or",
"any_of": [
"Rec_「AutoBattle_TabTo_Auto」_Ocr_01",
"Rec_「AutoBattle_TabTo_Auto」_Ocr_02"
"Rec_<AutoBattle_TabTo_Auto>_Ocr_01",
"Rec_<AutoBattle_TabTo_Auto>_Ocr_02"
],
"next": ["AutoBattle_ClickAutoButt"]
},
"Rec_「AutoBattle_TabTo_Auto」_Ocr_01": {
"Rec_<AutoBattle_TabTo_Auto>_Ocr_01": {
"desc": "[识别]手动战斗界面,位置01",
"recognition": "OCR",
"roi": [
Expand All @@ -68,7 +68,7 @@
"expected": ["BATTLE"],
"only_rec": true
},
"Rec_「AutoBattle_TabTo_Auto」_Ocr_02": {
"Rec_<AutoBattle_TabTo_Auto>_Ocr_02": {
"desc": "[识别]手动战斗界面,位置02",
"recognition": "OCR",
"roi": [
Expand Down
4 changes: 2 additions & 2 deletions assets/resource/base/pipeline/Collect_TeleportRecall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
]
}
},
"Rec_「Collect_TeleportRecall_Skill」_Tpl"
"Rec_<Collect_TeleportRecall_Skill>_Tpl"
],
"timeout": 8000,
"rate_limit": 2000,
Expand All @@ -122,7 +122,7 @@
],
"focus": "CRT.传送阵技能已放置"
},
"Rec_「Collect_TeleportRecall_Skill」_Tpl": {
"Rec_<Collect_TeleportRecall_Skill>_Tpl": {
"desc": "[识别]'传送'技能存在",
"recognition": "TemplateMatch",
"roi": [
Expand Down
20 changes: 10 additions & 10 deletions assets/resource/base/pipeline/Daily.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@
"max_hit": 10,
"recognition": "Or",
"any_of": [
"Rec_「Daily_Busin_Claim」_Ocr",
"Rec_「Daily_Busin_Claim」_Tpl"
"Rec_<Daily_Busin_Claim>_Ocr",
"Rec_<Daily_Busin_Claim>_Tpl"
],
"action": "Click",
"target_offset": [
Expand All @@ -197,7 +197,7 @@
],
"focus": "GOM.餐馆结算(COR)-主界面"
},
"Rec_「Daily_Busin_Claim」_Ocr": {
"Rec_<Daily_Busin_Claim>_Ocr": {
"desc": "主页,左侧按钮群-经管1",
"recognition": "OCR",
"roi": [
Expand All @@ -210,7 +210,7 @@
"经营管理"
]
},
"Rec_「Daily_Busin_Claim」_Tpl": {
"Rec_<Daily_Busin_Claim>_Tpl": {
"desc": "主页,左侧按钮群-经管2",
"recognition": "TemplateMatch",
"roi": [
Expand Down Expand Up @@ -451,9 +451,9 @@
"Daily_Busin_DecorCoin_PickUp": {
"recognition": "Or",
"any_of": [
"Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_01",
"Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_02",
"Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_03"
"Rec_<Daily_Busin_DecorCoin_PickUp>_Tpl_01",
"Rec_<Daily_Busin_DecorCoin_PickUp>_Tpl_02",
"Rec_<Daily_Busin_DecorCoin_PickUp>_Tpl_03"
],
"action": "Click",
"post_delay": 1500,
Expand All @@ -468,7 +468,7 @@
],
"focus": "拾取装饰币"
},
"Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_01": {
"Rec_<Daily_Busin_DecorCoin_PickUp>_Tpl_01": {
"desc": "装饰币探查区域01-中央",
"recognition": "TemplateMatch",
"roi": [
Expand All @@ -480,7 +480,7 @@
"template": "UI_BusinCoin.png",
"green_mask": true
},
"Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_02": {
"Rec_<Daily_Busin_DecorCoin_PickUp>_Tpl_02": {
"desc": "装饰币探查区域02-下方",
"recognition": "TemplateMatch",
"roi": [
Expand All @@ -492,7 +492,7 @@
"template": "UI_BusinCoin.png",
"green_mask": true
},
"Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_03": {
"Rec_<Daily_Busin_DecorCoin_PickUp>_Tpl_03": {
"desc": "装饰币探查区域03-左侧",
"recognition": "TemplateMatch",
"roi": [
Expand Down
Loading
Loading