ksaa 2025.8.23.0__py3-none-any.whl → 2025.9b1__py3-none-any.whl

kotonebot/kaa/main/gr.py

@@ -233,10 +233,22 @@ class KotoneBotUI:
         self.is_single_task_stopping: bool = False  # 新增：标记单个任务是否正在停止
         self._kaa = kaa
         self._load_config()
-        # 新增 IdleModeManager
+        # IdleModeManager 空闲检测
+        def safe_get_is_running():
+            try:
+                return (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
+            except ContextNotInitializedError:
+                return False
+
+        def safe_get_is_paused():
+            try:
+                return vars.flow.is_paused
+            except ContextNotInitializedError:
+                return False
+
         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_is_running=safe_get_is_running,
+            get_is_paused=safe_get_is_paused,
             get_config=lambda: self.current_config.options.idle,
         )
         self._setup_kaa()
@@ -518,6 +530,13 @@ class KotoneBotUI:
 
             # 快速设置控制区域
             gr.Markdown("### 快速设置")
+
+            with gr.Row():
+                select_all_btn = gr.Button("全选", scale=1)
+                unselect_all_btn = gr.Button("清空", scale=1)
+                select_produce_only_btn = gr.Button("只选培育", scale=1)
+                unselect_produce_only_btn = gr.Button("只不选培育", scale=1)
+
             with gr.Row(elem_classes=["quick-controls-row"]):
                 purchase_quick = gr.Checkbox(
                     label="商店",
@@ -612,6 +631,8 @@ class KotoneBotUI:
                 label="任务状态"
             )
 
+            # MARK: 状态 - 监听函数
+
             def on_run_click(evt: gr.EventData) -> Tuple[gr.Button, List[List[str]]]:
                 result = self.toggle_run()
                 # 如果正在停止，禁用按钮
@@ -623,43 +644,66 @@ class KotoneBotUI:
                 return self.toggle_pause()
 
             # 快速设置控制的事件处理函数
-            def save_quick_setting(field_name: str, value: bool, display_name: str):
+            def save_quick_setting(success_msg: str, failed_msg: str):
                 """保存快速设置并立即应用"""
                 try:
-                    # 更新配置
-                    if field_name == 'purchase':
-                        self.current_config.options.purchase.enabled = value
-                    elif field_name == 'assignment':
-                        self.current_config.options.assignment.enabled = value
-                    elif field_name == 'contest':
-                        self.current_config.options.contest.enabled = value
-                    elif field_name == 'produce':
-                        self.current_config.options.produce.enabled = value
-                    elif field_name == 'mission_reward':
-                        self.current_config.options.mission_reward.enabled = value
-                    elif field_name == 'club_reward':
-                        self.current_config.options.club_reward.enabled = value
-                    elif field_name == 'activity_funds':
-                        self.current_config.options.activity_funds.enabled = value
-                    elif field_name == 'presents':
-                        self.current_config.options.presents.enabled = value
-                    elif field_name == 'capsule_toys':
-                        self.current_config.options.capsule_toys.enabled = value
-                    elif field_name == 'upgrade_support_card':
-                        self.current_config.options.upgrade_support_card.enabled = value
-                    elif field_name == 'start_game':
-                        self.current_config.options.start_game.enabled = value
-
                     # 保存配置
                     save_config(self.config, "config.json")
 
                     # 尝试热重载配置
                     if self.reload_config():
-                        gr.Success(f"✓ {display_name} 已{'启用' if value else '禁用'}")
+                        gr.Success(success_msg)
                     else:
-                        gr.Warning(f"⚠ {display_name} 已保存，但重新加载失败")
+                        gr.Warning(failed_msg)
                 except Exception as e:
                     gr.Error(f"✗ 保存失败：{str(e)}")
+            
+            def update_and_save_quick_setting(field_name: str, value: bool, display_name: str):
+                """更新字段，并保存快速设置并立即应用"""
+
+                # 更新配置
+                if field_name == 'purchase':
+                    self.current_config.options.purchase.enabled = value
+                elif field_name == 'assignment':
+                    self.current_config.options.assignment.enabled = value
+                elif field_name == 'contest':
+                    self.current_config.options.contest.enabled = value
+                elif field_name == 'produce':
+                    self.current_config.options.produce.enabled = value
+                elif field_name == 'mission_reward':
+                    self.current_config.options.mission_reward.enabled = value
+                elif field_name == 'club_reward':
+                    self.current_config.options.club_reward.enabled = value
+                elif field_name == 'activity_funds':
+                    self.current_config.options.activity_funds.enabled = value
+                elif field_name == 'presents':
+                    self.current_config.options.presents.enabled = value
+                elif field_name == 'capsule_toys':
+                    self.current_config.options.capsule_toys.enabled = value
+                elif field_name == 'upgrade_support_card':
+                    self.current_config.options.upgrade_support_card.enabled = value
+                
+                # 保存并重载配置
+                save_quick_setting(
+                    f"✓ {display_name} 已{'启用' if value else '禁用'}",
+                    f"⚠ {display_name} 已保存，但重新加载失败"
+                )
+
+            def batch_select(default: bool, produce_only: bool, success_msg: str) -> None:
+                self.current_config.options.purchase.enabled             = default
+                self.current_config.options.assignment.enabled           = default
+                self.current_config.options.contest.enabled              = default
+                self.current_config.options.produce.enabled              = produce_only
+                self.current_config.options.mission_reward.enabled       = default
+                self.current_config.options.club_reward.enabled          = default
+                self.current_config.options.activity_funds.enabled       = default
+                self.current_config.options.presents.enabled             = default
+                self.current_config.options.capsule_toys.enabled         = default
+                self.current_config.options.upgrade_support_card.enabled = default
+
+                save_quick_setting(success_msg, f"⚠ 数据已保存，但重新加载失败")
+
+            # MARK: 状态 - UI回调函数
 
             run_btn.click(
                 fn=on_run_click,
@@ -671,45 +715,67 @@ class KotoneBotUI:
                 outputs=[pause_btn]
             )
 
+            select_all_btn.click(
+                fn=lambda: batch_select(True, True, f"✓ 全选成功"),
+                outputs=[]
+            )
+
+            unselect_all_btn.click(
+                fn=lambda: batch_select(False, False, f"✓ 清空成功"),
+                outputs=[]
+            )
+
+            select_produce_only_btn.click(
+                fn=lambda: batch_select(False, True, f"✓ 只选培育成功"),
+                outputs=[]
+            )
+
+            unselect_produce_only_btn.click(
+                fn=lambda: batch_select(True, False, f"✓ 只不选培育成功"),
+                outputs=[]
+            )
+
             # 绑定快速设置控制的事件
-            purchase_quick.change(
-                fn=lambda x: save_quick_setting('purchase', x, '商店'),
+
+            # 以下回调函数均由.change修改为.input，这样回调函数就只会在用户操作时触发，避免全选功能导致反复触发
+            purchase_quick.input(
+                fn=lambda x: update_and_save_quick_setting('purchase', x, '商店'),
                 inputs=[purchase_quick]
             )
-            assignment_quick.change(
-                fn=lambda x: save_quick_setting('assignment', x, '工作'),
+            assignment_quick.input(
+                fn=lambda x: update_and_save_quick_setting('assignment', x, '工作'),
                 inputs=[assignment_quick]
             )
-            contest_quick.change(
-                fn=lambda x: save_quick_setting('contest', x, '竞赛'),
+            contest_quick.input(
+                fn=lambda x: update_and_save_quick_setting('contest', x, '竞赛'),
                 inputs=[contest_quick]
             )
-            produce_quick.change(
-                fn=lambda x: save_quick_setting('produce', x, '培育'),
+            produce_quick.input(
+                fn=lambda x: update_and_save_quick_setting('produce', x, '培育'),
                 inputs=[produce_quick]
             )
-            mission_reward_quick.change(
-                fn=lambda x: save_quick_setting('mission_reward', x, '任务奖励'),
+            mission_reward_quick.input(
+                fn=lambda x: update_and_save_quick_setting('mission_reward', x, '任务奖励'),
                 inputs=[mission_reward_quick]
             )
-            club_reward_quick.change(
-                fn=lambda x: save_quick_setting('club_reward', x, '社团奖励'),
+            club_reward_quick.input(
+                fn=lambda x: update_and_save_quick_setting('club_reward', x, '社团奖励'),
                 inputs=[club_reward_quick]
             )
-            activity_funds_quick.change(
-                fn=lambda x: save_quick_setting('activity_funds', x, '活动费'),
+            activity_funds_quick.input(
+                fn=lambda x: update_and_save_quick_setting('activity_funds', x, '活动费'),
                 inputs=[activity_funds_quick]
             )
-            presents_quick.change(
-                fn=lambda x: save_quick_setting('presents', x, '礼物'),
+            presents_quick.input(
+                fn=lambda x: update_and_save_quick_setting('presents', x, '礼物'),
                 inputs=[presents_quick]
             )
-            capsule_toys_quick.change(
-                fn=lambda x: save_quick_setting('capsule_toys', x, '扭蛋'),
+            capsule_toys_quick.input(
+                fn=lambda x: update_and_save_quick_setting('capsule_toys', x, '扭蛋'),
                 inputs=[capsule_toys_quick]
             )
-            upgrade_support_card_quick.change(
-                fn=lambda x: save_quick_setting('upgrade_support_card', x, '支援卡升级'),
+            upgrade_support_card_quick.input(
+                fn=lambda x: update_and_save_quick_setting('upgrade_support_card', x, '支援卡升级'),
                 inputs=[upgrade_support_card_quick]
             )
 
@@ -2369,9 +2435,12 @@ class KotoneBotUI:
             # 社团奖励设置
             club_reward_settings = self._create_club_reward_settings()
 
-            # 升级支援卡设置
+            # 扭蛋设置
             capsule_toys_settings = self._create_capsule_toys_settings()
 
+            # 升级支援卡设置
+            upgrade_support_card_settings = self._create_upgrade_support_card_settings()
+
             # 启动游戏设置
             start_game_settings = self._create_start_game_settings()
 
@@ -2402,6 +2471,7 @@ class KotoneBotUI:
                 mission_reward_settings,
                 club_reward_settings,
                 capsule_toys_settings,
+                upgrade_support_card_settings,
                 start_game_settings,
                 end_game_settings,
                 misc_settings,
@@ -2483,7 +2553,7 @@ class KotoneBotUI:
                 try:
                     # 构建命令，使用清华镜像源
                     cmd = [
-                        sys.executable, "-m", "pip", "index", "versions", "ksaa", "--json",
+                        sys.executable, "-m", "pip", "index", "versions", "ksaa", "--json", "--pre",
                         "--index-url", "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple",
                         "--trusted-host", "mirrors.tuna.tsinghua.edu.cn"
                     ]

kotonebot/kaa/metadata.py

@@ -1,6 +1,40 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.09b1
+发布日期：2025-09-06
+
+> **注意**
+>
+> 自此版本开始，版本号格式从 `v{YYYY}.{MM}.{DD}.{Minor}` 改为 `v{YYYY}.{MM}` 与 `v{YYYY}.{MM}b{BetaVersion}` 。
+> 前者为正式版，每一到两个月发布一次，后者为测试版，一到两周发布一次。对于只更新了游戏数据的正式版，使用 `post` 后缀。
+>
+> 【例】
+> - v2025.08 为 2025 年 9 月发布的正式版
+> - v2025.09b3 为 2025 年 9 月发布的第 3 个测试版
+> - v2025.08.post1 为 2025 年 8 月发布的正式版，但只更新了游戏数据
+
+脚本：
+* [修复] 修复培育中打牌时无法处理日期变更弹窗的问题（#de27888）
+* [修复] 修复了produce模块中循环引用，导致produce子模块失效的问题（#e08ec22）
+* [修复] 再次修复进入商店时，错误进入交换所的问题（#a425ae9）
+* [修复] 修复了上一次培育为NIA培育时，错误地进入Hajime培育的问题（#f8686b8）
+* [修复] 修复了自动使用AP饮料时有几率卡在点击「使う」按钮上的问题（#dd5dbdf）
+* [修复] 修复了'休息'时按钮点击过快，导致第二次点击丢失的问题（#070f052）
+* [修复] 修复了进入商店时，错误进入交换所的问题（#bfabf3e）
+* [新增] 新增了处理'培育时，日期变更'的功能（#e15f4e3）
+
+界面：
+* [修复] 在详细设置中添加了缺失的‘升级支援卡设置’（#89793c7）
+* [新增] 在'状态'页新增了全选、全不选、只选培育、只不选培育这四个新按键（#93f03b3）
+* [新增] UI 内支持检索测试版本的 kaa（#5a66777）
+
+框架：
+* [修复] 修复启用空闲模式后，反复报错 ContextNotInitializedError 的问题（#0a8293e）
+
+其他：
+* [文档] 新增开发指南（#4b7dea5）
+
 ### v2025.8.23.0
 脚本：
 * [新增] 新增闲置挂机功能（#54e2101）