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

Fix: Resolve merge conflict ui/ui.py and ui/assets.py

Browse Source
This commit is contained in:
nEEtdo0d
2021-07-18 10:05:21 -04:00
parent 7f6fcaf508 96e388d7ab
commit 0477870c41
59 changed files with 225 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/reward/reward.py
View File

@@ -124,8 +124,10 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardDorm,
(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_COMMISSION_REWARD and self.appear_then_click(REWARD_1, interval=1))
or (self.config.ENABLE_RESEARCH_REWARD and
not self.config.ENABLE_SAVE_GET_ITEMS and self.appear_then_click(REWARD_3, interval=1))
or (self.config.ENABLE_RESEARCH_REWARD
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()
click_timer.reset()