diff --git a/assets/cn/daily/reward/DAILY_QUEST_FULL.png b/assets/cn/daily/reward/DAILY_QUEST_FULL.png index a8d642e8c..b2b56116c 100644 Binary files a/assets/cn/daily/reward/DAILY_QUEST_FULL.png and b/assets/cn/daily/reward/DAILY_QUEST_FULL.png differ diff --git a/tasks/daily/assets/assets_daily_reward.py b/tasks/daily/assets/assets_daily_reward.py index 801afba63..8e5681070 100644 --- a/tasks/daily/assets/assets_daily_reward.py +++ b/tasks/daily/assets/assets_daily_reward.py @@ -157,10 +157,10 @@ DAILY_QUEST_FULL = ButtonWrapper( name='DAILY_QUEST_FULL', cn=Button( file='./assets/cn/daily/reward/DAILY_QUEST_FULL.png', - area=(159, 546, 298, 564), - search=(139, 526, 318, 584), - color=(128, 111, 80), - button=(159, 546, 298, 564), + area=(164, 574, 301, 592), + search=(144, 554, 321, 612), + color=(131, 113, 82), + button=(164, 574, 301, 592), ), ) DAILY_QUEST_GOTO = ButtonWrapper( diff --git a/tasks/daily/daily_quest.py b/tasks/daily/daily_quest.py index 18b45c72f..f50947ee5 100644 --- a/tasks/daily/daily_quest.py +++ b/tasks/daily/daily_quest.py @@ -116,7 +116,11 @@ class DailyQuestUI(DungeonUI): else: self.device.screenshot() - if self.appear(DAILY_QUEST_FULL) or self.appear(DAILY_QUEST_GOTO): + if self.appear(DAILY_QUEST_FULL): + logger.info('No more quests to get, activity full') + break + if self.appear(DAILY_QUEST_GOTO): + logger.info('No more quests to get, have quests uncompleted') break if self.appear_then_click(DAILY_QUEST_REWARD, interval=1): continue @@ -155,6 +159,7 @@ class DailyQuestUI(DungeonUI): self.device.screenshot() if self._no_reward_to_get(): + logger.info('No more reward to get') break if self.handle_reward(): continue @@ -192,7 +197,7 @@ class DailyQuestUI(DungeonUI): in: Any out: page_guide, Daily_Training """ - logger.hr('Get daily rewards', level=2) + logger.hr('Get daily rewards', level=1) self.dungeon_tab_goto(KEYWORDS_DUNGEON_TAB.Daily_Training) logger.info("Getting quest rewards") self._get_quest_reward()