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

Fix: Mis-click HOME when skipping story

Browse Source 
- Fix daily hard when fleet lock disabled
This commit is contained in:
LmeSzinc
2020-08-03 16:28:22 +08:00
parent a4706662cb
commit 4cc9c0481a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/handler/info_handler.py
View File

@@ -99,6 +99,8 @@ class InfoHandler(ModuleBase):
if self.story_popup_timout.started() and not self.story_popup_timout.reached(): if self.story_popup_timout.started() and not self.story_popup_timout.reached():
if self.handle_popup_confirm('STORY_SKIP'): if self.handle_popup_confirm('STORY_SKIP'):
self.story_popup_timout = Timer(10) self.story_popup_timout = Timer(10)
self.interval_reset(STORY_SKIP)
self.interval_reset(STORY_LETTERS_ONLY)
return True return True
if self.appear_then_click(STORY_SKIP, offset=True, interval=2): if self.appear_then_click(STORY_SKIP, offset=True, interval=2):
self.story_popup_timout.reset() self.story_popup_timout.reset()

4
module/reward/reward.py
View File

@@ -220,6 +220,7 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, LoginHandler
_enable_daily_reward = False _enable_daily_reward = False
_fleet_auto_mode = ('combat_auto', 'combat_auto', 'combat_auto') _fleet_auto_mode = ('combat_auto', 'combat_auto', 'combat_auto')
_enable_map_fleet_lock = False
def reward_backup_daily_reward_settings(self): def reward_backup_daily_reward_settings(self):
""" """
@@ -229,7 +230,10 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, LoginHandler
self.config.ENABLE_DAILY_REWARD = False self.config.ENABLE_DAILY_REWARD = False
self._fleet_auto_mode = self.config.FLEET_1_AUTO_MODE, self.config.FLEET_2_AUTO_MODE, self.config.FLEET_3_AUTO_MODE self._fleet_auto_mode = self.config.FLEET_1_AUTO_MODE, self.config.FLEET_2_AUTO_MODE, self.config.FLEET_3_AUTO_MODE
self.config.FLEET_1_AUTO_MODE, self.config.FLEET_2_AUTO_MODE, self.config.FLEET_3_AUTO_MODE = ('combat_auto', 'combat_auto', 'combat_auto') self.config.FLEET_1_AUTO_MODE, self.config.FLEET_2_AUTO_MODE, self.config.FLEET_3_AUTO_MODE = ('combat_auto', 'combat_auto', 'combat_auto')
self._enable_map_fleet_lock = self.config.ENABLE_MAP_FLEET_LOCK
self.config.ENABLE_MAP_FLEET_LOCK = True
def reward_recover_daily_reward_settings(self): def reward_recover_daily_reward_settings(self):
self.config.ENABLE_DAILY_REWARD = self._enable_daily_reward self.config.ENABLE_DAILY_REWARD = self._enable_daily_reward
self.config.FLEET_1_AUTO_MODE, self.config.FLEET_2_AUTO_MODE, self.config.FLEET_3_AUTO_MODE = self._fleet_auto_mode self.config.FLEET_1_AUTO_MODE, self.config.FLEET_2_AUTO_MODE, self.config.FLEET_3_AUTO_MODE = self._fleet_auto_mode
self.config.ENABLE_MAP_FLEET_LOCK = self._enable_map_fleet_lock