ksaa 2025.6.8.0__py3-none-any.whl → 2025.6.23.0__py3-none-any.whl

kotonebot/kaa/tasks/produce/produce.py

@@ -4,15 +4,14 @@ from typing import Optional, Literal
 from typing_extensions import assert_never
 
 from kotonebot.ui import user
-from kotonebot.util import Countdown, Interval
-from kotonebot.backend.context.context import wait
-from kotonebot.backend.dispatch import SimpleDispatcher
-
 from kotonebot.kaa.tasks import R
 from kotonebot.kaa.common import conf
 from kotonebot.kaa.game_ui import dialog
 from ..actions.scenes import at_home, goto_home
-from kotonebot.kaa.game_ui.idols_overview import locate_idol
+from kotonebot.backend.loop import Loop, StatedLoop
+from kotonebot.util import Countdown, Interval, Throttler
+from kotonebot.kaa.game_ui.primary_button import find_button
+from kotonebot.kaa.game_ui.idols_overview import locate_idol, match_idol
 from ..produce.in_purodyuusu import hajime_pro, hajime_regular, hajime_master, resume_pro_produce, resume_regular_produce, \
     resume_master_produce
 from kotonebot import device, image, ocr, task, action, sleep, contains, regex
@@ -193,10 +192,15 @@ def do_produce(
     前置条件：可导航至首页的任意页面\n
     结束状态：游戏首页\n
     
-    :param idol: 要培育的偶像。如果为 None，则使用配置文件中的偶像。
+    :param memory_set_index: 回忆编成编号。
+    :param idol_skin_id: 要培育的偶像。如果为 None，则使用配置文件中的偶像。
     :param mode: 培育模式。
     :return: 是否因为 AP 不足而跳过本次培育。
+    :raises ValueError: 如果 `memory_set_index` 不在 [1, 10] 的范围内。
     """
+    if memory_set_index is not None and not 1 <= memory_set_index <= 10:
+        raise ValueError('`memory_set_index` must be in range [1, 10].')
+
     if not at_home():
         goto_home()
 
@@ -208,16 +212,28 @@ def do_produce(
         return True
 
     # 0. 进入培育页面
-    mode_text = mode.upper()
-    if mode_text == 'MASTER':
-        mode_text = 'MASTER|MIASTER'
-    logger.info(f'Enter produce page. Mode: {mode_text}')
-    result = (SimpleDispatcher('enter_produce')
-        .click(R.Produce.ButtonProduce)
-        .click(regex(mode_text))
-        .until(R.Produce.ButtonPIdolOverview, result=True)
-        .until(R.Produce.TextAPInsufficient, result=False)
-    ).run()
+    logger.info(f'Enter produce page. Mode: {mode}')
+    match mode:
+        case 'regular':
+            target_buttons = [R.Produce.ButtonHajime0Regular, R.Produce.ButtonHajime1Regular]
+        case 'pro':
+            target_buttons = [R.Produce.ButtonHajime0Pro, R.Produce.ButtonHajime1Pro]
+        case 'master':
+            target_buttons = [R.Produce.ButtonHajime1Master]
+        case _:
+            assert_never(mode)
+    result = None
+    for _ in Loop():
+        if image.find(R.Produce.ButtonProduce):
+            device.click()
+        elif image.find_multi(target_buttons):
+            device.click()
+        elif image.find(R.Produce.ButtonPIdolOverview):
+            result = True
+            break
+        elif image.find(R.Produce.TextAPInsufficient):
+            result = False
+            break
     if not result:
         if conf().produce.use_ap_drink:
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_1.png]
@@ -230,7 +246,7 @@ def do_produce(
                     device.click()
                 elif image.find(R.Produce.ButtonRefillAP):
                     device.click()
-                elif ocr.find(contains(mode_text)):
+                elif image.find_multi(target_buttons):
                     device.click()
                 elif image.find(R.Produce.ButtonPIdolOverview):
                     break
@@ -240,49 +256,91 @@ def do_produce(
             logger.info('AP insufficient. Exiting produce.')
             device.click(image.expect_wait(R.InPurodyuusu.ButtonCancel))
             return False
-    # 1. 选择 PIdol [screenshots/produce/screenshot_produce_start_1_p_idol.png]
-    select_idol(idol_skin_id)
-    it = Interval()
-    while True:
-        it.wait()
-        device.screenshot()
-        if image.find(R.Produce.TextAnotherIdolAvailableDialog):
-            dialog.no()
-        elif image.find(R.Common.ButtonNextNoIcon):
-            device.click()
-        if image.find(R.Produce.TextStepIndicator2):
-            break
-    # 2. 选择支援卡 自动编成 [screenshots/produce/screenshot_produce_start_2_support_card.png]
-    image.expect_wait(R.Produce.TextStepIndicator2)
-    it = Interval()
-    while True:
-        if image.find(R.Common.ButtonNextNoIcon, colored=True):
-            device.click()
-            break
-        elif image.find(R.Produce.ButtonAutoSet):
-            device.click()
-            sleep(1)
-        elif image.find(R.Common.ButtonConfirm, colored=True):
-            device.click()
-        device.screenshot()
-        it.wait()
-    # 3. 选择回忆 自动编成 [screenshots/produce/screenshot_produce_start_3_memory.png]
-    image.expect_wait(R.Produce.TextStepIndicator3)
-    # 自动编成
-    if memory_set_index is not None and not 1 <= memory_set_index <= 10:
-        raise ValueError('`memory_set_index` must be in range [1, 10].')
-    if memory_set_index is None:
-        device.click(image.expect_wait(R.Produce.ButtonAutoSet))
-        wait(0.5, before='screenshot')
-        device.screenshot()
-    # 指定编号
-    else:
-        select_set(memory_set_index)
-    (SimpleDispatcher('do_produce.step_3')
-        .until(R.Produce.TextStepIndicator4)
-        .click(R.Common.ButtonNextNoIcon)
-        .click(R.Common.IconButtonCheck)
-    ).run()
+
+    idol_located = False
+    memory_set_selected = False
+    support_auto_set_done = False
+    next_throttler = Throttler(interval=4)
+    for lp in StatedLoop[Literal[0, 1, 2, 3]]():
+        if image.find(R.Produce.TextStepIndicator1):
+            lp.state = 1
+
+        if lp.state == 0:
+            pass
+        # 1. 选择 PIdol [screenshots/produce/screenshot_produce_start_1_p_idol.png]
+        if lp.state == 1:
+            if image.find(R.Produce.TextStepIndicator2):
+                lp.state = 2
+                continue
+            if lp.when(R.Produce.TextAnotherIdolAvailableDialog):
+                dialog.no(msg='Closed another idol available dialog.')
+            # 首先判断是否已选中目标偶像
+            img = lp.screenshot
+            x, y, w, h = R.Produce.BoxSelectedIdol.xywh
+            if img is not None and match_idol(idol_skin_id, img[y:y+h, x:x+w]):
+                logger.info('Idol %s selected.', idol_skin_id)
+                idol_located = True
+            # 如果没有，才选择
+            if not idol_located:
+                select_idol(idol_skin_id)
+                idol_located = True
+
+            # 下一步「次へ」
+            if idol_located and find_button(R.Common.ButtonNextNoIcon, True) and next_throttler.request():
+                device.click()
+        # 2. 选择支援卡 自动编成 [screenshots/produce/screenshot_produce_start_2_support_card.png]
+        elif lp.state == 2:
+            if image.find(R.Produce.TextStepIndicator3):
+                lp.state = 3
+                continue
+
+            # 下一步「次へ」
+            if find_button(R.Common.ButtonNextNoIcon, True) and next_throttler.request():
+                device.click()
+            # 今天仍然有租用回忆次数提示（第三步的提示）
+            # （第二步选完之后点「次へ」大概率会卡几秒钟，这个时候脚本很可能会重复点击，
+            # 卡住时候的点击就会在第三步生效，出现这个提示。而此时脚本仍然处于第二步，
+            # 这样就会报错，或者出现误自动编成。因此需要在第二步里处理掉这个对话框。
+            # 理论上应该避免这种情况，但是没找到办法，只能这样 workaround 了。）
+            elif image.find(R.Produce.TextRentAvailable):
+                dialog.no(msg='Closed rent available dialog. (Step 2)')
+            # 确认自动编成提示
+            elif image.find(R.Produce.TextAutoSet):
+                dialog.yes(msg='Confirmed auto set.')
+                sleep(1) # 等对话框消失
+            elif not support_auto_set_done and image.find(R.Produce.ButtonAutoSet):
+                device.click()
+                support_auto_set_done = True
+                sleep(1)
+        # 3. 选择回忆 自动编成 [screenshots/produce/screenshot_produce_start_3_memory.png]
+        elif lp.state == 3:
+            if image.find(R.Produce.TextStepIndicator4):
+                break
+
+            # 确认自动编成提示
+            if image.find(R.Produce.TextAutoSet):
+                dialog.yes(msg='Confirmed auto set.')
+                continue
+            # 今天仍然有租用回忆次数提示
+            elif image.find(R.Produce.TextRentAvailable):
+                dialog.yes(msg='Confirmed rent available. (Step 3)')
+                continue
+
+            if not memory_set_selected:
+                # 自动编成
+                if memory_set_index is None:
+                    lp.click_if(R.Produce.ButtonAutoSet)
+                # 指定编号
+                else:
+                    # dialog.no() # TODO: 这是什么？
+                    select_set(memory_set_index)
+                memory_set_selected = True
+            # 下一步「次へ」
+            if find_button(R.Common.ButtonNextNoIcon, True) and next_throttler.request():
+                device.click()
+                continue
+        else:
+            assert False, f'Invalid state of {lp.state}.'
 
     # 4. 选择道具 [screenshots/produce/screenshot_produce_start_4_end.png]
     # TODO: 如果道具不足，这里加入推送提醒
@@ -357,19 +415,10 @@ if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO, format='[%(asctime)s] [%(levelname)s] [%(name)s] [%(funcName)s] [%(lineno)d] %(message)s')
     logging.getLogger('kotonebot').setLevel(logging.DEBUG)
     logger.setLevel(logging.DEBUG)
-    import os
-    from datetime import datetime
-    os.makedirs('logs', exist_ok=True)
-    log_filename = datetime.now().strftime('logs/task-%y-%m-%d-%H-%M-%S.log')
-    file_handler = logging.FileHandler(log_filename, encoding='utf-8')
-    file_handler.setFormatter(logging.Formatter('[%(asctime)s] [%(levelname)s] [%(name)s] %(message)s'))
-    logging.getLogger().addHandler(file_handler)
-    
-    import time
     from kotonebot.backend.context import init_context
     from kotonebot.kaa.common import BaseConfig
+    from kotonebot.kaa.main import Kaa
 
-    init_context(config_type=BaseConfig)
     conf().produce.enabled = True
     conf().produce.mode = 'pro'
     conf().produce.produce_count = 1

kotonebot/kaa/tasks/start_game.py

@@ -95,8 +95,9 @@ def android_launch():
     前置条件：-
     结束状态：-
     """
+    _device = device.of_android()
     # 如果已经在游戏中，直接返回home
-    if device.current_package() == conf().start_game.game_package_name:
+    if _device.current_package() == conf().start_game.game_package_name:
         logger.info("Game already started")
         if not at_home():
             logger.info("Not at home, going to home")
@@ -106,15 +107,15 @@ def android_launch():
     # 如果不在游戏中，启动游戏
     if not conf().start_game.start_through_kuyo:
         # 直接启动
-        device.launch_app(conf().start_game.game_package_name)
+        _device.launch_app(conf().start_game.game_package_name)
     else:
         # 通过Kuyo启动
-        if device.current_package() == conf().start_game.kuyo_package_name:
+        if _device.current_package() == conf().start_game.kuyo_package_name:
             logger.warning("Kuyo already started. Auto start game failed.")
             # TODO: Kuyo支持改进
             return
         # 启动kuyo
-        device.launch_app('org.kuyo.game')
+        _device.launch_app('org.kuyo.game')
         # 点击"加速"
         device.click(image.expect_wait(R.Kuyo.ButtonTab3Speedup, timeout=10))
         # Kuyo会延迟加入广告，导致识别后，原位置突然弹出广告，导致进入广告页面
@@ -156,8 +157,8 @@ def windows_launch():
             logger.info('Gakumas Localify disabled.')
     
     from ahk import AHK
-    from importlib import resources
-    ahk_path = str(resources.files('kaa.res.bin') / 'AutoHotkey.exe')
+    from kotonebot.kaa.util.paths import get_ahk_path
+    ahk_path = get_ahk_path()
     ahk = AHK(executable_path=ahk_path)
 
     if ahk.find_window(title='gakumas', title_match_mode=3): # 3=精确匹配

kotonebot/kaa/util/paths.py

@@ -1,5 +1,6 @@
 import os
 from typing import cast
+from importlib import resources
 
 from kotonebot.kaa import resources as res
 
@@ -15,4 +16,8 @@ def cache(path: str) -> str:
     return p
 
 def resource(path: str) -> str:
-    return os.path.join(RESOURCE, path)
+    return os.path.join(RESOURCE, path)
+
+def get_ahk_path() -> str:
+    """获取 AutoHotkey 可执行文件路径"""
+    return str(resources.files('kaa.res.bin') / 'AutoHotkey.exe')

kotonebot/tools/mirror.py

@@ -297,19 +297,27 @@ class DeviceMirrorFrame(wx.Frame):
             self.log("请输入包名")
             return
         try:
-            self.device.launch_app(package_name)
-            self.log(f"启动APP: {package_name}")
+            # 使用新的 API 通过 commands 属性访问平台特定方法
+            if hasattr(self.device, 'commands') and hasattr(self.device.commands, 'launch_app'):
+                self.device.commands.launch_app(package_name)
+                self.log(f"启动APP: {package_name}")
+            else:
+                self.log("当前设备不支持启动APP功能")
         except Exception as e:
             self.log(f"启动APP失败: {e}")
             
     def on_get_current_app(self, event):
         """获取前台APP"""
         try:
-            package = self.device.current_package()
-            if package:
-                self.log(f"前台APP: {package}")
+            # 使用新的 API 通过 commands 属性访问平台特定方法
+            if hasattr(self.device, 'commands') and hasattr(self.device.commands, 'current_package'):
+                package = self.device.commands.current_package()
+                if package:
+                    self.log(f"前台APP: {package}")
+                else:
+                    self.log("未获取到前台APP")
             else:
-                self.log("获取前台APP失败")
+                self.log("当前设备不支持获取前台APP功能")
         except Exception as e:
             self.log(f"获取前台APP失败: {e}")
             
@@ -326,19 +334,21 @@ def show_device_mirror(device: Device):
 
 if __name__ == "__main__":
     # 测试代码
+    from kotonebot.client.device import AndroidDevice
     from kotonebot.client.implements.adb import AdbImpl
     from kotonebot.client.implements.uiautomator2 import UiAutomator2Impl
     from adbutils import adb
-    
+
     print("server version:", adb.server_version())
     adb.connect("127.0.0.1:5555")
     print("devices:", adb.device_list())
     d = adb.device_list()[-1]
-    
-    dd = Device(d)
-    adb_imp = AdbImpl(dd)
-    dd._command = adb_imp
+
+    # 使用新的 API
+    dd = AndroidDevice(d)
+    adb_imp = AdbImpl(d)  # 直接传入 adb 连接
     dd._touch = adb_imp
-    dd._screenshot = UiAutomator2Impl(dd)
-    
+    dd._screenshot = UiAutomator2Impl(dd)  # UiAutomator2Impl 可能还需要 device 对象
+    dd.commands = adb_imp  # 设置 Android 特定命令
+
     show_device_mirror(dd)

kotonebot/util.py

@@ -263,6 +263,38 @@ class Interval:
     def reset(self):
         self.start_time = time.time()
 
+class Throttler:
+    """
+    限流器，在循环中用于限制某操作的频率。
+
+    示例代码：
+    ```python
+    while True:
+        device.screenshot()
+        if throttler.request() and image.find(...):
+            do_something()
+    ```
+    """
+    def __init__(self, interval: float, max_requests: int | None = None):
+        self.max_requests = max_requests
+        self.interval = interval
+        self.last_request_time: float | None = None
+        self.request_count = 0
+
+    def request(self) -> bool:
+        """
+        检查是否允许请求。此函数立即返回，不会阻塞。
+
+        :return: 如果允许，返回 True，否则返回 False
+        """
+        current_time = time.time()
+        if self.last_request_time is None or current_time - self.last_request_time >= self.interval:
+            self.last_request_time = current_time
+            self.request_count = 0
+            return True
+        else:
+            return False
+
 def lf_path(path: str) -> str:
     standalone = os.path.join('kotonebot-resource', path)
     if os.path.exists(standalone):

{ksaa-2025.6.8.0.dist-info → ksaa-2025.6.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.6.8.0
+Version: 2025.6.23.0
 Summary: Kotones Auto Assistant(kaa) is a script for game 'Gakuen Idol M@ster' that automates the dailies and produces.
 Requires-Python: ~=3.10
 Description-Content-Type: text/markdown