ksaa 2025.9.post1__py3-none-any.whl → 2025.11b1__py3-none-any.whl

kaa/config/schema.py

@@ -3,6 +3,7 @@ from pydantic import BaseModel, ConfigDict
 
 from kotonebot import config
 from kaa.config.produce import ProduceSolution, ProduceSolutionManager
+from kaa.errors import NoProduceSolutionSelectedError
 from .const import (
     ConfigEnum,
     Priority,
@@ -77,6 +78,14 @@ class ProduceConfig(ConfigBaseModel):
     """培育的次数。"""
     produce_timeout_cd: int = 60
     """推荐卡检测用时上限；若超时，则随机选择卡片打出。单位为秒，最少为20sec，DMM用户可以设置为30sec"""
+    enable_fever_month: Literal['on', 'off', 'ignore'] = 'ignore'
+    """
+    是否自动启用强化月间。
+
+    * on: 自动启用
+    * off: 自动禁用
+    * ignore: 不改变当前状态
+    """
 
 class MissionRewardConfig(ConfigBaseModel):
     enabled: bool = False
@@ -125,21 +134,24 @@ class StartGameConfig(ConfigBaseModel):
 
     kuyo_package_name: str = 'org.kuyo.game'
     """Kuyo包名"""
-    
+
     disable_gakumas_localify: bool = False
     """
     自动检测并禁用 Gakumas Localify 汉化插件。
-    
+
     （目前仅对 DMM 版有效。）
     """
-    
+
     dmm_game_path: str | None = None
     """
     DMM 版游戏路径。若不填写，会自动检测。
-    
+
     例：`F:\\Games\\gakumas\\gakumas.exe`
     """
 
+    dmm_bypass: bool = False
+    """绕过 DMM 启动器直接启动游戏（实验性）"""
+
 class EndGameConfig(ConfigBaseModel):
     exit_kaa: bool = False
     """退出 kaa"""
@@ -157,7 +169,7 @@ class EndGameConfig(ConfigBaseModel):
     """
     恢复 Gakumas Localify 汉化插件状态至启动前。通常与
     `disable_gakumas_localify` 配对使用。
-    
+
     （目前仅对 DMM 版有效。）
     """
 
@@ -253,6 +265,6 @@ def produce_solution() -> ProduceSolution:
     """获取当前培育方案"""
     id = conf().produce.selected_solution_id
     if id is None:
-        raise ValueError("No produce solution selected")
+        raise NoProduceSolutionSelectedError()
     # TODO: 这里需要缓存，不能每次都从磁盘读取
     return ProduceSolutionManager().read(id)

kaa/errors.py

@@ -63,4 +63,19 @@ class GameUpdateNeededError(KaaUserFriendlyError):
         super().__init__(
             '游戏本体需要更新。kaa 暂不支持自动更新，请前往 Play Store 手动更新游戏。',
             'https://www.baidu.com/s?wd=%E5%BF%AB%E5%8E%BB%E6%9B%B4%E6%96%B0%E6%B8%B8%E6%88%8F%E5%95%8A%EF%BC%8C%E8%BF%98%E7%82%B9%E4%BB%80%E4%B9%88%E6%89%93%E5%BC%80%E5%B8%AE%E5%8A%A9'
-        )
+        )
+
+class NoProduceSolutionSelectedError(KaaUserFriendlyError):
+    def __init__(self):
+        super().__init__(
+            '未选择培育方案。请前往「设置」，在「当前使用的培育方案」选择一个培育方案后再重新运行。',
+            'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=LasxpznR6b'
+        )
+
+class DmmGameLaunchError(KaaUserFriendlyError):
+    def __init__(self, reason: str):
+        self.reason = reason
+        super().__init__(
+            f'绕过 DMM 启动器失败，原因：{reason}',
+            'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=pSw7QcH1Kx'
+        )

kaa/main/dmm_host.py

@@ -1,60 +1,60 @@
-from typing_extensions import override
-
-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(CommonWindowsCreateDeviceMixin, Instance[DmmHostConfigs]):
-    def __init__(self):
-        super().__init__('dmm', 'gakumas')
-
-    @override
-    def refresh(self):
-        raise NotImplementedError()
-
-    @override
-    def start(self):
-        raise NotImplementedError()
-
-    @override
-    def stop(self):
-        raise NotImplementedError()
-
-    @override
-    def running(self) -> bool:
-        raise NotImplementedError()
-
-    @override
-    def wait_available(self, timeout: float = 180):
-        raise NotImplementedError()
-
-    @override
-    def create_device(self, impl: DmmRecipes, host_config: DmmHostConfigs) -> Device:
-        """为 DMM 实例创建 Device。"""
-        return super().create_device(impl, host_config)
-
-class DmmHost(HostProtocol[DmmRecipes]):
-    instance = DmmInstance()
-    """DmmInstance 单例。"""
-
-    @staticmethod
-    def installed() -> bool:
-        # TODO: 应该检查 DMM 和 gamkumas 的安装情况
-        raise NotImplementedError()
-
-    @staticmethod
-    def list() -> list[Instance]:
-        raise NotImplementedError()
-
-    @staticmethod
-    def query(*, id: str) -> Instance | None:
-        raise NotImplementedError()
-
-    @staticmethod
-    def recipes() -> 'list[DmmRecipes]':
-        return ['windows', 'remote_windows']
+from typing_extensions import override
+
+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(CommonWindowsCreateDeviceMixin, Instance[DmmHostConfigs]):
+    def __init__(self):
+        super().__init__('dmm', 'gakumas')
+
+    @override
+    def refresh(self):
+        raise NotImplementedError()
+
+    @override
+    def start(self):
+        raise NotImplementedError()
+
+    @override
+    def stop(self):
+        raise NotImplementedError()
+
+    @override
+    def running(self) -> bool:
+        raise NotImplementedError()
+
+    @override
+    def wait_available(self, timeout: float = 180):
+        raise NotImplementedError()
+
+    @override
+    def create_device(self, impl: DmmRecipes, host_config: DmmHostConfigs) -> Device:
+        """为 DMM 实例创建 Device。"""
+        return super().create_device(impl, host_config)
+
+class DmmHost(HostProtocol[DmmRecipes]):
+    instance = DmmInstance()
+    """DmmInstance 单例。"""
+
+    @staticmethod
+    def installed() -> bool:
+        # TODO: 应该检查 DMM 和 gamkumas 的安装情况
+        raise NotImplementedError()
+
+    @staticmethod
+    def list() -> list[Instance]:
+        raise NotImplementedError()
+
+    @staticmethod
+    def query(*, id: str) -> Instance | None:
+        raise NotImplementedError()
+
+    @staticmethod
+    def recipes() -> 'list[DmmRecipes]':
+        return ['windows', 'remote_windows']

kaa/main/gr.py

@@ -59,7 +59,7 @@ ConfigKey = Literal[
     'select_which_contestant', 'when_no_set',
     
     # produce
-    'produce_enabled', 'selected_solution_id', 'produce_count', 'produce_timeout_cd',
+    'produce_enabled', 'selected_solution_id', 'produce_count', 'produce_timeout_cd', 'enable_fever_month',
     'mission_reward_enabled',
     
     # club reward
@@ -77,7 +77,7 @@ ConfigKey = Literal[
     # start game
     'start_game_enabled', 'start_through_kuyo',
     'game_package_name', 'kuyo_package_name',
-    'disable_gakumas_localify', 'dmm_game_path',
+    'disable_gakumas_localify', 'dmm_game_path', 'dmm_bypass',
 
     # end game
     'exit_kaa', 'kill_game', 'kill_dmm',
@@ -1530,6 +1530,14 @@ class KotoneBotUI:
                     info=ProduceConfig.model_fields['produce_timeout_cd'].description
                 )
 
+                enable_fever_month = gr.Radio(
+                    label="自动启用强化月间",
+                    choices=[("不操作", "ignore"), ("自动启用", "on"), ("自动禁用", "off")],
+                    value=self.current_config.options.produce.enable_fever_month,
+                    info=ProduceConfig.model_fields['enable_fever_month'].description,
+                    interactive=True
+                )
+
             # 绑定启用状态变化事件
             def on_produce_enabled_change(enabled):
                 return gr.Group(visible=enabled)
@@ -1548,12 +1556,14 @@ class KotoneBotUI:
             config.produce.selected_solution_id = data.get('selected_solution_id')
             config.produce.produce_count = data.get('produce_count', 1)
             config.produce.produce_timeout_cd = data.get('produce_timeout_cd', 60)
+            config.produce.enable_fever_month = data.get('enable_fever_month', 'ignore')
 
         return set_config, {
             'produce_enabled': produce_enabled,
             'selected_solution_id': solution_dropdown,
             'produce_count': produce_count,
-            'produce_timeout_cd': produce_timeout_cd
+            'produce_timeout_cd': produce_timeout_cd,
+            'enable_fever_month': enable_fever_month
         }
 
 
@@ -2236,6 +2246,11 @@ class KotoneBotUI:
                     info=StartGameConfig.model_fields['dmm_game_path'].description,
                     placeholder="例：F:\\Games\\gakumas\\gakumas.exe"
                 )
+                dmm_bypass = gr.Checkbox(
+                    label="绕过 DMM 启动器直接启动游戏（实验性）",
+                    value=self.current_config.options.start_game.dmm_bypass,
+                    info=StartGameConfig.model_fields['dmm_bypass'].description
+                )
             start_game_enabled.change(
                 fn=lambda x: gr.Group(visible=x),
                 inputs=[start_game_enabled],
@@ -2249,6 +2264,7 @@ class KotoneBotUI:
             config.start_game.kuyo_package_name = data['kuyo_package_name']
             config.start_game.disable_gakumas_localify = data['disable_gakumas_localify']
             config.start_game.dmm_game_path = data['dmm_game_path'] if data['dmm_game_path'] else None
+            config.start_game.dmm_bypass = data['dmm_bypass']
 
         return set_config, {
             'start_game_enabled': start_game_enabled,
@@ -2256,7 +2272,8 @@ class KotoneBotUI:
             'game_package_name': game_package_name,
             'kuyo_package_name': kuyo_package_name,
             'disable_gakumas_localify': disable_gakumas_localify,
-            'dmm_game_path': dmm_game_path
+            'dmm_game_path': dmm_game_path,
+            'dmm_bypass': dmm_bypass
         }
 
 

kaa/metadata.py

@@ -1,6 +1,12 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.09.post2
+发布日期：2025-10-07
+
+脚本：
+* [修复] 修复卡再开培育对话框上的问题（#6bd6afc）
+
 ### v2025.09.post1
 发布日期：2025-10-02