ksaa 2025.9.post2__py3-none-any.whl → 2025.11__py3-none-any.whl

kaa/tasks/produce/non_lesson_actions.py

@@ -10,7 +10,7 @@ from kaa.game_ui import dialog
 
 from kaa.tasks import R
 from kaa.config import conf
-from ..produce.common import fast_acquisitions
+from ..produce.common import ProduceInterrupt
 from kaa.game_ui.commu_event_buttons import CommuEventButtonUI
 from kotonebot.util import Countdown
 from kotonebot.backend.loop import Loop
@@ -57,12 +57,7 @@ def enter_study():
     device.double_click(image.expect_wait(R.InPurodyuusu.ButtonIconStudy))
     # 等待进入页面。中间可能会出现未读交流
     # [screenshots/produce/action_study2.png]
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.IconTitleStudy):
-            logger.debug("Waiting for 授業 screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.IconTitleStudy)
     # 首先需要判断是不是自习课
     # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_study_self_study.png]
     if image.find_multi([
@@ -105,11 +100,7 @@ def enter_study():
             device.click(target_btn)
         else:
             device.double_click(target_btn)
-        for _ in Loop():
-            if fast_acquisitions() is None:
-                logger.info("Waiting for acquisitions finished.")
-            else:
-                break
+        ProduceInterrupt().resolve()
     logger.info("授業 completed.")
 
 
@@ -126,13 +117,9 @@ def enter_allowance():
     logger.info("Double clicking on 活動支給.")
     device.double_click(image.expect(R.InPurodyuusu.ButtonTextAllowance), interval=1)
     # 等待进入页面
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.IconTitleAllowance):
-            logger.debug("Waiting for 活動支給 screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.IconTitleAllowance)
     # 领取奖励
+    pi = ProduceInterrupt()
     for _ in Loop():
         # TODO: 检测是否在行动页面应当单独一个函数
         if image.find_multi([
@@ -145,7 +132,7 @@ def enter_allowance():
             device.click()
             sleep(0.5) # 防止点击了第一个箱子后立马点击了第二个
             continue
-        if fast_acquisitions() is not None:
+        if pi.handle():
             continue
     logger.info("活動支給 completed.")
 
@@ -164,13 +151,7 @@ def enter_consult():
     device.double_click(image.expect(R.InPurodyuusu.ButtonIconConsult), interval=1)
     
     # 等待进入页面
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.IconTitleConsult):
-            device.screenshot()
-            logger.debug("Waiting for 相談 screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.IconTitleConsult)
     # # 尝试固定购买第一个物品
     # device.click(R.InPurodyuusu.PointConsultFirstItem)
     # sleep(0.5)
@@ -282,12 +263,7 @@ def enter_outing():
     logger.info("Double clicking on おでかけ.")
     device.double_click(image.expect(R.InPurodyuusu.ButtonIconOuting))
     # 等待进入页面
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.TitleIconOuting):
-            logger.debug("Waiting for おでかけ screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.TitleIconOuting)
     # 固定选中第二个选项
     # TODO: 可能需要二次处理外出事件
     # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_outing.png]
@@ -301,10 +277,11 @@ def enter_outing():
         device.click(target_btn)
     else:
         device.double_click(target_btn)
+    pi = ProduceInterrupt()
     for _ in Loop():
         if at_action_scene():
             break
-        elif fast_acquisitions():
+        elif pi.handle():
             pass
         # [screenshots\produce\outing_ap_confirm.png]
         elif image.find(R.Common.ButtonSelect2):

kaa/tasks/produce/p_drink.py

@@ -17,6 +17,9 @@ POSTIONS = [
 def acquire_p_drink():
     """
     领取 P 饮料
+
+    前置：领取饮料弹窗
+
     :param index: 要领取的 P 饮料的索引。从 0 开始。
     """
     # TODO: 随机领取一个饮料改成根据具体情况确定最佳
@@ -26,7 +29,8 @@ def acquire_p_drink():
         logger.info("Skip claiming PDrink.")
         device.click()
         sleep(0.3)
-        device.click(image.expect_wait(R.InPurodyuusu.ButtonDontClaim))
+        if image.find(R.InPurodyuusu.ButtonDontClaim):
+            device.click()
     else:
         # 点击饮料
         device.click(POSTIONS[0])

kaa/tasks/produce/produce.py

@@ -219,6 +219,15 @@ def do_produce(
     for _ in Loop():
         if image.find(R.Produce.ButtonProduce):
             device.click()
+        # 强化月间处理
+        elif conf().produce.enable_fever_month == 'on' and image.find(R.Produce.SwitchEventModeOff):
+            logger.info('Fever month checked on.')
+            device.click()
+            sleep(0.5)
+        elif conf().produce.enable_fever_month == 'off' and image.find(R.Produce.SwitchEventModeOn):
+            logger.info('Fever month checked off.')
+            device.click()
+            sleep(0.5)
         elif image.find_multi(target_buttons):
             device.click()
         elif image.find(R.Produce.ButtonPIdolOverview):
@@ -233,7 +242,8 @@ 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.')
-            for _ in Loop():
+            for _ in Loop(interval=1):
+                # HACK: 这里设置 interval 是 #91 的临时 workaround
                 if image.find(R.Produce.ButtonUse, colored=True):
                     device.click()
                 elif image.find(R.Produce.ButtonRefillAP):
@@ -418,6 +428,7 @@ if __name__ == '__main__':
 
     conf().produce.enabled = True
     conf().produce.produce_count = 1
+    conf().produce.enable_fever_month = 'ignore'
     produce_solution().data.mode = 'pro'
     # produce_solution().data.idol = 'i_card-skin-hski-3-002'
     produce_solution().data.memory_set = 1

kaa/tasks/start_game.py

@@ -1,8 +1,10 @@
 """启动游戏，领取登录奖励，直到首页为止"""
-import json
 import os
+import re
+import json
 import ctypes
 import logging
+import subprocess
 
 from kotonebot.util import Countdown
 from kotonebot.backend.loop import Loop
@@ -14,7 +16,8 @@ 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
+from kaa.tasks.common import skip
+from kaa.errors import ElevationRequiredError, GameUpdateNeededError, DmmGameLaunchError
 
 logger = logging.getLogger(__name__)
 
@@ -48,6 +51,49 @@ def locate_game_path() -> str | None:
         config.save()
     return game_path
 
+def start_windows_bypass():
+    """
+    绕过 DMMPlayer 直接启动游戏。
+    """
+    appdata = os.getenv('APPDATA')
+    if not appdata:
+        raise DmmGameLaunchError('APPDATA not found.')
+    log_path = os.path.join(appdata, 'dmmgameplayer5', 'logs', 'dll.log')
+
+    if not os.path.exists(log_path):
+        raise DmmGameLaunchError(f'DMMGamePlayer log file not found at {log_path}')
+
+    last_launch_line = None
+    with open(log_path, 'r', encoding='utf-8', errors='ignore') as f:
+        for line in f:
+            if "Execute of:: gakumas exe" in line:
+                last_launch_line = line
+
+    if not last_launch_line:
+        raise DmmGameLaunchError('Could not find any run records for "Gakumas" in the DMM log. Please launch the game normally once through the DMM client.')
+
+    regex = r'exe:\s*(?P<exe_path>.*?gakumas\.exe).*?/viewer_id=(?P<viewer_id>[^\s]+).*?/open_id=(?P<open_id>[^\s]+).*?/pf_access_token=(?P<pf_token>[^\s]+)'
+    match = re.search(regex, last_launch_line)
+
+    if not match:
+        raise DmmGameLaunchError('Failed to extract complete launch information from the log. The log format may have changed.')
+
+    game_info = match.groupdict()
+    exe_path = game_info['exe_path']
+    working_dir = os.path.dirname(exe_path)
+    args = [
+        exe_path,
+        f"/viewer_id={game_info['viewer_id']}",
+        f"/open_id={game_info['open_id']}",
+        f"/pf_access_token={game_info['pf_token']}"
+    ]
+
+    try:
+        # CREATE_NO_WINDOW to avoid console popup
+        subprocess.Popen(args, cwd=working_dir, creationflags=0x08000000)
+    except Exception as e:
+        raise DmmGameLaunchError(f'Failed to start the game directly: {e}')
+
 # TODO: 这个函数功能和 kaa\tasks\actions\scenes.py 中的 goto_home 重复了，后续需要合并
 @action('启动游戏.进入首页', screenshot_mode='manual-inherit')
 def wait_for_home():
@@ -93,7 +139,7 @@ def wait_for_home():
             device.click()
 
         if should_click and click_cd.expired():
-            device.click(10, 10)
+            skip()
             click_cd.reset()
 
 @action('启动游戏.Android', screenshot_mode='manual-inherit')
@@ -172,8 +218,18 @@ def windows_launch():
         logger.debug('Game already started.')
         return
     
-    logger.info('Starting game...')
-    os.startfile('dmmgameplayer://play/GCL/gakumas/cl/win')
+    for _ in [1]:
+        if conf().start_game.dmm_bypass:
+            logger.info('Bypassing DMM launcher to start game directly...')
+            try:
+                start_windows_bypass()
+                break
+            except DmmGameLaunchError:
+                logger.exception('Failed to bypass DMM launcher, fallback to DMM launcher...')
+        
+        logger.info('Starting game via DMM launcher...')
+        os.startfile('dmmgameplayer://play/GCL/gakumas/cl/win')
+    
     # 等待游戏窗口出现
     for _ in Loop(auto_screenshot=False):
         if ahk.find_window(title='gakumas', title_match_mode=3):

kaa/util/reactive.py

@@ -0,0 +1,182 @@
+from typing import TypeVar, Generic, Any, Callable, Optional, cast
+
+# T: 原始对象的类型 (Root)
+# V: 属性值的类型 (Leaf)
+T = TypeVar("T")
+V = TypeVar("V")
+
+class PathRecorder(Generic[T]):
+    """
+    记录路径操作（属性访问 或 索引访问）
+    """
+    # FIX: 显式声明 path 可以为 None
+    def __init__(self, root: Any = None, path: Optional[list[tuple[str, Any]]] = None):
+        self._root = root
+        # path 存储操作记录: ('attr', 'name') 或 ('item', 'key')
+        self._path: list[tuple[str, Any]] = path if path is not None else []
+
+    def __getattr__(self, name: str) -> "PathRecorder":
+        # 记录 .attr 操作
+        return PathRecorder(self._root, self._path + [('attr', name)])
+    
+    def __getitem__(self, key: Any) -> "PathRecorder":
+        # 记录 [key] 操作
+        return PathRecorder(self._root, self._path + [('item', key)])
+
+    # 内部接口
+    def _get_recorder_info(self) -> tuple[Any, list[tuple[str, Any]]]:
+        return self._root, self._path
+
+def of(obj: T) -> T:
+    """
+    Proxy 入口。类型标记返回 T 以获得 IDE 提示，运行时返回 Recorder。
+    """
+    return cast(T, PathRecorder(root=obj))
+
+def _traverse(target: Any, path: list[tuple[str, Any]]) -> tuple[Any, str, Any]:
+    """
+    辅助函数：遍历路径，返回 (parent_container, last_op_type, last_key)
+    """
+    current = target
+    
+    # 遍历直到倒数第二个节点（获取父容器）
+    for op_type, key in path[:-1]:
+        if op_type == 'attr':
+            current = getattr(current, key)
+        elif op_type == 'item':
+            current = current[key]
+    
+    # 获取最后一个操作的信息
+    last_op, last_key = path[-1]
+    return current, last_op, last_key
+
+def getter(proxy: V) -> Callable[[], V]:
+    """
+    创建一个 getter 函数。
+    """
+    # 运行时检查
+    if not isinstance(proxy, PathRecorder):
+        raise TypeError("getter argument must be a proxy object created by of()")
+
+    # 显式转换类型以通过静态检查
+    recorder = cast(PathRecorder, proxy)
+    root, path = recorder._get_recorder_info()
+    
+    if not path:
+        return lambda: cast(V, root)
+
+    def _getter_impl() -> V:
+        parent, last_op, last_key = _traverse(root, path)
+        
+        if last_op == 'attr':
+            return getattr(parent, last_key)
+        elif last_op == 'item':
+            return parent[last_key]
+        
+        # FIX: 抛出异常而不是返回 None，以满足返回类型 V
+        raise ValueError(f"Unknown operation type: {last_op}")
+
+    return _getter_impl
+
+def setter(proxy: V) -> Callable[[V], None]:
+    """
+    创建一个 setter 函数。
+    """
+    if not isinstance(proxy, PathRecorder):
+        raise TypeError("setter argument must be a proxy object created by of()")
+
+    recorder = cast(PathRecorder, proxy)
+    root, path = recorder._get_recorder_info()
+    
+    if not path:
+        raise ValueError("Cannot set root object directly")
+
+    def _setter_impl(value: V) -> None:
+        parent, last_op, last_key = _traverse(root, path)
+        
+        if last_op == 'attr':
+            setattr(parent, last_key, value)
+        elif last_op == 'item':
+            parent[last_key] = value
+        else:
+             raise ValueError(f"Unknown operation type: {last_op}")
+
+    return _setter_impl
+
+class Ref(Generic[T]):
+    """
+    持有对特定数据路径的引用，支持读写。
+    Ref 接收一个 path recorder 代理对象。
+    """
+    def __init__(self, proxy: T):
+        self._getter_fn = getter(proxy)
+        self._setter_fn = setter(proxy)
+
+    @property
+    def value(self) -> T:
+        return self._getter_fn()
+    
+    @value.setter
+    def value(self, new_value: T) -> None:
+        self._setter_fn(new_value)
+
+def ref(proxy: T) -> Ref[T]:
+    """
+    创建一个引用对象 (Ref)，用于直接读写路径记录器的目标值。
+    
+    Example:
+        name_ref = ref(of(user).name)
+        name_ref.value = "Bob"
+    """
+    return Ref(proxy)
+
+if __name__ == "__main__":
+    class Address:
+        def __init__(self, city):
+            self.city = city
+        def __repr__(self):
+            return f"Address(city='{self.city}')"
+
+    class User:
+        def __init__(self, name, city):
+            self.name = name
+            self.addresses = {"home": Address(city)}
+        def __repr__(self):
+            return f"User(name='{self.name}', addresses={self.addresses})"
+
+    data = User("Alice", "New York")
+    print(f"Original Data: {data}")
+
+    # 1. 测试 Getter (混合 属性 和 字典索引)
+    get_city = getter(of(data).addresses["home"].city)
+    print(f"Getter result: {get_city()}")  # Output: New York
+
+    # 2. 测试 Setter
+    set_city = setter(of(data).addresses["home"].city)
+    set_city("San Francisco")
+    print(f"After Setter: {data.addresses['home'].city}")  # Output: San Francisco
+
+    # 3. 测试 Ref (引用)
+    print("-" * 30)
+    print("Testing Ref...")
+    
+    # 创建一个指向 user.name 的 Ref
+    name_ref = ref(of(data).name)
+    
+    print(f"Ref initial value: {name_ref.value}") # Alice
+
+    # 修改 Ref，应该影响原始对象
+    name_ref.value = "Bob"
+    print(f"Ref value set to 'Bob'.")
+    print(f"Original object name: {data.name}") # Bob
+    
+    # 修改原始对象，Ref 应该能感知
+    data.name = "Charlie"
+    print(f"Original object name set to 'Charlie'.")
+    print(f"Ref value: {name_ref.value}") # Charlie
+
+    # 复杂路径 Ref
+    city_ref = ref(of(data).addresses["home"].city)
+    print(f"City Ref value: {city_ref.value}") # San Francisco
+    city_ref.value = "Tokyo"
+    print(f"City Ref set to 'Tokyo'. Original: {data.addresses['home'].city}")

{ksaa-2025.9.post2.dist-info → ksaa-2025.11.dist-info}/METADATA

@@ -1,34 +1,35 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.9.post2
+Version: 2025.11
 Summary: Kotones Auto Assistant(kaa) is a script for game 'Gakuen Idol M@ster' that automates the dailies and produces.
-Requires-Python: ~=3.10
+Requires-Python: ~=3.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: opencv-python==4.10.0.84
-Requires-Dist: rapidocr_onnxruntime==1.4.3
-Requires-Dist: av==14.0.1
-Requires-Dist: scikit-image==0.25.0
-Requires-Dist: thefuzz==0.22.1
-Requires-Dist: adbutils==2.8.0
-Requires-Dist: uiautomator2==3.2.8
-Requires-Dist: fastapi==0.115.6
-Requires-Dist: uvicorn==0.34.0
-Requires-Dist: python-multipart==0.0.20
-Requires-Dist: websockets==14.1
-Requires-Dist: psutil==6.1.1
-Requires-Dist: gradio==5.21.0
-Requires-Dist: pydantic==2.10.4
+Requires-Dist: opencv-python~=4.10
+Requires-Dist: rapidocr_onnxruntime~=1.4
+Requires-Dist: av~=14.0
+Requires-Dist: scikit-image~=0.25
+Requires-Dist: thefuzz~=0.22
+Requires-Dist: adbutils~=2.8
+Requires-Dist: uiautomator2~=3.2
+Requires-Dist: fastapi~=0.115.6
+Requires-Dist: uvicorn~=0.34.0
+Requires-Dist: python-multipart~=0.0.20
+Requires-Dist: websockets~=14.1
+Requires-Dist: psutil~=6.1
+Requires-Dist: gradio~=6.0
+Requires-Dist: pydantic~=2.10
 Requires-Dist: ksaa-res==0.2.0
-Requires-Dist: typing-extensions==4.12.2
-Requires-Dist: python-dotenv==1.0.1
-Requires-Dist: onnxruntime==1.14.0
+Requires-Dist: typing-extensions~=4.12
+Requires-Dist: python-dotenv~=1.0.1
+Requires-Dist: onnxruntime~=1.14.0
 Requires-Dist: numpy<2.0
-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
+Requires-Dist: pywin32==310; sys_platform == "win32"
+Requires-Dist: ahk~=1.8.3; sys_platform == "win32"
+Requires-Dist: win11toast~=0.35; sys_platform == "win32"
+Requires-Dist: keyboard~=0.13.5
+Requires-Dist: kotonebot[android]==0.5.0
+Requires-Dist: kotonebot[windows]==0.5.0; sys_platform == "win32"
 Dynamic: license-file
 
 # Kotone's Auto Assistant 琴音小助手
@@ -123,6 +124,8 @@ kaa
 main 分支为开发分支与测试版发布分支，release 分支为稳定版发布分支。所有 PR 都应提交到 main 分支。
 其他分支均为临时分支，请不要提交到这些分支。
 
+提交 PR 前建议你先进行覆盖率自测，详见“开发指南 ##测试”。
+
 ## 路线图
 下面是待实现的功能：  
 （带删除线标记的为已完成）
@@ -195,9 +198,10 @@ kaa 本体及框架（kotonebot 文件夹）、相关辅助脚本（tools 文件
 
 kaa 的开发主要用到了以下开源项目：
 * [GkmasObjectManager
-](https://github.com/AllenHeartcore/GkmasObjectManager)：用于提取游戏图像资源，以 GPLv3 协议开源。
+](https://github.com/AllenHeartcore/GkmasObjectManager)（GPLv3）：用于提取游戏图像资源。
 * [gakumasu-diff](https://github.com/vertesan/gakumasu-diff)：游戏数据。
 
 kaa 的开发还参考了以下开源项目：
-* [EmulatorExtras](https://github.com/MaaXYZ/EmulatorExtras)：MuMu 与雷电模拟器的截图与控制接口定义。
-* [blue_archive_auto_script](https://github.com/pur1fying/blue_archive_auto_script)：MuMu 与雷电模拟器的截图与控制接口的 Python 实现，以及各模拟器的控制实现。
+* [EmulatorExtras](https://github.com/MaaXYZ/EmulatorExtras)（No License）：MuMu 与雷电模拟器的截图与控制接口定义。
+* [blue_archive_auto_script](https://github.com/pur1fying/blue_archive_auto_script)（GPLv3）：MuMu 与雷电模拟器的截图与控制接口的 Python 实现，以及各模拟器的控制实现。
+* [Gakumas_Launcher](https://github.com/a4nqi3n/Gakumas_Launcher)（Unlicense license）：绕开 DMMPlayer 直接启动游戏本体的方式。