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

Add: Research to GUI

Browse Source 
- Opt: Faster page switch in reward
This commit is contained in:
LmeSzinc
2020-07-17 09:28:11 +08:00
parent 1ff8a05014
commit 567c4a790a
10 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/reward/commission.py
View File

@@ -652,12 +652,12 @@ class RewardCommission(UI, InfoHandler):
"""
if not self.config.ENABLE_COMMISSION_REWARD:
return False
self.device.screenshot()
if not self.appear(COMMISSION_HAS_PENDING):
logger.info('No commission pending')
return False
self.ui_goto(page_commission)
self.ui_goto(page_commission, skip_first_screenshot=True)
self.commission_start()

7
module/reward/reward.py
View File

@@ -9,9 +9,10 @@ from module.reward.commission import RewardCommission
from module.reward.tactical_class import RewardTacticalClass
from module.ui.page import *
from module.update import Update
from module.research.research import RewardResearch
class Reward(RewardCommission, RewardTacticalClass, LoginHandler, Update):
class Reward(RewardCommission, RewardTacticalClass, RewardResearch, LoginHandler, Update):
def reward(self):
if not self.config.ENABLE_REWARD:
return False
@@ -26,7 +27,7 @@ class Reward(RewardCommission, RewardTacticalClass, LoginHandler, Update):
self.handle_commission_start()
self.handle_tactical_class()
self.ui_goto_main()
self.handle_research_reward()
self._reward_mission()
self.config.REWARD_LAST_TIME = datetime.now()
@@ -59,8 +60,6 @@ class Reward(RewardCommission, RewardTacticalClass, LoginHandler, Update):
exit_timer = Timer(1, count=3).start()
click_timer = Timer(1)
btn = []
if self.config.ENABLE_REWARD:
btn.append(REWARD_3)
if self.config.ENABLE_COMMISSION_REWARD:
btn.append(REWARD_1)
if self.config.ENABLE_OIL_REWARD: