style: run prettier as there's missing stuff apparently

This commit is contained in:
Constrat
2025-10-20 21:30:13 +02:00
parent 2207b15fe3
commit c3aac18e1b
13 changed files with 286 additions and 283 deletions

View File

@@ -24,11 +24,13 @@ Mac 可以使用 `tools/build_macos_universal.zsh` 脚本进行编译
1. 下载编译所需的依赖
::: code-tabs
@tab:active Ubuntu/Debian
```bash :no-line-numbers
sudo apt install cmake
```
@tab Arch
```bash :no-line-numbers
sudo pacman -S --needed cmake
```
@@ -80,7 +82,6 @@ Mac 可以使用 `tools/build_macos_universal.zsh` 脚本进行编译
4. 结束,你应该能在目录下看到构建文件了
::::
## 集成文档

View File

@@ -6,8 +6,9 @@ icon: iconoir:code-brackets
# 专用 VSCode 插件教程
该插件针对 MaaAssistantArknights/MaaFramework 提供了一系列方便开发的能力,包括但不限于以下功能:
+ tasks.json 支持,包含 `template 预览``next 跳转``任务引用` 等等
+ 截取/裁剪图片
- tasks.json 支持,包含 `template 预览``next 跳转``任务引用` 等等
- 截取/裁剪图片
具体内容可以前往 [插件商店](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) 或是 [仓库](https://github.com/neko-para/maa-support-extension) 查看

View File

@@ -18,11 +18,13 @@ Homebrew 用户可以通过非官方的 [tap](https://github.com/MaaAssistantArk
::: code-tabs
@tab:active 稳定版
```bash :no-line-numbers
brew install MaaAssistantArknights/tap/maa-cli
```
@tab 不稳定版/预发行版
```bash :no-line-numbers
brew install MaaAssistantArknights/tap/maa-cli-beta
```
@@ -40,11 +42,13 @@ brew install MaaAssistantArknights/tap/maa-cli-beta
::: code-tabs
@tab:active paru
```bash :no-line-numbers
paru -S maa-cli
```
@tab yay
```bash :no-line-numbers
yay -S maa-cli
```
@@ -58,11 +62,13 @@ yay -S maa-cli
::: code-tabs
@tab:active 稳定版
```bash :no-line-numbers
nix run nixpkgs#maa-cli
```
@tab 每夜构建
```bash :no-line-numbers
nix run github:Cryolitia/nur-packages#maa-cli-nightly
```
@@ -90,13 +96,15 @@ nix run github:Cryolitia/nur-packages#maa-cli-nightly
@tab Linux
请选择你的架构
+ [x64/x86_64/amd64](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-unknown-linux-gnu.tar.gz)
+ [aarch64/arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-unknown-linux-gnu.tar.gz)
- [x64/x86_64/amd64](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-unknown-linux-gnu.tar.gz)
- [aarch64/arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-unknown-linux-gnu.tar.gz)
@tab Windows
请选择你的架构
+ [x64/x86_64/amd64](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-pc-windows-msvc.zip)
+ [aarch64/arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-pc-windows-msvc.zip)
- [x64/x86_64/amd64](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-pc-windows-msvc.zip)
- [aarch64/arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-pc-windows-msvc.zip)
:::
@@ -109,11 +117,13 @@ Rust 开发者可以通过 `cargo` 自行编译安装 maa-cli
::: code-tabs
@tab:active 稳定版本
```bash :no-line-numbers
cargo install --git https://github.com/MaaAssistantArknights/maa-cli.git --bin maa --tag stable --locked
```
@tab 开发版本
```bash :no-line-numbers
cargo install --git https://github.com/MaaAssistantArknights/maa-cli.git --bin maa --locked
```
@@ -157,24 +167,28 @@ winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /nore
@tab Homebrew
你可以直接通过 Homebrew 安装 maa-core
```bash :no-line-numbers
brew install MaaAssistantArknights/tap/maa-core
```
@tab Arch
你可以通过 [AUR](https://aur.archlinux.org/packages/maa-assistant-arknights/) 安装 maa-core
::: code-tabs
你可以通过 [AUR](https://aur.archlinux.org/packages/maa-assistant-arknights/) 安装 maa-core
::: code-tabs
@tab:active paru
```bash :no-line-numbers
paru -S maa-assistant-arknights
```
@tab:active paru
@tab yay
```bash :no-line-numbers
yay -S maa-assistant-arknights
```
:::
```bash :no-line-numbers
paru -S maa-assistant-arknights
```
@tab yay
```bash :no-line-numbers
yay -S maa-assistant-arknights
```
:::
@tab Nix
Nix 上的 maa-cli 强制依赖 MaaCore因此 Nix 用户无需,也不应该手动安装 MaaCore

View File

@@ -10,6 +10,7 @@ icon: ri:guide-fill
## 前置准备
:::: steps
1. 确认系统版本
MAA 在 Windows 下仅支持 10 和 11旧版 Windows 请参阅[常见问题](./faq.md#系统问题)中的系统问题部分。
@@ -37,7 +38,7 @@ icon: ri:guide-fill
6. 正确设置模拟器分辨率
模拟器分辨率应为横屏的 `1280x720``1920x1080`对于美服YosterEN玩家必须为 `1920x1080`
::::
::::
## 初始配置

View File

@@ -1,45 +1,31 @@
{
"name": "MaaAssistantArknights",
"controller": [
{
"name": "Adb",
"type": "Adb"
}
],
"resource": [
{
"name": "官服 | Official",
"path": [
"{PROJECT_DIR}/resource"
]
},
{
"name": "日服 | YoStarJP",
"path": [
"{PROJECT_DIR}/resource",
"{PROJECT_DIR}/resource/global/YoStarJP/resource"
]
},
{
"name": "韩服 | YoStarKR",
"path": [
"{PROJECT_DIR}/resource",
"{PROJECT_DIR}/resource/global/YoStarKR/resource"
]
},
{
"name": "美服 | YoStarEN",
"path": [
"{PROJECT_DIR}/resource",
"{PROJECT_DIR}/resource/global/YoStarEN/resource"
]
},
{
"name": "台服 | txwy",
"path": [
"{PROJECT_DIR}/resource",
"{PROJECT_DIR}/resource/global/txwy/resource"
]
}
]
"name": "MaaAssistantArknights",
"controller": [
{
"name": "Adb",
"type": "Adb"
}
],
"resource": [
{
"name": "官服 | Official",
"path": ["{PROJECT_DIR}/resource"]
},
{
"name": "日服 | YoStarJP",
"path": ["{PROJECT_DIR}/resource", "{PROJECT_DIR}/resource/global/YoStarJP/resource"]
},
{
"name": "韩服 | YoStarKR",
"path": ["{PROJECT_DIR}/resource", "{PROJECT_DIR}/resource/global/YoStarKR/resource"]
},
{
"name": "美服 | YoStarEN",
"path": ["{PROJECT_DIR}/resource", "{PROJECT_DIR}/resource/global/YoStarEN/resource"]
},
{
"name": "台服 | txwy",
"path": ["{PROJECT_DIR}/resource", "{PROJECT_DIR}/resource/global/txwy/resource"]
}
]
}

View File

@@ -31,15 +31,15 @@
1. 把他丢进 Maa 文件夹下,形成如下文件结构.备注: 启动脚本[Maa-HTTP-Server-startup.bat](Maa-HTTP-Server-startup.bat).
```text
MaaCoreArknights_v3.9.0-beta.8
│ MAA.exe
│ MaaCore.dll
│ ...
└───Java-HTTP
│ Maa-HTTP-0.0.1.jar
│ Maa-HTTP-Server-startup.bat
```
```text
MaaCoreArknights_v3.9.0-beta.8
│ MAA.exe
│ MaaCore.dll
│ ...
└───Java-HTTP
│ Maa-HTTP-0.0.1.jar
│ Maa-HTTP-Server-startup.bat
```
2. 双击Maa-HTTP-Server-startup.bat启动.
3. 默认端口号8848钛金端口,如需修改,请修改 Maa-HTTP-Server-startup.bat 中的-port=8848 .
@@ -86,11 +86,11 @@
```json
{
"data": {
"version": "v3.9.0-beta"
},
"code": 0,
"message": "success"
"data": {
"version": "v3.9.0-beta"
},
"code": 0,
"message": "success"
}
```
@@ -108,9 +108,9 @@
```json
{
"adbPath": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe",
"host": "127.0.0.1:62001",
"detailJson": ""
"adbPath": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe",
"host": "127.0.0.1:62001",
"detailJson": ""
}
```
@@ -126,12 +126,12 @@
```json
{
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"result": true
},
"code": 0,
"message": "success"
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"result": true
},
"code": 0,
"message": "success"
}
```
@@ -158,11 +158,11 @@
```json
{
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"type": "Fight",
"params": {
"stage": "LastBattle"
}
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"type": "Fight",
"params": {
"stage": "LastBattle"
}
}
```
@@ -178,12 +178,12 @@
```json
{
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"taskId": 0
},
"code": 0,
"message": "success"
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"taskId": 0
},
"code": 0,
"message": "success"
}
```
@@ -208,12 +208,12 @@
```json
{
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"type": "Fight",
"taskId": 0,
"params": {
"stage": "LastBattle"
}
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"type": "Fight",
"taskId": 0,
"params": {
"stage": "LastBattle"
}
}
```
@@ -230,12 +230,12 @@
```json
{
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"result": false
},
"code": 0,
"message": "success"
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"result": false
},
"code": 0,
"message": "success"
}
```
@@ -260,7 +260,7 @@
```json
{
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3"
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3"
}
```
@@ -274,12 +274,12 @@
```json
{
"data": {
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"result": true
},
"code": 0,
"message": "success"
"data": {
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"result": true
},
"code": 0,
"message": "success"
}
```
@@ -304,7 +304,7 @@
```json
{
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3"
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3"
}
```
@@ -318,12 +318,12 @@
```json
{
"data": {
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"result": true
},
"code": 0,
"message": "success"
"data": {
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"result": true
},
"code": 0,
"message": "success"
}
```
@@ -348,7 +348,7 @@
```json
{
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3"
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3"
}
```
@@ -362,12 +362,12 @@
```json
{
"data": {
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"result": true
},
"code": 0,
"message": "success"
"data": {
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"result": true
},
"code": 0,
"message": "success"
}
```
@@ -394,19 +394,19 @@
```json
{
"data": {
"list": [
{
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"host": "127.0.0.1:62026",
"adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe",
"uuid": "",
"status": 0
}
]
},
"code": 0,
"message": "success"
"data": {
"list": [
{
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"host": "127.0.0.1:62026",
"adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe",
"uuid": "",
"status": 0
}
]
},
"code": 0,
"message": "success"
}
```
@@ -468,9 +468,9 @@
```json
{
"command": "getVersion",
"msgId": 114514,
"data": {}
"command": "getVersion",
"msgId": 114514,
"data": {}
}
```
@@ -484,13 +484,13 @@
```json
{
"data": {
"version": "v3.9.0-beta"
},
"command": "getVersion",
"msgId": 114514,
"code": 0,
"message": "success"
"data": {
"version": "v3.9.0-beta"
},
"command": "getVersion",
"msgId": 114514,
"code": 0,
"message": "success"
}
```
@@ -506,12 +506,12 @@
```json
{
"command": "connect",
"msgId": 114514,
"data": {
"adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe",
"host": "127.0.0.1:62001"
}
"command": "connect",
"msgId": 114514,
"data": {
"adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe",
"host": "127.0.0.1:62001"
}
}
```
@@ -525,14 +525,14 @@
```json
{
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"result": true
},
"command": "connect",
"msgId": 114514,
"code": 0,
"message": "success"
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"result": true
},
"command": "connect",
"msgId": 114514,
"code": 0,
"message": "success"
}
```
@@ -552,27 +552,27 @@ appendTask setTaskParams start stop等接口不再描述均可遵循以上规
```json
{
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"logId": 1,
"msg": 2,
"details": {
"uuid": "",
"details": {
"adb": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe",
"address": "127.0.0.1:62001",
"config": "General",
"width": 1280,
"height": 720
},
"what": "ResolutionGot",
"why": ""
}
},
"command": "callBack",
"msgId": 0,
"code": 0,
"message": "success"
"data": {
"id": "46b9d5cd60382f100b336b17d6817f8eda255f73",
"logId": 1,
"msg": 2,
"details": {
"uuid": "",
"details": {
"adb": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe",
"address": "127.0.0.1:62001",
"config": "General",
"width": 1280,
"height": 720
},
"what": "ResolutionGot",
"why": ""
}
},
"command": "callBack",
"msgId": 0,
"code": 0,
"message": "success"
}
```

View File

@@ -21,9 +21,9 @@
```json
{
"core": "2022-07-24-16-43-52-8218e7f",
"result": 0,
"server": "v0.0.1"
"core": "2022-07-24-16-43-52-8218e7f",
"result": 0,
"server": "v0.0.1"
}
```
@@ -44,8 +44,8 @@
```json
{
"id": 1,
"result": 0
"id": 1,
"result": 0
}
```
@@ -65,7 +65,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -77,7 +77,7 @@
```json
{
"result": 0
"result": 0
}
```
@@ -95,8 +95,8 @@
```json
{
"instances": [1],
"result": 0
"instances": [1],
"result": 0
}
```
@@ -116,10 +116,10 @@
```json
{
"id": 1,
"adb_path": "adb.exe",
"target": "127.0.0.1:62025",
"config": null
"id": 1,
"adb_path": "adb.exe",
"target": "127.0.0.1:62025",
"config": null
}
```
@@ -134,7 +134,7 @@
```json
{
"result": 0
"result": 0
}
```
@@ -150,7 +150,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -162,8 +162,8 @@
```json
{
"result": 0,
"target": "127.0.0.1:62025"
"result": 0,
"target": "127.0.0.1:62025"
}
```
@@ -183,8 +183,8 @@
```json
{
"uuid": "af01fba4f43da740\r\n",
"nums": 5
"uuid": "af01fba4f43da740\r\n",
"nums": 5
}
```
@@ -197,23 +197,23 @@
```json
{
"msgs": [
{
"body": {
"details": {
"adb": "adb.exe",
"address": "127.0.0.1:62025",
"config": "General"
},
"uuid": "af01fba4f43da740",
"what": "Connected",
"why": ""
},
"time": 1658687213962,
"type": 2
}
],
"result": 0
"msgs": [
{
"body": {
"details": {
"adb": "adb.exe",
"address": "127.0.0.1:62025",
"config": "General"
},
"uuid": "af01fba4f43da740",
"what": "Connected",
"why": ""
},
"time": 1658687213962,
"type": 2
}
],
"result": 0
}
```
@@ -236,7 +236,7 @@
```json
{
"uuid": "af01fba4f43da740\r\n"
"uuid": "af01fba4f43da740\r\n"
}
```
@@ -248,7 +248,7 @@
```json
{
"result": 0
"result": 0
}
```
@@ -266,8 +266,8 @@
```json
{
"result": 0,
"uuid": ["af01fba4f43da740"]
"result": 0,
"uuid": ["af01fba4f43da740"]
}
```
@@ -287,7 +287,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -299,8 +299,8 @@
```json
{
"result": 0,
"uuid": "af01fba4f43da740\r\n"
"result": 0,
"uuid": "af01fba4f43da740\r\n"
}
```
@@ -320,9 +320,9 @@
```json
{
"id": 1,
"types": "StartUp",
"params": {}
"id": 1,
"types": "StartUp",
"params": {}
}
```
@@ -336,8 +336,8 @@
```json
{
"result": 0,
"task_id": 1
"result": 0,
"task_id": 1
}
```
@@ -357,9 +357,9 @@
```json
{
"id": 1,
"task_id": 1,
"params": {}
"id": 1,
"task_id": 1,
"params": {}
}
```
@@ -373,7 +373,7 @@
```json
{
"result": 0
"result": 0
}
```
@@ -389,7 +389,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -401,13 +401,13 @@
```json
{
"result": 0,
"tasks": {
"1": {
"params": "{}",
"type": "StartUp"
}
"result": 0,
"tasks": {
"1": {
"params": "{}",
"type": "StartUp"
}
}
}
```
@@ -427,7 +427,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -439,7 +439,7 @@
```json
{
"result": 0
"result": 0
}
```
@@ -455,7 +455,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -467,7 +467,7 @@
```json
{
"result": 0
"result": 0
}
```
@@ -483,7 +483,7 @@
```json
{
"id": 1
"id": 1
}
```
@@ -509,9 +509,9 @@
```json
{
"id": 1,
"x": 114,
"y": 514
"id": 1,
"x": 114,
"y": 514
}
```
@@ -525,7 +525,7 @@
```json
{
"result": 0
"result": 0
}
```

View File

@@ -55,25 +55,25 @@ Enjoy!
1. 不要破坏缩进(包括空行不带空格)
2. `<ResourceDictionary x:Uid="KeyName">` 如果能在资源字典找到Uid对应的Key把对应的Value作为注释写入像这样注意注释中的空格
```xml
<!-- 设置 -->
<ResourceDictionary x:Uid="Settings">
</ResourceDictionary>
```
```xml
<!-- 设置 -->
<ResourceDictionary x:Uid="Settings">
</ResourceDictionary>
```
3. 由于字典被拆分了,重复的键要交给脚本检查
4. 因为zh-cn可能会混入一些中文梗所以ja-jp、ko-kr尽量由en-us翻译
```code
check duplicate Key()
if exist duplicate Key:
throw (or raise) an exception
```code
check duplicate Key()
if exist duplicate Key:
throw (or raise) an exception
zh-cn -> zh-tw
if exist en-us:
en-us -> ja-jp
en-us -> ko-kr
else:
zh-cn -> ja-jp
zh-cn -> ko-kr
zh-cn -> en-us
```
zh-cn -> zh-tw
if exist en-us:
en-us -> ja-jp
en-us -> ko-kr
else:
zh-cn -> ja-jp
zh-cn -> ko-kr
zh-cn -> en-us
```