Merge pull request #15 from Night-stars-1/main

chore: 支持其他研学角色

assets/resource_picli/base/pipeline/11_(03)_landscape.json

@@ -1,25 +1,44 @@
 {
-    "landscape": {
-        "recognition": "TemplateMatch",
-        "template": "Research/82.png",
-        "roi": [
-            109,
-            384,
-            80,
-            86
-        ],
-        "action": "Click",
-        "target_offset": [
-            60,
-            150,
-            0,
-            0
-        ],
-        "post_wait_freezes": 3000,
-        "next": [
-            "Marksmanship",
-            "Blazing_Knife",
-            "Spells"
-        ]
-    }
-}
+  "landscape": {
+      "recognition": "TemplateMatch",
+      "template": "Research/r1.png",
+      "roi": [494, 386, 90, 84],
+      "action": "Click",
+      "target_offset": [
+          60,
+          150,
+          0,
+          0
+      ],
+      "post_wait_freezes": 3000,
+      "next": [
+          "Marksmanship",
+          "Blazing_Knife",
+          "Spells",
+          "landscape",
+          "Research",
+          "museum",
+          "landscape-buff-one"
+      ]
+  },
+  "landscape-buff-one": {
+      "action": "Click",
+      "target": [
+          360,
+          340,
+          0,
+          0
+      ],
+      "post_delay": 3000,
+      "next": [
+          "agree",
+          "Marksmanship",
+          "Blazing_Knife",
+          "Spells",
+          "landscape",
+          "Research",
+          "museum",
+          "advance_four"
+      ]
+  }
+}

assets/resource_picli/base/pipeline/11_(04)_journey.json

@@ -1,25 +1,34 @@
 {
-    "journey": {
-        "recognition": "TemplateMatch",
-        "template": "Research/82.png",
-        "roi": [
-            109,
-            384,
-            80,
-            86
-        ],
-        "action": "Click",
-        "target_offset": [
-            60,
-            150,
-            0,
-            0
-        ],
-        "post_wait_freezes": 3000,
-        "next": [
-            "Marksmanship",
-            "Blazing_Knife",
-            "Spells"
-        ]
-    }
-}
+  "journey": {
+    "recognition": "TemplateMatch",
+    "template": "Research/r2.png",
+    "roi": [878, 385, 92, 90],
+    "action": "Click",
+    "target_offset": [60, 150, 0, 0],
+    "post_wait_freezes": 3000,
+    "next": [
+      "Marksmanship",
+      "Blazing_Knife",
+      "Spells",
+      "journey",
+      "Research",
+      "museum",
+      "journey-buff-one"
+    ]
+  },
+  "journey-buff-one": {
+    "action": "Click",
+    "target": [360, 340, 0, 0],
+    "post_delay": 3000,
+    "next": [
+      "agree",
+      "Marksmanship",
+      "Blazing_Knife",
+      "Spells",
+      "journey",
+      "Research",
+      "museum",
+      "advance_four"
+    ]
+  }
+}

py/__main__.py

@@ -2,28 +2,22 @@
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-07-18 23:52:39
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2024-09-08 15:52:35
+LastEditTime: 2024-09-11 13:04:56
 """
-'''
-Author: Night-stars-1 nujj1042633805@gmail.com
-Date: 2024-07-18 23:52:39
-LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2024-07-27 11:18:11
-'''
+import asyncio
 import json
 import time
 from typing import Tuple
 
+from maa.controller import AdbController
+from maa.custom_recognizer import CustomRecognizer
+
 # python -m pip install maafw
 from maa.define import RectType
-from maa.resource import Resource
-from maa.controller import AdbController
 from maa.instance import Instance
+from maa.resource import Resource
 from maa.toolkit import Toolkit
 
-from maa.custom_recognizer import CustomRecognizer
-
-import asyncio
 
 def read_json() -> dict:
     with open("./assets/resource/data/event.json", "r", encoding="utf-8") as f: