sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 12:47:53 +08:00
Code Activity

Fix: Resolve to allow upstream pull

Browse Source
This commit is contained in:
nEEtdo0d
2021-10-10 23:34:02 -04:00
parent 2524df3cf5 c68f9c1ccd
commit 5cb9ee1895
419 changed files with 38969 additions and 11678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
campaign/campaign_hard/campaign_hard.py
View File

@@ -36,8 +36,8 @@ class Campaign(CampaignBase, HardEquipment):
# except CampaignEnd:
# logger.hr('Campaign end')
def fleet_preparation(self):
self.equipment_take_on()
# def fleet_preparation(self):
# self.equipment_take_on()
def _expected_combat_end(self, expected):
return 'in_stage'

2
campaign/campaign_main/campaign_12_2_leveling.py
View File

@@ -56,7 +56,7 @@ class Campaign(CampaignBase):
.count
logger.attr('S2_enemy', current)
if self.s3_enemy_count >= self.config.C122_S3_TOLERANCE and current == 0:
if self.s3_enemy_count >= self.config.C122MediumLeveling_LargeEnemyTolerance and current == 0:
self.withdraw()
def battle_0(self):

10
campaign/campaign_main/campaign_12_4_leveling.py
View File

@@ -69,18 +69,18 @@ class Campaign(CampaignBase):
current = self.map.select(is_enemy=True, enemy_scale=3).count
logger.attr('S3_enemy', current)
if self.battle_count == self.config.C124_NON_S3_ENTER_TOLERANCE \
and self.config.C124_NON_S3_WITHDRAW_TOLERANCE < 10:
if self.battle_count == self.config.C124LargeLeveling_NonLargeEnterTolerance \
and self.config.C124LargeLeveling_NonLargeRetreatTolerance < 10:
if self.s3_enemy_count + current == 0:
self.withdraw()
elif self.battle_count > self.config.C124_NON_S3_ENTER_TOLERANCE:
if self.non_s3_enemy_count >= self.config.C124_NON_S3_WITHDRAW_TOLERANCE and current == 0:
elif self.battle_count > self.config.C124LargeLeveling_NonLargeEnterTolerance:
if self.non_s3_enemy_count >= self.config.C124LargeLeveling_NonLargeRetreatTolerance and current == 0:
self.withdraw()
def battle_0(self):
self.check_s3_enemy()
if self.battle_count >= self.config.C124_AMMO_PICK_UP:
if self.battle_count >= self.config.C124LargeLeveling_PickupAmmo:
self.pick_up_ammo()
if self.clear_enemy(scale=(3,), genre=['light', 'carrier', 'enemy', 'treasure', 'main']):

4
campaign/campaign_main/campaign_1_1_affinity_farming.py
View File

@@ -23,8 +23,8 @@ class Campaign(CampaignBase):
affinity_battle = 0
def battle_default(self):
while self.affinity_battle < self.config.C11_AFFINITY_BATTLE_COUNT:
logger.attr('Affinity_battle', f'{self.affinity_battle}/{self.config.C11_AFFINITY_BATTLE_COUNT}')
while self.affinity_battle < self.config.C11AffinityFarming_RunCount:
logger.attr('Affinity_battle', f'{self.affinity_battle}/{self.config.C11AffinityFarming_RunCount}')
self.goto(C1)
self.affinity_battle += 1
self.goto(D1 if np.random.uniform() < 0.7 else B1)

8
campaign/campaign_main/campaign_7_2_mystery_farming.py
View File

@@ -27,7 +27,7 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.config.C72_BOSS_FLEET_STEP_ON_A3:
if self.config.C72MysteryFarming_StepOnA3:
if self.fleet_2_step_on(FLEET_2_STEP_ON, roadblocks=[ROAD_MAIN]):
return True
@@ -59,7 +59,7 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_3(self):
if self.config.C72_BOSS_FLEET_STEP_ON_A3:
if self.config.C72MysteryFarming_StepOnA3:
ignore = None
if self.fleet_at(A3, fleet=2):
ignore = SelectedGrids([A2])
@@ -81,3 +81,7 @@ class Campaign(CampaignBase):
if not self.map.select(is_mystery=True):
self.withdraw()
@property
def _map_battle(self):
return 3

5
campaign/campaign_sos/campaign_10_5.py
View File

@@ -68,7 +68,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_6(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_3_5.py
View File

@@ -72,7 +72,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_3(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_4_5.py
View File

@@ -82,7 +82,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_4(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_5_5.py
View File

@@ -76,7 +76,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_4(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_6_5.py
View File

@@ -65,7 +65,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_5(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_7_5.py
View File

@@ -68,7 +68,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_5(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_8_5.py
View File

@@ -83,7 +83,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_4(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

5
campaign/campaign_sos/campaign_9_5.py
View File

@@ -67,7 +67,4 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_5(self):
if not self.config.FLEET_2:
return self.fleet_1.clear_boss()
else:
return self.fleet_2.clear_boss()
self.fleet_boss.clear_boss()

11
campaign/campaign_war_archives/campaign_base.py
View File

@@ -1,6 +1,6 @@
from module.base.button import Button
from module.base.utils import area_offset, get_color, random_rectangle_vector
from module.base.utils import random_rectangle_vector
from module.campaign.campaign_base import CampaignBase as CampaignBase_
from module.exception import RequestHumanTakeover
from module.logger import logger
from module.ui.assets import WAR_ARCHIVES_CHECK
from module.ui.page import page_archives
@@ -90,10 +90,9 @@ class CampaignBase(CampaignBase_):
skip_first_screenshot=True)
self.handle_stage_icon_spawn()
else:
logger.warning(
'Respective server may not yet support the chosen War Archives campaign, check back in the next '
'app update')
exit(1)
logger.critical('Respective server may not yet support the chosen War Archives campaign, '
'check back in the next app update')
raise RequestHumanTakeover
# Subsequent runs all set False
if self.first_run: