ksaa 2025.7.3.0__py3-none-any.whl → 2025.7.7.0__py3-none-any.whl

kotonebot/backend/bot.py

@@ -145,6 +145,18 @@ class KotoneBot:
         """
         raise NotImplementedError('Implement `_create_device` before using Kotonebot.')
 
+    def _on_init_context(self) -> None:
+        """
+        初始化 Context 的钩子方法。子类可以重写此方法来自定义初始化逻辑。
+        默认实现调用 init_context 而不传入 target_screenshot_interval。
+        """
+        d = self._on_create_device()
+        init_context(
+            config_path=self.config_path,
+            config_type=self.config_type,
+            target_device=d
+        )
+
     def _on_after_init_context(self):
         """
         抽象方法，在 init_context() 被调用后立即执行。
@@ -155,8 +167,7 @@ class KotoneBot:
         """
         按优先级顺序运行所有任务。
         """
-        d = self._on_create_device()
-        init_context(config_path=self.config_path, config_type=self.config_type, target_device=d)
+        self._on_init_context()
         self._on_after_init_context()
         vars.flow.clear_interrupt()
 

kotonebot/backend/context/context.py

@@ -27,6 +27,7 @@ from cv2.typing import MatLike
 
 from kotonebot.client.device import Device, AndroidDevice, WindowsDevice
 from kotonebot.backend.flow_controller import FlowController
+from kotonebot.util import Interval
 import kotonebot.backend.image as raw_image
 from kotonebot.backend.image import (
     TemplateMatchResult,
@@ -718,8 +719,20 @@ class Forwarded:
 
 T_Device = TypeVar('T_Device', bound=Device)
 class ContextDevice(Generic[T_Device], Device):
-    def __init__(self, device: T_Device):
+    def __init__(self, device: T_Device, target_screenshot_interval: float | None = None):
+        """
+        :param device: 目标设备。
+        :param target_screenshot_interval: 见 `ContextDevice.target_screenshot_interval`。
+        """
         self._device = device
+        self.target_screenshot_interval: float | None = target_screenshot_interval
+        """
+        目标截图间隔，可用于限制截图速度。若两次截图实际间隔小于该值，则会自动等待。
+        为 None 时不限制截图速度。
+        """
+        self._screenshot_interval: Interval | None = None
+        if self.target_screenshot_interval is not None:
+            self._screenshot_interval = Interval(self.target_screenshot_interval)
 
     def screenshot(self, *, force: bool = False):
         """
@@ -734,6 +747,9 @@ class ContextDevice(Generic[T_Device], Device):
             img = current._inherit_screenshot
             current._inherit_screenshot = None
         else:
+            if self._screenshot_interval is not None:
+                self._screenshot_interval.wait()
+
             if next_wait == 'screenshot':
                 delta = time.time() - last_screenshot_time
                 if delta < next_wait_time:
@@ -780,7 +796,8 @@ class Context(Generic[T]):
         self,
         config_path: str,
         config_type: Type[T],
-        device: Device
+        device: Device,
+        target_screenshot_interval: float | None = None
     ):
         self.__ocr = ContextOcr(self)
         self.__image = ContextImage(self)
@@ -788,7 +805,7 @@ class Context(Generic[T]):
         self.__vars = ContextGlobalVars()
         self.__debug = ContextDebug(self)
         self.__config = ContextConfig[T](self, config_path, config_type)
-        self.__device = ContextDevice(device)
+        self.__device = ContextDevice(device, target_screenshot_interval)
 
     def inject(
         self,
@@ -900,6 +917,7 @@ def init_context(
     config_type: Type[T] = dict[str, Any],
     force: bool = False,
     target_device: Device,
+    target_screenshot_interval: float | None = None,
 ):
     """
     初始化 Context 模块。
@@ -911,6 +929,7 @@ def init_context(
     :param force:  是否强制重新初始化。
         若为 `True`，则忽略已存在的 Context 实例，并重新创建一个新的实例。
     :param target_device: 目标设备
+    :param target_screenshot_interval: 见 `ContextDevice.target_screenshot_interval`。
     """
     global _c, device, ocr, image, color, vars, debug, config
     if _c is not None and not force:
@@ -919,6 +938,7 @@ def init_context(
         config_path=config_path,
         config_type=config_type,
         device=target_device,
+        target_screenshot_interval=target_screenshot_interval,
     )
     device._FORWARD_getter = lambda: _c.device # type: ignore
     ocr._FORWARD_getter = lambda: _c.ocr # type: ignore

kotonebot/client/device.py

@@ -29,31 +29,6 @@ class HookContextManager:
     def __exit__(self, exc_type, exc_value, traceback):
         self.device.screenshot_hook_after = self.old_func
 
-
-class PinContextManager:
-    def __init__(self, device: 'Device'):
-        self.device = device
-        self.old_hook = device.screenshot_hook_before
-        self.memo = None
-
-    def __hook(self) -> MatLike:
-        if self.memo is None:
-            self.memo = self.device.screenshot_raw()
-        return self.memo
-
-    def __enter__(self):
-        self.device.screenshot_hook_before = self.__hook
-        return self
-    
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.device.screenshot_hook_before = self.old_hook
-
-    def update(self) -> None:
-        """
-        更新记住的截图
-        """
-        self.memo = self.device.screenshot_raw()
-
 class Device:
     def __init__(self, platform: str = 'unknown') -> None:
         self.screenshot_hook_after: Callable[[MatLike], MatLike] | None = None
@@ -356,16 +331,6 @@ class Device:
         """
         return HookContextManager(self, func)
 
-    @deprecated('改用 @task/@action 装饰器中的 screenshot_mode 参数')
-    def pinned(self) -> PinContextManager:
-        """
-        记住下次截图结果，并将截图调整为手动挡。
-        之后截图都会返回记住的数据，节省重复截图时间。
-
-        调用返回对象中的 PinContextManager.update() 可以立刻更新记住的截图。
-        """
-        return PinContextManager(self)
-
     @property
     def screen_size(self) -> tuple[int, int]:
         """

kotonebot/config/base_config.py

@@ -50,6 +50,8 @@ class BackendConfig(ConfigBaseModel):
     """Windows 截图方式的 AutoHotkey 可执行文件路径，为 None 时使用默认路径"""
     mumu_background_mode: bool = False
     """MuMu12 模拟器后台保活模式"""
+    target_screenshot_interval: float | None = None
+    """最小截图间隔，单位为秒。为 None 时不限制截图速度。"""
 
 class PushConfig(ConfigBaseModel):
     """推送配置。"""

kotonebot/kaa/common.py

@@ -80,7 +80,7 @@ class DailyMoneyShopItems(IntEnum):
     """紫云清夏 Tame-Lie-One-Step 碎片"""
     IdolPiece_葛城リーリヤ_白線 = 17
     """葛城リーリヤ 白線 碎片"""
-    IdolPiece_姫崎薪波_cIclumsy_trick = 18
+    IdolPiece_姬崎莉波_clumsy_trick = 18
     """姫崎薪波 cIclumsy trick 碎片"""
     IdolPiece_花海咲季_FightingMyWay = 19
     """花海咲季 FightingMyWay 碎片"""
@@ -90,6 +90,8 @@ class DailyMoneyShopItems(IntEnum):
     """花海佑芽 The Rolling Riceball 碎片"""
     IdolPiece_月村手毬_LunaSayMaybe = 22
     """月村手毬 Luna say maybe 碎片"""
+    IdolPiece_有村麻央_Fluorite = 23
+    """有村麻央 Fluorite 碎片"""
 
     @classmethod
     def to_ui_text(cls, item: "DailyMoneyShopItems") -> str:
@@ -126,23 +128,25 @@ class DailyMoneyShopItems(IntEnum):
             case cls.RecordKey:
                 return "记录钥匙"
             case cls.IdolPiece_倉本千奈_WonderScale:
-                return "倉本千奈 WonderScale 碎片"
+                return "倉本千奈　WonderScale 碎片"
             case cls.IdolPiece_篠泽广_光景:
-                return "篠泽广 光景 碎片"
+                return "篠泽广　光景 碎片"
             case cls.IdolPiece_紫云清夏_TameLieOneStep:
-                return "紫云清夏 Tame-Lie-One-Step 碎片"
+                return "紫云清夏　Tame-Lie-One-Step 碎片"
             case cls.IdolPiece_葛城リーリヤ_白線:
-                return "葛城リーリヤ 白線 碎片"
-            case cls.IdolPiece_姫崎薪波_cIclumsy_trick:
-                return "姫崎薪波 cIclumsy trick 碎片"
+                return "葛城リーリヤ　白線 碎片"
+            case cls.IdolPiece_姬崎莉波_clumsy_trick:
+                return "姫崎薪波　clumsy trick 碎片"
             case cls.IdolPiece_花海咲季_FightingMyWay:
-                return "花海咲季 FightingMyWay 碎片"
+                return "花海咲季　FightingMyWay 碎片"
             case cls.IdolPiece_藤田ことね_世界一可愛い私:
-                return "藤田ことね 世界一可愛い私 碎片"
+                return "藤田ことね　世界一可愛い私 碎片"
             case cls.IdolPiece_花海佑芽_TheRollingRiceball:
-                return "花海佑芽 The Rolling Riceball 碎片"
+                return "花海佑芽　The Rolling Riceball 碎片"
             case cls.IdolPiece_月村手毬_LunaSayMaybe:
-                return "月村手毬 Luna say maybe 碎片"
+                return "月村手毬　Luna say maybe 碎片"
+            case cls.IdolPiece_有村麻央_Fluorite:
+                return "有村麻央　Fluorite 碎片"
             case _:
                 assert_never(item)
 
@@ -202,8 +206,8 @@ class DailyMoneyShopItems(IntEnum):
                 return R.Shop.IdolPiece.紫云清夏_TameLieOneStep
             case DailyMoneyShopItems.IdolPiece_葛城リーリヤ_白線:
                 return R.Shop.IdolPiece.葛城リーリヤ_白線
-            case DailyMoneyShopItems.IdolPiece_姫崎薪波_cIclumsy_trick:
-                return R.Shop.IdolPiece.姫崎薪波_cIclumsy_trick
+            case DailyMoneyShopItems.IdolPiece_姬崎莉波_clumsy_trick:
+                return R.Shop.IdolPiece.姬崎莉波_clumsy_trick
             case DailyMoneyShopItems.IdolPiece_花海咲季_FightingMyWay:
                 return R.Shop.IdolPiece.花海咲季_FightingMyWay
             case DailyMoneyShopItems.IdolPiece_藤田ことね_世界一可愛い私:
@@ -212,6 +216,8 @@ class DailyMoneyShopItems(IntEnum):
                 return R.Shop.IdolPiece.花海佑芽_TheRollingRiceball
             case DailyMoneyShopItems.IdolPiece_月村手毬_LunaSayMaybe:
                 return R.Shop.IdolPiece.月村手毬_LunaSayMaybe
+            case DailyMoneyShopItems.IdolPiece_有村麻央_Fluorite:
+                return R.Shop.IdolPiece.有村麻央_Fluorite
             case _:
                 assert_never(self)
 
@@ -225,13 +231,9 @@ class PurchaseConfig(ConfigBaseModel):
     """是否启用金币购买"""
     money_items: list[DailyMoneyShopItems] = []
     """金币商店要购买的物品"""
-    money_refresh_on: Literal['never', 'not_found', 'always'] = 'never'
+    money_refresh: bool = True
     """
-    金币商店刷新逻辑。
-
-    * never: 从不刷新。
-    * not_found: 仅当要购买的物品不存在时刷新。
-    * always: 总是刷新。
+    是否使用每日一次免费刷新金币商店。
     """
     ap_enabled: bool = False
     """是否启用AP购买"""
@@ -465,16 +467,22 @@ class MiscConfig(ConfigBaseModel):
     check_update: Literal['never', 'startup'] = 'startup'
     """
     检查更新时机。
-    
+
     * never: 从不检查更新。
     * startup: 启动时检查更新。
     """
     auto_install_update: bool = True
     """
     是否自动安装更新。
-    
+
     若启用，则每次自动检查更新时若有新版本会自动安装，否则只是会提示。
     """
+    expose_to_lan: bool = False
+    """
+    是否允许局域网访问 Web 界面。
+
+    启用后，局域网内的其他设备可以通过本机 IP 地址访问 Web 界面。
+    """
 
 class BaseConfig(ConfigBaseModel):
     purchase: PurchaseConfig = PurchaseConfig()

kotonebot/kaa/game_ui/toolbar.py

@@ -34,10 +34,11 @@ def toolbar_menu(critical: Literal[True]) -> TemplateMatchResult:
     """寻找工具栏上的菜单按钮。若未找到，则抛出异常。"""
     ...
 
+_TOOLBAR_THRESHOLD = 0.6
 @action('工具栏按钮.寻找菜单', screenshot_mode='manual-inherit')
 def toolbar_menu(critical: bool = False):
     device.screenshot()
     if critical:
-        return image.expect_wait(R.Common.ButtonToolbarMenu, preprocessors=[WhiteFilter()])
+        return image.expect_wait(R.Common.ButtonToolbarMenu, preprocessors=[WhiteFilter()], threshold=_TOOLBAR_THRESHOLD)
     else:
-        return image.find(R.Common.ButtonToolbarMenu, preprocessors=[WhiteFilter()])
+        return image.find(R.Common.ButtonToolbarMenu, preprocessors=[WhiteFilter()], threshold=_TOOLBAR_THRESHOLD)

kotonebot/kaa/main/gr.py

@@ -37,12 +37,12 @@ ConfigKey = Literal[
     'check_emulator', 'emulator_path',
     'adb_emulator_name', 'emulator_args',
     '_mumu_index', '_leidian_index',
-    'mumu_background_mode',
+    'mumu_background_mode', 'target_screenshot_interval',
 
     # purchase
     'purchase_enabled',
     'money_enabled', 'ap_enabled',
-    'ap_items', 'money_items',
+    'ap_items', 'money_items', 'money_refresh',
     
     # assignment
     'assignment_enabled',
@@ -92,8 +92,8 @@ ConfigKey = Literal[
     'trace_recommend_card_detection',
     
     # misc
-    'check_update', 'auto_install_update',
-    
+    'check_update', 'auto_install_update', 'expose_to_lan',
+
     '_selected_backend_index'
     
 ]
@@ -761,6 +761,15 @@ class KotoneBotUI:
             interactive=True
         )
 
+        target_screenshot_interval = gr.Number(
+            label="最小截图间隔（秒）",
+            value=self.current_config.backend.target_screenshot_interval,
+            info=BackendConfig.model_fields['target_screenshot_interval'].description,
+            minimum=0,
+            step=0.1,
+            interactive=True
+        )
+
         tab_mumu12.select(fn=partial(_update_emulator_tab_options, selected_index=0), inputs=[screenshot_impl], outputs=[screenshot_impl])
         tab_leidian.select(fn=partial(_update_emulator_tab_options, selected_index=1), inputs=[screenshot_impl], outputs=[screenshot_impl])
         tab_custom.select(fn=partial(_update_emulator_tab_options, selected_index=2), inputs=[screenshot_impl], outputs=[screenshot_impl])
@@ -814,12 +823,14 @@ 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
+            'target_screenshot_interval': target_screenshot_interval,
             'keep_screenshots': keep_screenshots,
             'check_emulator': check_emulator,
             'emulator_path': emulator_path,
@@ -854,6 +865,12 @@ class KotoneBotUI:
                     info=PurchaseConfig.model_fields['money_items'].description
                 )
 
+                money_refresh = gr.Checkbox(
+                    label="每日一次免费刷新金币商店",
+                    value=self.current_config.options.purchase.money_refresh,
+                    info=PurchaseConfig.model_fields['money_refresh'].description
+                )
+
                 ap_enabled = gr.Checkbox(
                     label="启用AP购买",
                     value=self.current_config.options.purchase.ap_enabled,
@@ -891,6 +908,7 @@ class KotoneBotUI:
             config.purchase.enabled = data['purchase_enabled']
             config.purchase.money_enabled = data['money_enabled']
             config.purchase.money_items = [DailyMoneyShopItems(x) for x in data['money_items']]
+            config.purchase.money_refresh = data['money_refresh']
             config.purchase.ap_enabled = data['ap_enabled']
             ap_items_enum: List[Literal[0, 1, 2, 3]] = []
             ap_items_map: Dict[str, APShopItems] = {
@@ -909,7 +927,8 @@ class KotoneBotUI:
             'money_enabled': money_enabled,
             'ap_enabled': ap_enabled,
             'ap_items': ap_items,
-            'money_items': money_items
+            'money_items': money_items,
+            'money_refresh': money_refresh
         }
 
     def _create_work_settings(self) -> ConfigBuilderReturnValue:
@@ -1494,14 +1513,22 @@ class KotoneBotUI:
                 info=MiscConfig.model_fields['auto_install_update'].description,
                 interactive=True
             )
-        
+            expose_to_lan = gr.Checkbox(
+                label="允许局域网访问",
+                value=self.current_config.options.misc.expose_to_lan,
+                info=MiscConfig.model_fields['expose_to_lan'].description,
+                interactive=True
+            )
+
         def set_config(config: BaseConfig, data: dict[ConfigKey, Any]) -> None:
             config.misc.check_update = data['check_update']
             config.misc.auto_install_update = data['auto_install_update']
+            config.misc.expose_to_lan = data['expose_to_lan']
         
         return set_config, {
             'check_update': check_update,
-            'auto_install_update': auto_install_update
+            'auto_install_update': auto_install_update,
+            'expose_to_lan': expose_to_lan
         }
 
     def _create_settings_tab(self) -> None:
@@ -1888,7 +1915,9 @@ def main(kaa: Kaa | None = None) -> None:
     kaa = kaa or Kaa('./config.json')
     ui = KotoneBotUI(kaa)
     app = ui.create_ui()
-    app.launch(inbrowser=True, show_error=True)
+
+    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)
 
 if __name__ == "__main__":
     main()

kotonebot/kaa/main/kaa.py

@@ -110,6 +110,27 @@ class Kaa(KotoneBot):
             logger.exception('Failed to save error report:')
             return ''
 
+    @override
+    def _on_init_context(self) -> None:
+        """
+        初始化 Context，从配置中读取 target_screenshot_interval。
+        """
+        from kotonebot.config.manager import load_config
+        from kotonebot.backend.context import init_context
+
+        # 加载配置以获取 target_screenshot_interval
+        config = load_config(self.config_path, type=self.config_type)
+        user_config = config.user_configs[0]  # HACK: 硬编码
+        target_screenshot_interval = user_config.backend.target_screenshot_interval
+
+        d = self._on_create_device()
+        init_context(
+            config_path=self.config_path,
+            config_type=self.config_type,
+            target_device=d,
+            target_screenshot_interval=target_screenshot_interval
+        )
+
     @override
     def _on_after_init_context(self):
         if self.backend_instance is None:

kotonebot/kaa/metadata.py

@@ -1,6 +1,33 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.7.7.0
+脚本：
+* [修复] 修复 AP 商店购买时点击坐标偏移问题（#b8b56bb）
+* [修复] 修复商店购买时无法识别部分偶像碎片的问题（#353fa3f）
+* [修复] 修复 DMM 版购买时无法进入 AP 商店的问题（#f5a4e50）
+* [修复] 修复商店购买有几率卡在确认购买对话框上（#cf1605d）
+* [修复] 修复某些情况下无法自动关闭领取活动费后的弹窗（#3b3aac6）
+* [新增] 金币商店可选使用每日刷新次数（#68dbc48）
+
+界面：
+* [新增] UI 支持向局域网开放（#9b37bcf）
+
+框架：
+* [新增] 新增目标截图间隔功能（#c8fbf80）
+
+其他：
+* [其他] 删除一些无用 Sprite 资源（#03aa2b5）
+
+### v2025.7.5.0
+脚本：
+* [修复] 修复有几率无法识别到进行中培育的问题（#50d1403）
+* [修复] 修复分辨率缩放导致无法识别到菜单按钮（#f2eadad）
+* [修复] 修复分辨率缩放时无法检测到工作完成状态的问题（#d9077e7）
+
+框架：
+* [重构] 移除 Device.pinned 方法（#5306f5c）
+
 ### v2025.7.3.0
 启动器：
 * [新增] 新启动器现在支持安装指定版本与指定补丁（#456019b）