opt: skip claim expedition when area not found

infstellar · Apr 29, 2023 · ff95f98 · ff95f98
1 parent 6ad1be9
commit ff95f98
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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