ksaa 2025.7.27.1__py3-none-any.whl → 2025.8.17.0__py3-none-any.whl

kotonebot/__init__.py

@@ -36,4 +36,5 @@ from .backend.ocr import (
     equals,
 )
 from .backend.bot import KotoneBot
-from .ui import user
+from .backend.loop import Loop
+from .ui import user

kotonebot/interop/win/shortcut.py

@@ -0,0 +1,43 @@
+import os
+import typing
+
+import pythoncom
+from win32comext.shell import shell, shellcon
+
+def create_shortcut(target_file: str, target_args: str, link_file: str | None, *,
+                    link_name: str | None = None,
+                    icon_path: str, description: str = ""):
+    """
+    Creates a shortcut.
+
+    :param target_file: The path to the target file.
+    :param target_args: The arguments for the target file.
+    :param link_file: The path to the shortcut file. If None, creates on the desktop.
+    :param link_name: The name of the shortcut file. If None, it is derived from the target file name.
+                        Only used when link_file is None.
+    :param icon_path: The path to the icon file.
+    :param description: The description of the shortcut.
+    """
+    pythoncom.CoInitialize()
+    if link_file is None:
+        desktop_path = shell.SHGetFolderPath(0, shellcon.CSIDL_DESKTOP, 0, 0)
+        if link_name is None:
+            link_name = os.path.splitext(os.path.basename(target_file))[0]
+        link_file = os.path.join(desktop_path, f"{link_name}.lnk")
+
+    shortcut = pythoncom.CoCreateInstance(
+        shell.CLSID_ShellLink,
+        None,
+        pythoncom.CLSCTX_INPROC_SERVER,
+        shell.IID_IShellLink
+    )
+    # TODO: 下面这些方法都没有 typing，会报错，需要一种方法加入 typing
+    shortcut.SetPath(target_file) # type: ignore
+    shortcut.SetArguments(target_args) # type: ignore
+    shortcut.SetDescription(description) # type: ignore
+    shortcut.SetIconLocation(icon_path, 0) # type: ignore
+
+    persist_file = shortcut.QueryInterface(pythoncom.IID_IPersistFile)
+    persist_file.Save(link_file, 0) # type: ignore
+    pythoncom.CoUninitialize()
+

kotonebot/kaa/application/adapter/misc_adapter.py

@@ -0,0 +1,5 @@
+from ..core import misc_core
+
+
+def create_desktop_shortcut(start_immediately: bool):
+    misc_core.create_desktop_shortcut(start_immediately)

kotonebot/kaa/application/core/misc_core.py

@@ -0,0 +1,33 @@
+import os
+import sys
+
+from kotonebot.interop.win.shortcut import create_shortcut
+from kotonebot.kaa.errors import LauncherNotFoundError
+
+
+def create_desktop_shortcut(start_immediately: bool):
+    exe_path = os.path.abspath('./kaa.exe')
+    if not os.path.exists(exe_path):
+        raise LauncherNotFoundError()
+
+    icon_paths = ['./kaa.exe', './kaa.ico']
+    icon_path = next((os.path.abspath(p) for p in icon_paths if os.path.exists(p)), '')
+
+    if start_immediately:
+        create_shortcut(
+            target_file=exe_path,
+            target_args='--start-immidiately',
+            link_file=None,  # Creates on desktop
+            link_name='琴音小助手（快捷启动）',
+            icon_path=icon_path,
+            description='启动琴音小助手并立即运行任务'
+        )
+    else:
+        create_shortcut(
+            target_file=exe_path,
+            target_args='',
+            link_file=None,  # Creates on desktop
+            link_name='琴音小助手',
+            icon_path=icon_path,
+            description='启动琴音小助手'
+        )

kotonebot/kaa/errors.py

@@ -7,11 +7,18 @@ class KaaError(Exception):
 
 class KaaUserFriendlyError(UserFriendlyError, KaaError):
     def __init__(self, message: str, help_link: str):
+        self.message = message
+        """用户友好的错误信息"""
+        self.help_link = help_link
+        """此错误的帮助链接"""
         super().__init__(message, [
             (0, '打开帮助', lambda: os.startfile(help_link)),
             (1, '知道了', lambda: None)
         ])
 
+    def __str__(self):
+        return f'【发生错误】{self.message}。访问 {self.help_link} 以获取更多帮助。'
+
 class ProduceSolutionNotFoundError(KaaUserFriendlyError):
     def __init__(self, solution_id: str):
         self.solution_id = solution_id
@@ -36,3 +43,10 @@ class IdolCardNotFoundError(KaaUserFriendlyError):
             f'未找到 ID 为「{skin_id}」的偶像卡。请检查游戏内偶像皮肤与培育方案中偶像皮肤是否一致。',
             'https://kdocs.cn/l/cetCY8mGKHLj?linkname=cySASqoPGj'
         )
+
+class LauncherNotFoundError(KaaUserFriendlyError):
+    def __init__(self):
+        super().__init__(
+            '未找到启动器「kaa.exe」，请确认是否正确放置在根目录。',
+            'https://kdocs.cn/l/cetCY8mGKHLj?linkname=jpzb09rLTS'
+        )

kotonebot/kaa/main/cli.py

@@ -21,6 +21,7 @@ psr.add_argument('-lp', '--log-path', default=None, help='Path to the log file.
 psr.add_argument('-ll', '--log-level', default='DEBUG', help='Log level. Default: DEBUG')
 psr.add_argument('--kill-dmm', action='store_true', default=False, help='Kill DMM Game Player when tasks are completed. Overrides config().end_game.kill_dmm')
 psr.add_argument('--kill-game', action='store_true', default=False, help='Kill gakumasu.exe when tasks are completed. Overrides config().end_game.kill_game')
+psr.add_argument('--start-immidiately', action='store_true', default=False, help='Start tasks immediately after launching the UI. Only available when no subcommand is specified.')
 
 # 子命令
 subparsers = psr.add_subparsers(dest='subcommands', title='Subcommands')
@@ -119,7 +120,7 @@ def main():
         kaa().set_log_level(logging.DEBUG)
         kaa().add_file_logger(log_filename)
         from .gr import main as gr_main
-        gr_main(kaa())
+        gr_main(kaa(), psr.parse_args().start_immidiately)
 
 if __name__ == '__main__':
     main()

kotonebot/kaa/main/gr.py

@@ -30,6 +30,7 @@ from kotonebot.kaa.config import (
     RecommendCardDetectionMode, TraceConfig, StartGameConfig, EndGameConfig, UpgradeSupportCardConfig, MiscConfig,
 )
 from kotonebot.kaa.config.produce import ProduceSolution, ProduceSolutionManager, ProduceData
+from kotonebot.kaa.application.adapter.misc_adapter import create_desktop_shortcut
 
 logger = logging.getLogger(__name__)
 GradioInput = gr.Textbox | gr.Number | gr.Checkbox | gr.Dropdown | gr.Radio | gr.Slider | gr.Tabs | gr.Tab
@@ -870,75 +871,102 @@ class KotoneBotUI:
 
     def _create_emulator_settings(self) -> ConfigBuilderReturnValue:
         gr.Markdown("### 模拟器设置")
-        has_mumu12 = Mumu12Host.installed()
-        has_leidian = LeidianHost.installed()
         current_tab = 0
 
         def _update_emulator_tab_options(impl_value: str, selected_index: int):
             nonlocal current_tab
             current_tab = selected_index
-
-            # if selected_index == 3:  # DMM
-            #     choices = ['windows', 'remote_windows']
-            # else:  # Mumu, Leidian, Custom
-            #     choices = ['adb', 'adb_raw', 'uiautomator2']
-            # 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:
                 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", interactive=has_mumu12, id="mumu12") as tab_mumu12:
+            with gr.Tab("MuMu 12", id="mumu12") as tab_mumu12:
                 gr.Markdown("已选中 MuMu 12 模拟器")
-                if has_mumu12:
+                mumu_refresh_message = gr.Markdown("<div style='color: red;'>点击下方「刷新」按钮载入信息</div>", visible=True)
+                mumu_instance = gr.Dropdown(
+                    label="选择多开实例",
+                    choices=[],
+                    interactive=True
+                )
+                mumu_refresh_btn = gr.Button("刷新")
+
+                def refresh_mumu_instances():
                     try:
                         instances = Mumu12Host.list()
                         is_mumu12 = self.current_config.backend.type == 'mumu12'
-                        mumu_instance = gr.Dropdown(
-                            label="选择多开实例",
-                            value=self.current_config.backend.instance_id if is_mumu12 else None,
-                            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
+                        current_id = self.current_config.backend.instance_id if is_mumu12 else None
+                        choices = [(i.name, i.id) for i in instances]
+                        return gr.Dropdown(choices=choices, value=current_id, interactive=True), gr.Markdown(visible=False)
+                    except Exception as e:
                         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)
+                        gr.Error("获取 MuMu12 模拟器列表失败，请升级模拟器到最新版本。若问题依旧，前往 QQ 群、QQ 频道或 Github 反馈 bug。")
+                        return gr.Dropdown(choices=[], interactive=True), gr.Markdown(visible=True)
+
+                mumu_refresh_btn.click(
+                    fn=refresh_mumu_instances,
+                    outputs=[mumu_instance, mumu_refresh_message]
+                )
+
+                # 如果当前是 MuMu 模拟器且有配置的 instance_id，立即加载实例列表
+                if self.current_config.backend.type == 'mumu12' and self.current_config.backend.instance_id:
+                    try:
+                        instances = Mumu12Host.list()
+                        choices = [(i.name, i.id) for i in instances]
+                        mumu_instance.choices = choices
+                        mumu_instance.value = self.current_config.backend.instance_id
+                        mumu_refresh_message.visible = False
+                    except Exception as e:
+                        logger.exception('Failed to auto-load MuMu12 instances')
 
-            with gr.Tab("雷电", interactive=has_leidian, id="leidian") as tab_leidian:
+                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
+                )
+
+            with gr.Tab("雷电", id="leidian") as tab_leidian:
                 gr.Markdown("已选中雷电模拟器")
-                if has_leidian:
+                leidian_refresh_message = gr.Markdown("<div style='color: red;'>点击下方「刷新」按钮载入信息</div>", visible=True)
+                leidian_instance = gr.Dropdown(
+                    label="选择多开实例",
+                    choices=[],
+                    interactive=True
+                )
+                leidian_refresh_btn = gr.Button("刷新")
+
+                def refresh_leidian_instances():
                     try:
                         instances = LeidianHost.list()
                         is_leidian = self.current_config.backend.type == 'leidian'
-                        leidian_instance = gr.Dropdown(
-                            label="选择多开实例",
-                            value=self.current_config.backend.instance_id if is_leidian else None,
-                            choices=[(i.name, i.id) for i in instances],
-                            interactive=True
-                        )
-                    except:  # noqa: E722
+                        current_id = self.current_config.backend.instance_id if is_leidian else None
+                        choices = [(i.name, i.id) for i in instances]
+                        return gr.Dropdown(choices=choices, value=current_id, interactive=True), gr.Markdown(visible=False)
+                    except Exception as e:
                         logger.exception('Failed to list installed Leidian')
-                        gr.Markdown('获取雷电模拟器列表失败，请前往 QQ 群、QQ 频道或 Github 反馈 bug。')
-                        leidian_instance = gr.Dropdown(visible=False)
-                else:
-                    leidian_instance = gr.Dropdown(visible=False)
+                        gr.Error("获取雷电模拟器列表失败，请前往 QQ 群、QQ 频道或 Github 反馈 bug。")
+                        return gr.Dropdown(choices=[], interactive=True), gr.Markdown(visible=True)
+
+                leidian_refresh_btn.click(
+                    fn=refresh_leidian_instances,
+                    outputs=[leidian_instance, leidian_refresh_message]
+                )
+
+                # 如果当前是雷电模拟器且有配置的 instance_id，立即加载实例列表
+                if self.current_config.backend.type == 'leidian' and self.current_config.backend.instance_id:
+                    try:
+                        instances = LeidianHost.list()
+                        choices = [(i.name, i.id) for i in instances]
+                        leidian_instance.choices = choices
+                        leidian_instance.value = self.current_config.backend.instance_id
+                        leidian_refresh_message.visible = False
+                    except Exception as e:
+                        logger.exception('Failed to auto-load Leidian instances')
+                        # 保持显示刷新提示
 
             with gr.Tab("自定义", id="custom") as tab_custom:
                 gr.Markdown("已选中自定义模拟器")
@@ -991,13 +1019,6 @@ class KotoneBotUI:
             with gr.Tab("DMM", id="dmm") as tab_dmm:
                 gr.Markdown("已选中 DMM")
 
-        # type_in_config = self.current_config.backend.type
-        # if type_in_config in ['dmm']:
-        #     choices = ['windows', 'remote_windows']
-        # elif type_in_config in ['mumu12', 'leidian', 'custom']:
-        #     choices = ['adb', 'adb_raw', 'uiautomator2']
-        # else:
-        #     raise ValueError(f'Unsupported backend type: {type_in_config}')
         choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows', 'nemu_ipc']
         screenshot_impl = gr.Dropdown(
             choices=choices,
@@ -1384,12 +1405,6 @@ class KotoneBotUI:
                         info="进行一次 REGULAR 培育需要 ~30min，进行一次 PRO 培育需要 ~1h（具体视设备性能而定）。",
                         visible=False
                     )
-                    produce_count = gr.Number(
-                        minimum=1,
-                        label="培育次数",
-                        info="培育的次数。",
-                        visible=False
-                    )
 
                     # 添加偶像选择
                     idol_choices = []
@@ -1505,13 +1520,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 = []
@@ -1642,7 +1650,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
@@ -1672,7 +1679,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),
@@ -1768,7 +1774,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):
                 """保存培育方案"""
@@ -1810,9 +1816,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]
@@ -1863,7 +1866,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,
@@ -1899,7 +1902,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,
@@ -2224,6 +2227,15 @@ class KotoneBotUI:
                 info=MiscConfig.model_fields['expose_to_lan'].description,
                 interactive=True
             )
+            with gr.Row():
+                gr.Button("创建桌面快捷方式").click(
+                    fn=self._create_shortcut_button_click(False),
+                    outputs=[]
+                )
+                gr.Button("创建一键启动快捷方式").click(
+                    fn=self._create_shortcut_button_click(True),
+                    outputs=[]
+                )
 
         def set_config(config: BaseConfig, data: dict[ConfigKey, Any]) -> None:
             config.misc.check_update = data['check_update']
@@ -2236,6 +2248,12 @@ class KotoneBotUI:
             'expose_to_lan': expose_to_lan
         }
 
+    def _create_shortcut_button_click(self, start_immediately: bool) -> Callable[[], None]:
+        def _inner():
+            create_desktop_shortcut(start_immediately)
+            gr.Success("快捷方式创建成功")
+        return _inner
+
     def _create_debug_settings(self) -> ConfigBuilderReturnValue:
         """调试设置：仅在调试时使用"""
         with gr.Column():
@@ -2269,7 +2287,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()
@@ -2661,11 +2679,14 @@ class KotoneBotUI:
 
         return app
 
-def main(kaa: Kaa | None = None) -> None:
+def main(kaa: Kaa | None = None, start_immidiately: bool = False) -> None:
     kaa = kaa or Kaa('./config.json')
     ui = KotoneBotUI(kaa)
     app = ui.create_ui()
 
+    if start_immidiately:
+        ui.start_run()
+
     server_name = "0.0.0.0" if ui.current_config.options.misc.expose_to_lan else "127.0.0.1"
     app.launch(inbrowser=True, show_error=True, server_name=server_name)
 

kotonebot/kaa/metadata.py

@@ -1,6 +1,32 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.8.17.0
+脚本：
+* [修复] 尝试修复进入每日商店时报错的问题（#e9529b7）
+* [修复] 修复刷新商店商品时脚本不会等待刷新完成的问题（#180d800）
+* [修复] 修复商店刷新后第二次购买会跳过第一行的问题 #59（#a327791）
+* [修复] 修复金币商店购买一个物品总是点击两次的问题（#94a264e）
+
+界面：
+* [修复] 移除模拟器设置的最后多余的 Dropdown（#91d05b1）
+* [修复] 移除培育方案中多余的培育次数输入框（#c0549d9）
+* [新增] 新增保存设置提示（#b56eabc）
+
+### v2025.8.2.0
+脚本：
+* [修复] 修复 DMM 版启动游戏提示找不到窗口的问题（#46e72c4）
+* [重构] 将部分 while 循环用 Loop 类重写（#8c99955）
+
+界面：
+* [新增] 模拟器列表懒加载（#0f18d36）
+* [新增] 新增创建桌面快捷方式功能（#6640a21）
+* [新增] 新增命令行参数 --start-immidiately（#c39dd79）
+
+启动器：
+* [新增] 以管理员重启时跳过重复检查更新（#142d9ef）
+* [新增] 启动器支持拖拽安装 whl 包（#11c75dc）
+
 ### v2025.7.27.1
 脚本：
 * [修复] 修复检测培育阶段函数过早返回的问题（#de1328c）