ksaa 2025.8.23.1.post1__py3-none-any.whl → 2025.9__py3-none-any.whl

{kotonebot/kaa → kaa}/tasks/daily/acquire_presents.py

@@ -1,8 +1,8 @@
 """领取礼物（邮箱）"""
 import logging
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
+from kaa.tasks import R
+from kaa.config import conf
 from ..actions.scenes import at_home, goto_home
 from kotonebot import device, image, task, color, rect_expand, sleep
 

{kotonebot/kaa → kaa}/tasks/daily/assignment.py

@@ -3,8 +3,8 @@ import logging
 from typing import Literal
 from datetime import timedelta
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
+from kaa.tasks import R
+from kaa.config import conf
 from ..actions.scenes import at_home, goto_home
 from kotonebot import task, device, image, action, ocr, contains, cropped, rect_expand, color, sleep, regex
 

{kotonebot/kaa → kaa}/tasks/daily/capsule_toys.py

@@ -1,9 +1,9 @@
 """扭蛋机，支持任意次数的任意扭蛋类型"""
 import logging
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.game_ui.scrollable import Scrollable
+from kaa.tasks import R
+from kaa.config import conf
+from kaa.game_ui.scrollable import Scrollable
 from ..actions.scenes import at_home, goto_home
 from kotonebot.backend.image import TemplateMatchResult
 from kotonebot.backend.loop import Loop
@@ -91,6 +91,7 @@ def capsule_toys():
     # 进入扭蛋机页面
     logger.info('Entering Capsule Toys page')
     device.click(image.expect_wait(R.Daily.ButtonShop, timeout=5))
+    sleep(0.5) # 动画未加载完毕时，提前点击按钮
     device.click(image.expect_wait(R.Daily.ButtonShopCapsuleToys, timeout=5))
     # 等待加载
     image.expect_wait(R.Daily.CapsuleToys.IconTitle)

{kotonebot/kaa → kaa}/tasks/daily/club_reward.py

@@ -1,9 +1,9 @@
 """领取社团奖励，并尽可能地给其他人送礼物"""
 import logging
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.game_ui import toolbar_menu
+from kaa.tasks import R
+from kaa.config import conf
+from kaa.game_ui import toolbar_menu
 from ..actions.scenes import at_home, goto_home
 from kotonebot import task, device, image, sleep, ocr
 

{kotonebot/kaa → kaa}/tasks/daily/contest.py

@@ -3,9 +3,9 @@ import logging
 from gettext import gettext as _
 
 from kotonebot.errors import StopCurrentTask
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.game_ui import WhiteFilter, dialog
+from kaa.tasks import R
+from kaa.config import conf
+from kaa.game_ui import WhiteFilter, dialog
 from ..actions.scenes import at_home, goto_home
 from ..actions.loading import wait_loading_end
 from kotonebot import device, image, ocr, color, action, task, rect_expand, sleep, contains, Interval
@@ -201,6 +201,6 @@ def contest():
     logger.info('Contest all finished.')
 
 if __name__ == '__main__':
-    from kotonebot.kaa.main import Kaa
+    from kaa.main import Kaa
     from kotonebot.backend.context import tasks_from_id
     Kaa('config.json').run(tasks_from_id(['contest']))

{kotonebot/kaa → kaa}/tasks/daily/mission_reward.py

@@ -1,10 +1,10 @@
 """领取任务奖励"""
 import logging
 
-from kotonebot.kaa.tasks import R
+from kaa.tasks import R
 
 from kotonebot.primitives import Rect
-from kotonebot.kaa.config import conf, Priority
+from 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

{kotonebot/kaa → kaa}/tasks/daily/purchase.py

@@ -3,8 +3,8 @@ import logging
 from typing import Optional
 
 from kotonebot.backend.loop import Loop
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf, DailyMoneyShopItems
+from kaa.tasks import R
+from kaa.config import conf, DailyMoneyShopItems
 from kotonebot.primitives.geometry import Point
 from kotonebot.util import Countdown, cropped
 from kotonebot import task, device, image, action, sleep
@@ -40,7 +40,6 @@ def money_items2(items: Optional[list[DailyMoneyShopItems]] = None):
         for item in items:
             if ret := image.find(item.to_resource(), colored=True):
                 logger.info(f'Purchasing {item.to_ui_text(item)}...')
-                device.click()
                 confirm_purchase(ret.position)
                 finished.append(item)
         items = [item for item in items if item not in finished]
@@ -74,7 +73,6 @@ def dispatch_recommended_items():
         if rec := image.find(R.Daily.TextShopRecommended):
             logger.info(f'Clicking on recommended item.') # TODO: 计数
             pos = rec.position.offset(dx=0, dy=80)
-            device.click(pos)
             confirm_purchase(pos)
             sleep(2.5) # 
         elif image.find(R.Daily.IconTitleDailyShop) and not image.find(R.Daily.TextShopRecommended):

{kotonebot/kaa → kaa}/tasks/daily/upgrade_support_card.py

@@ -1,9 +1,9 @@
 """升级一张支援卡，优先升级低等级支援卡"""
 import logging
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.game_ui.scrollable import Scrollable
+from kaa.tasks import R
+from kaa.config import conf
+from kaa.game_ui.scrollable import Scrollable
 from ..actions.scenes import at_home, goto_home
 from kotonebot import task, device, image, sleep
 

{kotonebot/kaa → kaa}/tasks/end_game.py

@@ -8,7 +8,7 @@ import threading
 from kotonebot.backend.bot import PostTaskContext
 from kotonebot.ui import user
 from ..kaa_context import instance
-from kotonebot.kaa.config import Priority, conf
+from kaa.config import Priority, conf
 from kotonebot import task, action, config, device
 
 logger = logging.getLogger(__name__)

{kotonebot/kaa → kaa}/tasks/produce/cards.py

@@ -6,10 +6,13 @@ import cv2
 import numpy as np
 from cv2.typing import MatLike
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.game_ui import dialog
-from kotonebot.kaa.util.trace import trace
+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.config import conf
+from kaa.game_ui import dialog
+from kaa.tasks.produce.common import acquisition_date_change_dialog
+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
@@ -110,6 +113,7 @@ def calc_card_position(card_count: int):
 
 @action('打牌', screenshot_mode='manual')
 def do_cards(
+        is_exam: bool,
         threshold_predicate: Callable[[int, CardDetectResult], bool],
         end_predicate: Callable[[], bool]
     ):
@@ -119,18 +123,27 @@ def do_cards(
     前置条件：考试/练习页面\n
     结束状态：考试/练习结束的一瞬间
 
+    :param is_exam: 是否是考试
     :param threshold_predicate: 推荐卡检测阈值判断函数
     :param end_predicate: 结束条件判断函数
     """
-    timeout_cd = Countdown(sec=120).start() # 推荐卡检测超时计时器
+    timeout_cd = Countdown(sec=conf().produce.produce_timeout_cd).start() # 推荐卡检测超时计时器
     break_cd = Countdown(sec=5) # 满足结束条件计时器
     no_card_cd = Countdown(sec=4) # 无手牌计时器
     detect_card_count_cd = Countdown(sec=4).start() # 刷新检测手牌数量间隔
     tries = 1
     card_count = -1
+    timeout_card_id = 1 # timeout时，选择的卡的编号
+                        # 每次选择后会自增；若成功打出，则重置为1；如果全不无法选中，那么预测系统应该会选择空过本回合，不用考虑
+
+    enable_drink: bool = is_exam # 避免耦合
+    drinks_list: list[tuple[Drink, RectTuple]] | None = None
+    drink_selected_idx: int = -1 # 此索引指向drinks_list
+    drink_retries = 0
+    DRINK_MAX_RETRIES = 5
 
     for _ in Loop(interval=1/30):
-        device.click(0, 0)
+        device.click(10, 10)
         img = device.screenshot()
 
         # 技能卡自选移动对话框
@@ -138,6 +151,25 @@ def do_cards(
             if handle_skill_card_move():
                 sleep(4)  # 等待卡片刷新
                 continue
+        # 饮品详细对话框（需要在 ButtonIconCheckMark 之前，因为ButtonUse也是√）
+        if image.find(R.InPurodyuusu.ButtonUse):
+            # 任何情况下都点击（避免卡死）
+            device.click()
+            if enable_drink and drinks_list is not None:
+                if drink_selected_idx < 0 or drink_selected_idx >= len(drinks_list):
+                    logger.warning('`drink_selected_idx` dismatches, internal error!')
+                else:
+                    drinks_list.pop(drink_selected_idx)
+                    drink_selected_idx = -1 # Reset
+                    drink_retries = 0 # 逻辑正常运作，重置drink_retries
+                    logger.info('Used selected drink.')
+                    sleep(3) # 饮品动画
+                    img = device.screenshot()
+                    drinks_list = locate_all_drinks_in_3_drink_slots(img)
+                    logger.info("Rematched %d drinks. Detailed: %s", len(drinks_list), str(drinks_list))
+            else:
+                logger.warning('Unexpected use drink dialog.')
+            continue
         # 技能卡效果无法发动对话框
         if image.find(R.Common.ButtonIconCheckMark):
             logger.info("Confirmation dialog detected")
@@ -145,6 +177,35 @@ def do_cards(
             sleep(4)  # 等待卡片刷新
             continue
 
+        # 匹配饮品
+        # - 顺序应该在对话框检测之后、卡片更新之前
+        # 考试时，初始化饮料
+        if enable_drink and drinks_list is None:
+            drinks_list = locate_all_drinks_in_3_drink_slots(img)
+            logger.info("Matched %d drinks. Detailed: %s", len(drinks_list), str(drinks_list))
+        # 考试时，处理具体的饮料
+        if enable_drink and drinks_list is not None and len(drinks_list) > 0:
+            if drinks_list[0][0].name in Drink.ordinary_drinks_name():
+                # 可以处理第0个饮品
+                drink_selected_idx = 0
+                # 点击
+                device.click(Rect(xywh=drinks_list[drink_selected_idx][1]))
+                # Log
+                logger.info('Click drink %s', drinks_list[0][0].name)
+            else:
+                # Log
+                logger.info('Drink %s cannot be process, skip', drinks_list[0][0].name)
+                # 不可以处理第0个饮品
+                drinks_list.pop(0)
+                drink_retries = 0 # 逻辑正常运作，重置drink_retries
+
+            drink_retries += 1
+            if drink_retries > DRINK_MAX_RETRIES: # 卡死
+                drink_retries = 0
+                drinks_list.pop(drink_selected_idx)
+                logger.warning('Drink processing stuck. Force to pop drink.')
+            continue
+
         # 更新卡片数量
         if card_count == -1 or detect_card_count_cd.expired():
             detect_card_count_cd.reset()
@@ -178,16 +239,23 @@ def do_cards(
                 tries += 1
         # 检测超时（防止一直卡在检测）
         if timeout_cd.expired():
-            logger.info("Recommend card detection timed out. Click first card.")
             if card_count == 0:
                 logger.warning("Recommend card detection timeout but no card found.")
                 timeout_cd.reset()
                 continue
             card_rects = calc_card_position(card_count)
-            card_rect = card_rects[0]
+            assert len(card_rects) == card_count, "len(card_rects) != card_count, internal code error!"
+
+            # 让timeout_card_id自增，避免“因为第一张卡无法打出，导致卡在第一张卡上”的情况
+            timeout_card_id = timeout_card_id % card_count + 1
+            logger.info(f"Recommend card detection timed out. Click {timeout_card_id}-th card.")
+
+            card_rect = card_rects[timeout_card_id - 1]
             device.double_click(Rect(xywh=card_rect[:4]))
             sleep(2)
             timeout_cd.reset()
+        # 日期变更检测
+        acquisition_date_change_dialog()
         # 结束条件
         if card_count == 0 and end_predicate():
             if not break_cd.started:

{kotonebot/kaa → kaa}/tasks/produce/common.py

@@ -10,15 +10,16 @@ from kotonebot import (
     Loop,
     Interval,
 )
-from kotonebot.kaa.config.schema import produce_solution
+from kaa.config.schema import produce_solution
+from kaa.tasks.start_game import wait_for_home
 from kotonebot.primitives import Rect
-from kotonebot.kaa.tasks import R
+from kaa.tasks import R
 from .p_drink import acquire_p_drink
 from kotonebot.util import measure_time
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.tasks.actions.loading import loading
-from kotonebot.kaa.game_ui import CommuEventButtonUI, dialog, badge
-from kotonebot.kaa.tasks.actions.commu import handle_unread_commu
+from kaa.config import conf
+from kaa.tasks.actions.loading import loading
+from kaa.game_ui import CommuEventButtonUI, dialog, badge
+from kaa.tasks.actions.commu import handle_unread_commu
 
 logger = getLogger(__name__)
 
@@ -150,6 +151,63 @@ def handle_skill_card_removal():
             break
     logger.debug("Handle skill card removal finished.")
 
+@action('继续当前培育.进入培育', screenshot_mode='manual-inherit')
+def resume_produce_pre() -> tuple[Literal['regular', 'pro', 'master'], int]:
+    """
+    继续当前培育.进入培育\n
+    该函数用于处理‘日期变更’等情况；单独执行此函数时，要确保代码已经处于培育状态。
+
+    前置条件：游戏首页，且当前有进行中培育\n
+    结束状态：培育中的任意一个页面
+    """
+    device.screenshot()
+    # 点击 プロデュース中
+    # [res/sprites/jp/daily/home_1.png]
+    logger.info('Click ongoing produce button.')
+    device.click(R.Produce.BoxProduceOngoing)
+    btn_resume = image.expect_wait(R.Produce.ButtonResume)
+    # 判断信息
+    mode_result = image.find_multi([
+        R.Produce.ResumeDialogRegular,
+        R.Produce.ResumeDialogPro,
+        R.Produce.ResumeDialogMaster
+    ])
+    if not mode_result:
+        raise ValueError('Failed to detect produce mode.')
+    if mode_result.index == 0:
+        mode = 'regular'
+    elif mode_result.index == 1:
+        mode = 'pro'
+    else:
+        mode = 'master'
+    logger.info(f'Produce mode: {mode}')
+    retry_count = 0
+    max_retries = 5
+    current_week = None
+    while retry_count < max_retries:
+        week_text = ocr.ocr(R.Produce.BoxResumeDialogWeeks, lang='en').squash().regex(r'\d+/\d+')
+        if week_text:
+            weeks = week_text[0].split('/')
+            logger.info(f'Current week: {weeks[0]}/{weeks[1]}')
+            if len(weeks) >= 2:
+                current_week = int(weeks[0])
+                break
+        retry_count += 1
+        logger.warning(f'Failed to detect weeks. week_text="{week_text}". Retrying... ({retry_count}/{max_retries})')
+        sleep(0.5)
+        device.screenshot()
+    
+    if retry_count >= max_retries:
+        raise ValueError('Failed to detect weeks after multiple retries.')
+    if current_week is None:
+        raise ValueError('Failed to detect current_week.')
+    # 点击 再開する
+    # [kotonebot-resource/sprites/jp/produce/produce_resume.png]
+    logger.info('Click resume button.')
+    device.click(btn_resume)
+
+    return mode, current_week
+
 AcquisitionType = Literal[
     "PDrinkAcquire", # P饮料被动领取
     "PDrinkSelect", # P饮料主动领取
@@ -167,7 +225,31 @@ AcquisitionType = Literal[
     "NetworkError", # 网络中断弹窗
     "SkipCommu", # 跳过交流
     "Loading", # 加载画面
+    "DateChange", # 日期变更
 ]
+
+def acquisition_date_change_dialog() -> AcquisitionType | None:
+    """
+    检测是否执行了日期变更。\n
+    如果出现了日期变更，则对日期变更直接进行处理（返回标题、进入游戏、重进培育）\n
+    注：不更新屏幕截图。
+    """
+
+    # 日期变更（可以考虑加入版本更新，但因为我目前没有版本更新的720x1080素材，所以没法加）
+    logger.debug("Check date change dialog...")
+    if image.find(R.Daily.TextDateChangeDialog):
+        logger.info("Date change dialog found.")
+        # 点击确认
+        device.click(image.expect(R.Daily.TextDateChangeDialogConfirmButton))
+        # 进入游戏
+        # 注：wait_for_home()里的Loop类第一次进入循环体时，会自动执行device.screenshot()
+        wait_for_home()
+        # 重进培育
+        resume_produce_pre()
+        return "DateChange"
+
+    return None
+
 @measure_time()
 @action('处理培育事件', screenshot_mode='manual')
 def fast_acquisitions() -> AcquisitionType | None:
@@ -264,6 +346,12 @@ def fast_acquisitions() -> AcquisitionType | None:
             return "PItemSelect"
     device.click(10, 10)
 
+    # 日期变更
+    result = acquisition_date_change_dialog()
+    if result is not None:
+        return result
+    device.click(10, 10)
+
     return None
 
 def until_acquisition_clear():