diff --git a/assets/interface.json b/assets/interface.json index 438d1fa..e93bb3e 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -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 @@ -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 diff --git a/assets/resource/base/image/card/card_ssr_q.png b/assets/resource/base/image/card/card_ssr_q.png new file mode 100644 index 0000000..d408547 Binary files /dev/null and b/assets/resource/base/image/card/card_ssr_q.png differ diff --git a/assets/resource/base/image/card/card_ssr_r.png b/assets/resource/base/image/card/card_ssr_r.png new file mode 100644 index 0000000..f7632d6 Binary files /dev/null and b/assets/resource/base/image/card/card_ssr_r.png differ diff --git a/assets/resource/base/pipeline/my_task.json b/assets/resource/base/pipeline/farm_new_account.json similarity index 93% rename from assets/resource/base/pipeline/my_task.json rename to assets/resource/base/pipeline/farm_new_account.json index 6f2fd33..6c6fcaf 100644 --- a/assets/resource/base/pipeline/my_task.json +++ b/assets/resource/base/pipeline/farm_new_account.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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" ] }, @@ -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": [ @@ -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" ] }, @@ -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", diff --git a/assets/resource/base/pipeline/system_control b/assets/resource/base/pipeline/system_control.json similarity index 66% rename from assets/resource/base/pipeline/system_control rename to assets/resource/base/pipeline/system_control.json index 3d13ecf..38145a4 100644 --- a/assets/resource/base/pipeline/system_control +++ b/assets/resource/base/pipeline/system_control.json @@ -6,5 +6,14 @@ "End_App_Gakumas": { "action": "StopApp", "package": "com.bandainamcoent.idolmaster_gakuen" + }, + "Click_Test": { + "action": "Click", + "roi": [ + 1169, + 61, + 59, + 42 + ] } } \ No newline at end of file