MaaFw 2.1.0b2__py3-none-win_amd64.whl → 2.1.2__py3-none-win_amd64.whl

{MaaFw-2.1.0b2.dist-info → MaaFw-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.1.0b2
+Version: 2.1.2
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
@@ -48,7 +48,6 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 
 ## 即刻开始
 
-- [开发思路](docs/zh_cn/0.1-开发思路.md)
 - [快速开始](docs/zh_cn/1.1-快速开始.md)
 - [集成文档](docs/zh_cn/2.1-集成文档.md)
 - [Pipeline 协议](docs/zh_cn/3.1-任务流水线协议.md)
@@ -79,7 +78,7 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 - [MCCA](https://github.com/MaaXYZ/MCCA) 交错战线 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
   基于全新架构的 交错战线 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
   
-- [MSBA](https://github.com/overflow65537/MAA_SnowBreak) 分析员 小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
+- [MSBA](https://github.com/overflow65537/MAA_SnowBreak) 尘白禁区 小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
   基于全新架构的 尘白禁区 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
 
 - [MaaAeonFantasy](https://github.com/Andl-Liu/MaaAeonFantasy)  星神少女 预言之子 小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
@@ -95,8 +94,17 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
   基于 MAA 全新架构的 通用 GUI。由 MaaFramework 强力驱动！
 
 - [MET](https://github.com/shanchuan001/MET) 悠久之树 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
-基于全新架构的 悠久之树 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
-  
+  基于全新架构的 悠久之树 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
+
+- [MaaYYs](https://github.com/TanyaShue/MaaYYs) 阴阳师小助手 ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white) ![qt](https://img.shields.io/badge/Qt6-41CD52?logo=Qt&logoColor=white)  
+  基于全新架构的 阴阳师小助手。图像技术 + 模拟控制，当赛博屯屯鼠，自动日常，解放你的双手！由 MaaFramework 强力驱动！
+
+- [MaaJR](https://github.com/Saratoga-Official/MaaJR) 战舰少女R 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
+  基于全新架构的 战舰少女R 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
+
+- [MPA](https://github.com/overflow65537/MAA_Punish) 战双 小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
+  基于全新架构的 战双帕弥什 小助手。图像技术 + 模拟控制，解放双手！由 玛丽的黑咖啡 2.0 强力驱动！
+   
 ## 生态共建
 
 MAA 正计划建设为一类项目，而非舟的单一软件。  

{MaaFw-2.1.0b2.dist-info → MaaFw-2.1.2.dist-info}/RECORD

@@ -4,25 +4,25 @@ maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
 maa/controller.py,sha256=BpAotY8qlxLSKU0ZO249YDhJWU35B5avnwCTE5PxItQ,22160
 maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
 maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
-maa/define.py,sha256=nFPEOa7asyf4UG9kkeQrQaarXWbN0w-tSHoQWdZi_4s,11032
+maa/define.py,sha256=X0srxfg6eUohfxC3s0pkICTv8B_dB3tbrPAJMmWTX20,11032
 maa/job.py,sha256=Vj6q3sFPlmo260mxJWBnPuO2oT2LdZ-92vdDvrqBZYU,1777
 maa/library.py,sha256=nDTBUFC6_91gmyy8SfkTTccMZET9XGU8IxvuVUEwQ6E,2099
-maa/notification_handler.py,sha256=HtGmTFgTj7ibTdAIVNr5-LBn38trv_j6beHvYXUVFeg,5172
+maa/notification_handler.py,sha256=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
 maa/resource.py,sha256=bvS02sCCS9DRw_zJZeyCk8_DrZry6KBlUIvcfpKoUIg,8243
 maa/tasker.py,sha256=6FOzU-PxWSA0dK8vEmiPVaJThvUMwNDi6EC6V-TcQmM,14758
 maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
 maa/bin/DirectML.dll,sha256=it3PSVO_NoJUHvoqZSbiQOjiMd-RqChTBrK5cl9CKWE,27383832
-maa/bin/MaaAdbControlUnit.dll,sha256=p5czZtwLpLNMaUzoUBIXqPCY-64GDpgcB7sWeFzAlwU,777728
-maa/bin/MaaDbgControlUnit.dll,sha256=h65UnafWEmROHrRepoaoRVJiDFx03AqK0SROussOlhY,424448
-maa/bin/MaaFramework.dll,sha256=2UZE7Kn7LLlJ1vJaVlMSJEeWnxYOFhdDGWHkiA5pR1A,1377280
-maa/bin/MaaToolkit.dll,sha256=3kH-OS_pbKeoVu9CElr8Z1T9l5DSP-HGWOXJN81S4aY,691712
-maa/bin/MaaUtils.dll,sha256=R9ohEWPuBlfiupFGFzyg6fB3TVI_-v13Y9UtVAXh2rI,536064
-maa/bin/MaaWin32ControlUnit.dll,sha256=2QSzWbhEWkoIk_6Hs4Yxe5CFR8lA2But2-olJloTkPU,367104
+maa/bin/MaaAdbControlUnit.dll,sha256=0EpyZivr_QWIXGkqMCWXNkBgGFw4K55FCnjjOhtfHns,776192
+maa/bin/MaaDbgControlUnit.dll,sha256=LEQd6NnPGzFyggvtJ2CK96d_dj7TmDTcc32h_Ozzxfw,424448
+maa/bin/MaaFramework.dll,sha256=xAUJ8wUnFwEAHVSnPcwERMBcfVa1MSNEUgn4jIvSslM,1380352
+maa/bin/MaaToolkit.dll,sha256=CsbExJTsoEChz6QhbBZ-r7GWwO6OCRA1ynIiBh70UD8,696832
+maa/bin/MaaUtils.dll,sha256=8RHwoIN94gTiFhF1gMt1D2bY98iI5e2mz2AFu084H9o,590336
+maa/bin/MaaWin32ControlUnit.dll,sha256=C8ln7CqhWAsockC5d3nWa4sbvVonl5F54zc41az_D6k,368128
 maa/bin/fastdeploy_ppocr_maa.dll,sha256=4ri3FE9bJemUgZu3bsvDSPbqsioIFki1J-Ifk3qkKvg,564736
 maa/bin/onnxruntime_maa.dll,sha256=cu4Z-EwQuqMuphxCt4Pho7XPlUcIEenPK9Tk90alBhc,14653440
 maa/bin/opencv_world4_maa.dll,sha256=NtWJEx6Dg29Qqk493eAAU8O8zZ7Ym5UV6RQ0N0RG9RU,18230272
-MaaFw-2.1.0b2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.1.0b2.dist-info/METADATA,sha256=Mjl4tQaNLNTD7mh1GiJaYHE_MgUcejnuzuutaN8tUNs,9430
-MaaFw-2.1.0b2.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
-MaaFw-2.1.0b2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.1.0b2.dist-info/RECORD,,
+MaaFw-2.1.2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.1.2.dist-info/METADATA,sha256=qql_PehhQW-B8iTJ6PCykMUQ2duKbvDmpAdF1jVZfBQ,10390
+MaaFw-2.1.2.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
+MaaFw-2.1.2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.1.2.dist-info/RECORD,,

maa/define.py

@@ -146,7 +146,7 @@ class MaaAdbScreencapMethodEnum:
     EmulatorExtras = 1 << 6
 
     All = ~Null
-    Default = All & (~RawByNetcat) & (~MinicapDirect) & (~MinicapDirect)
+    Default = All & (~RawByNetcat) & (~MinicapDirect) & (~MinicapStream)
 
 
 MaaAdbInputMethod = ctypes.c_uint64

maa/notification_handler.py

@@ -33,7 +33,7 @@ class NotificationHandler(ABC):
         path: str
 
     def on_resource_loading(
-        self, type: NotificationType, detail: ResourceLoadingDetail
+        self, noti_type: NotificationType, detail: ResourceLoadingDetail
     ):
         pass
 
@@ -44,7 +44,7 @@ class NotificationHandler(ABC):
         action: str
 
     def on_controller_action(
-        self, type: NotificationType, detail: ControllerActionDetail
+        self, noti_type: NotificationType, detail: ControllerActionDetail
     ):
         pass
 
@@ -55,7 +55,7 @@ class NotificationHandler(ABC):
         uuid: str
         hash: str
 
-    def on_tasker_task(self, type: NotificationType, detail: TaskerTaskDetail):
+    def on_tasker_task(self, noti_type: NotificationType, detail: TaskerTaskDetail):
         pass
 
     @dataclass
@@ -64,7 +64,9 @@ class NotificationHandler(ABC):
         name: str
         next_list: list[str]
 
-    def on_task_next_list(self, type: NotificationType, detail: TaskNextListDetail):
+    def on_task_next_list(
+        self, noti_type: NotificationType, detail: TaskNextListDetail
+    ):
         pass
 
     @dataclass
@@ -74,7 +76,7 @@ class NotificationHandler(ABC):
         name: str
 
     def on_task_recognition(
-        self, type: NotificationType, detail: TaskRecognitionDetail
+        self, noti_type: NotificationType, detail: TaskRecognitionDetail
     ):
         pass
 
@@ -84,7 +86,7 @@ class NotificationHandler(ABC):
         node_id: int
         name: str
 
-    def on_task_action(self, type: NotificationType, detail: TaskActionDetail):
+    def on_task_action(self, noti_type: NotificationType, detail: TaskActionDetail):
         pass
 
     def on_unknown_notification(self, msg: str, details: dict):
@@ -92,7 +94,7 @@ class NotificationHandler(ABC):
 
     def on_raw_notification(self, msg: str, details: dict):
 
-        type = NotificationHandler._notification_type(msg)
+        noti_type = NotificationHandler._notification_type(msg)
 
         if msg.startswith("Resource.Loading"):
             detail = self.ResourceLoadingDetail(
@@ -100,7 +102,7 @@ class NotificationHandler(ABC):
                 hash=details["hash"],
                 path=details["path"],
             )
-            self.on_resource_loading(type, detail)
+            self.on_resource_loading(noti_type, detail)
 
         elif msg.startswith("Controller.Action"):
             detail = self.ControllerActionDetail(
@@ -108,7 +110,7 @@ class NotificationHandler(ABC):
                 uuid=details["uuid"],
                 action=details["action"],
             )
-            self.on_controller_action(type, detail)
+            self.on_controller_action(noti_type, detail)
 
         elif msg.startswith("Tasker.Task"):
             detail = self.TaskerTaskDetail(
@@ -117,7 +119,7 @@ class NotificationHandler(ABC):
                 uuid=details["uuid"],
                 hash=details["hash"],
             )
-            self.on_tasker_task(type, detail)
+            self.on_tasker_task(noti_type, detail)
 
         elif msg.startswith("Task.NextList"):
             detail = self.TaskNextListDetail(
@@ -125,7 +127,7 @@ class NotificationHandler(ABC):
                 name=details["name"],
                 next_list=details["list"],
             )
-            self.on_task_next_list(type, detail)
+            self.on_task_next_list(noti_type, detail)
 
         elif msg.startswith("Task.Recognition"):
             detail = self.TaskRecognitionDetail(
@@ -133,7 +135,7 @@ class NotificationHandler(ABC):
                 reco_id=details["reco_id"],
                 name=details["name"],
             )
-            self.on_task_recognition(type, detail)
+            self.on_task_recognition(noti_type, detail)
 
         elif msg.startswith("Task.Action"):
             detail = self.TaskActionDetail(
@@ -141,7 +143,7 @@ class NotificationHandler(ABC):
                 node_id=details["node_id"],
                 name=details["name"],
             )
-            self.on_task_action(type, detail)
+            self.on_task_action(noti_type, detail)
 
         else:
             self.on_unknown_notification(msg, details)