sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 01:43:43 +08:00
Code Activity

Fix: Handle RAID_REWARDS at raid ocr (#2838)

Browse Source
This commit is contained in:
LmeSzinc
2023-07-07 00:38:10 +08:00
parent cc93296e60
commit 54d4920a63
2 changed files with 8 additions and 2 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.') logger.info('Combat preparation.')
skip_first_screenshot = True skip_first_screenshot = True
# No need, already waited in `raid_execute_once()` # No need, already waited in `raid_execute_once()`
# if emotion_reduce: # if emotion_reduce:
# self.emotion.wait(fleet_index) # self.emotion.wait(fleet_index)
@@ -243,9 +244,9 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
break break
def raid_expected_end(self): 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 False
return self.appear(RAID_CHECK, offset=(30,30)) return self.appear(RAID_CHECK, offset=(30, 30))
def raid_execute_once(self, mode, raid): def raid_execute_once(self, mode, raid):
""" """

5
module/raid/run.py
View File

@@ -2,6 +2,7 @@ from module.base.timer import Timer
from module.campaign.campaign_event import CampaignEvent from module.campaign.campaign_event import CampaignEvent
from module.exception import ScriptEnd, ScriptError from module.exception import ScriptEnd, ScriptError
from module.logger import logger from module.logger import logger
from module.raid.assets import RAID_REWARDS
from module.raid.raid import OilExhausted, Raid, raid_ocr from module.raid.raid import OilExhausted, Raid, raid_ocr
from module.ui.page import page_raid from module.ui.page import page_raid
@@ -49,6 +50,10 @@ class RaidRun(Raid, CampaignEvent):
remain, _, _ = result remain, _, _ = result
logger.attr(f'{mode.capitalize()} Remain', remain) logger.attr(f'{mode.capitalize()} Remain', remain)
if self.appear_then_click(RAID_REWARDS, offset=(30, 30), interval=3):
confirm_timer.reset()
continue
# End # End
if remain == prev: if remain == prev:
if confirm_timer.reached(): if confirm_timer.reached():