LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 23:29:30 +08:00
Code Activity

Merge branch 'master_lme'

Browse Source 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
This commit is contained in:
Zuosizhu
2023-07-15 20:24:33 +08:00
parent 68a2ba7c12 ab59c58ca4
commit 0935b58ede
123 changed files with 630 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/raid/raid.py
View File

@@ -154,6 +154,7 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
GGHandler(config=self.config, device=self.device).power_limit('Raid')
skip_first_screenshot = True
# No need, already waited in `raid_execute_once()`
# if emotion_reduce:
# self.emotion.wait(fleet_index)
@@ -248,6 +249,8 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
break
def raid_expected_end(self):
if self.appear_then_click(RAID_REWARDS, offset=(30, 30), interval=3):
return False
return self.appear(RAID_CHECK, offset=(30, 30))
def raid_execute_once(self, mode, raid):