sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-28 01:59:43 +08:00
Code Activity

Fix: Update map files and UI switches

Browse Source
This commit is contained in:
LmeSzinc
2023-04-27 22:34:59 +08:00
parent 0e7b9fe8c8
commit 196d687970
7 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
campaign/event_20201126_cn/campaign_base.py
View File

@@ -1,5 +1,6 @@
from module.base.button import Button from module.base.button import Button
from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.campaign.campaign_base import CampaignBase as CampaignBase_
from module.exception import CampaignNameError
from module.logger import logger from module.logger import logger
EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400), EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
@@ -15,6 +16,19 @@ class CampaignBase(CampaignBase_):
Mode switch is meaningless. Mode switch is meaningless.
""" """
@staticmethod
def _campaign_separate_name(name):
"""
Args:
name (str): Stage name in lowercase, such as 7-2, d3, sp3.
Returns:
tuple[str]: Campaign_name and stage index in lowercase, Such as ['7', '2'], ['d', '3'], ['sp', '3'].
"""
if name == 'vsp' or name == 'sp': # Difference
return 'ex_sp', '1'
return CampaignBase_._campaign_separate_name(name)
@staticmethod @staticmethod
def _campaign_get_chapter_index(name): def _campaign_get_chapter_index(name):
""" """
@@ -33,41 +47,18 @@ class CampaignBase(CampaignBase_):
return 1 return 1
elif name in ['b', 'd', 'ex_sp']: # Difference elif name in ['b', 'd', 'ex_sp']: # Difference
return 2 return 2
elif name in ['ex_ex']: # Difference
return 3
else: else:
raise CampaignNameError raise CampaignNameError
def campaign_set_chapter(self, name, mode='normal'): def campaign_set_chapter_sp(self, chapter, mode='normal'):
""" if chapter == 'sp':
Args:
name (str): Campaign name, such as '7-2', 'd3', 'sp3'.
mode (str): 'normal' or 'hard'.
"""
chapter, stage = self._campaign_separate_name(name)
if chapter.isdigit():
self.ui_weigh_anchor()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
elif chapter in 'abcd' or chapter == 'ex_sp':
self.ui_goto_event() self.ui_goto_event()
if chapter in 'ab':
self.campaign_ensure_mode('normal')
elif chapter in 'cd':
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
pass # Difference
self.campaign_ensure_chapter(index=chapter) self.campaign_ensure_chapter(index=chapter)
return True
elif chapter == 'sp':
self.ui_goto_event() # Difference
self.campaign_ensure_chapter(index=chapter)
else: else:
logger.warning(f'Unknown campaign chapter: {name}') return False
def is_event_animation(self): def is_event_animation(self):
""" """

17
campaign/event_20201126_cn/sp.py
View File

@@ -1,8 +1,7 @@
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
from .campaign_base import CampaignBase from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
MAP = CampaignMap('VSP') MAP = CampaignMap('VSP')
MAP.shape = 'I6' MAP.shape = 'I6'
@@ -48,6 +47,7 @@ class Config:
MAP_HAS_MAP_STORY = False MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = False MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = False MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
STAR_REQUIRE_1 = 0 STAR_REQUIRE_1 = 0
STAR_REQUIRE_2 = 0 STAR_REQUIRE_2 = 0
STAR_REQUIRE_3 = 0 STAR_REQUIRE_3 = 0
@@ -59,9 +59,16 @@ class Config:
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self): def battle_0(self):
if self.clear_siren(): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=2):
return True
return self.battle_default()
def battle_5(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True return True
return self.battle_default() return self.battle_default()

14
campaign/event_20201126_cn/sp1.py
View File

@@ -1,8 +1,7 @@
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
from .campaign_base import CampaignBase from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
MAP = CampaignMap('SP1') MAP = CampaignMap('SP1')
MAP.shape = 'H7' MAP.shape = 'H7'
@@ -48,6 +47,7 @@ class Config:
MAP_HAS_MAP_STORY = False MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
STAGE_ENTRANCE = ['normal', 'half'] # normal, blue, half STAGE_ENTRANCE = ['normal', 'half'] # normal, blue, half
@@ -69,8 +69,14 @@ class Config:
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self): def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default() return self.battle_default()
def battle_4(self): def battle_4(self):

11
campaign/event_20201126_cn/sp2.py
View File

@@ -1,8 +1,7 @@
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
from .campaign_base import CampaignBase from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .sp1 import Config as ConfigBase from .sp1 import Config as ConfigBase
MAP = CampaignMap('SP2') MAP = CampaignMap('SP2')
@@ -53,6 +52,7 @@ class Config(ConfigBase):
MAP_HAS_MAP_STORY = False MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SWIPE_MULTIPLY = 1.714 MAP_SWIPE_MULTIPLY = 1.714
@@ -61,10 +61,13 @@ class Config(ConfigBase):
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self): def battle_0(self):
if self.clear_siren(): if self.clear_siren():
return True return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default() return self.battle_default()

11
campaign/event_20201126_cn/sp3.py
View File

@@ -1,8 +1,7 @@
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
from .campaign_base import CampaignBase from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .sp1 import Config as ConfigBase from .sp1 import Config as ConfigBase
MAP = CampaignMap('SP3') MAP = CampaignMap('SP3')
@@ -54,6 +53,7 @@ class Config(ConfigBase):
MAP_HAS_MAP_STORY = False MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SWIPE_MULTIPLY = 1.626 MAP_SWIPE_MULTIPLY = 1.626
@@ -62,10 +62,13 @@ class Config(ConfigBase):
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self): def battle_0(self):
if self.clear_siren(): if self.clear_siren():
return True return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default() return self.battle_default()

11
campaign/event_20201126_cn/sp4.py
View File

@@ -1,8 +1,7 @@
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
from .campaign_base import CampaignBase from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .sp1 import Config as ConfigBase from .sp1 import Config as ConfigBase
MAP = CampaignMap('SP4') MAP = CampaignMap('SP4')
@@ -57,6 +56,7 @@ class Config(ConfigBase):
MAP_HAS_MAP_STORY = False MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SWIPE_MULTIPLY = 1.626 MAP_SWIPE_MULTIPLY = 1.626
@@ -65,6 +65,7 @@ class Config(ConfigBase):
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self): def battle_0(self):
if self.fleet_2_protect(): if self.fleet_2_protect():
@@ -72,6 +73,8 @@ class Campaign(CampaignBase):
if self.clear_siren(): if self.clear_siren():
return True return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default() return self.battle_default()

1
module/campaign/campaign_ui.py
View File

@@ -39,7 +39,6 @@ class CampaignUI(CampaignEvent, CampaignOcr):
current = self.get_chapter_index(self.device.image) current = self.get_chapter_index(self.device.image)
logger.attr("Index", current) logger.attr("Index", current)
logger.info([index, current, index - current])
diff = index - current diff = index - current
if diff == 0: if diff == 0:
break break