mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-09 18:39:04 +08:00
Merge branch 'master' into dev
This commit is contained in:
commit
36bf3acfef
@ -94,7 +94,7 @@ class Camera(InfoHandler):
|
||||
logger.info('Perspective error cause by info bar. Waiting.')
|
||||
self.handle_info_bar()
|
||||
return self.update(camera=camera)
|
||||
elif self.appear(IN_STAGE):
|
||||
elif self.appear(IN_STAGE, offset=(5, 5)):
|
||||
logger.warning('Image is in stage')
|
||||
raise CampaignEnd('Image is in stage')
|
||||
elif not self.appear(IN_MAP):
|
||||
|
||||
@ -68,7 +68,7 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardMeowff
|
||||
return True
|
||||
|
||||
def handle_reward(self):
|
||||
if datetime.now() - self.config.REWARD_LAST_TIME < timedelta(minutes=self.reward_interval):
|
||||
if datetime.now() - self.config.REWARD_LAST_TIME < timedelta(seconds=self.reward_interval):
|
||||
return False
|
||||
|
||||
flag = self.reward()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user