diff --git a/resource/tasks.json b/resource/tasks.json index c453384f9a..c31575a93f 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -2720,6 +2720,45 @@ 100 ] }, + "InfrastClueSelfMaybeFull": { + "Doc": "有一种情况是,自己的线索满了,但是却没有new的标记", + "roi": [ + 1110, + 89, + 170, + 177 + ], + "action": "clickSelf", + "next": [ + "InfrastClueSelfFull", + "CloseCluePage" + ] + }, + "InfrastClueSelfFull": { + "roi": [ + 286, + 550, + 366, + 130 + ], + "next": [ + "CloseCluePageThenSendClue" + ] + }, + "CloseCluePageThenSendClue": { + "template": "CloseCluePage.png", + "action": "clickSelf", + "roi": [ + 930, + 50, + 120, + 120 + ], + "next": [ + "CloseCluePageThenSendClue", + "SendClues" + ] + }, "InfrastClueSelfNew": { "template": "ClueNew.png", "action": "clickSelf", @@ -3061,7 +3100,9 @@ 41 ], "next": [ - "InfrastClueSelfNew" + "InfrastClueSelfNew", + "InfrastClueFriendNew", + "ReceptionFlag" ] }, "ClueGiveToNextPage": { diff --git a/resource/template/InfrastClueSelfFull.png b/resource/template/InfrastClueSelfFull.png new file mode 100644 index 0000000000..8a4cd3b58e Binary files /dev/null and b/resource/template/InfrastClueSelfFull.png differ diff --git a/resource/template/InfrastClueSelfMaybeFull.png b/resource/template/InfrastClueSelfMaybeFull.png new file mode 100644 index 0000000000..7c34577040 Binary files /dev/null and b/resource/template/InfrastClueSelfMaybeFull.png differ diff --git a/src/MeoAssistant/InfrastReceptionTask.cpp b/src/MeoAssistant/InfrastReceptionTask.cpp index 12b3caa37e..f6d3f7af25 100644 --- a/src/MeoAssistant/InfrastReceptionTask.cpp +++ b/src/MeoAssistant/InfrastReceptionTask.cpp @@ -44,7 +44,7 @@ bool asst::InfrastReceptionTask::close_end_of_clue_exchange() bool asst::InfrastReceptionTask::get_clue() { - ProcessTask task_temp(*this, { "InfrastClueSelfNew", "InfrastClueFriendNew", "ReceptionFlag" }); + ProcessTask task_temp(*this, { "InfrastClueSelfNew", "InfrastClueFriendNew", "InfrastClueSelfMaybeFull", "ReceptionFlag" }); return task_temp.run(); }