From bfe67e2922e79d1ddb9c8390208a16614e5f9dd7 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 28 Feb 2026 04:17:37 +0800 Subject: [PATCH] Opt: swipe multiply in event_20260226_cn --- campaign/event_20260226_cn/a1.py | 4 ++++ campaign/event_20260226_cn/a2.py | 10 +++------- campaign/event_20260226_cn/a3.py | 10 ++-------- campaign/event_20260226_cn/b1.py | 4 ++++ campaign/event_20260226_cn/b2.py | 6 ------ campaign/event_20260226_cn/b3.py | 10 ++-------- campaign/event_20260226_cn/c1.py | 4 ++++ campaign/event_20260226_cn/c2.py | 10 +++------- campaign/event_20260226_cn/c3.py | 10 ++-------- campaign/event_20260226_cn/d1.py | 4 ++++ campaign/event_20260226_cn/d2.py | 6 ------ campaign/event_20260226_cn/d3.py | 10 ++-------- campaign/event_20260226_cn/sp.py | 6 +++++- 13 files changed, 35 insertions(+), 59 deletions(-) diff --git a/campaign/event_20260226_cn/a1.py b/campaign/event_20260226_cn/a1.py index cc3b8c59e..1f30ab703 100644 --- a/campaign/event_20260226_cn/a1.py +++ b/campaign/event_20260226_cn/a1.py @@ -56,12 +56,16 @@ class Config: 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 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 1729d1154..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 ++ ++ -- -- -- @@ -54,12 +54,8 @@ class Config(ConfigBase): 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 - 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 9663cc010..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 -- @@ -57,12 +57,6 @@ class Config(ConfigBase): 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 - 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 ccf7af706..88095243d 100644 --- a/campaign/event_20260226_cn/b1.py +++ b/campaign/event_20260226_cn/b1.py @@ -57,12 +57,16 @@ class Config: 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 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 2e22715d4..78bddb7c5 100644 --- a/campaign/event_20260226_cn/b2.py +++ b/campaign/event_20260226_cn/b2.py @@ -58,12 +58,6 @@ class Config(ConfigBase): 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 - 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 72a065516..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 ++ ++ ++ -- -- -- -- -- -- -- -- -- @@ -64,12 +64,6 @@ class Config(ConfigBase): 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 - 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 ca055193c..485086cd3 100644 --- a/campaign/event_20260226_cn/c1.py +++ b/campaign/event_20260226_cn/c1.py @@ -56,12 +56,16 @@ class Config: 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 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 d4b40db5b..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 ++ ++ -- -- -- @@ -54,12 +54,8 @@ class Config(ConfigBase): 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 - 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 daa8d23db..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 -- @@ -58,12 +58,6 @@ class Config(ConfigBase): 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 - 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 58bf65ecc..14139ff3a 100644 --- a/campaign/event_20260226_cn/d1.py +++ b/campaign/event_20260226_cn/d1.py @@ -57,12 +57,16 @@ class Config: 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 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 bc86ada32..c009cb3b7 100644 --- a/campaign/event_20260226_cn/d2.py +++ b/campaign/event_20260226_cn/d2.py @@ -59,12 +59,6 @@ class Config(ConfigBase): 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 - 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 d6ab29a65..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 ++ ++ ++ -- -- -- -- -- -- -- -- -- @@ -65,12 +65,6 @@ class Config(ConfigBase): 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 - 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 e6ece740c..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 -- @@ -59,6 +59,7 @@ class Config: 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 @@ -66,6 +67,9 @@ class Config: 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):