diff --git a/assets/resource/base/image/Wilderness/SummonlngSuccess.png b/assets/resource/base/image/Wilderness/SummonlngSuccess.png new file mode 100644 index 0000000..d38d379 Binary files /dev/null and b/assets/resource/base/image/Wilderness/SummonlngSuccess.png differ diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index 3faee9e..8a05e63 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -223,11 +223,31 @@ "doc": "铸币美学", "next": [ "ResourceChapter_MAEnter", - "Sub_SwipeRightForChapter", "Sub_ResourceChapterLabel" ] }, "ResourceChapter_MAEnter": { + "recognition": "OCR", + "expected": [ + "铸币" + ], + "replace": [ + "市", + "币" + ], + "roi": [ + 0, + 153, + 1280, + 367 + ], + "action": "Click", + "next": [ + "SwipeLeftAndFindStage", + "Sub_SwipeRightForChapter" + ] + }, + "ResourceChapter_MAEnter原": { "recognition": "TemplateMatch", "template": "Combat/ResourceChapter_MAEnter.png", "threshold": 0.9, diff --git a/assets/resource/base/pipeline/psychube.json b/assets/resource/base/pipeline/psychube.json index 46cdf84..a397604 100644 --- a/assets/resource/base/pipeline/psychube.json +++ b/assets/resource/base/pipeline/psychube.json @@ -104,6 +104,7 @@ "PsychubeSwitchToReplay": { "recognition": "TemplateMatch", "template": "Psychube/SwitchToReplay.png", + "threshold": 0.8, "roi": [ 548, 569, diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json index 3aa18ed..66332a0 100644 --- a/assets/resource/base/pipeline/startup.json +++ b/assets/resource/base/pipeline/startup.json @@ -77,7 +77,8 @@ "GameLoading", "Download", "StartGame", - "CloseAnnouncement" + "CloseAnnouncement", + "HomeFlag" ] }, "GameLoading": { diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json index fd5dcb9..25d51ea 100644 --- a/assets/resource/base/pipeline/wilderness.json +++ b/assets/resource/base/pipeline/wilderness.json @@ -2,6 +2,7 @@ "Wilderness": { "next": [ "EnterWilderness", + "EnterProduct", "CollectEXP", "CollectMoney", "CollectAwards", @@ -114,10 +115,29 @@ "CollectTrust", "TrustDialogueNext", "TrustDialogueInteraction", + "Sub_TestCritterTraining", "Sub_HomeButton", "HomeFlag" ] }, + "Sub_TestCritterTraining": { + "is_sub": true, + "recognition": "OCR", + "expected": "培训位置", + "roi": [ + 1076, + 0, + 204, + 131 + ], + "action": "Click", + "target": [ + 44, + 44, + 8, + 8 + ] + }, "TrustDialogueNext": { "recognition": "TemplateMatch", "template": "Wilderness/TrustDialogueNext.png", @@ -186,10 +206,30 @@ 0, 0 ], + "post_delay": 500, "action": "Click", "next": [ "CollectProduct", - "EnterProduct" + "EnterProduct", + "Sub_SummonlngSuccess" + ] + }, + "Sub_SummonlngSuccess": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Wilderness/SummonlngSuccess.png", + "roi": [ + 528, + 1, + 245, + 166 + ], + "action": "Click", + "target": [ + 44, + 44, + 8, + 8 ] }, "CollectProduct": { @@ -234,7 +274,8 @@ ], "action": "Click", "next": [ - "AutoSelectLeast" + "AutoSelectLeast", + "AutoSelectProducts" ] }, "AutoSelectLeast": { @@ -250,7 +291,8 @@ ], "action": "Click", "next": [ - "AutoSelectComfirm" + "AutoSelectComfirm", + "AutoSelectLeast" ] }, "AutoSelectComfirm": { @@ -266,6 +308,7 @@ ], "action": "Click", "next": [ + "AutoSelectComfirm", "CollectEXP", "CollectMoney", "CollectAwards",