From 7ec2523688b4e3db14504efcdb99288b05465ea3 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:28:53 +0800 Subject: [PATCH 1/3] Fix: Handle popup in synthesize_rarity_set() --- tasks/item/synthesize.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tasks/item/synthesize.py b/tasks/item/synthesize.py index c6963713f..0426df522 100644 --- a/tasks/item/synthesize.py +++ b/tasks/item/synthesize.py @@ -9,6 +9,7 @@ from module.exception import ScriptError from module.logger import logger from module.ocr.ocr import Digit, Ocr from tasks.base.page import page_menu, page_synthesize +from tasks.combat.assets.assets_combat_obtain import ITEM_CLOSE from tasks.combat.obtain import CombatObtain from tasks.item.assets.assets_item_synthesize import * from tasks.item.inventory import InventoryManager @@ -178,6 +179,10 @@ class Synthesize(CombatObtain, ItemUI): self.device.click(SWITCH_RARITY) switched = True continue + if self.appear_then_click(ITEM_CLOSE, interval=2): + continue + if self.handle_reward(): + continue return switched From 5521ff9e671dc2cec0d17fbf98b475a986067a59 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:36:28 +0800 Subject: [PATCH 2/3] Upd: Enlarge search area of dungeon tabs --- assets/share/dungeon/ui/TAB_SEARCH.png | Bin 0 -> 17757 bytes tasks/dungeon/assets/assets_dungeon_ui.py | 10 ++++++++++ tasks/dungeon/ui.py | 8 ++++++++ 3 files changed, 18 insertions(+) create mode 100644 assets/share/dungeon/ui/TAB_SEARCH.png diff --git a/assets/share/dungeon/ui/TAB_SEARCH.png b/assets/share/dungeon/ui/TAB_SEARCH.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4e7bbd219abd16f0de3d1e53aa35324a4207fd GIT binary patch literal 17757 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 literal 0 HcmV?d00001 diff --git a/tasks/dungeon/assets/assets_dungeon_ui.py b/tasks/dungeon/assets/assets_dungeon_ui.py index d70a8e5b3..77c5fe3e6 100644 --- a/tasks/dungeon/assets/assets_dungeon_ui.py +++ b/tasks/dungeon/assets/assets_dungeon_ui.py @@ -153,6 +153,16 @@ SURVIVAL_INDEX_LOADED = ButtonWrapper( button=(451, 286, 476, 302), ), ) +TAB_SEARCH = ButtonWrapper( + name='TAB_SEARCH', + share=Button( + file='./assets/share/dungeon/ui/TAB_SEARCH.png', + area=(139, 84, 599, 144), + search=(119, 64, 619, 164), + color=(92, 87, 83), + button=(139, 84, 599, 144), + ), +) TREASURES_LIGHTWARD_CHECK = ButtonWrapper( name='TREASURES_LIGHTWARD_CHECK', share=Button( diff --git a/tasks/dungeon/ui.py b/tasks/dungeon/ui.py index 4ab40761e..571771f00 100644 --- a/tasks/dungeon/ui.py +++ b/tasks/dungeon/ui.py @@ -33,6 +33,14 @@ from tasks.map.keywords import KEYWORDS_MAP_WORLD, MapPlane class DungeonTabSwitch(Switch): + def add_state(self, state, check_button, click_button=None): + # Load search + if check_button is not None: + check_button.load_search(TAB_SEARCH.area) + if click_button is not None: + click_button.load_search(TAB_SEARCH.area) + return super().add_state(state, check_button, click_button) + def click(self, state, main): """ Args: From 7293ad467ac6892fcd3ee3c17d1e6b9247c64cee Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:44:00 +0800 Subject: [PATCH 3/3] Fix: Clear click record after synthesize_rarity_reset() cause too many similar clicks when selecting items --- tasks/item/synthesize.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/item/synthesize.py b/tasks/item/synthesize.py index 0426df522..78f9c7822 100644 --- a/tasks/item/synthesize.py +++ b/tasks/item/synthesize.py @@ -310,6 +310,7 @@ class Synthesize(CombatObtain, ItemUI): inv.select(first) logger.hr('Synthesize select view', level=2) + self.device.click_record_clear() switch_row = True while 1: # End @@ -329,6 +330,7 @@ class Synthesize(CombatObtain, ItemUI): logger.info('Reached inventory view end, reset view') self.synthesize_rarity_reset(inv=inv) logger.hr('Synthesize select view', level=2) + self.device.click_record_clear() continue else: logger.info('Reached inventory list end, no more rows')