ksaa 2025.9b1__py3-none-any.whl → 2025.9b2__py3-none-any.whl

{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

{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,11 +6,11 @@ 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.tasks.produce.common import acquisition_date_change_dialog
-from kotonebot.kaa.util.trace import trace
+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
@@ -123,12 +123,14 @@ def do_cards(
     :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；如果全不无法选中，那么预测系统应该会选择空过本回合，不用考虑
 
     for _ in Loop(interval=1/30):
         device.click(0, 0)
@@ -179,13 +181,18 @@ 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()

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

@@ -10,16 +10,16 @@ from kotonebot import (
     Loop,
     Interval,
 )
-from kotonebot.kaa.config.schema import produce_solution
-from kotonebot.kaa.tasks.start_game import wait_for_home
+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__)
 

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

@@ -2,18 +2,18 @@ import logging
 from typing_extensions import assert_never
 from typing import Literal
 
-from kotonebot.kaa.config.schema import produce_solution
-from kotonebot.kaa.game_ui.schedule import Schedule
-from kotonebot.kaa.tasks import R
+from kaa.config.schema import produce_solution
+from kaa.game_ui.schedule import Schedule
+from kaa.tasks import R
 from ..actions import loading
-from kotonebot.kaa.game_ui import WhiteFilter, dialog
+from kaa.game_ui import WhiteFilter, dialog
 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, cropped
 from kotonebot.backend.loop import Loop
-from kotonebot.kaa.config import ProduceAction, RecommendCardDetectionMode
+from kaa.config import ProduceAction, RecommendCardDetectionMode
 from ..produce.common import until_acquisition_clear, commu_event, fast_acquisitions
 from kotonebot import ocr, device, contains, image, regex, action, sleep, wait
 from ..produce.non_lesson_actions import (
@@ -219,12 +219,15 @@ def practice():
     logger.info("CLEAR/PERFECT not found. Practice finished.")
 
 @action('执行考试')
-def exam(type: Literal['mid', 'final']):
+def exam(type: Literal['mid', 'final']) -> bool:
     """
     执行考试
     
     前置条件：考试进行中场景（手牌可见）\n
     结束状态：考试结束交流/对话（TODO：截图）
+
+    :return: 如果考试合格则返回True，否则返回False
+    :rtype: bool
     """
     logger.info("Exam started")
 
@@ -287,59 +290,76 @@ def exam(type: Literal['mid', 'final']):
 
     do_cards(threshold_predicate, end_predicate)
     device.click(image.expect_wait(R.Common.ButtonNext))
+
+    is_exam_passed = True
+
+    # 如果考试失败
+    sleep(1) # 避免在动画未播放完毕时点击
+    if image.wait_for(R.InPurodyuusu.TextRechallengeEndProduce, timeout=3):
+        logger.info('Exam failed, end produce.')
+        device.click()
+        is_exam_passed = False
+
     if type == 'final':
         for _ in Loop():
             if ocr.wait_for(contains("メモリー"), timeout=7):
                 device.click_center()
             else:
                 break
+    
+    return is_exam_passed
 
 # TODO: 将这个函数改为手动截图模式
 @action('考试结束流程')
-def produce_end():
-    """执行考试结束流程"""
+def produce_end(has_live: bool = True):
+    """
+    执行考试结束流程
+    
+    :param has_live: 培育结束后是否存在live；当培育在期中考时失败的话，就没有live
+    """
     # 1. 考试结束交流 [screenshots/produce/in_produce/final_exam_end_commu.png]
     # 2. 然后是，考试结束对话 [screenshots\produce_end\step2.jpg]
     # 3. MV
     # 4. 培育结束交流
     # 上面这些全部一直点就可以
 
-
     # 等待选择封面画面 [screenshots/produce_end/select_cover.jpg]
     # 次へ
     logger.info("Waiting for select cover screen...")
-    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)
-    logger.debug("Click next")
-    device.click(image.expect_wait(R.InPurodyuusu.ButtonNextNoIcon))
-    sleep(1)
-    # 确认对话框 [screenshots/produce_end/select_cover_confirm.jpg]
-    # 決定
-    logger.debug("Click Confirm")
-    device.click(image.expect_wait(R.Common.ButtonConfirm, threshold=0.8))
-    sleep(1)
-    # 上传图片，等待“生成”按钮
-    # 注意网络可能会很慢，可能出现上传失败对话框
-    logger.info("Waiting for cover uploading...")
+    if has_live: # 只有在合格时，才会进行演出
+        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)
+        logger.debug("Click next")
+        device.click(image.expect_wait(R.InPurodyuusu.ButtonNextNoIcon))
+        sleep(1)
+        # 确认对话框 [screenshots/produce_end/select_cover_confirm.jpg]
+        # 決定
+        logger.debug("Click Confirm")
+        device.click(image.expect_wait(R.Common.ButtonConfirm, threshold=0.8))
+        sleep(1)
+        # 上传图片，等待“生成”按钮
+        # 注意网络可能会很慢，可能出现上传失败对话框
+        logger.info("Waiting for cover uploading...")
+    
     retry_count = 0
     MAX_RETRY_COUNT = 5
     while True:
@@ -365,6 +385,7 @@ def produce_end():
             break
         else:
             device.click_center()
+            device.click(0, 0) # 为了兼容has_live==False的情况
         sleep(2)
     # 后续动画
     logger.info("Waiting for memory generation animation completed...")
@@ -577,26 +598,30 @@ def week_final_lesson():
         case _:
             assert_never(action)
 
-def week_mid_exam():
-    logger.info("Week mid exam started.")
+def week_mid_and_final_exam_common():
     logger.info("Wait for exam scene...")
     until_exam_scene()
     logger.info("Exam scene detected.")
     sleep(5)
     device.click_center()
-    sleep(5)
-    exam('mid')
-    until_action_scene()
+    sleep(0.5)
+    loading.wait_loading_end()
+
+def week_mid_exam():
+    logger.info("Week mid exam started.")
+
+    week_mid_and_final_exam_common()
+    
+    if exam('mid'):
+        until_action_scene() # 考试通过
+    else:
+        produce_end(has_live=False) # 考试不合格
 
 def week_final_exam():
     logger.info("Week final exam started.")
-    logger.info("Wait for exam scene...")
-    until_exam_scene()
-    logger.info("Exam scene detected.")
-    sleep(5)
-    device.click_center()
-    sleep(0.5)
-    loading.wait_loading_end()
+
+    week_mid_and_final_exam_common()
+
     exam('final')
     produce_end()
 
@@ -792,30 +817,28 @@ def hajime_from_stage(stage: ProduceStage, type: Literal['regular', 'pro', 'mast
     elif stage == 'exam-ongoing':
         # TODO: 应该直接调用 week_final_exam 而不是再写一次
         logger.info("Exam ongoing. Start exam.")
+        
+        mid_exam_week = 6
         match type:
             case 'regular':
-                if week > 6: # 第六周为期中考试
-                    exam('final')
-                    return produce_end()
-                else:
-                    exam('mid')
-                    return hajime_from_stage(detect_produce_scene(), type, week)
+                mid_exam_week = 6 # 第六周为期中考试
             case 'pro':
-                if week > 7:
-                    exam('final')
-                    return produce_end()
-                else:
-                    exam('mid')
-                    return hajime_from_stage(detect_produce_scene(), type, week)
+                mid_exam_week = 7
             case 'master':
-                if week > 8:
-                    exam('final')
-                    return produce_end()
-                else:
-                    exam('mid')
-                    return hajime_from_stage(detect_produce_scene(), type, week)
+                mid_exam_week = 8
             case _:
                 assert_never(type)
+
+        # 在考试进行一半时，继续培育
+        if week > mid_exam_week: # 判断在期中考，还是期末考
+            exam('final')
+            return produce_end()
+        else:
+            if exam('mid'): # 如果考试合格，则继续进行培育
+                return hajime_from_stage(detect_produce_scene(), type, week)
+            else: # 如果考试不合格，则直接结束培育，并且没有live
+                return produce_end(has_live=False)
+
     elif stage == 'practice-ongoing':
         # TODO: 应该直接调用 week_final_exam 而不是再写一次
         logger.info("Practice ongoing. Start practice.")

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

@@ -5,13 +5,13 @@
 """
 from logging import getLogger
 
-from kotonebot.kaa.config.schema import produce_solution
-from kotonebot.kaa.game_ui import dialog
+from kaa.config.schema import produce_solution
+from kaa.game_ui import dialog
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
+from kaa.tasks import R
+from kaa.config import conf
 from ..produce.common import fast_acquisitions
-from kotonebot.kaa.game_ui.commu_event_buttons import CommuEventButtonUI
+from kaa.game_ui.commu_event_buttons import CommuEventButtonUI
 from kotonebot.util import Countdown
 from kotonebot.backend.loop import Loop
 from kotonebot.errors import UnrecoverableError

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

@@ -1,6 +1,6 @@
 from logging import getLogger
 
-from kotonebot.kaa.tasks import R
+from kaa.tasks import R
 from kotonebot.primitives import Rect
 from kotonebot import device, image, action, sleep
 

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

@@ -2,21 +2,21 @@ import logging
 from typing import Optional, Literal
 from typing_extensions import assert_never
 
-from kotonebot.kaa.config.schema import produce_solution
-from kotonebot.kaa.tasks.produce.common import resume_produce_pre
+from kaa.config.schema import produce_solution
+from kaa.tasks.produce.common import resume_produce_pre
 from kotonebot.ui import user
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import conf
-from kotonebot.kaa.game_ui import dialog
+from kaa.tasks import R
+from kaa.config import conf
+from kaa.game_ui import dialog
 from ..actions.scenes import at_home, goto_home
 from kotonebot.backend.loop import Loop, StatedLoop
 from kotonebot.util import Countdown, Throttler
-from kotonebot.kaa.game_ui.primary_button import find_button
-from kotonebot.kaa.game_ui.idols_overview import locate_idol, match_idol
+from kaa.game_ui.primary_button import find_button
+from 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
-from kotonebot.kaa.errors import IdolCardNotFoundError
+from kaa.errors import IdolCardNotFoundError
 
 logger = logging.getLogger(__name__)
 
@@ -410,8 +410,8 @@ if __name__ == '__main__':
     logging.getLogger('kotonebot').setLevel(logging.DEBUG)
     logger.setLevel(logging.DEBUG)
     from kotonebot.backend.context import init_context
-    from kotonebot.kaa.common import BaseConfig
-    from kotonebot.kaa.main import Kaa
+    from kaa.common import BaseConfig
+    from kaa.main import Kaa
 
     conf().produce.enabled = True
     conf().produce.produce_count = 1

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

@@ -4,17 +4,19 @@ import os
 import ctypes
 import logging
 
-from kotonebot.kaa.tasks import R
-from kotonebot.kaa.config import Priority, conf
-from .actions.loading import loading
 from kotonebot.util import Countdown
 from kotonebot.backend.loop import Loop
-from .actions.scenes import at_home, goto_home
-from .actions.commu import handle_unread_commu
 from kotonebot.errors import GameUpdateNeededError
 from kotonebot import task, action, sleep, device, image, ocr, config
 from kotonebot.backend.context.context import vars
 
+from kaa.tasks import R
+from .actions.loading import loading
+from kaa.config import Priority, conf
+from kaa.errors import ElevationRequiredError
+from .actions.scenes import at_home, goto_home
+from .actions.commu import handle_unread_commu
+
 logger = logging.getLogger(__name__)
 
 def locate_game_path() -> str | None:
@@ -137,7 +139,7 @@ def windows_launch():
     except AttributeError:
         is_admin = ctypes.windll.shell32.IsUserAnAdmin() != 0
     if not is_admin:
-        raise PermissionError("Please run as administrator.")
+        raise ElevationRequiredError()
     
     # 处理汉化插件
     if conf().start_game.disable_gakumas_localify:
@@ -156,7 +158,7 @@ def windows_launch():
             logger.info('Gakumas Localify disabled.')
     
     from ahk import AHK
-    from kotonebot.kaa.util.paths import get_ahk_path
+    from kaa.util.paths import get_ahk_path
     ahk_path = get_ahk_path()
     ahk = AHK(executable_path=ahk_path)
 

{kotonebot/kaa → kaa}/util/paths.py

@@ -2,7 +2,7 @@ import os
 from typing import cast
 from importlib import resources
 
-from kotonebot.kaa import resources as res
+from kaa import resources as res
 
 CACHE = os.path.join('cache')
 RESOURCE = cast(list[str], res.__path__)[0]

{ksaa-2025.9b1.dist-info → ksaa-2025.9b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.9b1
+Version: 2025.9b2
 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
@@ -28,6 +28,7 @@ Requires-Dist: pywin32==310
 Requires-Dist: ahk==1.8.3
 Requires-Dist: win11toast==0.35
 Requires-Dist: keyboard==0.13.5
+Requires-Dist: kotonebot[android,windows]==0.2.0
 Dynamic: license-file
 
 # Kotone's Auto Assistant 琴音小助手