From 189645b97ad06a1f982ebd23110aad4a81fa8312 Mon Sep 17 00:00:00 2001 From: positnuec <93694981+positnuec@users.noreply.github.com> Date: Sun, 12 Jul 2026 08:48:57 +0800 Subject: [PATCH] Fix: handle_exp_info signature mismatch causing TypeError in auto_search --- campaign/campaign_main/campaign_2_base.py | 4 ++-- campaign/campaign_main/campaign_3_base.py | 4 ++-- campaign/event_20220224_cn/campaign_base.py | 4 ++-- campaign/event_20220428_cn/campaign_base.py | 4 ++-- campaign/event_20220915_cn/campaign_base.py | 4 ++-- campaign/event_20221222_cn/campaign_base.py | 4 ++-- campaign/event_20230914_cn/campaign_base.py | 4 ++-- campaign/event_20240815_cn/campaign_base.py | 4 ++-- campaign/event_20240912_cn/campaign_base.py | 4 ++-- campaign/event_20250424_cn/campaign_base.py | 4 ++-- campaign/event_20250724_cn/campaign_base.py | 4 ++-- campaign/event_20250912_cn/campaign_base.py | 4 ++-- campaign/war_archives_20220224_cn/campaign_base.py | 4 ++-- campaign/war_archives_20220428_cn/campaign_base.py | 4 ++-- campaign/war_archives_20220915_cn/campaign_base.py | 4 ++-- campaign/war_archives_20221222_cn/campaign_base.py | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/campaign/campaign_main/campaign_2_base.py b/campaign/campaign_main/campaign_2_base.py index 5f1565154..ac7382866 100644 --- a/campaign/campaign_main/campaign_2_base.py +++ b/campaign/campaign_main/campaign_2_base.py @@ -3,8 +3,8 @@ from module.ui.page import page_campaign class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of Main Chapter 2 hits EXP_INFO_B if self.ui_page_appear(page_campaign): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/campaign_main/campaign_3_base.py b/campaign/campaign_main/campaign_3_base.py index 1567e3c6b..823f05f43 100644 --- a/campaign/campaign_main/campaign_3_base.py +++ b/campaign/campaign_main/campaign_3_base.py @@ -4,8 +4,8 @@ from module.ui.page import page_campaign class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of Main Chapter 3 hits EXP_INFO_B if self.ui_page_appear(page_campaign): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20220224_cn/campaign_base.py b/campaign/event_20220224_cn/campaign_base.py index c874590eb..47bda4bcd 100644 --- a/campaign/event_20220224_cn/campaign_base.py +++ b/campaign/event_20220224_cn/campaign_base.py @@ -8,8 +8,8 @@ class CampaignBase(CampaignBase_): self.config.MAP_SIREN_TEMPLATE = ['SS'] self.config.MAP_HAS_SIREN = True - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20220428_cn/campaign_base.py b/campaign/event_20220428_cn/campaign_base.py index cf328723b..c3efeab9a 100644 --- a/campaign/event_20220428_cn/campaign_base.py +++ b/campaign/event_20220428_cn/campaign_base.py @@ -3,8 +3,8 @@ from module.ui.page import page_event class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of chapter A hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20220915_cn/campaign_base.py b/campaign/event_20220915_cn/campaign_base.py index fc5e5f21b..8e7efbe07 100644 --- a/campaign/event_20220915_cn/campaign_base.py +++ b/campaign/event_20220915_cn/campaign_base.py @@ -13,8 +13,8 @@ class CampaignBase(CampaignBase_): MAP_ENEMY_SEARCHING.color, get_color(self.device.image, MAP_ENEMY_SEARCHING.area) ) > self.MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20221222_cn/campaign_base.py b/campaign/event_20221222_cn/campaign_base.py index 6e2175131..04a979e35 100644 --- a/campaign/event_20221222_cn/campaign_base.py +++ b/campaign/event_20221222_cn/campaign_base.py @@ -3,11 +3,11 @@ from module.ui.page import page_event class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) def map_data_init(self, map_): super().map_data_init(map_) diff --git a/campaign/event_20230914_cn/campaign_base.py b/campaign/event_20230914_cn/campaign_base.py index e1522a3f5..83f9dc494 100644 --- a/campaign/event_20230914_cn/campaign_base.py +++ b/campaign/event_20230914_cn/campaign_base.py @@ -4,8 +4,8 @@ from module.campaign.campaign_base import CampaignBase as CampaignBase_ class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20240815_cn/campaign_base.py b/campaign/event_20240815_cn/campaign_base.py index 415e17f00..7c5121b0c 100644 --- a/campaign/event_20240815_cn/campaign_base.py +++ b/campaign/event_20240815_cn/campaign_base.py @@ -84,8 +84,8 @@ class CampaignBase(CampaignBase_): return True return super().handle_campaign_ui_additional() - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20240912_cn/campaign_base.py b/campaign/event_20240912_cn/campaign_base.py index 3b0e28b0b..63eaa146a 100644 --- a/campaign/event_20240912_cn/campaign_base.py +++ b/campaign/event_20240912_cn/campaign_base.py @@ -40,8 +40,8 @@ class CampaignBase(CampaignBase_): ) return super().campaign_set_chapter_20241219(*args, **kwargs) - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/event_20250424_cn/campaign_base.py b/campaign/event_20250424_cn/campaign_base.py index c7a4d7a78..ebe10f736 100644 --- a/campaign/event_20250424_cn/campaign_base.py +++ b/campaign/event_20250424_cn/campaign_base.py @@ -5,11 +5,11 @@ from module.ui.page import page_campaign_menu, page_event class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) def ui_goto_event(self): if self.appear(EVENT_20250424_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): diff --git a/campaign/event_20250724_cn/campaign_base.py b/campaign/event_20250724_cn/campaign_base.py index ea0bf47cb..ce74ffc28 100644 --- a/campaign/event_20250724_cn/campaign_base.py +++ b/campaign/event_20250724_cn/campaign_base.py @@ -51,11 +51,11 @@ class CampaignBaseTS(CampaignBaseT): return True return super().campaign_set_chapter_20241219(chapter, stage, mode) - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Extra confirm button in chapter TS if self.appear_then_click(ALCHEMIST_MATERIAL_CONFIRM, offset=(20, 20), interval=1): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) def get_map_clear_percentage(self): if AUTO_SEARCH.appear(main=self): diff --git a/campaign/event_20250912_cn/campaign_base.py b/campaign/event_20250912_cn/campaign_base.py index e1522a3f5..83f9dc494 100644 --- a/campaign/event_20250912_cn/campaign_base.py +++ b/campaign/event_20250912_cn/campaign_base.py @@ -4,8 +4,8 @@ from module.campaign.campaign_base import CampaignBase as CampaignBase_ class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/war_archives_20220224_cn/campaign_base.py b/campaign/war_archives_20220224_cn/campaign_base.py index b8b32ebb9..d194dea25 100644 --- a/campaign/war_archives_20220224_cn/campaign_base.py +++ b/campaign/war_archives_20220224_cn/campaign_base.py @@ -8,8 +8,8 @@ class CampaignBase(CampaignBase_): self.config.MAP_SIREN_TEMPLATE = ['SS'] self.config.MAP_HAS_SIREN = True - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/war_archives_20220428_cn/campaign_base.py b/campaign/war_archives_20220428_cn/campaign_base.py index ac57105c1..69f9caee5 100644 --- a/campaign/war_archives_20220428_cn/campaign_base.py +++ b/campaign/war_archives_20220428_cn/campaign_base.py @@ -3,8 +3,8 @@ from module.ui.page import page_event class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of chapter A hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/war_archives_20220915_cn/campaign_base.py b/campaign/war_archives_20220915_cn/campaign_base.py index 2c904a5a8..93ca2e9ec 100644 --- a/campaign/war_archives_20220915_cn/campaign_base.py +++ b/campaign/war_archives_20220915_cn/campaign_base.py @@ -13,8 +13,8 @@ class CampaignBase(CampaignBase_): MAP_ENEMY_SEARCHING.color, get_color(self.device.image, MAP_ENEMY_SEARCHING.area) ) > self.MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) diff --git a/campaign/war_archives_20221222_cn/campaign_base.py b/campaign/war_archives_20221222_cn/campaign_base.py index 42e0ca3f9..487d13681 100644 --- a/campaign/war_archives_20221222_cn/campaign_base.py +++ b/campaign/war_archives_20221222_cn/campaign_base.py @@ -3,11 +3,11 @@ from module.ui.page import page_event class CampaignBase(CampaignBase_): - def handle_exp_info(self): + def handle_exp_info(self, handle_fail=False): # Random background of hits EXP_INFO_B if self.ui_page_appear(page_event): return False - return super().handle_exp_info() + return super().handle_exp_info(handle_fail=handle_fail) def map_data_init(self, map_): super().map_data_init(map_)