ksaa 2025.11.post3__py3-none-any.whl → 2026.2b1__py3-none-any.whl

kaa/application/services/config_service.py

@@ -92,7 +92,7 @@ class ConfigService:
             'mumu12v5': ['adb', 'adb_raw', 'uiautomator2', 'nemu_ipc'],
             'leidian': ['adb', 'adb_raw', 'uiautomator2'],
             'custom': ['adb', 'adb_raw', 'uiautomator2'],
-            'dmm': ['remote_windows', 'windows']
+            'dmm': ['remote_windows', 'windows', 'windows_background'],
         }
         if backend_config.screenshot_impl not in valid_screenshot_methods.get(backend_config.type, []):
             raise ConfigValidationError(

kaa/application/services/instant_service.py

@@ -0,0 +1,13 @@
+from kotonebot.interop.win import Win32Window
+
+class InstantService:
+    def __init__(self):
+        pass
+
+    def reset_game_window(self):
+        window = Win32Window.find_window('title', 'gakumas')
+        if not window:
+            return False
+        window.set_position(50, 50)
+        window.bring_foreground()
+        return True

kaa/application/ui/components/alert.pyi

@@ -0,0 +1,277 @@
+from typing import Optional, Dict, Any
+
+import gradio as gr
+
+# ͼ�� SVG ����
+ICONS: Dict[str, str] = {
+    "success": """<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />""",
+    "info": """<path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd" />""",
+    "warning": """<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd" />""",
+    "error": """<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />"""
+}
+from gradio.events import Dependency
+
+class Alert(gr.HTML):
+    def __init__(
+        self, 
+        value: str = "Alert Content", 
+        title: Optional[str] = None, 
+        variant: str = "info", 
+        action_text: Optional[str] = None, 
+        show_close: bool = True, 
+        visible: bool = True, 
+        elem_id: Optional[str] = None, 
+        **kwargs: Any
+    ):
+        """
+        �̳��� gr.HTML ���Զ��� Alert �����
+        
+        Args:
+            value: Alert ����Ҫ�����ı���
+            title: Alert �ı��⣨��ѡ����
+            variant: ��ʽ���壬��ѡ "success", "info", "warning", "error"��
+            action_text: �ײ�������ť���ı�����ѡ����
+            show_close: �Ƿ���ʾ�رհ�ť��
+            visible: �����ʼ�ɼ��ԡ�
+            elem_id: HTML Ԫ�� ID��
+            **kwargs: �������ݸ� gr.HTML �IJ�����
+        """
+        
+        # ��ʽ������ JS on_load ��̬ע���Ա���ʹ�� `css_template` ����
+
+        # 2. HTML ģ�� (HTML Template)
+        # �޸ĵ㣺�ع� HTML �ṹ���� button ���� .alert-body-wrapper ��
+        html_template = """
+        <div class="alert alert-${variant}" role="alert">
+            <svg class="alert-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                ${ {
+                    'success': `""" + ICONS['success'] + """`,
+                    'info': `""" + ICONS['info'] + """`,
+                    'warning': `""" + ICONS['warning'] + """`,
+                    'error': `""" + ICONS['error'] + """`
+                }[variant] }
+            </svg>
+            
+            <div class="alert-body-wrapper">
+                ${ title ? `<div class="alert-title">${title}</div>` : '' }
+                <div class="alert-description">${value}</div>
+                
+                ${ action_text ? `
+                <div class="alert-actions">
+                    <button class="action-btn">${action_text}</button>
+                </div>` : '' }
+            </div>
+            
+            ${ show_close ? `
+            <button class="close-btn" aria-label="Close">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd" />
+                </svg>
+            </button>` : '' }
+        </div>
+        """
+
+        # 3. JS �����߼� (JS on Load)
+        js = """
+        // ��̬ע����ʽ����ȥ�ؼ�飩
+        (function(){
+            const STYLE_ID = 'kaa-alert-styles';
+            if (!document.getElementById(STYLE_ID)) {
+                const style = document.createElement('style');
+                style.id = STYLE_ID;
+                style.innerHTML = `
+        .alert {
+            display: flex;
+            align-items: flex-start; /* �������� */
+            padding: 1rem;
+            border-radius: 0.5rem;
+            border: 1px solid transparent;
+            margin-bottom: 1rem;
+            transition: opacity 0.3s ease;
+        }
+        
+        .alert-icon { 
+            width: 1.25rem; 
+            height: 1.25rem; 
+            margin-right: 0.75rem; 
+            flex-shrink: 0; 
+        }
+        
+        .alert-body-wrapper {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            gap: 0.25rem; /* ���⡢��������ť֮��ļ�� */
+        }
+        
+        .alert-title { 
+            font-weight: 600; 
+            font-size: 0.875rem; 
+        }
+        
+        .alert-description { 
+            font-size: 0.875rem; 
+            line-height: 1.25rem; 
+        }
+        
+        .alert-actions { 
+            display: flex; 
+            align-items: center; 
+            gap: 0.5rem; 
+            margin-top: 0.25rem; /* ��ť���Ϸ����ֵĶ����� */
+        }
+        
+        /* Variants Colors */
+        .alert-success { background-color: #ecfdf5; border-color: #a7f3d0; color: #065f46; }
+        .alert-success .alert-icon, .alert-success .action-btn { color: #059669; }
+        
+        .alert-info { background-color: #eff6ff; border-color: #bfdbfe; color: #1e40af; }
+        .alert-info .alert-icon, .alert-info .action-btn { color: #2563eb; }
+        
+        .alert-warning { background-color: #fffbeb; border-color: #fde68a; color: #92400e; }
+        .alert-warning .alert-icon, .alert-warning .action-btn { color: #d97706; }
+        
+        .alert-error { background-color: #fef2f2; border-color: #fecaca; color: #991b1b; }
+        .alert-error .alert-icon, .alert-error .action-btn { color: #dc2626; }
+
+        /* Buttons */
+        .action-btn { 
+            background: transparent; 
+            border: none; 
+            font-weight: 600; 
+            cursor: pointer; 
+            padding: 0; /* �Ƴ� padding �Ա�������һ�����룬���߱��� padding ���ɰ�ť��ʽ */
+            padding-right: 0.5rem;
+            font-size: 0.875rem;
+            text-align: left;
+        }
+        .action-btn:hover { text-decoration: underline; }
+        
+        .close-btn { 
+            background: transparent; 
+            border: none; 
+            cursor: pointer; 
+            opacity: 0.6; 
+            padding: 0.25rem; 
+            margin-left: 0.75rem; /* ��������΢Զһ�� */
+            flex-shrink: 0;
+            display: flex; 
+        }
+        .close-btn:hover { opacity: 1; }
+        .close-btn svg { width: 1rem; height: 1rem; }
+
+        /* Dark Mode Support */
+        body.dark .alert-success { background-color: #064e3b; border-color: #059669; color: #d1fae5; }
+        body.dark .alert-success .alert-icon, body.dark .alert-success .action-btn { color: #34d399; }
+        
+        body.dark .alert-info { background-color: #1e3a8a; border-color: #1d4ed8; color: #dbeafe; }
+        body.dark .alert-info .alert-icon, body.dark .alert-info .action-btn { color: #60a5fa; }
+        
+        body.dark .alert-warning { background-color: #451a03; border-color: #b45309; color: #fef3c7; }
+        body.dark .alert-warning .alert-icon, body.dark .alert-warning .action-btn { color: #fbbf24; }
+        
+        body.dark .alert-error { background-color: #450a0a; border-color: #b91c1c; color: #fee2e2; }
+        body.dark .alert-error .alert-icon, body.dark .alert-error .action-btn { color: #f87171; }
+                `;
+                document.head.appendChild(style);
+            }
+        })();
+
+        const actionBtn = element.querySelector('.action-btn');
+        const closeBtn = element.querySelector('.close-btn');
+        const alertBox = element.querySelector('.alert');
+
+        if (actionBtn) {
+            actionBtn.addEventListener('click', (e) => {
+                e.stopPropagation(); // ��ֹð��
+                trigger('click', {
+                    action_text: props.action_text,
+                    variant: props.variant
+                });
+            });
+        }
+
+        if (closeBtn) {
+            closeBtn.addEventListener('click', (e) => {
+                e.stopPropagation();
+                alertBox.style.opacity = '0';
+                setTimeout(() => {
+                    alertBox.style.display = 'none';
+                    // ���� change �¼�֪ͨ���״̬�仯
+                    trigger('change', { status: 'closed' });
+                }, 300);
+            });
+        }
+        """
+
+        super().__init__(
+            value=value,
+            title=title,
+            variant=variant,
+            action_text=action_text,
+            show_close=show_close,
+            html_template=html_template,
+            js_on_load=js,
+            visible=visible,
+            elem_id=elem_id,
+            **kwargs
+        )
+    from typing import Callable, Literal, Sequence, Any, TYPE_CHECKING
+    from gradio.blocks import Block
+    if TYPE_CHECKING:
+        from gradio.components import Timer
+        from gradio.components.base import Component
+
+# --- ʹ��ʾ�� ---
+
+if __name__ == "__main__":
+    with gr.Blocks() as demo:
+        gr.Markdown("### Alert Component with Typed Arguments & Aligned Layout")
+
+        with gr.Row():
+            with gr.Column():
+                # ������
+                msg_input = gr.Textbox(label="Alert Message", value="���ƺ���û�д����κ���������������Ҫ�ȵ����������ﴴ��һ����")
+                title_input = gr.Textbox(label="Title", value="��ʾ")
+                variant_input = gr.Dropdown(["success", "info", "warning", "error"], label="Variant", value="info")
+                action_input = gr.Textbox(label="Action Button Text", value="ȥ����")
+                update_btn = gr.Button("Update Alert")
+
+            with gr.Column():
+                # ���ʵ����
+                alert = Alert(
+                    title="��ʾ",
+                    value="���ƺ���û�д����κ���������������Ҫ�ȵ����������ﴴ��һ����",
+                    variant="info",
+                    action_text="ȥ����",
+                    elem_id="my-alert"
+                )
+                
+                # �����ʾ��
+                result_box = gr.Textbox(label="Event Log")
+
+        # 1. ���� Alert ����
+        def update_props(msg: str, title: str, variant: str, action: str) -> Alert:
+            return Alert(value=msg, title=title, variant=variant, action_text=action)
+        
+        update_btn.click(
+            update_props, 
+            inputs=[msg_input, title_input, variant_input, action_input], 
+            outputs=alert
+        )
+
+        # 2. ���� Action ��ť���
+        def on_action_click(evt: gr.EventData) -> str:
+            data: Dict[str, Any] = evt._data # type: ignore
+            return f"Action Clicked! Variant: {data.get('variant')}, Action: {data.get('action_text')}"
+        
+        alert.click(on_action_click, outputs=result_box)
+
+        # 3. ���� Close ��ť���
+        def on_close(evt: gr.EventData) -> str:
+            data: Dict[str, Any] = evt._data # type: ignore
+            return f"Alert Closed. Status: {data.get('status')}"
+        
+        alert.change(on_close, outputs=result_box)
+
+    demo.launch()

kaa/application/ui/facade.py

@@ -4,6 +4,7 @@ import zipfile
 from datetime import datetime
 from typing import Any, Dict, List, Tuple
 
+from kaa.application.services.instant_service import InstantService
 from kaa.main.kaa import Kaa
 from kaa.application.services.config_service import ConfigService, ConfigValidationError
 from kaa.application.services.produce_solution_service import ProduceSolutionService
@@ -32,6 +33,7 @@ class KaaFacade:
         # Other existing services
         self.update_service = UpdateService()
         self.feedback_service = FeedbackService()
+        self.instance_service = InstantService()
         self.idle_mgr = self._setup_idle_manager()
 
         self._kaa = kaa_instance

kaa/application/ui/views/settings_view.py

@@ -203,6 +203,20 @@ class SettingsView:
             # --- DMM ---
             with gr.Tab("DMM", id="dmm") as tab_dmm:
                 gr.Markdown("已选中 DMM")
+                wait_cursor_speed = gr.Number(
+                    value=user_config.backend.cursor_wait_speed,
+                    label="后台挂机时光标最大速度（像素/秒）",
+                    info="""使用 DMM 版后台挂机功能时，在点击前会尝试等待光标静止，以避免发生点击偏移。
+此项规定了速度小于多少时认为光标静止，单位为像素/秒。
+
+-1 表示使用内置默认值，0 表示禁用该功能。
+值越大，等待时间越短，脚本响应越快，但点击偏移风险上升，可能导致误点击而卡住。
+值越小，等待时间越长，脚本响应越慢，但点击偏移风险下降，稳定性更好。
+""",
+                    minimum=-1, step=0.1, interactive=True
+                )
+                self._bind(wait_cursor_speed, ref(of(user_config.backend).cursor_wait_speed))
+                gr.Button('重置游戏窗口位置', scale=1).click(self.facade.instance_service.reset_game_window)
             
             tab_dmm.select(
                 fn=lambda: ("dmm", None), 
@@ -211,7 +225,15 @@ class SettingsView:
 
         # 通用设置
         comps['screenshot'] = gr.Dropdown(
-            choices=['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows', 'nemu_ipc'],
+            choices=[
+                ('adb - 模拟器通用', 'adb'),
+                ('adb_raw（已废弃勿选）', 'adb_raw'),
+                ('uiautomator2 - 模拟器通用', 'uiautomator2'),
+                ('windows - DMM 版前台挂机', 'windows'),
+                ('remote_windows（调试专用勿选）', 'remote_windows'),
+                ('windows_background - DMM 版后台挂机（实验性）', 'windows_background'),
+                ('nemu_ipc - MuMu 模拟器专属（推荐）', 'nemu_ipc')
+            ],
             value=backend_config.screenshot_impl, label="截图方法", interactive=True
         )
         self._bind(comps['screenshot'], ref(of(backend_config).screenshot_impl))
@@ -224,10 +246,10 @@ class SettingsView:
             is_mumu = 'mumu' in backend_type
             # 1. 检查 DMM 兼容性
             if backend_type == 'dmm':
-                if impl != 'windows' and impl != 'remote_windows':
+                if impl != 'windows' and impl != 'remote_windows' and impl != 'windows_background':
                     Alert(
                         title="提示", 
-                        value="DMM 版本仅支持 `windows` 截图方式",
+                        value="DMM 版本仅支持 `windows` 或 `windows_background` 截图方式",
                         variant="warning",
                         show_close=False
                     )
@@ -248,7 +270,7 @@ class SettingsView:
                         variant="info",
                         show_close=False
                     )
-                elif impl in ['windows', 'remote_windows']:
+                elif impl in ['windows', 'remote_windows', 'windows_background']:
                     Alert(
                         title="提示",
                         value="模拟器不支持 `windows` 截图方式，建议使用 `adb` 或 `nemu_ipc`",

kaa/config/upgrade.py

@@ -14,8 +14,6 @@ def upgrade_config() -> str | None:
     # 避免循环依赖，这里再进行本地导入
     from .migrations import MIGRATION_REGISTRY, LATEST_VERSION  # pylint: disable=import-outside-toplevel
 
-    logger.setLevel(logging.DEBUG)
-    print('1212121212')
     config_path = "config.json"
     if not os.path.exists(config_path):
         logger.debug("config.json not found. Skip upgrade.")

kaa/main/gr.py

@@ -40,7 +40,8 @@ def main(kaa_ins: Kaa, start_immediately: bool = False):
         # Set log level from config
         log_level_str = facade.config_service.get_options().misc.log_level
         log_level = logging.DEBUG if log_level_str == 'verbose' else logging.INFO
-        logging.getLogger().setLevel(log_level)
+        logging.getLogger('kaa').setLevel(log_level)
+        logging.getLogger('kotonebot').setLevel(log_level)
         logger.info(f"Log level set to {log_level_str.upper()}")
 
 

kaa/main/kaa.py

@@ -11,20 +11,8 @@ from typing_extensions import override
 
 import cv2
 
-from kaa.errors import WindowsOnlyError
 from kotonebot.util import is_windows
 from kotonebot.client.host.mumu12_host import MuMu12HostConfig
-
-from kotonebot.client.device import Device
-from kotonebot.ui import user
-from kotonebot import KotoneBot
-from ..util.paths import get_ahk_path
-from ..kaa_context import _set_instance
-if is_windows():
-    from .dmm_host import DmmHost, DmmInstance
-else:
-    DmmHost = DmmInstance = None
-from ..config import BaseConfig, upgrade_config
 from kotonebot.config.base_config import UserConfig
 from kotonebot.client.host import (
     Mumu12Host, LeidianHost, Mumu12Instance,
@@ -35,6 +23,19 @@ from kotonebot.client.host.protocol import (
     Instance, AdbHostConfig, WindowsHostConfig,
     RemoteWindowsHostConfig
 )
+from kotonebot.primitives.geometry import Size
+from kotonebot.client.device import Device, WindowsDevice
+from kotonebot.ui import user
+from kotonebot import KotoneBot
+
+from kaa.errors import WindowsOnlyError
+from ..util.paths import get_ahk_path
+from ..kaa_context import _set_instance
+if is_windows():
+    from .dmm_host import DmmHost, DmmInstance
+else:
+    DmmHost = DmmInstance = None
+from ..config import BaseConfig, upgrade_config
 
 # 初始化日志
 format = '[%(asctime)s][%(levelname)s][%(name)s:%(lineno)d] %(message)s'
@@ -137,6 +138,11 @@ class Kaa(KotoneBot):
         user_config = config.user_configs[0]  # HACK: 硬编码
         target_screenshot_interval = user_config.backend.target_screenshot_interval
 
+        from kotonebot.config.config import conf
+        from kotonebot.client.scaler import PortraitGameScaler
+        conf().device.default_scaler_factory = lambda: PortraitGameScaler()
+        conf().device.default_logic_resolution = Size(720, 1280)
+
         d = self._on_create_device()
         init_context(
             config_path=self.config_path,
@@ -263,25 +269,40 @@ class Kaa(KotoneBot):
         impl_name = user_config.backend.screenshot_impl
 
         if DmmInstance and isinstance(self.backend_instance, DmmInstance):
+            d = WindowsDevice()
             if impl_name == 'windows':
+                from kotonebot.client.implements.windows import WindowsImpl
                 ahk_path = get_ahk_path()
-                host_conf = WindowsHostConfig(
+                impl = WindowsImpl(
+                    device=d,
                     window_title='gakumas',
                     ahk_exe_path=ahk_path
                 )
+                touch = impl
+                screenshot = impl
             elif impl_name == 'remote_windows':
-                ahk_path = get_ahk_path()
-                host_conf = RemoteWindowsHostConfig(
-                    windows_host_config=WindowsHostConfig(
-                        window_title='gakumas',
-                        ahk_exe_path=ahk_path
-                    ),
+                from kotonebot.client.implements.remote_windows import RemoteWindowsImpl
+                impl = RemoteWindowsImpl(
+                    device=d,
                     host=user_config.backend.adb_ip,
                     port=user_config.backend.adb_port
                 )
+            elif impl_name == 'windows_background':
+                from kotonebot.client.implements.windows import WindowsImpl
+                from kotonebot.client.implements.windows.send_message import SendMessageImpl
+                from kotonebot.client.implements.windows.print_window import PrintWindowImpl
+                impl = WindowsImpl(
+                    device=d,
+                    window_title='gakumas',
+                    ahk_exe_path=''
+                )
+                screenshot = PrintWindowImpl(d, 'gakumas')
+                touch = SendMessageImpl(d, 'gakumas', wait_cursor_idle=user_config.backend.cursor_wait_speed)
             else:
                 raise ValueError(f"Impl of '{impl_name}' is not supported on DMM.")
-            return self.backend_instance.create_device(impl_name, host_conf)
+            d._screenshot = screenshot
+            d._touch = touch
+            return d
         # 统一处理所有基于 ADB 的后端
         elif isinstance(self.backend_instance, (CustomInstance, Mumu12Instance, LeidianInstance)):
             if impl_name == 'nemu_ipc' and isinstance(self.backend_instance, Mumu12Instance):
@@ -310,6 +331,5 @@ class Kaa(KotoneBot):
                 )
             else:
                 raise ValueError(f"{user_config.backend.type} backend does not support implementation '{impl_name}'")
-
         else:
-            raise TypeError(f"Unknown instance type: {type(self.backend_instance)}")
+            raise TypeError(f"Unknown instance type: {type(self.backend_instance)}")

kaa/metadata.py

@@ -1,6 +1,18 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2026.02b1
+发布日期：2026-02-03
+
+【更新内容】
+支持 DMM 版后台挂机功能（实验性）
+
+### v2025.11.post4
+发布日期：2026-01-13
+
+【更新内容】
+修复了 PyAV 依赖安装问题
+
 ### v2025.11.post3
 发布日期：2025-12-16