ksaa 2025.8.2.0__py3-none-any.whl → 2025.8.23.0__py3-none-any.whl

kotonebot/kaa/application/core/idle_mode.py

@@ -0,0 +1,172 @@
+import sys
+import time
+import logging
+import threading
+from contextlib import suppress
+from typing import Callable, Optional
+
+with suppress(ImportError):
+    keyboard = None
+    win32api = None
+    win32gui = None
+    win32con = None
+    import keyboard # type: ignore
+    import win32api # type: ignore
+    import win32gui # type: ignore
+    import win32con # type: ignore
+
+from kotonebot.backend.context.context import vars
+from kotonebot.kaa.config.schema import IdleModeConfig
+
+logger = logging.getLogger(__name__)
+
+def _get_system_idle_seconds_windows() -> int:
+    if win32api is None:
+        return 0
+    try:
+        last_input_tick = win32api.GetLastInputInfo()
+        tick_count = win32api.GetTickCount()
+        elapsed_ms = tick_count - last_input_tick
+        return max(0, int(elapsed_ms / 1000))
+    except Exception:
+        logger.exception('win32api.GetLastInputInfo failed')
+        return 0
+
+
+def get_system_idle_seconds() -> int:
+    if sys.platform.startswith('win'):
+        try:
+            return _get_system_idle_seconds_windows()
+        except Exception:
+            logger.exception('GetLastInputInfo failed')
+            return 0
+    return 0
+
+
+class IdleModeManager:
+    def __init__(
+        self,
+        *,
+        get_is_running: Callable[[], bool],
+        get_is_paused: Callable[[], bool],
+        get_config: Callable[[], IdleModeConfig],
+    ) -> None:
+        self._get_is_running = get_is_running
+        self._get_is_paused = get_is_paused
+        self._get_config = get_config
+        self._stop_event = threading.Event()
+        self._thread: Optional[threading.Thread] = None
+        self._keyboard_hook = None
+        self._last_key_ts: float = 0.0
+
+    def start(self) -> None:
+        if self._thread and self._thread.is_alive():
+            return
+        self._stop_event.clear()
+        self._thread = threading.Thread(target=self._loop, name='IdleModeThread', daemon=True)
+        self._thread.start()
+        self._install_keyboard_hook()
+        logger.info('IdleModeManager started')
+
+    def stop(self) -> None:
+        self._remove_keyboard_hook()
+        if self._thread and self._thread.is_alive():
+            self._stop_event.set()
+            self._thread.join(timeout=2.0)
+        logger.info('IdleModeManager stopped')
+
+    def notify_on_start(self) -> None:
+        # 运行态切换时可根据需要做重置
+        self._last_key_ts = 0.0
+
+    def notify_on_stop(self) -> None:
+        self._last_key_ts = 0.0
+
+    def _loop(self) -> None:
+        while not self._stop_event.is_set():
+            conf = self._get_config()
+            if not conf.enabled:
+                time.sleep(0.8)
+                continue
+            try:
+                if self._get_is_paused():
+                    idle_sec = get_system_idle_seconds()
+                    if idle_sec >= max(0, int(conf.idle_seconds)):
+                        logger.info('System idle for %ss while paused. Requesting resume...', idle_sec)
+                        try:
+                            vars.flow.request_resume()
+                        except Exception:
+                            logger.exception('request_resume failed')
+                time.sleep(0.8)
+            except Exception:
+                logger.exception('IdleMode loop error')
+                time.sleep(1.0)
+
+    def _install_keyboard_hook(self) -> None:
+        if keyboard is None:
+            logger.warning('keyboard module not available; key-to-pause disabled')
+            return
+        if self._keyboard_hook is not None:
+            return
+
+        def _on_key_event(_: object) -> None:
+            conf = self._get_config()
+            if not conf.enabled:
+                return
+            now = time.time()
+            if (now - self._last_key_ts) < 0.3:
+                return
+            self._last_key_ts = now
+            try:
+                if self._get_is_running() and not self._get_is_paused():
+                    logger.info('Any key pressed -> pause requested')
+                    vars.flow.request_pause()
+                    if conf.minimize_on_pause:
+                        self._minimize_game_window()
+            except Exception:
+                logger.exception('key handler failed')
+
+        try:
+            self._keyboard_hook = keyboard.on_press(_on_key_event, suppress=False)
+        except Exception:
+            logger.warning('Failed to install keyboard hook; degraded behavior')
+            self._keyboard_hook = None
+
+    def _remove_keyboard_hook(self) -> None:
+        if keyboard is None:
+            return
+        if self._keyboard_hook is None:
+            return
+        try:
+            keyboard.unhook(self._keyboard_hook)
+        except Exception:
+            logger.exception('Failed to remove keyboard hook')
+        finally:
+            self._keyboard_hook = None
+
+    def _minimize_game_window(self) -> None:
+        # Send the window to background (bottom of Z-order) via pywin32
+        if not sys.platform.startswith('win'):
+            return
+        if win32gui is None or win32con is None:
+            logger.warning('pywin32 (win32gui/win32con) not available; skip backgrounding')
+            return
+        try:
+            hwnd = win32gui.FindWindow(None, 'gakumas')  # type: ignore
+            if hwnd:
+                flags = (
+                    win32con.SWP_NOMOVE
+                    | win32con.SWP_NOSIZE
+                    | win32con.SWP_NOACTIVATE
+                    | win32con.SWP_NOOWNERZORDER
+                )
+                win32gui.SetWindowPos(hwnd, win32con.HWND_BOTTOM, 0, 0, 0, 0, flags)
+                try:
+                    win32gui.ShowWindow(hwnd, win32con.SW_SHOWNOACTIVATE)
+                except Exception:
+                    pass
+                logger.info('Sent game window to background (HWND=%s)', hwnd)
+            else:
+                logger.warning('Game window not found; cannot send to background')
+        except Exception:
+            logger.warning('Failed to send game window to background', exc_info=True) 

kotonebot/kaa/config/__init__.py

@@ -14,6 +14,7 @@ from .schema import (
     StartGameConfig,
     EndGameConfig,
     MiscConfig,
+    IdleModeConfig,
     conf,
 )
 from .const import (
@@ -46,6 +47,7 @@ __all__ = [
     "StartGameConfig",
     "EndGameConfig",
     "MiscConfig",
+    "IdleModeConfig",
     "conf",
     # const 导出
     "ConfigEnum",

kotonebot/kaa/config/schema.py

@@ -180,6 +180,14 @@ class MiscConfig(ConfigBaseModel):
     启用后，局域网内的其他设备可以通过本机 IP 地址访问 Web 界面。
     """
 
+class IdleModeConfig(ConfigBaseModel):
+    enabled: bool = False
+    """是否启用闲置挂机（任意键暂停、闲置自动恢复）"""
+    idle_seconds: int = 30
+    """暂停状态下，超过该闲置秒数将自动恢复"""
+    minimize_on_pause: bool = True
+    """按键触发暂停时最小化游戏窗口"""
+
 class BaseConfig(ConfigBaseModel):
     purchase: PurchaseConfig = PurchaseConfig()
     """商店购买配置"""
@@ -223,6 +231,9 @@ class BaseConfig(ConfigBaseModel):
     misc: MiscConfig = MiscConfig()
     """杂项配置"""
 
+    idle: IdleModeConfig = IdleModeConfig()
+    """闲置挂机配置"""
+
 
 def conf() -> BaseConfig:
     """获取当前配置数据"""

kotonebot/kaa/main/gr.py

@@ -28,9 +28,11 @@ from kotonebot.kaa.config import (
     PresentsConfig, AssignmentConfig, ContestConfig, ProduceConfig,
     MissionRewardConfig, DailyMoneyShopItems, ProduceAction,
     RecommendCardDetectionMode, TraceConfig, StartGameConfig, EndGameConfig, UpgradeSupportCardConfig, MiscConfig,
+    IdleModeConfig,
 )
 from kotonebot.kaa.config.produce import ProduceSolution, ProduceSolutionManager, ProduceData
 from kotonebot.kaa.application.adapter.misc_adapter import create_desktop_shortcut
+from kotonebot.kaa.application.core.idle_mode import IdleModeManager
 
 logger = logging.getLogger(__name__)
 GradioInput = gr.Textbox | gr.Number | gr.Checkbox | gr.Dropdown | gr.Radio | gr.Slider | gr.Tabs | gr.Tab
@@ -91,6 +93,9 @@ ConfigKey = Literal[
     # misc
     'check_update', 'auto_install_update', 'expose_to_lan',
 
+    # idle
+    'idle_enabled', 'idle_seconds', 'idle_minimize_on_pause',
+
     '_selected_backend_index'
     
 ]
@@ -228,6 +233,12 @@ class KotoneBotUI:
         self.is_single_task_stopping: bool = False  # 新增：标记单个任务是否正在停止
         self._kaa = kaa
         self._load_config()
+        # 新增 IdleModeManager
+        self.idle_mgr = IdleModeManager(
+            get_is_running=lambda: (self.is_running or self.single_task_running) and not self.is_stopping and not self.is_single_task_stopping and not vars.flow.is_paused,
+            get_is_paused=lambda: vars.flow.is_paused,
+            get_config=lambda: self.current_config.options.idle,
+        )
         self._setup_kaa()
 
     def _setup_kaa(self) -> None:
@@ -322,6 +333,8 @@ class KotoneBotUI:
     def start_run(self) -> Tuple[str, List[List[str]]]:
         self.is_running = True
         self.run_status = self._kaa.start_all()
+        # 通知 Idle 管理器进入运行态
+        self.idle_mgr.notify_on_start()
         return "停止", self.update_task_status()
 
     def stop_run(self) -> Tuple[str, List[List[str]]]:
@@ -336,6 +349,8 @@ class KotoneBotUI:
         if self._kaa:
             self.run_status.interrupt()
             gr.Info("正在停止任务...")
+        # 通知 Idle 管理器停止态
+        self.idle_mgr.notify_on_stop()
 
         return "停止中...", self.update_task_status()
 
@@ -369,6 +384,8 @@ class KotoneBotUI:
         if hasattr(self, 'run_status') and self._kaa:
             self.run_status.interrupt()
             gr.Info("正在停止任务...")
+        # 通知 Idle 管理器停止态
+        self.idle_mgr.notify_on_stop()
         return "停止中...", "正在停止任务..."
 
     def toggle_pause(self) -> str:
@@ -881,7 +898,7 @@ class KotoneBotUI:
                 new_value = choices[0]
             else:
                 new_value = impl_value
-            return gr.Dropdown(choices=choices, value=new_value)
+            return new_value
 
         with gr.Tabs(selected=self.current_config.backend.type):
             with gr.Tab("MuMu 12", id="mumu12") as tab_mumu12:
@@ -1405,12 +1422,6 @@ class KotoneBotUI:
                         info="进行一次 REGULAR 培育需要 ~30min，进行一次 PRO 培育需要 ~1h（具体视设备性能而定）。",
                         visible=False
                     )
-                    produce_count = gr.Number(
-                        minimum=1,
-                        label="培育次数",
-                        info="培育的次数。",
-                        visible=False
-                    )
 
                     # 添加偶像选择
                     idol_choices = []
@@ -1526,13 +1537,6 @@ class KotoneBotUI:
                         label="培育模式",
                         info="进行一次 REGULAR 培育需要 ~30min，进行一次 PRO 培育需要 ~1h（具体视设备性能而定）。"
                     )
-                    produce_count = gr.Number(
-                        minimum=1,
-                        value=self.current_config.options.produce.produce_count,
-                        label="培育次数",
-                        interactive=True,
-                        info="培育的次数。"
-                    )
 
                     # 添加偶像选择
                     idol_choices = []
@@ -1566,7 +1570,7 @@ class KotoneBotUI:
 
                     with gr.Group(visible=not current_solution.data.auto_set_memory) as memory_sets_group:
                         memory_sets = gr.Dropdown(
-                            choices=[str(i) for i in range(1, 11)],  # 假设最多10个编成位
+                            choices=[str(i) for i in range(1, 21)],  # 最多20个编成位
                             value=str(current_solution.data.memory_set) if current_solution.data.memory_set else None,
                             label="回忆编成编号",
                             multiselect=False,
@@ -1582,7 +1586,7 @@ class KotoneBotUI:
 
                     with gr.Group(visible=not current_solution.data.auto_set_support_card) as support_card_sets_group:
                         support_card_sets = gr.Dropdown(
-                            choices=[str(i) for i in range(1, 11)],  # 假设最多10个编成位
+                            choices=[str(i) for i in range(1, 21)],  # 最多20个编成位
                             value=str(current_solution.data.support_card_set) if current_solution.data.support_card_set else None,
                             label="支援卡编成编号",
                             multiselect=False,
@@ -1663,7 +1667,6 @@ class KotoneBotUI:
                         gr.Textbox(value="", visible=False),  # solution_name
                         gr.Textbox(value="", visible=False),  # solution_description
                         gr.Dropdown(visible=False),  # produce_mode
-                        gr.Number(visible=False),  # produce_count
                         gr.Dropdown(visible=False),  # produce_idols
                         gr.Markdown(visible=False),  # kotone_warning
                         gr.Checkbox(visible=False),  # auto_set_memory
@@ -1693,7 +1696,6 @@ class KotoneBotUI:
                         gr.Textbox(value=solution.name, visible=True),
                         gr.Textbox(value=solution.description or "", visible=True),
                         gr.Dropdown(value=solution.data.mode, visible=True),
-                        gr.Number(value=self.current_config.options.produce.produce_count, visible=True),
                         gr.Dropdown(value=solution.data.idol, visible=True),
                         gr.Markdown(visible=has_kotone and not is_strict_mode),
                         gr.Checkbox(value=solution.data.auto_set_memory, visible=True),
@@ -1789,7 +1791,7 @@ class KotoneBotUI:
                     else:
                         return gr.Dropdown()
 
-            def on_save_solution(solution_id, name, description, mode, count, idols, auto_memory, memory_sets,
+            def on_save_solution(solution_id, name, description, mode, idols, auto_memory, memory_sets,
                                auto_support, support_card_sets, pt_boost, note_boost, follow_producer, study_lesson, prefer_ap,
                                actions, detection_mode, ap_drink, skip_commu_val):
                 """保存培育方案"""
@@ -1831,9 +1833,6 @@ class KotoneBotUI:
                     # 保存方案
                     solution_manager.save(solution_id, solution)
 
-                    # 同时更新配置中的 produce_count
-                    self.current_config.options.produce.produce_count = int(count)
-
                     # 重新列出所有方案（确保没有重复项）
                     solutions = solution_manager.list()
                     solution_choices = [(f"{sol.name} - {sol.description or '无描述'}", sol.id) for sol in solutions]
@@ -1884,7 +1883,7 @@ class KotoneBotUI:
                 inputs=[solution_dropdown],
                 outputs=[
                     solution_name, solution_description,
-                    produce_mode, produce_count, produce_idols, kotone_warning,
+                    produce_mode, produce_idols, kotone_warning,
                     auto_set_memory, memory_sets_group, memory_sets,
                     auto_set_support, support_card_sets_group, support_card_sets,
                     use_pt_boost, use_note_boost, follow_producer,
@@ -1920,7 +1919,7 @@ class KotoneBotUI:
                 fn=on_save_solution,
                 inputs=[
                     solution_dropdown, solution_name, solution_description,
-                    produce_mode, produce_count, produce_idols,
+                    produce_mode, produce_idols,
                     auto_set_memory, memory_sets, auto_set_support, support_card_sets,
                     use_pt_boost, use_note_boost, follow_producer,
                     self_study_lesson, prefer_lesson_ap, actions_order,
@@ -2271,6 +2270,42 @@ class KotoneBotUI:
             create_desktop_shortcut(start_immediately)
             gr.Success("快捷方式创建成功")
         return _inner
+    
+    def _create_idle_settings(self) -> ConfigBuilderReturnValue:
+        with gr.Column():
+            gr.Markdown("### 闲置挂机")
+            idle_enabled = gr.Checkbox(
+                label="启用闲置挂机（任意键暂停、闲置自动恢复）",
+                value=self.current_config.options.idle.enabled,
+                info=IdleModeConfig.model_fields['enabled'].description,
+                interactive=True
+            )
+            idle_seconds = gr.Slider(
+                label="自动恢复触发时间（秒）",
+                minimum=30,
+                maximum=3600,
+                step=10,
+                value=self.current_config.options.idle.idle_seconds,
+                info=IdleModeConfig.model_fields['idle_seconds'].description,
+                interactive=True
+            )
+            idle_minimize_on_pause = gr.Checkbox(
+                label="暂停时最小化游戏窗口",
+                value=self.current_config.options.idle.minimize_on_pause,
+                info=IdleModeConfig.model_fields['minimize_on_pause'].description,
+                interactive=True
+            )
+        
+        def set_config(config: BaseConfig, data: dict[ConfigKey, Any]) -> None:
+            config.idle.enabled = data['idle_enabled']
+            config.idle.idle_seconds = int(data['idle_seconds'])
+            config.idle.minimize_on_pause = data['idle_minimize_on_pause']
+        
+        return set_config, {
+            'idle_enabled': idle_enabled,
+            'idle_seconds': idle_seconds,
+            'idle_minimize_on_pause': idle_minimize_on_pause,
+        }
 
     def _create_debug_settings(self) -> ConfigBuilderReturnValue:
         """调试设置：仅在调试时使用"""
@@ -2305,7 +2340,7 @@ class KotoneBotUI:
 
     def _create_settings_tab(self) -> None:
         with gr.Tab("设置"):
-            gr.Markdown("## 设置")
+            gr.Markdown("## 设置 <span style='color: red; font-size: 0.8rem; font-weight: normal;'>设置修改后需要保存（网页底部）才会生效！</span>")
 
             # 模拟器设置
             emulator_settings = self._create_emulator_settings()
@@ -2346,6 +2381,9 @@ class KotoneBotUI:
             # 杂项设置
             misc_settings = self._create_misc_settings()
 
+            # 闲置挂机设置
+            idle_settings = self._create_idle_settings()
+
             # 调试设置（放在最后）
             debug_settings = self._create_debug_settings()
 
@@ -2367,6 +2405,7 @@ class KotoneBotUI:
                 start_game_settings,
                 end_game_settings,
                 misc_settings,
+                idle_settings,
                 debug_settings
             ] # list of (set_func, { 'key': component, ... })
             all_components = [list(ret[1].values()) for ret in all_return_values] # [[c1, c2], [c3], ...]
@@ -2668,6 +2707,7 @@ class KotoneBotUI:
             self.config.user_configs.append(default_config)
         self.current_config = self.config.user_configs[0]
 
+
     def create_ui(self) -> gr.Blocks:
         custom_css = """
         #container { max-width: 800px; margin: auto; padding: 20px; }
@@ -2695,6 +2735,9 @@ class KotoneBotUI:
                     self._create_whats_new_tab()
                     self._create_screen_tab()
 
+        # 启动 IdleModeManager 后台线程
+        self.idle_mgr.start()
+
         return app
 
 def main(kaa: Kaa | None = None, start_immidiately: bool = False) -> None:

kotonebot/kaa/metadata.py

@@ -1,6 +1,29 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.8.23.0
+脚本：
+* [新增] 新增闲置挂机功能（#54e2101）
+* [修复] 再次修复商店刷新后第二次购买会跳过第一行的问题（#b72cdf4）
+* [修复] 修复游戏更新导致的培育时识别编成编号失败（#24d14d4）
+* [修复] 修复培育内周数识别失败的问题（#3a84994）
+* [修复] 培育商店中有时候会因为结束按钮被挡住而卡住（#e93cfa8）
+
+其他：
+* [文档] 更新 README（#841fcf2）
+
+### v2025.8.17.0
+脚本：
+* [修复] 尝试修复进入每日商店时报错的问题（#e9529b7）
+* [修复] 修复刷新商店商品时脚本不会等待刷新完成的问题（#180d800）
+* [修复] 修复商店刷新后第二次购买会跳过第一行的问题 #59（#a327791）
+* [修复] 修复金币商店购买一个物品总是点击两次的问题（#94a264e）
+
+界面：
+* [修复] 移除模拟器设置的最后多余的 Dropdown（#91d05b1）
+* [修复] 移除培育方案中多余的培育次数输入框（#c0549d9）
+* [新增] 新增保存设置提示（#b56eabc）
+
 ### v2025.8.2.0
 脚本：
 * [修复] 修复 DMM 版启动游戏提示找不到窗口的问题（#46e72c4）