From c0ed80e7059e94fefc66a2ec1d400259936e959c Mon Sep 17 00:00:00 2001 From: W1NDes Date: Fri, 24 Oct 2025 04:15:10 +0800 Subject: [PATCH] =?UTF-8?q?Fix(event):=20=E4=BF=AE=E5=A4=8D=E8=BE=B9?= =?UTF-8?q?=E7=BC=98=E7=BA=BF=E6=B7=B1=E8=89=B2=E8=8C=83=E5=9B=B4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- campaign/event_20251023_cn/t1.py | 2 +- campaign/event_20251023_cn/t4.py | 2 +- campaign/event_20251023_cn/t5.py | 2 +- campaign/event_20251023_cn/t6.py | 2 +- dev_tools/grids_debug.py | 18 +++++++++++++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/campaign/event_20251023_cn/t1.py b/campaign/event_20251023_cn/t1.py index 7d8c1ed0c..86d519a40 100644 --- a/campaign/event_20251023_cn/t1.py +++ b/campaign/event_20251023_cn/t1.py @@ -71,7 +71,7 @@ class Config: 'distance': 50, 'wlen': 1000 } - HOMO_EDGE_COLOR_RANGE = (0, 17) + HOMO_EDGE_COLOR_RANGE = (0, 30) HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 MAP_SIREN_HAS_BOSS_ICON_SMALL = True MAP_SWIPE_MULTIPLY = (1.084, 1.104) diff --git a/campaign/event_20251023_cn/t4.py b/campaign/event_20251023_cn/t4.py index 671bddcf9..630d1301a 100644 --- a/campaign/event_20251023_cn/t4.py +++ b/campaign/event_20251023_cn/t4.py @@ -58,7 +58,7 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - + HOMO_EDGE_COLOR_RANGE = (0, 17) # swipe multiply same as T1 diff --git a/campaign/event_20251023_cn/t5.py b/campaign/event_20251023_cn/t5.py index ac8c46d7c..1698bb416 100644 --- a/campaign/event_20251023_cn/t5.py +++ b/campaign/event_20251023_cn/t5.py @@ -65,7 +65,7 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - + HOMO_EDGE_COLOR_RANGE = (0, 17) # swipe multiply same as T1 diff --git a/campaign/event_20251023_cn/t6.py b/campaign/event_20251023_cn/t6.py index b08e8de01..43d970b14 100644 --- a/campaign/event_20251023_cn/t6.py +++ b/campaign/event_20251023_cn/t6.py @@ -56,7 +56,7 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - + HOMO_EDGE_COLOR_RANGE = (0, 17) # Big boss at the middle MAP_SWIPE_PREDICT_WITH_CURRENT_FLEET = True MAP_SWIPE_MULTIPLY = (1.171, 1.193) diff --git a/dev_tools/grids_debug.py b/dev_tools/grids_debug.py index c662d79be..b962e25cd 100644 --- a/dev_tools/grids_debug.py +++ b/dev_tools/grids_debug.py @@ -1,3 +1,5 @@ +import sys +sys.path.append(r'D:/M-AzurLaneAutoScript') import module.config.server as server server.server = 'cn' # Don't need to edit, it's used to avoid error. @@ -53,6 +55,20 @@ class Config: Step 1: Paste your config here. """ + INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (80, 255 - 17), + 'width': (0.9, 10), + 'prominence': 10, + 'distance': 35, + } + EDGE_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (255 - 17, 255), + 'prominence': 10, + 'distance': 50, + 'wlen': 1000 + } + HOMO_EDGE_COLOR_RANGE = (0, 30) + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 pass @@ -60,7 +76,7 @@ class Config: Step 2: Put your image here. """ -file = '' +file = 'C:/Users/W1NDes/Documents/MuMu共享文件夹/Screenshots/test9.png' image = np.array(Image.open(file).convert('RGB'))