修复一键收菜

ok-oldking · Jun 13, 2024 · 562e8f7 · 562e8f7
1 parent 687e71c
commit 562e8f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/task/BJTask.py b/task/BJTask.py
@@ -41,7 +41,7 @@ def go_home_wait(self):
         return self.wait_main()
 
     def wait_main(self):
-        return self.wait_until(lambda: self.ocr(box=self.main_menu_zone, match=re.compile(r"完成")))
+        return self.wait_until(lambda: self.ocr(box=self.main_menu_zone, match=re.compile(r"外勤作战")))
 
     def go_home_now(self):
         go_home = self.find_feature('go_home', threshold=0.92)

diff --git a/task/DailyTask.py b/task/DailyTask.py
@@ -164,6 +164,7 @@ def combat(self):
             self.click_box(combats[0])
             self.dingxiang_combat()
         if self.config.get('随机刷技能书次数') > 0:
+            combats = self.wait_ocr(x=0.1, y=0.58, to_x=0.75, to_y=0.67, match=["定向保障", "光刻协议"])
             self.click_box(combats[1])
             self.guangke_combat()