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

Opt: reward receiving logic optimization

Browse Source 
To ensure that nothing is pending before exiting page_reward. It also avoids using research_receive() function in RewardResearch class which might be unstable because of too many sleep().
This commit is contained in:
noname94
2020-09-27 03:12:41 +09:00
parent b9f230badf
commit f82b899e12
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/research/research.py
View File

@@ -341,11 +341,12 @@ class RewardResearch(ResearchSelector):
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, offset=(20, 20)): if not self.appear(RESEARCH_PENDING, offset=(20, 20)):
logger.info('No research finished or pending') logger.info('No research pending')
return False return False
self.ui_ensure_research() self.ui_ensure_research()
self.research_reward() self.research_reward()
self.ui_goto(page_reward, skip_first_screenshot=True)
return True return True

20
module/reward/reward.py
View File

@@ -46,11 +46,21 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardMeowff
self.ui_goto_main() self.ui_goto_main()
self.ui_goto(page_reward, skip_first_screenshot=True) self.ui_goto(page_reward, skip_first_screenshot=True)
self._reward_receive()
self.handle_info_bar() reward_handled = False
self.handle_commission_start() while 1:
self.handle_tactical_class() if reward_handled:
self.handle_research_reward() break
self._reward_receive()
self.handle_info_bar()
if self.handle_commission_start():
continue
if self.handle_tactical_class():
continue
if self.handle_research_reward():
continue
reward_handled = True
self.ui_goto(page_main, skip_first_screenshot=True) self.ui_goto(page_main, skip_first_screenshot=True)
self.handle_meowfficer() self.handle_meowfficer()

4
module/reward/tactical_class.py
View File

@@ -285,6 +285,4 @@ class RewardTacticalClass(UI):
if not self.config.ENABLE_TACTICAL_REWARD: if not self.config.ENABLE_TACTICAL_REWARD:
return False return False
self._tactical_class_receive() return self._tactical_class_receive()
return True