ksaa 2025.5.16.0__py3-none-any.whl → 2025.5.23.0__py3-none-any.whl

kotonebot/kaa/tasks/daily/contest.py

@@ -7,11 +7,11 @@ from kotonebot.kaa.common import conf
 from kotonebot.kaa.game_ui import WhiteFilter
 from ..actions.scenes import at_home, goto_home
 from ..actions.loading import wait_loading_end
-from kotonebot import device, image, ocr, color, action, task, user, rect_expand, sleep, contains
+from kotonebot import device, image, ocr, color, action, task, user, rect_expand, sleep, contains, Interval
 
 logger = logging.getLogger(__name__)
 
-@action('前往竞赛页面')
+@action('前往竞赛页面', screenshot_mode='manual-inherit')
 def goto_contest() -> bool:
     """
     前置条件：位于首页 \n
@@ -19,103 +19,134 @@ def goto_contest() -> bool:
 
     :return: 是否存在未完成的挑战
     """
-    # TODO: 优化这一部分，加入区域检测，提高速度
-    device.click(image.expect(R.Common.ButtonContest))
-    ocr.expect_wait(contains('CONTEST'))
-    btn_contest = ocr.expect_wait(contains('コンテスト'))
-    has_ongoing_contest = image.find(R.Daily.TextContestLastOngoing) is not None
-    device.click(btn_contest)
-    if not has_ongoing_contest:
-        while not image.find(R.Daily.ButtonContestRanking):
+    it = Interval()
+    has_ongoing_contest = None
+    while True:
+        device.screenshot()
+        it.wait()
+        
+        if image.find(R.Common.ButtonContest):
+            device.click()
+        elif image.find(R.Daily.TextRoadToIdol):
+            # 已进入竞赛 Tab
+            if image.find(R.Daily.TextContestLastOngoing):
+                logger.info('Ongoing contest found.')
+                has_ongoing_contest = True
+            else:
+                has_ongoing_contest = False
+            # 点击进入竞赛页面
+            logger.debug('Clicked on Contest.')
+            device.click(R.Daily.PointContest)
+            continue
+
+        # 有未完成的挑战
+        if has_ongoing_contest is True:
+            if image.find(R.Daily.ButtonContestChallengeStart):
+                logger.info('Challenging.')
+                break
+        # 新开挑战
+        elif has_ongoing_contest is False:
+            if image.find(R.Daily.ButtonContestRanking):
+                logger.info('Now at pick contestant screen.')
+                break
+            # 跳过奖励领取
             # [kotonebot-resource\sprites\jp\daily\screenshot_contest_season_reward.png]
             # [screenshots/contest/acquire2.png]
             device.click(R.Daily.PointDissmissContestReward)
-            sleep(1)
-        # [screenshots/contest/main.png]
-    else:
-        image.expect_wait(R.Daily.ButtonContestChallengeStart)
     return has_ongoing_contest
 
-@action('选择并挑战')
-def pick_and_contest(has_ongoing_contest: bool = False) -> bool:
+@action('处理竞赛挑战', screenshot_mode='manual-inherit')
+def handle_challenge() -> bool:
     """
-    选择并挑战
 
-    前置条件：位于竞赛界面 \n
-    结束状态：位于竞赛界面
-
-    :param has_ongoing_contest: 是否有中断未完成的挑战
-    :return: 如果返回假，说明今天挑战次数已经用完了
+    前置条件：- \n
+    结束状态：位于竞赛选择对手界面
+    :return: 是否命中任何处理
     """
-    # 判断是否有中断未完成的挑战
-    # [screenshots/contest/ongoing.png]
-    if not has_ongoing_contest:
-        image.expect_wait(R.Daily.ButtonContestRanking)
-        sleep(3) # 等待动画
-        # 随机选一个对手 [screenshots/contest/main.png]
-        logger.debug('Clicking on contestant.')
-        contestant_list = image.find_all(R.Daily.TextContestOverallStats)
-        if contestant_list is None or len(contestant_list) == 0:
-            logger.info('No contestant found. Today\'s challenge points used up.')
-            return False
-        # 按照y坐标从上到下排序对手列表
-        contestant_list.sort(key=lambda x: x.position[1])
-        if len(contestant_list) != 3:
-            logger.warning('Cannot find all 3 contestants.')
-        # 选择配置文件中对应的对手顺序（1最强，3最弱）
-        target = conf().contest.select_which_contestant
-        if target >= 1 and target <= 3 and target <= len(contestant_list):
-            target -= 1 # [1, 3]映射至[0, 2]
-        else:
-            target = 0 # 出错则默认选择第一个
-        contestant = contestant_list[target]
-        logger.info('Picking up contestant #%d.', target + 1)
-        device.click(contestant)
-        # 挑战开始 [screenshots/contest/start1.png]
+    # 挑战开始 [screenshots/contest/start1.png]
+    if image.find(R.Daily.ButtonContestStart, threshold=0.75): # TODO: 为什么默认阈值找不到？
         logger.debug('Clicking on start button.')
-        device.click(image.expect_wait(R.Daily.ButtonContestStart))
-    sleep(3) # 多延迟一点
-    # 进入挑战页面 [screenshots/contest/contest1.png]
-    # [screenshots/contest/contest2.png]
-    while not image.find(R.Daily.ButtonContestChallengeStart):
-        # 记忆未编成 [screenshots/contest/no_memo.png]
-        if image.find(R.Daily.TextContestNoMemory):
-            logger.debug('Memory not set. Using auto-compilation.')
-            user.warning('竞赛未编成', _('记忆未编成。将使用自动编成。'), once=True)
-            device.click(image.expect(R.Daily.ButtonContestChallenge))
-        logger.debug('Waiting for challenge start screen.')
+        device.click()
+
+    # 记忆未编成 [screenshots/contest/no_memo.png]
+    if image.find(R.Daily.TextContestNoMemory):
+        logger.debug('Memory not set. Using auto-compilation.')
+        user.warning('竞赛未编成', _('记忆未编成。将使用自动编成。'), once=True)
+        if image.find(R.Daily.ButtonContestChallenge):
+            device.click()
+            return True
+
     # 勾选跳过所有
-    if image.find(R.Common.CheckboxUnchecked):
+    # [screenshots/contest/contest2.png]
+    if image.find(R.Common.CheckboxUnchecked, colored=True):
         logger.debug('Checking skip all.')
         device.click()
-        sleep(0.5)
-    # 点击 SKIP
-    logger.debug('Clicking on SKIP.')
-    device.click(image.expect_wait(R.Daily.ButtonIconSkip, timeout=10, preprocessors=[WhiteFilter()]))
-    while not image.wait_for(R.Common.ButtonNextNoIcon, timeout=2):
-        device.click_center()
-        logger.debug('Waiting for the result.')
-    # [screenshots/contest/after_contest1.png]
-    # 点击 次へ [screenshots/contest/after_contest2.png]
-    logger.debug('Challenge finished. Clicking on next.')
-    device.click()
-    # 点击 終了 [screenshots/contest/after_contest3.png]
-    logger.debug('Clicking on end.')
-    device.click(image.expect_wait(R.Common.ButtonEnd))
+        return True
+
+    # 跳过所有
+    # [screenshots/contest/contest1.png]
+    if image.find(R.Daily.ButtonIconSkip, preprocessors=[WhiteFilter()]):
+        logger.debug('Skipping all.')
+        device.click()
+        return True
+
+    if image.find(R.Common.ButtonNextNoIcon):
+        logger.debug('Clicking on next.')
+        device.click()
+
+    # 終了 [screenshots/contest/after_contest3.png]
+    if image.find(R.Common.ButtonEnd):
+        logger.debug('Clicking on end.')
+        device.click()
+        return True
+
     # 可能出现的奖励弹窗 [screenshots/contest/after_contest4.png]
-    sleep(1)
     if image.find(R.Common.ButtonClose):
         logger.debug('Clicking on close.')
         device.click()
-    # 等待返回竞赛界面
-    wait_loading_end()
-    image.expect_wait(R.Daily.ButtonContestRanking)
-    logger.info('Challenge finished.')
-    return True
+
+    return False
+
+@action('选择对手')
+def handle_pick_contestant(has_ongoing_contest: bool = False) -> tuple[bool, bool]:
+    """
+    选择并挑战
+
+    前置条件：位于竞赛界面 \n
+    结束状态：位于竞赛界面
+
+    :param has_ongoing_contest: 是否有中断未完成的挑战
+    :return: 二元组。第一个值表示是否命中任何处理。
+        第二个值表示是否应该继续挑战，为 False 表示今天挑战次数已经用完了。
+    """
+    if image.find(R.Daily.ButtonContestRanking):
+        # 无进行中挑战，说明要选择对手
+        if not has_ongoing_contest:
+            # 随机选一个对手 [screenshots/contest/main.png]
+            logger.debug('Clicking on contestant.')
+            contestant_list = image.find_all(R.Daily.TextContestOverallStats)
+            if contestant_list is None or len(contestant_list) == 0:
+                logger.info('No contestant found. Today\'s challenge points used up.')
+                return True, False
+            # 按照y坐标从上到下排序对手列表
+            contestant_list.sort(key=lambda x: x.position[1])
+            if len(contestant_list) != 3:
+                logger.warning('Cannot find all 3 contestants.')
+            # 选择配置文件中对应的对手顺序（1最强，3最弱）
+            target = conf().contest.select_which_contestant
+            if target >= 1 and target <= 3 and target <= len(contestant_list):
+                target -= 1  # [1, 3]映射至[0, 2]
+            else:
+                target = 0  # 出错则默认选择第一个
+            contestant = contestant_list[target]
+            logger.info('Picking up contestant #%d.', target + 1)
+            device.click(contestant)
+            sleep(2)
+            return True, True
+    return False, True
 
 @task('竞赛')
 def contest():
-    """"""
     if not conf().contest.enabled:
         logger.info('Contest is disabled.')
         return
@@ -129,17 +160,20 @@ def contest():
         logger.info('No action needed.')
         return
     has_ongoing_contest = goto_contest()
-    while pick_and_contest(has_ongoing_contest):
-        sleep(1.3)
+    while True:
+        device.screenshot()
+        handled, should_continue = handle_pick_contestant(has_ongoing_contest)
+        if not should_continue:
+            break
+        if not handled: 
+            handled = handle_challenge()
+        if not handled:
+            device.click(10, 10)
         has_ongoing_contest = False
     goto_home()
     logger.info('Contest all finished.')
-    
 
 if __name__ == '__main__':
-    import logging
-    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)
-    
-    contest()
+    from kotonebot.kaa.main import Kaa
+    from kotonebot.backend.context import tasks_from_id
+    Kaa('config.json').run(tasks_from_id(['contest']))

kotonebot/kaa/tasks/daily/mission_reward.py

@@ -2,6 +2,8 @@
 import logging
 
 from kotonebot.kaa.tasks import R
+
+from kotonebot.primitives import Rect
 from kotonebot.kaa.common import conf, Priority
 from ..actions.loading import wait_loading_end
 from ..actions.scenes import at_home, goto_home
@@ -70,8 +72,8 @@ def claim_pass_reward():
     # [screenshots/mission/daily.png]
     pass_rect = image.expect_wait(R.Daily.ButtonIconPass, timeout=1).rect
     # 向右扩展 150px，向上扩展 35px
-    color_rect = (pass_rect[0], pass_rect[1] - 35, pass_rect[2] + 150, pass_rect[3] + 35)
-    if not color.find('#ff1249', rect=color_rect):
+    color_rect = (pass_rect.x1, pass_rect.y1 - 35, pass_rect.w + 150, pass_rect.h + 35)
+    if not color.find('#ff1249', rect=Rect(xywh=color_rect)):
         logger.info('No pass reward to claim.')
         return
     logger.info('Claiming pass reward.')
@@ -130,8 +132,6 @@ 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)
-    from .common import conf
-    conf().mission_reward.enabled = True
     
     # if image.find(R.Common.CheckboxUnchecked):
     #     logger.debug('Checking skip all.')

kotonebot/kaa/tasks/end_game.py

@@ -6,6 +6,7 @@ import _thread
 import threading
 
 from kotonebot.ui import user
+from ..kaa_context import instance
 from kotonebot.kaa.common import Priority, conf
 from kotonebot import task, action, config, device
 
@@ -56,15 +57,7 @@ def end_game():
 
     # 关闭模拟器
     if conf().end_game.kill_emulator:
-        emulator_path = config.current.backend.emulator_path
-        if emulator_path is None:
-            logger.warning("Emulator path is not set. Skipping")
-            user.info("「关闭模拟器」功能需要配置「模拟器 exe 文件路径」。")
-        else:
-            exe_name = os.path.basename(emulator_path)
-            os.system(f"taskkill /f /im {exe_name}")
-            logger.info("Emulator closed")
-        # TODO: 实现关闭模拟器
+        instance().stop()
 
     # 关机
     if conf().end_game.shutdown:

kotonebot/kaa/tasks/produce/cards.py

@@ -10,7 +10,8 @@ from kotonebot.kaa.tasks import R
 from kotonebot.kaa.common import conf
 from kotonebot.kaa.game_ui import dialog
 from kotonebot.kaa.util.trace import trace
-from kotonebot import action, Interval, Countdown, device, image, sleep, ocr, contains, use_screenshot, color, Rect
+from kotonebot.primitives import RectTuple, Rect
+from kotonebot import action, Interval, Countdown, device, image, sleep, ocr, contains, use_screenshot, color
 
 class SkillCard(NamedTuple):
     available: bool
@@ -159,7 +160,7 @@ def do_cards(
             if no_remaining_card and no_card_cd.expired():
                 logger.debug('No remaining card detected. Skip this turn.')
                 # TODO: HARD CODEDED
-                SKIP_POSITION = (621, 739, 85, 85)
+                SKIP_POSITION = Rect(621, 739, 85, 85)
                 device.click(SKIP_POSITION)
                 no_card_cd.reset()
                 continue
@@ -185,7 +186,7 @@ def do_cards(
                 continue
             card_rects = calc_card_position(card_count)
             card_rect = card_rects[0]
-            device.double_click(card_rect[:4])
+            device.double_click(Rect(xywh=card_rect[:4]))
             sleep(2)
             timeout_cd.reset()
         # 结束条件
@@ -277,7 +278,7 @@ def handle_recommended_card(
 def skill_card_count(img: MatLike | None = None):
     """获取当前持有的技能卡数量"""
     img = use_screenshot(img)
-    x, y, w, h = R.InPurodyuusu.BoxCardLetter
+    x, y, w, h = R.InPurodyuusu.BoxCardLetter.xywh
     img = img[y:y+h, x:x+w]
     count = image.raw().count(img, R.InPurodyuusu.A)
     count += image.raw().count(img, R.InPurodyuusu.M)
@@ -346,7 +347,7 @@ def detect_recommended_card(
             right_score,
             top_score,
             bottom_score,
-            (x, y, w, h)
+            Rect(x, y, w, h)
         ))
         img = original_image.copy()
     #     cv2.imshow(f"card detect {return_value}", cv2.cvtColor(glow_area, cv2.COLOR_HSV2BGR))
@@ -376,7 +377,7 @@ def detect_recommended_card(
     )
     # 跟踪检测结果
     if conf().trace.recommend_card_detection:
-        x, y, w, h = filtered_results[0].rect
+        x, y, w, h = filtered_results[0].rect.xywh
         cv2.rectangle(original_image, (x, y), (x+w, y+h), (0, 0, 255), 3)
         trace('rec-card', original_image, {
             'card_count': card_count,

kotonebot/kaa/tasks/produce/common.py

@@ -1,7 +1,6 @@
 from typing import Literal
 from logging import getLogger
 
-from kotonebot.kaa.tasks import R
 from kotonebot import (
     ocr,
     device,
@@ -10,6 +9,8 @@ from kotonebot import (
     sleep,
     Interval,
 )
+from kotonebot.primitives import Rect
+from kotonebot.kaa.tasks import R
 from .p_drink import acquire_p_drink
 from kotonebot.util import measure_time
 from kotonebot.kaa.common import conf
@@ -89,16 +90,17 @@ def select_p_item():
     # 前置条件 [screenshots/produce/in_produce/claim_p_item.png]
 
     POSTIONS = [
-        (157, 820, 128, 128), # x, y, w, h
-        (296, 820, 128, 128),
-        (435, 820, 128, 128),
+        Rect(157, 820, 128, 128), # x, y, w, h
+        Rect(296, 820, 128, 128),
+        Rect(435, 820, 128, 128),
     ] # TODO: HARD CODED
     device.click(POSTIONS[0])
     sleep(0.5)
     device.click(ocr.expect_wait('受け取る'))
 
+
 @action('技能卡自选强化', screenshot_mode='manual-inherit')
-def hanlde_skill_card_enhance():
+def handle_skill_card_enhance():
     """
     前置条件：技能卡强化对话框\n
     结束状态：技能卡强化动画结束后瞬间
@@ -107,24 +109,26 @@ def hanlde_skill_card_enhance():
     """
     # 前置条件 [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_skill_card_enhane.png]
     # 结束状态 [screenshots/produce/in_produce/skill_card_enhance.png]
-    cards = image.find_multi([
+    cards = image.find_all_multi([
         R.InPurodyuusu.A,
         R.InPurodyuusu.M
     ])
     if cards is None:
         logger.info("No skill cards found")
         return False
-    logger.debug("Clicking first skill card.")
-    device.click(cards)
-    it = Interval()
-    while True:
+    cards = sorted(cards, key=lambda x: (x.position[1], x.position[0]))
+    it = Interval(0.5)
+    for card in reversed(cards):
+        device.click(card)
+        it.wait()
         device.screenshot()
         if image.find(R.InPurodyuusu.ButtonEnhance, colored=True):
             logger.debug("Enhance button found")
             device.click()
+            it.wait()
             break
-        it.wait()
     logger.debug("Handle skill card enhance finished.")
+    return True
 
 @action('技能卡自选删除', screenshot_mode='manual-inherit')
 def handle_skill_card_removal():
@@ -220,7 +224,7 @@ def fast_acquisitions() -> AcquisitionType | None:
 
     # 技能卡自选强化
     if image.find(R.InPurodyuusu.IconTitleSkillCardEnhance):
-        if hanlde_skill_card_enhance():
+        if handle_skill_card_enhance():
             return "PSkillCardEnhanceSelect"
     device.click(10, 10)
 

kotonebot/kaa/tasks/produce/in_purodyuusu.py

@@ -2,6 +2,7 @@ import logging
 from typing_extensions import assert_never
 from typing import Literal
 
+from kotonebot.kaa.game_ui.schedule import Schedule
 from kotonebot.kaa.tasks import R
 from ..actions import loading
 from kotonebot.kaa.game_ui import WhiteFilter, dialog
@@ -33,11 +34,10 @@ def handle_sp_lesson():
     前置条件：行动页面\n
     结束状态：练习场景，以及中间可能出现的加载、支援卡奖励、交流等
     """
-    if (sp := image.find(R.InPurodyuusu.IconSp)) is not None:
-        # 取 SP 图标中心点向左、向下偏移 30px
-        rect = sp.rect
-        pt = (rect[0] + rect[2] // 2, rect[1] + rect[3] // 2)
-        device.double_click(pt[0] + 30, pt[1] + 30)
+    schedule = Schedule()
+    if schedule.have_lesson():
+        lesson = schedule.select_lesson()
+        device.double_click(lesson.rect)
         return True
     else:
         return False

kotonebot/kaa/tasks/produce/p_drink.py

@@ -1,15 +1,16 @@
 from logging import getLogger
 
 from kotonebot.kaa.tasks import R
+from kotonebot.primitives import Rect
 from kotonebot import device, image, action, sleep
 
 logger = getLogger(__name__)
 
 # 三个饮料的坐标
 POSTIONS = [
-    (157, 820, 128, 128),  # x, y, w, h
-    (296, 820, 128, 128),
-    (435, 820, 128, 128),
+    Rect(157, 820, 128, 128),  # x, y, w, h
+    Rect(296, 820, 128, 128),
+    Rect(435, 820, 128, 128),
 ]  # TODO: HARD CODED
 
 @action('领取 P 饮料')

kotonebot/kaa/tasks/produce/produce.py

@@ -15,7 +15,7 @@ from ..actions.scenes import at_home, goto_home
 from kotonebot.kaa.game_ui.idols_overview import locate_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
+from kotonebot import device, image, ocr, task, action, sleep, contains, regex
 
 logger = logging.getLogger(__name__)
 
@@ -159,7 +159,7 @@ def resume_produce():
                 current_week = int(weeks[0])
                 break
         retry_count += 1
-        logger.warning(f'Failed to detect weeks. Retrying... ({retry_count}/{max_retries})')
+        logger.warning(f'Failed to detect weeks. week_text="{week_text}". Retrying... ({retry_count}/{max_retries})')
         sleep(0.5)
         device.screenshot()
     
@@ -209,10 +209,12 @@ def do_produce(
 
     # 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(contains(mode_text))
+        .click(regex(mode_text))
         .until(R.Produce.ButtonPIdolOverview, result=True)
         .until(R.Produce.TextAPInsufficient, result=False)
     ).run()

kotonebot/kaa/tasks/start_game.py

@@ -112,7 +112,7 @@ def windows_launch():
     ahk_path = str(resources.files('kaa.res.bin') / 'AutoHotkey.exe')
     ahk = AHK(executable_path=ahk_path)
 
-    if ahk.find_window(title='gakumas'):
+    if ahk.find_window(title='gakumas', title_match_mode=3): # 3=精确匹配
         logger.debug('Game already started.')
         return
     
@@ -121,7 +121,7 @@ def windows_launch():
     # 等待游戏窗口出现
     it = Interval()
     while True:
-        if ahk.find_window(title='gakumas'):
+        if ahk.find_window(title='gakumas', title_match_mode=3):
             logger.debug('Game window found.')
             break
         logger.debug('Waiting for game window...')

kotonebot/primitives/__init__.py

@@ -0,0 +1,17 @@
+from .visual import Image, Template
+from .geometry import Point, Rect, Size, Vector2D, Vector3D, is_point, is_rect
+from .geometry import  RectTuple, PointTuple
+
+__all__ = [
+    'Image',
+    'Template',
+    'Point',
+    'Rect',
+    'Size',
+    'Vector2D',
+    'Vector3D',
+    'is_point',
+    'is_rect',
+    'RectTuple',
+    'PointTuple'
+]