sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-02 07:14:07 +08:00
Code Activity

Fix: On first round, often same ship is detected as new ship

Browse Source 
Disabling ensure_template repairs this behavior and retains
if new ship is actually detected
This commit is contained in:
nEEtdo0d
2020-12-27 13:51:56 -05:00
parent b0ba4c32a2
commit 25098f2f82
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/equipment/equipment.py
View File

@@ -21,6 +21,7 @@ class Equipment(UI):
swipe_timer = Timer(5, count=10) swipe_timer = Timer(5, count=10)
self.ensure_no_info_bar(timeout=3) self.ensure_no_info_bar(timeout=3)
SWIPE_CHECK.load_color(self.device.image) SWIPE_CHECK.load_color(self.device.image)
SWIPE_CHECK._match_init = True # Disable ensure_template() on match(), allows ship to be properly determined whether different or not
while 1: while 1:
if not swipe_timer.started() or swipe_timer.reached(): if not swipe_timer.started() or swipe_timer.reached():
swipe_timer.reset() swipe_timer.reset()
@@ -32,7 +33,7 @@ class Equipment(UI):
self.device.screenshot() self.device.screenshot()
if SWIPE_CHECK.match(self.device.image): if SWIPE_CHECK.match(self.device.image):
if swipe_count > 1: if swipe_count > 1:
logger.warning('Same ship on multiple swipes') logger.info('Same ship on multiple swipes')
return False return False
continue continue