mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-23 06:18:01 +08:00
Fix: _get_stage_name should before handle_get_chapter_additional (#4094)
so loop can be break
This commit is contained in:
@@ -331,28 +331,33 @@ class CampaignOcr(ModuleBase):
|
|||||||
logger.warning(f'get_chapter_index: WITHDRAW appears')
|
logger.warning(f'get_chapter_index: WITHDRAW appears')
|
||||||
raise CampaignNameError
|
raise CampaignNameError
|
||||||
|
|
||||||
def get_chapter_index(self, image):
|
def get_chapter_index(self, skip_first_screenshot=True):
|
||||||
"""
|
"""
|
||||||
A tricky method for ui_ensure_index
|
A tricky method for ui_ensure_index
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
image: Screenshot
|
skip_first_screenshot:
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
int: Chapter index.
|
int: Chapter index.
|
||||||
"""
|
"""
|
||||||
timeout = Timer(2, count=4).start()
|
timeout = Timer(2, count=4).start()
|
||||||
while 1:
|
while 1:
|
||||||
|
if skip_first_screenshot:
|
||||||
|
skip_first_screenshot = False
|
||||||
|
else:
|
||||||
|
self.device.screenshot()
|
||||||
|
|
||||||
if timeout.reached():
|
if timeout.reached():
|
||||||
raise CampaignNameError
|
raise CampaignNameError
|
||||||
if self.handle_get_chapter_additional():
|
image = self.device.image
|
||||||
continue
|
|
||||||
try:
|
try:
|
||||||
self._get_stage_name(image)
|
self._get_stage_name(image)
|
||||||
break
|
break
|
||||||
except (IndexError, CampaignNameError):
|
except (IndexError, CampaignNameError):
|
||||||
self.device.screenshot()
|
pass
|
||||||
image = self.device.image
|
|
||||||
|
if self.handle_get_chapter_additional():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
return self._campaign_get_chapter_index(self.campaign_chapter)
|
return self._campaign_get_chapter_index(self.campaign_chapter)
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ class CampaignUI(MapOperation, CampaignEvent, CampaignOcr):
|
|||||||
if self.handle_chapter_additional():
|
if self.handle_chapter_additional():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
current = self.get_chapter_index(self.device.image)
|
current = self.get_chapter_index()
|
||||||
|
|
||||||
logger.attr("Index", current)
|
logger.attr("Index", current)
|
||||||
diff = index - current
|
diff = index - current
|
||||||
|
|||||||
Reference in New Issue
Block a user