ksaa 2025.11b3__py3-none-any.whl → 2025.11.post1__py3-none-any.whl

kaa/tasks/R2.py

@@ -0,0 +1,24 @@
+from . import R
+from kaa.game_ui.primary_button import GakumasButtonPrefab
+from kotonebot.primitives import Image
+
+class ButtonNextNoIcon(GakumasButtonPrefab):
+    template = Image(R.Common.ButtonNextNoIcon.data)
+
+    # @classmethod
+    # def require(cls, **kwargs: *PrefabKwargs[GakumasButtonObject]) -> GakumasButtonObject:
+    #     ...
+
+
+if __name__ == '__main__':
+    # from kotonebot.backend.context.context import manual_context
+    from kotonebot import device
+
+    # device.click(100, 100)
+    from time import sleep
+    device.screenshot()
+    sleep(0.5)
+    device.screenshot()
+    # print(image.find(R.Common.ButtonNextNoIcon, threshold=0.6))
+    btn1 = ButtonNextNoIcon.require()
+    print(btn1.disabled)

kaa/tasks/daily/club_reward.py

@@ -25,6 +25,7 @@ def club_reward():
     # 进入社团UI
     logger.info('Entering club UI')
     device.click(toolbar_menu(True))
+    sleep(0.5) # 避免过早点击
     device.click(image.expect_wait(R.Daily.IconMenuClub, timeout=5))
     sleep(3)
 

kaa/tasks/daily/purchase.py

@@ -154,7 +154,12 @@ def ap_items():
             if purchased is not None:
                 logger.info(f'AP item #{index} already purchased.')
                 continue
-            comfirm = image.expect_wait(R.Common.ButtonConfirm, timeout=2)
+            comfirm = image.wait_for(R.Common.ButtonConfirm, colored=True, timeout=2)
+            # 如果体力不足
+            if comfirm is None:
+                logger.info(f'Not enough AP for item #{index}. Skipping all AP items.')
+                device.click(image.expect_wait(R.Common.ButtonIconClose))
+                break
             # 如果数量不是最大,调到最大
             for _ in Loop(interval=0.3):
                 if image.find(R.Daily.ButtonShopCountAdd, colored=True):
@@ -169,6 +174,23 @@ def ap_items():
             logger.warning(f'AP item #{index} not found')
     logger.info(f'Purchasing AP items completed. {len(item_indices)} items purchased.')
 
+@action('购买 周免费礼包')
+def weekly_free_pack():
+    """
+    购买 周免费礼包
+
+    前置条件：位于主商店页面
+    """
+    logger.info(f'Purchasing weekly free pack.')
+    
+    sleep(1.0) # 动画加载完毕，但是按钮不可点击
+    device.click(image.expect_wait(R.Common.ShopPackButton))
+
+    if image.wait_for(R.Daily.WeeklyFreePack, colored=True, timeout=1):
+        device.click()
+        device.click(image.expect_wait(R.Common.ButtonConfirmNoIcon))
+        logger.info('Confirming purchase of weekly free pack.')
+
 @task('商店购买')
 def purchase():
     """
@@ -204,6 +226,9 @@ def purchase():
     
     # 购买 AP 物品
     if conf().purchase.ap_enabled:
+        # 如果不购买マニー物品，则需要等待动画加载完毕，否则按钮无法点击
+        # FIXME: 使用Loop形式重构整个purchase函数
+        sleep(0.5)
         # 点击 AP 选项卡
         device.click(ap_tab)
         # 等待 AP 选项卡加载完成
@@ -213,6 +238,13 @@ def purchase():
     else:
         logger.info('AP purchase is disabled.')
     
+    # 返回主商店页面
+    device.click(image.expect_wait(R.Common.ButtonToolbarBack))
+    
+    # 购买周免费礼包
+    if conf().purchase.weekly_enabled:
+        weekly_free_pack()
+    
     goto_home()
 
 if __name__ == '__main__':

kaa/tasks/daily/upgrade_support_card.py

@@ -31,8 +31,18 @@ def upgrade_support_card():
     device.click(image.expect_wait(R.Common.ButtonIdolSupportCard, timeout=5))
     sleep(2)
 
-    # 往下滑，划到最底部
-    Scrollable().to(1)
+    # 重试10次
+    for retry_idx in range(10):
+        logger.debug(f'Scrolling down to find low-level support cards, attempt {retry_idx + 1}/10')
+        # 往下滑，划到最底部
+        scrollbar = Scrollable()
+        scrollbar.to(1)
+        sleep(0.1)
+        scrollbar.update()
+        if scrollbar.position >= 0.99:
+            logger.debug('Successfully scrolled to the bottom.')
+            break
+        sleep(0.5)
     
     # 点击左上角第一张支援卡
     # 点击位置百分比: (0.18, 0.34)

kaa/tasks/produce/common.py

@@ -85,6 +85,7 @@ def acquire_skill_card():
         if acquire_btn := image.find(R.InPurodyuusu.AcquireBtnDisabled):
             logger.debug("Click acquire button")
             device.click(acquire_btn)
+            sleep(0.2)
             break
 
 @action('选择P物品', screenshot_mode='auto')

kaa/tasks/produce/in_purodyuusu.py

@@ -536,7 +536,7 @@ def handle_action(action: ProduceAction, final_week: bool = False) -> ProduceAct
             logger.warning("Unknown action: %s", action)
             return None
 
-def week_normal(week_first: bool = False):
+def week_normal(week_first: bool = False) -> bool:
     until_action_scene(week_first)
     logger.info("Handling actions...")
     action: ProduceAction | None = None
@@ -572,7 +572,9 @@ def week_normal(week_first: bool = False):
             assert_never(action)
     until_action_scene()
 
-def week_final_lesson():
+    return True # 继续执行下一周
+
+def week_final_lesson() -> bool:
     until_action_scene()
     action: ProduceAction | None = None
     actions = produce_solution().data.actions_order
@@ -599,6 +601,8 @@ def week_final_lesson():
             raise ValueError("Action is None.")
         case _:
             assert_never(action)
+            
+    return True # 继续执行下一周
 
 def week_mid_and_final_exam_common():
     logger.info("Wait for exam scene...")
@@ -609,23 +613,27 @@ def week_mid_and_final_exam_common():
     sleep(0.5)
     loading.wait_loading_end()
 
-def week_mid_exam():
+def week_mid_exam() -> bool:
     logger.info("Week mid exam started.")
 
     week_mid_and_final_exam_common()
     
     if exam('mid'):
         until_action_scene() # 考试通过
+        return True
     else:
         produce_end(has_live=False) # 考试不合格
+        return False
 
-def week_final_exam():
+def week_final_exam() -> bool:
     logger.info("Week final exam started.")
 
     week_mid_and_final_exam_common()
 
     exam('final')
+    
     produce_end()
+    return False
 
 @action('执行 Regular 培育', screenshot_mode='manual-inherit')
 def hajime_regular(week: int = -1, start_from: int = 1):
@@ -658,7 +666,9 @@ def hajime_regular(week: int = -1, start_from: int = 1):
     else:
         for i, w in enumerate(weeks[start_from-1:]):
             logger.info("Week %d started.", i + start_from)
-            w()
+            if not w():
+                logger.info("Exit produce after week %d.", i + start_from)
+                break
 
 @action('执行 PRO 培育', screenshot_mode='manual-inherit')
 def hajime_pro(week: int = -1, start_from: int = 1):
@@ -692,7 +702,9 @@ def hajime_pro(week: int = -1, start_from: int = 1):
     else:
         for i, w in enumerate(weeks[start_from-1:]):
             logger.info("Week %d started.", i + start_from)
-            w()
+            if not w():
+                logger.info("Exit produce after week %d.", i + start_from)
+                break
 
 @action("执行 MASTER 培育", screenshot_mode='manual-inherit')
 def hajime_master(week: int = -1, start_from: int = 1):
@@ -728,7 +740,9 @@ def hajime_master(week: int = -1, start_from: int = 1):
     else:
         for i, w in enumerate(weeks[start_from-1:]):
             logger.info("Week %d started.", i + start_from)
-            w()
+            if not w():
+                logger.info("Exit produce after week %d.", i + start_from)
+                break
 
 @action('是否在考试场景')
 def is_exam_scene():

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.11b3.dist-info → ksaa-2025.11.post1.dist-info}/METADATA

@@ -1,33 +1,33 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.11b3
+Version: 2025.11.post1
 Summary: Kotones Auto Assistant(kaa) is a script for game 'Gakuen Idol M@ster' that automates the dailies and produces.
 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; 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: 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