fix: 修复钓鱼异常退出，修改agent出口为钓上鱼/鱼溜走/在钓鱼界面

Author: EeeMaoY

agent/custom/action/AutoFish/auto_fish_withoutCV.py

@@ -20,7 +20,6 @@ def run(
         self, context: Context, argv: CustomAction.RunArg
     ) -> CustomAction.RunResult:
         deadzone = 15  # 光标与绿条中心的距离在 deadzone（像素）以内时不操作，避免过度频繁地轻微调整导致的抖动
-        max_try_item = 5  # 识别不完整（绿条或光标未命中）的最大尝试次数，超过后放弃本次钓鱼，重新抛竿（执行 FishHook）
         factor = 1.5  # 控条时长的调整因子，实际时长 = 基础时长 * factor，基础时长 = (光标与绿条中心的像素偏移 / CURSOR_PX_PER_SEC) * 1000ms，增加 factor 可以适当补偿识别误差和按键响应延迟
         cap_ms = (
             1500  # 控条时长的上限（毫秒），避免因识别到较大偏移时按键过久，导致过度补偿
@@ -32,7 +31,6 @@ def run(
             try:
                 params = json.loads(argv.custom_action_param)
                 deadzone = params.get("deadzone", deadzone)
-                max_try_item = params.get("max_try", max_try_item)
                 factor = params.get("factor", factor)
                 cap_ms = params.get("cap_ms", cap_ms)
                 floor_ms = params.get("floor_ms", floor_ms)
@@ -48,7 +46,7 @@ def run(
             green_bar = context.run_recognition("FishGreenBar", image)
             cursor = context.run_recognition("FishCursor", image)
 
-            if not (
+            while not (
                 green_bar
                 and green_bar.hit
                 and green_bar.box
@@ -62,17 +60,20 @@ def run(
                 click_blank = context.run_recognition("SceneClickBlankToExit", image)
                 if click_blank and click_blank.hit:
                     PrintT(context, "autofish.fish_caught")
+                    logger.debug("识别到钓上鱼, 钓鱼退出")
                     return CustomAction.RunResult(success=True)
 
-                max_try_item -= 1
-                logger.debug(
-                    f"识别不完整（绿条或光标未命中），剩余尝试次数: {max_try_item}"
-                )
-
-                if max_try_item <= 0:
-                    logger.debug("尝试次数用尽，控条失败")
+                fish_escape = context.run_recognition("FishEscape", image)
+                if fish_escape and fish_escape.hit:
+                    PrintT(context, "autofish.fish_escape")
+                    logger.debug("识别到鱼溜走，钓鱼退出")
+                    return CustomAction.RunResult(success=True)
+                fish_on_gaming = context.run_recognition("FishSceneOnFishGame", image)
+                if fish_on_gaming and fish_on_gaming.hit:
+                    Print(
+                        "钓鱼异常结束（可能是鱼溜走），继续钓鱼"
+                    )  # 通常不会执行这一步
                     return CustomAction.RunResult(success=True)
-                # 看来就是通过识别失败几次直接通用适配成功/失败的情况的，不用管，根本没有去识别有没有钓到
                 continue
 
             green_bar_x, green_bar_y, green_bar_w, green_bar_h = green_bar.box

assets/resource/base/pipeline/Fish/FishStatus.json

@@ -57,6 +57,17 @@
             }
         }
     },
+    "FishEscape": {
+        "desc": "鱼逃走",
+        "recognition": "OCR",
+        "expected": [
+            "鱼儿溜走了",
+            "The fish got away!"
+        ],
+        "pre_delay": 0,
+        "post_delay": 0,
+        "rate_limit": 0
+    },
     "FishTest": {
         "post_delay": 0,
         "pre_delay": 0,

assets/resource/locales/agent/en_us.json

@@ -1,5 +1,6 @@
 {
     "autofish.fish_caught": "Fish hooked!",
+    "autofish.fish_escape": "Fish escaped!",
     "autofish.task_end": "Fishing task ended",
     "autofish.started": "=== Auto Fishing Started ===",
     "autofish.progress": "=== Fishing %d/%d ===",

assets/resource/locales/agent/ja_jp.json

@@ -1,5 +1,6 @@
 {
     "autofish.fish_caught": "魚がかかりました！",
+    "autofish.fish_escape": "魚が逃げました！",
     "autofish.task_end": "釣りタスク終了",
     "autofish.started": "=== 自動釣り開始 ===",
     "autofish.progress": "=== 釣り %d/%d ===",

assets/resource/locales/agent/ko_kr.json

@@ -1,5 +1,6 @@
 {
     "autofish.fish_caught": "물고기가 걸렸습니다!",
+    "autofish.fish_escape": "물고기가 도망갔습니다!",
     "autofish.task_end": "낚시 작업 종료",
     "autofish.started": "=== 자동 낚시 시작 ===",
     "autofish.progress": "=== 낚시 %d/%d ===",

assets/resource/locales/agent/zh_cn.json

@@ -1,5 +1,6 @@
 {
     "autofish.fish_caught": "钓上鱼了！",
+    "autofish.fish_escape": "鱼逃走了！",
     "autofish.task_end": "钓鱼任务结束",
     "autofish.started": "=== 自动钓鱼已启动 ===",
     "autofish.progress": "=== 钓鱼 %d/%d ===",

assets/resource/locales/agent/zh_tw.json

@@ -1,5 +1,6 @@
 {
     "autofish.fish_caught": "釣上魚了！",
+    "autofish.fish_escape": "魚逃走了！",
     "autofish.task_end": "釣魚任務結束",
     "autofish.started": "=== 自動釣魚已啟動 ===",
     "autofish.progress": "=== 釣魚 %d/%d ===",