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

Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"

Browse Source 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
This commit is contained in:
whoamikyo
2020-08-18 20:47:27 -03:00
parent bdc5aa0720
commit ac9303012c
741 changed files with 8380 additions and 18943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/combat/submarine.py
View File

@@ -7,7 +7,6 @@ from module.logger import logger
class SubmarineCall(ModuleBase):
submarine_call_flag = False
submarine_call_timer = Timer(5)
submarine_call_click_timer = Timer(1)
def submarine_call_reset(self):
"""
@@ -30,20 +29,13 @@ class SubmarineCall(ModuleBase):
logger.info('Submarine call timer reached')
self.submarine_call_flag = True
return False
if not self.appear(SUBMARINE_AVAILABLE_CHECK_1) or not self.appear(SUBMARINE_AVAILABLE_CHECK_2):
return False
if self.appear(SUBMARINE_CALLED):
logger.info('Submarine called')
self.submarine_call_flag = True
return False
elif self.submarine_call_click_timer.reached():
if self.appear_then_click(SUBMARINE_READY):
logger.info('Call submarine')
return True
else:
logger.info('Incorrect submarine icon')
self.device.click(SUBMARINE_READY)
logger.info('Call submarine')
return True
if self.appear_then_click(SUBMARINE_READY, interval=1):
logger.info('Call submarine')
return True