Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8c5abaa
Merge:'fix/0509patch'| 0509的01质量更新
sunyink May 9, 2026
549589e
Merge branch 'main' into develop | #277 并入dev通道
sunyink May 9, 2026
1e9667c
Merge:'chroe/patch0510'| 0510的01功能更新
sunyink May 10, 2026
1f5081b
chore: ignore支援增加MaaOWM
sunyink May 11, 2026
48cf55c
chore:添加macOS .DS_Store到gitignore
KalimiaChen May 10, 2026
a5d2df4
Merge branch 'main' into chore/reftosupnt
sunyink May 12, 2026
52e02ea
refactor:将可重用的内嵌Sub识别全部拆分为节点引用
sunyink May 12, 2026
fc19f19
refactor:对非重用的And-Sub识别重新厘定、分离|一些不常用的节点改用更通用的Sub条件
sunyink May 12, 2026
f0a4423
refactor:对非重用的Or-Sub识别重新厘定、分离
sunyink May 12, 2026
df08544
chore: ignore支援增加MaaOWM
sunyink May 11, 2026
4501363
Merge branch 'main' into develop
sunyink May 12, 2026
0bb7fda
Merge:'chore/reftosupnt'| 所有子识别重构拆分
sunyink May 12, 2026
213b672
fix:启动.消除网络弹窗后的路径问题
sunyink May 13, 2026
05ea681
chore:公用节点库.将单节点条件替换为复用rec节点
sunyink May 14, 2026
b35d373
fix:狩猎.圣石均衡模式,增加按键位置适配
sunyink May 14, 2026
a6eaf81
Merge:'fix/patch0513'| 0514的01质量更新
sunyink May 14, 2026
977c0c4
chore:公用节点库.继续将类似参数复用
sunyink May 14, 2026
b75d10f
chore:调整OCR模型为V5
sunyink May 14, 2026
f107227
Merge:'chore/reftosupnt'| 0514的02质量更新
sunyink May 14, 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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -477,4 +477,12 @@ package-lock.json
package.json
prettier.config.mjs

# macOS
.DS_Store
**/.DS_Store

.claude/*

# MaaOWM
**/.maaowm
**/__mod_extras__.json
1 change: 1 addition & 0 deletions assets/resource/PC/model/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ocr
Binary file added assets/resource/base/image/SubBattle_+1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 5 additions & 30 deletions assets/resource/base/pipeline/Activities.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,8 @@
"desc": "[通用复位]复位到主界面模块,开始,中继调用",
"recognition": "And",
"all_of": [
{
"sub_name": "Main_OCR",
"recognition": "OCR",
"roi": [
98,
656,
66,
32
],
"expected": [
"抽抽乐"
]
},
"Global_Main_Clr"
"Rec_HomePage_GA_Ocr",
"Sub_HomePage_GA_Bright_Clr"
],
"next": [
"Activities_InIndex",
Expand Down Expand Up @@ -372,7 +360,6 @@
"recognition": "And",
"all_of": [
{
"sub_name": "Sub_Ocr",
"recognition": "OCR",
"roi": [
966,
Expand All @@ -384,7 +371,7 @@
"旋转"
]
},
"Global_Ocr_Clr_Enable_Sub"
"Sub_Ocr_Enable_Clr"
],
"action": "Click",
"post_delay": 4000,
Expand Down Expand Up @@ -561,20 +548,8 @@
"desc": "返回主页",
"recognition": "And",
"all_of": [
{
"sub_name": "Main_OCR",
"recognition": "OCR",
"roi": [
98,
656,
66,
32
],
"expected": [
"抽抽乐"
]
},
"Global_Main_Clr"
"Rec_HomePage_GA_Ocr",
"Sub_HomePage_GA_Bright_Clr"
],
"next": [
"Activities_InIndex",
Expand Down
Loading
Loading