From 39546d55c6cd81ec8aa6f51b0917b49662f7ab54 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 2 Jan 2025 00:49:13 +0800 Subject: [PATCH 1/2] Fix: get_event_story_state should not have interval --- module/eventstory/eventstory.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/eventstory/eventstory.py b/module/eventstory/eventstory.py index 0556460c4..10fcf5f6c 100644 --- a/module/eventstory/eventstory.py +++ b/module/eventstory/eventstory.py @@ -109,16 +109,16 @@ class EventStory(CampaignUI, Combat, LoginHandler): Returns: str: 'finish', 'story', 'unknown' """ - if self.match_template_color(STORY_FINISHED, offset=(20, 20), interval=3): + if self.match_template_color(STORY_FINISHED, offset=(20, 20)): return 'finish' - if self.appear_then_click(STORY_FIRST, offset=(20, 20), interval=3): + if self.appear_then_click(STORY_FIRST, offset=(20, 20)): return 'story' - if self.match_template_color(STORY_LAST, offset=(20, 20), interval=3): + if self.match_template_color(STORY_LAST, offset=(20, 20)): return 'story' - if self.appear_then_click(STORY_MIDDLE, offset=(20, 200), interval=3): + if self.appear_then_click(STORY_MIDDLE, offset=(20, 200)): return 'story' - if self.appear_then_click(BATTLE_MIDDLE, offset=(20, 200), interval=3): + if self.appear_then_click(BATTLE_MIDDLE, offset=(20, 200)): return 'story' return 'unknown' From 3be9adc4855d730cc6c7a8ee91678a2eb07e0ed6 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 2 Jan 2025 01:04:51 +0800 Subject: [PATCH 2/2] Fix: Switch handler in campaign_ensure_aside_20241219 --- module/campaign/campaign_ui.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/campaign/campaign_ui.py b/module/campaign/campaign_ui.py index d64a1e35b..c83373f32 100644 --- a/module/campaign/campaign_ui.py +++ b/module/campaign/campaign_ui.py @@ -139,13 +139,13 @@ class CampaignUI(MapOperation, CampaignEvent, CampaignOcr): chapter: 'part1', 'part2', 'sp', 'ex' """ if chapter in ['part1', 'a', 'c', 't']: - MODE_SWITCH_20241219.set('part1', main=self) + ASIDE_SWITCH_20241219.set('part1', main=self) elif chapter in ['part2', 'b', 'd']: - MODE_SWITCH_20241219.set('part2', main=self) + ASIDE_SWITCH_20241219.set('part2', main=self) elif chapter in ['sp', 'ex_sp']: - MODE_SWITCH_20241219.set('sp', main=self) + ASIDE_SWITCH_20241219.set('sp', main=self) elif chapter in ['ex', 'ex_ex']: - MODE_SWITCH_20241219.set('sp', main=self) + ASIDE_SWITCH_20241219.set('ex', main=self) else: logger.warning(f'Unknown campaign aside: {chapter}')