diff --git a/campaign/event_20260226_cn/a1.py b/campaign/event_20260226_cn/a1.py index 15977c32e..1f30ab703 100644 --- a/campaign/event_20260226_cn/a1.py +++ b/campaign/event_20260226_cn/a1.py @@ -55,13 +55,17 @@ class Config: MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True - # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.179, 1.201) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/a2.py b/campaign/event_20260226_cn/a2.py index f58f6b446..b69f02818 100644 --- a/campaign/event_20260226_cn/a2.py +++ b/campaign/event_20260226_cn/a2.py @@ -6,7 +6,7 @@ from .a1 import Config as ConfigBase MAP = CampaignMap('A2') MAP.shape = 'J7' -MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data = ['D2', 'D5', 'E4'] MAP.camera_data_spawn_point = ['D5'] MAP.map_data = """ -- ME -- -- ME ++ ++ -- -- -- @@ -53,13 +53,9 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/a3.py b/campaign/event_20260226_cn/a3.py index 63e3ae5fb..677b7771f 100644 --- a/campaign/event_20260226_cn/a3.py +++ b/campaign/event_20260226_cn/a3.py @@ -6,8 +6,8 @@ from .a1 import Config as ConfigBase MAP = CampaignMap('A3') MAP.shape = 'H8' -MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] -MAP.camera_data_spawn_point = ['D2'] +MAP.camera_data = ['D4', 'D6', 'E3'] +MAP.camera_data_spawn_point = ['D4'] MAP.map_data = """ ++ ++ -- -- ME -- -- ME ++ ++ MS -- -- -- ME -- @@ -56,13 +56,7 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/b1.py b/campaign/event_20260226_cn/b1.py index bbe3d0026..88095243d 100644 --- a/campaign/event_20260226_cn/b1.py +++ b/campaign/event_20260226_cn/b1.py @@ -56,13 +56,17 @@ class Config: MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True - # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.138, 1.160) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/b2.py b/campaign/event_20260226_cn/b2.py index 64e29d2fc..78bddb7c5 100644 --- a/campaign/event_20260226_cn/b2.py +++ b/campaign/event_20260226_cn/b2.py @@ -57,13 +57,7 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/b3.py b/campaign/event_20260226_cn/b3.py index 0a020206d..c8032c4ee 100644 --- a/campaign/event_20260226_cn/b3.py +++ b/campaign/event_20260226_cn/b3.py @@ -6,8 +6,8 @@ from .b1 import Config as ConfigBase MAP = CampaignMap('B3') MAP.shape = 'I10' -MAP.camera_data = ['D2', 'D6', 'D8', 'F2', 'F6', 'F8'] -MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8'] +MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ ++ ++ ++ SP -- SP ++ ++ ++ -- -- -- -- -- -- -- -- -- @@ -63,13 +63,7 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/c1.py b/campaign/event_20260226_cn/c1.py index 84216d3fe..485086cd3 100644 --- a/campaign/event_20260226_cn/c1.py +++ b/campaign/event_20260226_cn/c1.py @@ -55,13 +55,17 @@ class Config: MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True - # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.179, 1.201) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/c2.py b/campaign/event_20260226_cn/c2.py index 759fbb65d..7879eb122 100644 --- a/campaign/event_20260226_cn/c2.py +++ b/campaign/event_20260226_cn/c2.py @@ -6,7 +6,7 @@ from .c1 import Config as ConfigBase MAP = CampaignMap('C2') MAP.shape = 'J7' -MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data = ['D2', 'D5', 'E4'] MAP.camera_data_spawn_point = ['D5'] MAP.map_data = """ -- ME -- -- ME ++ ++ -- -- -- @@ -53,13 +53,9 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/c3.py b/campaign/event_20260226_cn/c3.py index 3092de3d6..ffba35361 100644 --- a/campaign/event_20260226_cn/c3.py +++ b/campaign/event_20260226_cn/c3.py @@ -6,8 +6,8 @@ from .c1 import Config as ConfigBase MAP = CampaignMap('C3') MAP.shape = 'H8' -MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] -MAP.camera_data_spawn_point = ['D2'] +MAP.camera_data = ['D4', 'D6', 'E3'] +MAP.camera_data_spawn_point = ['D4'] MAP.map_data = """ ++ ++ -- -- ME -- -- ME ++ ++ MS -- -- -- ME -- @@ -57,13 +57,7 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/d1.py b/campaign/event_20260226_cn/d1.py index 84a52e495..14139ff3a 100644 --- a/campaign/event_20260226_cn/d1.py +++ b/campaign/event_20260226_cn/d1.py @@ -56,13 +56,17 @@ class Config: MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True - # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.138, 1.160) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/d2.py b/campaign/event_20260226_cn/d2.py index 9ac50ce44..c009cb3b7 100644 --- a/campaign/event_20260226_cn/d2.py +++ b/campaign/event_20260226_cn/d2.py @@ -58,13 +58,7 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/d3.py b/campaign/event_20260226_cn/d3.py index 8d1ad5734..cc783a8b7 100644 --- a/campaign/event_20260226_cn/d3.py +++ b/campaign/event_20260226_cn/d3.py @@ -6,8 +6,8 @@ from .d1 import Config as ConfigBase MAP = CampaignMap('D3') MAP.shape = 'I10' -MAP.camera_data = ['D2', 'D6', 'D8', 'F2', 'F6', 'F8'] -MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8'] +MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ ++ ++ ++ SP -- SP ++ ++ ++ -- -- -- -- -- -- -- -- -- @@ -64,13 +64,7 @@ class Config(ConfigBase): MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/sp.py b/campaign/event_20260226_cn/sp.py index 605d921d6..0352d024f 100644 --- a/campaign/event_20260226_cn/sp.py +++ b/campaign/event_20260226_cn/sp.py @@ -5,7 +5,7 @@ from module.logger import logger MAP = CampaignMap('SP') MAP.shape = 'H7' -MAP.camera_data = ['D2', 'D5', 'E2', 'E5'] +MAP.camera_data = ['D5', 'E2', 'E5'] MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ -- -- -- -- ++ -- ME -- @@ -55,16 +55,21 @@ class Config: MAP_HAS_FLEET_STEP = True MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True STAR_REQUIRE_1 = 0 STAR_REQUIRE_2 = 0 STAR_REQUIRE_3 = 0 # ===== End of generated config ===== + + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = False + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_IS_ONE_TIME_STAGE = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.162, 1.184) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.124, 1.145) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.091, 1.111) class Campaign(CampaignBase): diff --git a/module/campaign/campaign_ocr.py b/module/campaign/campaign_ocr.py index 9dc04193e..f39a29ae8 100644 --- a/module/campaign/campaign_ocr.py +++ b/module/campaign/campaign_ocr.py @@ -41,11 +41,21 @@ class CampaignOcr(ModuleBase): @staticmethod def _campaign_ocr_result_process(result): # The result will be like '7--2', because tha dash in game is '–' not '-' - result = result.lower().replace('--', '-').replace('--', '-') - if result.startswith('-'): - result = result[1:] + result = result.replace('--', '-').replace('--', '-').lstrip('-') + + # Replace wrong 'I' from results like 'I1-1', '1I-1', 'I-I', '11-I', 'I4-4', to '1' + # while keeping results like 'isp-2', 'sp1' + def replace_func(match): + segment = match.group(0) + return segment.replace('I', '1') + + result = re.sub(r'[0-9I]+-[0-9I]+', replace_func, result, count=1) + + # Convert '72' to '7-2' if len(result) == 2 and result[0].isdigit(): result = '-'.join(result) + + result = result.lower() return result @staticmethod diff --git a/module/os/fleet.py b/module/os/fleet.py index 035d9eac1..981b63f2b 100644 --- a/module/os/fleet.py +++ b/module/os/fleet.py @@ -20,7 +20,7 @@ from module.os.assets import FLEET_EMP_DEBUFF, MAP_EXIT, MAP_GOTO_GLOBE, STRONGH from module.os.camera import OSCamera from module.os.map_base import OSCampaignMap from module.os_ash.ash import OSAsh -from module.os_combat.combat import Combat +from module.os_combat.combat import Combat, BATTLE_PREPARATION, SIREN_PREPARATION from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER from module.os_shop.assets import PORT_SUPPLY_CHECK from module.ui.assets import BACK_ARROW @@ -319,6 +319,13 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): clicked_story_count = 0 stuck_timer = Timer(20, count=5).start() confirm_timer.reset() + + def abyssal_expected_end(): + # add handle_map_event() because OSCombat.combat_status() removes get_items + if self.handle_map_event(drop=drop): + return False + return self.is_in_map() + for _ in self.loop(skip_first=skip_first_screenshot): # Map event event = self.handle_map_event(drop=drop) @@ -395,7 +402,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): if self.combat_appear(): # Use ui_back() for testing, because there are too few abyssal loggers every month. # self.ui_back(check_button=self.is_in_map) - self.combat(expected_end=self.is_in_map, fleet_index=self.fleet_show_index, save_get_items=drop) + self.combat(expected_end=abyssal_expected_end, fleet_index=self.fleet_show_index, save_get_items=drop) confirm_timer.reset() stuck_timer.reset() result.add('event') @@ -760,6 +767,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): logger.hr('BOSS leave') # Update local view self.update_os() + self.predict() click_timer = Timer(3) pause_interval = Timer(0.5, count=1) @@ -773,8 +781,13 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): # Re-enter boss accidentally if pause_interval.reached(): - if self.combat_appear(): - logger.info(f'combat_appear -> {BACK_ARROW}') + if self.appear(BATTLE_PREPARATION): + logger.info(f'{BATTLE_PREPARATION} -> {BACK_ARROW}') + self.device.click(BACK_ARROW) + pause_interval.reset() + continue + if self.appear(SIREN_PREPARATION, offset=(20, 20)): + logger.info(f'{SIREN_PREPARATION} -> {BACK_ARROW}') self.device.click(BACK_ARROW) pause_interval.reset() continue diff --git a/module/webui/patch.py b/module/webui/patch.py index 1e4d7407f..6f799d85f 100644 --- a/module/webui/patch.py +++ b/module/webui/patch.py @@ -50,20 +50,16 @@ def patch_mimetype(): all deployment, we use the builtin mimetype table only. """ import mimetypes - if mimetypes.inited: - # ohno mimetypes already inited - db = mimetypes.MimeTypes() - mimetypes._db = db - # override global variable - mimetypes.encodings_map = db.encodings_map - mimetypes.suffix_map = db.suffix_map - mimetypes.types_map = db.types_map[True] - mimetypes.common_types = db.types_map[False] - else: - # init db with the default table - db = mimetypes.MimeTypes() - mimetypes._db = db - mimetypes.inited = True + # lock as inited + mimetypes.inited = True + # create a new clean instance + db = mimetypes.MimeTypes(filenames=()) + mimetypes._db = db + # override global variable + mimetypes.encodings_map = db.encodings_map + mimetypes.suffix_map = db.suffix_map + mimetypes.types_map = db.types_map[True] + mimetypes.common_types = db.types_map[False] def fix_py37_subprocess_communicate():