diff --git a/assets/interface.json b/assets/interface.json index f2bc519..f1934d1 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -969,7 +969,7 @@ { "name": "活动:地球上最后的夜晚 20 艰难", "pipeline_override": { - "ActivityEnterTheShow": { + "EnterTheActivityMain": { "template": "Combat/Activity/TheLastEveningOnEarthEnterTheShow.png" }, "TargetStageName": { @@ -983,7 +983,7 @@ { "name": "活动:东区黎明 19 艰难", "pipeline_override": { - "ActivityEnterTheShow": { + "EnterTheActivityMain": { "template": "Combat/Activity/LondonDawningEnterTheShow.png" }, "TargetStageName": { diff --git a/assets/resource/base/pipeline/anecdote.json b/assets/resource/base/pipeline/anecdote.json index e8691b5..37ea3bb 100644 --- a/assets/resource/base/pipeline/anecdote.json +++ b/assets/resource/base/pipeline/anecdote.json @@ -4,10 +4,10 @@ "next": [ "ActivityMainFlag", "ActivityMainAnecdoteFlag", - "AnecdoteMainFlag", - "EnterTheActivityMain" + "AnecdoteMainFlag" ], "interrupt": [ + "EnterTheActivityMain", "ActivityMainSelectAnecdote", "ReturnMain" ] @@ -731,22 +731,5 @@ 626 ], "action": "Click" - }, - "EnterTheActivityMain": { - "doc": "进入当期活动主界面", - "template_code": "在interface.json中修改template", - "recognition": "TemplateMatch", - "roi": [ - 885, - 123, - 340, - 183 - ], - "action": "Click", - "post_wait_freezes": 300, - "next": [ - "ActivityMainFlag", - "EnterTheActivityMain" - ] } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/combat_activity.json b/assets/resource/base/pipeline/combat_activity.json index c97638e..e78a484 100644 --- a/assets/resource/base/pipeline/combat_activity.json +++ b/assets/resource/base/pipeline/combat_activity.json @@ -1,13 +1,15 @@ { "ActivityEntry": { "next": [ - "ActivityEnterTheShow" + "ActivityMainChapter" ], "interrupt": [ + "EnterTheActivityMain", "ReturnMain" ] }, - "ActivityEnterTheShow": { + "EnterTheActivityMain": { + "doc": "进入当期活动主界面", "recognition": "TemplateMatch", "template_code": "Set in code", "roi": [ @@ -17,11 +19,15 @@ 183 ], "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ActivityMainChapter", - "ActivityEnterTheShow" - ] + "post_wait_freezes": { + "time": 500, + "target": [ + 0, + 179, + 190, + 541 + ] + } }, "ActivityMainChapter": { "recognition": "OCR",