From d7bc8fcea3e4fc045a005963313c4af0692374d8 Mon Sep 17 00:00:00 2001
From: Lancarus <duzhen92@qq.com>
Date: Mon, 18 Sep 2023 21:28:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=82=E9=85=8D=E9=AB=98=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=88=86=E9=98=9F=E5=BC=80=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roguelike/Sami/autopilot/公司纠葛.json    | 80 ++++++++++++++++++-
 .../roguelike/Sami/autopilot/生人勿近.json    | 16 +++-
 resource/tasks.json                           |  8 +-
 3 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/resource/roguelike/Sami/autopilot/公司纠葛.json b/resource/roguelike/Sami/autopilot/公司纠葛.json
index a675131c58..47063a9f93 100644
--- a/resource/roguelike/Sami/autopilot/公司纠葛.json
+++ b/resource/roguelike/Sami/autopilot/公司纠葛.json
@@ -20,7 +20,11 @@
                 7,
                 2
             ],
-            "direction": "left"
+            "direction": "left",
+            "condition": [
+                0,
+                5
+            ]
         },
         {
             "groups": [
@@ -76,11 +80,26 @@
             ],
             "direction": "down"
         },
+        {
+            "groups": [
+                "处决者",
+                "情报官"
+            ],
+            "location": [
+                3,
+                2
+            ],
+            "direction": "left",
+            "condition": [
+                12,
+                16
+            ]
+        },
         {
             "groups": [
                 "奶",
                 "高台输出",
-                "狙击", 
+                "狙击",
                 "辅助",
                 "其他高台"
             ],
@@ -101,6 +120,16 @@
             ],
             "direction": "left"
         },
+        {
+            "groups": [
+                "补给站"
+            ],
+            "location": [
+                6,
+                1
+            ],
+            "direction": "down"
+        },
         {
             "groups": [
                 "处决者",
@@ -110,7 +139,50 @@
                 3,
                 2
             ],
-            "direction": "left"
+            "direction": "left",
+            "condition": [
+                21,
+                25
+            ]
+        },
+        {
+            "groups": [
+                "无人机"
+            ],
+            "location": [
+                5,
+                3
+            ],
+            "direction": "down"
+        },
+        {
+            "groups": [
+                "支援陷阱"
+            ],
+            "location": [
+                5,
+                3
+            ],
+            "direction": "down",
+            "condition": [
+                21,
+                30
+            ]
+        },
+        {
+            "groups": [
+                "处决者",
+                "情报官"
+            ],
+            "location": [
+                3,
+                2
+            ],
+            "direction": "left",
+            "condition": [
+                31,
+                35
+            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/resource/roguelike/Sami/autopilot/生人勿近.json b/resource/roguelike/Sami/autopilot/生人勿近.json
index 96b492cec8..7badc106eb 100644
--- a/resource/roguelike/Sami/autopilot/生人勿近.json
+++ b/resource/roguelike/Sami/autopilot/生人勿近.json
@@ -19,7 +19,11 @@
                 2,
                 1
             ],
-            "direction": "down"
+            "direction": "down",
+            "condition": [
+                0,
+                5
+            ]
         },
         {
             "groups": [
@@ -29,7 +33,11 @@
                 2,
                 5
             ],
-            "direction": "up"
+            "direction": "up",
+            "condition": [
+                0,
+                5
+            ]
         },
         {
             "groups": [
@@ -156,7 +164,9 @@
             "groups": [
                 "情报官",
                 "处决者",
-                "其他地面"
+                "其他地面",
+                "支援陷阱",
+                "无人机"
             ],
             "location": [
                 7,
diff --git a/resource/tasks.json b/resource/tasks.json
index 8b8cd8d778..237a822fa1 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -9146,9 +9146,9 @@
         "templThreshold": 0.6,
         "cache": false,
         "roi": [
-            190,
+            80,
             470,
-            300,
+            410,
             154
         ],
         "next": [
@@ -9162,9 +9162,9 @@
         "template": "empty.png",
         "baseTask": "Roguelike@RecruitMain",
         "roi": [
-            190,
+            80,
             470,
-            900,
+            1120,
             154
         ]
     },