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

Fix: Larger BEACON_ENTER search range

Browse Source
This commit is contained in:
LmeSzinc
2022-07-14 21:52:02 +08:00
parent fe0e7072e6
commit 88af4cf33a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/os_ash/ash.py
View File

@@ -84,6 +84,7 @@ class AshCombat(Combat):
class OSAsh(UI, MapEventHandler): class OSAsh(UI, MapEventHandler):
ash_entrance_offset = (200, 5) ash_entrance_offset = (200, 5)
beacon_entrance_offset = (100, 100)
def is_in_ash(self): def is_in_ash(self):
return self.appear(ASH_CHECK, offset=(100, 20)) return self.appear(ASH_CHECK, offset=(100, 20))
@@ -258,7 +259,7 @@ class OSAsh(UI, MapEventHandler):
continue continue
if self.appear_then_click(ASH_SELECT, offset=(30, 30), interval=3): if self.appear_then_click(ASH_SELECT, offset=(30, 30), interval=3):
continue continue
if self.appear_then_click(BEACON_ENTER, offset=(20, 20), interval=2): if self.appear_then_click(BEACON_ENTER, offset=self.beacon_entrance_offset, interval=2):
continue continue
if self._handle_ash_beacon_reward(): if self._handle_ash_beacon_reward():
continue continue
@@ -384,7 +385,7 @@ class OSAsh(UI, MapEventHandler):
if confirm_timer.reached(): if confirm_timer.reached():
logger.info('Ash beacon attack finished') logger.info('Ash beacon attack finished')
return True return True
elif self.appear(BEACON_ENTER, offset=(20, 20)): elif self.appear(BEACON_ENTER, offset=self.beacon_entrance_offset):
# If previous beacon is not completed, the previous beacon is attacked in this round. # If previous beacon is not completed, the previous beacon is attacked in this round.
# Then found a new beacon, after attack. # Then found a new beacon, after attack.
if confirm_timer.reached(): if confirm_timer.reached():