Merge remote-tracking branch 'origin/main'

CHNZYX · May 26, 2023 · 1e07c02 · 1e07c02
2 parents e77d1ca + 6edef8b
commit 1e07c02
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/imgs/maps/20815/map_4018_4026_.jpg b/imgs/maps/20815/map_4018_4026_.jpg
diff --git a/imgs/maps/20815/target.jpg b/imgs/maps/20815/target.jpg
diff --git a/imgs/maps/45516/target.jpg b/imgs/maps/45516/target.jpg
diff --git a/imgs/maps/65515/target.jpg b/imgs/maps/65515/target.jpg
diff --git a/info.txt b/info.txt
@@ -2,4 +2,4 @@
 0.7086614173228346
 2
 巡猎
-37172e8a025fb30d269adc7f9ebb3caa2aea6b36
+99715ce434fb61a0c2c5d0fa6c34cd3a9698a5c9
diff --git a/states.py b/states.py
@@ -72,7 +72,7 @@ def route(self):
                 Text = win32gui.GetWindowText(hwnd)
             self.get_screen()
             # cv.imwrite('imgs/scr.jpg',self.screen) #0.8547,0.4963 0.7375,0.4898
-            #self.click_target('imgs/tp.jpg',0.9,False)#0.3375,0.9685 0.9417,0.9472 0.1167,0.5491  0.2938,0.4685  0.1167,0.3546
+            #self.click_target('imgs/mask_z2.jpg',0.9,False)#0.3375,0.9685 0.9417,0.9472 0.1167,0.5491  0.2938,0.4685  0.1167,0.3546
             res = self.normal()
             if res == 0:
                 if self.threshold > 0.95:
@@ -91,7 +91,7 @@ def normal(self):
         bk_lst_changed = self.lst_changed
         self.lst_changed = time.time()
         if self.check('auto_2', 0.3760, 0.0370):
-            if self.check('z', 0.3047, 0.9685, mask='mask_z'):
+            if self.check('z', 0.3047, 0.9685, mask='mask_z') or (self.check('z',0.7146,0.9759,mask='mask_z2',threshold=0.96) and self.battle==0):
                 self.click((0.0891, 0.9676))
             self.battle = 1
             return 1