From da19d42b3b8d8815b59d11801948ae41c1771b55 Mon Sep 17 00:00:00 2001 From: Yusen Wu Date: Tue, 23 Jul 2024 21:15:15 +0100 Subject: [PATCH] Update: early stop if sub wanted page --- modules/AllTask/InShop/InShop.py | 1 + modules/AllTask/InWanted/InWanted.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/AllTask/InShop/InShop.py b/modules/AllTask/InShop/InShop.py index 2df141b..ca6846d 100644 --- a/modules/AllTask/InShop/InShop.py +++ b/modules/AllTask/InShop/InShop.py @@ -29,6 +29,7 @@ def pre_condition(self) -> bool: def on_run(self) -> None: # 进入商店 + # 可能这边不需要区分服务器 if config.userconfigdict["SERVER_TYPE"]=="JP": # 适配日服新界面 self.run_until( diff --git a/modules/AllTask/InWanted/InWanted.py b/modules/AllTask/InWanted/InWanted.py index 790e786..795911a 100644 --- a/modules/AllTask/InWanted/InWanted.py +++ b/modules/AllTask/InWanted/InWanted.py @@ -48,7 +48,7 @@ def on_run(self) -> None: # 进入悬赏通缉页面 caninwanted = self.run_until( lambda: click((741, 440)), - lambda: Page.is_page(PageName.PAGE_WANTED), + lambda: Page.is_page(PageName.PAGE_WANTED) or Page.is_page(PageName.PAGE_WANTED_SUB), ) if Page.is_page(PageName.PAGE_WANTED_SUB): # 点多了，进入到了子页面，此时点击左上角返回一次