Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev

docs/回调消息协议.md

@@ -447,5 +447,36 @@ Todo
     }
     ```
 
+- `DepotInfo`  
+    仓库识别结果
+
+    ```jsonc
+    // 对应的 details 字段举例
+    // 目前只支持 ArkPlanner 的格式，以后可能会兼容更多网站
+    "arkplanner": {
+        "object": {
+            "items": [
+                {
+                    "id": "2004",
+                    "have": 4,
+                    "name": "高级作战记录"
+                },
+                {
+                    "id": "mod_unlock_token",
+                    "have": 25,
+                    "name": "模组数据块"
+                },
+                {
+                    "id": "2003",
+                    "have": 20,
+                    "name": "中级作战记录"
+                }
+            ],
+            "@type": "@penguin-statistics/depot"
+        },
+        "data": "{\"@type\":\"@penguin-statistics/depot\",\"items\":[{\"id\":\"2004\",\"have\":4,\"name\":\"高级作战记录\"},{\"id\":\"mod_unlock_token\",\"have\":25,\"name\":\"模组数据块\"},{\"id\":\"2003\",\"have\":20,\"name\":\"中级作战记录\"}]}"
+    }
+    ```
+
 - `UnsupportedLevel`  
     自动抄作业，不支持的关卡名

resource/config.json

@@ -16,6 +16,11 @@
             "Doc": "企鹅数据汇报: https://penguin-stats.cn/",
             "cmdFormat": "curl -H \"Content-Type: application/json\" -s -i -d \"[body]\" \"https://penguin-stats.cn/PenguinStats/api/v2/report\" [extra]",
             "cmdFormat_Doc": "命令格式，想打印详细信息可以尝试添加 -v -i"
+        },
+        "depotExportTemplate": {
+            "Doc": "仓库识别导出结果模板",
+            "arkPlanner": "{\"@type\": \"@penguin-statistics/depot\",\"items\": []}",
+            "arkPlanner_Doc": "https://penguin-stats.cn/planner"
         }
     },
     "intent": {

resource/tasks.json

@@ -6913,5 +6913,109 @@
             250,
             100
         ]
+    },
+    "DeoptMatchData": {
+        "template": "empty.png",
+        "templThreshold": 0.6,
+        "roi": [
+            0,
+            0,
+            1060,
+            596
+        ],
+        "roi_Doc": "作为截图的缩放尺寸使用",
+        "maskRange": [
+            1,
+            255
+        ]
+    },
+    "DeoptBaseRect": {
+        "template": "empty.png",
+        "roi": [
+            0,
+            90,
+            219,
+            150
+        ]
+    },
+    "DeoptQuantity": {
+        "template": "empty.png",
+        "templThreshold": 3,
+        "templThreshold_Doc": "这里用来作为字间距阈值",
+        "roi": [
+            36,
+            69,
+            47,
+            20
+        ],
+        "maskRange": [
+            150,
+            255
+        ]
+    },
+    "DepotTaskSlowlySwipeRightRect": {
+        "algorithm": "JustReturn",
+        "action": "ClickRect",
+        "specificRect": [
+            780,
+            200,
+            100,
+            300
+        ],
+        "preDelay": 1500,
+        "rearDelay": 300,
+        "Doc": "这里的preDelay作为滑动duration使用，rearDelay作为滑动额外延时使用"
+    },
+    "DepotTaskSlowlySwipeLeftRect": {
+        "algorithm": "JustReturn",
+        "action": "ClickRect",
+        "specificRect": [
+            300,
+            200,
+            100,
+            300
+        ]
+    },
+    "DepotBegin": {
+        "algorithm": "JustReturn",
+        "action": "DoNothing",
+        "next": [
+            "DepotEnter",
+            "DepotMaterialTab",
+            "DepotMaterialTabClicked"
+        ]
+    },
+    "DepotEnter": {
+        "action": "ClickSelf",
+        "roi": [
+            1109,
+            560,
+            171,
+            160
+        ],
+        "next": [
+            "DepotMaterialTab"
+        ]
+    },
+    "DepotMaterialTab": {
+        "action": "ClickSelf",
+        "roi": [
+            1026,
+            0,
+            254,
+            138
+        ],
+        "next": [
+            "DepotMaterialTabClicked"
+        ]
+    },
+    "DepotMaterialTabClicked": {
+        "action": "DoNothing",
+        "roi": [
+            1026,
+            0,
+            254,
+            138
+        ]
     }
 }