From ff95f9859fefaae08c9041a0c47b5427ac6737b9 Mon Sep 17 00:00:00 2001 From: infstellar <98541813+infstellar@users.noreply.github.com> Date: Sat, 29 Apr 2023 10:13:56 +0800 Subject: [PATCH] opt: skip claim expedition when area not found --- source/commission/commission_parser.py | 1 + source/task/claim_reward/claim_reward.py | 3 ++- update_note.md | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/commission/commission_parser.py b/source/commission/commission_parser.py index 12a3be07..1fde4250 100644 --- a/source/commission/commission_parser.py +++ b/source/commission/commission_parser.py @@ -33,6 +33,7 @@ def traverse_mondstant(self): self.commission_dicts = [] commission_positions = [] ui_control.ensure_page(UIPages.page_bigmap) + genshin_map.get_bigmap_posi() genshin_map._switch_to_area("Mondstadt") for posi in self.TRAVERSE_MONDSTADT_POSITION: genshin_map.get_bigmap_posi() diff --git a/source/task/claim_reward/claim_reward.py b/source/task/claim_reward/claim_reward.py index de5fc28a..aa58eb8f 100644 --- a/source/task/claim_reward/claim_reward.py +++ b/source/task/claim_reward/claim_reward.py @@ -52,7 +52,8 @@ def reset_character(): break i+=80 for area in [ButtonExpeditionMD, ButtonExpeditionLY, ButtonExpeditionDQ, ButtonExpeditionXM]: - itt.appear_then_click(area) + r = itt.appear_then_click(area) + if not r: continue itt.delay("2animation") reset_character() diff --git a/update_note.md b/update_note.md index 54d4eebb..310b3ded 100644 --- a/update_note.md +++ b/update_note.md @@ -1,6 +1,4 @@ ## TODO: -- time dilation rate -- i18n - 传送点识别区域还是不够大 - domain 退出 识别错误 - combat sco shield与复活不兼容 考虑加入usd。 @@ -21,6 +19,9 @@ - combat lib识别受ui限制 ## Done: +- time dilation rate +- i18n +- 支持无须弥人 - aim operator move to enemy按空格 - 让sco get_characters_name()在continue时获得charalist - move straight在移动视角前按下了w