xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-26 18:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: 修复7-2三站拣垃圾

Browse Source
This commit is contained in:
LmeSzinc 2020-05-18 17:59:38 +08:00
parent db8c01431e
commit 47c4afdaae
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
campaign/campaign_main/campaign_7_2_mystery_farming.py
View File

@ -35,38 +35,23 @@ class Campaign(CampaignBase):
else:
self.clear_all_mystery(nearby=False)
grids = ROAD_MAIN.roadblocks().select(is_accessible=True, enemy_scale=3)
if grids:
self.clear_chosen_enemy(grids[0])
if self.clear_roadblocks([ROAD_MAIN], strongest=True):
return True
if self.clear_roadblocks([ROAD_MAIN]):
return True
grids = ROAD_MAIN.potential_roadblocks().select(is_accessible=True, enemy_scale=3)
if grids:
self.clear_chosen_enemy(grids[0])
return True
if self.clear_potential_roadblocks([ROAD_MAIN]):
if self.clear_potential_roadblocks([ROAD_MAIN], strongest=True):
return True
if self.clear_enemy(scale=(3,)):
return True
grids = ROAD_MAIN.first_roadblock().select(is_accessible=True, enemy_scale=2)
if grids:
self.clear_chosen_enemy(grids[0])
if self.clear_grids_for_faster(GRIDS_FOR_FASTER, scale=(2,)):
return True
if self.clear_enemy(scale=(2,)):
return True
if self.clear_grids_for_faster(GRIDS_FOR_FASTER):
return True
return self.battle_default()
battle_1 = battle_0
battle_2 = battle_0
def battle_3(self):
if self.config.C72_BOSS_FLEET_STEP_ON_A3:
ignore = None

3
module/reward/tactical_class.py
View File

@ -221,12 +221,13 @@ class RewardTacticalClass(UI, InfoHandler):
if self.handle_urgent_commission(save_get_items=False):
# Only one button in the middle, when skill reach max level.
continue
if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=1) \
if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \
and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
self.device.sleep(0.3)
self.device.screenshot()
self._tactical_books_choose()
self.device.click(TACTICAL_CLASS_START)
self.interval_reset(TACTICAL_CLASS_CANCEL)
continue
# End