mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 14:27:00 +08:00
Fix: Solve merge conflicts
- Fix typo UrgentCube-1:45 - Add auto mode control in auto search
This commit is contained in:
@@ -285,7 +285,7 @@ Commission:
|
||||
DailyEvent
|
||||
> Gem-8 > Gem-4 > Gem-2
|
||||
> Box-6 > Box-3 > Box-1
|
||||
> DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:40 > UrgentCube-2:15
|
||||
> DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:45 > UrgentCube-2:15
|
||||
> UrgentCube-3 > DailyCube-3 > UrgentCube-4 > UrgentCube-6
|
||||
> Major
|
||||
> DailyRescource > DailyChip
|
||||
|
||||
@@ -77,13 +77,14 @@ class ManualConfig:
|
||||
MAP_HAS_PORTAL = False
|
||||
MAP_HAS_LAND_BASED = False
|
||||
MAP_HAS_MAZE = False # event_20210422_cn adds maze and maze walls move every 3 rounds.
|
||||
MAP_HAS_FORTRESS = False # event_2021917_cn, clear fortress to remove roadblock to boss.
|
||||
MAP_FOCUS_ENEMY_AFTER_BATTLE = False # Operation siren
|
||||
MAP_ENEMY_TEMPLATE = ['Light', 'Main', 'Carrier', 'Treasure']
|
||||
MAP_SIREN_TEMPLATE = ['DD', 'CL', 'CA', 'BB', 'CV']
|
||||
MAP_ENEMY_GENRE_DETECTION_SCALING = {} # Key: str, Template name, Value: float, scaling factor
|
||||
MAP_SIREN_MOVE_WAIT = 1.5 # The enemy moving takes about 1.2 ~ 1.5s.
|
||||
MAP_SIREN_COUNT = 0
|
||||
MAP_MYSTERY_HAS_CARRIER = False
|
||||
MAP_HAS_MYSTERY = True
|
||||
MAP_GRID_CENTER_TOLERANCE = 0.1
|
||||
|
||||
MOVABLE_ENEMY_FLEET_STEP = 2
|
||||
|
||||
Reference in New Issue
Block a user