Skip to content

Commit

Permalink
新版本
Browse files Browse the repository at this point in the history 
1. 适配新卡。
2. 修改卡池变更步骤以适配三池情况。
  • Loading branch information
@Carpenter-MK1
Carpenter-MK1 committed Jul 2, 2024
1 parent aced7a1 commit 0849aa5
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 12 deletions.
26 changes: 24 additions & 2 deletions assets/interface.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,18 @@
"param": {}
},
{
"name": "【NEW!】不是“a”是“e”!（「ア」じゃなくて「エ」！）",
"name": "<NEW>【Da&干劲】真是的！很冷的啦！（もうっ！冷たいよ！",
"param": {
"Check_SSR_Specific_First_S": {
"enabled": true
},
"Check_Support_Specific_First": {
"enabled": true
}
}
},
{
"name": "【Vi&叠毒】不是“a”是“e”!（「ア」じゃなくて「エ」！）",
"param": {
"Check_SSR_Specific_First_R": {
"enabled": true
Expand Down Expand Up @@ -317,7 +328,18 @@
"param": {}
},
{
"name": "【NEW!】不是“a”是“e”!（「ア」じゃなくて「エ」！）",
"name": "<NEW>【Da&干劲】真是的！很冷的啦！（もうっ！冷たいよ！）",
"param": {
"Check_SSR_Specific_Second_S": {
"enabled": true
},
"Check_Support_Specific_Second": {
"enabled": true
}
}
},
{
"name": "【Vi&叠毒】不是“a”是“e”!（「ア」じゃなくて「エ」！）",
"param": {
"Check_SSR_Specific_Second_R": {
"enabled": true
Expand Down
91 changes: 81 additions & 10 deletions assets/resource/base/pipeline/farm_new_account.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,23 @@
"Gacha_Normel_Pool": {
"enabled": false,
"next": [
"Change_Pool",
"Flag_In_Normel_Pool",
"Change_Pool"
]
},
"Flag_In_Normel_Pool": {
"recognition": "TemplateMatch",
"template": "icon_normel_pool.png",
"roi": [
166,
629,
262,
186
],
"next": "Gacha_Normel_Pool_Loop"
},
"Gacha_Normel_Pool_Loop": {
"next": [
"Gacha_With_Tickets",
"Gacha_Normel_With_Diamonds"
]
Expand Down Expand Up @@ -301,7 +317,10 @@
"Change_Pool": {
"is_sub": true,
"recognition": "TemplateMatch",
"template": "icon_change_pool.png",
"template": [
"icon_change_pool.png",
"icon_change_pool_48sp.png"
],
"post_delay": 1500,
"action": "Click"
},
Expand Down Expand Up @@ -339,7 +358,7 @@
57
],
"next": [
"Change_Pool_And_Gacha_Normel"
"Change_Pool_From_UP_To_48SP"
]
},
"Gacha_UP_With_Diamonds_Confirm": {
Expand All @@ -364,11 +383,25 @@
"Gacha_UP_Pool"
]
},
"Change_Pool_And_Gacha_Normel": {
"Change_Pool_From_UP_To_48SP": {
"recognition": "TemplateMatch",
"template": "icon_change_pool_48sp.png",
"post_delay": 1500,
"action": "Click",
"next": [
"Change_Pool_From_48SP_To_Normel"
]
},
"Change_Pool_From_48SP_To_Normel": {
"recognition": "TemplateMatch",
"template": "icon_change_pool.png",
"post_delay": 1500,
"action": "Click",
"next": [
"Gacha_Normel"
]
},
"Gacha_Normel": {
"next": [
"Gacha_With_Tickets",
"Go_To_Idol"
Expand Down Expand Up @@ -434,7 +467,8 @@
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png",
"card/card_ssr_q.png"
"card/card_ssr_q.png",
"card/card_ssr_s.png"
],
"roi": [
469,
Expand Down Expand Up @@ -467,7 +501,8 @@
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png",
"card/card_ssr_q.png"
"card/card_ssr_q.png",
"card/card_ssr_s.png"
],
"roi": [
253,
Expand Down Expand Up @@ -500,7 +535,8 @@
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png",
"card/card_ssr_q.png"
"card/card_ssr_q.png",
"card/card_ssr_s.png"
],
"roi": [
34,
Expand Down Expand Up @@ -533,7 +569,9 @@
"card/card_ssr_n.png",
"card/card_ssr_o.png",
"card/card_ssr_p.png",
"card/card_ssr_q.png"
"card/card_ssr_q.png",
"card/card_ssr_r.png",
"card/card_ssr_s.png"
],
"roi": [
475,
Expand Down Expand Up @@ -567,7 +605,8 @@
"card/card_ssr_o.png",
"card/card_ssr_p.png",
"card/card_ssr_q.png",
"card/card_ssr_r.png"
"card/card_ssr_r.png",
"card/card_ssr_s.png"
],
"roi": [
252,
Expand Down Expand Up @@ -601,7 +640,8 @@
"card/card_ssr_o.png",
"card/card_ssr_p.png",
"card/card_ssr_q.png",
"card/card_ssr_r.png"
"card/card_ssr_r.png",
"card/card_ssr_s.png"
],
"roi": [
36,
Expand Down Expand Up @@ -635,6 +675,7 @@
"Check_SSR_Specific_First_P",
"Check_SSR_Specific_First_Q",
"Check_SSR_Specific_First_R",
"Check_SSR_Specific_First_S",
"Open_Menu"
]
},
Expand Down Expand Up @@ -908,6 +949,21 @@
"End_All"
]
},
"Check_SSR_Specific_First_S": {
"enabled": false,
"recognition": "TemplateMatch",
"template": "card/card_ssr_s.png",
"roi": [
14,
406,
690,
489
],
"next": [
"Check_Support_Specific_Second",
"End_All"
]
},
"Check_Support_Specific_Second": {
"enabled": false,
"next": [
Expand All @@ -929,6 +985,7 @@
"Check_SSR_Specific_Second_P",
"Check_SSR_Specific_Second_Q",
"Check_SSR_Specific_Second_R",
"Check_SSR_Specific_Second_S",
"Open_Menu"
]
},
Expand Down Expand Up @@ -1184,6 +1241,20 @@
489
]
},
"Check_SSR_Specific_Second_S": {
"enabled": false,
"recognition": "TemplateMatch",
"template": "card/card_ssr_s.png",
"next": [
"End_All"
],
"roi": [
14,
406,
690,
489
]
},
"Open_Menu": {
"recognition": "TemplateMatch",
"template": "icon_menu.png",
Expand Down

0 comments on commit 0849aa5

Please sign in to comment.