sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 20:58:19 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-08-22 01:49:37 +08:00
parent 71c079bd0f 5a897f7031
commit 36bf3acfef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/map/camera.py
View File

@@ -94,7 +94,7 @@ class Camera(InfoHandler):
logger.info('Perspective error cause by info bar. Waiting.') logger.info('Perspective error cause by info bar. Waiting.')
self.handle_info_bar() self.handle_info_bar()
return self.update(camera=camera) return self.update(camera=camera)
elif self.appear(IN_STAGE): elif self.appear(IN_STAGE, offset=(5, 5)):
logger.warning('Image is in stage') logger.warning('Image is in stage')
raise CampaignEnd('Image is in stage') raise CampaignEnd('Image is in stage')
elif not self.appear(IN_MAP): elif not self.appear(IN_MAP):

2
module/reward/reward.py
View File

@@ -68,7 +68,7 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardMeowff
return True return True
def handle_reward(self): 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 return False
flag = self.reward() flag = self.reward()