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

Merge branch 'LmeSzinc:master' into master

Browse Source
This commit is contained in:
Zuosizhu
2023-07-15 06:48:33 +08:00
committed by GitHub
parent 1bf0e4752c ab59c58ca4
commit b5da0cc106
92 changed files with 444 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/raid/raid.py
View File

@@ -149,6 +149,7 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
"""
logger.info('Combat preparation.')
skip_first_screenshot = True
# No need, already waited in `raid_execute_once()`
# if emotion_reduce:
# self.emotion.wait(fleet_index)
@@ -243,9 +244,9 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
break
def raid_expected_end(self):
if self.appear_then_click(RAID_REWARDS, offset=(30,30), interval=3):
if self.appear_then_click(RAID_REWARDS, offset=(30, 30), interval=3):
return False
return self.appear(RAID_CHECK, offset=(30,30))
return self.appear(RAID_CHECK, offset=(30, 30))
def raid_execute_once(self, mode, raid):
"""