ksaa 2025.7.27.1__py3-none-any.whl → 2025.8.17.0__py3-none-any.whl

kotonebot/kaa/tasks/daily/mission_reward.py

@@ -8,6 +8,7 @@ from kotonebot.kaa.config import conf, Priority
 from ..actions.loading import wait_loading_end
 from ..actions.scenes import at_home, goto_home
 from kotonebot import device, image, color, task, action, rect_expand, sleep
+from kotonebot.backend.loop import Loop
 
 logger = logging.getLogger(__name__)
 
@@ -43,12 +44,14 @@ def claim_mission_reward(name: str):
         logger.info(f'Claiming {name} mission reward.')
         device.click()
         sleep(0.5)
-        while not image.find(R.Common.ButtonIconArrowShortDisabled, colored=True):
-            if image.find(R.Common.ButtonIconClose):
-                logger.debug('Closing popup dialog.')
-                device.click()
-                sleep(1)
-            sleep(0.5)
+        for _ in Loop(interval=0.5):
+            if not image.find(R.Common.ButtonIconArrowShortDisabled, colored=True):
+                if image.find(R.Common.ButtonIconClose):
+                    logger.debug('Closing popup dialog.')
+                    device.click()
+                    sleep(1)
+            else:
+                break
     else:
         logger.info(f'No {name} mission reward to claim.')
 
@@ -81,13 +84,14 @@ def claim_pass_reward():
     device.click()
     # [screenshots/mission/pass.png]
     # 对话框 [screenshots/mission/pass_dialog.png]
-    while not image.find(R.Daily.IconTitlePass):
+    for _ in Loop(interval=0.2):
         if image.find(R.Common.ButtonIconClose):
             logger.debug('Closing popup dialog.')
             device.click()
-        sleep(0.2)
+        elif image.find(R.Daily.IconTitlePass):
+            break
     logger.debug('Pass screen loaded.')
-    while True:
+    for _ in Loop():
         if image.find(R.Common.ButtonIconClose):
             logger.debug('Closing popup dialog.')
             device.click()
@@ -96,7 +100,6 @@ def claim_pass_reward():
             device.click()
         elif not image.find(R.Daily.ButtonPassClaim, colored=True) and image.find(R.Daily.IconTitlePass):
             break
-        sleep(0.2)
     logger.info('All pass rewards claimed.')
 
 @action('活动奖励')

kotonebot/kaa/tasks/daily/purchase.py

@@ -70,8 +70,7 @@ def dispatch_recommended_items():
     # 前置条件：[screenshots\shop\money1.png]
     logger.info(f'Start purchasing recommended items.')
 
-    while True:
-        device.screenshot()
+    for _ in Loop():
         if rec := image.find(R.Daily.TextShopRecommended):
             logger.info(f'Clicking on recommended item.') # TODO: 计数
             pos = rec.position.offset(dx=0, dy=80)
@@ -82,7 +81,7 @@ def dispatch_recommended_items():
             logger.info(f'No recommended item found. Finished.')
             break
 
-@action('确认购买', screenshot_mode='manual-inherit')
+@action('确认购买', screenshot_mode='manual')
 def confirm_purchase(target_item_pos: Point | None = None):
     """
     确认购买
@@ -120,11 +119,13 @@ def confirm_purchase(target_item_pos: Point | None = None):
         return
     else:
         device.screenshot()
-        while image.find(R.Daily.ButtonShopCountAdd, colored=True):
-            logger.debug('Adjusting quantity(+1)...')
-            device.click()
-            sleep(0.2)
-            device.screenshot()
+        # TODO: 这下面这段代码是干什么的？为什么上面和下面都点击了 Confirm？
+        for _ in Loop(interval=0.2):
+            if image.find(R.Daily.ButtonShopCountAdd, colored=True):
+                logger.debug('Adjusting quantity(+1)...')
+                device.click()
+            else:
+                break
         logger.debug('Confirming purchase...')
         device.click(image.expect_wait(R.Common.ButtonConfirm))
     # 等待对话框动画结束
@@ -157,10 +158,12 @@ def ap_items():
                 continue
             comfirm = image.expect_wait(R.Common.ButtonConfirm, timeout=2)
             # 如果数量不是最大,调到最大
-            while image.find(R.Daily.ButtonShopCountAdd, colored=True):
-                logger.debug('Adjusting quantity(+1)...')
-                device.click()
-                sleep(0.3)
+            for _ in Loop(interval=0.3):
+                if image.find(R.Daily.ButtonShopCountAdd, colored=True):
+                    logger.debug('Adjusting quantity(+1)...')
+                    device.click()
+                else:
+                    break
             logger.debug(f'Confirming purchase...')
             device.click(comfirm)
             sleep(1.5)
@@ -179,7 +182,7 @@ def purchase():
 
     goto_shop()
     # 进入每日商店 [screenshots\shop\shop.png]
-    device.click(image.expect(R.Daily.ButtonDailyShop)) # TODO: memoable
+    device.click(image.expect_wait(R.Daily.ButtonDailyShop)) # TODO: memoable
     # 等待载入
     ap_tab = image.expect_wait(R.Daily.TextTabShopAp)
 
@@ -192,6 +195,12 @@ def purchase():
             logger.info('Refreshing money shop.')
             device.click()
             sleep(0.5)
+            # 等待刷新完成
+            for _ in Loop():
+                if not image.find(R.Daily.ButtonRefreshMoneyShop):
+                    break
+                logger.debug('Waiting for money shop refresh...')
+            device.screenshot()
             money_items2()
             sleep(0.5)
     else:

kotonebot/kaa/tasks/produce/cards.py

@@ -12,6 +12,7 @@ from kotonebot.kaa.game_ui import dialog
 from kotonebot.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
 
 class SkillCard(NamedTuple):
     available: bool
@@ -121,7 +122,6 @@ def do_cards(
     :param threshold_predicate: 推荐卡检测阈值判断函数
     :param end_predicate: 结束条件判断函数
     """
-    it = Interval(seconds=1/30)
     timeout_cd = Countdown(sec=120).start() # 推荐卡检测超时计时器
     break_cd = Countdown(sec=5) # 满足结束条件计时器
     no_card_cd = Countdown(sec=4) # 无手牌计时器
@@ -129,10 +129,9 @@ def do_cards(
     tries = 1
     card_count = -1
 
-    while True:
+    for _ in Loop(interval=1/30):
         device.click(0, 0)
         img = device.screenshot()
-        it.wait()
 
         # 技能卡自选移动对话框
         if image.find(R.InPurodyuusu.IconTitleSkillCardMove):
@@ -216,10 +215,8 @@ def handle_skill_card_move():
         logger.info("No skill cards found")
         return False
 
-    it = Interval()
     cd = Countdown(sec=3)
-    while True:
-        device.screenshot()
+    for _ in Loop():
         # 判断对话框是否关闭
         # 已关闭，开始计时
         if not image.find(R.InPurodyuusu.IconTitleSkillCardMove):
@@ -241,8 +238,6 @@ def handle_skill_card_move():
             device.double_click(card)
             sleep(1)
             dialog.yes()
-
-        it.wait()
     logger.debug("Handle skill card move finished.")
 
 @action('获取当前卡牌信息', screenshot_mode='manual-inherit')

kotonebot/kaa/tasks/produce/common.py

@@ -7,6 +7,7 @@ from kotonebot import (
     image,
     action,
     sleep,
+    Loop,
     Interval,
 )
 from kotonebot.kaa.config.schema import produce_solution
@@ -28,15 +29,11 @@ def acquire_skill_card():
     # TODO: 不硬编码坐标
     logger.debug("Locating all skill cards...")
     
-    it = Interval()
     cards = None
     card_clicked = False
     target_card = None
     
-    while True:
-        device.screenshot()
-        it.wait()
-        
+    for _ in Loop():
         # 是否显示技能卡选择指导的对话框
         # [kotonebot-resource/sprites/jp/in_purodyuusu/screenshot_show_skill_card_select_guide_dialog.png]
         if image.find(R.InPurodyuusu.TextSkillCardSelectGuideDialogTitle):
@@ -146,14 +143,11 @@ def handle_skill_card_removal():
         logger.info("No skill cards found")
         return False
     device.click(card)
-    it = Interval()
-    while True:
-        device.screenshot()
+    for _ in Loop():
         if image.find(R.InPurodyuusu.ButtonRemove):
             device.click()
             logger.debug("Remove button clicked.")
             break
-        it.wait()
     logger.debug("Handle skill card removal finished.")
 
 AcquisitionType = Literal[

kotonebot/kaa/tasks/produce/in_purodyuusu.py

@@ -11,7 +11,7 @@ from ..actions.scenes import at_home
 from .cards import do_cards, CardDetectResult
 from ..actions.commu import handle_unread_commu
 from kotonebot.errors import UnrecoverableError
-from kotonebot.util import Countdown, Interval, cropped
+from kotonebot.util import Countdown, cropped
 from kotonebot.backend.loop import Loop
 from kotonebot.kaa.config import ProduceAction, RecommendCardDetectionMode
 from ..produce.common import until_acquisition_clear, commu_event, fast_acquisitions
@@ -74,10 +74,11 @@ def handle_recommended_action(final_week: bool = False) -> ProduceAction | None:
     device.screenshot()
     if not image.find(R.InPurodyuusu.IconAsariSenseiAvatar):
         return None
-    it = Interval()
     cd = Countdown(sec=5).start()
     result = None
-    while not cd.expired():
+    for _ in Loop():
+        if cd.expired():
+            break
         logger.debug('Retrieving recommended lesson...')
         with cropped(device, y1=0.00, y2=0.30):
             if result := image.find_multi([
@@ -88,8 +89,6 @@ def handle_recommended_action(final_week: bool = False) -> ProduceAction | None:
                 R.InPurodyuusu.TextSenseiTipConsult,
             ]):
                 break
-        it.wait()
-        device.screenshot()
 
     logger.debug("image.find_multi: %s", result)
     if result is None:
@@ -145,32 +144,34 @@ def handle_recommended_action(final_week: bool = False) -> ProduceAction | None:
 @action('等待进入行动场景')
 def until_action_scene(week_first: bool = False):
     """等待进入行动场景"""
-    # 检测是否到行动页面
-    while not image.find_multi([
-        R.InPurodyuusu.TextPDiary, # 普通周
-        R.InPurodyuusu.ButtonFinalPracticeDance # 离考试剩余一周
-    ]):
-        logger.info("Action scene not detected. Retry...")
-        # commu_event 和 acquisitions 顺序不能颠倒。
-        # 在 PRO 培育初始饮料、技能卡二选一事件时，右下方的
-        # 快进按钮会被视为交流。如果先执行 acquisitions()，
-        # 会因为命中交流而 continue，commut_event() 永远
-        # 不会执行。
-        # [screenshots/produce/in_produce/initial_commu_event.png]
-        if week_first and commu_event():
-            continue
-        if fast_acquisitions():
-            continue
-        sleep(0.2)
-    else:
-        logger.info("Now at action scene.")
-        return 
+    for _ in Loop(interval=0.2):
+        if not image.find_multi([
+            R.InPurodyuusu.TextPDiary, # 普通周
+            R.InPurodyuusu.ButtonFinalPracticeDance # 离考试剩余一周
+        ]):
+            logger.info("Action scene not detected. Retry...")
+            # commu_event 和 acquisitions 顺序不能颠倒。
+            # 在 PRO 培育初始饮料、技能卡二选一事件时，右下方的
+            # 快进按钮会被视为交流。如果先执行 acquisitions()，
+            # 会因为命中交流而 continue，commut_event() 永远
+            # 不会执行。
+            # [screenshots/produce/in_produce/initial_commu_event.png]
+            if week_first and commu_event():
+                continue
+            if fast_acquisitions():
+                continue
+        else:
+            logger.info("Now at action scene.")
+            return 
 
 @action('等待进入练习场景')
 def until_practice_scene():
     """等待进入练习场景"""
-    while image.find(R.InPurodyuusu.TextClearUntil) is None:
-        until_acquisition_clear()
+    for _ in Loop():
+        if image.find(R.InPurodyuusu.TextClearUntil) is None:
+            until_acquisition_clear()
+        else:
+            break
 
 @action('等待进入考试场景')
 def until_exam_scene():
@@ -178,8 +179,11 @@ def until_exam_scene():
     # NOTE: is_exam_scene() 通过 OCR 剩余回合数判断是否处于考试场景。
     # 本来有可能会与练习场景混淆，
     # 但是在确定后续只是考试场景的情况下应该不会
-    while ocr.find(regex("合格条件|三位以上")) is None and not is_exam_scene():
-        until_acquisition_clear()
+    for _ in Loop():
+        if ocr.find(regex("合格条件|三位以上")) is None and not is_exam_scene():
+            until_acquisition_clear()
+        else:
+            break
 
 @action('执行练习', screenshot_mode='manual')
 def practice():
@@ -284,8 +288,11 @@ def exam(type: Literal['mid', 'final']):
     do_cards(threshold_predicate, end_predicate)
     device.click(image.expect_wait(R.Common.ButtonNext))
     if type == 'final':
-        while ocr.wait_for(contains("メモリー"), timeout=7):
-            device.click_center()
+        for _ in Loop():
+            if ocr.wait_for(contains("メモリー"), timeout=7):
+                device.click_center()
+            else:
+                break
 
 # TODO: 将这个函数改为手动截图模式
 @action('考试结束流程')
@@ -301,23 +308,24 @@ def produce_end():
     # 等待选择封面画面 [screenshots/produce_end/select_cover.jpg]
     # 次へ
     logger.info("Waiting for select cover screen...")
-    it = Interval()
-    while not image.find(R.InPurodyuusu.ButtonNextNoIcon):
-        # device.screenshot()
-        # 未读交流
-        if handle_unread_commu():
-            logger.info("Skipping unread commu")
-        # 跳过演出
-        # [kotonebot-resource\sprites\jp\produce\screenshot_produce_end.png]
-        elif image.find(R.Produce.ButtonSkipLive, preprocessors=[WhiteFilter()]):
-            logger.info("Skipping live.")
-            device.click()
-        # [kotonebot-resource\sprites\jp\produce\screenshot_produce_end_skip.png]
-        elif image.find(R.Produce.TextSkipLiveDialogTitle):
-            logger.info("Confirming skip live.")
-            device.click(image.expect_wait(R.Common.IconButtonCheck))
-        it.wait()
-        device.click(0, 0)
+    for _ in Loop():
+        if not image.find(R.InPurodyuusu.ButtonNextNoIcon):
+            # device.screenshot()
+            # 未读交流
+            if handle_unread_commu():
+                logger.info("Skipping unread commu")
+            # 跳过演出
+            # [kotonebot-resource\sprites\jp\produce\screenshot_produce_end.png]
+            elif image.find(R.Produce.ButtonSkipLive, preprocessors=[WhiteFilter()]):
+                logger.info("Skipping live.")
+                device.click()
+            # [kotonebot-resource\sprites\jp\produce\screenshot_produce_end_skip.png]
+            elif image.find(R.Produce.TextSkipLiveDialogTitle):
+                logger.info("Confirming skip live.")
+                device.click(image.expect_wait(R.Common.IconButtonCheck))
+            device.click(0, 0)
+        else:
+            break
     # 选择封面
     logger.info("Use default cover.")
     sleep(3)
@@ -360,9 +368,11 @@ def produce_end():
         sleep(2)
     # 后续动画
     logger.info("Waiting for memory generation animation completed...")
-    while not image.find(R.InPurodyuusu.ButtonNextNoIcon):
-        device.click_center()
-        sleep(1)
+    for _ in Loop(interval=1):
+        if not image.find(R.InPurodyuusu.ButtonNextNoIcon):
+            device.click_center()
+        else:
+            break
     
     # 结算完毕
     # logger.info("Finalize")
@@ -385,7 +395,7 @@ def produce_end():
 
     # 四个完成画面
     logger.info("Finalize")
-    while True:
+    for _ in Loop():
         # [screenshots/produce_end/end_next_1.jpg]
         # [screenshots/produce_end/end_next_2.png]
         # [screenshots/produce_end/end_next_3.png]
@@ -406,37 +416,39 @@ def produce_end():
 
     # 点击结束后可能还会弹出来：
     # 活动进度、关注提示
-    while not at_home():
-        # 活动积分进度 奖励领取
-        # [screenshots/produce_end/end_activity1.png]
-        # 制作人 升级
-        # [screenshots/produce_end/end_level_up.png]
-        if image.find(R.Common.ButtonIconClose):
-            logger.info("Activity award claim dialog found. Click to close.")
-            device.click()
-        # 活动积分进度
-        # [screenshots/produce_end/end_activity.png]
-        elif image.find(R.Common.ButtonNextNoIcon, colored=True):
-            logger.debug("Click next")
-            device.click()
-        # 关注制作人
-        # [screenshots/produce_end/end_follow.png]
-        elif image.find(R.InPurodyuusu.ButtonCancel):
-            logger.info("Follow producer dialog found. Click to close.")
-            if produce_solution().data.follow_producer:
-                logger.info("Follow producer")
-                device.click(image.expect_wait(R.InPurodyuusu.ButtonFollowNoIcon))
-            else:
-                logger.info("Skip follow producer")
+    for _ in Loop(interval=1):
+        if not at_home():
+            # 活动积分进度 奖励领取
+            # [screenshots/produce_end/end_activity1.png]
+            # 制作人 升级
+            # [screenshots/produce_end/end_level_up.png]
+            if image.find(R.Common.ButtonIconClose):
+                logger.info("Activity award claim dialog found. Click to close.")
                 device.click()
-        # 偶像强化月 新纪录达成
-        # [kotonebot-resource/sprites/jp/in_purodyuusu/screenshot_new_record.png]
-        elif image.find(R.Common.ButtonOK):
-            logger.info("OK button found. Click to close.")
-            device.click()
+            # 活动积分进度
+            # [screenshots/produce_end/end_activity.png]
+            elif image.find(R.Common.ButtonNextNoIcon, colored=True):
+                logger.debug("Click next")
+                device.click()
+            # 关注制作人
+            # [screenshots/produce_end/end_follow.png]
+            elif image.find(R.InPurodyuusu.ButtonCancel):
+                logger.info("Follow producer dialog found. Click to close.")
+                if produce_solution().data.follow_producer:
+                    logger.info("Follow producer")
+                    device.click(image.expect_wait(R.InPurodyuusu.ButtonFollowNoIcon))
+                else:
+                    logger.info("Skip follow producer")
+                    device.click()
+            # 偶像强化月 新纪录达成
+            # [kotonebot-resource/sprites/jp/in_purodyuusu/screenshot_new_record.png]
+            elif image.find(R.Common.ButtonOK):
+                logger.info("OK button found. Click to close.")
+                device.click()
+            else:
+                device.click_center()
         else:
-            device.click_center()
-        sleep(1)
+            break
     logger.info("Produce completed.")
 
 @action('执行行动', screenshot_mode='manual-inherit')

kotonebot/kaa/tasks/produce/non_lesson_actions.py

@@ -12,7 +12,8 @@ from kotonebot.kaa.tasks import R
 from kotonebot.kaa.config import conf
 from ..produce.common import fast_acquisitions
 from kotonebot.kaa.game_ui.commu_event_buttons import CommuEventButtonUI
-from kotonebot.util import Countdown, Interval
+from kotonebot.util import Countdown
+from kotonebot.backend.loop import Loop
 from kotonebot.errors import UnrecoverableError
 from kotonebot import device, image, action, sleep
 from kotonebot.backend.dispatch import SimpleDispatcher
@@ -56,9 +57,12 @@ def enter_study():
     device.double_click(image.expect_wait(R.InPurodyuusu.ButtonIconStudy))
     # 等待进入页面。中间可能会出现未读交流
     # [screenshots/produce/action_study2.png]
-    while not image.find(R.InPurodyuusu.IconTitleStudy):
-        logger.debug("Waiting for 授業 screen.")
-        fast_acquisitions()
+    for _ in Loop():
+        if not image.find(R.InPurodyuusu.IconTitleStudy):
+            logger.debug("Waiting for 授業 screen.")
+            fast_acquisitions()
+        else:
+            break
     # 首先需要判断是不是自习课
     # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_study_self_study.png]
     if image.find_multi([
@@ -101,8 +105,11 @@ def enter_study():
             device.click(target_btn)
         else:
             device.double_click(target_btn)
-        while fast_acquisitions() is None:
-            logger.info("Waiting for acquisitions finished.")
+        for _ in Loop():
+            if fast_acquisitions() is None:
+                logger.info("Waiting for acquisitions finished.")
+            else:
+                break
     logger.info("授業 completed.")
 
 
@@ -119,12 +126,14 @@ def enter_allowance():
     logger.info("Double clicking on 活動支給.")
     device.double_click(image.expect(R.InPurodyuusu.ButtonTextAllowance), interval=1)
     # 等待进入页面
-    while not image.find(R.InPurodyuusu.IconTitleAllowance):
-        logger.debug("Waiting for 活動支給 screen.")
-        fast_acquisitions()
+    for _ in Loop():
+        if not image.find(R.InPurodyuusu.IconTitleAllowance):
+            logger.debug("Waiting for 活動支給 screen.")
+            fast_acquisitions()
+        else:
+            break
     # 领取奖励
-    it = Interval()
-    while True:
+    for _ in Loop():
         # TODO: 检测是否在行动页面应当单独一个函数
         if image.find_multi([
             R.InPurodyuusu.TextPDiary, # 普通周
@@ -138,7 +147,6 @@ def enter_allowance():
             continue
         if fast_acquisitions() is not None:
             continue
-        it.wait()
     logger.info("活動支給 completed.")
 
 # TODO: 将逻辑用循环改写
@@ -156,10 +164,13 @@ def enter_consult():
     device.double_click(image.expect(R.InPurodyuusu.ButtonIconConsult), interval=1)
     
     # 等待进入页面
-    while not image.find(R.InPurodyuusu.IconTitleConsult):
-        device.screenshot()
-        logger.debug("Waiting for 相談 screen.")
-        fast_acquisitions()
+    for _ in Loop():
+        if not image.find(R.InPurodyuusu.IconTitleConsult):
+            device.screenshot()
+            logger.debug("Waiting for 相談 screen.")
+            fast_acquisitions()
+        else:
+            break
     # # 尝试固定购买第一个物品
     # device.click(R.InPurodyuusu.PointConsultFirstItem)
     # sleep(0.5)
@@ -179,15 +190,12 @@ def enter_consult():
     #     dialog.yes()
     device.click(R.InPurodyuusu.PointConsultFirstItem)
     sleep(0.3)
-    it = Interval()
     wait_purchase_cd = Countdown(sec=5)
     exit_cd = Countdown(sec=5)
     purchase_clicked = False
     purchase_confirmed = False
     exit_clicked = False
-    while True:
-        device.screenshot()
-        it.wait()
+    for _ in Loop():
         if wait_purchase_cd.expired():
             # 等待购买确认对话框超时后直接认为购买完成
             purchase_confirmed = True
@@ -268,9 +276,12 @@ def enter_outing():
     logger.info("Double clicking on おでかけ.")
     device.double_click(image.expect(R.InPurodyuusu.ButtonIconOuting))
     # 等待进入页面
-    while not image.find(R.InPurodyuusu.TitleIconOuting):
-        logger.debug("Waiting for おでかけ screen.")
-        fast_acquisitions()
+    for _ in Loop():
+        if not image.find(R.InPurodyuusu.TitleIconOuting):
+            logger.debug("Waiting for おでかけ screen.")
+            fast_acquisitions()
+        else:
+            break
     # 固定选中第二个选项
     # TODO: 可能需要二次处理外出事件
     # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_outing.png]
@@ -284,9 +295,7 @@ def enter_outing():
         device.click(target_btn)
     else:
         device.double_click(target_btn)
-    it = Interval()
-    while True:
-        device.screenshot()
+    for _ in Loop():
         if at_action_scene():
             break
         elif fast_acquisitions():
@@ -296,7 +305,6 @@ def enter_outing():
             logger.info("AP max out dialog found. Click to continue.")
             device.click()
             sleep(0.1)
-        it.wait()
 
     logger.info("おでかけ completed.")