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

Fix: Research receive in page_reward if AzurStats enabled

Browse Source
This commit is contained in:
LmeSzinc
2021-07-11 19:21:39 +08:00
parent fb0552d960
commit c8b0238e57
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/base/base.py
View File

@@ -97,7 +97,7 @@ class ModuleBase:
def wait_until_stable(self, button, timer=Timer(0.3, count=1), timeout=Timer(5, count=10), skip_first_screenshot=True): def wait_until_stable(self, button, timer=Timer(0.3, count=1), timeout=Timer(5, count=10), skip_first_screenshot=True):
button._match_init = False button._match_init = False
timeout.start() timeout.reset()
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False

6
module/reward/reward.py
View File

@@ -122,8 +122,10 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardDorm,
(self.config.ENABLE_OIL_REWARD and self.appear_then_click(OIL, interval=60)) (self.config.ENABLE_OIL_REWARD and self.appear_then_click(OIL, interval=60))
or (self.config.ENABLE_COIN_REWARD and self.appear_then_click(COIN, interval=60)) or (self.config.ENABLE_COIN_REWARD and self.appear_then_click(COIN, interval=60))
or (self.config.ENABLE_COMMISSION_REWARD and self.appear_then_click(REWARD_1, interval=1)) or (self.config.ENABLE_COMMISSION_REWARD and self.appear_then_click(REWARD_1, interval=1))
or (self.config.ENABLE_RESEARCH_REWARD and or (self.config.ENABLE_RESEARCH_REWARD
not self.config.ENABLE_SAVE_GET_ITEMS and self.appear_then_click(REWARD_3, interval=1)) and not self.config.ENABLE_SAVE_GET_ITEMS
and not self.config.ENABLE_AZURSTAT
and self.appear_then_click(REWARD_3, interval=1))
): ):
exit_timer.reset() exit_timer.reset()
click_timer.reset() click_timer.reset()