diff --git a/.gitignore b/.gitignore index 627dec9..3c7a2e1 100644 --- a/.gitignore +++ b/.gitignore @@ -447,4 +447,6 @@ install # Tools tools/ImageCropper/**/*.png -config \ No newline at end of file +config + +lib \ No newline at end of file diff --git a/assets/interface.json b/assets/interface.json index 8a682bf..5d5ae2b 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -64,7 +64,7 @@ "entry": "WeekInstance", "pipeline_override": { "首页_出击": { - "next": "ActivityExploration" + "next": "ActivityExploration_fifth_ep" } }, "option": [ @@ -282,38 +282,16 @@ { "name": "第一关45微晶", "pipeline_override": { - "ActivityExploration_2": { - "next": [ - "ActivityExploration_3", - "ActivityExploration_SwipeUp", - "ActivityExploration_2" - ] - }, - "ActivityExploration_CombatEnd3": { - "next": [ - "子任务_获得物品", - "ActivityExploration_3", - "ActivityExploration_CombatEnd3" - ] + "首页_出击": { + "next": "ActivityExploration_first_ep" } } }, { "name": "第五关120微晶", "pipeline_override": { - "ActivityExploration_2": { - "next": [ - "ActivityExploration_第五关", - "ActivityExploration_SwipeDown", - "ActivityExploration_2" - ] - }, - "ActivityExploration_CombatEnd3": { - "next": [ - "子任务_获得物品", - "ActivityExploration_第五关", - "ActivityExploration_CombatEnd3" - ] + "首页_出击": { + "next": "ActivityExploration_fifth_ep" } } } diff --git a/assets/resource/base/image/StartUp/CloseOneYear.png b/assets/resource/base/image/StartUp/CloseOneYear.png new file mode 100644 index 0000000..10b1692 Binary files /dev/null and b/assets/resource/base/image/StartUp/CloseOneYear.png differ diff --git a/assets/resource/base/image/StartUp/NoMail.png b/assets/resource/base/image/StartUp/NoMail.png index fdcb8e0..a3e86b2 100644 Binary files a/assets/resource/base/image/StartUp/NoMail.png and b/assets/resource/base/image/StartUp/NoMail.png differ diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json index 2b5d347..08e688c 100644 --- a/assets/resource/base/pipeline/awards.json +++ b/assets/resource/base/pipeline/awards.json @@ -11,10 +11,10 @@ "Mail": { "recognition": "ColorMatch", "roi": [ - 254, - 14, - 42, - 27 + 1058, + 27, + 34, + 35 ], "method": 4, "lower": [ @@ -66,10 +66,10 @@ "recognition": "TemplateMatch", "template": "StartUp/NoMail.png", "roi": [ - 259, - 20, - 24, - 24 + 1060, + 31, + 30, + 26 ], "next": [ "DailyTask", @@ -80,10 +80,10 @@ "recognition": "TemplateMatch", "template": "StartUp/DailyTask.png", "roi": [ - 1219, - 394, - 39, - 35 + 686, + 609, + 62, + 83 ], "action": "Click", "next": [ diff --git a/assets/resource/base/pipeline/infrastructures.json b/assets/resource/base/pipeline/infrastructures.json index d326d4b..cfa6b56 100644 --- a/assets/resource/base/pipeline/infrastructures.json +++ b/assets/resource/base/pipeline/infrastructures.json @@ -38,10 +38,10 @@ "基地" ], "roi": [ - 1020, - 619, - 167, - 93 + 606, + 665, + 42, + 26 ], "action": "Click", "post_delay": 3000, @@ -1638,4 +1638,4 @@ "Infr_行星指挥部_返回" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/rehearsal.json b/assets/resource/base/pipeline/rehearsal.json index 744d76d..976ea92 100644 --- a/assets/resource/base/pipeline/rehearsal.json +++ b/assets/resource/base/pipeline/rehearsal.json @@ -11,10 +11,10 @@ "模拟军演" ], "roi": [ - 185, - 282, - 280, - 174 + 256, + 338, + 113, + 40 ], "action": "Click", "next": [ @@ -25,21 +25,15 @@ "模拟军演_二级入口": { "recognition": "OCR", "expected": [ - "模拟军演" + "镜像竞技" ], "roi": [ - 483, - 41, - 358, - 118 + 155, + 405, + 202, + 56 ], "action": "Click", - "target_offset": [ - -10, - 276, - 20, - 20 - ], "next": [ "模拟军演_刷新对手", "模拟军演_选择对手", diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json index 65cc696..5018a82 100644 --- a/assets/resource/base/pipeline/startup.json +++ b/assets/resource/base/pipeline/startup.json @@ -8,6 +8,7 @@ "子任务_点击取消", "子任务_点击确认", "子任务_关闭公告", + "关闭周年弹窗", "签到", "首页标志1", "开始游戏", @@ -61,6 +62,7 @@ "next": [ "首页标志1", "子任务_关闭公告", + "关闭周年弹窗", "签到", "开始游戏" ] @@ -131,5 +133,17 @@ "is_sub": true, "action": "StartApp", "package": "com.megagame.crosscore/com.megagame.crosscore.extend.PhoneUtilActivity" + }, + "关闭周年弹窗": { + "recognition": "TemplateMatch", + "template": "StartUp/CloseOneYear.png", + "roi": [ + 1143, + 118, + 36, + 41 + ], + "action": "Click", + "green_mask": true } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/utils.json b/assets/resource/base/pipeline/utils.json index 598b6fc..1a3beff 100644 --- a/assets/resource/base/pipeline/utils.json +++ b/assets/resource/base/pipeline/utils.json @@ -36,10 +36,10 @@ "出击" ], "roi": [ - 1058, - 159, - 212, - 123 + 1134, + 603, + 97, + 51 ], "action": "Click", "next_doc": "Set in code." diff --git a/assets/resource/base/pipeline/weekinstance.json b/assets/resource/base/pipeline/weekinstance.json deleted file mode 100644 index f945f4b..0000000 --- a/assets/resource/base/pipeline/weekinstance.json +++ /dev/null @@ -1,641 +0,0 @@ -{ - "WeekInstance": { - "next": [ - "首页_出击", - "子任务_进入首页" - ] - }, - "ActivityExploration": { - "recognition": "OCR", - "expected": [ - "活动探索" - ], - "roi": [ - 540, - 98, - 215, - 95 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "ActivityExploration_1", - "ActivityExploration" - ] - }, - "ActivityExploration_1": { - "recognition": "OCR", - "expected": [ - "碎星虚影" - ], - "roi": [ - 450, - 443, - 302, - 98 - ], - "action": "Click", - "post_delay": 3000, - "next": [ - "ActivityExploration_Exist", - "ActivityExploration_2", - "ActivityExploration_1" - ] - }, - "ActivityExploration_2": { - "recognition": "OCR", - "expected": [ - "戈里刻虚影" - ], - "roi": [ - 100, - 333, - 500, - 154 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "ActivityExploration_第五关", - "ActivityExploration_SwipeDown", - "ActivityExploration_2" - ] - }, - "ActivityExploration_3": { - "recognition": "OCR", - "expected": [ - "虚影阿瑞斯" - ], - "roi": [ - 653, - 204, - 180, - 55 - ], - "action": "Click", - "next": [ - "ActivityExploration_Exist", - "ActivityExploration_Start" - ] - }, - "ActivityExploration_第五关": { - "recognition": "OCR", - "expected": [ - "虚影宙斯" - ], - "roi": [ - 682, - 456, - 180, - 180 - ], - "action": "Click", - "next": [ - "ActivityExploration_Exist", - "ActivityExploration_第五关Start" - ] - }, - "ActivityExploration_Exist": { - "recognition": "OCR", - "expected": [ - "600/600", - "6007600", - "6001600" - ], - "roi": [ - 86, - 623, - 152, - 40 - ], - "action": "Click", - "target": [ - 208, - 37, - 20, - 20 - ] - }, - "ActivityExploration_Start": { - "recognition": "OCR", - "expected": [ - "开始战斗" - ], - "roi": [ - 1057, - 615, - 200, - 89 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "ActivityExploration_Comfirm", - "ActivityExploration_关闭第二队", - "ActivityExploration_Start_1", - "ActivityExploration_Start", - "ActivityExploration_Step_1" - ] - }, - "ActivityExploration_第五关Start": { - "recognition": "OCR", - "expected": [ - "开始战斗" - ], - "roi": [ - 1057, - 615, - 200, - 89 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "ActivityExploration_Comfirm", - "ActivityExploration_关闭第二队", - "ActivityExploration_第五关Start_1", - "ActivityExploration_第五关Start", - "ActivityExploration_第五关Step_1" - ] - }, - "ActivityExploration_Comfirm": { - "is_sub": true, - "recognition": "OCR", - "expected": [ - "开启" - ], - "roi": [ - 722, - 405, - 190, - 94 - ], - "action": "Click", - "post_delay": 2000 - }, - "ActivityExploration_关闭第二队": { - "is_sub": true, - "recognition": "ColorMatch", - "roi": [ - 1153, - 380, - 21, - 14 - ], - "method": 4, - "lower": [ - 220, - 180, - 60 - ], - "upper": [ - 255, - 220, - 100 - ], - "count": 1, - "action": "Click" - }, - "ActivityExploration_Start_1": { - "recognition": "OCR", - "expected": [ - "开始行动" - ], - "roi": [ - 1057, - 615, - 200, - 89 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "ActivityExploration_Step_1", - "ActivityExploration_Start_1" - ] - }, - "ActivityExploration_第五关Start_1": { - "recognition": "OCR", - "expected": [ - "开始行动" - ], - "roi": [ - 1057, - 615, - 200, - 89 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "ActivityExploration_第五关Step_1", - "ActivityExploration_第五关Start_1" - ] - }, - "ActivityExploration_Step_1": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 705, - 284, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_Step_2" - ] - }, - "ActivityExploration_第五关Step_1": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 538, - 564, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_第五关Step_2" - ] - }, - "ActivityExploration_Step_2": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 588, - 221, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_Combating1", - "ActivityExploration_Step_2" - ] - }, - "ActivityExploration_第五关Step_2": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 415, - 384, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_第五关Step_3" - ] - }, - "ActivityExploration_Step_3": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 777, - 331, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_Combating2", - "ActivityExploration_Step_3" - ] - }, - "ActivityExploration_第五关Step_3": { - "recognition": "ColorMatch", - "roi": [ - 375, - 415, - 40, - 40 - ], - "method": 4, - "lower": [ - 80, - 135, - 55 - ], - "upper": [ - 120, - 180, - 120 - ], - "count": 1, - "pre_delay": 2000, - "action": "Click", - "target": [ - 332, - 260, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_第五关Step_4" - ] - }, - "ActivityExploration_第五关Step_4": { - "recognition": "ColorMatch", - "roi": [ - 377, - 419, - 40, - 40 - ], - "method": 4, - "lower": [ - 80, - 135, - 55 - ], - "upper": [ - 120, - 180, - 120 - ], - "count": 1, - "pre_delay": 2000, - "action": "Click", - "target": [ - 503, - 295, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_第五关Step_5" - ] - }, - "ActivityExploration_Step_4": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 592, - 186, - 20, - 20 - ], - "post_delay": 3000, - "next": [ - "ActivityExploration_Step_5" - ] - }, - "ActivityExploration_第五关Step_5": { - "recognition": "ColorMatch", - "roi": [ - 808, - 291, - 40, - 40 - ], - "method": 4, - "lower": [ - 80, - 135, - 55 - ], - "upper": [ - 120, - 180, - 120 - ], - "count": 1, - "pre_delay": 2000, - "action": "Click", - "target": [ - 680, - 224, - 20, - 20 - ], - "timeout": 40000, - "next": [ - "ActivityExploration_Combating3", - "ActivityExploration_第五关Step_5" - ] - }, - "ActivityExploration_Step_5": { - "recognition": "OCR", - "expected": [ - "行动" - ], - "roi": [ - 1052, - 11, - 130, - 64 - ], - "pre_delay": 2000, - "action": "Click", - "target": [ - 592, - 186, - 20, - 20 - ], - "timeout": 40000, - "next": [ - "ActivityExploration_Combating3", - "ActivityExploration_Step_5" - ] - }, - "ActivityExploration_Combating1": { - "recognition": "TemplateMatch", - "template": "Combat/Combat_Combating.png", - "roi": [ - 1169, - 27, - 105, - 59 - ], - "next": [ - "战斗_自动战斗", - "战斗_启用二倍速", - "ActivityExploration_CombatEnd1", - "ActivityExploration_Combating1" - ] - }, - "ActivityExploration_CombatEnd1": { - "recognition": "OCR", - "expected": [ - "等级" - ], - "roi": [ - 210, - 410, - 97, - 152 - ], - "action": "Click", - "next": [ - "子任务_获得物品", - "ActivityExploration_Step_3", - "ActivityExploration_CombatEnd1" - ] - }, - "ActivityExploration_Combating2": { - "recognition": "TemplateMatch", - "template": "Combat/Combat_Combating.png", - "roi": [ - 1169, - 27, - 105, - 59 - ], - "next": [ - "战斗_自动战斗", - "战斗_启用二倍速", - "ActivityExploration_CombatEnd2", - "ActivityExploration_Combating2" - ] - }, - "ActivityExploration_CombatEnd2": { - "recognition": "OCR", - "expected": [ - "等级" - ], - "roi": [ - 210, - 410, - 97, - 152 - ], - "action": "Click", - "next": [ - "子任务_获得物品", - "ActivityExploration_Step_4", - "ActivityExploration_CombatEnd2" - ] - }, - "ActivityExploration_Combating3": { - "recognition": "TemplateMatch", - "template": "Combat/Combat_Combating.png", - "roi": [ - 1169, - 27, - 105, - 59 - ], - "next": [ - "子任务_获得物品", - "战斗_自动战斗", - "战斗_启用二倍速", - "ActivityExploration_CombatEnd3", - "ActivityExploration_Combating3" - ] - }, - "ActivityExploration_CombatEnd3": { - "recognition": "OCR", - "expected": [ - "等级" - ], - "roi": [ - 210, - 410, - 97, - 152 - ], - "action": "Click", - "next": [ - "子任务_获得物品", - "ActivityExploration_第五关", - "ActivityExploration_CombatEnd3" - ] - }, - "ActivityExploration_SwipeUp": { - "is_sub": true, - "action": "Swipe", - "begin": [ - 617, - 196, - 40, - 40 - ], - "end": [ - 617, - 385, - 40, - 40 - ] - }, - "ActivityExploration_SwipeDown": { - "is_sub": true, - "action": "Swipe", - "begin": [ - 617, - 385, - 40, - 40 - ], - "end": [ - 617, - 196, - 40, - 40 - ] - } -} diff --git a/assets/resource/base/pipeline/weekinstance/ActivityExploration_fifth_ep.json b/assets/resource/base/pipeline/weekinstance/ActivityExploration_fifth_ep.json new file mode 100644 index 0000000..14b6b3b --- /dev/null +++ b/assets/resource/base/pipeline/weekinstance/ActivityExploration_fifth_ep.json @@ -0,0 +1,316 @@ +{ + "ActivityExploration_fifth_ep": { + "recognition": "OCR", + "expected": [ + "活动探索" + ], + "roi": [ + 540, + 98, + 215, + 95 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_碎星虚影", + "ActivityExploration_fifth_ep" + ] + }, + "ActivityExploration_碎星虚影": { + "recognition": "OCR", + "expected": [ + "碎星虚影" + ], + "roi": [ + 450, + 443, + 302, + 98 + ], + "action": "Click", + "post_delay": 3000, + "next": [ + "ActivityExploration_已获取资源", + "ActivityExploration_戈里刻虚影", + "ActivityExploration_碎星虚影" + ] + }, + "ActivityExploration_戈里刻虚影": { + "recognition": "OCR", + "expected": [ + "戈里刻虚影" + ], + "roi": [ + 100, + 333, + 500, + 154 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_第五关", + "ActivityExploration_SwipeDown", + "ActivityExploration_戈里刻虚影" + ] + }, + "ActivityExploration_第五关": { + "recognition": "OCR", + "expected": [ + "虚影宙斯" + ], + "roi": [ + 682, + 456, + 180, + 180 + ], + "action": "Click", + "next": [ + "ActivityExploration_已获取资源", + "ActivityExploration_第五关Start" + ] + }, + "ActivityExploration_第五关Start": { + "recognition": "OCR", + "expected": [ + "开始战斗" + ], + "roi": [ + 1057, + 615, + 200, + 89 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_Comfirm", + "ActivityExploration_关闭第二队", + "ActivityExploration_第五关Start_1", + "ActivityExploration_第五关Start", + "ActivityExploration_第五关Step_1" + ] + }, + "ActivityExploration_第五关Start_1": { + "recognition": "OCR", + "expected": [ + "开始行动" + ], + "roi": [ + 1057, + 615, + 200, + 89 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_第五关Step_1", + "ActivityExploration_第五关Start_1" + ] + }, + "ActivityExploration_第五关Step_1": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 538, + 564, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_第五关Step_2" + ] + }, + "ActivityExploration_第五关Step_2": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 415, + 384, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_第五关Step_3" + ] + }, + "ActivityExploration_第五关Step_3": { + "recognition": "ColorMatch", + "roi": [ + 375, + 415, + 40, + 40 + ], + "method": 4, + "lower": [ + 80, + 135, + 55 + ], + "upper": [ + 120, + 180, + 120 + ], + "count": 1, + "pre_delay": 2000, + "action": "Click", + "target": [ + 332, + 260, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_第五关Step_4" + ] + }, + "ActivityExploration_第五关Step_4": { + "recognition": "ColorMatch", + "roi": [ + 377, + 419, + 40, + 40 + ], + "method": 4, + "lower": [ + 80, + 135, + 55 + ], + "upper": [ + 120, + 180, + 120 + ], + "count": 1, + "pre_delay": 2000, + "action": "Click", + "target": [ + 503, + 295, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_第五关Step_5" + ] + }, + "ActivityExploration_第五关Step_5": { + "recognition": "ColorMatch", + "roi": [ + 808, + 291, + 40, + 40 + ], + "method": 4, + "lower": [ + 80, + 135, + 55 + ], + "upper": [ + 120, + 180, + 120 + ], + "count": 1, + "pre_delay": 2000, + "action": "Click", + "target": [ + 680, + 224, + 20, + 20 + ], + "timeout": 40000, + "next": [ + "ActivityExploration_第五关战斗中", + "ActivityExploration_第五关Step_5" + ] + }, + "ActivityExploration_第五关战斗中": { + "recognition": "TemplateMatch", + "template": "Combat/Combat_Combating.png", + "roi": [ + 1169, + 27, + 105, + 59 + ], + "next": [ + "子任务_获得物品", + "战斗_自动战斗", + "战斗_启用二倍速", + "ActivityExploration_第五关周报酬进度", + "ActivityExploration_第五关战斗结束", + "ActivityExploration_第五关战斗中" + ] + }, + "ActivityExploration_第五关战斗结束": { + "recognition": "OCR", + "expected": [ + "等级" + ], + "roi": [ + 210, + 410, + 97, + 152 + ], + "action": "Click", + "next": [ + "子任务_获得物品", + "ActivityExploration_第五关", + "ActivityExploration_第五关战斗结束" + ], + "todo_doc": "这个结束可能还是在局内,不是打玩宙斯的情况,有可能还要做其他检测" + }, + "ActivityExploration_第五关周报酬进度": { + "recognition": "OCR", + "expected": [ + "周报酬进度" + ], + "roi": [ + 578, + 269, + 125, + 28 + ], + "action": "Click", + "next": [ + "ActivityExploration_第五关战斗结束", + "ActivityExploration_第五关周报酬进度" + ] + } +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/weekinstance/ActivityExploration_first_ep.json b/assets/resource/base/pipeline/weekinstance/ActivityExploration_first_ep.json new file mode 100644 index 0000000..bd4b69c --- /dev/null +++ b/assets/resource/base/pipeline/weekinstance/ActivityExploration_first_ep.json @@ -0,0 +1,364 @@ +{ + "ActivityExploration_first_ep": { + "recognition": "OCR", + "expected": [ + "活动探索" + ], + "roi": [ + 540, + 98, + 215, + 95 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_碎星虚影_第一关", + "ActivityExploration_first_ep" + ] + }, + "ActivityExploration_碎星虚影_第一关": { + "recognition": "OCR", + "expected": [ + "碎星虚影" + ], + "roi": [ + 450, + 443, + 302, + 98 + ], + "action": "Click", + "post_delay": 3000, + "next": [ + "ActivityExploration_已获取资源", + "ActivityExploration_戈里刻虚影_第一关", + "ActivityExploration_碎星虚影_第一关" + ] + }, + "ActivityExploration_戈里刻虚影_第一关": { + "recognition": "OCR", + "expected": [ + "戈里刻虚影" + ], + "roi": [ + 100, + 333, + 500, + 154 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_第一关_step1", + "ActivityExploration_SwipeUp", + "ActivityExploration_戈里刻虚影_第一关" + ] + }, + "ActivityExploration_第一关_step1": { + "recognition": "OCR", + "expected": [ + "虚影赫尔墨斯" + ], + "roi": [ + 667, + 337, + 143, + 29 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_已获取资源", + "ActivityExploration_第一关_step2", + "ActivityExploration_第一关_step1" + ] + }, + "ActivityExploration_第一关_step2": { + "recognition": "OCR", + "expected": [ + "虚影阿瑞斯" + ], + "roi": [ + 653, + 204, + 180, + 55 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_已获取资源", + "ActivityExploration_第一关Start", + "ActivityExploration_第一关_step2" + ] + }, + "ActivityExploration_第一关Start": { + "recognition": "OCR", + "expected": [ + "开始战斗" + ], + "roi": [ + 1057, + 615, + 200, + 89 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_Comfirm", + "ActivityExploration_关闭第二队", + "ActivityExploration_Start_1", + "ActivityExploration_第一关Start", + "ActivityExploration_Step_1" + ] + }, + "ActivityExploration_Start_1": { + "recognition": "OCR", + "expected": [ + "开始行动" + ], + "roi": [ + 1057, + 615, + 200, + 89 + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "ActivityExploration_Step_1", + "ActivityExploration_Start_1" + ] + }, + "ActivityExploration_Step_1": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 705, + 284, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_Step_2" + ] + }, + "ActivityExploration_Step_2": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 588, + 221, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_第一关战斗中", + "ActivityExploration_Step_2" + ] + }, + "ActivityExploration_Step_3": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 777, + 331, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_Combating2", + "ActivityExploration_Step_3" + ] + }, + "ActivityExploration_Step_4": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 592, + 186, + 20, + 20 + ], + "post_delay": 3000, + "next": [ + "ActivityExploration_Step_5" + ] + }, + "ActivityExploration_Step_5": { + "recognition": "OCR", + "expected": [ + "行动" + ], + "roi": [ + 1052, + 11, + 130, + 64 + ], + "pre_delay": 2000, + "action": "Click", + "target": [ + 592, + 186, + 20, + 20 + ], + "timeout": 40000, + "next": [ + "ActivityExploration_第一关战斗中", + "ActivityExploration_第一关boss跳过", + "ActivityExploration_Step_5" + ] + }, + "ActivityExploration_第一关战斗中": { + "recognition": "TemplateMatch", + "template": "Combat/Combat_Combating.png", + "roi": [ + 1169, + 27, + 105, + 59 + ], + "next": [ + "战斗_自动战斗", + "战斗_启用二倍速", + "ActivityExploration_第一关战斗结束", + "ActivityExploration_第一关周报酬进度", + "ActivityExploration_第一关战斗中" + ] + }, + "ActivityExploration_第一关战斗结束": { + "recognition": "OCR", + "expected": [ + "等级" + ], + "roi": [ + 210, + 410, + 97, + 152 + ], + "action": "Click", + "next": [ + "子任务_获得物品", + "ActivityExploration_第一关_step1", + "ActivityExploration_Step_3", + "ActivityExploration_第一关战斗结束" + ] + }, + "ActivityExploration_Combating2": { + "recognition": "TemplateMatch", + "template": "Combat/Combat_Combating.png", + "roi": [ + 1169, + 27, + 105, + 59 + ], + "next": [ + "战斗_自动战斗", + "战斗_启用二倍速", + "ActivityExploration_CombatEnd2", + "ActivityExploration_Combating2" + ] + }, + "ActivityExploration_CombatEnd2": { + "recognition": "OCR", + "expected": [ + "等级" + ], + "roi": [ + 210, + 410, + 97, + 152 + ], + "action": "Click", + "next": [ + "子任务_获得物品", + "ActivityExploration_Step_4", + "ActivityExploration_CombatEnd2" + ] + }, + "ActivityExploration_第一关周报酬进度": { + "recognition": "OCR", + "expected": [ + "周报酬进度" + ], + "roi": [ + 578, + 269, + 125, + 28 + ], + "action": "Click", + "next": [ + "ActivityExploration_第一关战斗结束", + "ActivityExploration_第一关周报酬进度" + ] + }, + "ActivityExploration_第一关boss跳过": { + "recognition": "OCR", + "expected": [ + "跳过" + ], + "roi": [ + 1132, + 39, + 45, + 25 + ], + "action": "Click", + "next": [ + "ActivityExploration_第一关战斗中", + "ActivityExploration_Step_5", + "ActivityExploration_第一关boss跳过" + ] + } +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/weekinstance/weekinstance.json b/assets/resource/base/pipeline/weekinstance/weekinstance.json new file mode 100644 index 0000000..2450c6a --- /dev/null +++ b/assets/resource/base/pipeline/weekinstance/weekinstance.json @@ -0,0 +1,102 @@ +{ + "WeekInstance": { + "next": [ + "首页_出击", + "子任务_进入首页" + ] + }, + "ActivityExploration_已获取资源": { + "recognition": "OCR", + "expected": [ + "600/600", + "6007600", + "6001600", + "500/500", + "5007500", + "5001500" + ], + "roi": [ + 86, + 623, + 152, + 40 + ], + "action": "Click", + "target": [ + 208, + 37, + 20, + 20 + ] + }, + "ActivityExploration_Comfirm": { + "is_sub": true, + "recognition": "OCR", + "expected": [ + "开启" + ], + "roi": [ + 722, + 405, + 190, + 94 + ], + "action": "Click", + "post_delay": 2000 + }, + "ActivityExploration_关闭第二队": { + "is_sub": true, + "recognition": "ColorMatch", + "roi": [ + 1153, + 380, + 21, + 14 + ], + "method": 4, + "lower": [ + 220, + 180, + 60 + ], + "upper": [ + 255, + 220, + 100 + ], + "count": 1, + "action": "Click" + }, + "ActivityExploration_SwipeUp": { + "is_sub": true, + "action": "Swipe", + "begin": [ + 617, + 196, + 40, + 40 + ], + "end": [ + 617, + 385, + 40, + 40 + ] + }, + "ActivityExploration_SwipeDown": { + "is_sub": true, + "action": "Swipe", + "begin": [ + 617, + 385, + 40, + 40 + ], + "end": [ + 617, + 196, + 40, + 40 + ] + } +} \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..a935ea6 --- /dev/null +++ b/package.json @@ -0,0 +1,21 @@ +{ + "name": "mcca", + "version": "1.0.0", + "description": "基于全新架构的 交错战线 CrossCore 小助手。图像技术 + 模拟控制,解放双手! \r 由 [MaaFramework](https://github.com/MaaXYZ/MaaFramework) 强力驱动!", + "main": "index.js", + "scripts": { + "start:mad": "cd ./lib/MaaDebugger && python -m MaaDebugger --port 8080", + "start:ic": "cd ./deps/tools/ImageCropper && python main.py", + "build": "python ./install.py" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Htgs/MCCA.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/Htgs/MCCA/issues" + }, + "homepage": "https://github.com/Htgs/MCCA#readme" +} \ No newline at end of file