ksaa 2025.9.post2__py3-none-any.whl → 2025.11__py3-none-any.whl

kaa/tasks/daily/upgrade_support_card.py

@@ -31,8 +31,18 @@ def upgrade_support_card():
     device.click(image.expect_wait(R.Common.ButtonIdolSupportCard, timeout=5))
     sleep(2)
 
-    # 往下滑，划到最底部
-    Scrollable().to(1)
+    # 重试10次
+    for retry_idx in range(10):
+        logger.debug(f'Scrolling down to find low-level support cards, attempt {retry_idx + 1}/10')
+        # 往下滑，划到最底部
+        scrollbar = Scrollable()
+        scrollbar.to(1)
+        sleep(0.1)
+        scrollbar.update()
+        if scrollbar.position >= 0.99:
+            logger.debug('Successfully scrolled to the bottom.')
+            break
+        sleep(0.5)
     
     # 点击左上角第一张支援卡
     # 点击位置百分比: (0.18, 0.34)

kaa/tasks/produce/cards.py

@@ -1,4 +1,3 @@
-import logging
 from functools import partial
 from typing import Callable, NamedTuple, Literal
 
@@ -9,6 +8,7 @@ from cv2.typing import MatLike
 from kaa.db.drink import Drink
 from kaa.game_ui.drinks_overview import locate_all_drinks_in_3_drink_slots
 from kaa.tasks import R
+from kaa.tasks.common import skip
 from kaa.config import conf
 from kaa.game_ui import dialog
 from kaa.tasks.produce.common import acquisition_date_change_dialog
@@ -16,6 +16,7 @@ from kaa.util.trace import trace
 from kotonebot.primitives import RectTuple, Rect
 from kotonebot import action, Interval, Countdown, device, image, sleep, ocr, contains, use_screenshot, color
 from kotonebot.backend.loop import Loop
+from kotonebot import logging
 
 class SkillCard(NamedTuple):
     available: bool
@@ -143,7 +144,7 @@ def do_cards(
     DRINK_MAX_RETRIES = 5
 
     for _ in Loop(interval=1/30):
-        device.click(10, 10)
+        skip()
         img = device.screenshot()
 
         # 技能卡自选移动对话框
@@ -420,7 +421,7 @@ def detect_recommended_card(
     filtered_results = list(filter(partial(threshold_predicate, card_count), results))
     if not filtered_results:
         max_result = max(results, key=lambda x: x.score)
-        logger.info("Max card detect result (discarded): value=%d score=%.4f borders=(%.4f, %.4f, %.4f, %.4f)",
+        logger.verbose("Max card detect result (discarded): value=%d score=%.4f borders=(%.4f, %.4f, %.4f, %.4f)",
             max_result.type,
             max_result.score,
             max_result.left_score,
@@ -430,7 +431,7 @@ def detect_recommended_card(
         )
         return None
     filtered_results.sort(key=lambda x: x.score, reverse=True)
-    logger.info("Max card detect result: value=%d score=%.4f borders=(%.4f, %.4f, %.4f, %.4f)",
+    logger.debug("Max card detect result: value=%d score=%.4f borders=(%.4f, %.4f, %.4f, %.4f)",
         filtered_results[0].type,
         filtered_results[0].score,
         filtered_results[0].left_score,

kaa/tasks/produce/common.py

@@ -1,6 +1,7 @@
-from typing import Literal
 from logging import getLogger
+from typing import Literal, Callable
 
+from cv2.typing import MatLike
 from kotonebot import (
     ocr,
     device,
@@ -10,16 +11,23 @@ from kotonebot import (
     Loop,
     Interval,
 )
-from kaa.config.schema import produce_solution
-from kaa.tasks.start_game import wait_for_home
+from kotonebot.util import Countdown
 from kotonebot.primitives import Rect
 from kaa.tasks import R
+from kaa.tasks.common import skip
 from .p_drink import acquire_p_drink
 from kotonebot.util import measure_time
+from kotonebot.backend.core import Image
+from kotonebot.errors import UnrecoverableError
+
+from kaa.tasks import R
 from kaa.config import conf
+from .p_drink import acquire_p_drink
 from kaa.tasks.actions.loading import loading
-from kaa.game_ui import CommuEventButtonUI, dialog, badge
+from kaa.config.schema import produce_solution
+from kaa.tasks.start_game import wait_for_home
 from kaa.tasks.actions.commu import handle_unread_commu
+from kaa.game_ui import CommuEventButtonUI, dialog, badge
 
 logger = getLogger(__name__)
 
@@ -77,6 +85,7 @@ def acquire_skill_card():
         if acquire_btn := image.find(R.InPurodyuusu.AcquireBtnDisabled):
             logger.debug("Click acquire button")
             device.click(acquire_btn)
+            sleep(0.2)
             break
 
 @action('选择P物品', screenshot_mode='auto')
@@ -257,109 +266,197 @@ def acquisition_date_change_dialog() -> AcquisitionType | None:
 
     return None
 
-@measure_time()
-@action('处理培育事件', screenshot_mode='manual')
-def fast_acquisitions() -> AcquisitionType | None:
-    """处理行动开始前和结束后可能需要处理的事件"""
-    img = device.screenshot()
-    logger.info("Acquisition stuffs...")
-    
-    # 加载画面
-    if loading():
-        logger.info("Loading...")
-        return "Loading"
-    device.click(10, 10)
-
-    # 跳过未读交流
-    logger.debug("Check skip commu...")
-    if produce_solution().data.skip_commu and handle_unread_commu(img):
-        return "SkipCommu"
-    device.click(10, 10)
-
-    # P饮料到达上限
-    logger.debug("Check PDrink max...")
-    # TODO: 需要封装一个更好的实现方式。比如 wait_stable？
-    if image.find(R.InPurodyuusu.TextPDrinkMax):
-        logger.debug("PDrink max found")
-        device.screenshot()
+# TODO: 这里要改善一下输出日志。
+# Acquisitions finished. Handled: xxx(event name or 'none'). Checked: 12(number of acquisitions) / 12(number of acquisitions)
+class ProduceInterrupt:
+    def __init__(self, *, timeout: float | None = None):
+        """
+        :param timeout: 超时时间，单位秒。默认为 None，表示使用配置文件中的时间。
+        """
+        timeout = timeout or conf().produce.interrupt_timeout
+        self.cd = Countdown(timeout)
+
+    @staticmethod
+    def _check_loading(img: MatLike) -> AcquisitionType | None:
+        """检查加载画面"""
+        if loading():
+            logger.info("Loading...")
+            return "Loading"
+        return None
+
+    @staticmethod
+    def _check_skip_commu(img: MatLike) -> AcquisitionType | None:
+        """检查跳过未读交流"""
+        logger.debug("Check skip commu...")
+        if produce_solution().data.skip_commu and handle_unread_commu(img):
+            return "SkipCommu"
+        return None
+
+    @staticmethod
+    def _check_pdrink_max(img: MatLike) -> AcquisitionType | None:
+        """检查P饮料到达上限"""
+        logger.debug("Check PDrink max...")
+        # TODO: 需要封装一个更好的实现方式。比如 wait_stable？
         if image.find(R.InPurodyuusu.TextPDrinkMax):
-            # 有对话框标题，但是没找到确认按钮
-            # 可能是需要勾选一个饮料
-            if not image.find(R.InPurodyuusu.ButtonLeave, colored=True):
-                logger.info("No leave button found, click checkbox")
-                device.click(image.expect(R.Common.CheckboxUnchecked, colored=True))
-                sleep(0.2)
-                device.screenshot()
-            if leave := image.find(R.InPurodyuusu.ButtonLeave, colored=True):
-                logger.info("Leave button found")
-                device.click(leave)
-                return "PDrinkMax"
-    # P饮料到达上限 确认提示框
-    # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_pdrink_max_confirm.png]
-    if image.find(R.InPurodyuusu.TextPDrinkMaxConfirmTitle):
-        logger.debug("PDrink max confirm found")
-        device.screenshot()
+            logger.debug("PDrink max found")
+            device.screenshot()
+            if image.find(R.InPurodyuusu.TextPDrinkMax):
+                # 有对话框标题，但是没找到确认按钮
+                # 可能是需要勾选一个饮料
+                # 也有可能是对话框正在往下退出
+                if not image.find(R.InPurodyuusu.ButtonLeave, colored=True):
+                    logger.info("No leave button found, click checkbox")
+                    if image.find(R.Common.CheckboxUnchecked, colored=True):
+                        device.click()
+                        sleep(0.2)
+                        device.screenshot()
+                if leave := image.find(R.InPurodyuusu.ButtonLeave, colored=True):
+                    logger.info("Leave button found")
+                    device.click(leave)
+                    return "PDrinkMax"
+        return None
+
+    @staticmethod
+    def _check_pdrink_max_confirm(img: MatLike) -> AcquisitionType | None:
+        """检查P饮料到达上限确认提示框"""
+        # [kotonebot-resource/sprites/jp/in_purodyuusu/screenshot_pdrink_max_confirm.png]
         if image.find(R.InPurodyuusu.TextPDrinkMaxConfirmTitle):
-            if confirm := image.find(R.Common.ButtonConfirm):
-                logger.info("Confirm button found")
-                device.click(confirm)
-                return "PDrinkMax"
-    device.click(10, 10)
-
-    # 技能卡自选强化
-    if image.find(R.InPurodyuusu.IconTitleSkillCardEnhance):
-        if handle_skill_card_enhance():
-            return "PSkillCardEnhanceSelect"
-    device.click(10, 10)
-
-    # 技能卡自选删除
-    if image.find(R.InPurodyuusu.IconTitleSkillCardRemoval):
-        if handle_skill_card_removal():
-            return "PSkillCardRemoveSelect"
-    device.click(10, 10)
-
-    # 网络中断弹窗
-    logger.debug("Check network error popup...")
-    if (image.find(R.Common.TextNetworkError) 
-        and (btn_retry := image.find(R.Common.ButtonRetry))
-    ):
-        logger.info("Network error popup found")
-        device.click(btn_retry)
-        return "NetworkError"
-    device.click(10, 10)
-
-    # 物品选择对话框
-    logger.debug("Check award select dialog...")
-    if image.find(R.InPurodyuusu.TextClaim):
-        logger.info("Award select dialog found.")
-
-        # P饮料选择
-        logger.debug("Check PDrink select...")
-        if image.find(R.InPurodyuusu.TextPDrink):
-            logger.info("PDrink select found")
-            acquire_p_drink()
-            return "PDrinkSelect"
-        # 技能卡选择
-        logger.debug("Check skill card select...")
-        if image.find(R.InPurodyuusu.TextSkillCard):
-            logger.info("Acquire skill card found")
-            acquire_skill_card()
-            return "PSkillCardSelect"
-        # P物品选择
-        logger.debug("Check PItem select...")
-        if image.find(R.InPurodyuusu.TextPItem):
-            logger.info("Acquire PItem found")
-            select_p_item()
-            return "PItemSelect"
-    device.click(10, 10)
-
-    # 日期变更
-    result = acquisition_date_change_dialog()
-    if result is not None:
-        return result
-    device.click(10, 10)
+            logger.debug("PDrink max confirm found")
+            device.screenshot()
+            if image.find(R.InPurodyuusu.TextPDrinkMaxConfirmTitle):
+                if confirm := image.find(R.Common.ButtonConfirm):
+                    logger.info("Confirm button found")
+                    device.click(confirm)
+                    return "PDrinkMax"
+        return None
 
-    return None
+    @staticmethod
+    def _check_skill_card_enhance(img: MatLike) -> AcquisitionType | None:
+        """检查技能卡自选强化"""
+        if image.find(R.InPurodyuusu.IconTitleSkillCardEnhance):
+            if handle_skill_card_enhance():
+                return "PSkillCardEnhanceSelect"
+        return None
+
+    @staticmethod
+    def _check_skill_card_removal(img: MatLike) -> AcquisitionType | None:
+        """检查技能卡自选删除"""
+        if image.find(R.InPurodyuusu.IconTitleSkillCardRemoval):
+            if handle_skill_card_removal():
+                return "PSkillCardRemoveSelect"
+        return None
+
+    @staticmethod
+    def _check_network_error(img: MatLike) -> AcquisitionType | None:
+        """检查网络中断弹窗"""
+        logger.debug("Check network error popup...")
+        if (image.find(R.Common.TextNetworkError) 
+            and (btn_retry := image.find(R.Common.ButtonRetry))
+        ):
+            logger.info("Network error popup found")
+            device.click(btn_retry)
+            return "NetworkError"
+        return None
+
+    @staticmethod
+    def _check_award_select(img: MatLike) -> AcquisitionType | None:
+        """检查物品选择对话框"""
+        logger.debug("Check award select dialog...")
+        if image.find(R.InPurodyuusu.TextClaim):
+            logger.info("Award select dialog found.")
+
+            # P饮料选择
+            logger.debug("Check PDrink select...")
+            if image.find(R.InPurodyuusu.TextPDrink):
+                logger.info("PDrink select found")
+                acquire_p_drink()
+                return "PDrinkSelect"
+            # 技能卡选择
+            logger.debug("Check skill card select...")
+            if image.find(R.InPurodyuusu.TextSkillCard):
+                logger.info("Acquire skill card found")
+                acquire_skill_card()
+                return "PSkillCardSelect"
+            # P物品选择
+            logger.debug("Check PItem select...")
+            if image.find(R.InPurodyuusu.TextPItem):
+                logger.info("Acquire PItem found")
+                select_p_item()
+                return "PItemSelect"
+        return None
+
+    @staticmethod
+    def _check_date_change(img: MatLike) -> AcquisitionType | None:
+        """检查日期变更"""
+        result = acquisition_date_change_dialog()
+        if result is not None:
+            return result
+        return None
+
+    handlers = [
+        _check_loading,
+        _check_skip_commu,
+        _check_pdrink_max,
+        _check_pdrink_max_confirm,
+        _check_skill_card_enhance,
+        _check_skill_card_removal,
+        _check_network_error,
+        _check_award_select,
+        _check_date_change
+    ]
+
+    @classmethod
+    @action('处理培育事件', screenshot_mode='manual')
+    def check(cls) -> AcquisitionType | None:
+        """处理行动开始前和结束后可能需要处理的事件"""
+        img = device.screenshot()
+        logger.info("Acquisition stuffs...")
+        
+        # 检查各个可能的中断事件        
+        for handler in cls.handlers:
+            result = handler(img)
+            if result:
+                return result
+            skip()
+
+        return None
+
+    def resolve(self, end_condition: Callable[[], bool] | Image | None = None):
+        self.cd.reset().start()
+        result: Literal[False] | AcquisitionType | None = False
+        for l in Loop():
+            if end_condition is not None:
+                if callable(end_condition) and end_condition():
+                    break
+                elif isinstance(end_condition, Image) and image.find(end_condition):
+                    break
+            else:
+                if result is None:
+                    break
+
+            if self.cd.expired():
+                raise UnrecoverableError("ProduceInterrupt.resolve timed out after 180 seconds")
+            
+            img = l.screenshot
+            if img is None:
+                img = device.screenshot()
+            for handler in self.handlers:
+                result = handler(img)
+                if result:
+                    break
+            skip()
+
+    def handle(self):
+        """处理中断事件，并检查是否超时。"""
+        if self.cd.expired():
+            raise UnrecoverableError('Unable to detect produce scene. Reseason: timed out.')
+        return self.check()
+    
+    def until(self, end_img: Image):
+        """
+        持续处理中断事件，直到指定图片出现为止。
+        """
+        return self.resolve(lambda: image.find(end_img) is not None)
 
 def until_acquisition_clear():
     """
@@ -369,7 +466,7 @@ def until_acquisition_clear():
     结束条件：任意
     """
     interval = Interval(0.6)
-    while fast_acquisitions():
+    while ProduceInterrupt.check():
         interval.wait()
 
 ORANGE_RANGE = ((14, 87, 23)), ((37, 211, 255))

kaa/tasks/produce/in_purodyuusu.py

@@ -2,9 +2,10 @@ import logging
 from typing_extensions import assert_never
 from typing import Literal
 
-from kaa.config.schema import produce_solution
+from kaa.config.schema import conf, produce_solution
 from kaa.game_ui.schedule import Schedule
 from kaa.tasks import R
+from kaa.tasks.common import skip
 from ..actions import loading
 from kaa.game_ui import WhiteFilter, dialog
 from ..actions.scenes import at_home
@@ -14,7 +15,7 @@ from kotonebot.errors import UnrecoverableError
 from kotonebot.util import Countdown, cropped
 from kotonebot.backend.loop import Loop
 from kaa.config import ProduceAction, RecommendCardDetectionMode
-from ..produce.common import until_acquisition_clear, commu_event, fast_acquisitions
+from ..produce.common import until_acquisition_clear, commu_event, ProduceInterrupt
 from kotonebot import ocr, device, contains, image, regex, action, sleep, wait
 from ..produce.non_lesson_actions import (
     enter_allowance, allowance_available,
@@ -141,9 +142,10 @@ def handle_recommended_action(final_week: bool = False) -> ProduceAction | None:
         return recommended
 
 
-@action('等待进入行动场景')
+@action('等待进入行动场景', screenshot_mode='manual')
 def until_action_scene(week_first: bool = False):
     """等待进入行动场景"""
+    pi = ProduceInterrupt()
     for _ in Loop(interval=0.2):
         if not image.find_multi([
             R.InPurodyuusu.TextPDiary, # 普通周
@@ -158,13 +160,13 @@ def until_action_scene(week_first: bool = False):
             # [screenshots/produce/in_produce/initial_commu_event.png]
             if week_first and commu_event():
                 continue
-            if fast_acquisitions():
+            if pi.handle():
                 continue
         else:
             logger.info("Now at action scene.")
             return 
 
-@action('等待进入练习场景')
+@action('等待进入练习场景', screenshot_mode='manual')
 def until_practice_scene():
     """等待进入练习场景"""
     for _ in Loop():
@@ -173,7 +175,7 @@ def until_practice_scene():
         else:
             break
 
-@action('等待进入考试场景')
+@action('等待进入考试场景', screenshot_mode='manual')
 def until_exam_scene():
     """等待进入考试场景"""
     # NOTE: is_exam_scene() 通过 OCR 剩余回合数判断是否处于考试场景。
@@ -342,7 +344,7 @@ def produce_end(has_live: bool = True):
                 elif image.find(R.Produce.TextSkipLiveDialogTitle):
                     logger.info("Confirming skip live.")
                     device.click(image.expect_wait(R.Common.IconButtonCheck))
-                device.click(10, 10)
+                skip()
             else:
                 break
         # 选择封面
@@ -385,7 +387,7 @@ def produce_end(has_live: bool = True):
             break
         else:
             device.click_center()
-            device.click(10, 10) # 为了兼容has_live==False的情况
+            skip() # 为了兼容has_live==False的情况
         sleep(2)
     # 后续动画
     logger.info("Waiting for memory generation animation completed...")
@@ -534,7 +536,7 @@ def handle_action(action: ProduceAction, final_week: bool = False) -> ProduceAct
             logger.warning("Unknown action: %s", action)
             return None
 
-def week_normal(week_first: bool = False):
+def week_normal(week_first: bool = False) -> bool:
     until_action_scene(week_first)
     logger.info("Handling actions...")
     action: ProduceAction | None = None
@@ -570,7 +572,9 @@ def week_normal(week_first: bool = False):
             assert_never(action)
     until_action_scene()
 
-def week_final_lesson():
+    return True # 继续执行下一周
+
+def week_final_lesson() -> bool:
     until_action_scene()
     action: ProduceAction | None = None
     actions = produce_solution().data.actions_order
@@ -597,6 +601,8 @@ def week_final_lesson():
             raise ValueError("Action is None.")
         case _:
             assert_never(action)
+            
+    return True # 继续执行下一周
 
 def week_mid_and_final_exam_common():
     logger.info("Wait for exam scene...")
@@ -607,23 +613,27 @@ def week_mid_and_final_exam_common():
     sleep(0.5)
     loading.wait_loading_end()
 
-def week_mid_exam():
+def week_mid_exam() -> bool:
     logger.info("Week mid exam started.")
 
     week_mid_and_final_exam_common()
     
     if exam('mid'):
         until_action_scene() # 考试通过
+        return True
     else:
         produce_end(has_live=False) # 考试不合格
+        return False
 
-def week_final_exam():
+def week_final_exam() -> bool:
     logger.info("Week final exam started.")
 
     week_mid_and_final_exam_common()
 
     exam('final')
+    
     produce_end()
+    return False
 
 @action('执行 Regular 培育', screenshot_mode='manual-inherit')
 def hajime_regular(week: int = -1, start_from: int = 1):
@@ -656,7 +666,9 @@ def hajime_regular(week: int = -1, start_from: int = 1):
     else:
         for i, w in enumerate(weeks[start_from-1:]):
             logger.info("Week %d started.", i + start_from)
-            w()
+            if not w():
+                logger.info("Exit produce after week %d.", i + start_from)
+                break
 
 @action('执行 PRO 培育', screenshot_mode='manual-inherit')
 def hajime_pro(week: int = -1, start_from: int = 1):
@@ -690,7 +702,9 @@ def hajime_pro(week: int = -1, start_from: int = 1):
     else:
         for i, w in enumerate(weeks[start_from-1:]):
             logger.info("Week %d started.", i + start_from)
-            w()
+            if not w():
+                logger.info("Exit produce after week %d.", i + start_from)
+                break
 
 @action("执行 MASTER 培育", screenshot_mode='manual-inherit')
 def hajime_master(week: int = -1, start_from: int = 1):
@@ -726,7 +740,9 @@ def hajime_master(week: int = -1, start_from: int = 1):
     else:
         for i, w in enumerate(weeks[start_from-1:]):
             logger.info("Week %d started.", i + start_from)
-            w()
+            if not w():
+                logger.info("Exit produce after week %d.", i + start_from)
+                break
 
 @action('是否在考试场景')
 def is_exam_scene():
@@ -750,8 +766,10 @@ def detect_produce_scene() -> ProduceStage:
     结束状态：游戏主页面\n
     """
     logger.info("Detecting current produce stage...")
-    
+    cd = Countdown(conf().produce.interrupt_timeout).start()
     for _ in Loop():
+        if cd.expired():
+            raise UnrecoverableError('Unable to detect produce scene. Reseason: timed out.')
         # 行动场景
         texts = ocr.ocr()
         if (
@@ -769,7 +787,7 @@ def detect_produce_scene() -> ProduceStage:
             logger.info("Detection result: At exam scene.")
             return 'exam-ongoing'
         else:
-            if fast_acquisitions():
+            if ProduceInterrupt.check():
                 # 继续循环检测
                 pass
             elif commu_event():