修复出本后可能会卡住(fix #3)

修复刷冰蚊子可能卡住(fix #8)
ok-oldking · Jul 18, 2024 · 6ffac69 · 6ffac69
1 parent 974ac33
commit 6ffac69
Show file tree

Hide file tree

Showing 21 changed files with 467 additions and 425 deletions.
diff --git a/...d_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png b/...d_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png
diff --git a/...d_3840x2160_title_None_Clie_6yGu616_png.rf.6b58ba35dfdb01cfe5a8f2b5dc578c12.png b/...d_3840x2160_title_None_Clie_6yGu616_png.rf.6b58ba35dfdb01cfe5a8f2b5dc578c12.png
diff --git a/...d_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png b/...d_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png
diff --git a/...d_3840x2160_title_None_Clie_6yGu616_png.rf.da9ca0640a0c122989090b5cf9589e3b.png b/...d_3840x2160_title_None_Clie_6yGu616_png.rf.da9ca0640a0c122989090b5cf9589e3b.png
diff --git a/...e_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.jpg b/...e_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.jpg
diff --git a/...e_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png b/...e_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png
diff --git a/...e_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.png b/...e_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.png
diff --git a/...d_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png b/...d_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png
diff --git a/...d_3840x2160_title_None_Clie_4ls54Fe_png.rf.a3daefc4a50b5cb646406e36f1c769ee.png b/...d_3840x2160_title_None_Clie_4ls54Fe_png.rf.a3daefc4a50b5cb646406e36f1c769ee.png
diff --git a/...d_0x0_title_None_Client-Win_BLAxtp1_png.rf.24dbe80092b3236adeed97f046507120.png b/...d_0x0_title_None_Client-Win_BLAxtp1_png.rf.24dbe80092b3236adeed97f046507120.png
diff --git a/...d_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.png b/...d_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.png
diff --git a/...e_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png b/...e_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png
diff --git a/...e_1920x1080_329010_1_False_original_png.rf.04af9811881aa3edd9a7b36d96c5e5b9.png b/...e_1920x1080_329010_1_False_original_png.rf.04af9811881aa3edd9a7b36d96c5e5b9.png
diff --git a/...e_1920x1080_329010_1_False_original_png.rf.05df8d2ee8391150d4b9c33b0c932aa6.png b/...e_1920x1080_329010_1_False_original_png.rf.05df8d2ee8391150d4b9c33b0c932aa6.png
diff --git a/...e_1920x1080_329010_1_False_original_png.rf.af972a2439733f3885ec4e7fe7d47d82.png b/...e_1920x1080_329010_1_False_original_png.rf.af972a2439733f3885ec4e7fe7d47d82.png
diff --git a/...3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png b/...3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png
diff --git a/assets/_annotations.coco.json b/assets/_annotations.coco.json
diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py
@@ -25,6 +25,7 @@ def __init__(self):
         self.boss_health_box = None
         self.boss_health = None
         self.out_of_combat_reason = ""
+        self.combat_check_interval = 0.8
 
     def reset_to_false(self, recheck=False, reason=""):
         if is_pure_black(self.frame):
@@ -133,7 +134,7 @@ def in_combat(self, rechecked=False):
             return True
         if self._in_combat:
             now = time.time()
-            if now - self.last_combat_check > 1:
+            if now - self.last_combat_check > self.combat_check_interval:
                 self.last_combat_check = now
                 if not self.in_team()[0]:
                     return self.reset_to_false(recheck=False, reason="not in team")

diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py
@@ -244,8 +244,7 @@ def handle_claim_button(self):
             return True
 
     def walk_until_f(self, direction='w', time_out=0, raise_if_not_found=True, backward_time=0):
-        if not self.find_one('pick_up_f', horizontal_variance=0.1, vertical_variance=0.1, threshold=0.8,
-                             use_gray_scale=True):
+        if not self.find_one('pick_up_f', horizontal_variance=0.01, vertical_variance=0.01, threshold=0.8):
             if backward_time > 0:
                 if self.send_key_and_wait_f('s', raise_if_not_found, backward_time):
                     return True

diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py
@@ -51,7 +51,7 @@ def run(self):
             self.combat_once()
             logger.info(f'farm echo combat end')
             self.wait_in_team_and_world(time_out=20)
-            logger.info(f'farm echo move forward walk_until_f to find echo')
+            logger.info(f'farm echo move {self.config.get("Entrance Direction")} walk_until_f to find echo')
             if self.config.get('Entrance Direction') == 'Forward':
                 dropped = self.walk_until_f(time_out=3,
                                             raise_if_not_found=False)  # find and pick echo

diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py
@@ -61,26 +61,22 @@ def teleport(self, boss_name):
         else:
             logger.info('click normal boss')
             self.click_relative(0.21, 0.36)
-        # self.wait_click_feature('gray_book_forgery', raise_if_not_found=True, use_gray_scale=True, threshold=0.7)
-        # self.wait_click_feature('gray_book_boss', raise_if_not_found=True, use_gray_scale=True, threshold=0.7)
+
         self.sleep(1)
-        # while index > 4:  # first page
+
         if index > 4:
             self.log_info(f'click scroll bar')
             self.click_relative(3760 / 3840, 1852 / 2160)
             self.sleep(0.5)
-            # self.scroll_down_a_page()
             index -= 4
-        # y = y + (index - 1) * distance
+
         self.log_info(f'index after scrolling down {index}')
         proceeds = self.find_feature('boss_proceed', vertical_variance=1, use_gray_scale=True, threshold=0.8)
         if self.debug:
             self.screenshot('proceeds')
         if not proceeds:
             raise Exception("can't find the boss proceeds")
 
-        # self.click_relative(self.crownless_pos[0], self.crownless_pos[1])
-        # self.wait_click_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True)
         self.wait_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True, time_out=120,
                           pre_action=lambda: self.click_box(proceeds[index], relative_x=-1), wait_until_before_delay=5)
         self.sleep(1)
@@ -92,7 +88,7 @@ def teleport(self, boss_name):
         self.wait_click_feature('gray_custom_way_point', box=self.box_of_screen(0.62, 0.48, 0.70, 0.66),
                                 raise_if_not_found=True,
                                 use_gray_scale=True, threshold=0.75, time_out=2)
-        travel = self.wait_feature('fast_travel_custom', raise_if_not_found=True, use_gray_scale=True, threshold=0.75)
+        travel = self.wait_feature('fast_travel_custom', raise_if_not_found=True, threshold=0.75)
         self.click_box(travel, relative_x=1.5)
 
     def wait_book(self):