ksaa 2025.7.27.1__py3-none-any.whl → 2025.8.17.0__py3-none-any.whl

kotonebot/kaa/tasks/produce/produce.py

@@ -9,7 +9,7 @@ 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
-from kotonebot.util import Countdown, Interval, Throttler
+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 ..produce.in_purodyuusu import hajime_pro, hajime_regular, hajime_master, resume_pro_produce, resume_regular_produce, \
@@ -50,23 +50,24 @@ def select_idol(skin_id: str):
     logger.info("Find and select idol: %s", skin_id)
     # 进入总览
     device.screenshot()
-    it = Interval()
-    while not image.find(R.Common.ButtonConfirmNoIcon):
-        if image.find(R.Produce.ButtonPIdolOverview):
-            device.click()
-        device.screenshot()
-        it.wait()
+    for _ in Loop():
+        if not image.find(R.Common.ButtonConfirmNoIcon):
+            if image.find(R.Produce.ButtonPIdolOverview):
+                device.click()
+        else:
+            break
     # 选择偶像
     pos = locate_idol(skin_id)
     if pos is None:
         raise IdolCardNotFoundError(skin_id)
     # 确认
-    it.reset()
-    while btn_confirm := image.find(R.Common.ButtonConfirmNoIcon):
-        device.click(pos)
-        sleep(0.3)
-        device.click(btn_confirm)
-        it.wait()
+    for _ in Loop():
+        if btn_confirm := image.find(R.Common.ButtonConfirmNoIcon):
+            device.click(pos)
+            sleep(0.3)
+            device.click(btn_confirm)
+        else:
+            break
 
 @action('培育开始.编成翻页', screenshot_mode='manual-inherit')
 def select_set(index: int):
@@ -248,8 +249,7 @@ def do_produce(
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_2.png]
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_3.png]
             logger.info('AP insufficient. Try to use AP drink.')
-            it = Interval()
-            while True:
+            for _ in Loop():
                 if image.find(R.Produce.ButtonUse):
                     device.click()
                 elif image.find(R.Produce.ButtonRefillAP):
@@ -258,8 +258,6 @@ def do_produce(
                     device.click()
                 elif image.find(R.Produce.ButtonPIdolOverview):
                     break
-                device.screenshot()
-                it.wait()
         else:
             logger.info('AP insufficient. Exiting produce.')
             device.click(image.expect_wait(R.InPurodyuusu.ButtonCancel))
@@ -363,7 +361,9 @@ def do_produce(
     device.click(image.expect_wait(R.Produce.ButtonProduceStart))
     # 5. 相关设置弹窗 [screenshots/produce/skip_commu.png]
     cd = Countdown(5).start()
-    while not cd.expired():
+    for _ in Loop():
+        if cd.expired():
+            break
         device.screenshot()
         if image.find(R.Produce.RadioTextSkipCommu):
             device.click()

kotonebot/kaa/tasks/start_game.py

@@ -7,7 +7,8 @@ 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, Interval
+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
@@ -54,11 +55,9 @@ def wait_for_home():
     结束状态：游戏首页
     """
     logger.info('Entering home...')
-    it = Interval()
     click_cd = Countdown(1).start()
     should_click = False
-    while True:
-        device.screenshot()
+    for _ in Loop():
         # 首页
         if image.find(R.Daily.ButtonHomeCurrent):
             break
@@ -88,7 +87,6 @@ def wait_for_home():
         if should_click and click_cd.expired():
             device.click(0, 0)
             click_cd.reset()
-        it.wait()
 
 @action('启动游戏.Android', screenshot_mode='manual-inherit')
 def android_launch():
@@ -169,14 +167,11 @@ def windows_launch():
     logger.info('Starting game...')
     os.startfile('dmmgameplayer://play/GCL/gakumas/cl/win')
     # 等待游戏窗口出现
-    it = Interval()
-    while True:
-        vars.flow.check()
+    for _ in Loop(auto_screenshot=False):
         if ahk.find_window(title='gakumas', title_match_mode=3):
             logger.debug('Game window found.')
             break
         logger.debug('Waiting for game window...')
-        it.wait()
 
 @task('启动游戏', priority=Priority.START_GAME)
 def start_game():

{ksaa-2025.7.27.1.dist-info → ksaa-2025.8.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.7.27.1
+Version: 2025.8.17.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