fix(WithdrawMoney): 修复快速连续点击导致异常滑动

Author: EeeMaoY

agent/custom/action/withdraw_money_choose_item.py

@@ -3,6 +3,7 @@
 from maa.agent.agent_server import AgentServer
 from maa.custom_action import CustomAction
 from maa.context import Context
+from utils.logger import logger
 
 
 def _screencap(controller):
@@ -31,9 +32,11 @@ def _box_to_rect(box):
 def _click_rect(controller, rect):
     cx = rect[0] + rect[2] // 2
     cy = rect[1] + rect[3] // 2
+    controller.post_touch_move(cx, cy).wait()  # 先移动再点击，防止误滑动
     controller.post_touch_down(cx, cy).wait()
     time.sleep(0.05)  # 间隔太短概率失效
     controller.post_touch_up().wait()
+    time.sleep(0.05)
 
 
 def _parse_value(text):
@@ -68,12 +71,11 @@ def click_all_grey_backgrounds():
             result = run_recog("WithdrawMoneyGreyBackground")
             for box in _filtered_boxes(result):
                 _click_rect(controller, _box_to_rect(box))
-                time.sleep(0.5)
 
-        def collect_product_values():
+        def collect_product_values(recog_name):
             """识别当前截图中所有商品 /h 价格，返回 [(value, rect), ...]"""
             items = []
-            result = run_recog("WithdrawMoneyItemValue")
+            result = run_recog(recog_name)
             for r in result.filtered_results if result else []:
                 text = getattr(r, "text", "")
                 value = _parse_value(text)
@@ -94,40 +96,26 @@ def collect_product_values():
 
         # Step 3: 再次关掉灰色背景角标
         click_all_grey_backgrounds()
-
-        down_items = []
-        seen = set()
+        time.sleep(1)
 
         # Step 4: 向下位置匹配商品价格 /h
-        for value, rect in collect_product_values():
-            key = (rect[0], rect[1])
-            if key not in seen:
-                seen.add(key)
-                down_items.append((value, rect))
+        down_items = [
+            (v, r, "down")
+            for v, r in collect_product_values("WithdrawMoneyItemValueDown")
+        ]
 
         # Step 5: 向上滑动
         run_act("WithdrawMoneySwipeUp")
-        time.sleep(1)
-
-        up_items = []
+        time.sleep(0.1)  # 等待动画
 
         # Step 6: 向上位置匹配商品价格 /h
-        for value, rect in collect_product_values():
-            key = (rect[0], rect[1])
-            if key not in seen:
-                seen.add(key)
-                up_items.append((value, rect))
-
-        # Step 7: 按 value 去重，从大到小排序，只点前五个
-        all_items = [(v, r, "down") for v, r in down_items] + [
-            (v, r, "up") for v, r in up_items
+        up_items = [
+            (v, r, "up") for v, r in collect_product_values("WithdrawMoneyItemValueUp")
         ]
-        # 按 value 去重（保留第一个出现的 rect）
-        deduped: dict[float, tuple] = {}
-        for value, rect, swipe in all_items:
-            if value not in deduped:
-                deduped[value] = (value, rect, swipe)
-        sorted_items = sorted(deduped.values(), key=lambda x: x[0], reverse=True)
+
+        # Step 7: 按 value 从大到小排序，只点前五个
+        all_items = down_items + up_items
+        sorted_items = sorted(all_items, key=lambda x: x[0], reverse=True)
         top5 = sorted_items[:5]
 
         current_swipe = "up"
@@ -142,6 +130,7 @@ def collect_product_values():
                     current_swipe = "down"
                 time.sleep(1)
             _click_rect(controller, rect)
+            logger.debug(f"click {value} in {rect} of {item_swipe}")
             time.sleep(0.5)
 
         return CustomAction.RunResult(success=True)

assets/resource/base/pipeline/WithdrawMoney/WithdrawMoney.json

@@ -90,8 +90,9 @@
         "action": "Click",
         "next": [
             "[JumpBack]SceneClickBlankToExit",
-            "WithdrawMoneyEnterItemList",
-            "点击补货"
+            "[JumpBack]WithdrawMoneyEnterItemList",
+            "点击补货",
+            "WithdrawMoneyExit"
         ]
     },
     "WithdrawMoneyEnterItemList": {
@@ -110,8 +111,7 @@
                     "累計營業時間",
                     "(?i)Total\\s*Operating\\s*Time",
                     "累計営業時間"
-                ]
-            ,
+                ],
                 "roi_offset": [
                     0,
                     0,
@@ -153,8 +153,7 @@
                     "商品列表",
                     "(?i)Item\\s*List",
                     "商品リスト"
-                ]
-            ,
+                ],
                 "roi_offset": [
                     0,
                     0,
@@ -191,11 +190,7 @@
                 ]
             }
         },
-        "action": "Click",
-        "next": [
-            "点击补货",
-            "WithdrawMoneyExit"
-        ]
+        "action": "Click"
     },
     "点击补货": {
         "recognition": {
@@ -360,7 +355,6 @@
                     "確定",
                     "确定",
                     "OK",
-                    "CONFIRN",
                     "확인"
                 ],
                 "threshold": 0.8,

assets/resource/base/pipeline/WithdrawMoney/WithdrawMoneyStatus.json

@@ -43,8 +43,8 @@
         "duration": 500,
         "end_hold": 600
     },
-    "WithdrawMoneyItemValue": {
-        "desc": "商品列表数值/h",
+    "WithdrawMoneyItemValueUp": {
+        "desc": "商品列表数值/h（上）",
         "recognition": {
             "type": "OCR",
             "only_rec": true,
@@ -62,6 +62,25 @@
             }
         }
     },
+    "WithdrawMoneyItemValueDown": {
+        "desc": "商品列表数值/h（下）",
+        "recognition": {
+            "type": "OCR",
+            "only_rec": true,
+            "param": {
+                "roi": [
+                    29,
+                    222,
+                    391,
+                    462
+                ],
+                "expected": [
+                    // @i18n-skip
+                    "/h"
+                ]
+            }
+        }
+    },
     "WithdrawMoneySwipeUp": {
         "desc": "商品列表向上滑动",
         "action": "Swipe",