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

2026-07-18 10:10:45 +08:00 · 2022-06-22 00:32:13 +08:00
parent ffc8620489 bd115f995e
commit 8bfd5410e5
97 changed files with 2411 additions and 2022 deletions
--- a/docs/en/CONTRIBUTING.md
+++ b/docs/en/CONTRIBUTING.md
@@ -13,7 +13,7 @@
    1. Download and install `Visual Studio 2022 Community`. Select `Desktop development with C++` and `.NET Desktop Development`.

 5. Double-click to open the file `MeoAssistantArknights.sln`. Visual Studio will load the project automatically.
-6. Run a build to test whether the development environment has been configured correctly. Chosse `Release` & `x64`, right-click `MeoAsstGui` to set it as the startup project, and run it. If the build is successful, the `MeoAsstGui` window will appear. You can connect to the simulator in order to confirm again that the development environment has been configured correctly.
+6. Run a build to test whether the development environment has been configured correctly. Chosse `Release` & `x64`, right-click `MeoAsstGui` to set it as the startup project, and run it. If the build is successful, the `MeoAsstGui` window will appear. You can connect to the emulator in order to confirm again that the development environment has been configured correctly.
 7. Now you are free to contribute to MAA.
 8. Remember to commit once you have proper number of changes. Don't forget to write a commit message.
 9. After development, push your local changes to the remote (of your repository).
--- a/docs/en/EMULATOR_SUPPORTS.md
+++ b/docs/en/EMULATOR_SUPPORTS.md
@@ -1,4 +1,4 @@
-## Simulator Support
+## Emulator Supports

 ### Bluestack

@@ -14,7 +14,7 @@ Compatible.

 - Turn on `Settings` - `Advanced` - `Android Debug Bridge`.
 - Bluestack Hyper-V port changes frequently. Here is a simple hack:
-  1. Find `bluestacks.conf` in the installation location of the simulator.
+  1. Find `bluestacks.conf` in the installation location of the emulator.
  2. Launch MAA, which generates `gui.json`.  Open it.
  3. Add a new field `Bluestacks.Config.Path`, with the value of the full path of `bluestacks.conf` (backslash should be escaped like `\\`).
  4. LinkStart!
@@ -33,7 +33,7 @@ Compatible but:

 - Requires MAA to "Run as Administrator" to get ADB path and address (since MuMu runs as admin).
 - You can also fill in the ADB path and address if you do not wish to run as admin.
- It has a chance that MAA may stuck at the main screen and prompt mission failed, which is probably related to the rendering method of MuMu. Recommend to change other simulator.
+- It has a chance that MAA may stuck at the main screen and prompt mission failed, which is probably related to the rendering method of MuMu. Recommend to change other emulator.

 ### MuMu Mobile Game Assistant  

--- a/docs/en/FAQ.md
+++ b/docs/en/FAQ.md
@@ -2,6 +2,9 @@

 ### The program crashes immediately when I try to run it

+- Possible solution 0: The downloaded archive is incomplete.
+  - If you are the first time using this software, please do not download the compressed package with the word `OTA` in the file name, this is for incremental update and cannot be used alone.
+  - If you can't use it after an automatic update, there may be some bugs in the automatic update function, you can try to manually download the complete package and use it again.
 - Possible solution 1: you are missing some runtime libraries.
  Please try installing [Visual C++ Redistributable](https://docs.microsoft.com/en/cpp/windows/latest-supported-vc-redist?view=msvc-160#visual-studio-2015-2017-2019-and-2022), [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-framework/net48) and restart the program.
 - Possible solution 2: your CPU instruction set is incompatible.
@@ -12,29 +15,37 @@

 ### Connection error/not knowing how to fill in ADB path

-Tips: please refer to the [Usage](../README-en.md#Usage) section to ensure that you are using your simulator correctly.
+Tips: please refer to the [Usage](../README-en.md#Usage) section to ensure that you are using your emulator correctly.

- Approach 1: find the installation path of your simulator, where there may be a file named `adb.exe` (or something similar, e.g. `nox_adb.exe`, `HD-adb.exe`, `adb_server.exe`, etc., EXE files with `adb`). Simply choose the file in the connection settings of MAA!
- Approach 2: please refer to the [Custom Connection](#custom-connection) section.
- Approach 3: change another simulator, such as [Bluestacks international version](https://www.bluestacks.com/download.html) Nougat 64 bit
- Approach 4: change the code related. You can find the code [here](../src/MeoAsstGui/Helper/WinAdapter.cs) written in C# which is related to the hook on the simulator process and getting ADB path. Feel free to submit PR to us!
+#### Approach 1
+
+1. Make sure that MAA `Settings` - `Connection Settings` - `adb path` is automatically filled in, if it has been filled in, please ignore this step. If not filled in:
+
+    - Option 1: Find the installation path of your emulator, where there may be a file named `adb.exe` (or something similar, e.g. `nox_adb.exe`, `HD-adb.exe`, `adb_server.exe`, etc., EXE files with `adb`). Simply choose the file in the connection settings of MAA!
+    - Option 2: Download [adb](https://dl.google.com/android/repository/platform-tools-latest-windows.zip) and unzip it, select the `adb.exe`
+
+2. Confirm that your connection address is filled in correctly, you can Google what the adb address of the emulator you are using is generally in a format like `127.0.0.1:5555`
+
+#### Approach 2
+
+Change another emulator, such as [Bluestacks international version](https://www.bluestacks.com/download.html) Nougat 64 bit
+
+#### Approach 3
+
+Try restarting your computer

 ### Wrong Recognition/Program freezes after starting

 Tip 1: The `Current Stage` of auto battle that costs Sanity requires you to go to the screen with the start button. Please confirm they are not related.
 Tip 2: Follow the steps below until the problem is solved.

-1. Confirm that your simulator is supported in the [List of the Supported Simulators](List of the Supported Simulators.md).
+1. Confirm that your emulator is supported in the [List of the Supported Emulators](EMULATOR_SUPPORTS.md).
 2. Change the DPI to `320 dpi`.
 3. Change the resolution to landscape, `1280 * 720`.
-4. Try with another simulator, such as [Bluestacks international version](https://www.bluestacks.com/download.html) Nougat 64 bit. (Please note that you are required to switch on ADB in Bluestack simulator.)
+4. Try with another emulator, such as [Bluestacks international version](https://www.bluestacks.com/download.html) Nougat 64 bit. (Please note that you are required to switch on ADB in Bluestack emulator.)
 5. Submit an issue to us if the problem still exists.

 ### Custom Connection

 - Download [adb](https://dl.google.com/android/repository/platform-tools-latest-windows.zip) and unzip it.
- Go to `Settings` - `Connection Settings`, and select the location of `adb.exe`, fill in the address of ADB (with the format of IP+port, e.g. `127.0.0.1:5555`), and choose the type of your simulator.
-
-### ADB already exists in the environment variable. Do I stil need to download it?
-
-You need not do so! Go to `Settings` - `Connection Settings`, and set  `ADB path` to `adb.exe`, or other relative path.
+- Go to `Settings` - `Connection Settings`, and select the location of `adb.exe`, fill in the address of ADB (with the format of IP+port, e.g. `127.0.0.1:5555`), and choose the type of your emulator.
--- a/docs/回调消息协议.md
+++ b/docs/回调消息协议.md
@@ -473,3 +473,6 @@ Todo
        "data": "{\"@type\":\"@penguin-statistics/depot\",\"items\":[{\"id\":\"2004\",\"have\":4,\"name\":\"高级作战记录\"},{\"id\":\"mod_unlock_token\",\"have\":25,\"name\":\"模组数据块\"},{\"id\":\"2003\",\"have\":20,\"name\":\"中级作战记录\"}]}"
    }
    ```
+
+- `UnsupportedLevel`  
+    自动抄作业，不支持的关卡名
--- a/docs/常见问题.md
+++ b/docs/常见问题.md
@@ -2,6 +2,9 @@

 ### 软件一打开就闪退

+- 可能性 0: 下载的压缩包不完整  
+  - 若您是第一次使用本软件，请不要下载文件名中有 `OTA` 字样的压缩包，这个是用于增量更新的，无法单独使用
+  - 若您是在某次自动更新后无法使用了，可能是自动更新功能存在一些 bug, 可以尝试重新手动下载完整的包使用
 - 可能性 1: 运行库问题。  
  请尝试安装 [Visual C++ Redistributable](https://docs.microsoft.com/zh-CN/cpp/windows/latest-supported-vc-redist?view=msvc-160#visual-studio-2015-2017-2019-and-2022)、[.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-framework/net48) 后重新运行本软件。
 - 可能性 2: CPU 指令集不支持。  
@@ -12,7 +15,7 @@

 ### 连接错误

-提示 : 请参考 [模拟器支持](模拟器支持.md) 确定您的模拟器是受支持的
+提示 : 请参考 [模拟器支持](模拟器支持.md) 确定您的模拟器是受支持的。如果是蓝叠模拟器，请注意在模拟器设置中打开 adb 调试相关选项

 #### 方式一

@@ -24,7 +27,11 @@

 #### 方式二

- 换模拟器，推荐 [蓝叠国际版](https://www.bluestacks.com/download.html) Nougat 64 bit
+换模拟器，推荐 [蓝叠国际版](https://www.bluestacks.com/download.html) Nougat 64 bit
+
+#### 方式三
+
+重启（电脑）试试

 ### 识别错误/任务开始后一直不动、没有反应

@@ -41,7 +48,3 @@

 - 下载 [adb](https://dl.google.com/android/repository/platform-tools-latest-windows.zip) 并解压
 - 进入软件 `设置` - `连接设置`，选择 adb.exe 的文件路径、填写 adb 地址（需要填写 IP + 端口，例如 `127.0.0.1:5555` ），并选择你的模拟器类型
-
-### 环境变量中已有 adb, 可以不再下载一份么？
-
-可以！进入软件 `设置` - `连接设置`，将 `adb 路径` 设置为 `adb.exe`, 或其他相对路径即可
--- a/docs/肉鸽战斗流程协议.md
+++ b/docs/肉鸽战斗流程协议.md
@@ -1,65 +1,26 @@
 # 肉鸽战斗流程协议

-`resource/roguelike/*.json` 的使用方法及各字段说明
+`resource/roguelike_copilot.json` 的使用方法及各字段说明

 ## 完整字段一览

 ```jsonc
-{
-    "stage_name": "驯兽小屋",        // 关卡名，必选
-    "actions": [                    // 战斗中的操作。有序，执行完前一个才会去执行下一个。必选
-        {
-            "type": "部署",         // 操作类型，可选，默认 "Deploy"
-                                    // "Deploy" | "Skill" | "Retreat" | "AllSkill"
-                                    // "部署"   |  "技能"  |  "撤退"   | "全部技能"
-                                    // 中英文皆可，效果相同
-                                    // 若为 "部署", 当费用不够时，会一直等待到费用够
-                                    // 若为 "技能", 当技能 cd 没转好时，会直接跳过当前项。
-                                    // 考虑不同干员技能效果及 cd 差异巨大，谨慎使用（例如 山 2 技能 这种，假如已经开了，你又开一次，就给关了）
-                                    // "全部技能", 会一次性使用所有 skill_usgae == 3 的干员的技能
-
-            "kills": 0,             // 击杀数条件，如果没达到就一直等待。可选，默认为 0。直接执行
-            // TODO: 其他条件
-            // TODO: "condition_type": 0,    // 执行条件间的关系，可选，默认 0
-            //                        // 0 - 且； 1 - 或
-
-            "roles": [              // 该位置使用的职业。可选，默认为空，任何职业都可以
-                                    // 有序，会先使用靠前的职业
-                                    // 会根据位置类型自动区分是高台还是地面。若设置了不可放置的职业，则忽略该职业
-                                    // 如果这里面的职业一个都没有，则会跳过该位置转而执行下一条
-                "近卫",
-                "先锋",
-                "重装",
-                "召唤物"
-            ],
-            
-            "waiting_cost": false,  // 如果有 roles 中有靠前的职业，但费用不够，是否等待。可选，默认 false
-                                    // 为 true 时，会使用 roles 中，当前有的、最靠前的职业（一直等他费用够）
-                                    // 为 false 时，会使用 roles 中，当前有的、费用够的中最靠前的职业
-
-            "location": [ 5, 5 ],   // 操作的干员的位置。必选
-
-            "direction": "左",      // 部署干员的干员朝向。 type 为 "部署" 时必选
-                                    // "Left" | "Right" | "Up" | "Down" | "None"
-                                    // "左"   |  "右"   | "上"  | "下"   |  "无"
-                                    // 中英文皆可，效果相同
-
-            "pre_delay": 0,         // 前置延时。可选，默认 0, 单位毫秒
-            "rear_delay": 0,        // 后置延时。可选，默认 0, 单位毫秒
-
-            "timeout": 999999999    // 超时时间。当 type 为 "部署" 时可选。默认 INT_MAX, 单位毫秒
-                                    // 等待超时则放弃当前动作, 转而执行下一个动作
-        },
-        {                           // 简单举例
-            "location": [6, 6],
-            "roles": [
-                "近卫",
-                "先锋",
-                "重装",
-                "召唤物"
-            ],
-            "direction": "左"
-        }
-    ]
-}
+[
+    {
+        "stage_name": "驯兽小屋",       // 关卡名，必选
+        "replacement_home": [          // 替换掉家门的位置，可选，默认为空
+            [ 2, 8 ]                   // 会使用这里面的坐标来代替蓝门的坐标，然后堵门
+        ],
+        "key_kills": [                 // 关键击杀数，可选，默认为空
+            15,                        // 若不为空，干员技能会攒着，不是好了就放，而是等到击杀数达到时再释放
+            ...                        // 当跑完数组里所有的元素之后，再把干员技能变成好了就放
+        ]
+    },
+    {
+        "stage_name": "巡逻队",
+        "replacement_home": [
+            [ 2, 8 ]
+        ]
+    }
+]
 ```