sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-13 12:37:01 +08:00
Code Activity

Merge branch 'master' into nightly

Browse Source
This commit is contained in:
Erik
2020-06-20 06:12:19 -03:00
committed by GitHub
parent c67f954350 888de8052d
commit 22bda2970f
8 changed files with 340 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/equipment/equipment.py
View File

@@ -17,7 +17,7 @@ class Equipment(InfoHandler):
equipment_has_take_on = False
def _view_swipe(self, distance, check_button=EQUIPMENT_OPEN):
swipe_timer = Timer(3, count=5)
swipe_timer = Timer(5, count=10)
SWIPE_CHECK.load_color(self.device.image)
while 1:
if not swipe_timer.started() or swipe_timer.reached():

4
module/exercise/combat.py
View File

@@ -80,12 +80,12 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
show_hp_timer.reset()
self._show_hp()
if self.appear_then_click(QUIT_CONFIRM, offset=True, interval=1):
if self.appear_then_click(QUIT_CONFIRM, offset=True, interval=5):
success = False
end = True
continue
if self.appear_then_click(QUIT_RECONFIRM, offset=True, interval=1):
if self.appear_then_click(QUIT_RECONFIRM, offset=True, interval=5):
self.interval_reset(QUIT_CONFIRM)
continue

4
module/handler/enemy_searching.py
View File

@@ -38,7 +38,9 @@ class EnemySearchingHandler(InfoHandler):
def is_in_stage(self):
if not self.appear(IN_STAGE, offset=(10, 10)):
return False
if self.stage_entrance is not None and not self.appear(self.stage_entrance, threshold=30):
if self.stage_entrance is not None \
and self.stage_entrance.area \
and not self.appear(self.stage_entrance, threshold=30):
return False
return True