sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-02 14:11:13 +08:00
Code Activity

Fix: Mission rewards checks wrong page if research reward disabled

Browse Source
This commit is contained in:
LmeSzinc
2020-07-20 18:51:56 +08:00
parent edbbcd7577
commit 657445d59f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/research/research.py
View File

@@ -257,14 +257,13 @@ class RewardResearch(ResearchSelector):
""" """
Pages: Pages:
in: page_reward in: page_reward
out: page_main out: page_research or page_reward
""" """
if not self.config.ENABLE_RESEARCH_REWARD: if not self.config.ENABLE_RESEARCH_REWARD:
return False return False
if not self.appear(RESEARCH_FINISHED) and not self.appear(RESEARCH_PENDING): if not self.appear(RESEARCH_FINISHED) and not self.appear(RESEARCH_PENDING):
logger.info('No research finished or pending') logger.info('No research finished or pending')
self.ui_goto(page_main, skip_first_screenshot=True)
return False return False
self.ui_goto(page_research, skip_first_screenshot=True) self.ui_goto(page_research, skip_first_screenshot=True)
@@ -272,5 +271,4 @@ class RewardResearch(ResearchSelector):
self.research_reward() self.research_reward()
self.ui_goto(page_main, skip_first_screenshot=True)
return True return True

1
module/reward/reward.py
View File

@@ -28,6 +28,7 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, LoginHandler
self.handle_tactical_class() self.handle_tactical_class()
self.handle_research_reward() self.handle_research_reward()
self.ui_goto(page_main, skip_first_screenshot=True)
self._reward_mission() self._reward_mission()
self.config.REWARD_LAST_TIME = datetime.now() self.config.REWARD_LAST_TIME = datetime.now()