From 665cdbe3020464baecb4b9db43e548cf488a5e25 Mon Sep 17 00:00:00 2001 From: moesnow <11678347+moesnow@users.noreply.github.com> Date: Tue, 9 Jan 2024 22:47:19 +0800 Subject: [PATCH] fix: purefiction --- .../images/screen/purefiction/purefiction.png | Bin 4393 -> 3080 bytes tasks/weekly/forgottenhall.py | 7 +++---- tasks/weekly/purefiction.py | 11 +++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/assets/images/screen/purefiction/purefiction.png b/assets/images/screen/purefiction/purefiction.png index 4715c3d35e33b52822f913c0b0ded7ce62d6606e..6b14e5053da01e368c56e8decd1306815baec9bd 100644 GIT binary patch delta 3060 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 Z_#YdHMD(dn{fGbn002ovPDHLkV1lE%WZVD% diff --git a/tasks/weekly/forgottenhall.py b/tasks/weekly/forgottenhall.py index a337ad7b..edcefcfb 100644 --- a/tasks/weekly/forgottenhall.py +++ b/tasks/weekly/forgottenhall.py @@ -286,10 +286,10 @@ def prepare(): else: break if auto.click_element("传送", "text", max_retries=10, need_ocr=False): - auto.click_element("./assets/images/forgottenhall/memory_of_chaos.png", "image", - 0.95, max_retries=2, crop=(470 / 1920, 0, 970 / 1920, 114 / 1080)) + # auto.click_element("./assets/images/forgottenhall/memory_of_chaos.png", "image", + # 0.95, max_retries=2, crop=(470 / 1920, 0, 970 / 1920, 114 / 1080)) if auto.click_element("./assets/images/screen/forgottenhall/memory_of_chaos.png", "image", - 0.95, max_retries=10, crop=(36 / 1920, 25 / 1080, 170 / 1920, 80 / 1080)): + 0.95, max_retries=20, crop=(36 / 1920, 25 / 1080, 170 / 1920, 80 / 1080)): flag = True if not flag: @@ -307,7 +307,6 @@ def prepare(): ForgottenHall.run() - screen.change_to('main') return True @staticmethod diff --git a/tasks/weekly/purefiction.py b/tasks/weekly/purefiction.py index 1888e5bd..a230516b 100644 --- a/tasks/weekly/purefiction.py +++ b/tasks/weekly/purefiction.py @@ -246,6 +246,7 @@ def prepare(): auto.find_element("虚构叙事", "text", max_retries=10, crop=( 689.0 / 1920, 285.0 / 1080, 970.0 / 1920, 474.0 / 1080), include=True) for box in auto.ocr_result: + break text = box[1][0] if "/12" in text: logger.info(_("星数：{text}").format(text=text)) @@ -255,7 +256,8 @@ def prepare(): else: break if auto.click_element("传送", "text", max_retries=10, need_ocr=False): - if auto.click_element("./assets/images/screen/purefiction/purefiction.png", "image", 0.8, max_retries=10, action="move"): + if auto.click_element("虚构叙事", "text", max_retries=20, include=True, action="move", crop=(0.0 / 1920, 1.0 / 1080, 552.0 / 1920, 212.0 / 1080)): + # if auto.click_element("./assets/images/screen/purefiction/purefiction.png", "image", 0.8, max_retries=10, action="move"): flag = True if not flag: @@ -265,12 +267,13 @@ def prepare(): # 刷新后打开会出现本期buff的弹窗 time.sleep(2) if auto.click_element("./assets/images/purefiction/start_story.png", "image", 0.8): - auto.click_element("./assets/images/screen/purefiction/purefiction.png", - "image", 0.8, max_retries=10, action="move") + auto.click_element("虚构叙事", "text", max_retries=10, include=True, action="move", crop=( + 0.0 / 1920, 1.0 / 1080, 552.0 / 1920, 212.0 / 1080)) + # auto.click_element("./assets/images/screen/purefiction/purefiction.png", + # "image", 0.8, max_retries=10, action="move") PureFiction.run() - screen.change_to('main') return True @staticmethod