Skip to content

Commit

Permalink
更新
Browse files Browse the repository at this point in the history 
1. 更新至最新版框架，修复了无法定义任务内容问题。
2. 最新版本支援卡的适配。
3. 改善了部分卡死问题，
  • Loading branch information
@Carpenter-MK1
Carpenter-MK1 committed Jun 23, 2024
1 parent 447dd8a commit 617e3d7
Show file tree
Hide file tree
Showing 5 changed files with 131 additions and 8 deletions.
48 changes: 46 additions & 2 deletions assets/interface.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,29 @@
"param": {}
},
{
"name": "【NEW!】不要再贴过来啦！（まだ上がりませんように!）",
"name": "【NEW!】不是“a”是“e”!（「ア」じゃなくて「エ」！）",
"param": {
"Check_SSR_Specific_First_R": {
"enabled": true
},
"Check_Support_Specific_First": {
"enabled": true
}
}
},
{
"name": "【Da&奶】放晴了呢（晴れたね）",
"param": {
"Check_SSR_Specific_First_Q": {
"enabled": true
},
"Check_Support_Specific_First": {
"enabled": true
}
}
},
{
"name": "【Vo&多动】不要再贴过来啦！（まだ上がりませんように!）",
"param": {
"Check_SSR_Specific_First_P": {
"enabled": true
Expand Down Expand Up @@ -295,7 +317,29 @@
"param": {}
},
{
"name": "【NEW!】不要再贴过来啦！（まだ上がりませんように!）",
"name": "【NEW!】不是“a”是“e”!（「ア」じゃなくて「エ」！）",
"param": {
"Check_SSR_Specific_Second_R": {
"enabled": true
},
"Check_Support_Specific_Second": {
"enabled": true
}
}
},
{
"name": "【Da&奶】放晴了呢（晴れたね）",
"param": {
"Check_SSR_Specific_Second_Q": {
"enabled": true
},
"Check_Support_Specific_Second": {
"enabled": true
}
}
},
{
"name": "【Vo&多动】不要再贴过来啦！（まだ上がりませんように!）",
"param": {
"Check_SSR_Specific_Second_P": {
"enabled": true
Expand Down
Binary file added assets/resource/base/image/card/card_ssr_q.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/card/card_ssr_r.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 76 additions & 6 deletions assets/resource/base/pipeline/my_task.json → ...ource/base/pipeline/farm_new_account.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,8 @@
"card/card_ssr_m.png",
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png"
"card/card_ssr_p.png",
"card/card_ssr_q.png"
],
"roi": [
469,
Expand Down Expand Up @@ -465,7 +466,8 @@
"card/card_ssr_m.png",
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png"
"card/card_ssr_p.png",
"card/card_ssr_q.png"
],
"roi": [
253,
Expand Down Expand Up @@ -497,7 +499,8 @@
"card/card_ssr_m.png",
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png"
"card/card_ssr_p.png",
"card/card_ssr_q.png"
],
"roi": [
34,
Expand Down Expand Up @@ -529,7 +532,8 @@
"card/card_ssr_m.png",
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png"
"card/card_ssr_p.png",
"card/card_ssr_q.png"
],
"roi": [
475,
Expand Down Expand Up @@ -561,7 +565,9 @@
"card/card_ssr_m.png",
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png"
"card/card_ssr_p.png",
"card/card_ssr_q.png",
"card/card_ssr_r.png"
],
"roi": [
252,
Expand Down Expand Up @@ -593,7 +599,9 @@
"card/card_ssr_m.png",
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png"
"card/card_ssr_p.png",
"card/card_ssr_q.png",
"card/card_ssr_r.png"
],
"roi": [
36,
Expand Down Expand Up @@ -625,6 +633,8 @@
"Check_SSR_Specific_First_N",
"Check_SSR_Specific_First_O",
"Check_SSR_Specific_First_P",
"Check_SSR_Specific_First_Q",
"Check_SSR_Specific_First_R",
"Open_Menu"
]
},
Expand Down Expand Up @@ -868,6 +878,36 @@
"End_All"
]
},
"Check_SSR_Specific_First_Q": {
"enabled": false,
"recognition": "TemplateMatch",
"template": "card/card_ssr_q.png",
"roi": [
14,
406,
690,
489
],
"next": [
"Check_Support_Specific_Second",
"End_All"
]
},
"Check_SSR_Specific_First_R": {
"enabled": false,
"recognition": "TemplateMatch",
"template": "card/card_ssr_r.png",
"roi": [
14,
406,
690,
489
],
"next": [
"Check_Support_Specific_Second",
"End_All"
]
},
"Check_Support_Specific_Second": {
"enabled": false,
"next": [
Expand All @@ -887,6 +927,8 @@
"Check_SSR_Specific_Second_N",
"Check_SSR_Specific_Second_O",
"Check_SSR_Specific_Second_P",
"Check_SSR_Specific_Second_Q",
"Check_SSR_Specific_Second_R",
"Open_Menu"
]
},
Expand Down Expand Up @@ -1114,6 +1156,34 @@
489
]
},
"Check_SSR_Specific_Second_Q": {
"enabled": false,
"recognition": "TemplateMatch",
"template": "card/card_ssr_q.png",
"next": [
"End_All"
],
"roi": [
14,
406,
690,
489
]
},
"Check_SSR_Specific_Second_R": {
"enabled": false,
"recognition": "TemplateMatch",
"template": "card/card_ssr_r.png",
"next": [
"End_All"
],
"roi": [
14,
406,
690,
489
]
},
"Open_Menu": {
"recognition": "TemplateMatch",
"template": "icon_menu.png",
Expand Down
9 changes: 9 additions & 0 deletions assets/resource/base/pipeline/system_control → ...esource/base/pipeline/system_control.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,14 @@
"End_App_Gakumas": {
"action": "StopApp",
"package": "com.bandainamcoent.idolmaster_gakuen"
},
"Click_Test": {
"action": "Click",
"roi": [
1169,
61,
59,
42
]
}
}

0 comments on commit 617e3d7

Please sign in to comment.