ksaa 2025.5.16.1__py3-none-any.whl → 2025.5.23.1__py3-none-any.whl

kotonebot/client/host/protocol.py

@@ -1,15 +1,21 @@
 import time
 import socket
-from typing import Protocol, NamedTuple
-from dataclasses import dataclass
+from abc import ABC, abstractmethod
+from typing_extensions import ParamSpec, Concatenate
+from typing import Callable, TypeVar, Generic, Protocol, runtime_checkable, Type, Any
 
 from adbutils import adb, AdbTimeout, AdbError
 from adbutils._device import AdbDevice
 
 from kotonebot import logging
+from kotonebot.client import Device, create_device, DeviceImpl
 from kotonebot.util import Countdown, Interval
 
 logger = logging.getLogger(__name__)
+# https://github.com/python/typing/issues/769#issuecomment-903760354
+_T = TypeVar("_T")
+def copy_type(_: _T) -> Callable[[Any], _T]:
+    return lambda x: x
 
 def tcp_ping(host: str, port: int, timeout: float = 1.0) -> bool:
     """
@@ -30,34 +36,77 @@ def tcp_ping(host: str, port: int, timeout: float = 1.0) -> bool:
         return False
 
 
-@dataclass
-class Instance:
-    id: str
-    name: str
-    adb_port: int
-    adb_ip: str = '127.0.0.1'
-    adb_emulator_name: str = 'emulator-5554'
+class Instance(ABC):
+    def __init__(self,
+        id: str,
+        name: str,
+        adb_port: int | None = None,
+        adb_ip: str = '127.0.0.1',
+        adb_name: str | None = None
+    ):
+        self.id: str = id
+        self.name: str = name
+        self.adb_port: int | None = adb_port
+        self.adb_ip: str = adb_ip
+        self.adb_name: str | None = adb_name
 
+    def require_adb_port(self) -> int:
+        if self.adb_port is None:
+            raise ValueError("ADB port is not set and is required.")
+        return self.adb_port
+
+    @abstractmethod
+    def refresh(self):
+        """
+        刷新实例信息，如 ADB 端口号等。
+        """
+        raise NotImplementedError()
+
+    @abstractmethod
     def start(self):
+        """
+        启动模拟器实例。
+        """
         raise NotImplementedError()
     
+    @abstractmethod
     def stop(self):
+        """
+        停止模拟器实例。
+        """
         raise NotImplementedError()
 
+    @abstractmethod
     def running(self) -> bool:
         raise NotImplementedError()
 
+    def create_device(self, impl: DeviceImpl, *, timeout: float = 180) -> Device:
+        """
+        创建 Device 实例，可用于控制模拟器系统。
+        
+        :return: Device 实例
+        """
+        if self.adb_port is None:
+            raise ValueError("ADB port is not set and is required.")
+        return create_device(
+            addr=f'{self.adb_ip}:{self.adb_port}',
+            impl=impl,
+            device_serial=self.adb_name,
+            connect=True,
+            timeout=timeout
+        )
+
     def wait_available(self, timeout: float = 180):
         logger.info('Starting to wait for emulator %s(127.0.0.1:%d) to be available...', self.name, self.adb_port)
         state = 0
-        port = self.adb_port
-        emulator_name = self.adb_emulator_name
+        port = self.require_adb_port() 
+        emulator_name = self.adb_name
         cd = Countdown(timeout)
         it = Interval(1)
         d: AdbDevice | None = None
         while True:
             if cd.expired():
-                raise TimeoutError(f"Emulator {self.name} is not available.")
+                raise TimeoutError(f'Emulator "{self.name}" is not available.')
             it.wait()
             try:
                 match state:
@@ -121,38 +170,19 @@ class Instance:
         time.sleep(1)
         logger.info('Emulator %s(127.0.0.1:%d) now is available.', self.name, self.adb_port)
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}(name="{self.name}", id="{self.id}", adb="{self.adb_ip}:{self.adb_port}"({self.adb_name}))'
 
 class HostProtocol(Protocol):
     @staticmethod
     def installed() -> bool: ...
+    
     @staticmethod
     def list() -> list[Instance]: ...
+    
+    @staticmethod
+    def query(*, id: str) -> Instance | None: ...
 
 
 if __name__ == '__main__':
-    from . import bluestack_global
-    from pprint import pprint
-    logging.basicConfig(level=logging.DEBUG, format='[%(asctime)s][%(levelname)s] %(message)s')
-    # bluestack_global.
-    ins = Instance(id='1', name='test', adb_port=5555)
-    ins.wait_available()
-
-    # 
-    # while not tcp_ping('127.0.0.1', 16384):
-    #     print('waiting for bluestacks to start...')
-    
-    # while True:
-    #     print('connecting to bluestacks...')
-    #     try:
-    #         adb.connect('127.0.0.1:16384', timeout=0.1)
-    #         print('connected to bluestacks')
-    #         if d := adb.device_list()[0]:
-    #             if d.get_state() == 'device':
-    #                 if d.shell('getprop sys.boot_completed').strip() == '1':
-    #                     if 'launcher' in d.app_current().package:
-    #                         break
-    #     except Exception as e:
-    #         print(e)
-    #     time.sleep(0.5)
-    # time.sleep(1)
-    # print('bluestacks is ready')
+    pass

kotonebot/client/implements/adb.py

@@ -32,7 +32,7 @@ class AdbImpl(Commandable, Touchable, Screenshotable):
         if result_text == '':
             logger.error("No current package found")
             return None
-        _, activity, _, pid = result_text.split(' ')
+        _, activity, *_ = result_text.split(' ')
         package = activity.split('/')[0]
         return package
 

kotonebot/client/protocol.py

@@ -2,7 +2,7 @@ from typing import Protocol, TYPE_CHECKING, runtime_checkable, Literal
 
 from cv2.typing import MatLike
 
-from kotonebot.util import Rect
+from kotonebot.primitives import Rect
 if TYPE_CHECKING:
     from .device import Device
 

kotonebot/config/base_config.py

@@ -3,14 +3,19 @@ from typing import Generic, TypeVar, Literal
 
 from pydantic import BaseModel, ConfigDict
 
+from kotonebot.client.factory import DeviceImpl
+
 T = TypeVar('T')
+BackendType = Literal['custom', 'mumu12', 'leidian', 'dmm']
 
 class ConfigBaseModel(BaseModel):
     model_config = ConfigDict(use_attribute_docstrings=True)
 
 class BackendConfig(ConfigBaseModel):
-    type: Literal['custom'] = 'custom'
+    type: BackendType = 'custom'
     """后端类型。"""
+    instance_id: str | None = None
+    """模拟器实例 ID。"""
     adb_ip: str = '127.0.0.1'
     """adb 连接的 ip 地址。"""
     adb_port: int = 5555
@@ -22,7 +27,7 @@ class BackendConfig(ConfigBaseModel):
     雷电模拟器需要设置正确的模拟器名，否则 自动启动模拟器 功能将无法正常工作。
     其他功能不受影响。
     """
-    screenshot_impl: Literal['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows'] = 'adb'
+    screenshot_impl: DeviceImpl = 'adb'
     """
     截图方法。暂时推荐使用【adb】截图方式。
 
@@ -76,7 +81,7 @@ class UserConfig(ConfigBaseModel, Generic[T]):
 
 
 class RootConfig(ConfigBaseModel, Generic[T]):
-    version: int = 4
+    version: int = 5
     """配置版本。"""
     user_configs: list[UserConfig[T]] = []
     """用户配置。"""

kotonebot/interop/win/reg.py

@@ -0,0 +1,37 @@
+import winreg
+from typing import Any, Literal
+
+RegKey = Literal["HKLM", "HKCU", "HKCR", "HKU", "HKCC"]
+
+def read_reg(key: RegKey, subkey: str, name: str, *, default: Any = None) -> Any:
+    """
+    读取注册表项的值。
+
+    :param key: 注册表键，例如 "HKLM" (HKEY_LOCAL_MACHINE), "HKCU" (HKEY_CURRENT_USER) 等。
+    :param subkey: 注册表子键的路径。
+    :param name: 要读取的值的名称。
+    :param default: 如果注册表项不存在时返回的默认值。
+    :return: 注册表项的值，如果不存在则返回默认值。
+    """
+    try:
+        hkey = {
+            "HKLM": winreg.HKEY_LOCAL_MACHINE,
+            "HKCU": winreg.HKEY_CURRENT_USER,
+            "HKCR": winreg.HKEY_CLASSES_ROOT,
+            "HKU": winreg.HKEY_USERS,
+            "HKCC": winreg.HKEY_CURRENT_CONFIG,
+        }[key]
+    except KeyError:
+        raise ValueError(f"Invalid key: {key}")
+
+    try:
+        with winreg.OpenKey(hkey, subkey) as key_handle:
+            value, _ = winreg.QueryValueEx(key_handle, name)
+            return value
+    except FileNotFoundError:
+        return default
+    except OSError as e:
+        if e.winerror == 2:  # 注册表项不存在
+            return default
+        else:
+            raise  # 其他 OSError 异常，例如权限问题，重新抛出

kotonebot/kaa/common.py

@@ -2,7 +2,7 @@ import os
 import json
 import shutil
 from importlib import resources
-from typing import Literal, TypeVar, Any
+from typing import Literal, TypeVar, Any, Sequence
 from typing_extensions import assert_never
 from enum import IntEnum, Enum
 
@@ -235,7 +235,7 @@ class PurchaseConfig(ConfigBaseModel):
     """
     ap_enabled: bool = False
     """是否启用AP购买"""
-    ap_items: list[Literal[0, 1, 2, 3]] = []
+    ap_items: Sequence[Literal[0, 1, 2, 3]] = []
     """AP商店要购买的物品"""
 
 
@@ -523,6 +523,11 @@ def upgrade_config() -> str | None:
                     user_config, msg = upgrade_v3_to_v4(user_config['options'])
                     messages.append(msg)
                     version = 4
+                case 4:
+                    logger.info('Upgrading config: v4 -> v5')
+                    user_config, msg = upgrade_v4_to_v5(user_config, user_config['options'])
+                    messages.append(msg)
+                    version = 5
                 case _:
                     logger.info('No config upgrade needed.')
                     return version
@@ -929,5 +934,16 @@ def upgrade_v3_to_v4(options: dict[str, Any]) -> tuple[dict[str, Any], str]:
         logger.info('Corrected game package name to com.bandainamcoent.idolmaster_gakuen')
     return options, ''
 
+def upgrade_v4_to_v5(user_config: dict[str, Any], options: dict[str, Any]) -> tuple[dict[str, Any], str]:
+    """
+    v4 -> v5 变更：
+    为 windows 和 windows_remote 截图方式的 type 设置为 dmm
+    """
+    shutil.copy('config.json', 'config.v4.json')
+    if user_config['backend']['screenshot_impl'] in ['windows', 'remote_windows']:
+        logger.info('Set backend type to dmm.')
+        user_config['backend']['type'] = 'dmm'
+    return options, ''
+
 if __name__ == '__main__':
     print(PurchaseConfig.model_fields['money_refresh_on'].description)

kotonebot/kaa/game_ui/badge.py

@@ -4,7 +4,7 @@ badge 模块，用于关联带附加徽章的 UI。
 """
 from typing import Literal, NamedTuple
 
-from kotonebot.util import Rect
+from kotonebot.primitives import Rect, RectTuple, PointTuple
 
 BadgeCorner = Literal['lt', 'lm', 'lb', 'rt', 'rm', 'rb', 'mt', 'm', 'mb']
 """
@@ -33,11 +33,11 @@ def match(
     :return: 匹配结果列表
     """
     # 将 rect 转换为中心点
-    def center(rect: Rect) -> tuple[int, int]:
+    def center(rect: RectTuple) -> PointTuple:
         return rect[0] + rect[2] // 2, rect[1] + rect[3] // 2
     
     # 判断 badge 是否在 object 的指定角落位置
-    def is_in_corner(obj_rect: Rect, badge_center: tuple[int, int]) -> bool:
+    def is_in_corner(obj_rect: RectTuple, badge_center: PointTuple) -> bool:
         obj_center = center(obj_rect)
         x_obj, y_obj = obj_center
         x_badge, y_badge = badge_center
@@ -72,15 +72,15 @@ def match(
     available_badges = badges.copy()
 
     for obj_rect in objects:
-        obj_center = center(obj_rect)
+        obj_center = center(obj_rect.xywh)
         target_badge = None
         min_dist = float('inf')
         target_index = -1
         
         # 查找最近的符合条件的徽章
         for i, badge_rect in enumerate(available_badges):
-            badge_center = center(badge_rect)
-            if is_in_corner(obj_rect, badge_center):
+            badge_center = center(badge_rect.xywh)
+            if is_in_corner(obj_rect.xywh, badge_center):
                 dist = ((badge_center[0] - obj_center[0]) ** 2 + (badge_center[1] - obj_center[1]) ** 2) ** 0.5
                 if dist < min_dist and dist <= threshold_distance:
                     min_dist = dist

kotonebot/kaa/game_ui/common.py

@@ -4,7 +4,7 @@ from cv2.typing import MatLike
 
 from kotonebot import action, color, image
 from kotonebot.backend.color import HsvColor
-from kotonebot.util import Rect
+from kotonebot.primitives import RectTuple, Rect
 from kotonebot.backend.core import Image
 from kotonebot.backend.preprocessor import HsvColorFilter
 
@@ -20,16 +20,16 @@ def filter_rectangles(
     过滤出指定颜色，并执行轮廓查找，返回符合要求的轮廓的 bound box。
     返回结果按照 y 坐标排序。
     """
-    img_hsv =cv2.cvtColor(img, cv2.COLOR_BGR2HSV)
+    img_hsv = cv2.cvtColor(img, cv2.COLOR_BGR2HSV)
 
     white_mask = cv2.inRange(img_hsv, np.array(color_ranges[0]), np.array(color_ranges[1]))
     contours, _ = cv2.findContours(white_mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
-    result_rects = []
+    result_rects: list[Rect] = []
     for contour in contours:
         x, y, w, h = cv2.boundingRect(contour)
         # 如果不在指定范围内，跳过
         if rect is not None:
-            rect_x1, rect_y1, rect_w, rect_h = rect
+            rect_x1, rect_y1, rect_w, rect_h = rect.xywh
             rect_x2 = rect_x1 + rect_w
             rect_y2 = rect_y1 + rect_h
             if not (
@@ -42,8 +42,8 @@ def filter_rectangles(
         aspect_ratio = w / h
         area = cv2.contourArea(contour)
         if aspect_ratio >= aspect_ratio_threshold and area >= area_threshold:
-            result_rects.append((x, y, w, h))
-    result_rects.sort(key=lambda x: x[1])
+            result_rects.append(Rect(x, y, w, h))
+    result_rects.sort(key=lambda x: x.y1)
     return result_rects
 
 @action('按钮是否禁用', screenshot_mode='manual-inherit')

kotonebot/kaa/game_ui/commu_event_buttons.py

@@ -2,9 +2,10 @@ from dataclasses import dataclass
 from typing import Sequence
 
 from ..tasks import R
+from kotonebot.primitives import Rect, RectTuple
 from kotonebot.backend.core import HintBox
 from kotonebot.backend.color import HsvColor
-from kotonebot import action, device, ocr, sleep, Rect
+from kotonebot import action, device, ocr, sleep
 from .common import filter_rectangles, WHITE_LOW, WHITE_HIGH
 
 @dataclass
@@ -103,7 +104,7 @@ class CommuEventButtonUI:
         if selected is not None:
             result.append(selected)
             selected.selected = False
-        result.sort(key=lambda x: x.rect[1])
+        result.sort(key=lambda x: x.rect.y1)
         return result
 
     @action('交流事件按钮.识别描述', screenshot_mode='manual-inherit')
@@ -116,7 +117,7 @@ class CommuEventButtonUI:
         """
         img = device.screenshot()
         rects = filter_rectangles(img, (WHITE_LOW, WHITE_HIGH), 3, 1000, rect=self.rect)
-        rects.sort(key=lambda x: x[1])
+        rects.sort(key=lambda x: x.y1)
         # TODO: 这里 rects 可能为空，需要加入判断重试
         ocr_result = ocr.raw().ocr(img, rect=rects[0])
         return ocr_result.squash().text

kotonebot/kaa/game_ui/idols_overview.py

@@ -7,7 +7,7 @@ from cv2.typing import MatLike
 
 from kotonebot.kaa.tasks import R
 from kotonebot.kaa.util import paths
-from kotonebot.util import Rect
+from kotonebot.primitives import RectTuple, Rect
 from kotonebot.kaa.game_ui import Scrollable
 from kotonebot import device, action
 from kotonebot.kaa.image_db import ImageDatabase, HistDescriptor, FileDataSource
@@ -21,7 +21,7 @@ RED_DOT = ((157, 205, 255), (179, 255, 255)) # 红点
 ORANGE_SELECT_BORDER = ((9, 50, 106), (19, 255, 255)) # 当前选中的偶像的橙色边框
 WHITE_BACKGROUND = ((0, 0, 234), (179, 40, 255)) # 白色背景
 
-def extract_idols(img: MatLike) -> list[Rect]:
+def extract_idols(img: MatLike) -> list[RectTuple]:
     """
     寻找给定图像中的所有偶像。
 
@@ -48,7 +48,7 @@ def extract_idols(img: MatLike) -> list[Rect]:
             rects.append((x, y, w, h))
     return rects
 
-def display_rects(img: MatLike, rects: list[Rect]) -> MatLike:
+def display_rects(img: MatLike, rects: list[RectTuple]) -> MatLike:
     """Draw rectangles on the image and display them."""
     result = img.copy()
     for rect in rects:
@@ -60,7 +60,7 @@ def display_rects(img: MatLike, rects: list[Rect]) -> MatLike:
                    cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 0), 1)
     return result
 
-def draw_idol_preview(img: MatLike, rects: list[Rect], db: ImageDatabase, idol_path: str) -> MatLike:
+def draw_idol_preview(img: MatLike, rects: list[RectTuple], db: ImageDatabase, idol_path: str) -> MatLike:
     """
     在预览图上绘制所有匹配到的偶像。
     
@@ -110,7 +110,7 @@ def idols_db() -> ImageDatabase:
 def locate_idol(skin_id: str):
     device.screenshot()
     logger.info('Locating idol %s', skin_id)
-    x, y, w, h = R.Produce.BoxIdolOverviewIdols
+    x, y, w, h = R.Produce.BoxIdolOverviewIdols.xywh
     db = idols_db()
     sc = Scrollable(color_schema='light')
 
@@ -140,7 +140,7 @@ def locate_idol(skin_id: str):
             # 同一张卡升级前后图片不一样，index 分别为 0 和 1
             if match and match.key.startswith(skin_id):
                 logger.info('Found idol %s', skin_id)
-                return rx, ry, rw, rh
+                return Rect(rx, ry, rw, rh)
     return None
     # cv2.imshow('Detected Idols', cv2.resize(display_rects(img, rects), (0, 0), fx=0.5, fy=0.5))
 

kotonebot/kaa/game_ui/schedule.py

@@ -0,0 +1,162 @@
+import logging
+from dataclasses import dataclass
+
+from cv2.typing import MatLike
+
+from kotonebot.primitives import Rect
+from kotonebot import ocr, device, image, action
+from kotonebot.backend.core import HintBox
+from kotonebot.kaa.common import ProduceAction
+from kotonebot.kaa.tasks import R
+
+logger = logging.getLogger(__name__)
+
+# 三属性的当前值与最大值读取范围
+CurVoValue = HintBox(x1=185, y1=680, x2=285, y2=720, source_resolution=(720, 1280))
+CurDaValue = HintBox(x1=330, y1=680, x2=430, y2=720, source_resolution=(720, 1280))
+CurViValue = HintBox(x1=475, y1=680, x2=575, y2=720, source_resolution=(720, 1280))
+MaxDaValue = HintBox(x1=285, y1=720, x2=430, y2=750, source_resolution=(720, 1280))
+
+
+@dataclass
+class Lesson:
+    """
+    :param rect: 课程位置
+    :param sp: 是否为 SP 课程
+    :param act: 课程类型
+    :param cur_attr_value: 课程属性的当前值
+    :param max_attr_value: 课程属性的最大值
+    """
+    rect: Rect
+    sp: bool
+    act: ProduceAction
+    cur_attr_value: int
+    max_attr_value: int
+
+
+class Schedule:
+    def __init__(self):
+        """
+        初始化日程表
+        这里本来想传入本次培育中的全局信息，比如 难度，偶像信息，各个课程sp率
+        这些信息在整局培育中是相同的
+        """
+        pass
+
+    @action('检测日程是否有课程', screenshot_mode='manual-inherit')
+    def have_lesson(self) -> bool:
+        """
+        判断是否有课程，依据是课程的名字的图片
+        TODO: NIA 课程的名字的图片没放到这里，后续若要支持NIA需要添加对应的图片
+        """
+        device.screenshot()
+        result = image.find_multi([
+            R.InPurodyuusu.TextActionVocal,
+            R.InPurodyuusu.TextActionDance,
+            R.InPurodyuusu.TextActionVisual,
+        ])
+        return result is not None
+
+    @action('识别日程，课程抉择，', screenshot_mode='manual-inherit')
+    def select_lesson(self) -> Lesson:
+        """
+        选择课程，根据推荐、属性进行抉择
+        :return: 课程
+        """
+        recommended = self.read_sensei_recommended()
+        lesson_data = self.read_lesson_data()
+        sp_lessons, nor_lessons = [], []
+        for l in lesson_data:
+            sp_lessons.append(l) if l.sp else nor_lessons.append(l)
+        have_sp = len(sp_lessons) > 0
+        for lesson in lesson_data:
+            if lesson.act == recommended and lesson.sp == have_sp:
+                logger.info(f'Recommended: {lesson}')
+                return lesson
+
+        # TODO: 各个课程的属性上限需要根据难度+偶像属性要求进行调整，之后再根据此上限选择课程.目前设置上限为 attr_limit_ratio
+        cal_lesson = None
+        attr_limit_ratio = 0.8
+        if sp_lessons:
+            lesson = min(sp_lessons, key=lambda x: x.cur_attr_value)
+            if lesson.cur_attr_value < lesson.max_attr_value * attr_limit_ratio:
+                cal_lesson = lesson
+        if cal_lesson is None and nor_lessons:
+            cal_lesson = min(nor_lessons, key=lambda x: x.cur_attr_value)
+        if cal_lesson is None:
+            logger.warning('Lesson calculate error, select vocal')
+            return lesson_data[0]
+        logger.info(f'Recommended is not sp, calculate result:  {cal_lesson}')
+        return cal_lesson
+
+    @action('读取日程中课程数据', screenshot_mode='manual-inherit')
+    def read_lesson_data(self) -> list[Lesson]:
+        """
+        读取当前课程数据，包括位置，是否为sp，当前属性对应数值和最大值
+        :return: 课程数据列表
+        """
+        img = device.screenshot()
+        sp_list = image.find_all(R.InPurodyuusu.IconSp)
+        vo_sp = da_sp = vi_sp = False
+        vo = image.expect(R.InPurodyuusu.ButtonPracticeVocal)
+        da = image.expect(R.InPurodyuusu.ButtonPracticeDance)
+        vi = image.expect(R.InPurodyuusu.ButtonPracticeVisual)
+        for cur_sp in sp_list:
+            if cur_sp.position[0] < vo.position[0]:
+                vo_sp = True
+            elif vo.position[0] < cur_sp.position[0] < da.position[0]:
+                da_sp = True
+            elif da.position[0] < cur_sp.position[0] < vi.position[0]:
+                vi_sp = True
+        max_value = self.read_number(img, MaxDaValue)
+        lesson_data = [
+            Lesson(vo.rect, vo_sp, ProduceAction.VOCAL, self.read_number(img, CurVoValue), max_value),
+            Lesson(da.rect, da_sp, ProduceAction.DANCE, self.read_number(img, CurDaValue), max_value),
+            Lesson(vi.rect, vi_sp, ProduceAction.VISUAL, self.read_number(img, CurViValue), max_value),
+        ]
+        for lesson in lesson_data:
+            logger.info(f'Lesson: {lesson}')
+        return lesson_data
+
+    @action('读取日程中老师的推荐行动', screenshot_mode='manual-inherit')
+    def read_sensei_recommended(self) -> ProduceAction:
+        """
+        读取老师的推荐行动
+        :return: 当前推荐行动，如果没推荐行动，返回 RECOMMENDED
+        """
+        device.screenshot()
+        if image.find(R.InPurodyuusu.IconAsariSenseiAvatar):
+            logger.debug('Retrieving recommended lesson...')
+            result = image.find_multi([
+                R.InPurodyuusu.TextSenseiTipVocal,
+                R.InPurodyuusu.TextSenseiTipDance,
+                R.InPurodyuusu.TextSenseiTipVisual,
+                R.InPurodyuusu.TextSenseiTipRest,
+                R.InPurodyuusu.TextSenseiTipConsult,
+            ])
+            if result:
+                match result.index:
+                    case 0:
+                        return ProduceAction.VOCAL
+                    case 1:
+                        return ProduceAction.DANCE
+                    case 2:
+                        return ProduceAction.VISUAL
+                    case 3:
+                        return ProduceAction.REST
+                    case 4:
+                        return ProduceAction.CONSULT
+        return ProduceAction.RECOMMENDED
+
+    def read_number(self, img: MatLike, box: HintBox) -> int:
+        """
+        :param img: MatLike 图像
+        :param box: HintBox 需要读取数值的范围
+        :return: int 数值，读取失败返回0
+        """
+        all_number = ocr.raw().ocr(img, rect=box)
+        all_number = all_number.squash().numbers()
+        if all_number:
+            return int(all_number[0])
+        else:
+            return 0

kotonebot/kaa/game_ui/scrollable.py

@@ -4,11 +4,12 @@ from typing import Literal
 
 import cv2
 import numpy as np
-from cv2.typing import MatLike, Rect
+from cv2.typing import MatLike
 
-from kotonebot import device, color, action
+from kotonebot import device, action
+from kotonebot.primitives import Rect
 from kotonebot.backend.core import HintBox
-from kotonebot.backend.preprocessor import HsvColorFilter
+from kotonebot.primitives.geometry import RectTuple
 
 logger = logging.getLogger(__name__)
 
@@ -77,7 +78,7 @@ def find_scroll_bar2(img: MatLike) -> Rect | None:
     contours, _ = cv2.findContours(dilated, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
     # 找出最可能是滚动条的轮廓：
     # 宽高比 < 0.5，且形似矩形，且最长
-    rects = []
+    rects: list[RectTuple] = []
     for contour in contours:
         x, y, w, h = cv2.boundingRect(contour)
         contour_area = cv2.contourArea(contour)
@@ -86,7 +87,7 @@ def find_scroll_bar2(img: MatLike) -> Rect | None:
             rects.append((x, y, w, h))
     if rects:
         longest_rect = max(rects, key=lambda r: r[2] * r[3])
-        return longest_rect
+        return Rect(xywh=longest_rect)
     return None
 
 class ScrollableIterator:
@@ -190,7 +191,7 @@ class Scrollable:
             return False
         logger.debug('Scrollbar rect found.')
 
-        x, y, w, h = self.scrollbar_rect
+        x, y, w, h = self.scrollbar_rect.xywh
         scroll_img = img[y:y+h, x:x+w]
         # 灰度、二值化
         gray = cv2.cvtColor(scroll_img, cv2.COLOR_BGR2GRAY)

kotonebot/kaa/kaa_context.py

@@ -0,0 +1,8 @@
+from kotonebot.backend.context import vars
+from kotonebot.client.host import Instance
+
+def _set_instance(new_instance: Instance) -> None:
+    vars.set('instance', new_instance)
+
+def instance() -> Instance:
+    return vars.get('instance')