ksaa 2025.6.8.0__py3-none-any.whl → 2025.6.28.0__py3-none-any.whl

kotonebot/kaa/game_ui/common.py

@@ -2,10 +2,10 @@ import cv2
 import numpy as np
 from cv2.typing import MatLike
 
-from kotonebot import action, color, image
-from kotonebot.backend.color import HsvColor
-from kotonebot.primitives import RectTuple, Rect
+from kotonebot.primitives import Rect
 from kotonebot.backend.core import Image
+from kotonebot.backend.color import HsvColor
+from kotonebot import action, color, image, device
 from kotonebot.backend.preprocessor import HsvColorFilter
 
 
@@ -88,7 +88,4 @@ class WhiteFilter(HsvColorFilter):
 
 
 if __name__ == '__main__':
-    from kotonebot.backend.context import init_context, manual_context, device
-
-    init_context()
-    manual_context().begin()
+    pass

kotonebot/kaa/game_ui/dialog.py

@@ -1,45 +1,65 @@
+import logging
+
 from kotonebot.kaa.tasks import R
 from kotonebot import device, image
 
-def expect_yes():
+logger = logging.getLogger(__name__)
+
+def expect_yes(*, msg: str | None = None):
     """
     点击对话框上的✔️按钮。若不存在，会等待其出现，直至超时异常。
     
     前置条件：当前打开了任意对话框\n
     结束状态：点击了肯定意义按钮（✔️图标，橙色背景）后瞬间
+
+    :param msg: 成功点击后输出的日志信息。信息中的动词建议使用过去式。
     """
     device.click(image.expect(R.Common.IconButtonCheck))
+    if msg is not None:
+        logger.debug(msg)
 
-def yes() -> bool:
+def yes(*, msg: str | None = None) -> bool:
     """
     点击对话框上的✔️按钮。
 
     前置条件：当前打开了任意对话框\n
     结束状态：点击了肯定意义按钮（✔️图标，橙色背景）后瞬间
+
+    :param msg: 成功点击后输出的日志信息。信息中的动词建议使用过去式。
     """
     if image.find(R.Common.IconButtonCheck):
         device.click()
+        if msg is not None:
+            logger.debug(msg)
         return True
     return False
 
-def expect_no():
+def expect_no(*, msg: str | None = None):
     """
     点击对话框上的✖️按钮。若不存在，会等待其出现，直至超时异常。
     
     前置条件：当前打开了任意对话框\n
     结束状态：点击了否定意义按钮（✖️图标，白色背景）后瞬间
+
+    :param msg: 成功点击后输出的日志信息。信息中的动词建议使用过去式。
     """
     device.click(image.expect(R.Common.IconButtonCross))
+    if msg is not None:
+        logger.debug(msg)
 
-def no():
+def no(*, msg: str | None = None):
     """
     点击对话框上的✖️按钮。
 
     前置条件：当前打开了任意对话框\n
     结束状态：点击了否定意义按钮（✖️图标，白色背景）后瞬间
+
+    :param msg: 成功点击后输出的日志信息。信息中的动词建议使用过去式。
     """
     if image.find(R.Common.IconButtonCross):
         device.click()
+        if msg is not None:
+            logger.debug(msg)
         return True
     return False
 

kotonebot/kaa/game_ui/idols_overview.py

@@ -10,7 +10,8 @@ from kotonebot.kaa.util import paths
 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
+from kotonebot.util import cv2_imread
+from kotonebot.kaa.image_db import ImageDatabase, HistDescriptor, FileDataSource, DatabaseQueryResult
 from kotonebot.backend.preprocessor import HsvColorsRemover
 
 logger = logging.getLogger(__name__)
@@ -106,8 +107,32 @@ def idols_db() -> ImageDatabase:
         _db = ImageDatabase(FileDataSource(str(path)), db_path, HistDescriptor(8), name='idols')
     return _db
 
+def match_idol(skin_id: str, idol_img: MatLike) -> DatabaseQueryResult | None:
+    """
+    将给定图像与指定偶像 ID 进行匹配。
+
+    :param skin_id: 偶像 ID。
+    :param idol_img: 待匹配偶像图像。
+    :return: 若匹配成功，则返回匹配结果，否则返回 None。
+    """
+    db = idols_db()
+    match = db.match(idol_img, 20)
+    if match and match.key.startswith(skin_id):
+        return match
+    else:
+        return None
+
 @action('定位偶像', screenshot_mode='manual-inherit')
-def locate_idol(skin_id: str):
+def locate_idol(skin_id: str) -> Rect | None:
+    """
+    定位并选中指定偶像。
+
+    前置条件：位于偶像总览界面。\n
+    结束状态：位于偶像总览界面。
+
+    :param skin_id: 目标偶像的 Skin ID
+    :return: 若成功，返回目标偶像的范围 (x, y, w, h)，否则返回 None。
+    """
     device.screenshot()
     logger.info('Locating idol %s', skin_id)
     x, y, w, h = R.Produce.BoxIdolOverviewIdols.xywh
@@ -146,15 +171,6 @@ def locate_idol(skin_id: str):
 
     # # 使用新函数绘制预览图
     # preview_img = draw_idol_preview(img, rects, db, path)
-    
-
-def test():
-    from kotonebot.backend.context import init_context, manual_context
-    init_context()
-    manual_context().begin()
-    locate_idol('i_card-skin-fktn-3-006')
 
 if __name__ == '__main__':
-    from kotonebot.util import cv2_imread
-
-    test()
+    locate_idol('i_card-skin-fktn-3-006')

kotonebot/kaa/game_ui/primary_button.py

@@ -0,0 +1,55 @@
+import cv2
+import numpy as np
+from typing import Optional
+from cv2.typing import MatLike
+
+from kotonebot import action, image, device
+from kotonebot.backend.core import Image
+from kotonebot.backend.image import TemplateMatchResult
+
+
+def primary_button_state(img: MatLike) -> Optional[bool]:
+    """
+    分析按钮图像并根据红色通道直方图返回按钮状态
+
+    :param img: 输入的按钮图像 (BGR格式)
+    :return: True - 启用状态
+             False - 禁用状态
+             None - 未知状态或输入无效
+    """
+    # 确保图像有效
+    if img is None or img.size == 0:
+        return None
+
+    # 计算红色通道直方图（五箱）
+    _, _, r = cv2.split(img)
+    hist = cv2.calcHist([r], [0], None, [5], [0, 256])
+    # 归一化并找出红色集中在哪一箱
+    hist = hist.ravel() / hist.sum()
+    max_idx = np.argmax(hist)
+
+    if max_idx == 3:
+        return False
+    elif max_idx == 4:
+        return True
+    else:
+        return None
+
+@action('寻找按钮', screenshot_mode='manual-inherit')
+def find_button(template: MatLike | Image, state: Optional[bool] = None) -> Optional[bool]:
+    """
+    在图像中寻找按钮并返回其状态
+
+    :param template: 按钮模板图像 (BGR格式)
+    :param state: 按钮状态 (True - 启用, False - 禁用, None - 任意)
+    :return: True - 启用状态
+             False - 禁用状态
+             None - 未找到按钮或状态未知
+    """
+    img = device.screenshot()
+    result = image.find(template)
+    if result is None:
+        return None
+    x, y, w, h = result.rect.xywh
+    button_img = img[y:y+h, x:x+w]
+    return primary_button_state(button_img)

kotonebot/kaa/game_ui/scrollable.py

@@ -327,12 +327,7 @@ class Scrollable:
         return ScrollableIterator(self, int(self.track_height * step), start, end, skip_first)
 
 if __name__ == '__main__':
-    from kotonebot.backend.context import init_context, manual_context, device
-    init_context()
-    manual_context().begin()
-    from kotonebot import device
     import cv2
-    from kotonebot.util import cv2_imread
     import time
     logger.setLevel(logging.DEBUG)
 

kotonebot/kaa/main/cli.py

@@ -1,13 +1,15 @@
 import os
 import sys
-import runpy
 import logging
 import argparse
 import importlib.metadata
 from datetime import datetime
 
 from .kaa import Kaa
+from ..util.paths import get_ahk_path
+from kotonebot.client.implements.windows import WindowsImplConfig
 from kotonebot.backend.context import tasks_from_id, task_registry
+from kotonebot.client.implements.remote_windows import RemoteWindowsServer
 
 version = importlib.metadata.version('ksaa')
 
@@ -90,9 +92,12 @@ def task_list() -> int:
 def remote_server() -> int:
     args = psr.parse_args()
     try:
-        # 使用runpy运行remote_windows.py模块
-        sys.argv = ['remote_windows.py', f'--host={args.host}', f'--port={args.port}']
-        runpy.run_module('kotonebot.client.implements.remote_windows', run_name='__main__')
+        ahk_path = get_ahk_path()
+        server = RemoteWindowsServer(WindowsImplConfig(window_title='gakumas', ahk_exe_path=ahk_path), args.host, args.port)
+        server.start()
+        return 0
+    except KeyboardInterrupt:
+        print("Server stopped by user")
         return 0
     except Exception as e:
         print(f'Error starting remote server: {e}')

kotonebot/kaa/main/dmm_host.py

@@ -1,11 +1,15 @@
 from typing_extensions import override
 
-from kotonebot.client import Device, create_device
-from kotonebot.client import DeviceImpl, Device
+from kotonebot.client import Device
 from kotonebot.client.host import HostProtocol, Instance
+from kotonebot.client.host.windows_common import WindowsRecipes, WindowsHostConfigs, CommonWindowsCreateDeviceMixin
+
+
+DmmHostConfigs = WindowsHostConfigs
+DmmRecipes = WindowsRecipes
 
 # TODO: 可能应该把 start_game 和 end_game 里对启停的操作移动到这里来
-class DmmInstance(Instance):
+class DmmInstance(CommonWindowsCreateDeviceMixin, Instance[DmmHostConfigs]):
     def __init__(self):
         super().__init__('dmm', 'gakumas')
 
@@ -30,12 +34,11 @@ class DmmInstance(Instance):
         raise NotImplementedError()
 
     @override
-    def create_device(self, impl: DeviceImpl, *, timeout: float = 180) -> Device:
-        if impl not in ['windows', 'remote_windows']:
-            raise ValueError(f'Unsupported device implementation: {impl}')
-        return create_device('', impl, timeout=timeout)
+    def create_device(self, impl: DmmRecipes, host_config: DmmHostConfigs) -> Device:
+        """为 DMM 实例创建 Device。"""
+        return super().create_device(impl, host_config)
 
-class DmmHost(HostProtocol):
+class DmmHost(HostProtocol[DmmRecipes]):
     instance = DmmInstance()
     """DmmInstance 单例。"""
 
@@ -51,3 +54,7 @@ class DmmHost(HostProtocol):
     @staticmethod
     def query(*, id: str) -> Instance | None:
         raise NotImplementedError()
+
+    @staticmethod
+    def recipes() -> 'list[DmmRecipes]':
+        return ['windows', 'remote_windows']

kotonebot/kaa/main/gr.py

@@ -2,6 +2,7 @@ import os
 import traceback
 import zipfile
 import logging
+import copy
 from functools import partial
 from itertools import chain
 from datetime import datetime, timedelta
@@ -33,6 +34,7 @@ ConfigKey = Literal[
     'check_emulator', 'emulator_path',
     'adb_emulator_name', 'emulator_args',
     '_mumu_index', '_leidian_index',
+    'mumu_background_mode',
 
     # purchase
     'purchase_enabled',
@@ -94,17 +96,30 @@ ConfigSetFunction = Callable[[BaseConfig, Dict[ConfigKey, Any]], None]
 ConfigBuilderReturnValue = Tuple[ConfigSetFunction, Dict[ConfigKey, GradioInput]]
 
 def _save_bug_report(
+    title: str,
+    description: str,
     version: str,
+    upload: bool,
     path: str | None = None
 ) -> Generator[str, None, str]:
     """
     保存报告
 
-    :param path: 保存的路径。若为 `None`，则保存到 `./reports/bug-{YY-MM-DD HH-MM-SS}.zip`。
+    :param title: 标题
+    :param description: 描述
+    :param version: 版本号
+    :param upload: 是否上传
+    :param path: 保存的路径。若为 `None`，则保存到 `./reports/bug-YY-MM-DD HH-MM-SS_标题.zip`。
     :return: 保存的路径
     """
     from kotonebot import device
     from kotonebot.backend.context import ContextStackVars
+    import re
+
+    # 过滤标题中的非法文件名字符
+    def sanitize_filename(s: str) -> str:
+        # 替换 \/:*?"<>| 为空或下划线
+        return re.sub(r'[\\/:*?"<>|]', '_', s)
 
     # 确保目录存在
     os.makedirs('logs', exist_ok=True)
@@ -112,8 +127,18 @@ def _save_bug_report(
 
     error = ""
     if path is None:
-        path = f'./reports/bug-{datetime.now().strftime("%y-%m-%d %H-%M-%S")}.zip'
+        safe_title = sanitize_filename(title)[:30] or "无标题"
+        timestamp = datetime.now().strftime("%y-%m-%d-%H-%M-%S")
+        path = f'./reports/bug_{timestamp}_{safe_title}.zip'
     with zipfile.ZipFile(path, 'w', zipfile.ZIP_DEFLATED, compresslevel=9) as zipf:
+        # 打包描述文件
+        yield "### 打包描述文件..."
+        try:
+            description_content = f"标题：{title}\n类型：bug\n内容：\n{description}"
+            zipf.writestr('description.txt', description_content.encode('utf-8'))
+        except Exception as e:
+            error += f"保存描述文件失败：{str(e)}\n"
+
         # 打包截图
         yield "### 打包上次截图..."
         try:
@@ -158,12 +183,16 @@ def _save_bug_report(
         # 写出版本号
         zipf.writestr('version.txt', version)
 
+    if not upload:
+        yield f"### 报告已保存至 {os.path.abspath(path)}"
+        return path
+
     # 上传报告
-    from kotonebot.ui.file_host.sensio import upload
+    from kotonebot.ui.file_host.sensio import upload as upload_file
     yield "### 上传报告..."
     url = ''
     try:
-        url = upload(path)
+        url = upload_file(path)
     except Exception as e:
         yield f"### 上传报告失败：{str(e)}\n\n"
         return ''
@@ -371,9 +400,41 @@ class KotoneBotUI:
             assert key in CONFIG_KEY_VALUE, f"未知的配置项：{key}"
             key = cast(ConfigKey, key)
             data[key] = value
-        # 设置结果
+        
+        # 先设置options
         for (set_func, _) in return_values:
             set_func(options, data)
+        
+        # 验证规则1：截图方法验证
+        screenshot_method = self.current_config.backend.screenshot_impl
+        backend_type = self.current_config.backend.type
+        
+        valid_screenshot_methods = {
+            'mumu12': ['adb', 'adb_raw', 'uiautomator2', 'nemu_ipc'],
+            'leidian': ['adb', 'adb_raw', 'uiautomator2'],
+            'custom': ['adb', 'adb_raw', 'uiautomator2'],
+            'dmm': ['remote_windows', 'windows']
+        }
+        
+        if screenshot_method not in valid_screenshot_methods.get(backend_type, []):
+            gr.Warning(f"截图方法 '{screenshot_method}' 不适用于当前选择的模拟器类型，配置未保存。")
+            return ""
+        
+        # 验证规则2：若启用培育，那么培育偶像不能为空
+        if options.produce.enabled and not options.produce.idols:
+            gr.Warning("启用培育时，培育偶像不能为空，配置未保存。")
+            return ""
+        
+        # 验证规则3：若启用AP/金币购买，对应的商品不能为空
+        if options.purchase.ap_enabled and not options.purchase.ap_items:
+            gr.Warning("启用AP购买时，AP商店购买物品不能为空，配置未保存。")
+            return ""
+        
+        if options.purchase.money_enabled and not options.purchase.money_items:
+            gr.Warning("启用金币购买时，金币商店购买物品不能为空，配置未保存。")
+            return ""
+        
+        # 验证通过，保存配置
         self.current_config.options = options
         try:
             save_config(self.config, "config.json")
@@ -393,7 +454,14 @@ class KotoneBotUI:
             if self._kaa.upgrade_msg:
                 gr.Markdown('### 配置升级报告')
                 gr.Markdown(self._kaa.upgrade_msg)
-            gr.Markdown('脚本报错或者卡住？点击"日志"选项卡中的"一键导出报告"可以快速反馈！')
+            gr.Markdown('脚本报错或者卡住？前往"反馈"选项卡可以快速导出报告！')
+            
+            # 添加调试模式警告
+            if self.current_config.keep_screenshots:
+                gr.Markdown(
+                    '<div style="color: red; font-size: larger;">当前启用了调试功能「保留截图数据」，调试结束后正常使用时建议关闭此选项！</div>',
+                    elem_classes=["debug-warning"]
+                )
 
             task_status = gr.Dataframe(
                 headers=["任务", "状态"],
@@ -555,7 +623,9 @@ class KotoneBotUI:
             #     choices = ['windows', 'remote_windows']
             # else:  # Mumu, Leidian, Custom
             #     choices = ['adb', 'adb_raw', 'uiautomator2']
-            choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows']
+            # else:
+            #     raise ValueError(f'Unsupported backend type: {type_in_config}')
+            choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows', 'nemu_ipc']
             if impl_value not in choices:
                 new_value = choices[0]
             else:
@@ -576,13 +646,21 @@ class KotoneBotUI:
                             choices=[(i.name, i.id) for i in instances],
                             interactive=True
                         )
+                        mumu_background_mode = gr.Checkbox(
+                            label="MuMu12 模拟器后台保活模式",
+                            value=self.current_config.backend.mumu_background_mode,
+                            info=BackendConfig.model_fields['mumu_background_mode'].description,
+                            interactive=True
+                        )
                     except:  # noqa: E722
                         logger.exception('Failed to list installed MuMu12')
                         gr.Markdown('获取 MuMu12 模拟器列表失败，请升级模拟器到最新版本。若问题依旧，前往 QQ 群、QQ 频道或 Github 反馈 bug。')
                         mumu_instance = gr.Dropdown(visible=False)
+                        mumu_background_mode = gr.Checkbox(visible=False)
                 else:
                     # 为了让 return 收集组件时不报错
                     mumu_instance = gr.Dropdown(visible=False)
+                    mumu_background_mode = gr.Checkbox(visible=False)
 
             with gr.Tab("雷电", interactive=has_leidian, id="leidian") as tab_leidian:
                 gr.Markdown("已选中雷电模拟器")
@@ -661,7 +739,7 @@ class KotoneBotUI:
         #     choices = ['adb', 'adb_raw', 'uiautomator2']
         # else:
         #     raise ValueError(f'Unsupported backend type: {type_in_config}')
-        choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows']
+        choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows', 'nemu_ipc']
         screenshot_impl = gr.Dropdown(
             choices=choices,
             value=self.current_config.backend.screenshot_impl,
@@ -711,6 +789,7 @@ class KotoneBotUI:
             if current_tab == 0:  # Mumu
                 self.current_config.backend.type = 'mumu12'
                 self.current_config.backend.instance_id = data['_mumu_index']
+                self.current_config.backend.mumu_background_mode = data['mumu_background_mode']
             elif current_tab == 1:  # Leidian
                 self.current_config.backend.type = 'leidian'
                 self.current_config.backend.instance_id = data['_leidian_index']
@@ -741,7 +820,8 @@ class KotoneBotUI:
             'adb_emulator_name': adb_emulator_name,
             'emulator_args': emulator_args,
             '_mumu_index': mumu_instance,
-            '_leidian_index': leidian_instance
+            '_leidian_index': leidian_instance,
+            'mumu_background_mode': mumu_background_mode
         }
 
     def _create_purchase_settings(self) -> ConfigBuilderReturnValue:
@@ -1460,27 +1540,33 @@ class KotoneBotUI:
             )
 
     def _create_log_tab(self) -> None:
-        with gr.Tab("日志"):
-            gr.Markdown("## 日志")
-
+        with gr.Tab("反馈"):
+            gr.Markdown("## 反馈")
+            gr.Markdown('脚本报错或者卡住？在这里填写信息可以快速反馈！')
             with gr.Column():
+                report_title = gr.Textbox(label="标题", placeholder="用一句话概括问题")
+                report_type = gr.Dropdown(label="反馈类型", choices=["bug"], value="bug", interactive=False)
+                report_description = gr.Textbox(label="描述", lines=5, placeholder="详细描述问题。例如：什么时候出错、是否每次都出错、出错时的步骤是什么")
                 with gr.Row():
-                    export_dumps_btn = gr.Button("导出 dump")
-                    export_logs_btn = gr.Button("导出日志")
-                with gr.Row():
-                    save_report_btn = gr.Button("一键导出报告")
+                    upload_report_btn = gr.Button("上传")
+                    save_local_report_btn = gr.Button("保存至本地")
+
                 result_text = gr.Markdown("等待操作\n\n\n")
 
-            export_dumps_btn.click(
-                fn=self.export_dumps,
-                outputs=[result_text]
-            )
-            export_logs_btn.click(
-                fn=self.export_logs,
+            def on_upload_click(title: str, description: str):
+                yield from _save_bug_report(title, description, self._kaa.version, upload=True)
+
+            def on_save_local_click(title: str, description: str):
+                yield from _save_bug_report(title, description, self._kaa.version, upload=False)
+
+            upload_report_btn.click(
+                fn=on_upload_click,
+                inputs=[report_title, report_description],
                 outputs=[result_text]
             )
-            save_report_btn.click(
-                fn=partial(_save_bug_report, version=self._kaa.version),
+            save_local_report_btn.click(
+                fn=on_save_local_click,
+                inputs=[report_title, report_description],
                 outputs=[result_text]
             )
 
@@ -1493,6 +1579,7 @@ class KotoneBotUI:
     def _create_screen_tab(self) -> None:
         with gr.Tab("画面"):
             gr.Markdown("## 当前设备画面")
+            refresh_btn = gr.Button("刷新画面", variant="primary")
             WIDTH = 720 // 3
             HEIGHT = 1280 // 3
             last_update_text = gr.Markdown("上次更新时间：无数据")
@@ -1501,14 +1588,14 @@ class KotoneBotUI:
             def update_screenshot():
                 ctx = ContextStackVars.current()
                 if ctx is None:
-                    return [None, last_update_text.value]
+                    return [None, "上次更新时间：无上下文数据"]
                 screenshot = ctx._screenshot
                 if screenshot is None:
-                    return [None, last_update_text.value]
+                    return [None, "上次更新时间：无截图数据"]
                 screenshot = cv2.cvtColor(screenshot, cv2.COLOR_BGR2RGB)
                 return screenshot, f"上次更新时间：{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
 
-            gr.Timer(0.3).tick(
+            refresh_btn.click(
                 fn=update_screenshot,
                 outputs=[screenshot_display, last_update_text]
             )