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

{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 (
@@ -215,16 +215,19 @@ def practice():
             R.InPurodyuusu.TextPerfectUntil
         ])
 
-    do_cards(threshold_predicate, end_predicate)
+    do_cards(False, threshold_predicate, end_predicate)
     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")
 
@@ -285,61 +288,78 @@ def exam(type: Literal['mid', 'final']):
             and image.find(R.Common.ButtonNext)
         )
 
-    do_cards(threshold_predicate, end_predicate)
+    do_cards(True, 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(10, 10)
+            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(10, 10) # 为了兼容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
@@ -242,12 +242,18 @@ def is_rest_available():
 def rest():
     """执行休息"""
     logger.info("Rest for this week.")
-    (SimpleDispatcher('in_produce.rest')
-        # 点击休息
-        .click(R.InPurodyuusu.Rest)
-        # 确定
-        .click(R.InPurodyuusu.RestConfirmBtn, finish=True)
-    ).run()
+
+    # 部分设备上，第二次click（确定）点击速度过快，导致卡死，所以这里需要添加一个sleep
+    device.click(image.expect(R.InPurodyuusu.Rest))
+    sleep(0.5)
+    device.click(image.expect(R.InPurodyuusu.RestConfirmBtn))
+    # 原方案
+    # (SimpleDispatcher('in_produce.rest')
+    #     # 点击休息
+    #     .click(R.InPurodyuusu.Rest)
+    #     # 确定
+    #     .click(R.InPurodyuusu.RestConfirmBtn, finish=True)
+    # ).run()
 
 @action('判断是否处于行动页面')
 def at_action_scene():

{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,20 +2,21 @@ import logging
 from typing import Optional, Literal
 from typing_extensions import assert_never
 
-from kotonebot.kaa.config.schema import produce_solution
+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__)
 
@@ -118,60 +119,23 @@ def select_set(index: int):
             logger.warning(f'Failed to navigate to set #{index}. Current set is #{final_current}. Retrying... ({retry_count}/{max_retries})')
     
     logger.error(f'Failed to navigate to set #{index} after {max_retries} retries.')
-    
-@action('继续当前培育', screenshot_mode='manual-inherit')
-def resume_produce():
+
+@action('继续当前培育.继续培育', screenshot_mode='manual-inherit')
+def resume_produce_lst(
+    mode: Literal['regular', 'pro', 'master'],
+    current_week: int
+):
     """
-    继续当前培育
+    继续当前培育.继续培育\n
+    该函数正常情况不应该被单独调用。
 
-    前置条件：游戏首页，且当前有进行中培育\n
+    前置条件：培育中的任意一个页面\n
     结束状态：游戏首页
+
+    :param mode: 培育模式
+    :param current_week: 培育的周数
     """
-    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)
+
     match mode:
         case 'regular':
             resume_regular_produce(current_week)
@@ -181,6 +145,19 @@ def resume_produce():
             resume_master_produce(current_week)
         case _:
             assert_never(mode)
+    
+@action('继续当前培育', screenshot_mode='manual-inherit')
+def resume_produce():
+    """
+    继续当前培育
+
+    前置条件：游戏首页，且当前有进行中培育\n
+    结束状态：游戏首页
+    """
+
+    mode, current_week = resume_produce_pre()
+
+    resume_produce_lst(mode, current_week)
 
 @action('执行培育', screenshot_mode='manual-inherit')
 def do_produce(
@@ -209,13 +186,20 @@ def do_produce(
     device.screenshot()
     # 点击培育按钮，然后判断是新开还是再开培育
     for _ in Loop(interval=0.6):
-        if image.find(R.Produce.TitleIconProudce):
+        if image.find(R.Produce.LogoHajime): # Hajime培育界面
             # 新开
             break
+        elif image.find(R.Produce.LogoNia): # NIA培育界面
+            device.click(R.Produce.PointNiaToHajime)
+            sleep(0.5)
+            continue
         elif image.find(R.Produce.ButtonResume):
             # 再开
             resume_produce()
             return True
+        # 首页的各种贴脸通知（比如 TRUE END 达成）
+        elif dialog.no():
+            continue
         else:
             device.click(R.Produce.BoxProduceOngoing)
             sleep(2)
@@ -250,7 +234,7 @@ def do_produce(
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_3.png]
             logger.info('AP insufficient. Try to use AP drink.')
             for _ in Loop():
-                if image.find(R.Produce.ButtonUse):
+                if image.find(R.Produce.ButtonUse, colored=True):
                     device.click()
                 elif image.find(R.Produce.ButtonRefillAP):
                     device.click()
@@ -429,8 +413,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,18 @@ 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 .actions.scenes import at_home, goto_home
+from .actions.commu import handle_unread_commu
+from kaa.errors import ElevationRequiredError, GameUpdateNeededError
+
 logger = logging.getLogger(__name__)
 
 def locate_game_path() -> str | None:
@@ -47,7 +48,7 @@ def locate_game_path() -> str | None:
         config.save()
     return game_path
 
-
+# TODO: 这个函数功能和 kaa\tasks\actions\scenes.py 中的 goto_home 重复了，后续需要合并
 @action('启动游戏.进入首页', screenshot_mode='manual-inherit')
 def wait_for_home():
     """
@@ -58,6 +59,7 @@ def wait_for_home():
     click_cd = Countdown(1).start()
     should_click = False
     for _ in Loop():
+        logger.info('尝试进入/返回主页中...')
         # 首页
         if image.find(R.Daily.ButtonHomeCurrent):
             break
@@ -83,9 +85,15 @@ def wait_for_home():
         # [screenshots/startup/birthday.png]
         elif handle_unread_commu():
             pass
+        # 如果已经进入游戏，但是在其他页面，也尝试跳转回主页面
+        # 左下角是否有 Home 图标
+        elif image.find(R.Common.ButtonToolbarHome):
+            device.click()
+        elif image.find(R.Common.ButtonHome):
+            device.click()
 
         if should_click and click_cd.expired():
-            device.click(0, 0)
+            device.click(10, 10)
             click_cd.reset()
 
 @action('启动游戏.Android', screenshot_mode='manual-inherit')
@@ -137,7 +145,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 +164,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.8.23.1.dist-info → ksaa-2025.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.8.23.1
+Version: 2025.9
 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.3.1
 Dynamic: license-file
 
 # Kotone's Auto Assistant 琴音小助手
@@ -110,12 +111,17 @@ kaa
 因此你最好每次都在同一个地方运行 kaa，否则可能会出现找不到配置文件的情况。
 
 ## 开发
-见 [DEVELOPMENT.md](./docs/DEVELOPMENT.md)
+环境配置见 [DEVELOPMENT.md](./docs/DEVELOPMENT.md)。
+
+开发指南见 [QUICK_START.md](./docs/GUIDE.md)。
 
 ## 贡献
-欢迎 PR。
+欢迎 PR。你可以从 Github Issue 中选择一个 Issue 解决，或者从下面的路线图里选一个任务讨论。
+
+如果你打算开发或修复的问题没有在 Github Issue、QQ 群或其他地方提出，请先在这些地方提出，让我知道。
 
-你可以从 Github Issue 中选择一个 Issue 解决，或者从下面的路线图里选一个任务讨论。
+main 分支为开发分支与测试版发布分支，release 分支为稳定版发布分支。所有 PR 都应提交到 main 分支。
+其他分支均为临时分支，请不要提交到这些分支。
 
 ## 路线图
 下面是待实现的功能：  
@@ -166,7 +172,7 @@ kaa
 * Linux 支持
 
 ### 开发工具与框架
-* 分离框架为一个单独的项目
+* ~~分离框架为一个单独的项目~~
 * 分离资源管理为一个单独的项目
   * 重构资源编辑器（ImageAnnotation 工具）
 * 重构 Devtool 工具