Update: early stop if sub wanted page

sanmusen214 · Jul 23, 2024 · da19d42 · da19d42
1 parent 42251c7
commit da19d42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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):
             # 点多了，进入到了子页面，此时点击左上角返回一次