ksaa 2025.8.23.0__py3-none-any.whl → 2025.9b1__py3-none-any.whl

kotonebot/kaa/tasks/produce/common.py

@@ -11,6 +11,7 @@ from kotonebot import (
     Interval,
 )
 from kotonebot.kaa.config.schema import produce_solution
+from kotonebot.kaa.tasks.start_game import wait_for_home
 from kotonebot.primitives import Rect
 from kotonebot.kaa.tasks import R
 from .p_drink import acquire_p_drink
@@ -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():

kotonebot/kaa/tasks/produce/non_lesson_actions.py

@@ -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/tasks/produce/produce.py

@@ -3,6 +3,7 @@ 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 kotonebot.ui import user
 from kotonebot.kaa.tasks import R
 from kotonebot.kaa.config import conf
@@ -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,9 +186,13 @@ 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()
@@ -250,7 +231,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()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.8.23.0
+Version: 2025.9b1
 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
@@ -110,7 +110,9 @@ kaa
 因此你最好每次都在同一个地方运行 kaa，否则可能会出现找不到配置文件的情况。
 
 ## 开发
-见 [DEVELOPMENT.md](./docs/DEVELOPMENT.md)
+环境配置见 [DEVELOPMENT.md](./docs/DEVELOPMENT.md)。
+
+开发指南见 [QUICK_START.md](./docs/GUIDE.md)。
 
 ## 贡献
 欢迎 PR。