Merge pull request #252 from IsolateOB/fix-issue-247

fix(autofish): 将收线阶段按空格改为点击屏幕 (#247)

Author: BnanZ0

src/tasks/fullauto/AutoFishTask.py

@@ -94,7 +94,7 @@ def find_fish_bite(self) -> tuple[bool, tuple]:
     def find_fish_chance(self) -> tuple[bool, tuple]:
         """查找 fish_chance 图标（授渔以鱼），返回 (found, center)"""
         CHANCE_THRESHOLD = 0.8  # fish_chance 匹配阈值
-        fish_chance_box = self.box_of_screen_scaled(3840, 2160, 3467, 1797, 3703, 2033, name="fish_chance")
+        fish_chance_box = self.box_of_screen_scaled(3840, 2160, 3269, 1672, 3505, 1908, name="fish_chance")
         box = self.find_one("fish_chance", box=fish_chance_box, threshold=CHANCE_THRESHOLD)
         if box:
             return True, (box.x + box.width // 2, box.y + box.height // 2)
@@ -238,10 +238,7 @@ def phase_start(self) -> bool:
         # ensure foreground handled by framework interaction activation
         start_deadline = time.monotonic() + cfg.get("MAX_START_SEC", 20.0)
 
-        has_cast_icon, _ = self.find_fish_cast()
-        self.stats["last_cast_icon_found"] = has_cast_icon
-
-        # 检测是否有授渔以鱼机会
+        # 检测是否有授渔以鱼机会 (优先执行且短路，减少不必要的对比开销)
         has_chance_icon, _ = self.find_fish_chance()
         if has_chance_icon:
             logger.info("检测到fish_chance（授渔以鱼）-> 按下E键使用授渔以鱼抛竿")
@@ -253,13 +250,16 @@ def phase_start(self) -> bool:
                 self.info_set("完成轮数", self.stats["rounds_completed"])
                 logger.info(f"上一轮的鱼作为鱼饵，轮数调整为: {self.stats['rounds_completed']}")
             self.send_key("e", down_time=0.06)
-        elif not has_cast_icon:
-            logger.info("开始阶段未找到fish_cast，尝试按空格抛竿并等待fish_bite出现")
-            # press space to cast
-            self.send_key("space", down_time=0.06)
         else:
-            logger.info("找到fish_cast -> 按下空格抛竿")
-            self.send_key("space", down_time=0.06)
+            has_cast_icon, _ = self.find_fish_cast()
+            self.stats["last_cast_icon_found"] = has_cast_icon
+            if not has_cast_icon:
+                logger.info("开始阶段未找到fish_cast，尝试按空格抛竿并等待fish_bite出现")
+                # press space to cast
+                self.send_key("space", down_time=0.06)
+            else:
+                logger.info("找到fish_cast -> 按下空格抛竿")
+                self.send_key("space", down_time=0.06)
 
         logger.info("等待fish_bite出现...")
         ret = self.wait_until(lambda: self.find_fish_bite()[0], time_out=start_deadline, raise_if_not_found=False)
@@ -447,25 +447,42 @@ def phase_end(self) -> bool:
         logger.info(f"等待 {cfg.get('END_WAIT_SPACE', 7.0)}s 结束鱼信息展示...")
         self.sleep(cfg.get("END_WAIT_SPACE", 7.0))
 
-        logger.info("收线 (Space)")
-        self.send_key("space", down_time=0.06)
-
         # wait and verify
         confirm_deadline = time.monotonic() + cfg.get("MAX_END_SEC", 20.0)
+        
+        # 抛竿图标连续稳定确认机制
+        stable_confirm_time = 0.5
+        cast_appeared_time = None
+
         while time.monotonic() < confirm_deadline:
-            has_cast_icon, _ = self.find_fish_cast()
-            has_bite_icon, _ = self.find_fish_bite()
-            has_chance_icon, _ = self.find_fish_chance()
-            self.stats["last_cast_icon_found"] = has_cast_icon
-            self.stats["last_bite_icon_found"] = has_bite_icon
-            if has_cast_icon or has_bite_icon or has_chance_icon:
-                if has_chance_icon:
-                    logger.info("确认已回到挥杆界面（检测到授渔以鱼）")
-                else:
-                    logger.info("确认已回到挥杆界面")
+            has_chance = self.find_fish_chance()[0]
+            if has_chance:
+                logger.info("确认已回到挥杆界面（检测到授渔以鱼）")
                 return True
-            self.send_key("space", down_time=0.06)
-            self.sleep(1.0)
+
+            has_bite = self.find_fish_bite()[0]
+            if has_bite:
+                logger.info("确认已回到挥杆界面（检测到鱼咬钩被遗留）")
+                return True
+
+            has_cast = self.find_fish_cast()[0]
+            self.stats["last_cast_icon_found"] = has_cast
+            if has_cast:
+                if cast_appeared_time is None:
+                    # 记录第一次看见抛竿图标的时间
+                    cast_appeared_time = time.monotonic()
+                elif time.monotonic() - cast_appeared_time >= stable_confirm_time:
+                    # 第二次确认：抛竿图标连续显示，非画面闪现
+                    logger.info("界面稳定，确认已回到抛竿界面")
+                    return True
+            else:
+                # 抛竿图标消失，重置判定计时
+                cast_appeared_time = None
+
+            # 继续保持点击屏幕左侧用来关闭那些可能无法单纯靠时间等待关闭的层叠UI
+            self.click_relative_random(0.05, 0.3, 0.4, 0.7)
+            self.sleep(0.5)
+            
         logger.info("结束阶段确认失败")
         return False
 
@@ -553,9 +570,6 @@ def do_run(self):
                 logger.info(f"  剩余轮数: {remaining}")
                 logger.info("=" * 50)
 
-                # 继续下一轮
-                self.sleep(1.0)
-                self.sleep(1.0)
             except TaskDisabledException:
                 raise
             except Exception as e: