From 63f46c9555498eefafe9680ee798a2f53149cd67 Mon Sep 17 00:00:00 2001
From: mmwuyou <3176706900@qq.com>
Date: Mon, 18 Nov 2024 15:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8F=E6=97=A5=E5=85=8D?=
 =?UTF-8?q?=E8=B4=B9=E7=A4=BC=E5=8C=85=E4=BB=BB=E5=8A=A1=EF=BC=88=E7=A0=B4?=
 =?UTF-8?q?=E8=AF=8D=E7=89=8C=E4=B9=B1=E6=94=B9ui=EF=BC=81=EF=BC=81?=
 =?UTF-8?q?=EF=BC=81=EF=BC=89=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/config/maa_pi_config.json                   | 14 +++-----------
 .../base/pipeline/13_activity_attendance.json      |  4 ++--
 .../resource_picli/base/pipeline/4_dailybonus.json |  6 ++++--
 .../resource_picli/base/pipeline/7_(03)allin.json  |  6 ++++--
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/assets/config/maa_pi_config.json b/assets/config/maa_pi_config.json
index f45bdcb..d0965c3 100644
--- a/assets/config/maa_pi_config.json
+++ b/assets/config/maa_pi_config.json
@@ -1,6 +1,7 @@
 {
     "controller": {
-        "name": "安卓端"
+        "name": "安卓端",
+        "type": "Adb"
     },
     "gpu": -2,
     "resource": "B 服",
@@ -8,15 +9,6 @@
     "adb": {
         "adb_path": "D:/leidian/LDPlayer9/adb.exe",
         "address": "emulator-5554",
-        "config": {
-            "extras": {
-                "ld": {
-                    "enable": false,
-                    "index": 0,
-                    "path": "D:/leidian/LDPlayer9",
-                    "pid": 15696
-                }
-            }
-        }
+        "config": {}
     }
 }
\ No newline at end of file
diff --git a/assets/resource_picli/base/pipeline/13_activity_attendance.json b/assets/resource_picli/base/pipeline/13_activity_attendance.json
index 3e118dd..1237127 100644
--- a/assets/resource_picli/base/pipeline/13_activity_attendance.json
+++ b/assets/resource_picli/base/pipeline/13_activity_attendance.json
@@ -11,12 +11,12 @@
     },
     "activity": {
         "recognition": "OCR",
-        "expected": "活动",
+        "expected": "动",
         "action": "Click",
         "post_delay": 2000,
         "roi": [
             0,
-            290,
+            311,
             130,
             190
         ],
diff --git a/assets/resource_picli/base/pipeline/4_dailybonus.json b/assets/resource_picli/base/pipeline/4_dailybonus.json
index a614c3d..d54d066 100644
--- a/assets/resource_picli/base/pipeline/4_dailybonus.json
+++ b/assets/resource_picli/base/pipeline/4_dailybonus.json
@@ -34,7 +34,7 @@
     },
     "richang": {
         "recognition": "OCR",
-        "expected": "日常",
+        "expected": "循时",
         "action": "Click",
         "post_delay": 2000,
         "next": [
@@ -49,6 +49,7 @@
         "post_delay": 2000,
         "next": [
             "goumai",
+            "donggu",
             "Quit"
         ]
     },
@@ -58,7 +59,8 @@
         "action": "Click",
         "post_delay": 2000,
         "next": [
-            "obtain1"
+            "obtain1",
+            "donggu"
         ]
     },
     "obtain1": {
diff --git a/assets/resource_picli/base/pipeline/7_(03)allin.json b/assets/resource_picli/base/pipeline/7_(03)allin.json
index f9614a7..95d4b40 100644
--- a/assets/resource_picli/base/pipeline/7_(03)allin.json
+++ b/assets/resource_picli/base/pipeline/7_(03)allin.json
@@ -418,7 +418,8 @@
             0
         ],
         "next": [
-            "situation"
+            "situation",
+            "hit"
         ]
     },
     "situation": {
@@ -426,7 +427,8 @@
         "expected": "确定",
         "action": "Click",
         "next": [
-            "exit"
+            "exit",
+            "situation"
         ]
     }
 }
\ No newline at end of file