diff --git a/assets/interface.json b/assets/interface.json index 3a80799..ac672a5 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -52,6 +52,10 @@ "是否访问每个好友换抽" ] }, + { + "name": "仅好友换抽(不换班,只换抽,上面的开了这里就不用开了)", + "entry": "Infrastructures_Deal" + }, { "name": "周本", "entry": "WeekInstance", diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json index 66a0438..f7e941a 100644 --- a/assets/resource/base/pipeline/awards.json +++ b/assets/resource/base/pipeline/awards.json @@ -20,12 +20,12 @@ "lower": [ 230, 178, - 66 + 60 ], "upper": [ 255, - 190, - 72 + 210, + 80 ], "count": 7, "action": "Click", diff --git a/assets/resource/base/pipeline/infrastructures.json b/assets/resource/base/pipeline/infrastructures.json index e89a506..4ecc715 100644 --- a/assets/resource/base/pipeline/infrastructures.json +++ b/assets/resource/base/pipeline/infrastructures.json @@ -6,6 +6,30 @@ "Sub_StartUp" ] }, + "Infrastructures_Deal": { + "next": [ + "Base_Deal", + "Infr_DealDefaltYes", + "Sub_StartUp" + ] + }, + "Base_Deal":{ + "recognition": "OCR", + "text": [ + "基地" + ], + "roi": [ + 1020, + 619, + 167, + 93 + ], + "action": "Click", + "next": [ + "Infr_DealDefaltYes", + "Base_Deal" + ] + }, "Base":{ "recognition": "OCR", "text": [ @@ -510,6 +534,21 @@ "Infr_DealSelf" ] }, + "Infr_DealDefaltYes":{ + "recognition": "TemplateMatch", + "template": "Infrastructures/Infr_Deal.png", + "roi": [ + 980, + 225, + 263, + 235 + ], + "action": "Click", + "next": [ + "Infr_DealDefaltYes", + "Infr_DealSelf" + ] + }, "Infr_Deal1": { "recognition": "TemplateMatch", "template": "Infrastructures/Infr_Deal1.png",