1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-02 07:14:07 +08:00

Fix: W16 map data

This commit is contained in:
LmeSzinc
2026-03-30 02:39:51 +08:00
parent 33e812adb8
commit b993a5e8b4
6 changed files with 30 additions and 7 deletions

View File

@@ -7,8 +7,8 @@ from .campaign_16_base_submarine import Config as ConfigBase
MAP = CampaignMap('16-1')
MAP.shape = 'I9'
MAP.camera_data = ['C2', 'C6', 'F2', 'F6']
MAP.camera_data_spawn_point = ['F6']
MAP.camera_data = ['C2', 'C6', 'F2', 'F5']
MAP.camera_data_spawn_point = ['F7']
MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """
++ ME -- -- ME -- -- ME --
@@ -57,6 +57,7 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
MAP_SWIPE_MULTIPLY = (1.050, 1.069)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.015, 1.034)
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.985, 1.003)

View File

@@ -54,6 +54,7 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
MAP_SWIPE_MULTIPLY = (1.093, 1.113)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.057, 1.077)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.026, 1.045)

View File

@@ -7,7 +7,7 @@ from .campaign_16_base_aircraft import Config as ConfigBase
MAP = CampaignMap('16-3')
MAP.shape = 'K6'
MAP.camera_data = ['C2', 'C5', 'F2', 'F5', 'H2', 'H5']
MAP.camera_data = ['D3', 'E4', 'G2', 'H2']
MAP.camera_data_spawn_point = ['C5']
MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """
@@ -30,7 +30,11 @@ MAP.spawn_data = [
{'battle': 0, 'enemy': 3},
{'battle': 1, 'enemy': 6},
{'battle': 2, 'enemy': 3},
{'battle': 3, 'boss': 1},
{'battle': 3},
{'battle': 4},
{'battle': 5},
{'battle': 6},
{'battle': 7, 'boss': 1},
]
MAP.spawn_data_loop = [
{'battle': 0, 'enemy': 3},
@@ -56,6 +60,7 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
MAP_SWIPE_MULTIPLY = (1.180, 1.202)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.141, 1.162)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.108, 1.128)

View File

@@ -7,7 +7,7 @@ from .campaign_16_base_aircraft import Config as ConfigBase
MAP = CampaignMap('16-4')
MAP.shape = 'K8'
MAP.camera_data = ['C2', 'C6', 'F2', 'F6', 'H2', 'H6']
MAP.camera_data = ['C2', 'F5', 'F2', 'H2', 'H5']
MAP.camera_data_spawn_point = ['C6']
MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """
@@ -31,6 +31,17 @@ MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 5},
{'battle': 1, 'enemy': 3},
{'battle': 2, 'enemy': 5},
{'battle': 3},
{'battle': 4},
{'battle': 5},
{'battle': 6},
{'battle': 7},
{'battle': 8, 'boss': 1},
]
MAP.spawn_data_loop = [
{'battle': 0, 'enemy': 5},
{'battle': 1, 'enemy': 3},
{'battle': 2, 'enemy': 5},
@@ -54,6 +65,7 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
MAP_SWIPE_MULTIPLY = (1.003, 1.022)
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.970, 0.988)
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.942, 0.959)

View File

@@ -17,7 +17,9 @@ class Config:
'prominence': 10,
'distance': 35,
}
HOMO_CANNY_THRESHOLD = (50, 100)
# Handle fog on map, static homography parameters and lower canny threshold
HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
HOMO_CANNY_THRESHOLD = (50, 80)
class CampaignBase(CampaignBase_):

View File

@@ -14,9 +14,11 @@ class CampaignBase(CampaignBase_):
ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M'
def map_init(self, map_):
# submarine battle after entering map
# all emenies spawned already, so no need to wait enemy searching
if self.use_support_fleet:
logger.hr(f'{self.FUNCTION_NAME_BASE}SUBMARINE', level=2)
self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False)
self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False, expected_end='no_searching')
super().map_init(map_)
def handle_submarine_support_popup(self):