ksaa 2025.7.7.0__py3-none-any.whl → 2025.7.9.0__py3-none-any.whl

kotonebot/kaa/tasks/daily/acquire_presents.py

@@ -2,7 +2,7 @@
 import logging
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from ..actions.scenes import at_home, goto_home
 from kotonebot import device, image, task, color, rect_expand, sleep
 

kotonebot/kaa/tasks/daily/assignment.py

@@ -4,7 +4,7 @@ from typing import Literal
 from datetime import timedelta
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.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/tasks/daily/capsule_toys.py

@@ -2,7 +2,7 @@
 import logging
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from kotonebot.kaa.game_ui.scrollable import Scrollable
 from ..actions.scenes import at_home, goto_home
 from kotonebot.backend.image import TemplateMatchResult

kotonebot/kaa/tasks/daily/club_reward.py

@@ -2,7 +2,7 @@
 import logging
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from kotonebot.kaa.game_ui import toolbar_menu
 from ..actions.scenes import at_home, goto_home
 from kotonebot import task, device, image, sleep, ocr

kotonebot/kaa/tasks/daily/contest.py

@@ -3,7 +3,7 @@ import logging
 from gettext import gettext as _
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from kotonebot.kaa.game_ui import WhiteFilter
 from ..actions.scenes import at_home, goto_home
 from ..actions.loading import wait_loading_end

kotonebot/kaa/tasks/daily/mission_reward.py

@@ -4,7 +4,7 @@ import logging
 from kotonebot.kaa.tasks import R
 
 from kotonebot.primitives import Rect
-from kotonebot.kaa.common import conf, Priority
+from kotonebot.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/tasks/daily/purchase.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 from kotonebot.backend.loop import Loop
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf, DailyMoneyShopItems
+from kotonebot.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/tasks/daily/upgrade_support_card.py

@@ -2,7 +2,7 @@
 import logging
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from kotonebot.kaa.game_ui.scrollable import Scrollable
 from ..actions.scenes import at_home, goto_home
 from kotonebot import task, device, image, sleep

kotonebot/kaa/tasks/end_game.py

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

kotonebot/kaa/tasks/produce/cards.py

@@ -7,7 +7,7 @@ import numpy as np
 from cv2.typing import MatLike
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from kotonebot.kaa.game_ui import dialog
 from kotonebot.kaa.util.trace import trace
 from kotonebot.primitives import RectTuple, Rect

kotonebot/kaa/tasks/produce/common.py

@@ -9,11 +9,12 @@ from kotonebot import (
     sleep,
     Interval,
 )
+from kotonebot.kaa.config.schema import produce_solution
 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
+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
@@ -188,7 +189,7 @@ def fast_acquisitions() -> AcquisitionType | None:
 
     # 跳过未读交流
     logger.debug("Check skip commu...")
-    if conf().produce.skip_commu and handle_unread_commu(img):
+    if produce_solution().data.skip_commu and handle_unread_commu(img):
         return "SkipCommu"
     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.config.schema import produce_solution
 from kotonebot.kaa.game_ui.schedule import Schedule
 from kotonebot.kaa.tasks import R
 from ..actions import loading
@@ -12,7 +13,8 @@ from ..actions.commu import handle_unread_commu
 from kotonebot.errors import UnrecoverableError
 from kotonebot.util import Countdown, Interval, cropped
 from kotonebot.backend.dispatch import DispatcherContext
-from kotonebot.kaa.common import ProduceAction, RecommendCardDetectionMode, conf
+from kotonebot.kaa.config import ProduceAction, RecommendCardDetectionMode
+from kotonebot.kaa.config import conf
 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 (
@@ -192,7 +194,7 @@ def practice():
 
     def threshold_predicate(card_count: int, result: CardDetectResult):
         border_scores = (result.left_score, result.right_score, result.top_score, result.bottom_score)
-        is_strict_mode = conf().produce.recommend_card_detection_mode == RecommendCardDetectionMode.STRICT
+        is_strict_mode = produce_solution().data.recommend_card_detection_mode == RecommendCardDetectionMode.STRICT
         if is_strict_mode:
             return (
                 result.score >= 0.05
@@ -224,7 +226,7 @@ def exam(type: Literal['mid', 'final']):
     logger.info("Exam started")
 
     def threshold_predicate(card_count: int, result: CardDetectResult):
-        is_strict_mode = conf().produce.recommend_card_detection_mode == RecommendCardDetectionMode.STRICT
+        is_strict_mode = produce_solution().data.recommend_card_detection_mode == RecommendCardDetectionMode.STRICT
         total = lambda t: result.score >= t
         def borders(t):
             # 卡片数量小于三时无遮挡，以及最后一张卡片也总是无遮挡
@@ -422,7 +424,7 @@ def produce_end():
         # [screenshots/produce_end/end_follow.png]
         elif image.find(R.InPurodyuusu.ButtonCancel):
             logger.info("Follow producer dialog found. Click to close.")
-            if conf().produce.follow_producer:
+            if produce_solution().data.follow_producer:
                 logger.info("Follow producer")
                 device.click(image.expect_wait(R.InPurodyuusu.ButtonFollowNoIcon))
             else:
@@ -506,12 +508,12 @@ def week_normal(week_first: bool = False):
     action: ProduceAction | None = None
     # SP 课程
     if (
-        conf().produce.prefer_lesson_ap
+        produce_solution().data.prefer_lesson_ap
         and handle_sp_lesson()
     ):
         action = ProduceAction.DANCE
     else:
-        actions = conf().produce.actions_order
+        actions = produce_solution().data.actions_order
         for action in actions:
             logger.debug("Checking action: %s", action)
             if action := handle_action(action):
@@ -539,7 +541,7 @@ def week_normal(week_first: bool = False):
 def week_final_lesson():
     until_action_scene()
     action: ProduceAction | None = None
-    actions = conf().produce.actions_order
+    actions = produce_solution().data.actions_order
     for action in actions:
         logger.debug("Checking action: %s", action)
         if action := handle_action(action, True):

kotonebot/kaa/tasks/produce/non_lesson_actions.py

@@ -5,10 +5,11 @@
 """
 from logging import getLogger
 
+from kotonebot.kaa.config.schema import produce_solution
 from kotonebot.kaa.game_ui import dialog
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from ..produce.common import fast_acquisitions
 from kotonebot.kaa.game_ui.commu_event_buttons import CommuEventButtonUI
 from kotonebot.util import Countdown, Interval
@@ -66,7 +67,7 @@ def enter_study():
         R.InPurodyuusu.TextSelfStudyVocal
     ]):
         logger.info("授業 type: Self study.")
-        target = conf().produce.self_study_lesson
+        target = produce_solution().data.self_study_lesson
         if target == 'dance':
             logger.debug("Clicking on lesson dance.")
             device.double_click(image.expect(R.InPurodyuusu.TextSelfStudyDance))

kotonebot/kaa/tasks/produce/produce.py

@@ -1,11 +1,11 @@
 import logging
-from itertools import cycle
 from typing import Optional, Literal
 from typing_extensions import assert_never
 
+from kotonebot.kaa.config.schema import produce_solution
 from kotonebot.ui import user
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import conf
+from kotonebot.kaa.config import conf
 from kotonebot.kaa.game_ui import dialog
 from ..actions.scenes import at_home, goto_home
 from kotonebot.backend.loop import Loop, StatedLoop
@@ -150,7 +150,7 @@ def resume_produce():
     max_retries = 5
     current_week = None
     while retry_count < max_retries:
-        week_text = ocr.ocr(R.Produce.BoxResumeDialogWeeks).squash().regex(r'\d+/\d+')
+        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]}')
@@ -191,7 +191,7 @@ def do_produce(
 
     前置条件：可导航至首页的任意页面\n
     结束状态：游戏首页\n
-    
+
     :param memory_set_index: 回忆编成编号。
     :param idol_skin_id: 要培育的偶像。如果为 None，则使用配置文件中的偶像。
     :param mode: 培育模式。
@@ -242,7 +242,7 @@ def do_produce(
             result = False
             break
     if not result:
-        if conf().produce.use_ap_drink:
+        if produce_solution().data.use_ap_drink:
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_1.png]
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_2.png]
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_3.png]
@@ -351,11 +351,11 @@ def do_produce(
 
     # 4. 选择道具 [screenshots/produce/screenshot_produce_start_4_end.png]
     # TODO: 如果道具不足，这里加入推送提醒
-    if conf().produce.use_note_boost:
+    if produce_solution().data.use_note_boost:
         if image.find(R.Produce.CheckboxIconNoteBoost):
             device.click()
             sleep(0.1)
-    if conf().produce.use_pt_boost:
+    if produce_solution().data.use_pt_boost:
         if image.find(R.Produce.CheckboxIconSupportPtBoost):
             device.click()
             sleep(0.1)
@@ -389,28 +389,33 @@ def produce():
         return
     import time
     count = conf().produce.produce_count
-    idols = conf().produce.idols
-    memory_sets = conf().produce.memory_sets
-    mode = conf().produce.mode
+    idol = produce_solution().data.idol
+    memory_set = produce_solution().data.memory_set
+    support_card_set = produce_solution().data.support_card_set
+    mode = produce_solution().data.mode
     # 数据验证
     if count < 0:
         user.warning('配置有误', '培育次数不能小于 0。将跳过本次培育。')
         return
+    if idol is None:
+        user.warning('配置有误', '未设置要培育的偶像。将跳过本次培育。')
+        return
 
-    idol_iterator = cycle(idols)
-    memory_set_iterator = cycle(memory_sets)
     for i in range(count):
         start_time = time.time()
-        idol = next(idol_iterator)
-        if conf().produce.auto_set_memory:
-            memory_set = None
+        if produce_solution().data.auto_set_memory:
+            memory_set_to_use = None
+        else:
+            memory_set_to_use = memory_set
+        if produce_solution().data.auto_set_support_card:
+            support_card_set_to_use = None
         else:
-            memory_set = next(memory_set_iterator, None)
+            support_card_set_to_use = support_card_set
         logger.info(
             f'Produce start with: '
-            f'idol: {idol}, mode: {mode}, memory_set: #{memory_set}'
+            f'idol: {idol}, mode: {mode}, memory_set: #{memory_set_to_use}, support_card_set: #{support_card_set_to_use}'
         )
-        if not do_produce(idol, mode, memory_set):
+        if not do_produce(idol, mode, memory_set_to_use):
             user.info('AP 不足', f'由于 AP 不足，跳过了 {count - i} 次培育。')
             logger.info('%d produce(s) skipped because of insufficient AP.', count - i)
             break
@@ -427,11 +432,11 @@ if __name__ == '__main__':
     from kotonebot.kaa.main import Kaa
 
     conf().produce.enabled = True
-    conf().produce.mode = 'pro'
     conf().produce.produce_count = 1
-    # conf().produce.idols = ['i_card-skin-hski-3-002']
-    conf().produce.memory_sets = [1]
-    conf().produce.auto_set_memory = False
+    produce_solution().data.mode = 'pro'
+    # produce_solution().data.idol = 'i_card-skin-hski-3-002'
+    produce_solution().data.memory_set = 1
+    produce_solution().data.auto_set_memory = False
     # do_produce(PIdol.月村手毬_初声, 'pro', 5)
     produce()
     # a()

kotonebot/kaa/tasks/start_game.py

@@ -5,7 +5,7 @@ import ctypes
 import logging
 
 from kotonebot.kaa.tasks import R
-from kotonebot.kaa.common import Priority, conf
+from kotonebot.kaa.config import Priority, conf
 from .actions.loading import loading
 from kotonebot.util import Countdown, Interval
 from .actions.scenes import at_home, goto_home

{ksaa-2025.7.7.0.dist-info → ksaa-2025.7.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.7.7.0
+Version: 2025.7.9.0
 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