ksaa 2025.7.9.0__py3-none-any.whl → 2025.7.20.0__py3-none-any.whl

kotonebot/backend/context/context.py

@@ -50,7 +50,7 @@ from kotonebot.backend.ocr import (
 from kotonebot.config.manager import load_config, save_config
 from kotonebot.config.base_config import UserConfig
 from kotonebot.backend.core import Image, HintBox
-from kotonebot.errors import KotonebotWarning
+from kotonebot.errors import ContextNotInitializedError, KotonebotWarning
 from kotonebot.backend.preprocessor import PreprocessorProtocol
 from kotonebot.primitives import Rect
 
@@ -719,14 +719,14 @@ class Forwarded:
         if name.startswith('_FORWARD_'):
             return object.__getattribute__(self, name)
         if self._FORWARD_getter is None:
-            raise ValueError(f"Forwarded object {self._FORWARD_name} called before initialization.")
+            raise ContextNotInitializedError(f"Forwarded object {self._FORWARD_name} called before initialization.")
         return getattr(self._FORWARD_getter(), name)
     
     def __setattr__(self, name: str, value: Any):
         if name.startswith('_FORWARD_'):
             return object.__setattr__(self, name, value)
         if self._FORWARD_getter is None:
-            raise ValueError(f"Forwarded object {self._FORWARD_name} called before initialization.")
+            raise ContextNotInitializedError(f"Forwarded object {self._FORWARD_name} called before initialization.")
         setattr(self._FORWARD_getter(), name, value)
 
 
@@ -974,7 +974,7 @@ def inject_context(
 ):
     global _c
     if _c is None:
-        raise RuntimeError('Context not initialized')
+        raise ContextNotInitializedError('Context not initialized')
     _c.inject(device=device, ocr=ocr, image=image, color=color, vars=vars, debug=debug, config=config)
 
 class ManualContextManager:

kotonebot/errors.py

@@ -30,4 +30,8 @@ class UnscalableResolutionError(KotonebotError):
         self.target_resolution = target_resolution
         self.screen_size = screen_size
         super().__init__(f'Cannot scale to target resolution {target_resolution}. '
-                         f'Screen size: {screen_size}')
+                         f'Screen size: {screen_size}')
+        
+class ContextNotInitializedError(KotonebotError):
+    def __init__(self, msg: str = 'Context not initialized'):
+        super().__init__(msg)

kotonebot/kaa/main/gr.py

@@ -16,11 +16,12 @@ import gradio as gr
 
 from kotonebot.kaa.main import Kaa
 from kotonebot.kaa.db import IdolCard
+from kotonebot.backend.context.context import vars
+from kotonebot.errors import ContextNotInitializedError
+from kotonebot.client.host import Mumu12Host, LeidianHost
 from kotonebot.config.manager import load_config, save_config
 from kotonebot.config.base_config import UserConfig, BackendConfig
 from kotonebot.backend.context import task_registry, ContextStackVars
-from kotonebot.backend.context.context import vars
-from kotonebot.client.host import Mumu12Host, LeidianHost
 from kotonebot.kaa.config import (
     BaseConfig, APShopItems, CapsuleToysConfig, ClubRewardConfig, PurchaseConfig, ActivityFundsConfig,
     PresentsConfig, AssignmentConfig, ContestConfig, ProduceConfig,
@@ -180,6 +181,15 @@ def _save_bug_report(
                     zipf.write(file_path, arcname)
                     yield f"### 打包 log 文件：{arcname}"
 
+        # 打包 conf 文件夹
+        if os.path.exists('conf'):
+            for root, dirs, files in os.walk('conf'):
+                for file in files:
+                    file_path = os.path.join(root, file)
+                    arcname = os.path.join('conf', os.path.relpath(file_path, 'conf'))
+                    zipf.write(file_path, arcname)
+                    yield f"### 打包配置文件：{arcname}"
+
         # 写出版本号
         zipf.writestr('version.txt', version)
 
@@ -381,8 +391,8 @@ class KotoneBotUI:
         """获取暂停按钮的状态和交互性"""
         try:
             text = "恢复" if vars.flow.is_paused else "暂停"
-        except ValueError:
-            # ValueError: Forwarded object vars called before initialization.
+        except ContextNotInitializedError:
+            # ContextNotInitializedError: Forwarded object vars called before initialization.
             # TODO: vars.flow.is_paused 应该要可以在脚本正式启动前就能访问
             text = '未启动'
         # 如果正在停止过程中，禁用暂停按钮
@@ -408,7 +418,10 @@ class KotoneBotUI:
 
             # 重新加载 Context 中的配置数据
             from kotonebot.backend.context.context import config
-            config.load()
+            try:
+                config.load()
+            except ContextNotInitializedError:
+                pass
 
             logger.info("配置已成功重新加载")
             return True
@@ -484,8 +497,8 @@ class KotoneBotUI:
                 run_btn = gr.Button("启动", scale=2)
                 pause_btn = gr.Button("暂停", scale=1)
 
-            # 快速功能启停控制区域
-            gr.Markdown("### 快速功能启停")
+            # 快速设置控制区域
+            gr.Markdown("### 快速设置")
             with gr.Row(elem_classes=["quick-controls-row"]):
                 purchase_quick = gr.Checkbox(
                     label="商店",
@@ -548,6 +561,20 @@ class KotoneBotUI:
                     elem_classes=["quick-checkbox"]
                 )
 
+            def _get_end_action_value() -> str:
+                if self.current_config.options.end_game.shutdown:
+                    return "关机"
+                if self.current_config.options.end_game.hibernate:
+                    return "休眠"
+                return "什么都不做"
+
+            end_action_dropdown = gr.Dropdown(
+                label="完成后：",
+                choices=["什么都不做", "关机", "休眠"],
+                value=_get_end_action_value(),
+                interactive=True
+            )
+
             if self._kaa.upgrade_msg:
                 gr.Markdown('### 配置升级报告')
                 gr.Markdown(self._kaa.upgrade_msg)
@@ -576,7 +603,7 @@ class KotoneBotUI:
             def on_pause_click(evt: gr.EventData) -> str:
                 return self.toggle_pause()
 
-            # 快速功能控制的事件处理函数
+            # 快速设置控制的事件处理函数
             def save_quick_setting(field_name: str, value: bool, display_name: str):
                 """保存快速设置并立即应用"""
                 try:
@@ -625,7 +652,7 @@ class KotoneBotUI:
                 outputs=[pause_btn]
             )
 
-            # 绑定快速功能控制的事件
+            # 绑定快速设置控制的事件
             purchase_quick.change(
                 fn=lambda x: save_quick_setting('purchase', x, '商店'),
                 inputs=[purchase_quick]
@@ -667,13 +694,42 @@ class KotoneBotUI:
                 inputs=[upgrade_support_card_quick]
             )
 
+            # 处理完成后操作下拉框
+            def save_quick_end_action(action: str):
+                try:
+                    if action == "关机":
+                        self.current_config.options.end_game.shutdown = True
+                        self.current_config.options.end_game.hibernate = False
+                    elif action == "休眠":
+                        self.current_config.options.end_game.shutdown = False
+                        self.current_config.options.end_game.hibernate = True
+                    else:  # 什么都不做
+                        self.current_config.options.end_game.shutdown = False
+                        self.current_config.options.end_game.hibernate = False
+
+                    save_config(self.config, "config.json")
+
+                    # 尝试热重载配置
+                    if self.reload_config():
+                        gr.Success(f"✓ 完成后操作已设置为 {action}")
+                    else:
+                        gr.Warning("⚠ 设置已保存，但重新加载失败")
+                except Exception as e:
+                    gr.Error(f"✗ 保存失败：{str(e)}")
+
+            end_action_dropdown.change(
+                fn=save_quick_end_action,
+                inputs=[end_action_dropdown]
+            )
+
             # 添加定时器，分别更新按钮状态和任务状态
             def update_run_button_status():
                 text, interactive = self.get_button_status()
                 return gr.Button(value=text, interactive=interactive)
 
             def update_quick_checkboxes():
-                """更新快速功能控制的 checkbox 状态，确保与设置同步"""
+                """更新快速设置区域控件的状态，确保与设置同步"""
+                end_action_val = _get_end_action_value()
                 return [
                     gr.Checkbox(value=self.current_config.options.purchase.enabled),
                     gr.Checkbox(value=self.current_config.options.assignment.enabled),
@@ -685,6 +741,7 @@ class KotoneBotUI:
                     gr.Checkbox(value=self.current_config.options.presents.enabled),
                     gr.Checkbox(value=self.current_config.options.capsule_toys.enabled),
                     gr.Checkbox(value=self.current_config.options.upgrade_support_card.enabled),
+                    gr.Dropdown(value=end_action_val),
                 ]
 
             gr.Timer(1.0).tick(
@@ -700,7 +757,7 @@ class KotoneBotUI:
                 outputs=[
                     purchase_quick, assignment_quick, contest_quick, produce_quick,
                     mission_reward_quick, club_reward_quick, activity_funds_quick, presents_quick,
-                    capsule_toys_quick, upgrade_support_card_quick
+                    capsule_toys_quick, upgrade_support_card_quick, end_action_dropdown
                 ]
             )
             gr.Timer(1.0).tick(
@@ -949,12 +1006,6 @@ class KotoneBotUI:
             interactive=True
         )
 
-        keep_screenshots = gr.Checkbox(
-            label="保留截图数据",
-            value=self.current_config.keep_screenshots,
-            info=UserConfig.model_fields['keep_screenshots'].description,
-            interactive=True
-        )
 
         target_screenshot_interval = gr.Number(
             label="最小截图间隔（秒）",
@@ -1019,14 +1070,12 @@ class KotoneBotUI:
             # Common settings for all backend types
             self.current_config.backend.screenshot_impl = data['screenshot_method']
             self.current_config.backend.target_screenshot_interval = data['target_screenshot_interval']
-            self.current_config.keep_screenshots = data['keep_screenshots']  # This is a UserConfig field
 
         return set_config, {
             'adb_ip': adb_ip,
             'adb_port': adb_port,
-            'screenshot_method': screenshot_impl,  # screenshot_impl is the component
+            'screenshot_method': screenshot_impl,
             'target_screenshot_interval': target_screenshot_interval,
-            'keep_screenshots': keep_screenshots,
             'check_emulator': check_emulator,
             'emulator_path': emulator_path,
             'adb_emulator_name': adb_emulator_name,
@@ -1583,6 +1632,8 @@ class KotoneBotUI:
                         gr.Group(visible=False),  # memory_sets_group
                         gr.Dropdown(visible=False),  # memory_sets
                         gr.Checkbox(visible=False),  # auto_set_support
+                        gr.Group(visible=False),  # support_card_sets_group
+                        gr.Dropdown(visible=False),  # support_card_sets
                         gr.Checkbox(visible=False),  # use_pt_boost
                         gr.Checkbox(visible=False),  # use_note_boost
                         gr.Checkbox(visible=False),  # follow_producer
@@ -1642,12 +1693,15 @@ class KotoneBotUI:
                     solution_choices = [(f"{sol.name} - {sol.description or '无描述'}", sol.id) for sol in solutions]
 
                     gr.Success("新培育方案创建成功")
-                    # 根据是否有设置Tab的下拉框来决定返回值
-                    updated_dropdown = gr.Dropdown(choices=solution_choices, value=new_solution.id)
+
+                    # 更新培育 Tab 下拉框并保持设置 Tab 当前选中值
+                    updated_dropdown_produce = gr.Dropdown(choices=solution_choices, value=new_solution.id)
                     if settings_dropdown is not None:
-                        return [updated_dropdown, updated_dropdown]
+                        current_selected = self.current_config.options.produce.selected_solution_id
+                        updated_dropdown_settings = gr.Dropdown(choices=solution_choices, value=current_selected)
+                        return [updated_dropdown_produce, updated_dropdown_settings]
                     else:
-                        return updated_dropdown
+                        return updated_dropdown_produce
                 except Exception as e:
                     gr.Error(f"创建培育方案失败：{str(e)}")
                     if settings_dropdown is not None:
@@ -1664,6 +1718,14 @@ class KotoneBotUI:
                     else:
                         return gr.Dropdown()
 
+                # 若尝试删除当前正在使用的培育方案，则拒绝并提示
+                if solution_id == self.current_config.options.produce.selected_solution_id:
+                    gr.Warning("不可删除选中方案。请先在设置中选择其他方案，保存后再删除此方案。")
+                    if settings_dropdown is not None:
+                        return [gr.Dropdown(), gr.Dropdown()]
+                    else:
+                        return gr.Dropdown()
+
                 try:
                     solution_manager.delete(solution_id)
 
@@ -1672,8 +1734,12 @@ class KotoneBotUI:
                     solution_choices = [(f"{sol.name} - {sol.description or '无描述'}", sol.id) for sol in solutions]
 
                     gr.Success("培育方案删除成功")
-                    # 根据是否有设置Tab的下拉框来决定返回值
-                    updated_dropdown = gr.Dropdown(choices=solution_choices, value=None)
+                    # 删除方案后，保持当前培育方案的选择不变
+                    current_selected = self.current_config.options.produce.selected_solution_id
+                    if current_selected not in [sol.id for sol in solutions]:
+                        current_selected = None  # 已不存在
+
+                    updated_dropdown = gr.Dropdown(choices=solution_choices, value=current_selected)
                     if settings_dropdown is not None:
                         return [updated_dropdown, updated_dropdown]
                     else:
@@ -2153,6 +2219,37 @@ class KotoneBotUI:
             'expose_to_lan': expose_to_lan
         }
 
+    def _create_debug_settings(self) -> ConfigBuilderReturnValue:
+        """调试设置：仅在调试时使用"""
+        with gr.Column():
+            gr.Markdown("### 调试设置")
+            gr.Markdown('<div style="color: red;">仅供调试使用。正常运行时务必关闭下面所有的选项。</div>')
+
+            keep_screenshots = gr.Checkbox(
+                label="保留截图数据",
+                value=self.current_config.keep_screenshots,
+                info=UserConfig.model_fields['keep_screenshots'].description,
+                interactive=True
+            )
+
+            trace_recommend_card_detection = gr.Checkbox(
+                label="跟踪推荐卡检测",
+                value=self.current_config.options.trace.recommend_card_detection,
+                info=TraceConfig.model_fields['recommend_card_detection'].description,
+                interactive=True
+            )
+
+        def set_config(config: BaseConfig, data: dict[ConfigKey, Any]) -> None:
+            # 保留截图数据属于 UserConfig
+            self.current_config.keep_screenshots = data['keep_screenshots']
+            # 跟踪推荐卡检测属于 BaseConfig.trace
+            config.trace.recommend_card_detection = data['trace_recommend_card_detection']
+
+        return set_config, {
+            'keep_screenshots': keep_screenshots,
+            'trace_recommend_card_detection': trace_recommend_card_detection
+        }
+
     def _create_settings_tab(self) -> None:
         with gr.Tab("设置"):
             gr.Markdown("## 设置")
@@ -2187,18 +2284,18 @@ class KotoneBotUI:
             # 升级支援卡设置
             capsule_toys_settings = self._create_capsule_toys_settings()
 
-            # 跟踪设置
-            trace_settings = self._create_trace_settings()
-
-            # 杂项设置
-            misc_settings = self._create_misc_settings()
-
             # 启动游戏设置
             start_game_settings = self._create_start_game_settings()
 
             # 关闭游戏设置
             end_game_settings = self._create_end_game_settings()
 
+            # 杂项设置
+            misc_settings = self._create_misc_settings()
+
+            # 调试设置（放在最后）
+            debug_settings = self._create_debug_settings()
+
             save_btn = gr.Button("保存设置")
             result = gr.Markdown()
 
@@ -2216,8 +2313,8 @@ class KotoneBotUI:
                 capsule_toys_settings,
                 start_game_settings,
                 end_game_settings,
-                trace_settings,
-                misc_settings
+                misc_settings,
+                debug_settings
             ] # list of (set_func, { 'key': component, ... })
             all_components = [list(ret[1].values()) for ret in all_return_values] # [[c1, c2], [c3], ...]
             all_components = list(chain(*all_components)) # [c1, c2, c3, ...]

kotonebot/kaa/main/kaa.py

@@ -1,5 +1,6 @@
 import io
 import os
+import sys
 from typing import Any, Literal, cast
 import zipfile
 import logging
@@ -60,6 +61,8 @@ class Kaa(KotoneBot):
         self.upgrade_msg = upgrade_msg
         self.version = importlib.metadata.version('ksaa')
         logger.info('Version: %s', self.version)
+        logger.info('Python Version: %s', sys.version)
+        logger.info('Python Executable: %s', sys.executable)
 
     def add_file_logger(self, log_path: str):
         log_dir = os.path.abspath(os.path.dirname(log_path))

kotonebot/kaa/metadata.py

@@ -1,6 +1,32 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.7.20.0
+脚本：
+* [修复] 修复商店购买中购买推荐商品时点击推荐标签不生效的问题（#b07d4d3）
+* [修复] 修复 DMM 上由于输出分辨率到日志中导致的启动失败问题（#4deea1d）
+* [修复] 修复严格模式下长时间卡在四张卡的推荐卡检测上（#acfb554）
+
+界面：
+* [修复] 修复新建培育方案时会自动修改当前选中的方案的问题（#3e67627）
+* [修复] 修复删除培育时的报错问题（#1b385c0）
+* [新增] 将保留截图数据与跟踪推荐卡两个选项统一移动到调试设置中（#f929046）
+* [新增] 首页快速功能区域新增完成后操作（#b8ade2f）
+
+### v2025.7.13.0
+脚本：
+* [新增] 上传报告时一并打包配置文件（#a8a5566）
+
+界面：
+* [修复] 修复某些情况下热重载配置失败的问题（#4bea422）
+
+启动器：
+* [修复] 修复当文件夹路径存在空格时启动器无法正确启动 kaa 的问题（#63f792d）
+* [新增] 启动器 EXE 新增多分辨率图标（#5db3ed6）
+
+其他：
+* [其他] 增加对 Python 信息与分辨率信息的日志输出（#5cc9f45）
+
 ### v2025.7.9.0
 脚本：
 * [新增] 配置中支持储存多个培育方案并支持来回切换（#41e7c8b）