mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-03 03:00:29 +08:00
Compare commits
166 Commits
ci/check
...
feat/self_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
03f719645a | ||
|
|
e0860ed779 | ||
|
|
1324165cfe | ||
|
|
96aa7ada11 | ||
|
|
ca3160bd72 | ||
|
|
c3bac8b504 | ||
|
|
642c62498c | ||
|
|
56cf52808d | ||
|
|
5d47ede186 | ||
|
|
a48fe44663 | ||
|
|
a872081615 | ||
|
|
485ef8fcbf | ||
|
|
c450e596f7 | ||
|
|
f9c16319a8 | ||
|
|
5db20fe2c4 | ||
|
|
e12c7f948d | ||
|
|
cb546b4370 | ||
|
|
c193b26b62 | ||
|
|
91c8a22d1c | ||
|
|
b8205b5593 | ||
|
|
68248df197 | ||
|
|
db98bb370e | ||
|
|
bf2375a44f | ||
|
|
d12fb7d565 | ||
|
|
9838dec4fd | ||
|
|
793d03d47b | ||
|
|
56d796c92e | ||
|
|
aae995aef5 | ||
|
|
9159e5d979 | ||
|
|
705c5a4c68 | ||
|
|
a563b14f47 | ||
|
|
400fd6bf53 | ||
|
|
2915338cac | ||
|
|
09dc393c98 | ||
|
|
0650cdb64e | ||
|
|
385c521eb4 | ||
|
|
a37a74a4e2 | ||
|
|
1d2d49920a | ||
|
|
da82e14efc | ||
|
|
ad9103ea12 | ||
|
|
26296b3b82 | ||
|
|
72ba949f1c | ||
|
|
1102771ea1 | ||
|
|
9d9f95ea4a | ||
|
|
0e33a53068 | ||
|
|
081c0b7597 | ||
|
|
e3de09ddcc | ||
|
|
81e22e5bf9 | ||
|
|
424687c3e1 | ||
|
|
94e6fabb76 | ||
|
|
8d346ed392 | ||
|
|
fd3204e965 | ||
|
|
7109310145 | ||
|
|
a424520a1d | ||
|
|
b98ae1be2d | ||
|
|
5eaf466128 | ||
|
|
8dc7893459 | ||
|
|
e891471750 | ||
|
|
9014a20c25 | ||
|
|
4280d9356a | ||
|
|
b8e739bcad | ||
|
|
f9c76d4995 | ||
|
|
28ca820784 | ||
|
|
d8dbec69ca | ||
|
|
ada9b0849b | ||
|
|
99e64b3ea8 | ||
|
|
e7be333557 | ||
|
|
8da2271af1 | ||
|
|
7b58ddee5b | ||
|
|
fcfa9c033c | ||
|
|
1992af7159 | ||
|
|
a6b5101e0c | ||
|
|
e03a96774d | ||
|
|
261ddc49d9 | ||
|
|
bb735b6ee7 | ||
|
|
c54b45c09f | ||
|
|
eb061dcc59 | ||
|
|
bc7dc763fe | ||
|
|
3bfc2662e3 | ||
|
|
f4c21be051 | ||
|
|
2936006087 | ||
|
|
efa364043d | ||
|
|
7b6dada3ea | ||
|
|
be3b1a2057 | ||
|
|
67ceb02116 | ||
|
|
aa7a2731e0 | ||
|
|
df8f3786f0 | ||
|
|
20b167119a | ||
|
|
b1f02a2eb5 | ||
|
|
f9e424cd3b | ||
|
|
5eecbe21c1 | ||
|
|
32a3523bc4 | ||
|
|
7dd2dbdcbe | ||
|
|
27f9df768d | ||
|
|
2350a05fc4 | ||
|
|
3ea9912802 | ||
|
|
a9e31c75d0 | ||
|
|
4e46a392a3 | ||
|
|
2f09f9e591 | ||
|
|
55f675fb8d | ||
|
|
36fc9a8e0a | ||
|
|
cfd463a7fd | ||
|
|
2884f2d0ae | ||
|
|
0af752b083 | ||
|
|
212cb506d6 | ||
|
|
6ed32b3344 | ||
|
|
4a2901c473 | ||
|
|
18bec2504d | ||
|
|
7c4002351e | ||
|
|
4e0b5ace24 | ||
|
|
acfb173cc3 | ||
|
|
feb7b6109f | ||
|
|
552d7784a2 | ||
|
|
b1d10a87dc | ||
|
|
30bb86bade | ||
|
|
80511c660f | ||
|
|
45ca28ed74 | ||
|
|
a208c1f03b | ||
|
|
5b33bc3f00 | ||
|
|
6202eedeb3 | ||
|
|
a70502521d | ||
|
|
66a5095ede | ||
|
|
5b750ca194 | ||
|
|
b18e4e6ff6 | ||
|
|
31761d7e5d | ||
|
|
c881362cb1 | ||
|
|
00e5c1eb9f | ||
|
|
7e3ab62aae | ||
|
|
b0713bb9df | ||
|
|
42343f8978 | ||
|
|
e9383a7783 | ||
|
|
e0ee76115b | ||
|
|
d6bf677bb1 | ||
|
|
746816c6c7 | ||
|
|
4d74abfd8f | ||
|
|
5853354357 | ||
|
|
022ab93c1c | ||
|
|
cd8d22d23e | ||
|
|
da1170ecc9 | ||
|
|
df46d6bcb0 | ||
|
|
bf27a7fc86 | ||
|
|
482f21620e | ||
|
|
1472d80c12 | ||
|
|
5bfc5fce9f | ||
|
|
dcd2d52a5a | ||
|
|
2c87975e52 | ||
|
|
e3245a4163 | ||
|
|
43ea1f94df | ||
|
|
1077b08c19 | ||
|
|
d02393f174 | ||
|
|
bc59477b24 | ||
|
|
e4cb99c0c0 | ||
|
|
e65219efc5 | ||
|
|
8bffeaa368 | ||
|
|
b017e90b6b | ||
|
|
36da60ed9d | ||
|
|
a71eb71eff | ||
|
|
283329f8ea | ||
|
|
01eed2a376 | ||
|
|
a13212ea6e | ||
|
|
cb31aa0dbd | ||
|
|
61265768e5 | ||
|
|
85975d642c | ||
|
|
8d5806b9e1 | ||
|
|
5b32c3a985 | ||
|
|
4dc488229d |
29
.devcontainer/Dockerfile
Normal file
29
.devcontainer/Dockerfile
Normal file
@@ -0,0 +1,29 @@
|
||||
FROM mcr.microsoft.com/devcontainers/base:ubuntu
|
||||
|
||||
USER vscode
|
||||
|
||||
ENV CONDA_DIR=/home/vscode/miniconda
|
||||
ENV PATH="$CONDA_DIR/bin:$PATH"
|
||||
|
||||
ARG PYTHON_VERSION=3.12
|
||||
ARG NODEJS_VERSION=24
|
||||
|
||||
# Install Miniconda
|
||||
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \
|
||||
&& bash ~/miniconda.sh -b -p $CONDA_DIR \
|
||||
&& rm ~/miniconda.sh \
|
||||
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main \
|
||||
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
|
||||
|
||||
# Configure conda environment
|
||||
RUN eval "$(conda shell.bash hook)" \
|
||||
&& conda create -n maa python=$PYTHON_VERSION -y \
|
||||
&& conda activate maa \
|
||||
&& conda install -y conda-forge::nodejs=$NODEJS_VERSION \
|
||||
&& pip install pre-commit black \
|
||||
&& npm install -g pnpm
|
||||
|
||||
# Finalize conda setup
|
||||
RUN conda init \
|
||||
&& conda config --set auto_activate false \
|
||||
&& echo "conda activate maa" >> ~/.bashrc
|
||||
@@ -1,13 +1,50 @@
|
||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
|
||||
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
|
||||
{
|
||||
"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04",
|
||||
"features": {
|
||||
"ghcr.io/devcontainers/features/python:1": {},
|
||||
"ghcr.io/devcontainers/features/sshd:1": {}
|
||||
"name": "MAA",
|
||||
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
|
||||
// "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
|
||||
"build": {
|
||||
"dockerfile": "Dockerfile"
|
||||
},
|
||||
"postCreateCommand": "sudo sh -ce 'wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 20'",
|
||||
// Features to add to the dev container. More info: https://containers.dev/features.
|
||||
// "features": {},
|
||||
|
||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||
"forwardPorts": [3001],
|
||||
|
||||
// Use 'postCreateCommand' to run commands after the container is created.
|
||||
"postCreateCommand": "bash .devcontainer/post-create.sh",
|
||||
|
||||
// Configure tool-specific properties.
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": ["llvm-vs-code-extensions.vscode-clangd", "DavidAnson.vscode-markdownlint"]
|
||||
"extensions": [
|
||||
"mkxml.vscode-filesize",
|
||||
"nekosu.maa-support",
|
||||
"DavidAnson.vscode-markdownlint",
|
||||
"esbenp.prettier-vscode",
|
||||
"vue.volar",
|
||||
"ms-python.python",
|
||||
"ms-python.black-formatter"
|
||||
],
|
||||
"settings": {
|
||||
// format
|
||||
"editor.formatOnSave": true,
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
||||
"[markdown]": {
|
||||
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
|
||||
},
|
||||
"[python]": {
|
||||
"editor.defaultFormatter": "ms-python.black-formatter"
|
||||
},
|
||||
// python
|
||||
"python.terminal.launchArgs": ["-u"],
|
||||
"python.defaultInterpreterPath": "/home/vscode/miniconda/envs/maa/bin/python",
|
||||
"python.terminal.activateEnvironment": false
|
||||
}
|
||||
}
|
||||
}
|
||||
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
|
||||
// "remoteUser": "root"
|
||||
}
|
||||
|
||||
21
.devcontainer/post-create.sh
Normal file
21
.devcontainer/post-create.sh
Normal file
@@ -0,0 +1,21 @@
|
||||
#!/bin/bash
|
||||
WORKSPACE=$(pwd)
|
||||
|
||||
# conda activate maa
|
||||
|
||||
echo "===================="
|
||||
echo "Setting up git safe.directory for $WORKSPACE and its submodules..."
|
||||
cd "$WORKSPACE"
|
||||
git config --global --add safe.directory "$WORKSPACE"
|
||||
git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$path"'
|
||||
|
||||
echo "===================="
|
||||
cd "$WORKSPACE"
|
||||
echo "Installing dependencies for python..."
|
||||
# pip install -r tools/.../requirements.txt
|
||||
# pip install -r tools/.../requirements-dev.txt
|
||||
|
||||
echo "===================="
|
||||
echo "Installing dependencies for nodejs..."
|
||||
cd "$WORKSPACE"/docs
|
||||
pnpm install --frozen-lockfile
|
||||
2
.github/ISSUE_TEMPLATE/cn-bug-report.yaml
vendored
2
.github/ISSUE_TEMPLATE/cn-bug-report.yaml
vendored
@@ -15,7 +15,7 @@ body:
|
||||
required: false
|
||||
- label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容并未提及该 Bug 已被修复的情况
|
||||
required: false
|
||||
- label: 我已检查了 [常见问题](https://maa.plus/docs/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的问题未被提及
|
||||
- label: 我已检查了 [常见问题](https://docs.maa.plus/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的问题未被提及
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
@@ -15,7 +15,7 @@ body:
|
||||
required: false
|
||||
- label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容,确认我的建议未被提及
|
||||
required: false
|
||||
- label: 我已检查了 [常见问题](https://maa.plus/docs/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的建议未被提及
|
||||
- label: 我已检查了 [常见问题](https://docs.maa.plus/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的建议未被提及
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/en-bug-report.yaml
vendored
2
.github/ISSUE_TEMPLATE/en-bug-report.yaml
vendored
@@ -17,7 +17,7 @@ body:
|
||||
required: true
|
||||
- label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution.
|
||||
required: false
|
||||
- label: I have reviewed the [FAQs](https://maa.plus/docs/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my issue has not been mentioned.
|
||||
- label: I have reviewed the [FAQs](https://docs.maa.plus/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my issue has not been mentioned.
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
@@ -17,7 +17,7 @@ body:
|
||||
required: true
|
||||
- label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution.
|
||||
required: false
|
||||
- label: I have reviewed the [FAQs](https://maa.plus/docs/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my feature/suggestion has not been mentioned.
|
||||
- label: I have reviewed the [FAQs](https://docs.maa.plus/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my feature/suggestion has not been mentioned.
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
75
.github/stale_cache_cleanup.ps1
vendored
Normal file
75
.github/stale_cache_cleanup.ps1
vendored
Normal file
@@ -0,0 +1,75 @@
|
||||
$totalClearedSize = 0
|
||||
$cacheList = gh cache list --json id,key,ref,sizeInBytes,createdAt | ConvertFrom-Json
|
||||
|
||||
# List of keys to process
|
||||
$keyPatterns = @(
|
||||
"Windows-x64-nuget",
|
||||
"Windows-x64-maadeps",
|
||||
"Windows-arm64-nuget",
|
||||
"Windows-arm64-maadeps",
|
||||
"macOS-x64-maadeps",
|
||||
"macOS-arm64-maadeps",
|
||||
"Linux-x64-maadeps",
|
||||
"Linux-arm64-maadeps",
|
||||
"Smoke-testing"
|
||||
)
|
||||
|
||||
# Filter caches matching any of our key patterns
|
||||
$matchingCaches = $cacheList | Where-Object {
|
||||
$cache = $_
|
||||
($keyPatterns | Where-Object { $cache.key -like "*$_*" }).Count -gt 0
|
||||
}
|
||||
|
||||
# Get unique branch references from the matching caches
|
||||
$branches = $matchingCaches | Select-Object -Property ref -Unique | ForEach-Object { $_.ref }
|
||||
|
||||
Write-Output "Found caches across $($branches.Count) branches"
|
||||
|
||||
foreach ($branch in $branches) {
|
||||
# Extract branch name from ref for display
|
||||
$branchName = $branch -replace "refs/heads/", ""
|
||||
if ($branch -match "refs/pull/(\d+)/merge") {
|
||||
$branchName = "PR #$($matches[1])"
|
||||
}
|
||||
|
||||
Write-Output "Processing caches for branch: $branchName"
|
||||
|
||||
# Filter for current branch caches
|
||||
$branchCaches = $matchingCaches | Where-Object { $_.ref -eq $branch }
|
||||
|
||||
foreach ($pattern in $keyPatterns) {
|
||||
Write-Output " Processing $branchName branch caches for pattern: $pattern"
|
||||
|
||||
# Filter for caches matching the current key pattern within branch
|
||||
$patternCaches = $branchCaches | Where-Object { $_.key -like "*$pattern*" }
|
||||
|
||||
if (-not $patternCaches) {
|
||||
Write-Output " No $branchName branch caches found for pattern: $pattern"
|
||||
continue
|
||||
}
|
||||
|
||||
# Sort by creation time (newest first)
|
||||
$sortedCaches = $patternCaches | Sort-Object -Property createdAt -Descending
|
||||
|
||||
# Keep the first one (latest) and delete the rest
|
||||
$latestCache = $sortedCaches[0]
|
||||
Write-Output " Keeping latest cache for $branchName/${pattern}: '$($latestCache.key)' (ID: $($latestCache.id))"
|
||||
|
||||
# Delete all except the latest one
|
||||
for ($i = 1; $i -lt $sortedCaches.Count; $i++) {
|
||||
$cache = $sortedCaches[$i]
|
||||
$cacheId = $cache.id
|
||||
$cacheKey = $cache.key
|
||||
|
||||
Write-Output " Deleting cache for $branchName/${pattern}: '$cacheKey' (ID: $cacheId)"
|
||||
gh cache delete $cacheId
|
||||
|
||||
$totalClearedSize += $cache.sizeInBytes
|
||||
}
|
||||
}
|
||||
|
||||
Write-Output ""
|
||||
}
|
||||
|
||||
$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
|
||||
Write-Output "Total cleared size: $formattedSize MB"
|
||||
59
.github/stale_cache_dev.ps1
vendored
Normal file
59
.github/stale_cache_dev.ps1
vendored
Normal file
@@ -0,0 +1,59 @@
|
||||
$totalClearedSize = 0
|
||||
$cacheList = gh cache list --json id,key,ref,sizeInBytes,createdAt | ConvertFrom-Json
|
||||
|
||||
# Filter for dev branch caches only
|
||||
$devCaches = $cacheList | Where-Object { $_.ref -eq "refs/heads/dev" }
|
||||
|
||||
if (-not $devCaches) {
|
||||
Write-Output "No caches found for dev branch."
|
||||
exit
|
||||
}
|
||||
|
||||
# List of keys to process
|
||||
$keyPatterns = @(
|
||||
"Windows-x64-nuget",
|
||||
"Windows-x64-maadeps",
|
||||
"Windows-arm64-nuget",
|
||||
"Windows-arm64-maadeps",
|
||||
"macOS-x64-maadeps",
|
||||
"macOS-arm64-maadeps",
|
||||
"Linux-x64-maadeps",
|
||||
"Linux-arm64-maadeps",
|
||||
"Smoke-testing"
|
||||
)
|
||||
|
||||
foreach ($pattern in $keyPatterns) {
|
||||
Write-Output "Processing dev branch caches for pattern: $pattern"
|
||||
|
||||
# Filter for caches matching the current key pattern within dev branch
|
||||
$matchingCaches = $devCaches | Where-Object { $_.key -like "*$pattern*" }
|
||||
|
||||
if (-not $matchingCaches) {
|
||||
Write-Output " No dev branch caches found for pattern: $pattern"
|
||||
continue
|
||||
}
|
||||
|
||||
# Sort by creation time (newest first)
|
||||
$sortedCaches = $matchingCaches | Sort-Object -Property createdAt -Descending
|
||||
|
||||
# Keep the first one (latest) and delete the rest
|
||||
$latestCache = $sortedCaches[0]
|
||||
Write-Output " Keeping latest dev branch cache: '$($latestCache.key)' (ID: $($latestCache.id))"
|
||||
|
||||
# Delete all except the latest one
|
||||
for ($i = 1; $i -lt $sortedCaches.Count; $i++) {
|
||||
$cache = $sortedCaches[$i]
|
||||
$cacheId = $cache.id
|
||||
$cacheKey = $cache.key
|
||||
|
||||
Write-Output " Deleting dev branch cache: '$cacheKey' (ID: $cacheId)"
|
||||
gh cache delete $cacheId
|
||||
|
||||
$totalClearedSize += $cache.sizeInBytes
|
||||
}
|
||||
|
||||
Write-Output ""
|
||||
}
|
||||
|
||||
$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
|
||||
Write-Output "Total cleared size: $formattedSize MB"
|
||||
47
.github/workflows/ci.yml
vendored
47
.github/workflows/ci.yml
vendored
@@ -128,7 +128,7 @@ jobs:
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('./tools/maadeps-download.py') }}
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
@@ -158,7 +158,7 @@ jobs:
|
||||
path: |
|
||||
.nuke/temp
|
||||
~/.nuget/packages
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('**/*.csproj') }}
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-nuget-${{ hashFiles('**/*.csproj') }}
|
||||
|
||||
- name: Restore dependencies
|
||||
if: steps.cache-nuget.outputs.cache-hit != 'true'
|
||||
@@ -196,11 +196,16 @@ jobs:
|
||||
|
||||
cp tools/DependencySetup_依赖库安装.bat install
|
||||
|
||||
- name: Zip files
|
||||
run: |
|
||||
cd install
|
||||
Compress-Archive -Destination MAA-${{ needs.meta.outputs.tag }}-win-${{ matrix.arch }}.zip -Path ./*
|
||||
|
||||
- name: Upload MAA to Github
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: MAA-win-${{ matrix.arch }}
|
||||
path: install
|
||||
path: install/*.zip
|
||||
|
||||
ubuntu:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
@@ -225,26 +230,19 @@ jobs:
|
||||
git submodule update --init --depth 1 3rdparty/EmulatorExtras
|
||||
git submodule update --init --depth 1 src/maa-cli
|
||||
|
||||
- name: Cache MaaDeps and Toolchain
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ./MaaDeps
|
||||
key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py', 'tools/linux-toolchain-download.py') }}
|
||||
key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps and Toolchain
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
|
||||
python3 tools/linux-toolchain-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}
|
||||
|
||||
- name: Install llvm 20
|
||||
run: |
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh 20
|
||||
|
||||
- name: Config cmake
|
||||
run: |
|
||||
@@ -255,7 +253,7 @@ jobs:
|
||||
-DINSTALL_RESOURCE=ON \
|
||||
-DINSTALL_PYTHON=ON \
|
||||
-DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
|
||||
-DCMAKE_TOOLCHAIN_FILE=cmake/linux/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
|
||||
-DCMAKE_TOOLCHAIN_FILE=MaaDeps/cmake/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
@@ -351,12 +349,18 @@ jobs:
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
# ninja 1.13.1 is already installed and up-to-date. To reinstall 1.13.1, run: brew reinstall ninja
|
||||
# ninja 1.13.1 is already installed and up-to-date.
|
||||
# - name: Install Dependencies
|
||||
# run: |
|
||||
# brew install ninja
|
||||
|
||||
# Caching not necessary on macOS runner
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ./MaaDeps
|
||||
key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
run: |
|
||||
[[ ${{ matrix.arch }} = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx"
|
||||
@@ -373,7 +377,7 @@ jobs:
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build build --config Release --parallel $(nproc)
|
||||
cmake --build build --config Release --parallel $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Install
|
||||
run: |
|
||||
@@ -590,3 +594,12 @@ jobs:
|
||||
gh workflow run --repo $GITHUB_REPOSITORY release-ota
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
|
||||
|
||||
- name: Create issue if failed
|
||||
if: failure()
|
||||
uses: actions-cool/issues-helper@v3
|
||||
with:
|
||||
actions: "create-issue"
|
||||
title: "Failed Release"
|
||||
body: |
|
||||
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
|
||||
50
.github/workflows/codeql-web.yml
vendored
50
.github/workflows/codeql-web.yml
vendored
@@ -1,50 +0,0 @@
|
||||
name: "CodeQL Website Analysis"
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: ["dev"]
|
||||
paths:
|
||||
- "website/**"
|
||||
- "!**/*.md"
|
||||
schedule:
|
||||
- cron: "10 12 * * *" # Runs daily at 12:10 UTC
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
actions: write
|
||||
contents: read
|
||||
security-events: write
|
||||
|
||||
jobs:
|
||||
analyze-website:
|
||||
name: Analyze Website (JavaScript/TypeScript)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v5
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
- name: Setup CodeQL for JavaScript/TypeScript
|
||||
uses: github/codeql-action/init@v3
|
||||
with:
|
||||
languages: javascript-typescript
|
||||
build-mode: none
|
||||
|
||||
- name: Run CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v3
|
||||
with:
|
||||
category: "/language:multi-none"
|
||||
|
||||
- name: Delete old caches
|
||||
shell: bash
|
||||
run: |
|
||||
oldCaches=$(gh cache list --key codeql --order asc --json key | jq -r '.[] | .key' | head -n -1)
|
||||
for cache in $oldCaches; do
|
||||
if [ -n "$cache" ]; then
|
||||
echo "Deleting cache: $cache"
|
||||
gh cache delete "$cache" --confirm
|
||||
fi
|
||||
done
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
1
.github/workflows/markdown-checker.yml
vendored
1
.github/workflows/markdown-checker.yml
vendored
@@ -52,7 +52,6 @@ jobs:
|
||||
--exclude 'https?://.*'
|
||||
--exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md'
|
||||
--exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md'
|
||||
--exclude 'files/MAA_Runtime_Fix_Pwsh.ps1$'
|
||||
-- './docs/**/*.md' './README.md'
|
||||
|
||||
- name: Comment (only for PR)
|
||||
|
||||
18
.github/workflows/release-nightly-ota.yml
vendored
18
.github/workflows/release-nightly-ota.yml
vendored
@@ -16,12 +16,12 @@ on:
|
||||
limit_maa:
|
||||
description: "Number of releases to fetch from MaaAssistantArknights"
|
||||
required: true
|
||||
default: "10"
|
||||
default: 10
|
||||
type: number
|
||||
limit_mr:
|
||||
limit_maarelease:
|
||||
description: "Number of releases to fetch from MaaRelease"
|
||||
required: true
|
||||
default: "10"
|
||||
default: 10
|
||||
type: number
|
||||
|
||||
jobs:
|
||||
@@ -172,7 +172,7 @@ jobs:
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('./tools/maadeps-download.py') }}
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
@@ -202,7 +202,7 @@ jobs:
|
||||
path: |
|
||||
.nuke/temp
|
||||
~/.nuget/packages
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('**/*.csproj') }}
|
||||
key: ${{ runner.os }}-${{ matrix.arch }}-nuget-${{ hashFiles('**/*.csproj') }}
|
||||
|
||||
- name: Restore dependencies
|
||||
if: steps.cache-nuget.outputs.cache-hit != 'true'
|
||||
@@ -313,12 +313,12 @@ jobs:
|
||||
limit_maa=${limit_maa%.*}
|
||||
echo "Parsed limit_maa: $limit_maa"
|
||||
|
||||
limit_mr=${{ inputs.limit_mr || 10 }}
|
||||
limit_mr=${limit_mr%.*}
|
||||
echo "Parsed limit_mr: $limit_mr"
|
||||
limit_maarelease=${{ inputs.limit_maarelease || 10 }}
|
||||
limit_maarelease=${limit_maarelease%.*}
|
||||
echo "Parsed limit_maarelease: $limit_maarelease"
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit_maa | tee ./release_maa.txt
|
||||
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_mr | tee ./release_mr.txt
|
||||
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_maarelease | tee ./release_mr.txt
|
||||
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
|
||||
|
||||
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
|
||||
|
||||
25
.github/workflows/release-ota.yml
vendored
25
.github/workflows/release-ota.yml
vendored
@@ -9,12 +9,12 @@ on:
|
||||
limit:
|
||||
description: Number of releases to fetch from MaaAssistantArknights, 2 at least
|
||||
required: false
|
||||
default: "31"
|
||||
default: 31
|
||||
type: number
|
||||
limit_2:
|
||||
description: Number of releases to fetch from MaaRelease
|
||||
required: false
|
||||
default: "30"
|
||||
default: 30
|
||||
type: number
|
||||
|
||||
env:
|
||||
@@ -95,6 +95,9 @@ jobs:
|
||||
steps:
|
||||
- name: Download release config
|
||||
uses: actions/download-artifact@v5
|
||||
with:
|
||||
name: MaaReleaseConfig
|
||||
path: ./MaaReleaseConfig
|
||||
|
||||
- name: Fetch MaaRelease
|
||||
uses: actions/checkout@v5
|
||||
@@ -134,6 +137,15 @@ jobs:
|
||||
prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }}
|
||||
overwrite: true
|
||||
|
||||
- name: Create issue if failed
|
||||
if: failure()
|
||||
uses: actions-cool/issues-helper@v3
|
||||
with:
|
||||
actions: "create-issue"
|
||||
title: "Failed make release OTA for Windows"
|
||||
body: |
|
||||
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
|
||||
make-ota-mac:
|
||||
needs: create-tag
|
||||
runs-on: macos-14
|
||||
@@ -177,6 +189,15 @@ jobs:
|
||||
prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }}
|
||||
overwrite: true
|
||||
|
||||
- name: Create issue if failed
|
||||
if: failure()
|
||||
uses: actions-cool/issues-helper@v3
|
||||
with:
|
||||
actions: "create-issue"
|
||||
title: "Failed make release OTA for macos"
|
||||
body: |
|
||||
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
|
||||
release:
|
||||
needs:
|
||||
- make-ota
|
||||
|
||||
52
.github/workflows/res-update-game.yml
vendored
52
.github/workflows/res-update-game.yml
vendored
@@ -129,7 +129,7 @@ jobs:
|
||||
|
||||
# needs: [clone-resources-official, clone-resources-overseas, clone-resources-txwy]
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Checkout MAA
|
||||
uses: actions/checkout@v5
|
||||
@@ -146,11 +146,8 @@ jobs:
|
||||
with:
|
||||
key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdater/libc++.so.1
|
||||
./tools/ResourceUpdater/libc++abi.so.1
|
||||
./tools/ResourceUpdater/libopencv_world4.so.411
|
||||
./tools/ResourceUpdater/libunwind.so.1
|
||||
./tools/ResourceUpdater/ResourceUpdater
|
||||
./tools/ResourceUpdater/libopencv_world4.4.11.0.dylib
|
||||
./tools/ResourceUpdater/res_updater
|
||||
|
||||
- name: Cache MaaDeps
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
@@ -159,42 +156,34 @@ jobs:
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('tools/maadeps-download.py', 'tools/linux-toolchain-download.py') }}
|
||||
key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true' && steps.maadeps-cache.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python3 tools/maadeps-download.py x64-linux
|
||||
python3 tools/linux-toolchain-download.py x64
|
||||
|
||||
- name: Install llvm-20
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh 20
|
||||
python3 tools/maadeps-download.py arm64-osx
|
||||
|
||||
- name: Config cmake
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cd tools/ResourceUpdater
|
||||
mkdir -p build
|
||||
cmake -B build \
|
||||
cmake -B build -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DMAADEPS_TRIPLET='maa-x64-linux' \
|
||||
-DBUILD_RES_UPDATER=ON \
|
||||
-DCMAKE_TOOLCHAIN_FILE=cmake/linux/maa-x64-linux-toolchain.cmake
|
||||
-DMAADEPS_TRIPLET='maa-arm64-osx' \
|
||||
-DWITH_HASH_VERSION=ON
|
||||
|
||||
- name: Build
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake --build build --config Release --parallel $(nproc)
|
||||
cmake --build tools/ResourceUpdater/build --config Release --parallel $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Install
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake --install build --config Release --prefix tools/ResourceUpdater
|
||||
cmake --install tools/ResourceUpdater/build --prefix tools/ResourceUpdater --config Release
|
||||
|
||||
- name: Save ResourceUpdater to cache
|
||||
if: always() && steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
@@ -202,11 +191,8 @@ jobs:
|
||||
with:
|
||||
key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdater/libc++.so.1
|
||||
./tools/ResourceUpdater/libc++abi.so.1
|
||||
./tools/ResourceUpdater/libopencv_world4.so.411
|
||||
./tools/ResourceUpdater/libunwind.so.1
|
||||
./tools/ResourceUpdater/ResourceUpdater
|
||||
./tools/ResourceUpdater/libopencv_world4.4.11.0.dylib
|
||||
./tools/ResourceUpdater/res_updater
|
||||
|
||||
- name: Download txwy
|
||||
id: download-txwy
|
||||
@@ -270,7 +256,7 @@ jobs:
|
||||
|
||||
- name: Run Resource Updater
|
||||
run: |
|
||||
./tools/ResourceUpdater/ResourceUpdater
|
||||
./tools/ResourceUpdater/res_updater
|
||||
|
||||
- name: Task Sorting
|
||||
id: task_sorting
|
||||
@@ -286,7 +272,7 @@ jobs:
|
||||
- name: Update version.json date if necessary
|
||||
id: update_version
|
||||
run: |
|
||||
tools/ResourceUpdater/version.sh
|
||||
./tools/ResourceUpdater/version.zsh
|
||||
|
||||
- name: Setup python
|
||||
if: steps.update_version.outputs.contains_png == 'True'
|
||||
@@ -360,7 +346,7 @@ jobs:
|
||||
if: steps.update_version.outputs.changes != 'True' || steps.add_files.outputs.have_commits != 'True'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
|
||||
# if: steps.add_files.outputs.have_commits == 'True'
|
||||
# run: |
|
||||
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
|
||||
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
|
||||
# if: steps.add_files.outputs.have_commits == 'True'
|
||||
# run: |
|
||||
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
|
||||
|
||||
62
.github/workflows/smoke-testing.yml
vendored
62
.github/workflows/smoke-testing.yml
vendored
@@ -3,6 +3,7 @@ name: smoke-testing
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- ".github/workflows/smoke-testing.yml"
|
||||
- "3rdparty/include/**"
|
||||
- "include/**"
|
||||
- "src/Cpp/**"
|
||||
@@ -14,6 +15,7 @@ on:
|
||||
- "tools/maadeps-download.py"
|
||||
pull_request:
|
||||
paths:
|
||||
- ".github/workflows/smoke-testing.yml"
|
||||
- "3rdparty/include/**"
|
||||
- "include/**"
|
||||
- "src/Cpp/**"
|
||||
@@ -25,17 +27,13 @@ on:
|
||||
- "tools/maadeps-download.py"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
smoke-testing:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v5
|
||||
@@ -53,15 +51,10 @@ jobs:
|
||||
with:
|
||||
key: ${{ steps.cache_key.outputs.key }}
|
||||
path: |
|
||||
./install/AsstCaller.h
|
||||
./install/AsstPort.h
|
||||
./install/libc++.so.1
|
||||
./install/libc++abi.so.1
|
||||
./install/libfastdeploy_ppocr.so
|
||||
./install/libMaaCore.so
|
||||
./install/libonnxruntime.so.1
|
||||
./install/libopencv_world4.so.411
|
||||
./install/libunwind.so.1
|
||||
./install/libfastdeploy_ppocr.dylib
|
||||
./install/libMaaCore.dylib
|
||||
./install/libonnxruntime.1.19.2.dylib
|
||||
./install/libopencv_world4.4.11.0.dylib
|
||||
./install/smoke_test
|
||||
|
||||
- name: Fetch submodules
|
||||
@@ -75,37 +68,30 @@ jobs:
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ./MaaDeps
|
||||
key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('tools/maadeps-download.py', 'tools/linux-toolchain-download.py') }}
|
||||
key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true' && steps.maadeps-cache.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python3 tools/maadeps-download.py x64-linux
|
||||
python3 tools/linux-toolchain-download.py x64
|
||||
|
||||
- name: Install llvm-20
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh 20
|
||||
python3 tools/maadeps-download.py arm64-osx
|
||||
|
||||
- name: Config cmake
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
mkdir -p build
|
||||
cmake -B build \
|
||||
cmake -B build -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=Debug \
|
||||
-DMAADEPS_TRIPLET='maa-x64-linux' \
|
||||
-DMAADEPS_TRIPLET='maa-arm64-osx' \
|
||||
-DBUILD_SMOKE_TEST=ON \
|
||||
-DCMAKE_TOOLCHAIN_FILE=cmake/linux/maa-x64-linux-toolchain.cmake
|
||||
-DINSTALL_RESOURCE=ON \
|
||||
-DWITH_HASH_VERSION=ON
|
||||
|
||||
- name: Build
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake --build build --config Debug --parallel $(nproc)
|
||||
cmake --build build --config Debug --parallel $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Install
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
@@ -113,9 +99,14 @@ jobs:
|
||||
mkdir -p install
|
||||
cmake --install build --prefix install --config Debug
|
||||
|
||||
- name: Make link for cache smoke-testing
|
||||
if: steps.smoke-cache.outputs.cache-hit == 'true'
|
||||
run: |
|
||||
ln -s "$(pwd)/resource" install/resource
|
||||
|
||||
- name: Run tests
|
||||
run: |
|
||||
./tools/SmokeTesting/run_tests.sh
|
||||
./tools/SmokeTesting/run_tests.zsh
|
||||
|
||||
- name: Save cache smoke-testing (only in dev)
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev'
|
||||
@@ -123,15 +114,10 @@ jobs:
|
||||
with:
|
||||
key: ${{ steps.cache_key.outputs.key }}
|
||||
path: |
|
||||
./install/AsstCaller.h
|
||||
./install/AsstPort.h
|
||||
./install/libc++.so.1
|
||||
./install/libc++abi.so.1
|
||||
./install/libfastdeploy_ppocr.so
|
||||
./install/libMaaCore.so
|
||||
./install/libonnxruntime.so.1
|
||||
./install/libopencv_world4.so.411
|
||||
./install/libunwind.so.1
|
||||
./install/libfastdeploy_ppocr.dylib
|
||||
./install/libMaaCore.dylib
|
||||
./install/libonnxruntime.1.19.2.dylib
|
||||
./install/libopencv_world4.4.11.0.dylib
|
||||
./install/smoke_test
|
||||
|
||||
- name: Upload logs
|
||||
|
||||
89
.github/workflows/website-workflow.yml
vendored
89
.github/workflows/website-workflow.yml
vendored
@@ -8,108 +8,65 @@ on:
|
||||
paths:
|
||||
- ".github/workflows/website-workflow.yml"
|
||||
- "docs/**"
|
||||
- "website/**"
|
||||
pull_request:
|
||||
paths:
|
||||
- ".github/workflows/website-workflow.yml"
|
||||
- "docs/**"
|
||||
- "website/**"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
deploy-to-prod-env:
|
||||
description: "Deploy to production environment"
|
||||
deploy-to-prod:
|
||||
description: "Deploy to prod"
|
||||
default: false
|
||||
required: true
|
||||
type: boolean
|
||||
|
||||
concurrency:
|
||||
group: "pages"
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
build:
|
||||
timeout-minutes: 20
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
steps:
|
||||
- name: Check out code
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
- name: Setup Pages
|
||||
uses: actions/configure-pages@v5
|
||||
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 9
|
||||
version: 10
|
||||
run_install: false
|
||||
|
||||
- name: Setup Node.js environment
|
||||
uses: actions/setup-node@v5
|
||||
with:
|
||||
node-version: 22
|
||||
node-version: 24
|
||||
cache: pnpm
|
||||
cache-dependency-path: "./docs/pnpm-lock.yaml"
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
working-directory: "./website"
|
||||
working-directory: "./docs"
|
||||
|
||||
- name: Build
|
||||
- name: Build documentation
|
||||
run: pnpm run build
|
||||
working-directory: "./website"
|
||||
working-directory: "./docs"
|
||||
|
||||
- name: Upload artifact to GitHub
|
||||
uses: actions/upload-artifact@v4
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-pages-artifact@v3
|
||||
with:
|
||||
name: dist
|
||||
path: "./website/dist"
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
needs: build
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
- name: Download website artifacts
|
||||
uses: actions/download-artifact@v5
|
||||
with:
|
||||
name: dist
|
||||
|
||||
- name: Set deployment environment
|
||||
id: set-deployment-env
|
||||
run: |
|
||||
if [[ "${{ github.event_name }}" != "workflow_dispatch" && "${{ github.ref }}" == "refs/heads/master" ]] || [[ "${{ github.event.inputs.deploy-to-prod-env }}" == "true" ]]; then
|
||||
echo "AZURE_TARGET_ENV=prod" >> $GITHUB_ENV
|
||||
else
|
||||
echo "AZURE_TARGET_ENV=dev" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
- name: Show environment
|
||||
run: echo ${{ env.AZURE_TARGET_ENV }}
|
||||
path: "./docs/.vuepress/dist"
|
||||
|
||||
- name: Deploy to GitHub Pages
|
||||
uses: peaceiris/actions-gh-pages@v4
|
||||
if: env.AZURE_TARGET_ENV == 'prod'
|
||||
if: ${{ inputs.deploy-to-prod == true || github.ref == 'refs/heads/master' }}
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: "."
|
||||
publish_dir: "./docs/.vuepress/dist"
|
||||
publish_branch: gh-pages
|
||||
|
||||
- name: Deploy to Azure (prod)
|
||||
id: deploy-prod
|
||||
uses: Azure/static-web-apps-deploy@v1
|
||||
if: env.AZURE_TARGET_ENV == 'prod'
|
||||
with:
|
||||
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
|
||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
action: "upload"
|
||||
app_location: "."
|
||||
api_location: ""
|
||||
skip_app_build: true
|
||||
skip_api_build: true
|
||||
|
||||
- name: Deploy to Azure (dev)
|
||||
id: deploy-dev
|
||||
uses: Azure/static-web-apps-deploy@v1
|
||||
if: env.AZURE_TARGET_ENV == 'dev'
|
||||
with:
|
||||
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
|
||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
action: "upload"
|
||||
deployment_environment: dev
|
||||
app_location: "."
|
||||
api_location: ""
|
||||
skip_app_build: true
|
||||
skip_api_build: true
|
||||
|
||||
6
.gitignore
vendored
6
.gitignore
vendored
@@ -451,6 +451,7 @@ tools/RoguelikeRecruitmentTool/output
|
||||
# CF 活动关卡(异格夜刀),手动改的地图
|
||||
/resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
|
||||
/src/MaaWpfGui/FodyWeavers.xml
|
||||
*.lnk
|
||||
|
||||
# 链接检查缓存
|
||||
.lycheecache
|
||||
@@ -473,4 +474,7 @@ Thumbs.db
|
||||
|
||||
# build & install
|
||||
build
|
||||
install
|
||||
install
|
||||
|
||||
# pnpm cache
|
||||
.pnpm-store
|
||||
|
||||
@@ -18,10 +18,17 @@ repos:
|
||||
rev: v3.5.3
|
||||
hooks:
|
||||
- id: prettier
|
||||
files: ^((\.github/ISSUE_TEMPLATE|docs|resource|src|tools|website)/.*|\.pre-commit-config\.yaml|package-definition\.json)
|
||||
name: prettier (config files)
|
||||
files: ^((\.github/ISSUE_TEMPLATE|resource|src|tools)/.*|\.pre-commit-config\.yaml|package-definition\.json)
|
||||
types_or:
|
||||
- yaml
|
||||
- json
|
||||
- repo: https://github.com/rbubley/mirrors-prettier
|
||||
rev: v3.5.3
|
||||
hooks:
|
||||
- id: prettier
|
||||
name: prettier (docs)
|
||||
files: ^docs/.*
|
||||
- repo: https://github.com/DavidAnson/markdownlint-cli2
|
||||
rev: v0.17.2
|
||||
hooks:
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
**/node_modules/
|
||||
**/pnpm-lock.yaml
|
||||
docs/**/*.md
|
||||
|
||||
MaaDeps/
|
||||
3rdparty/
|
||||
src/maa-cli
|
||||
src/MaaMacGui
|
||||
|
||||
website/
|
||||
# website/
|
||||
# docs/
|
||||
|
||||
resource/Arknights-Tile-Pos/
|
||||
|
||||
376
CHANGELOG.md
376
CHANGELOG.md
@@ -1,234 +1,228 @@
|
||||
## v5.24.2
|
||||
## v5.25.0
|
||||
|
||||
### 特殊说明
|
||||
### 依\~赖\~大\~更\~新\~ | Highlights
|
||||
|
||||
由于本次活动代号 SS 与 SideStory 的内部代号冲突,关卡命名统一采用 AveMujica-x 格式(例如 AveMujica-8),请使用 手动输入关卡名 / cli 的博士使用此代号。
|
||||
在这个版本,我们大幅更新了项目的依赖库,优化了 MAA 的性能,~~所以老电脑可能要更新运行库了。~~
|
||||
|
||||
### 功能进化 | Highlight
|
||||
**我们还为官网和 API 节点优化了网络,大幅优化了访问速度**。
|
||||
|
||||
本次更新继续扩展自动化能力,一起来看看吧
|
||||
#### 自动战斗方面
|
||||
|
||||
#### 自动战斗优化
|
||||
我们对【自动战斗】功能进行了一些改动,主要包括:
|
||||
|
||||
这个版本我们优化了自动战斗功能,现在你可以在更多的场景下使用自动战斗功能。目前 MAA 支持以下场景:
|
||||
* 牛牛现在会自动识别作业集内各个作业的干员编组情况,如果上一份作业的干员编组与当前作业的一致,牛牛就不再重复进行干员编组了,从而节省时间
|
||||
* 战斗列表部分,对各个作业的设置按键的鼠标按键逻辑进行了调整:点击左键将可以查看该作业的说明和干员配置需求,点击右键将直接提取该作业并关闭战斗列表功能(即只打该作业)
|
||||
|
||||
* `主线/故事集/SideStory`:基础模式,注意只能在当前章节/页面内导航(即 SS 里不能用于切换普通关、EX 关和 S 关);
|
||||
* `保全派驻`:用于保全派驻模式,可以点击神秘代码输入框右侧的向下小箭头来选择内置作业,并且可以设置循环次数;
|
||||
* `悖论模拟`:新增的专用于干员悖论模拟的场景,分为以下两种使用方式:
|
||||
* 直接使用单次战斗:输入神秘代码后,在干员的悖论模拟入口,<u>选择好技能,出现【开始模拟】按钮后,点击 MAA 的开始按钮</u>;
|
||||
* 多个干员连续作战:右键粘贴按钮可以粘贴作业集的神秘代码(或是勾选战斗列表依次输入每个干员的作业的神秘代码),然后<u>在干员列表界面,点击 MAA 的开始按钮</u>。
|
||||
* `其他活动`:兜底模式,不可使用战斗列表。
|
||||
#### 基建换班方面
|
||||
|
||||
现在,博士们可以直接使用悖论模拟的战斗列表功能完成所有悖论模拟作业,支持按职业找人、自动跳过未拥有的干员,并在战斗列表中直接显示干员名,真正实现“点一下,全都打完”~
|
||||
我们优化了基建换班中与基建技能有关的功能:
|
||||
|
||||
#### 新内容支持
|
||||
* 我们为所有没有设置效率数据的基建技能都设置了效率数据,这样牛牛在【基建换班】任务中就能更好地为干员不全的玩家选择合适的基建技能了(但还是把 U 酱拿掉了,~~U 酱那么可爱为什么要工作~~)
|
||||
* 如果【基建换班】任务处于「自定义基建配置」模式,且牛牛正在工作中,那么班次将不再随时间切换,避免牛牛工作到一半班次被切了而产生的各种问题
|
||||
* 如果【基建换班】任务处于「队列轮换」模式,那么牛牛将不再进入未勾选的设施
|
||||
* 我们调整了会客室技能的排序逻辑,现在会优先选择更容易获得尚未拥有的线索的技能
|
||||
|
||||
- **争锋频道:蜜果城** 入口适配(本质还是跑的青草城代码)
|
||||
- 外服也同步适配了 **新版终端界面**
|
||||
#### 其他方面
|
||||
|
||||
#### 其他优化
|
||||
我们增加了一些小的改动,值得注意的有:
|
||||
|
||||
- 自动战斗在关卡结束后增加了黑色返回按钮的检测,更加稳健
|
||||
- 界面与交互细节继续优化,深色模式显示效果更自然
|
||||
* 我们在【自动肉鸽】任务中优化了丰川祥子相关招募策略 ~~saki酱、saki酱、saki酱~~
|
||||
* 牛牛在【生息演算】任务中将会自动识别当前的存档状态与任务的设置是否一致,如果不一致将会提示你检查存档状态
|
||||
* 当你设置 Mirror酱的 CDK 后,MAA 将会显示 CDK 的剩余有效时间,方便你掌握有效期
|
||||
|
||||
----
|
||||
|
||||
### [CN ONLY] Special Notice
|
||||
In this version, we have significantly updated the project's dependency libraries and optimized MAA's performance. ~~So you may need to update their runtime libraries if you use old computers.~~
|
||||
|
||||
Due to a conflict between this event's code SS and the internal code for SideStory, the stage naming will use the format AveMujica-x (e.g., AveMujica-8). Please use this code when entering the stage manually or via CLI.
|
||||
**We have also optimized the network for the official website and API nodes, greatly improving access speed.**
|
||||
|
||||
#### Copilot Optimization
|
||||
#### *Copilot* Improvements
|
||||
|
||||
In this version, we've optimized the Copilot, allowing you to use it in more scenarios. Currently, MAA supports the following scenarios:
|
||||
We have made some adjustments to the *Copilot* feature, which mainly include:
|
||||
|
||||
* `Main Theme/Intermezzi/SideStory`: Basic mode. Note that navigation is only possible within the current chapter/page (i.e., in SideStory, you cannot switch between normal stages, EX stages, and S stages);
|
||||
* `SSS`: For SSS mode. You can click the small downward arrow on the right side of the mysterious code input box to select built-in files, also you can set the number of loop times;
|
||||
* `Paradox Simulation`: A newly added scenario specifically designed for operator paradox simulations, available in the following two usage methods:
|
||||
* Direct single battle usage: After entering the secret code, you need to navigate to the operator's paradox simulation entry point, <u>select the skills, wait for the [Start Simulation] button to appear, then click MAA's start button</u> to start;
|
||||
* Continuous battles for multiple operators: You need to rightclick the paste button to paste the mysterious code for the job set, or check the battle list checkbox and sequentially enter each operator's mysterious code for the operation, then <u>click MAA's start button on the operator list interface</u>.
|
||||
* `Other Events`: Fallback mode, battle list cannot be used.
|
||||
* MAA will now automatically recognize the operator formation in each job within the job set. If the operator formation of the previous job matches that of the current job, MAA will no longer repeat the operator squading process, thereby saving time.
|
||||
* In the Battle list section, the mouse button logic for each job's settings button has been adjusted: left-clicking will allow you to view the job's description and operator formation requirements, while right-clicking will directly extract that job and disable the combat list function (i.e., only run that specific operation).
|
||||
|
||||
Now, Doctors can directly use the combat list feature in Paradox Simulation to complete all Paradox Simulation assignments. It supports filtering by profession, automatically skipping unowned Operators, and displaying Operator names directly in the combat list — truly achieving "one click, all done"~
|
||||
#### *Base* Improvements
|
||||
|
||||
#### New Content Support
|
||||
We have optimized the base skill-related functions in *Base* task:
|
||||
|
||||
- [CN ONLY] **Arena Channel: Honeydew** entry (Use the same code for Green Grass City)
|
||||
- **New Terminal interface** adaptation for global servers
|
||||
* We have set efficiency data for all base skills that previously lacked that data, allowing MAA to better select suitable base skills for doctors with incomplete operator rosters during the *Base* task (though we did remove U-Offcial, ~~U-Offcial is so cute, why should she work~~)
|
||||
* If the *Base* task is in Custom Base Mode and the MAA is currently running, Base Plan will no longer switch over time to avoid various issues caused by interrupting the MAA's work by switching the Base Plan when MAA is running.
|
||||
* If the *Base* task is in One-click Rotation Mode, the MAA will no longer enter unchecked facilities.
|
||||
* We adjusted the sorting logic for reception room skills, now prioritizing skills that are more likely to obtain clues not yet owned.
|
||||
|
||||
#### Other Improvements
|
||||
#### Other Aspects
|
||||
|
||||
- Added detection for the black return button after auto-battle ends, making runs more robust
|
||||
- UI and interaction polish — dark mode looks more natural
|
||||
We've made some minor changes worth noting:
|
||||
|
||||
* [CN ONLY] In the *Auto I.S.* task, we've optimized the recruitment strategy related to Togawa Sakiko ~~Saki-chan, Saki-chan, Saki-chan~~
|
||||
* In the *Reclamation Algorithm* task, MAA will automatically detect whether the current save status matches the mission settings. If they don't match, it will prompt you to check your save status.
|
||||
* After setting MirrorChyan's CDK, MAA will display the remaining validity period of the CDK, making it easier for you to track its expiration
|
||||
|
||||
----
|
||||
|
||||
以下是详细内容:
|
||||
|
||||
## v5.24.2
|
||||
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 适配 命运(AveMujica) 主题 (#13970) @weinibuliu
|
||||
* SideStory「无忧梦呓」导航 (#13969) @SherkeyXD
|
||||
* 勾选 「下次公告更新前不再显示」 勾选框时不需要滚到底才能关闭公告 @ABA2396
|
||||
* CustomTask 增加任务存在检测 @status102
|
||||
* core 崩溃后下次启动时 ui 输出提示 (#14022) @ABA2396 @momomochi987
|
||||
* 给自定义任务添加 ScreenshotTaskPlugin 插件 @ABA2396
|
||||
* 战斗列表点击作业时自动关闭列表, 原逻辑迁移至鼠标右键 @status102
|
||||
* 添加基建计划 ToolTip 提示 @ABA2396
|
||||
* 添加信息获取失败时的提示 @ABA2396
|
||||
* CDK 倒计时显示 @ABA2396
|
||||
* 成就设置中的图标颜色可以随着主题色动态更新 @ABA2396
|
||||
* 添加 CDK 到期时间显示 @ABA2396
|
||||
* 添加 ResourceReferenceHelper,允许绑定 前后景色 key @ABA2396
|
||||
* 自动战斗多作业支持保存干员组内编入的干员 (#14095) @status102
|
||||
* cli 支持新版战斗列表以及悖论模拟 (#14154) @wangl-cc
|
||||
* 为官网首页添加多语言支持 (#13943) @lucienshawls @momomochi987 @Manicsteiner @pre-commit-ci[bot] @Constrat
|
||||
* RunningState 统一状态变更事件 (#14141) @ABA2396
|
||||
* 生息盐酸任务添加对错误模式 (有/无存档) 的提示 (#14131) @Alan-Charred
|
||||
* custom clang (#14102) @neko-para
|
||||
* allow single copilot task execution @status102
|
||||
* convert ResourceUpdater to ubuntu-latest (#14076) @Constrat
|
||||
* support build resource updater @neko-para
|
||||
* use coreml OCR for apple (#14108) @MistEO
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 优化关卡验证逻辑,避免导入错误类型关卡时直接崩溃 @ABA2396
|
||||
* 更新基建技能效率 @ABA2396
|
||||
* wpf 自动战斗列表中作业设置按钮左键单击还原为解析指定作业,新增行为修改至右键,解析作业并关闭列表 @status102
|
||||
* 优化更新设置中的徽标显示和逻辑 @ABA2396
|
||||
* add --parallel to cmake workflows @Constrat
|
||||
* 更新 markdownlint 规则 @SherkeyXD
|
||||
* 依赖大更新 (#13908) @MistEO @status102 @pre-commit-ci[bot]
|
||||
* 优化干员识别动画显示效果 @ABA2396
|
||||
* 加个try先 @status102
|
||||
* remove resource from smoke testing use the default location, do not duplicate @Constrat
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 肉鸽因模拟器卡顿偶现无法退出商店 @ABA2396
|
||||
* OF-1 无法切换分队 @status102
|
||||
* 蜜果城模拟器卡顿时可能无法返回主界面 @Windsland52
|
||||
* 八幡海铃识别错误 @Saratoga-Official
|
||||
* 选技能可能会点到技能范围 @ABA2396
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 关卡小提示改用 Value @ABA2396
|
||||
* 调整日志输出格式 @ABA2396
|
||||
* 悖论模拟选技能改用固定位置,避免透明背景影响 @ABA2396
|
||||
|
||||
## v5.24.1
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 适配 悬想(界园肉鸽) 主题 (#13948) @weinibuliu
|
||||
* 繁中服「視相」主題介面 (#13947) @momomochi987
|
||||
* 悖论通关后自动取消勾选,遇到战斗失败的关卡时停止 (#13963) @ABA2396
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 日志记录增加 ClassName 输出,debug 模式下属性切换新增反引号显示 @ABA2396
|
||||
* 优化 Copilot 列表验证逻辑,提高性能 @ABA2396
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 自动编队后续追加自定干员失败 @status102
|
||||
* 错误的关卡名可能导致验证崩溃 @ABA2396
|
||||
* 公告重复点击时不会前置窗口 @ABA2396
|
||||
* 战斗列表无法进入 1/2 星干员悖论 @ABA2396
|
||||
* 悖论模拟战斗列表页尾干员错位 @ABA2396
|
||||
* 空作业列表点开始崩溃 @status102
|
||||
* 繁中服薩米肉鴿第五層名稱 (#13961) @momomochi987
|
||||
* EN not picking up Trade Orders @Constrat
|
||||
* IS5 EN StageRefresh not working, updated template @Constrat
|
||||
* IS2 and IS3 not starting for EN @Constrat
|
||||
* update Infrast templates for EN @Constrat
|
||||
* 修复 cmake copy_and_add_rpath_library 的失败逻辑 (#14097) @litwak913
|
||||
* 刷开局奖励只选票券时行为异常 @ABA2396
|
||||
* 自动编队缺少干员输出的额外换行 @status102
|
||||
* Copilot多任务编队时编队设置残留 @status102
|
||||
* 自定义基建换班的班次不会随时间切换 @ABA2396
|
||||
* "统一 WpfGui 工作目录"后,配置为外服无法运行 MAA @ABA2396
|
||||
* 移除 debug_demo (原Sample) 的对应 resource 额外查找逻辑 (#14081) @status102 @MistEO
|
||||
* 统一 WpfGui 工作目录 (#14072) @MistEO @pre-commit-ci[bot] @ABA2396 @status102
|
||||
* 重构依赖后 MaaWpfGui 的 resource 路径丢失 (#14077) @status102
|
||||
* 停止中或者空闲状态不允许点击停止按钮 @ABA2396
|
||||
* 鲍勃杂货店拥有四叶草化石且无抗干扰值时卡住 @ABA2396
|
||||
* 无法收取太鼓达人联动主题会客室信息板信用 @ABA2396
|
||||
* cdk 过期时间超过 2038 年会爆炸(但 10000 年还是会爆炸 @ABA2396
|
||||
* maa 变成前文明产物了 @ABA2396
|
||||
* 糊一下 debug_demo 资源路径读取 @MistEO
|
||||
* 修复 wpf gui 一些 resource path 读取 @MistEO
|
||||
* 入暂亭特殊选项 @Saratoga-Official
|
||||
* 特里蒙旅行社特派团多选项 @Saratoga-Official
|
||||
* IS5 同心 @Daydreamer114
|
||||
* 选择技能时可能会点出描述文字 @ABA2396
|
||||
* 基建使用队列轮换时如果未勾选对应设施则不进入 @ABA2396
|
||||
* 重构后无法使用刷开局刷仅精二 @ABA2396
|
||||
* 部分背景下 mujica 主题无法进入对应功能 @ABA2396
|
||||
* 萨米肉鸽刷源石锭可能卡在预见的密文板 @ABA2396
|
||||
* 允许生息演算任务反复点击存档位置直到画面改变 (#14005) @Alan-Charred
|
||||
* 肉鸽助战无法刷新 @Saratoga-Official
|
||||
* minitouch 触控 wait ms @ABA2396
|
||||
* 复核自定义干员时等待游戏动画 @ABA2396
|
||||
* 自动战斗无法读取下拉列表中的作业 @ABA2396
|
||||
* 成就列表解锁时间显示颜色错误 @ABA2396
|
||||
* GO 导航 @ABA2396
|
||||
* 勾选启动后直接运行时无法自动切换基建排班表 @ABA2396
|
||||
* 网络连接错误的情况下读取了本地缓存也提示了获取热更成功 @ABA2396
|
||||
* 萨米肉鸽未通关结局时探寻前路卡住 @Saratoga-Official
|
||||
* 文档站首页在窄屏下的响应式设计 (#14166) @lucienshawls
|
||||
* 暂时修复无法读取过去的评论的问题 (#14163) @lucienshawls
|
||||
* 为什么 mujikca 的图黑的不够纯粹 @ABA2396
|
||||
* 肉鸽在结算界面卡死 (#14145) @Saratoga-Official @pre-commit-ci[bot]
|
||||
* CopilotTask 参数可选项存在性检查 @status102
|
||||
* 异格推王的基建加成错误 @Saratoga-Official
|
||||
* 调低 MacOS PlayCover 下对 InfrastControl 识别的阈值 (#14139) @Alan-Charred
|
||||
* CurrentConfig 未刷新 @status102
|
||||
* CurrentConfig 悬空 @status102
|
||||
* 拥有全干员的情况下重启后进入干员识别界面不会自动选中选项卡 @ABA2396
|
||||
* 修复 DataGrid 虚拟化下 Tab 导航异常 @ABA2396
|
||||
* 萨卡兹肉鸽未通关结局时原初异途卡住 @Saratoga-Official
|
||||
* 肉鸽深入探索无法退出结算界面 (#14123) @Saratoga-Official
|
||||
* typo @Constrat
|
||||
* type number for nightly ota @Constrat
|
||||
* smoke testing upload logs @Constrat
|
||||
* move smoke testing working dir @Constrat
|
||||
* add component for install libcxx only @neko-para
|
||||
* prevent caching in non-dev branches @Constrat
|
||||
* stuck on max trust EN @Constrat
|
||||
* pthread linking problem @neko-para
|
||||
* nightly package zip @MistEO
|
||||
* global resource path @MistEO
|
||||
* linux cross compiling (#14048) @neko-para @pre-commit-ci[bot]
|
||||
* remove opencv highgui again @MistEO
|
||||
* remove opencv highgui @MistEO
|
||||
* build error of ASST_DEBUG @MistEO
|
||||
* Sami floor detection 3 Thanks again @lin4289 on discord @Constrat
|
||||
* EN Roguelike@ChooseOperConfirm (#14033) @Daydreamer114
|
||||
* Sami floor detection 2 Thanks again @lin4289 on discord @Constrat
|
||||
* Sami floor detection Thanks @lin4289 on discord @Constrat
|
||||
* smoke-testing script @Constrat
|
||||
* wrong default on type number @Constrat
|
||||
* Eye For an Eye encounter IS2 EN @Constrat
|
||||
* SettingsViewModel Idle @ABA2396
|
||||
* download to v5 with necessary fix (#14122) @Constrat
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* 修正文档中的部分错误 (#13923) @lucienshawls
|
||||
* 维护信用作战相关功能及其文档 (#14013) @Alan-Charred
|
||||
* 修复序号问题 @SherkeyXD
|
||||
* 更新文档 cmake 配置 @MistEO
|
||||
* 微调文档 @MistEO
|
||||
* 完善文档站的代码检查和涉及的文本替换 (#14156) @lucienshawls @pre-commit-ci[bot]
|
||||
* 完善自动肉鸽和其它文档中的部分内容 (#13924) @lucienshawls @Constrat @Manicsteiner
|
||||
* 切换文档主题至 vuepress-theme-plume (#13821) @SherkeyXD @lucienshawls @MistEO
|
||||
* typo @MistEO
|
||||
* reapply eebe0a9 (#14036) @wangl-cc
|
||||
* remove weblate @MistEO
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 将 「掉线时自动重连」 从 「运行设置」 移到 「刷理智设置」 中 @ABA2396
|
||||
* 将 「自动肉鸽在战斗结束前延迟停止动作」 从 「运行设置」 移到 「肉鸽设置」 中 @ABA2396
|
||||
* 繁中服「銀心湖列車」復刻活動導航 (#13945) @momomochi987
|
||||
* 调整公告日志记录 @ABA2396
|
||||
* 提取 isBuildOutputFolder @ABA2396
|
||||
* 编译目录下不检查 dll @ABA2396
|
||||
* 长草任务运行状态 (#13928) @status102
|
||||
* 简化 Split @ABA2396
|
||||
* OperatorType -> OperatorRole @status102
|
||||
* JP ocr fix (#13938) @Manicsteiner
|
||||
* i18n @Constrat @Manicsteiner
|
||||
|
||||
## v5.24.0
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 悖论模拟战斗列表通过职业找人 @ABA2396
|
||||
* 悖论模拟战斗列表支持跳过未拥有的干员 @ABA2396
|
||||
* 战斗列表悖论模拟关卡名转为干员名 @ABA2396
|
||||
* 支持一键悖论模拟 (#13893) @status102 @Constrat @Burnside999 @momomochi987 @HX3N @Manicsteiner @ABA2396
|
||||
* 争锋频道:蜜果城 @ABA2396
|
||||
* mac 支持蜜果城 @ABA2396
|
||||
* 调整战斗列表提示描述 @ABA2396
|
||||
* 远程通知添加 `[MAA]` 前缀 @ABA2396
|
||||
* 加个启动提醒 @ABA2396
|
||||
* 在启动时检测额外的 DLL 文件 (#13850) @Rbqwow @ABA2396
|
||||
* 自动战斗关卡结束后增加识别使用黑色返回按钮的检测 @status102
|
||||
* 更新源为海外源时隐藏 Mirror酱 CDK 输入框 @ABA2396
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 覆盖 ThirdlyTextBrush,优化深色模式下的显示效果 @ABA2396
|
||||
* 任务 baseTask @status102
|
||||
* 重构自动战斗战斗列表 (#13852) @status102
|
||||
* 更新 CsWin32 @ABA2396
|
||||
* ToastNotification 重构 @ABA2396
|
||||
* 向战斗队列中添加 SSS 作业时追加错误输出 @status102
|
||||
* limit codeql run only to source code (#13802) @Constrat
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 悖论模拟单文件无法使用 @ABA2396
|
||||
* 关卡名下划线被解释成 CheckBox 访问键 @ABA2396
|
||||
* 勾八导航乱写 @ABA2396
|
||||
* 自动战斗界面 Idle setter 限制 @status102
|
||||
* 自动战斗-战斗列表使用错误的作业战斗 @status102
|
||||
* 信用购物有时候点不掉危机合约支援界面 @ABA2396
|
||||
* ServerChan 未使用通用 httpService @ABA2396
|
||||
* 错误清除 _tasksStatus 的时机 @ABA2396
|
||||
* 肉鸽入口等待 ocr 识别错误 @ABA2396
|
||||
* 界园肉鸽商店钱包余额ocr roi @status102
|
||||
* 自动战斗-战斗列表`突袭`提示显示在运行期显示效果 @status102
|
||||
* 不再点击停止任务时移除存储的 TaskId @status102
|
||||
* 繁中服薩米肉鴿第四層名稱 (#13846) @momomochi987
|
||||
* 肉鸽投资存款不变重试 20 次退出 @status102
|
||||
* required version 显示错误 @ABA2396
|
||||
* 会客室换班失败(如选人过程中弹出线索交流完成)时重开任务 @ABA2396
|
||||
* 肉鸽开局招募在无开局干员时, 无法识别两招募的左侧位 @status102
|
||||
* 千古鸭帝进战斗 @Saratoga-Official
|
||||
* 日服的萨卡兹第五层怎么全 jb 改成 exit 了 @ABA2396
|
||||
* 自动战斗干员编队状态; 修复编队中干员属性未达标时反复报错; 缺少干员输出时, 干员组内干员打平输出 (#13795) @status102
|
||||
* 修正生息演算中 "丰饶灌木林" 的 OCR 识别 (#13825) @Alan-Charred
|
||||
* 资源更新文件处理 @hguandl
|
||||
* 萨卡兹肉鸽因动画延时偶发无法领取去伪存真合成物品 @ABA2396
|
||||
* 萨米投资进二层会卡在预见密文板 @ABA2396
|
||||
* CrownSlayer -> Crownslayer for EN @Constrat
|
||||
* RoguelikeDialogSkip for EN @Constrat
|
||||
* BattleQuickFormationExpandRole text ocr @Constrat
|
||||
* OfficeMini template for EN @Constrat
|
||||
* OfficeMini template for EN @Constrat
|
||||
* ROI and text for EA YostarEN @Constrat
|
||||
* YostarEN text render template changes @Constrat
|
||||
* var type @status102
|
||||
* YostarKR EA navigation @HX3N
|
||||
* filters @ABA2396
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 整合枚举类 OperProfession 和 Role (#13914) @soundofautumn
|
||||
* 悖论模拟使用多任务流程 @status102
|
||||
* 移除MaaCore不再支持的自动战斗作业代码解析 @status102
|
||||
* 删掉 core 的联网功能 @ABA2396
|
||||
* core 删除 cpr @ABA2396
|
||||
* dll 检测排除带 maa 的 dll @ABA2396
|
||||
* 自动战斗模组错误本地化 & 移除多余的行末空格 (#13800) @soundofautumn @Constrat @HX3N
|
||||
* 调整小游戏内容顺序 @ABA2396
|
||||
* 修改 RA 和肉鸽的进入终端等待时间 @ABA2396
|
||||
* 调整萨卡兹,界园的古米精二优先度 @Saratoga-Official
|
||||
* 修改备份文件写入时间 @ABA2396
|
||||
* 关机/休眠/睡眠 统一调用 PowerManagement @ABA2396
|
||||
* 调整 GetModuleFileName 判断 @ABA2396
|
||||
* 移除未使用的 container @ABA2396
|
||||
* mumu 使用 7555 端口时禁用 Index 检测,添加日志警告 @ABA2396
|
||||
* 调整 锏 基建技能效率 @ABA2396
|
||||
* 自定义基建配置时间仍在有效期内时不检查其他时间段 @ABA2396
|
||||
* 界园萨卡兹肉鸽招募休谟斯优先级 @Saratoga-Official
|
||||
* 调整 y 存图时间间隔 @ABA2396
|
||||
* 调整定时器触发逻辑 @ABA2396
|
||||
* 调整未检测到模拟器的输出 @ABA2396
|
||||
* 按时间切换基建配置不在任务运行中或任务开始前切换 @ABA2396
|
||||
* 调整刷新助战日志 @ABA2396
|
||||
* 调整界面颜色 @ABA2396
|
||||
* 肉鸽丰川祥子招募策略 (#14035) @Saratoga-Official
|
||||
* 繁中服「大荒」介面主題 (#14064) @momomochi987 @pre-commit-ci[bot]
|
||||
* 删除一些遗留文件 @MistEO
|
||||
* 再糊点注释 @MistEO
|
||||
* 糊点注释 @MistEO
|
||||
* 管理员权限启动额外判断是否开启 UAC @ABA2396
|
||||
* 调整会客室中更容易获得线索板上尚未拥有的线索的技能优先级 @ABA2396
|
||||
* 基建把 u酱 ban 了 @ABA2396
|
||||
* 特征匹配过程函数拆入analyze() @status102
|
||||
* 繁中服「相見歡」活動導航 (#14137) @momomochi987
|
||||
* remove -DINSTALL_RESOURCES @Constrat
|
||||
* gitignore @status102
|
||||
* where and how did this come from? @Constrat
|
||||
* tweak workflow + remove .sln (#14074) @Constrat @neko-para
|
||||
* remove ninja from ci.yml @Constrat
|
||||
* restore older cache utilization for ci.yml (#14068) @Constrat
|
||||
* update interface.json @neko-para
|
||||
* update linux tutorial (en) @neko-para
|
||||
* EN @Constrat
|
||||
* remove MaaDeps @MistEO
|
||||
* bump maa-cli to 0.5.8 (#14032) @wangl-cc
|
||||
* BrightPointAnalyzer -> PixelAnalyzer (#13915) @Alan-Charred
|
||||
* mujika -> mujica (#14000) @weinibuliu
|
||||
* remove SyncRes @MistEO
|
||||
* use std::format instead of sprintf (#14107) @MistEO @pre-commit-ci[bot]
|
||||
* fix build warning (#14176) @soundofautumn
|
||||
* rename RecognizerViewModel -> ToolboxViewModel (#14177) @soundofautumn
|
||||
* YostarJP ocr fix (#14134) @Manicsteiner
|
||||
* file header @status102
|
||||
* 自动编队助战的确实干员读取 @status102
|
||||
* 加点肉鸽事件 fallback 前延迟,可能减轻点网络波动影响 @ABA2396
|
||||
* 自动战斗不再使用 `need_navigate` 字段作为导航启用开关, 而是直接使用 `navigate_name` 字段 @status102
|
||||
* 调整技能截图判断 @ABA2396
|
||||
* YostarEN updated main stage navigation (#13906) @Constrat
|
||||
* Give new line for English downloading from @Constrat
|
||||
* YostarJP remove old navigation (#13905) @Manicsteiner
|
||||
* YostarJP/KR new main stage navigation and ocr fix @Manicsteiner @HX3N
|
||||
* A single-line comment within C# code is not preceded by a blank line. @ABA2396
|
||||
* A C# partial element is missing a documentation header. @ABA2396
|
||||
* An item within a C# enumeration is missing an Xml documentation header. @ABA2396
|
||||
* A C# method, constructor, delegate or indexer element is missing documentation for one or more of its parameters. @ABA2396
|
||||
* The XML header documentation for a C# element is missing a tag. @ABA2396
|
||||
* Copyright 2025 @ABA2396
|
||||
* Update localization strings for Mini Game section @AnnAngela
|
||||
* fix build warning (#14120) @soundofautumn
|
||||
|
||||
136
CMakeLists.txt
136
CMakeLists.txt
@@ -1,22 +1,21 @@
|
||||
cmake_minimum_required(VERSION 3.28)
|
||||
project(MAA)
|
||||
|
||||
if (NOT CMAKE_BUILD_TYPE)
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
|
||||
|
||||
option(BUILD_WPF_GUI "build MaaWpfGui" ${WIN32})
|
||||
option(BUILD_DEBUG_DEMO "build debug demo" OFF)
|
||||
option(BUILD_XCFRAMEWORK "build xcframework for macOS app" OFF)
|
||||
option(BUILD_UNIVERSAL "build both arm64 and x86_64 on macOS" OFF)
|
||||
option(BUILD_SMOKE_TEST "build smoke_test" OFF)
|
||||
option(INSTALL_PYTHON "install python ffi" OFF)
|
||||
option(INSTALL_RESOURCE "install resource" OFF)
|
||||
option(INSTALL_FLATTEN "do not use bin lib include directory" ON)
|
||||
option(WITH_EMULATOR_EXTRAS "build with emulator extras" ${WIN32})
|
||||
option(BUILD_SMOKE_TEST "build smoke_test" OFF)
|
||||
option(BUILD_RES_UPDATER "build ResourceUpdater" OFF)
|
||||
option(WITH_HASH_VERSION "generate version from git hash" OFF)
|
||||
|
||||
include(${PROJECT_SOURCE_DIR}/MaaDeps/maadeps.cmake)
|
||||
|
||||
@@ -24,12 +23,16 @@ include(${PROJECT_SOURCE_DIR}/cmake/config.cmake)
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
|
||||
|
||||
if(APPLE)
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/macos.cmake)
|
||||
endif()
|
||||
|
||||
if(INSTALL_FLATTEN)
|
||||
set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .)
|
||||
endif()
|
||||
|
||||
add_library(HeaderOnlyLibraries INTERFACE)
|
||||
target_include_directories(HeaderOnlyLibraries INTERFACE 3rdparty/include 3rdparty/EmulatorExtras)
|
||||
|
||||
file(GLOB_RECURSE maa_src src/MaaCore/*.h src/MaaCore/*.hpp src/MaaCore/*.cpp)
|
||||
|
||||
add_library(MaaCore SHARED ${maa_src})
|
||||
target_include_directories(HeaderOnlyLibraries INTERFACE 3rdparty/include)
|
||||
|
||||
find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs)
|
||||
find_package(Boost REQUIRED CONFIG COMPONENTS system)
|
||||
@@ -37,113 +40,22 @@ find_package(ZLIB REQUIRED)
|
||||
find_package(fastdeploy_ppocr REQUIRED)
|
||||
find_package(ONNXRuntime REQUIRED)
|
||||
|
||||
target_link_libraries(MaaCore HeaderOnlyLibraries ${OpenCV_LIBS} fastdeploy_ppocr ONNXRuntime::ONNXRuntime ZLIB::ZLIB Boost::system)
|
||||
if(WIN32)
|
||||
target_link_libraries(MaaCore ws2_32)
|
||||
endif()
|
||||
if(LINUX)
|
||||
target_link_libraries(MaaCore pthread)
|
||||
endif()
|
||||
add_subdirectory(src/MaaCore)
|
||||
|
||||
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_src})
|
||||
|
||||
if (WIN32)
|
||||
#注意:相比VS版本缺少了 -D_CONSOLE -D_WINDLL 两项
|
||||
target_compile_definitions(MaaCore PRIVATE ASST_DLL_EXPORTS _UNICODE UNICODE)
|
||||
endif ()
|
||||
|
||||
target_include_directories(MaaCore PUBLIC include PRIVATE src/MaaCore)
|
||||
set(MaaCore_PUBLIC_HEADERS include/AsstCaller.h include/AsstPort.h)
|
||||
target_sources(MaaCore PUBLIC ${MaaCore_PUBLIC_HEADERS})
|
||||
set_target_properties(MaaCore PROPERTIES PUBLIC_HEADER "${MaaCore_PUBLIC_HEADERS}")
|
||||
|
||||
if(WIN32)
|
||||
add_custom_command(
|
||||
TARGET MaaCore
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
|
||||
"${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/$<$<CONFIG:Debug>:msvc-debug/>"
|
||||
$<TARGET_FILE_DIR:MaaCore>
|
||||
COMMAND_EXPAND_LISTS)
|
||||
endif()
|
||||
|
||||
if (BUILD_WPF_GUI)
|
||||
if(BUILD_WPF_GUI)
|
||||
include_external_msproject(MaaWpfGui ${PROJECT_SOURCE_DIR}/src/MaaWpfGui/MaaWpfGui.csproj)
|
||||
|
||||
|
||||
add_dependencies(MaaWpfGui MaaCore)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "@loader_path/")
|
||||
elseif(UNIX)
|
||||
set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "$ORIGIN/")
|
||||
endif()
|
||||
|
||||
if(WITH_EMULATOR_EXTRAS AND NOT EXISTS ${PROJECT_SOURCE_DIR}/3rdparty/EmulatorExtras/Mumu)
|
||||
message(WARNING "EmulatorExtras not found, please run `git submodule update --init 3rdparty/EmulatorExtras`")
|
||||
set(WITH_EMULATOR_EXTRAS OFF)
|
||||
endif()
|
||||
target_compile_definitions(MaaCore PRIVATE ASST_WITH_EMULATOR_EXTRAS=$<BOOL:${WITH_EMULATOR_EXTRAS}>)
|
||||
|
||||
if(INSTALL_FLATTEN)
|
||||
set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .)
|
||||
endif()
|
||||
|
||||
install(TARGETS MaaCore ${MaaCore_install_flatten_args})
|
||||
|
||||
maadeps_install(.)
|
||||
|
||||
if (INSTALL_PYTHON)
|
||||
if(INSTALL_PYTHON)
|
||||
install(DIRECTORY src/Python DESTINATION .)
|
||||
endif (INSTALL_PYTHON)
|
||||
if (INSTALL_RESOURCE)
|
||||
endif()
|
||||
|
||||
if(INSTALL_RESOURCE)
|
||||
install(DIRECTORY resource DESTINATION .)
|
||||
endif (INSTALL_RESOURCE)
|
||||
endif()
|
||||
|
||||
if (BUILD_DEBUG_DEMO)
|
||||
add_executable(debug_demo src/Cpp/main.cpp)
|
||||
if(MSVC)
|
||||
target_compile_options(debug_demo PRIVATE "/WX-")
|
||||
else()
|
||||
target_compile_options(debug_demo PRIVATE "-Wno-error")
|
||||
endif()
|
||||
target_link_libraries(debug_demo MaaCore)
|
||||
|
||||
add_dependencies(debug_demo MaaCore)
|
||||
# install(TARGETS debug_demo ${MaaCore_install_flatten_args})
|
||||
endif (BUILD_DEBUG_DEMO)
|
||||
|
||||
if (BUILD_SMOKE_TEST)
|
||||
add_executable(smoke_test src/Cpp/main.cpp)
|
||||
if(MSVC)
|
||||
target_compile_options(smoke_test PRIVATE "/WX-")
|
||||
else()
|
||||
target_compile_options(smoke_test PRIVATE "-Wno-error")
|
||||
endif()
|
||||
target_compile_definitions(smoke_test PRIVATE SMOKE_TESTING)
|
||||
target_link_libraries(smoke_test MaaCore)
|
||||
|
||||
add_dependencies(smoke_test MaaCore)
|
||||
install(TARGETS smoke_test ${MaaCore_install_flatten_args})
|
||||
endif (BUILD_SMOKE_TEST)
|
||||
|
||||
if (BUILD_RES_UPDATER)
|
||||
add_executable(ResourceUpdater tools/ResourceUpdater/main.cpp)
|
||||
target_include_directories(ResourceUpdater PUBLIC include PRIVATE src/MaaCore) # For Utils/Time.hpp
|
||||
target_link_libraries(ResourceUpdater HeaderOnlyLibraries ${OpenCV_LIBS})
|
||||
if(LINUX)
|
||||
target_link_libraries(ResourceUpdater pthread)
|
||||
endif()
|
||||
install(TARGETS ResourceUpdater DESTINATION . COMPONENT ResourceUpdater)
|
||||
|
||||
# Copy from maadeps_install, adding component
|
||||
if(MSVC)
|
||||
install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/$<$<CONFIG:Debug>:msvc-debug/>" DESTINATION . USE_SOURCE_PERMISSIONS COMPONENT ResourceUpdater)
|
||||
else()
|
||||
install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/" DESTINATION . USE_SOURCE_PERMISSIONS COMPONENT ResourceUpdater)
|
||||
endif()
|
||||
endif (BUILD_RES_UPDATER)
|
||||
|
||||
if (APPLE)
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/macos.cmake)
|
||||
endif (APPLE)
|
||||
if(BUILD_DEBUG_DEMO OR BUILD_SMOKE_TEST)
|
||||
add_subdirectory(src/Cpp)
|
||||
endif()
|
||||
|
||||
34
README.md
34
README.md
@@ -4,7 +4,7 @@
|
||||
|
||||
<img alt="LOGO" src="./docs/.vuepress/public/images/maa-logo_512x512.png" width="256" height="256" />
|
||||
|
||||
# MaaAssistantArknights
|
||||
# MAA
|
||||
|
||||
<br>
|
||||
<div>
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
|
||||
[简体中文](https://maa.plus/docs/zh-cn/) | [繁體中文](https://maa.plus/docs/zh-tw/) | [English](https://maa.plus/docs/en-us/) | [日本語](https://maa.plus/docs/ja-jp/) | [한국어](https://maa.plus/docs/ko-kr/)
|
||||
[简体中文](https://docs.maa.plus/zh-cn/) | [繁體中文](https://docs.maa.plus/zh-tw/) | [English](https://docs.maa.plus/en-us/) | [日本語](https://docs.maa.plus/ja-jp/) | [한국어](https://docs.maa.plus/ko-kr/)
|
||||
|
||||
MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
@@ -39,12 +39,12 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
## 下载与安装
|
||||
|
||||
请阅读 [文档](https://maa.plus/docs/zh-cn/manual/newbie.html) 后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载,并参考 [新手上路](https://maa.plus/docs/zh-cn/manual/newbie.html) 进行安装。
|
||||
请阅读 [文档](https://docs.maa.plus/zh-cn/manual/newbie.html) 后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载,并参考 [新手上路](https://docs.maa.plus/zh-cn/manual/newbie.html) 进行安装。
|
||||
|
||||
## 亮点功能
|
||||
|
||||
- 刷理智,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/),[一图流](https://ark.yituliu.cn/)
|
||||
- 智能基建换班,自动计算干员效率,单设施内最优解;同时也支持 [自定义排班](https://maa.plus/docs/zh-cn/protocol/base-scheduling-schema.html)
|
||||
- 智能基建换班,自动计算干员效率,单设施内最优解;同时也支持 [自定义排班](https://docs.maa.plus/zh-cn/protocol/base-scheduling-schema.html)
|
||||
- 自动公招,可选使用加急许可,一次全部刷完!公招数据自动上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit),[一图流](https://ark.yituliu.cn/survey/maarecruitdata)
|
||||
- 支持手动识别公招界面,方便对高星公招做出选择 ~~(你的这个高资回费出的是推王呢还是推王呢)~~
|
||||
- 支持识别干员列表,统计已有和未有干员及潜能,并在公招识别显示
|
||||
@@ -83,16 +83,16 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
### 功能介绍
|
||||
|
||||
请参阅 [用户手册](https://maa.plus/docs/zh-cn/manual/)。
|
||||
请参阅 [用户手册](https://docs.maa.plus/zh-cn/manual/)。
|
||||
|
||||
### 外服支持
|
||||
|
||||
目前国际服(美服)、日服、韩服、繁中服的绝大部分功能均已支持。但由于外服用户较少及项目人手不足,很多功能并没有进行全面的测试,所以请自行体验。
|
||||
若您遇到了 Bug,或对某个功能有强需求,欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更;或加入我们一起建设 MAA!请参阅 [外服适配教程](https://maa.plus/docs/zh-cn/develop/overseas-client-adaptation.html)
|
||||
若您遇到了 Bug,或对某个功能有强需求,欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更;或加入我们一起建设 MAA!请参阅 [外服适配教程](https://docs.maa.plus/zh-cn/develop/overseas-client-adaptation.html)
|
||||
|
||||
### CLI 支持
|
||||
|
||||
MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/)
|
||||
MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://docs.maa.plus/zh-cn/manual/cli/)
|
||||
|
||||
## 加入我们
|
||||
|
||||
@@ -103,7 +103,7 @@ MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,
|
||||
- 全新框架:[MaaFramework](https://github.com/MaaXYZ/MaaFramework)
|
||||
- [作业站](https://prts.plus) 前端:[maa-copilot-frontend](https://github.com/MaaAssistantArknights/maa-copilot-frontend)
|
||||
- [作业站](https://prts.plus) 后端:[MaaBackendCenter](https://github.com/MaaAssistantArknights/MaaBackendCenter)
|
||||
- [官网](https://maa.plus):[前端](website)
|
||||
- [官网](https://maa.plus):[前端](https://github.com/MaaAssistantArknights/maa-website)
|
||||
- 深度学习:[MaaAI](https://github.com/MaaAssistantArknights/MaaAI)
|
||||
|
||||
### 多语言 (i18n)
|
||||
@@ -114,11 +114,11 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
|
||||
|
||||
#### Windows
|
||||
|
||||
请参阅 [开始开发](https://maa.plus/docs/zh-cn/develop/development.html)。
|
||||
请参阅 [开始开发](https://docs.maa.plus/zh-cn/develop/development.html)。
|
||||
|
||||
#### Linux | macOS
|
||||
|
||||
请参阅 [Linux 编译教程](https://maa.plus/docs/zh-cn/develop/linux-tutorial.html)。
|
||||
请参阅 [Linux 编译教程](https://docs.maa.plus/zh-cn/develop/linux-tutorial.html)。
|
||||
|
||||
#### API
|
||||
|
||||
@@ -131,22 +131,22 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
|
||||
- [Rust 接口](src/Rust/src/maa_sys):[HTTP 接口](src/Rust)
|
||||
- [TypeScript 接口](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader)
|
||||
- [Woolang 接口](src/Woolang/maa.wo):[集成示例](src/Woolang/demo.wo)
|
||||
- [集成文档](https://maa.plus/docs/zh-cn/protocol/integration.html)
|
||||
- [回调消息协议](https://maa.plus/docs/zh-cn/protocol/callback-schema.html)
|
||||
- [任务流程协议](https://maa.plus/docs/zh-cn/protocol/task-schema.html)
|
||||
- [自动抄作业协议](https://maa.plus/docs/zh-cn/protocol/copilot-schema.html)
|
||||
- [集成文档](https://docs.maa.plus/zh-cn/protocol/integration.html)
|
||||
- [回调消息协议](https://docs.maa.plus/zh-cn/protocol/callback-schema.html)
|
||||
- [任务流程协议](https://docs.maa.plus/zh-cn/protocol/task-schema.html)
|
||||
- [自动抄作业协议](https://docs.maa.plus/zh-cn/protocol/copilot-schema.html)
|
||||
|
||||
#### 外服适配
|
||||
|
||||
请参阅 [外服适配教程](https://maa.plus/docs/zh-cn/develop/overseas-client-adaptation.html),对于国服已支持的功能,绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
|
||||
请参阅 [外服适配教程](https://docs.maa.plus/zh-cn/develop/overseas-client-adaptation.html),对于国服已支持的功能,绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
|
||||
|
||||
#### 想参与开发,但不太会用 GitHub?
|
||||
|
||||
[GitHub Pull Request 流程简述](https://maa.plus/docs/zh-cn/develop/development.html#github-pull-request-流程简述)
|
||||
[GitHub Pull Request 流程简述](https://docs.maa.plus/zh-cn/develop/development.html#github-pull-request-流程简述)
|
||||
|
||||
#### Issue bot
|
||||
|
||||
请参阅 [Issue Bot 使用方法](https://maa.plus/docs/zh-cn/develop/issue-bot-usage.html)
|
||||
请参阅 [Issue Bot 使用方法](https://docs.maa.plus/zh-cn/develop/issue-bot-usage.html)
|
||||
|
||||
## 致谢
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ if(LINUX)
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
if("${LIB_PATH}" STREQUAL "${LIBNAME}.so.1}")
|
||||
if("${LIB_PATH}" STREQUAL "${LIBNAME}.so.1")
|
||||
message(FATAL_ERROR "Could not locate ${LIBNAME}.so.1 using compiler")
|
||||
endif()
|
||||
|
||||
@@ -63,7 +63,7 @@ if(LINUX)
|
||||
|
||||
message(STATUS "${LIBNAME}.so.1 path: ${LIB_PATH_REAL}")
|
||||
|
||||
install(FILES "${LIB_PATH_REAL}" DESTINATION . RENAME "${LIBNAME}.so.1")
|
||||
install(FILES "${LIB_PATH_REAL}" DESTINATION . RENAME "${LIBNAME}.so.1" COMPONENT libcxx)
|
||||
|
||||
get_filename_component(LIB_PATH_DIR "${LIB_PATH_REAL}" DIRECTORY)
|
||||
list(APPEND CMAKE_BUILD_RPATH "${LIB_PATH_DIR}")
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_PROCESSOR aarch64)
|
||||
|
||||
set(XTOOLS_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../MaaDeps/x-tools/aarch64-linux-gnu)
|
||||
set(CMAKE_C_COMPILER_TARGET aarch64-linux-gnu)
|
||||
set(CMAKE_C_COMPILER clang-20)
|
||||
set(CMAKE_CXX_COMPILER_TARGET aarch64-linux-gnu)
|
||||
set(CMAKE_CXX_COMPILER clang++-20)
|
||||
set(CMAKE_ASM_COMPILER_TARGET aarch64-linux-gnu)
|
||||
set(CMAKE_ASM_COMPILER clang-20)
|
||||
set(CMAKE_SYSROOT ${XTOOLS_ROOT}/aarch64-linux-gnu/sysroot)
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT}")
|
||||
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT} -fuse-ld=lld --gcc-toolchain=${XTOOLS_ROOT}")
|
||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT} -fuse-ld=lld --gcc-toolchain=${XTOOLS_ROOT}")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT} -fuse-ld=lld --gcc-toolchain=${XTOOLS_ROOT}")
|
||||
set(CMAKE_LINKER_TYPE LLD)
|
||||
@@ -1,19 +0,0 @@
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||
|
||||
set(XTOOLS_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../MaaDeps/x-tools/x86_64-linux-gnu)
|
||||
set(CMAKE_C_COMPILER_TARGET x86_64-linux-gnu)
|
||||
set(CMAKE_C_COMPILER clang-20)
|
||||
set(CMAKE_CXX_COMPILER_TARGET x86_64-linux-gnu)
|
||||
set(CMAKE_CXX_COMPILER clang++-20)
|
||||
set(CMAKE_ASM_COMPILER_TARGET x86_64-linux-gnu)
|
||||
set(CMAKE_ASM_COMPILER clang-20)
|
||||
set(CMAKE_SYSROOT ${XTOOLS_ROOT}/x86_64-linux-gnu/sysroot)
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT}")
|
||||
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT} -fuse-ld=lld --gcc-toolchain=${XTOOLS_ROOT}")
|
||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT} -fuse-ld=lld --gcc-toolchain=${XTOOLS_ROOT}")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -stdlib=libc++ --sysroot=${CMAKE_SYSROOT} -fuse-ld=lld --gcc-toolchain=${XTOOLS_ROOT}")
|
||||
set(CMAKE_LINKER_TYPE LLD)
|
||||
@@ -25,6 +25,3 @@ if (BUILD_XCFRAMEWORK)
|
||||
)
|
||||
endif (BUILD_XCFRAMEWORK)
|
||||
|
||||
target_compile_options(MaaCore PRIVATE
|
||||
-Wno-deprecated-declarations
|
||||
-Wno-gnu-zero-variadic-macro-arguments)
|
||||
|
||||
@@ -44,3 +44,30 @@ endif(APPLE)
|
||||
if(NOT DEFINED MAADEPS_TRIPLET)
|
||||
detect_maadeps_triplet(MAADEPS_TRIPLET)
|
||||
endif()
|
||||
|
||||
# 创建资源目录链接的函数
|
||||
function(create_resource_link TARGET_NAME OUTPUT_DIR)
|
||||
if(WIN32)
|
||||
# Windows 使用 mklink /J 创建目录链接(不需要管理员权限)
|
||||
add_custom_command(
|
||||
TARGET ${TARGET_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "Creating resource directory link for ${TARGET_NAME}..."
|
||||
COMMAND ${CMAKE_COMMAND} -E remove_directory "${OUTPUT_DIR}/resource"
|
||||
COMMAND cmd /c "mklink /J \"${OUTPUT_DIR}/resource\" \"${PROJECT_SOURCE_DIR}/resource\""
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "Resource directory link created successfully"
|
||||
COMMENT "Creating junction for resource directory for ${TARGET_NAME}"
|
||||
)
|
||||
else()
|
||||
# Unix/Linux/macOS 使用符号链接
|
||||
add_custom_command(
|
||||
TARGET ${TARGET_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "Creating resource directory link for ${TARGET_NAME}..."
|
||||
COMMAND ${CMAKE_COMMAND} -E remove "${OUTPUT_DIR}/resource"
|
||||
COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/resource" "${OUTPUT_DIR}/resource"
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "Resource directory link created successfully"
|
||||
COMMENT "Creating symlink for resource directory for ${TARGET_NAME}"
|
||||
)
|
||||
endif()
|
||||
endfunction()
|
||||
@@ -3,23 +3,23 @@ set(MAA_HASH_VERSION
|
||||
"DEBUG_VERSION"
|
||||
CACHE STRING "maa version")
|
||||
|
||||
if(MAA_HASH_VERSION STREQUAL "DEBUG_VERSION")
|
||||
if(WITH_HASH_VERSION AND MAA_HASH_VERSION STREQUAL "DEBUG_VERSION")
|
||||
find_package(Git)
|
||||
endif()
|
||||
|
||||
if(MAA_HASH_VERSION STREQUAL "DEBUG_VERSION" AND GIT_FOUND)
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
RESULT_VARIABLE result
|
||||
OUTPUT_VARIABLE output
|
||||
ERROR_VARIABLE err
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(GIT_FOUND)
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
RESULT_VARIABLE result
|
||||
OUTPUT_VARIABLE output
|
||||
ERROR_VARIABLE err
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
if(result EQUAL 0)
|
||||
set(MAA_HASH_VERSION "${output}")
|
||||
else()
|
||||
message(WARNING "git rev-parse returning ${result}, output:\n${err}")
|
||||
if(result EQUAL 0)
|
||||
set(MAA_HASH_VERSION "${output}")
|
||||
else()
|
||||
message(WARNING "git rev-parse returning ${result}, output:\n${err}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
2
docs/.prettierignore
Normal file
2
docs/.prettierignore
Normal file
@@ -0,0 +1,2 @@
|
||||
**/pnpm-lock.yaml
|
||||
**/*.md
|
||||
40
docs/.prettierrc.js
Normal file
40
docs/.prettierrc.js
Normal file
@@ -0,0 +1,40 @@
|
||||
module.exports = {
|
||||
printWidth: 120,
|
||||
tabWidth: 2,
|
||||
useTabs: false,
|
||||
bracketSpacing: true,
|
||||
bracketSameLine: false,
|
||||
endOfLine: 'auto',
|
||||
semi: false,
|
||||
singleQuote: true,
|
||||
trailingComma: 'all',
|
||||
arrowParens: 'always',
|
||||
|
||||
overrides: [
|
||||
{
|
||||
files: ['**/*.ts'],
|
||||
options: {
|
||||
semi: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
files: ['**/*.*css'],
|
||||
options: {
|
||||
singleQuote: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
files: ['**/*.yml', '**/*.yaml'],
|
||||
options: {
|
||||
parser: 'yaml',
|
||||
singleQuote: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
files: ['**/*.json'],
|
||||
options: {
|
||||
tabWidth: 4,
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
@@ -1,12 +1,11 @@
|
||||
import { defineClientConfig } from "vuepress/client";
|
||||
import Image1 from "../components/Image1.vue";
|
||||
import Image2 from "../components/Image2.vue";
|
||||
import Image4 from "../components/Image4.vue";
|
||||
import { defineClientConfig } from 'vuepress/client';
|
||||
|
||||
import ImageGrid from './components/ImageGrid.vue';
|
||||
|
||||
import './styles/index.scss';
|
||||
|
||||
export default defineClientConfig({
|
||||
enhance: ({ app }) => {
|
||||
app.component("Image1", Image1);
|
||||
app.component("Image2", Image2);
|
||||
app.component("Image4", Image4);
|
||||
app.component('ImageGrid', ImageGrid);
|
||||
},
|
||||
});
|
||||
|
||||
72
docs/.vuepress/components/ImageGrid.vue
Normal file
72
docs/.vuepress/components/ImageGrid.vue
Normal file
@@ -0,0 +1,72 @@
|
||||
<template>
|
||||
<CardGrid>
|
||||
<ImageCard v-for="(item, index) of displayImageList" :key="index" :image="item" />
|
||||
</CardGrid>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { PropType, defineComponent, computed, ref, onMounted, onUnmounted } from 'vue'
|
||||
import { withBase } from 'vuepress/client'
|
||||
|
||||
export default defineComponent({
|
||||
name: 'ImageCardGrid',
|
||||
props: {
|
||||
imageList: {
|
||||
type: Array as PropType<Array<{ light: string; dark: string } | string>>,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
setup(props) {
|
||||
const isDarkMode = ref(false)
|
||||
let observer: MutationObserver | null = null
|
||||
let mediaQuery: MediaQueryList | null = null
|
||||
|
||||
const updateDarkMode = () => {
|
||||
if (typeof window !== 'undefined') {
|
||||
const html = document.documentElement
|
||||
isDarkMode.value =
|
||||
html.classList.contains('dark') ||
|
||||
html.getAttribute('data-theme') === 'dark' ||
|
||||
window.matchMedia('(prefers-color-scheme: dark)').matches
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
updateDarkMode()
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
// 监听DOM变化(主题切换通常会改变class或data-theme属性)
|
||||
observer = new MutationObserver(updateDarkMode)
|
||||
observer.observe(document.documentElement, {
|
||||
attributes: true,
|
||||
attributeFilter: ['class', 'data-theme'],
|
||||
})
|
||||
|
||||
// 监听系统主题变化
|
||||
mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
|
||||
mediaQuery.addEventListener('change', updateDarkMode)
|
||||
}
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
if (observer) {
|
||||
observer.disconnect()
|
||||
}
|
||||
if (mediaQuery) {
|
||||
mediaQuery.removeEventListener('change', updateDarkMode)
|
||||
}
|
||||
})
|
||||
|
||||
const displayImageList = computed(() => {
|
||||
return props.imageList.map((item) => {
|
||||
const src = typeof item === 'string' ? item : isDarkMode.value ? item.dark : item.light
|
||||
return withBase(src)
|
||||
})
|
||||
})
|
||||
|
||||
return {
|
||||
displayImageList,
|
||||
}
|
||||
},
|
||||
})
|
||||
</script>
|
||||
@@ -1,55 +0,0 @@
|
||||
import type { VNode } from "vue";
|
||||
import { defineComponent, h, computed } from "vue";
|
||||
|
||||
import NavbarDropdown from "@theme-hope/modules/navbar/components/NavbarDropdown";
|
||||
import { I18nIcon } from "@theme-hope/modules/navbar/components/icons/index";
|
||||
import { useNavbarLanguageDropdown } from "@theme-hope/modules/navbar/composables/index";
|
||||
|
||||
export default defineComponent({
|
||||
name: "LanguageDropdown",
|
||||
|
||||
setup() {
|
||||
const dropdown = useNavbarLanguageDropdown();
|
||||
|
||||
const filteredDropdown = computed(() => {
|
||||
if (!dropdown.value) return null;
|
||||
|
||||
const filteredConfig = { ...dropdown.value };
|
||||
|
||||
if (filteredConfig.children) {
|
||||
filteredConfig.children = filteredConfig.children.filter(item => {
|
||||
// 过滤掉跳转到根目录的项目
|
||||
return item.link !== '/' && item.link !== '/docs/' && !item.link?.endsWith('/docs/');
|
||||
});
|
||||
}
|
||||
|
||||
return filteredConfig;
|
||||
});
|
||||
|
||||
//console.log("OldLanguageDropdown", dropdown.value);
|
||||
//console.log("NewLanguageDropdown", filteredDropdown());
|
||||
|
||||
return (): VNode | null =>
|
||||
dropdown.value
|
||||
? h(
|
||||
"div",
|
||||
{ class: "vp-nav-item" },
|
||||
h(
|
||||
NavbarDropdown,
|
||||
{ config: filteredDropdown.value },
|
||||
{
|
||||
title: () =>
|
||||
h(I18nIcon, {
|
||||
"aria-label": filteredDropdown.value?.ariaLabel,
|
||||
style: {
|
||||
width: "1rem",
|
||||
height: "1rem",
|
||||
verticalAlign: "middle",
|
||||
},
|
||||
}),
|
||||
},
|
||||
),
|
||||
)
|
||||
: null;
|
||||
},
|
||||
});
|
||||
@@ -1,87 +1,70 @@
|
||||
import { defineUserConfig } from "vuepress";
|
||||
import { getDirname, path } from "vuepress/utils";
|
||||
import { viteBundler } from "@vuepress/bundler-vite";
|
||||
import { googleAnalyticsPlugin } from "@vuepress/plugin-google-analytics";
|
||||
import Theme from "./theme";
|
||||
import { viteBundler } from '@vuepress/bundler-vite';
|
||||
import { defineUserConfig } from 'vuepress';
|
||||
import { googleAnalyticsPlugin } from '@vuepress/plugin-google-analytics';
|
||||
import { plumeTheme } from 'vuepress-theme-plume';
|
||||
|
||||
const __dirname = getDirname(import.meta.url);
|
||||
import DocSearchConfig from './plugins/search';
|
||||
|
||||
const isProd = process.env.NODE_ENV === 'production';
|
||||
|
||||
export default defineUserConfig({
|
||||
base: "/docs/",
|
||||
lang: "zh-CN",
|
||||
title: "MaaAssistantArknights",
|
||||
description: "MAA",
|
||||
base: '/',
|
||||
lang: 'zh-CN',
|
||||
title: 'MAA 文档站',
|
||||
description: 'MAA —「明日方舟」小助手',
|
||||
host: '0.0.0.0',
|
||||
port: 3001,
|
||||
|
||||
locales: {
|
||||
"/zh-cn/": {
|
||||
lang: "zh-cn",
|
||||
description: "文档",
|
||||
'/zh-cn/': {
|
||||
lang: 'zh-CN',
|
||||
title: 'MAA 文档站',
|
||||
description: '文档',
|
||||
},
|
||||
"/zh-tw/": {
|
||||
lang: "zh-tw",
|
||||
description: "文件",
|
||||
'/zh-tw/': {
|
||||
lang: 'zh-TW',
|
||||
title: 'MAA 文件站',
|
||||
description: '文件',
|
||||
},
|
||||
"/en-us/": {
|
||||
lang: "en-us",
|
||||
description: "Documentation",
|
||||
'/en-us/': {
|
||||
lang: 'en-US',
|
||||
title: 'MAA Documentation Site',
|
||||
description: 'Documentation',
|
||||
},
|
||||
"/ja-jp/": {
|
||||
lang: "ja-jp",
|
||||
description: "ドキュメンテーション",
|
||||
'/ja-jp/': {
|
||||
lang: 'ja-JP',
|
||||
title: 'MAA ドキュメントサイト',
|
||||
description: 'ドキュメント',
|
||||
},
|
||||
"/ko-kr/": {
|
||||
lang: "ko-kr",
|
||||
description: "선적 서류 비치",
|
||||
'/ko-kr/': {
|
||||
lang: 'ko-KR',
|
||||
title: 'MAA 문서 사이트',
|
||||
description: '문서',
|
||||
},
|
||||
},
|
||||
|
||||
markdown: {
|
||||
headers: {
|
||||
level: [2, 3, 4, 5],
|
||||
},
|
||||
},
|
||||
|
||||
theme: Theme,
|
||||
|
||||
alias: {
|
||||
"@theme-hope/modules/navbar/components/LanguageDropdown": path.resolve(
|
||||
__dirname,
|
||||
"./components/LanguageDropdown.ts",
|
||||
),
|
||||
},
|
||||
|
||||
plugins: [
|
||||
googleAnalyticsPlugin({
|
||||
id: "G-FJQDKG394Z",
|
||||
}),
|
||||
],
|
||||
|
||||
head: [
|
||||
["link", { rel: "preconnect", href: "https://fonts.googleapis.com" }],
|
||||
['link', { rel: 'preconnect', href: 'https://fonts.googleapis.com' }],
|
||||
['link', { rel: 'preconnect', href: 'https://fonts.gstatic.com', crossorigin: '' }],
|
||||
[
|
||||
"link",
|
||||
{ rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: "" },
|
||||
],
|
||||
[
|
||||
"link",
|
||||
'link',
|
||||
{
|
||||
href: "https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100..900&display=swap",
|
||||
rel: "stylesheet",
|
||||
href: 'https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100..900&display=swap',
|
||||
rel: 'stylesheet',
|
||||
},
|
||||
],
|
||||
[
|
||||
"link",
|
||||
'link',
|
||||
{
|
||||
href: "https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&display=swap",
|
||||
rel: "stylesheet",
|
||||
href: 'https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&display=swap',
|
||||
rel: 'stylesheet',
|
||||
},
|
||||
],
|
||||
[
|
||||
"link",
|
||||
'link',
|
||||
{
|
||||
href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap",
|
||||
rel: "stylesheet",
|
||||
href: 'https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap',
|
||||
rel: 'stylesheet',
|
||||
},
|
||||
],
|
||||
],
|
||||
@@ -90,4 +73,63 @@ export default defineUserConfig({
|
||||
viteOptions: {},
|
||||
vuePluginOptions: {},
|
||||
}),
|
||||
|
||||
shouldPrefetch: false,
|
||||
|
||||
theme: plumeTheme({
|
||||
hostname: 'https://docs.maa.plus',
|
||||
|
||||
docsRepo: 'MaaAssistantArknights/MaaAssistantArknights',
|
||||
docsDir: '/docs',
|
||||
docsBranch: 'dev',
|
||||
|
||||
editLink: true,
|
||||
lastUpdated: false,
|
||||
contributors: false,
|
||||
changelog: false,
|
||||
|
||||
blog: false,
|
||||
|
||||
cache: 'filesystem',
|
||||
|
||||
search: DocSearchConfig,
|
||||
|
||||
codeHighlighter: {
|
||||
themes: { light: 'one-light', dark: 'one-dark-pro' },
|
||||
},
|
||||
|
||||
markdown: {
|
||||
image: {
|
||||
lazyload: true,
|
||||
mark: true,
|
||||
size: true,
|
||||
},
|
||||
|
||||
icon: { provider: 'iconify' },
|
||||
plot: true,
|
||||
field: true,
|
||||
bilibili: true,
|
||||
},
|
||||
|
||||
watermark: false,
|
||||
|
||||
comment: {
|
||||
provider: 'Giscus',
|
||||
repo: 'MaaAssistantArknights/maa-website',
|
||||
repoId: 'R_kgDOHY7Gyg',
|
||||
category: 'Comments',
|
||||
categoryId: 'DIC_kwDOHY7Gys4CgoVH',
|
||||
mapping: 'pathname',
|
||||
strict: false,
|
||||
lazyLoading: true,
|
||||
},
|
||||
|
||||
//replaceAssets: isProd ? "https://cdn.maa.plus" : false,
|
||||
}),
|
||||
|
||||
plugins: [
|
||||
googleAnalyticsPlugin({
|
||||
id: 'G-FJQDKG394Z',
|
||||
}),
|
||||
],
|
||||
});
|
||||
|
||||
5
docs/.vuepress/env.d.ts
vendored
Normal file
5
docs/.vuepress/env.d.ts
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
declare module '*.vue' {
|
||||
import { DefineComponent } from 'vue';
|
||||
const component: DefineComponent<{}, {}, any>;
|
||||
export default component;
|
||||
}
|
||||
@@ -1,29 +1,19 @@
|
||||
import { navbar } from "vuepress-theme-hope";
|
||||
import { defineNavbarConfig } from 'vuepress-theme-plume';
|
||||
|
||||
export const enusNavbar = navbar([
|
||||
export const enusNavbar = defineNavbarConfig([
|
||||
{
|
||||
text: "Home",
|
||||
icon: "ic:round-home",
|
||||
link: "/en-us/",
|
||||
text: 'User Manual',
|
||||
icon: 'mdi:user',
|
||||
link: '/en-us/manual/newbie.html',
|
||||
},
|
||||
{
|
||||
text: "User Manual",
|
||||
icon: "mdi:user",
|
||||
link: "/en-us/manual/",
|
||||
text: 'Development Docs',
|
||||
icon: 'ph:code-bold',
|
||||
link: '/en-us/develop/development.html',
|
||||
},
|
||||
{
|
||||
text: "Development Docs",
|
||||
icon: "ph:code-bold",
|
||||
link: "/en-us/develop/",
|
||||
},
|
||||
{
|
||||
text: "Protocol Docs",
|
||||
icon: "basil:document-solid",
|
||||
link: "/en-us/protocol/",
|
||||
},
|
||||
{
|
||||
text: "MAA Website",
|
||||
icon: "mdi:cow",
|
||||
link: "https://maa.plus",
|
||||
text: 'Protocol Docs',
|
||||
icon: 'basil:document-solid',
|
||||
link: '/en-us/protocol/integration.html',
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export * from "./zh-cn";
|
||||
export * from "./zh-tw";
|
||||
export * from "./en-us";
|
||||
export * from "./ja-jp";
|
||||
export * from "./ko-kr";
|
||||
export * from './zh-cn';
|
||||
export * from './zh-tw';
|
||||
export * from './en-us';
|
||||
export * from './ja-jp';
|
||||
export * from './ko-kr';
|
||||
|
||||
@@ -1,29 +1,19 @@
|
||||
import { navbar } from "vuepress-theme-hope";
|
||||
import { defineNavbarConfig } from 'vuepress-theme-plume';
|
||||
|
||||
export const jajpNavbar = navbar([
|
||||
export const jajpNavbar = defineNavbarConfig([
|
||||
{
|
||||
text: "ホームページ",
|
||||
icon: "ic:round-home",
|
||||
link: "/ja-jp/",
|
||||
text: '使用説明',
|
||||
icon: 'mdi:user',
|
||||
link: '/ja-jp/manual/newbie.html',
|
||||
},
|
||||
{
|
||||
text: "使用説明",
|
||||
icon: "mdi:user",
|
||||
link: "/ja-jp/manual/",
|
||||
text: '開発関連',
|
||||
icon: 'ph:code-bold',
|
||||
link: '/ja-jp/develop/development.html',
|
||||
},
|
||||
{
|
||||
text: "開発関連",
|
||||
icon: "ph:code-bold",
|
||||
link: "/ja-jp/develop/",
|
||||
},
|
||||
{
|
||||
text: "プロトコルドキュメント",
|
||||
icon: "basil:document-solid",
|
||||
link: "/ja-jp/protocol/",
|
||||
},
|
||||
{
|
||||
text: "MAA 公式サイト",
|
||||
icon: "mdi:cow",
|
||||
link: "https://maa.plus",
|
||||
text: 'プロトコルドキュメント',
|
||||
icon: 'basil:document-solid',
|
||||
link: '/ja-jp/protocol/integration.html',
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -1,29 +1,19 @@
|
||||
import { navbar } from "vuepress-theme-hope";
|
||||
import { defineNavbarConfig } from 'vuepress-theme-plume';
|
||||
|
||||
export const kokrNavbar = navbar([
|
||||
export const kokrNavbar = defineNavbarConfig([
|
||||
{
|
||||
text: "홈페이지",
|
||||
icon: "ic:round-home",
|
||||
link: "/ko-kr/",
|
||||
text: '사용자 설명서',
|
||||
icon: 'mdi:user',
|
||||
link: '/ko-kr/manual/newbie.html',
|
||||
},
|
||||
{
|
||||
text: "사용자 설명서",
|
||||
icon: "mdi:user",
|
||||
link: "/ko-kr/manual/",
|
||||
text: '개발 문서',
|
||||
icon: 'ph:code-bold',
|
||||
link: '/ko-kr/develop/development.html',
|
||||
},
|
||||
{
|
||||
text: "개발 문서",
|
||||
icon: "ph:code-bold",
|
||||
link: "/ko-kr/develop/",
|
||||
},
|
||||
{
|
||||
text: "프로토콜 문서",
|
||||
icon: "basil:document-solid",
|
||||
link: "/ko-kr/protocol/",
|
||||
},
|
||||
{
|
||||
text: "MAA 공식 홈페이지",
|
||||
icon: "mdi:cow",
|
||||
link: "https://maa.plus",
|
||||
text: '프로토콜 문서',
|
||||
icon: 'basil:document-solid',
|
||||
link: '/ko-kr/protocol/integration.html',
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -1,29 +1,19 @@
|
||||
import { navbar } from "vuepress-theme-hope";
|
||||
import { defineNavbarConfig } from 'vuepress-theme-plume';
|
||||
|
||||
export const zhcnNavbar = navbar([
|
||||
export const zhcnNavbar = defineNavbarConfig([
|
||||
{
|
||||
text: "主页",
|
||||
icon: "ic:round-home",
|
||||
link: "/zh-cn/",
|
||||
text: '用户手册',
|
||||
icon: 'mdi:user',
|
||||
link: '/zh-cn/manual/newbie.html',
|
||||
},
|
||||
{
|
||||
text: "用户手册",
|
||||
icon: "mdi:user",
|
||||
link: "/zh-cn/manual/",
|
||||
text: '开发文档',
|
||||
icon: 'ph:code-bold',
|
||||
link: '/zh-cn/develop/development.html',
|
||||
},
|
||||
{
|
||||
text: "开发文档",
|
||||
icon: "ph:code-bold",
|
||||
link: "/zh-cn/develop/",
|
||||
},
|
||||
{
|
||||
text: "协议文档",
|
||||
icon: "basil:document-solid",
|
||||
link: "/zh-cn/protocol/",
|
||||
},
|
||||
{
|
||||
text: "MAA 官网",
|
||||
icon: "mdi:cow",
|
||||
link: "https://maa.plus",
|
||||
text: '协议文档',
|
||||
icon: 'basil:document-solid',
|
||||
link: '/zh-cn/protocol/integration.html',
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -1,29 +1,19 @@
|
||||
import { navbar } from "vuepress-theme-hope";
|
||||
import { defineNavbarConfig } from 'vuepress-theme-plume';
|
||||
|
||||
export const zhtwNavbar = navbar([
|
||||
export const zhtwNavbar = defineNavbarConfig([
|
||||
{
|
||||
text: "首頁",
|
||||
icon: "ic:round-home",
|
||||
link: "/zh-tw/",
|
||||
text: '用戶說明書',
|
||||
icon: 'mdi:user',
|
||||
link: '/zh-tw/manual/newbie.html',
|
||||
},
|
||||
{
|
||||
text: "用戶說明書",
|
||||
icon: "mdi:user",
|
||||
link: "/zh-tw/manual/",
|
||||
text: '開發文件',
|
||||
icon: 'ph:code-bold',
|
||||
link: '/zh-tw/develop/development.html',
|
||||
},
|
||||
{
|
||||
text: "開發文件",
|
||||
icon: "ph:code-bold",
|
||||
link: "/zh-tw/develop/",
|
||||
},
|
||||
{
|
||||
text: "協議文件",
|
||||
icon: "basil:document-solid",
|
||||
link: "/zh-tw/protocol/",
|
||||
},
|
||||
{
|
||||
text: "MAA 官網",
|
||||
icon: "mdi:cow",
|
||||
link: "https://maa.plus",
|
||||
text: '協議文件',
|
||||
icon: 'basil:document-solid',
|
||||
link: '/zh-tw/protocol/integration.html',
|
||||
},
|
||||
]);
|
||||
|
||||
8
docs/.vuepress/notes/en-us.ts
Normal file
8
docs/.vuepress/notes/en-us.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { defineNotesConfig } from 'vuepress-theme-plume';
|
||||
import { genNotes } from './genSidebar';
|
||||
|
||||
export const enusNotes = defineNotesConfig({
|
||||
dir: 'en-us',
|
||||
link: '/en-us/',
|
||||
notes: genNotes('en-us'),
|
||||
});
|
||||
119
docs/.vuepress/notes/genSidebar.ts
Normal file
119
docs/.vuepress/notes/genSidebar.ts
Normal file
@@ -0,0 +1,119 @@
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import * as matterModule from 'gray-matter';
|
||||
import { defineNoteConfig, ThemeNote, ThemeSidebarItem } from 'vuepress-theme-plume';
|
||||
|
||||
const matter = (matterModule as any).default;
|
||||
|
||||
interface MetaData {
|
||||
baseName: string;
|
||||
order: number;
|
||||
title: string;
|
||||
icon: string;
|
||||
index: boolean;
|
||||
}
|
||||
|
||||
function getMetaData(dir: string, entry: fs.Dirent): MetaData | null {
|
||||
const currentPath = path.join(dir, entry.name);
|
||||
if (!fs.existsSync(currentPath)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
let mdFilePath = '';
|
||||
if (entry.isDirectory()) {
|
||||
mdFilePath = path.join(currentPath, 'README.md');
|
||||
} else if (entry.isFile() && entry.name.endsWith('.md') && entry.name.toLowerCase() !== 'readme.md') {
|
||||
mdFilePath = currentPath;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!fs.existsSync(mdFilePath)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const fileContent = fs.readFileSync(mdFilePath, 'utf-8');
|
||||
const meta = matter(fileContent).data ?? {};
|
||||
|
||||
const baseName = path.parse(entry.name).name;
|
||||
// 获取顺序,目录的order在meta.dir.order里,文件的order在meta.order里,默认值为一个大数
|
||||
const order = Number((entry.isDirectory() ? meta?.dir?.order : meta?.order) ?? Number.MAX_SAFE_INTEGER);
|
||||
// 获取标题,先从matter里找title,再用正则获取一级标题,最后fallback到文件名(不含扩展名)
|
||||
const title = String(meta?.title ?? RegExp('# (.+)').exec(fileContent)?.[1] ?? baseName);
|
||||
// 获取图标
|
||||
const icon = String(meta?.icon ?? '');
|
||||
// 是否作为索引页,文件永远为true,目录则看meta.index,默认true
|
||||
const index = entry.isDirectory() ? (Boolean(meta?.index) ?? true) : true;
|
||||
|
||||
return {
|
||||
baseName: baseName,
|
||||
order: order,
|
||||
title: title,
|
||||
icon: icon,
|
||||
index: index,
|
||||
};
|
||||
}
|
||||
|
||||
export function genNotes(lang: string, baseDir = path.resolve(__dirname, '../../')): ThemeNote[] {
|
||||
// 进入指定语言目录,即docs/<i18n>/
|
||||
const langDir = path.join(baseDir, lang);
|
||||
|
||||
// 递归获取目录和文件
|
||||
function getItems(dir: string, isRoot: boolean): any[] {
|
||||
// 将内容与对应顺序进行包装
|
||||
interface Wrapped {
|
||||
content: ThemeNote | ThemeSidebarItem | string;
|
||||
order: number;
|
||||
}
|
||||
let itemsWithOrder: Wrapped[] = [];
|
||||
|
||||
// 获取所有非隐藏文件和目录
|
||||
const entries = fs.readdirSync(dir, { withFileTypes: true }).filter((e) => !e.name.startsWith('.'));
|
||||
|
||||
for (const entry of entries) {
|
||||
const metaData = getMetaData(dir, entry);
|
||||
if (!metaData) {
|
||||
continue;
|
||||
}
|
||||
if (entry.isDirectory()) {
|
||||
// 递归获取子目录内容
|
||||
const children = getItems(path.join(dir, entry.name), false);
|
||||
|
||||
if (isRoot) {
|
||||
// 一级目录,作为“专题”
|
||||
const item = defineNoteConfig({
|
||||
dir: metaData.baseName,
|
||||
link: `/${metaData.baseName}/`,
|
||||
text: metaData.title,
|
||||
sidebar: children,
|
||||
});
|
||||
itemsWithOrder.push({ content: item, order: metaData.order });
|
||||
} else {
|
||||
// 非一级目录,作为可折叠的子目录
|
||||
const item: ThemeSidebarItem = {
|
||||
text: metaData.title,
|
||||
// 只有当目录设置了index: true时,才生成链接,否则点击时不跳转、只切换折叠状态
|
||||
link: metaData.index ? `${metaData.baseName}/` : undefined,
|
||||
icon: metaData.icon,
|
||||
// 目前没有文档使用了这个特性,故不处理
|
||||
// badge: undefined,
|
||||
collapsed: true,
|
||||
// 前面不能加斜杠,必须用相对路径
|
||||
prefix: `${metaData.baseName}/`,
|
||||
items: children,
|
||||
};
|
||||
itemsWithOrder.push({ content: item, order: metaData.order });
|
||||
}
|
||||
} else if (entry.isFile() && entry.name.endsWith('.md') && entry.name.toLowerCase() !== 'readme.md') {
|
||||
// 普通文件,取完整文件名作为链接
|
||||
const item = entry.name;
|
||||
itemsWithOrder.push({ content: item, order: metaData.order });
|
||||
}
|
||||
}
|
||||
// 当前dir的内容读取完毕,进行排序并返回,返回时丢弃order
|
||||
itemsWithOrder.sort((a, b) => a.order - b.order);
|
||||
return itemsWithOrder.map((i) => i.content);
|
||||
}
|
||||
// 递归起点,只有这里是一级目录,isRoot传true
|
||||
return getItems(langDir, true);
|
||||
}
|
||||
5
docs/.vuepress/notes/index.ts
Normal file
5
docs/.vuepress/notes/index.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
export * from './zh-cn';
|
||||
export * from './zh-tw';
|
||||
export * from './en-us';
|
||||
export * from './ja-jp';
|
||||
export * from './ko-kr';
|
||||
8
docs/.vuepress/notes/ja-jp.ts
Normal file
8
docs/.vuepress/notes/ja-jp.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { defineNotesConfig } from 'vuepress-theme-plume';
|
||||
import { genNotes } from './genSidebar';
|
||||
|
||||
export const jajpNotes = defineNotesConfig({
|
||||
dir: 'ja-jp',
|
||||
link: '/ja-jp/',
|
||||
notes: genNotes('ja-jp'),
|
||||
});
|
||||
8
docs/.vuepress/notes/ko-kr.ts
Normal file
8
docs/.vuepress/notes/ko-kr.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { defineNotesConfig } from 'vuepress-theme-plume';
|
||||
import { genNotes } from './genSidebar';
|
||||
|
||||
export const kokrNotes = defineNotesConfig({
|
||||
dir: 'ko-kr',
|
||||
link: '/ko-kr/',
|
||||
notes: genNotes('ko-kr'),
|
||||
});
|
||||
8
docs/.vuepress/notes/zh-cn.ts
Normal file
8
docs/.vuepress/notes/zh-cn.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { defineNotesConfig } from 'vuepress-theme-plume';
|
||||
import { genNotes } from './genSidebar';
|
||||
|
||||
export const zhcnNotes = defineNotesConfig({
|
||||
dir: 'zh-cn',
|
||||
link: '/zh-cn/',
|
||||
notes: genNotes('zh-cn'),
|
||||
});
|
||||
8
docs/.vuepress/notes/zh-tw.ts
Normal file
8
docs/.vuepress/notes/zh-tw.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { defineNotesConfig } from 'vuepress-theme-plume';
|
||||
import { genNotes } from './genSidebar';
|
||||
|
||||
export const zhtwNotes = defineNotesConfig({
|
||||
dir: 'zh-tw',
|
||||
link: '/zh-tw/',
|
||||
notes: genNotes('zh-tw'),
|
||||
});
|
||||
@@ -1,88 +1,84 @@
|
||||
export default {
|
||||
appId: "99JM20SIFG",
|
||||
apiKey: "7596a5a8c95cd64d4cf3050c9a4f878e",
|
||||
indexName: "maa",
|
||||
// 这里应该把所有本地化配置都放入 locales 中
|
||||
locales: {
|
||||
"/zh-cn/": {
|
||||
placeholder: "搜索",
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: "搜索",
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: "清除查询条件",
|
||||
cancelButtonText: "取消",
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: "搜索历史",
|
||||
noRecentSearchesText: "没有搜索历史",
|
||||
saveRecentSearchButtonTitle: "保存至搜索历史",
|
||||
removeRecentSearchButtonTitle: "从搜索历史中移除",
|
||||
favoriteSearchesTitle: "收藏",
|
||||
removeFavoriteSearchButtonTitle: "从收藏中移除",
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: "无法获取结果",
|
||||
helpText: "你可能需要检查你的网络连接",
|
||||
},
|
||||
footer: {
|
||||
selectText: "选择",
|
||||
navigateText: "切换",
|
||||
closeText: "关闭",
|
||||
searchByText: "搜索提供者",
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: "无法找到相关结果",
|
||||
suggestedQueryText: "你可以尝试查询",
|
||||
reportMissingResultsText: "你认为该查询应该有结果?",
|
||||
reportMissingResultsLinkText: "点击反馈",
|
||||
},
|
||||
},
|
||||
},
|
||||
provider: 'algolia' as const,
|
||||
appId: '99JM20SIFG',
|
||||
apiKey: '7596a5a8c95cd64d4cf3050c9a4f878e',
|
||||
indexName: 'maa',
|
||||
locales: {
|
||||
'/zh-cn/': {
|
||||
placeholder: '搜索',
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: '搜索',
|
||||
},
|
||||
"/en-us/": {
|
||||
placeholder: "Search",
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: "Search",
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: "Clear the query",
|
||||
cancelButtonText: "Cancel",
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: "Recent",
|
||||
noRecentSearchesText: "No recent searches",
|
||||
saveRecentSearchButtonTitle: "Save this search",
|
||||
removeRecentSearchButtonTitle:
|
||||
"Remove this search from history",
|
||||
favoriteSearchesTitle: "Favorite",
|
||||
removeFavoriteSearchButtonTitle:
|
||||
"Remove this search from favorites",
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: "Unable to fetch results",
|
||||
helpText:
|
||||
"You might want to check your network connection.",
|
||||
},
|
||||
footer: {
|
||||
selectText: "to select",
|
||||
navigateText: "to navigate",
|
||||
closeText: "to close",
|
||||
searchByText: "Search by",
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: "No results for",
|
||||
suggestedQueryText: "Try searching for",
|
||||
reportMissingResultsText:
|
||||
"Believe this query should return results?",
|
||||
reportMissingResultsLinkText: "Let us know.",
|
||||
},
|
||||
},
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: '清除查询条件',
|
||||
cancelButtonText: '取消',
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: '搜索历史',
|
||||
noRecentSearchesText: '没有搜索历史',
|
||||
saveRecentSearchButtonTitle: '保存至搜索历史',
|
||||
removeRecentSearchButtonTitle: '从搜索历史中移除',
|
||||
favoriteSearchesTitle: '收藏',
|
||||
removeFavoriteSearchButtonTitle: '从收藏中移除',
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: '无法获取结果',
|
||||
helpText: '你可能需要检查你的网络连接',
|
||||
},
|
||||
footer: {
|
||||
selectText: '选择',
|
||||
navigateText: '切换',
|
||||
closeText: '关闭',
|
||||
searchByText: '搜索提供者',
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: '无法找到相关结果',
|
||||
suggestedQueryText: '你可以尝试查询',
|
||||
reportMissingResultsText: '你认为该查询应该有结果?',
|
||||
reportMissingResultsLinkText: '点击反馈',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
'/en-us/': {
|
||||
placeholder: 'Search',
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: 'Search',
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: 'Clear the query',
|
||||
cancelButtonText: 'Cancel',
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: 'Recent',
|
||||
noRecentSearchesText: 'No recent searches',
|
||||
saveRecentSearchButtonTitle: 'Save this search',
|
||||
removeRecentSearchButtonTitle: 'Remove this search from history',
|
||||
favoriteSearchesTitle: 'Favorite',
|
||||
removeFavoriteSearchButtonTitle: 'Remove this search from favorites',
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: 'Unable to fetch results',
|
||||
helpText: 'You might want to check your network connection.',
|
||||
},
|
||||
footer: {
|
||||
selectText: 'to select',
|
||||
navigateText: 'to navigate',
|
||||
closeText: 'to close',
|
||||
searchByText: 'Search by',
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: 'No results for',
|
||||
suggestedQueryText: 'Try searching for',
|
||||
reportMissingResultsText: 'Believe this query should return results?',
|
||||
reportMissingResultsLinkText: 'Let us know.',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
129
docs/.vuepress/plume.config.ts
Normal file
129
docs/.vuepress/plume.config.ts
Normal file
@@ -0,0 +1,129 @@
|
||||
import { defineThemeConfig } from 'vuepress-theme-plume';
|
||||
import { zhcnNavbar, zhtwNavbar, enusNavbar, jajpNavbar, kokrNavbar } from './navbar';
|
||||
import { zhcnNotes, zhtwNotes, enusNotes, jajpNotes, kokrNotes } from './notes';
|
||||
|
||||
export default defineThemeConfig({
|
||||
logo: '/images/maa-logo_512x512.png',
|
||||
|
||||
appearance: true,
|
||||
|
||||
social: [
|
||||
{ icon: 'qq', link: 'https://api.maa.plus/MaaAssistantArknights/api/qqgroup' },
|
||||
{ icon: 'discord', link: 'https://discord.gg/23DfZ9uA4V' },
|
||||
{ icon: 'telegram', link: 'https://t.me/+Mgc2Zngr-hs3ZjU1' },
|
||||
{ icon: 'bilibili', link: 'https://space.bilibili.com/3493274731940507/' },
|
||||
{ icon: 'github', link: 'https://github.com/MaaAssistantArknights/MaaAssistantArknights/' },
|
||||
],
|
||||
navbarSocialInclude: ['qq', 'discord', 'telegram', 'bilibili', 'github'],
|
||||
|
||||
aside: true,
|
||||
// outline: [2, 3, 4, 5],
|
||||
copyright: false,
|
||||
prevPage: false,
|
||||
nextPage: false,
|
||||
createTime: false,
|
||||
|
||||
footer: false,
|
||||
|
||||
locales: {
|
||||
'/zh-cn/': {
|
||||
navbar: zhcnNavbar,
|
||||
notes: zhcnNotes,
|
||||
},
|
||||
'/zh-tw/': {
|
||||
navbar: zhtwNavbar,
|
||||
notes: zhtwNotes,
|
||||
},
|
||||
'/en-us/': {
|
||||
navbar: enusNavbar,
|
||||
notes: enusNotes,
|
||||
},
|
||||
'/ja-jp/': {
|
||||
navbar: jajpNavbar,
|
||||
notes: jajpNotes,
|
||||
},
|
||||
'/ko-kr/': {
|
||||
navbar: kokrNavbar,
|
||||
notes: kokrNotes,
|
||||
},
|
||||
},
|
||||
|
||||
autoFrontmatter: false,
|
||||
|
||||
//plugins: {
|
||||
// notice: [
|
||||
// {
|
||||
// path: "/zh-tw/",
|
||||
// title: "翻译警告",
|
||||
// content: "MAA 的文檔以簡體中文為主,其他語言的文檔可能品質低或尚未翻譯,請諒解。",
|
||||
// fullscreen: true,
|
||||
// confirm: true,
|
||||
// showOnce: true,
|
||||
// actions: [
|
||||
// {
|
||||
// text: "我知道了",
|
||||
// type: "primary",
|
||||
// },
|
||||
// {
|
||||
// text: "前往簡體中文",
|
||||
// link: "/zh-cn/",
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// {
|
||||
// path: "/en-us/",
|
||||
// title: "Translation Warning",
|
||||
// content: "MAA's documents are mainly in Simplified Chinese. Documents in other languages may be of low quality or not yet translated. Please understand.",
|
||||
// fullscreen: true,
|
||||
// confirm: true,
|
||||
// showOnce: true,
|
||||
// actions: [
|
||||
// {
|
||||
// text: "Okay",
|
||||
// type: "primary",
|
||||
// },
|
||||
// {
|
||||
// text: "Take me to zh-CN",
|
||||
// link: "/zh-cn/",
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// {
|
||||
// path: "/ja-jp/",
|
||||
// title: "翻訳に関する警告",
|
||||
// content: "MAA のドキュメントは主に簡体字中国語で書かれており、他の言語のドキュメントは低品質であるか、翻訳されていない可能性がありますので、ご了承ください。",
|
||||
// fullscreen: true,
|
||||
// confirm: true,
|
||||
// showOnce: true,
|
||||
// actions: [
|
||||
// {
|
||||
// text: "OK",
|
||||
// type: "primary",
|
||||
// },
|
||||
// {
|
||||
// text: "中国語サイトへ行く",
|
||||
// link: "/zh-cn/",
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// {
|
||||
// path: "/ko-kr/",
|
||||
// title: "번역 경고",
|
||||
// content: "MAA의 문서는 주로 중국어 간체로 되어 있습니다. 다른 언어로 된 문서는 번역이 이상하거나, 번역이 되어있지 않을 수 있습니다.",
|
||||
// fullscreen: true,
|
||||
// confirm: true,
|
||||
// showOnce: true,
|
||||
// actions: [
|
||||
// {
|
||||
// text: "OK",
|
||||
// type: "primary",
|
||||
// },
|
||||
// {
|
||||
// text: "중국어 간체로 이동",
|
||||
// link: "/zh-cn/",
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// ],
|
||||
//},
|
||||
});
|
||||
1
docs/.vuepress/public/CNAME
Normal file
1
docs/.vuepress/public/CNAME
Normal file
@@ -0,0 +1 @@
|
||||
docs.maa.plus
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
@@ -1,101 +0,0 @@
|
||||
# This file MUST use GBK encoding, whatever the system language is.
|
||||
# You may do more testing, but at least it works like this for me.
|
||||
# Fuck Microsoft.
|
||||
# 修改请使用 GBK 编码保存。
|
||||
# 如果能用 UTF-8 保存而不乱码,那就去做,我实在是研究不明白微软的屎了。
|
||||
# 你或许想加一条 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 来解决问题。
|
||||
# 但很神奇的,这根本不管用,甚至还会让中文汉字渲染重叠在一起。
|
||||
# 我在 CMD 里面都能 chcp 65001 换成 UTF-8。
|
||||
# 微软什么时候能把 PowerShell 7 集成到系统里。
|
||||
# 我由衷的认为 Windows 中预装的 PowerShell 就是一坨屎,甚至不如 CMD。
|
||||
# 用 PowerShell 写这东西真成为了一盘醋包的饺子了。
|
||||
|
||||
# 检查 PowerShell 脚本运行策略
|
||||
# 我真理解不了这个运行策略的存在意义了,明明叫脚本运行策略,却可以用脚本修改。
|
||||
# 我既可以在不提权的情况下允许所有脚本运行,也可以直接启动一个运行所有脚本运行的会话。
|
||||
# 本脚本在测试时发现,在不修改策略且不提权的情况下也可以正常运行,只是在安装运行库时需要点安装程序的 UAC 弹窗。
|
||||
# 而不修改策略且提权时反而因为脚本策略运行不了了,这是什么品种的管理员权限。
|
||||
# $ExecutionPolicy = Get-ExecutionPolicy
|
||||
# if ($ExecutionPolicy -eq 'Restricted' -or $ExecutionPolicy -eq 'AllSigned') {
|
||||
# Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
|
||||
# Write-Host "已修改当前用户的 PowerShell 脚本运行策略为 RemoteSigned 以便运行此脚本。"
|
||||
# Write-Host "这只需运行一次,且理应不会产生较大的安全风险。"
|
||||
# Write-Host "如果您对此有疑虑,请在脚本运行结束后,在 PowerShell 中运行以下命令将策略值清空。"
|
||||
# Write-Host "Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser"
|
||||
# Pause
|
||||
# }
|
||||
|
||||
# 获取 UAC 权限并启动一个 RemoteSigned 脚本策略会话
|
||||
If (-Not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)) {
|
||||
Write-Host "正在获取管理员权限..."
|
||||
Start-Process powershell.exe "-ExecutionPolicy RemoteSigned -File `"$PSCommandPath`" -ArgumentList `"$PSCommandPath`"" -Verb RunAs
|
||||
Exit
|
||||
}
|
||||
|
||||
# 读取系统代理并应用
|
||||
$Internet_Settings = Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings'
|
||||
if ($Internet_Settings.ProxyEnable -eq 1) {
|
||||
$env:HTTP_PROXY = "http://$($Internet_Settings.ProxyServer)"
|
||||
$env:HTTPS_PROXY = "http://$($Internet_Settings.ProxyServer)"
|
||||
Write-Host "已应用系统代理:$($Internet_Settings.ProxyServer)。"
|
||||
}
|
||||
# else {
|
||||
# Write-Host "未启用系统代理。"
|
||||
# }
|
||||
Remove-Variable -Name Internet_Settings
|
||||
|
||||
# 新建下载用临时文件夹
|
||||
New-Item -Path "$env:TEMP" -Name "MAA_Runtime_Fix_Pwsh" -ItemType "Directory" | Out-Null
|
||||
|
||||
# 使用 BITS 下载运行库安装包
|
||||
Write-Host "正在下载运行库安装包..."
|
||||
# Start-Sleep -Seconds 1
|
||||
Start-BitsTransfer -Source "https://aka.ms/vs/17/release/vc_redist.x64.exe" -Destination "$env:TEMP\MAA_Runtime_Fix_Pwsh\vc_redist.x64.exe"
|
||||
Start-BitsTransfer -Source "https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/8.0.11/windowsdesktop-runtime-8.0.11-win-x64.exe" -Destination "$env:TEMP\MAA_Runtime_Fix_Pwsh\windowsdesktop-runtime-8.0.11-win-x64.exe"
|
||||
|
||||
# 卸载 vc++ 和 dotnet8
|
||||
Write-Host ""
|
||||
Write-Host "尝试调用 WinGet 卸载已安装的运行库..."
|
||||
winget uninstall "Microsoft.VCRedist.2015+.x64" "Microsoft.DotNet.DesktopRuntime.8" --force --all-versions
|
||||
|
||||
# 安装 vc++
|
||||
Write-Host ""
|
||||
Write-Host "正在安装/修复 Microsoft Visual C++ 可再发行程序包..."
|
||||
$vcProcess = Start-Process "$env:TEMP\MAA_Runtime_Fix_Pwsh\vc_redist.x64.exe" -ArgumentList '/repair', '/passive', '/norestart' -PassThru
|
||||
$vcProcess.WaitForExit()
|
||||
|
||||
# 安装 dotnet8
|
||||
Write-Host "正在安装/修复 .NET 桌面运行时 8..."
|
||||
$dotnetProcess = Start-Process "$env:TEMP\MAA_Runtime_Fix_Pwsh\windowsdesktop-runtime-8.0.11-win-x64.exe" -ArgumentList '/repair', '/passive', '/norestart' -PassThru
|
||||
$dotnetProcess.WaitForExit()
|
||||
|
||||
# 删除临时文件夹
|
||||
Write-Host ""
|
||||
Write-Host "正在清理临时文件..."
|
||||
Remove-Item -Path "$env:TEMP\MAA_Runtime_Fix_Pwsh" -Recurse -Force
|
||||
|
||||
Write-Host "运行库修复完成,请再次尝试运行 MAA。"
|
||||
Write-Host ""
|
||||
Pause
|
||||
|
||||
# 使用 winget 安装/更新运行库并卸载旧版本
|
||||
# winget install "Microsoft.VCRedist.2015+.x64" "Microsoft.DotNet.DesktopRuntime.8" --uninstall-previous --accept-package-agreements
|
||||
|
||||
# 使用 winget 下载运行库安装包
|
||||
# winget download --id "Microsoft.VCRedist.2015+.x64" -d "$env:TEMP\MAA_Runtime_Fix_Pwsh\"
|
||||
# winget download --id "Microsoft.DotNet.DesktopRuntime.8" -d "$env:TEMP\MAA_Runtime_Fix_Pwsh\"
|
||||
|
||||
# 不使用 winget 卸载 vc++
|
||||
# 会进行卸载 但是卸不掉
|
||||
# Get-Package -Name "Microsoft Visual C++ 2015-2022 Redistributable (x64) - *" | Uninstall-Package -Force
|
||||
|
||||
# 不使用 winget 卸载 dotnet8
|
||||
# 会进行卸载 但是卸不掉
|
||||
# Get-Package -Name "Microsoft Windows Desktop Runtime - 8.* (x64)" | Uninstall-Package -Force
|
||||
|
||||
# 下载安装包那里注释了一个睡一秒是因为本来下载文件的那个进度条会把上面输出过的所有内容都覆盖掉,上来就只能看到个下载进度条,别的啥也看不到。
|
||||
# 但当我去掉新建文件夹时输出的一大坨东西之后,这行就能露出来了。
|
||||
# 我建议每个人都去看一下 PowerShell 的 New-Item 新建文件夹能输出多大一坨玩意。
|
||||
# 还有 PowerShell 弱智一样的进度条显示机制,非得搞个固定不透明一大坨的浮窗上去干什么,就不能和别人一样在命令底部显示吗。
|
||||
|
||||
# 再用 Pwsh 写脚本我就是傻逼。
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 266 KiB After Width: | Height: | Size: 74 KiB |
4
docs/.vuepress/public/images/maa-support-panel.svg
Normal file
4
docs/.vuepress/public/images/maa-support-panel.svg
Normal file
@@ -0,0 +1,4 @@
|
||||
<svg width="24" height="24" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
|
||||
<text x="16" y="31" font-size="12" text-anchor="middle" font-family="monospace">maa</text>
|
||||
<path transform="translate(4, 0)" fill-rule="evenodd" clip-rule="evenodd" d="M19.85 8.75l4.15.83v4.84l-4.15.83 2.35 3.52-3.43 3.43-3.52-2.35-.83 4.15H9.58l-.83-4.15-3.52 2.35-3.43-3.43 2.35-3.52L0 14.42V9.58l4.15-.83L1.8 5.23 5.23 1.8l3.52 2.35L9.58 0h4.84l.83 4.15 3.52-2.35 3.43 3.43-2.35 3.52zm-1.57 5.07l4-.81v-2l-4-.81-.54-1.3 2.29-3.43-1.43-1.43-3.43 2.29-1.3-.54-.81-4h-2l-.81 4-1.3.54-3.43-2.29-1.43 1.43L6.38 8.9l-.54 1.3-4 .81v2l4 .81.54 1.3-2.29 3.43 1.43 1.43 3.43-2.29 1.3.54.81 4h2l.81-4 1.3-.54 3.43 2.29 1.43-1.43-2.29-3.43.54-1.3zm-8.186-4.672A3.43 3.43 0 0 1 12 8.57 3.44 3.44 0 0 1 15.43 12a3.43 3.43 0 1 1-5.336-2.852zm.956 4.274c.281.188.612.288.95.288A1.7 1.7 0 0 0 13.71 12a1.71 1.71 0 1 0-2.66 1.422z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 934 B |
BIN
docs/.vuepress/public/images/preview.jpg
Normal file
BIN
docs/.vuepress/public/images/preview.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
@@ -1,32 +0,0 @@
|
||||
import { sidebar } from "vuepress-theme-hope";
|
||||
|
||||
export const enusSidebar = sidebar({
|
||||
"/en-us/": [
|
||||
{
|
||||
text: "MAA",
|
||||
icon: "ic:round-home",
|
||||
link: "/en-us/",
|
||||
},
|
||||
{
|
||||
text: "User Manual",
|
||||
icon: "mdi:user",
|
||||
prefix: "manual/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "Development Docs",
|
||||
icon: "ph:code-bold",
|
||||
prefix: "develop/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "Protocol Docs",
|
||||
icon: "basil:document-solid",
|
||||
prefix: "protocol/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -1,5 +0,0 @@
|
||||
export * from "./zh-cn";
|
||||
export * from "./zh-tw";
|
||||
export * from "./en-us";
|
||||
export * from "./ja-jp";
|
||||
export * from "./ko-kr";
|
||||
@@ -1,32 +0,0 @@
|
||||
import { sidebar } from "vuepress-theme-hope";
|
||||
|
||||
export const jajpSidebar = sidebar({
|
||||
"/ja-jp/": [
|
||||
{
|
||||
text: "MAA",
|
||||
icon: "ic:round-home",
|
||||
link: "/ja-jp/",
|
||||
},
|
||||
{
|
||||
text: "使用説明",
|
||||
icon: "mdi:user",
|
||||
prefix: "manual/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "開発関連",
|
||||
icon: "ph:code-bold",
|
||||
prefix: "develop/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "プロトコルドキュメント",
|
||||
icon: "basil:document-solid",
|
||||
prefix: "protocol/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -1,32 +0,0 @@
|
||||
import { sidebar } from "vuepress-theme-hope";
|
||||
|
||||
export const kokrSidebar = sidebar({
|
||||
"/ko-kr/": [
|
||||
{
|
||||
text: "MAA",
|
||||
icon: "ic:round-home",
|
||||
link: "/ko-kr/",
|
||||
},
|
||||
{
|
||||
text: "사용자 설명서",
|
||||
icon: "mdi:user",
|
||||
prefix: "manual/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "개발 관련",
|
||||
icon: "ph:code-bold",
|
||||
prefix: "develop/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "프로토콜 문서",
|
||||
icon: "basil:document-solid",
|
||||
prefix: "protocol/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -1,32 +0,0 @@
|
||||
import { sidebar } from "vuepress-theme-hope";
|
||||
|
||||
export const zhcnSidebar = sidebar({
|
||||
"/zh-cn/": [
|
||||
{
|
||||
text: "MAA",
|
||||
icon: "ic:round-home",
|
||||
link: "/zh-cn/",
|
||||
},
|
||||
{
|
||||
text: "用户手册",
|
||||
icon: "mdi:user",
|
||||
prefix: "manual/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "开发文档",
|
||||
icon: "ph:code-bold",
|
||||
prefix: "develop/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "协议文档",
|
||||
icon: "basil:document-solid",
|
||||
prefix: "protocol/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -1,32 +0,0 @@
|
||||
import { sidebar } from "vuepress-theme-hope";
|
||||
|
||||
export const zhtwSidebar = sidebar({
|
||||
"/zh-tw/": [
|
||||
{
|
||||
text: "MAA",
|
||||
icon: "ic:round-home",
|
||||
link: "/zh-tw/",
|
||||
},
|
||||
{
|
||||
text: "用戶說明書",
|
||||
icon: "mdi:user",
|
||||
prefix: "manual/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "開發文件",
|
||||
icon: "ph:code-bold",
|
||||
prefix: "develop/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
{
|
||||
text: "協議文件",
|
||||
icon: "basil:document-solid",
|
||||
prefix: "protocol/",
|
||||
collapsible: true,
|
||||
children: "structure",
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -1 +0,0 @@
|
||||
$theme-colors: #2196f3, #f26d6d, #3eaf7c, #fb9b5f;
|
||||
16
docs/.vuepress/styles/fonts.scss
Normal file
16
docs/.vuepress/styles/fonts.scss
Normal file
@@ -0,0 +1,16 @@
|
||||
:root {
|
||||
--vp-font-family-base:
|
||||
-apple-system, BlinkMacSystemFont, "Noto Sans SC", "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans",
|
||||
"Droid Sans", "Helvetica Neue", STHeiti, "Microsoft YaHei", sans-serif;
|
||||
|
||||
--vp-font-family-heading:
|
||||
Georgia, -apple-system, "Nimbus Roman No9 L", "PingFang SC", "Hiragino Sans GB", "Noto Serif SC", "Microsoft Yahei",
|
||||
"WenQuanYi Micro Hei", "ST Heiti", sans-serif;
|
||||
|
||||
--vp-font-family-mono:
|
||||
"Maple Mono NF CN", "JetBrains Mono", "Fira Code", "Noto Sans SC", Consolas, monospace, Menlo, "Courier New";
|
||||
}
|
||||
|
||||
html[lang="ja-JP"] {
|
||||
--vp-font-family-base: "Helvetica Neue", Arial, "Hiragino Kaku Gothic ProN", "Hiragino Sans", Meiryo, sans-serif;
|
||||
}
|
||||
40
docs/.vuepress/styles/home.scss
Normal file
40
docs/.vuepress/styles/home.scss
Normal file
@@ -0,0 +1,40 @@
|
||||
:root {
|
||||
--vp-home-hero-name: var(--vp-c-text-1);
|
||||
--vp-home-hero-text: var(--vp-c-text-2);
|
||||
--vp-home-hero-tagline: var(--vp-c-text-3);
|
||||
--vp-home-hero-name-color: transparent;
|
||||
--vp-home-hero-name-background: linear-gradient(350deg, var(--vp-c-yellow-1) 10%, var(--vp-c-red-2));
|
||||
--vp-home-hero-image-background-image: linear-gradient(-45deg, var(--vp-c-yellow-1) 50%, var(--vp-c-yellow-1) 50%);
|
||||
--vp-home-hero-image-filter: blur(50px);
|
||||
|
||||
--vp-home-hero-name-font-size: 4rem;
|
||||
--vp-home-hero-name-line-height: 1.1;
|
||||
|
||||
@media (min-width: 640px) {
|
||||
--vp-home-hero-name-font-size: 5rem;
|
||||
}
|
||||
|
||||
@media (min-width: 960px) {
|
||||
--vp-home-hero-name-font-size: 6rem;
|
||||
}
|
||||
}
|
||||
|
||||
.vp-home-doc-hero {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
.container {
|
||||
margin: 0 auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
max-width: 1152px;
|
||||
}
|
||||
|
||||
.name {
|
||||
font-size: var(--vp-home-hero-name-font-size) !important;
|
||||
line-height: var(--vp-home-hero-name-line-height) !important;
|
||||
}
|
||||
}
|
||||
22
docs/.vuepress/styles/index.scss
Normal file
22
docs/.vuepress/styles/index.scss
Normal file
@@ -0,0 +1,22 @@
|
||||
@use "home.scss";
|
||||
@use "fonts.scss";
|
||||
|
||||
/* 按钮组容器 */
|
||||
.actions .action {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
max-width: 100%;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* 按钮 */
|
||||
.actions .action .vp-button {
|
||||
margin: 0.5rem;
|
||||
min-width: 7em;
|
||||
}
|
||||
|
||||
/* 首页标题 */
|
||||
.is-home .name.clip {
|
||||
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
$sidebar-width: 16rem;
|
||||
$content-width: 1000px;
|
||||
|
||||
$vp-font: '-apple-system, BlinkMacSystemFont, "Noto Sans SC", "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", STHeiti, "Microsoft YaHei", sans-serif';
|
||||
$vp-font-heading: 'Georgia, -apple-system, "Nimbus Roman No9 L", "PingFang SC", "Hiragino Sans GB", "Noto Serif SC", "Microsoft Yahei", "WenQuanYi Micro Hei", "ST Heiti", sans-serif';
|
||||
$vp-font-mono: '"Sarasa Gothic", "Jetbrains mono", "Fira Code", "Noto Sans SC", Consolas, monospace, Menlo, "Courier New"';
|
||||
|
||||
.vp-hero-slide-down-button {
|
||||
display: none !important;
|
||||
visibility: hidden !important;
|
||||
}
|
||||
|
||||
.vp-skip-link.sr-only {
|
||||
display: none !important;
|
||||
visibility: hidden !important;
|
||||
}
|
||||
|
||||
html[lang="ja-JP"] {
|
||||
$vp-font: "Helvetica Neue, Arial, Hiragino Kaku Gothic ProN, Hiragino Sans, Meiryo, sans-serif";
|
||||
}
|
||||
@@ -1,185 +0,0 @@
|
||||
import { hopeTheme } from "vuepress-theme-hope";
|
||||
import DocSearchConfig from './plugins/search';
|
||||
import { zhcnNavbar, zhtwNavbar, enusNavbar, jajpNavbar, kokrNavbar } from "./navbar/index";
|
||||
import { zhcnSidebar, zhtwSidebar, enusSidebar, jajpSidebar, kokrSidebar } from "./sidebar/index";
|
||||
|
||||
export default hopeTheme({
|
||||
hostname: "https://maa.plus",
|
||||
author: "MaaAssistantArknights",
|
||||
license: "AGPL-3.0",
|
||||
repo: "MaaAssistantArknights/MaaAssistantArknights",
|
||||
docsBranch: "dev",
|
||||
docsDir: "/docs",
|
||||
|
||||
lastUpdated: false,
|
||||
contributors: false,
|
||||
|
||||
locales: {
|
||||
"/zh-cn/": {
|
||||
navbar: zhcnNavbar,
|
||||
sidebar: zhcnSidebar,
|
||||
displayFooter: false,
|
||||
metaLocales: {
|
||||
editLink: "在 Github 上编辑此页面",
|
||||
},
|
||||
},
|
||||
"/zh-tw/": {
|
||||
navbar: zhtwNavbar,
|
||||
sidebar: zhtwSidebar,
|
||||
displayFooter: false,
|
||||
title: '繁体中文',
|
||||
metaLocales: {
|
||||
editLink: "在 Github 上編輯此頁面",
|
||||
},
|
||||
},
|
||||
"/en-us/": {
|
||||
navbar: enusNavbar,
|
||||
sidebar: enusSidebar,
|
||||
displayFooter: false,
|
||||
metaLocales: {
|
||||
editLink: "Edit this page on Github",
|
||||
},
|
||||
},
|
||||
"/ja-jp/": {
|
||||
navbar: jajpNavbar,
|
||||
sidebar: jajpSidebar,
|
||||
displayFooter: false,
|
||||
metaLocales: {
|
||||
editLink: "このページを Github で編集する",
|
||||
},
|
||||
},
|
||||
"/ko-kr/": {
|
||||
navbar: kokrNavbar,
|
||||
sidebar: kokrSidebar,
|
||||
displayFooter: false,
|
||||
metaLocales: {
|
||||
editLink: "Github 에서 이 페이지를 편집",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
markdown: {
|
||||
align: true,
|
||||
codeTabs: true,
|
||||
//echarts: true,
|
||||
footnote: true,
|
||||
gfm: true,
|
||||
hint: true,
|
||||
imgLazyload: true,
|
||||
imgMark: true,
|
||||
imgSize: true,
|
||||
//mathjax: true,
|
||||
mark: true,
|
||||
//mermaid: true,
|
||||
tabs: true,
|
||||
tasklist: true,
|
||||
vPre: true,
|
||||
component: true,
|
||||
|
||||
highlighter: {
|
||||
'type': 'shiki',
|
||||
themes: {
|
||||
light: "light-plus",
|
||||
dark: "nord",
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
plugins: {
|
||||
activeHeaderLinks: false,
|
||||
|
||||
comment: {
|
||||
provider: "Giscus",
|
||||
repo: "MaaAssistantArknights/maa-website",
|
||||
repoId: "R_kgDOHY7Gyg",
|
||||
category: "Comments",
|
||||
categoryId: "DIC_kwDOHY7Gys4CgoVH",
|
||||
mapping: "pathname",
|
||||
strict: true,
|
||||
},
|
||||
|
||||
docsearch: DocSearchConfig,
|
||||
|
||||
icon: {
|
||||
assets: "iconify",
|
||||
},
|
||||
|
||||
sitemap: true,
|
||||
seo: true,
|
||||
|
||||
notice: [
|
||||
{
|
||||
path: "/zh-tw/",
|
||||
title: "翻译警告",
|
||||
content: "MAA 的文檔以簡體中文為主,其他語言的文檔可能品質低或尚未翻譯,請諒解。",
|
||||
fullscreen: true,
|
||||
confirm: true,
|
||||
showOnce: true,
|
||||
actions: [
|
||||
{
|
||||
text: "我知道了",
|
||||
type: "primary",
|
||||
},
|
||||
{
|
||||
text: "前往簡體中文",
|
||||
link: "/zh-cn/",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: "/en-us/",
|
||||
title: "Translation Warning",
|
||||
content: "MAA's documents are mainly in Simplified Chinese. Documents in other languages may be of low quality or not yet translated. Please understand.",
|
||||
fullscreen: true,
|
||||
confirm: true,
|
||||
showOnce: true,
|
||||
actions: [
|
||||
{
|
||||
text: "Okay",
|
||||
type: "primary",
|
||||
},
|
||||
{
|
||||
text: "Take me to zh-CN",
|
||||
link: "/zh-cn/",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: "/ja-jp/",
|
||||
title: "翻訳に関する警告",
|
||||
content: "MAA のドキュメントは主に簡体字中国語で書かれており、他の言語のドキュメントは低品質であるか、翻訳されていない可能性がありますので、ご了承ください。",
|
||||
fullscreen: true,
|
||||
confirm: true,
|
||||
showOnce: true,
|
||||
actions: [
|
||||
{
|
||||
text: "OK",
|
||||
type: "primary",
|
||||
},
|
||||
{
|
||||
text: "中国語サイトへ行く",
|
||||
link: "/zh-cn/",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: "/ko-kr/",
|
||||
title: "번역 경고",
|
||||
content: "MAA의 문서는 주로 중국어 간체로 되어 있습니다. 다른 언어로 된 문서는 번역이 이상하거나, 번역이 되어있지 않을 수 있습니다.",
|
||||
fullscreen: true,
|
||||
confirm: true,
|
||||
showOnce: true,
|
||||
actions: [
|
||||
{
|
||||
text: "OK",
|
||||
type: "primary",
|
||||
},
|
||||
{
|
||||
text: "중국어 간체로 이동",
|
||||
link: "/zh-cn/",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
}, { custom: true });
|
||||
27
docs/README.md
Normal file
27
docs/README.md
Normal file
@@ -0,0 +1,27 @@
|
||||
---
|
||||
pageLayout: home
|
||||
title: 首页
|
||||
config:
|
||||
- type: doc-hero
|
||||
hero:
|
||||
name: MAA
|
||||
text: 文档站 | Documentation
|
||||
tagline: 选择语言 | Select Language
|
||||
image: /images/maa-logo_512x512.png
|
||||
actions:
|
||||
- theme: brand
|
||||
text: 简体中文
|
||||
link: /zh-cn/
|
||||
- theme: alt
|
||||
text: 繁體中文
|
||||
link: /zh-tw/
|
||||
- theme: alt
|
||||
text: English
|
||||
link: /en-us/
|
||||
- theme: alt
|
||||
text: 日本語
|
||||
link: /ja-jp/
|
||||
- theme: alt
|
||||
text: 한국어
|
||||
link: /ko-kr/
|
||||
---
|
||||
@@ -1,41 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<img v-for="src of displayImageList" class="image" :src="src" alt="" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { PropType, defineComponent } from "vue";
|
||||
import { withBase } from "vuepress/client";
|
||||
|
||||
export default defineComponent({
|
||||
props: {
|
||||
imageList: Array as PropType<
|
||||
Array<{ light: string; dark: string } | string>
|
||||
>,
|
||||
},
|
||||
computed: {
|
||||
displayImageList() {
|
||||
return this.imageList.map((item) => {
|
||||
const src =
|
||||
typeof item === "string"
|
||||
? item
|
||||
: this.$isDarkmode
|
||||
? item.dark
|
||||
: item.light;
|
||||
return withBase(src);
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.image {
|
||||
box-sizing: border-box;
|
||||
width: auto;
|
||||
padding: 9px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<img v-for="src of displayImageList" class="image" :src="src" alt="" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { PropType, defineComponent } from "vue";
|
||||
import { withBase } from "vuepress/client";
|
||||
|
||||
export default defineComponent({
|
||||
props: {
|
||||
imageList: Array as PropType<
|
||||
Array<{ light: string; dark: string } | string>
|
||||
>,
|
||||
},
|
||||
computed: {
|
||||
displayImageList() {
|
||||
return this.imageList.map((item) => {
|
||||
const src =
|
||||
typeof item === "string"
|
||||
? item
|
||||
: this.$isDarkmode
|
||||
? item.dark
|
||||
: item.light;
|
||||
return withBase(src);
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.image {
|
||||
box-sizing: border-box;
|
||||
width: 50%;
|
||||
padding: 9px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
@media (max-width: 419px) {
|
||||
.image {
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<img v-for="src of displayImageList" class="image" :src="src" alt="" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { PropType, defineComponent } from "vue";
|
||||
import { withBase } from "vuepress/client";
|
||||
|
||||
export default defineComponent({
|
||||
props: {
|
||||
imageList: Array as PropType<
|
||||
Array<{ light: string; dark: string } | string>
|
||||
>,
|
||||
},
|
||||
computed: {
|
||||
displayImageList() {
|
||||
return this.imageList.map((item) => {
|
||||
const src =
|
||||
typeof item === "string"
|
||||
? item
|
||||
: this.$isDarkmode
|
||||
? item.dark
|
||||
: item.light;
|
||||
return withBase(src);
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.image {
|
||||
box-sizing: border-box;
|
||||
width: 25%;
|
||||
padding: 9px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
@media (max-width: 719px) {
|
||||
.image {
|
||||
width: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 419px) {
|
||||
.image {
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -9,12 +9,12 @@ icon: jam:write-f
|
||||
The purpose of this document is to guide document writers to better utilize the functionalities provided by the theme, thus achieving a more readable effect.
|
||||
:::
|
||||
|
||||
Our documentation is built on [vuepress](https://github.com/vuejs/vuepress) and utilizes the [vuepress-theme-hope](https://github.com/vuepress-theme-hope/vuepress-theme-hope) theme. You can also refer to the [official documentation](https://theme-hope.vuejs.press/) for more detailed explanations. Here, we only introduce some common functionalities.
|
||||
Our documentation is built on [vuepress](https://github.com/vuejs/vuepress) and utilizes the [vuepress-theme-plume](https://github.com/pengzhanbo/vuepress-theme-plume) theme. You can also refer to the [official documentation](https://theme-plume.vuejs.press/) for more detailed explanations. Here, we only introduce some common functionalities.
|
||||
|
||||
## Deploy Locally
|
||||
|
||||
1. Install [Pnpm](https://pnpm.io/installation), and clone the repository refer to [Introduction to GitHub Pull request Flow](./development.md#introduction-to-github-pull-request-flow).
|
||||
2. Create a terminal in the `website` directory, then run `pnpm i` to download dependencies.
|
||||
2. Create a terminal in the `docs` directory, then run `pnpm i` to download dependencies.
|
||||
3. Run `pnpm run dev` to deploy.
|
||||
|
||||
## Containers
|
||||
|
||||
@@ -22,9 +22,6 @@ Mac can use the `tools/build_macos_universal.zsh` script for compilation. It's r
|
||||
- Ubuntu/Debian
|
||||
|
||||
```bash
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh 20
|
||||
sudo apt install cmake
|
||||
```
|
||||
|
||||
@@ -32,8 +29,6 @@ Mac can use the `tools/build_macos_universal.zsh` script for compilation. It's r
|
||||
|
||||
```bash
|
||||
sudo pacman -S --needed cmake
|
||||
# also, llvm 20 is needed.
|
||||
# clang-20, clang++-20 are required to be found in PATH
|
||||
```
|
||||
|
||||
2. Build third-party libraries
|
||||
@@ -48,7 +43,6 @@ Mac can use the `tools/build_macos_universal.zsh` script for compilation. It's r
|
||||
|
||||
```bash
|
||||
python tools/maadeps-download.py
|
||||
python tools/linux-toolchain-download.py
|
||||
```
|
||||
|
||||
If you find the libraries downloaded above cannot run on your system due to ABI version issues and you don't want to use container solutions, you can also try compiling from scratch
|
||||
@@ -58,8 +52,8 @@ Mac can use the `tools/build_macos_universal.zsh` script for compilation. It's r
|
||||
```bash
|
||||
git clone https://github.com/MaaAssistantArknights/MaaDeps
|
||||
cd MaaDeps
|
||||
# If the system is too old to install llvm 20, please consider using local build enviroment instead of cross compiling.
|
||||
# The toolchain config under MaaDeps/vcpkg-overlay/triplet needs to be modified.
|
||||
# If the system is too old to use our prebuilt llvm 20, please consider using local build enviroment instead of cross compiling.
|
||||
# The toolchain config under MaaDeps/cmake needs to be modified.
|
||||
python linux-toolchain-download.py
|
||||
python build.py
|
||||
```
|
||||
@@ -70,7 +64,7 @@ Mac can use the `tools/build_macos_universal.zsh` script for compilation. It's r
|
||||
cmake -B build \
|
||||
-DINSTALL_RESOURCE=ON \
|
||||
-DINSTALL_PYTHON=ON \
|
||||
-DCMAKE_TOOLCHAIN_FILE=cmake/linux/maa-x64-linux-toolchain.cmake
|
||||
-DCMAKE_TOOLCHAIN_FILE=MaaDeps/cmake/maa-x64-linux-toolchain.cmake
|
||||
cmake --build build
|
||||
```
|
||||
|
||||
|
||||
@@ -22,16 +22,12 @@ Abbreviated as "repo", the place where we store our code and other resource file
|
||||
|
||||
👇 You can simply understand this webpage and all its contents as MAA's repository (we generally call it MAA's main repository)
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/repository-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/repository-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/repository-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/repository-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
### Fork
|
||||
|
||||
@@ -42,16 +38,12 @@ Since it's a copy, it becomes `MAA (1)` (just kidding)
|
||||
To distinguish from the original repository, we generally call the original MAA repository the "main repository" or "upstream repository."
|
||||
Since everyone can fork their own copy, the copied version is called a "personal repository" or "origin repository."
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/fork-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/fork-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/fork-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/fork-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
### Pull Request
|
||||
|
||||
@@ -62,16 +54,12 @@ Of course, since it's a "request," it naturally needs approval. MAA Team members
|
||||
|
||||
👇 Below are PRs currently submitted by contributors, waiting for approval
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pull-request-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pull-request-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pull-request-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pull-request-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
### Conflict
|
||||
|
||||
@@ -84,29 +72,21 @@ Conflicts are somewhat troublesome to resolve. This section only explains the co
|
||||
|
||||
1. First, enter MAA's main repository and click the Fork button in the upper right corner to fork a copy of the code
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/fork-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/fork-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/fork-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/fork-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
2. Then directly click "Create Fork"
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-2-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-2-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-2-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-2-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
3. You'll arrive at your personal repository. You can see the title is "YourName/MaaAssistantArknights" with small text below saying "forked from MaaAssistantArknights/MaaAssistantArknights"
|
||||
|
||||
|
||||
104
docs/en-us/develop/vsc-ext-tutorial.md
Normal file
104
docs/en-us/develop/vsc-ext-tutorial.md
Normal file
@@ -0,0 +1,104 @@
|
||||
---
|
||||
order: 8
|
||||
icon: iconoir:code-brackets
|
||||
---
|
||||
|
||||
# Dedicated VSCode Extension Tutorial
|
||||
|
||||
* [Extension Store](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support)
|
||||
* [Repository](https://github.com/neko-para/maa-support-extension)
|
||||
|
||||
## Installation
|
||||
|
||||
Searching `Maa` and installing it from VSCode extensions list is recommended.
|
||||
|
||||
## Features
|
||||
|
||||
### Control Panel
|
||||
|
||||
A dedicated control panel is added to the left, with icon 
|
||||
|
||||
The major features of the extension are based on the `interface.json` configuration. Select the activated `interface.json` on the top of the control panel.
|
||||
|
||||
The extension has a `Maa` compatiable mode. If `src/MaaCore` folder exists inside the opened workspace, the mode will be enabled automatically.
|
||||
|
||||
### Semantic resource analysis
|
||||
|
||||
Select expected resource via the `Resource` select inside the control panel. The extension will index and diagnose resource via corresponding paths.
|
||||
|
||||
If you find that the editing json isn't hinted by the extension, please check if the activated resource contains it.
|
||||
|
||||
> The term `definitions of task / task defs` refers to key props of task objects.
|
||||
>
|
||||
> The term `references of task / task refs` refers to values containing task name (e.g. in `next`) in other task objects.
|
||||
|
||||
#### Query task defs / task refs
|
||||
|
||||
The extension supports Jump to task defs, Jump to task refs and View task defs.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to parse `template task`, supporting querying task defs and task refs in conjunction with base tasks. Images that has the same name of the task will be shown when hovering the task defs.
|
||||
|
||||
#### Query / open images
|
||||
|
||||
The extension supports open images.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to recursively search for the image.
|
||||
|
||||
#### Task completion
|
||||
|
||||
The extension supports autocompletion according to all known tasks.
|
||||
|
||||
When enabling the `Maa` compatible mode, typing `@` will trigger completion.
|
||||
|
||||
#### Image path completion
|
||||
|
||||
The extension supports autocompletion according to the path of all known images.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to recursively search for the image.
|
||||
|
||||
#### Check tasks / image paths
|
||||
|
||||
The extension supports scheduled scanning and diagnosing all tasks.
|
||||
|
||||
* Check if contains task defs with same names.
|
||||
* Check if contains unknown task refs.
|
||||
* Check if contains unknown image refs.
|
||||
* Check if contains duplicated task refs in a single task.
|
||||
|
||||
#### Multiple paths resource support
|
||||
|
||||
The extension supports resource with multiple paths. The extension will perform logical overlapping according to specified order, thus content loaded later can reference content loaded earlier.
|
||||
|
||||
### Evaluate Task / Tsak List Expression (Only Maa)
|
||||
|
||||
Evaluating the expanded task object and the sources of each properties, and the result of the task list expression via the control panel.
|
||||
|
||||
### MaaPiCli feature (Only MaaFramework projects)
|
||||
|
||||
Scanning and selecting controllers, selecting resource, adding and manipulating tasks, and launching tasks can be done via the control panel.
|
||||
|
||||
### Take screenshots and crop images
|
||||
|
||||
Searching and launching `Maa: open crop tool` inside VSCode command panel can open `Screenshots / Crop` panel.
|
||||
|
||||
> Use `Ctrl+Shift+P` (`Command+Shift+P` on MacOS) to open command panel
|
||||
|
||||
* After selecting and connecting to the controller, use `Screencap` button to obtain screenshots
|
||||
* Use `Upload` button to manually upload images.
|
||||
* Hold `Ctrl` key and select cropping area
|
||||
* Use wheels to zoom
|
||||
* After finishing cropping, use `Download` button to save the cropping result to the folder of the topest layer of the activated resource
|
||||
|
||||
### Bottom status bar
|
||||
|
||||
#### MaaSupport \[Extension Version\]
|
||||
|
||||
Click to reveal control panel
|
||||
|
||||
#### MaaFramework \[MaaFw Version\]
|
||||
|
||||
Click to switch `MaaFramework` version used by the extension
|
||||
|
||||
> When used for the first time, the preset version will be downloaded.
|
||||
>
|
||||
> Search command `Maa: select fetch registry` to switch downloading source (npm / cnpm).
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
title: CLI Manual
|
||||
icon: material-symbols:terminal
|
||||
index: false
|
||||
index: true
|
||||
dir:
|
||||
order: 6
|
||||
---
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 4
|
||||
order: 2
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
|
||||
@@ -135,6 +135,8 @@ MAA now attempts to read the `bluestacks.conf` storage location from the registr
|
||||
- International version default: `C:\ProgramData\BlueStacks_nxt\bluestacks.conf`
|
||||
- Chinese version default: `C:\ProgramData\BlueStacks_nxt_cn\bluestacks.conf`
|
||||
|
||||
Note: `C:\ProgramData` is a hidden directory. If necessary, paste this address directly into the file explorer's address bar to access it.
|
||||
|
||||
2. If this is your first time, run MAA once so it automatically generates the configuration file.
|
||||
|
||||
3. **First close** MAA, **then** open `gui.json`, find your current configuration name under `Configurations` (viewable in Settings-Switch Configuration, default is `Default`), search for the `Bluestacks.Config.Path` field, and enter the full path to `bluestacks.conf`. (Note: use escaped backslashes `\\`)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 4
|
||||
order: 2
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ title: Introduction
|
||||
icon: mdi:information-outline
|
||||
index: false
|
||||
dir:
|
||||
order: 2
|
||||
order: 4
|
||||
---
|
||||
|
||||
<Catalog base='/en-us/manual/introduction/' />
|
||||
|
||||
@@ -21,25 +21,25 @@ All features involving automatic combat require a stable game frame rate of at l
|
||||
|
||||
## Recommended Starts
|
||||
|
||||
::: details _Last updated 2025/8/2_
|
||||
::: details _Last updated on 2025/8/30_
|
||||
|
||||
| Theme | Difficulty | Squad | Strategy | Operator |
|
||||
| ------- | ----------------- | --------------------------------------- | ------------------------- | --------- |
|
||||
| Phantom | Formal Investigation·3~7 | Leader Squad / Tactical Assault Squad | Overcoming Your Weaknesses | Thorns |
|
||||
| Mizuki | Surging Waves·3~7 | People-Oriented Squad / Mind Over Matter Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Sami | Braving Nature·4~10 | Special Training Squad / Tactical Ranged Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Sarkaz | Face the Spirit·4~10 | Blueprint Mapping Squad / Tactical Ranged Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Garden | Enter the Garden·3~10 | Leader Squad / Tactical Ranged Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Theme | Difficulty | Squad | Strategy | Operator |
|
||||
| ------- | ---------------------- | ----------------------------------------------- | ----------------------------- | -------- |
|
||||
| Phantom | Formal Investigation·2 | Leader Squad / Tactical Assault Squad | Overcoming Your Weaknesses | Thorns |
|
||||
| Mizuki | Surging Waves·3~7 | People-Oriented Squad / Mind Over Matter Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Sami | Braving Nature·4~10 | Special Training Squad / Tactical Ranged Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Sarkaz | Facing Souls·4~10 | Blueprint Mapping Squad / Tactical Ranged Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
| Garden | Enter the Garden·3~10 | Leader Squad / Tactical Ranged Squad | Slow and Steady Wins the Race | Wiš'adel |
|
||||
|
||||
The recommended difficulties consider factors like `enemy difficulty`, `hope consumption`, and `score multiplier`, and have been tested to be stable with high-level operators. Feel free to adjust based on your situation and needs.
|
||||
|
||||
| Theme | Notes |
|
||||
| ------- | ----- |
|
||||
| Phantom | `Formal Investigation·4` and higher difficulties may give hope-reducing collectibles at start, preventing recruitment of six-star operators. |
|
||||
| Mizuki | `Surging Waves·4` and higher difficulties increase six-star operator hope cost by +1, making it potentially impossible to recruit them with `Mind Over Matter Squad`.<br>`People-Oriented Squad` is better for high-level accounts, while `Mind Over Matter Squad` requires luck. |
|
||||
| Sami | `Braving Nature·6` and higher difficulties increase six-star operator hope cost by +1, potentially making it impossible to recruit them with `Special Training Squad`. |
|
||||
| Sarkaz | `Face the Spirit·15` and higher difficulties increase six-star operator hope cost by +1, potentially making it impossible to recruit them with `Blueprint Mapping Squad`.<br>With `Blueprint Mapping Squad`, MAA will adopt an avoidance strategy to quickly obtain `Spirit Bookmarks`, but generally cannot complete endings.<br>When using the Originium Ingot farming strategy with `Point-Stab Ingot Squad`, MAA will use shop refreshing to speed up the process. |
|
||||
| Garden | `Enter the Garden·15` and higher difficulties increase six-star operator hope cost by +1, potentially making it impossible to recruit them with `Leader Squad`.<br>When set to `Enter the Garden·3` difficulty with the Originium Ingot farming strategy and `Leader Squad`, MAA will use the `End of Time` stage-skip strategy to speed up the process. |
|
||||
| Theme | Notes |
|
||||
| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Phantom | `Formal Investigation·3` and higher difficulties may offer hope-reducing collectibles at start, preventing recruitment of six-star operators. |
|
||||
| Mizuki | `Surging Waves·4` and higher difficulties increase six-star operator hope cost by +1, making it potentially impossible to recruit them with `Mind Over Matter Squad`.<br>`People-Oriented Squad` is better for high-level accounts, while `Mind Over Matter Squad` requires luck. |
|
||||
| Sami | `Braving Nature·6` and higher difficulties increase six-star operator hope cost by +1, making it potentially impossible to recruit them with `Special Training Squad`. |
|
||||
| Sarkaz | `Facing Souls·15` and higher difficulties increase six-star operator hope cost by +1, making it potentially impossible to recruit them with `Blueprint Mapping Squad` unless `Blueprint Mapping Squad Enhancement Ⅱ` has been activated in `Historical Reconstruction`.<br>When `Blueprint Mapping Squad` is selected, MAA will use a combat-avoidance strategy to quickly collect `Soul Bookmarks`, though it typically makes it impossible to witness an ending.<br>When the Originium Ingot farming strategy and the `Ingots Squad` are selected, MAA will use the shop refreshing strategy to speed up the process. |
|
||||
| Garden | `Enter the Garden·15` and higher difficulties increase six-star operator hope cost by +1, making it potentially impossible to recruit them with `Leader Squad`.<br>When `Enter the Garden·3` difficulty, the Originium Ingot farming strategy and `Leader Squad` are selected, MAA will use the `End of Time` stage-skip strategy to speed up the process. |
|
||||
|
||||
:::
|
||||
|
||||
|
||||
@@ -8,6 +8,10 @@ icon: material-symbols:task
|
||||
Usage of `resource/tasks` and description of each field
|
||||
|
||||
::: tip
|
||||
It is recommended to use [Visual Studio Code](https://code.visualstudio.com/) and install [Maa Pipeline Support](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) extension for efficient editing. For more details, please visit the extension's homepage and the [docs](../develop/vsc-ext-tutorial.md).
|
||||
:::
|
||||
|
||||
::: warning
|
||||
Please note that JSON files do not support comments. The comments in this document are for demonstration purposes only. Do not copy them directly into your JSON files.
|
||||
:::
|
||||
|
||||
@@ -181,115 +185,207 @@ Please note that JSON files do not support comments. The comments in this docume
|
||||
}
|
||||
```
|
||||
|
||||
## Expression Calculation
|
||||
|
||||
Task list type fields (`sub`, `next`, `onErrorNext`, `exceededNext`, `reduceOtherTimes`) support expression calculations.
|
||||
|
||||
| Symbol | Meaning | Example |
|
||||
| :---------: | :---------------------------------------------------------: | :---------------------------------------: |
|
||||
| `@` | `@`-type Task | `Fight@ReturnTo` |
|
||||
| `#` (unary) | Virtual task | `#self` |
|
||||
| `#` (binary)| Virtual task | `StartUpThemes#next` |
|
||||
| `*` | Repeat tasks | `(ClickCornerAfterPRTS+ClickCorner)*5` |
|
||||
| `+` | Task list merge (in next-type attributes, only first occurrence of same-name tasks kept) | `A+B` |
|
||||
| `^` | Task list difference (in first but not second, order preserved) | `(A+A+B+C)^(A+B+D)` (result is `C`) |
|
||||
|
||||
Operators `@`, `#`, `*`, `+`, `^` have precedence: `#` (unary) > `@` = `#` (binary) > `*` > `+` = `^`.
|
||||
|
||||
## Special Task Types
|
||||
|
||||
### Template Task (`@` Type Task)
|
||||
### Template Task
|
||||
|
||||
Template task and base task are collectively called **template tasks**.
|
||||
**Template tasks** include derived tasks and `@`-type tasks. The core of the template task can be understood as **modifying the default values of fields** based on the *base task*.
|
||||
|
||||
Allows using task "A" as template, with "B@A" representing a task generated from "A".
|
||||
#### Derived Task
|
||||
|
||||
- If task "B@A" is not explicitly defined in `tasks.json`, then add `B@` prefix to `sub`, `next`, `onErrorNext`, `exceededNext`, `reduceOtherTimes` fields (or `B` if task name begins with `#`), all other parameters match task "A". For example, if task "A" has:
|
||||
Tasks with the `baseTask` field are derived tasks, and the task corresponding to the `baseTask` field is referred to as its *base task* of this derived task. For a derived task,
|
||||
|
||||
1. If it is an template matching task, the default value for the `template` field remains `"TaskName.png"`;
|
||||
2. If the `algorithm` field differs from its *base task*, the derived class parameters are not inherited (only parameters defined in `TaskInfo` are inherited);
|
||||
3. The default values for all other fields are the corresponding fields of its *base task*.
|
||||
|
||||
#### Implicit `@`-type Task
|
||||
|
||||
If task `"A"` exists and there is not a task directly defined in any task file such as `"B@A"`, it is an implicit `@`-type task, and task `"A"` is called the *base task* of task `"B@A"`. For an implicit `@`-type task,
|
||||
|
||||
1. The default values for task list type fields (`sub`, `next`, `onErrorNext`, `exceededNext`, `reduceOtherTimes`) are set to the base task's corresponding fields with the `B@` prefix directly appended (if the task name starts with `#`, the `B` prefix is appended);
|
||||
2. The default values for all other fields (including the `template` field) are the corresponding fields of its *base task*.
|
||||
|
||||
#### Explicit `@`-type Task
|
||||
|
||||
If task `"A"` exists and there is a task directly defined in the task file such as `"B@A"`, it is an explicit `@`-type task, and task `"A"` is called the *base task* of task `"B@A"`. For an explicit `@`-type task,
|
||||
|
||||
1. The default values for task list type fields (`sub`, `next`, `onErrorNext`, `exceededNext`, `reduceOtherTimes`) are set to the base task's corresponding fields with the `B@` prefix directly appended (if the task name starts with `#`, the `B` prefix is appended);
|
||||
2. If it is an template matching task, the default value for the `template` field remains `"TaskName.png"`;
|
||||
3. If the `algorithm` field differs from its *base task*, the derived class parameters are not inherited (only parameters defined in `TaskInfo` are inherited);
|
||||
4. The default values for all other fields are the corresponding fields of its *base task*.
|
||||
|
||||
### Virtual Task (`#`-type Task)
|
||||
|
||||
Virtual tasks are tasks of the form `"#{sharp_type}"` or `"B#{sharp_type}"`, where `{sharp_type}` can be `none`, `self`, `back`, `next`, `sub`, `on_error_next`, `exceeded_next`, or `reduce_other_times`.
|
||||
|
||||
Virtual tasks can be divided into **command virtual tasks** (`#none` / `#self` / `#back`) and **field virtual tasks** (`#next`, etc.).
|
||||
|
||||
| Virtual Task Type | Meaning | Simple example |
|
||||
|:---------:|:---:|:--------:|
|
||||
| none | Empty Task | Skip directly<sup>1</sup><br>`"A": {"next": ["#none", "T1"]}` is interpreted as `"A": {"next": ["T1"]}`<br>`"A#none + T1"` is interpreted as `"T1"` |
|
||||
| self | Current Task Name | `"A": {"next": "#self"}` in `"#self"` is interpreted as `"A"`<br>`"B": {"next": "A@B@C#self"}` in `"A@B@C#self"` is interpreted as `"B"`.<sup>2</sup> |
|
||||
| back | # Preceding task name | `"A@B#back"` is interpreted as `"A@B"`<br>`"#back"` will be skipped if it appears directly<sup>3</sup> |
|
||||
| next, sub, etc. | # The field corresponding to the previous task name | Take `next` for example:<br>`"A#next"` is interpreted as `Task.get("A")->next`<br>`"#next"` will be skipped if it appears directly |
|
||||
|
||||
*Note<sup>1</sup>: `"#none"` generally used in conjunction with the template task to add prefixes, or used in the `baseTask` field to avoid unnecessary fields in multi-file inheritance.*
|
||||
|
||||
*Note<sup>2</sup>: `"XXX#self"` has the same meaning as `"#self"`.*
|
||||
|
||||
*Note<sup>3</sup>: When several tasks have `"next": [ "#back" ]`, `"T1@T2@T3"` represents executing `T3`, `T2`, and `T1` in sequence.*
|
||||
|
||||
### Multi-File Task
|
||||
|
||||
If a task defined in a later loaded task file (e.g. `tasks.json` for foreign services; hereinafter called File 2) also has a task of the same name defined in a earlier loaded task file (e.g. `tasks.json` for official services; hereinafter called File 1), then.
|
||||
|
||||
- if the task in File 2 does not have a `baseTask` field, then it inherits the fields of the task with the same name in File 1 directly.
|
||||
- If the task in File 2 has a `baseTask` field, then it does not inherit the fields of the task with the same name in File 1, but overwrites them. In particular, when there is no template task, you can use `"baseTask": "#none"` to avoid inheriting unnecessary fields.
|
||||
|
||||
### Simple Example
|
||||
|
||||
- Derived task example (field `baseTask`)
|
||||
|
||||
Assume the following two tasks are defined:
|
||||
|
||||
```json
|
||||
"Return": {
|
||||
"action": "ClickSelf",
|
||||
"next": [ "Stop" ]
|
||||
},
|
||||
"Return2": {
|
||||
"baseTask": "Return"
|
||||
},
|
||||
```
|
||||
|
||||
The parameters of the `"Return2"` task are directly inherited from the `"Return"` task, and actually include the following parameters:
|
||||
|
||||
```json
|
||||
"Return2": {
|
||||
"algorithm": "MatchTemplate", // Directly inherited
|
||||
"template": "Return2.png", // "TaskName.png"
|
||||
"action": "ClickSelf", // Directly inherited
|
||||
"next": [ "Stop" ] // Directly inherited, without any prefix compared to the Template Task
|
||||
}
|
||||
```
|
||||
|
||||
- `@`-type task example
|
||||
|
||||
Assume that a task `"A"` with the following parameters is defined:
|
||||
|
||||
```json
|
||||
"A": {
|
||||
"template": "A.png",
|
||||
...,
|
||||
"next": [ "N1", "N2" ]
|
||||
}
|
||||
"next": [ "N1", "#back" ]
|
||||
},
|
||||
```
|
||||
|
||||
This would be equivalent to defining:
|
||||
If the task `"B@A"` is not directly defined, then the task `"B@A"` actually has the following parameters:
|
||||
|
||||
```json
|
||||
"B@A": {
|
||||
"template": "A.png",
|
||||
...,
|
||||
"next": [ "B@N1", "B@N2" ]
|
||||
"next": [ "B@N1", "B#back" ]
|
||||
}
|
||||
```
|
||||
|
||||
- If task "B@A" is defined in `tasks.json`, then:
|
||||
1. If "B@A" has different `algorithm` from "A", derived class parameters are not inherited (only `TaskInfo` parameters inherited)
|
||||
2. For image matching tasks, if `template` not explicitly defined, uses `B@A.png` (not inheriting "A" template name); otherwise any derived parameters not explicitly defined inherit directly from "A"
|
||||
3. For `TaskInfo` base class parameters (common to all task types like `algorithm`, `roi`, `next`, etc.), if not explicitly defined in "B@A", inherit directly from "A" except for the five fields mentioned above which get "B@" prefixed when inherited
|
||||
If the task `"B@A"` is defined as `"B@A": {}`, then the task `"B@A"` actually has the following parameters:
|
||||
|
||||
### Base Task
|
||||
|
||||
Base task and template task are collectively called **template tasks**.
|
||||
|
||||
Tasks with `baseTask` field are base tasks.
|
||||
|
||||
Base task logic takes precedence over template task. This means `"B@A": { "baseTask": "C", ... }` has no relation to task A.
|
||||
|
||||
Any parameter not explicitly defined uses the corresponding parameter from `baseTask` without prefix, except `template` which remains `"TaskName.png"` when not explicitly defined.
|
||||
|
||||
#### Multi-File Tasks
|
||||
|
||||
If a task defined in a later-loaded file (e.g., foreign server `tasks.json`, called File 2) is also defined in an earlier-loaded file (e.g., CN server `tasks.json`, called File 1), then:
|
||||
|
||||
- If File 2's task has no `baseTask` field, it directly inherits fields from File 1's same-name task.
|
||||
- If File 2's task has a `baseTask` field, it doesn't inherit fields from File 1's same-name task, but overwrites them instead.
|
||||
|
||||
### Virtual Task (`#` Task)
|
||||
|
||||
Virtual tasks are also called sharp tasks (`#` type tasks).
|
||||
|
||||
Tasks with `#` in name are virtual tasks. `#` can be followed by `next`, `back`, `self`, `sub`, `on_error_next`, `exceeded_next`, `reduce_other_times`.
|
||||
|
||||
| Virtual Task Type | Meaning | Simple Example |
|
||||
| :----------: | :----------------: | :--------------------------------------------------------------------------------------------------------------------------------------: |
|
||||
| self | Parent task name | `"A": {"next": "#self"}` where `"#self"` interpreted as `"A"`<br>`"B": {"next": "A@B@C#self"}` where `"A@B@C#self"` interpreted as `"B"`<sup>1</sup> |
|
||||
| back | Task name before # | `"A@B#back"` interpreted as `"A@B"`<br>`"#back"` directly appears will be skipped |
|
||||
| next, sub, etc. | Field of task name before # | For example with `next`:<br>`"A#next"` interpreted as `Task.get("A")->next`<br>`"#next"` directly appears will be skipped |
|
||||
|
||||
_Note<sup>1</sup>: `"XXX#self"` has same meaning as `"#self"`._
|
||||
|
||||
#### Simple Example
|
||||
|
||||
```json
|
||||
{
|
||||
"A": { "next": ["N1", "N2"] },
|
||||
"C": { "next": ["B@A#next"] },
|
||||
|
||||
"Loading": {
|
||||
"next": ["#self", "#next", "#back"]
|
||||
},
|
||||
"B": {
|
||||
"next": ["Other", "B@Loading"]
|
||||
```json
|
||||
"B@A": {
|
||||
"template": "B@A.png",
|
||||
...,
|
||||
"next": [ "B@N1", "B#back" ]
|
||||
}
|
||||
}
|
||||
```
|
||||
```
|
||||
|
||||
Results in:
|
||||
- Virtual task example
|
||||
|
||||
```cpp
|
||||
Task.get("C")->next = { "B@N1", "B@N2" };
|
||||
```json
|
||||
{
|
||||
"A": { "next": ["N1", "N2"] },
|
||||
"C": { "next": ["B@A#next"] },
|
||||
|
||||
Task.get("B@Loading")->next = { "B@Loading", "Other", "B" };
|
||||
Task.get("Loading")->next = { "Loading" };
|
||||
Task.get_raw("B@Loading")->next = { "B#self", "B#next", "B#back" };
|
||||
```
|
||||
"Loading": {
|
||||
"next": ["#self", "#next", "#back"]
|
||||
},
|
||||
"B": {
|
||||
"next": ["Other", "B@Loading"]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Some Use Cases
|
||||
Results in:
|
||||
|
||||
- When several tasks have `"next": [ "#back" ]`, `"Task1@Task2@Task3"` means execute `Task3`, then `Task2`, then `Task1` in sequence.
|
||||
```cpp
|
||||
Task.get("C")->next = { "B@N1", "B@N2" };
|
||||
|
||||
#### Other Related Cases
|
||||
Task.get("B@Loading")->next = { "B@Loading", "Other", "B" };
|
||||
Task.get("Loading")->next = { "Loading" };
|
||||
Task.get_raw("B@Loading")->next = { "B#self", "B#next", "B#back" };
|
||||
```
|
||||
|
||||
```json
|
||||
{
|
||||
"A": { "next": ["N0"] },
|
||||
"B": { "next": ["A#next"] },
|
||||
"C@A": { "next": ["N1"] }
|
||||
}
|
||||
```
|
||||
### Precautions
|
||||
|
||||
In this case, `"C@B" -> next` (i.e., `C@A#next`) is `[ "N1" ]`, not `[ "C@N0" ]`.
|
||||
If the tasks defined in the task list type field (`next`, etc.) contain low-priority operations, the actual results may not match expectations, so please be aware of this.
|
||||
|
||||
1. Special cases caused by the order of operations between `@` and double `#`
|
||||
|
||||
```json
|
||||
{
|
||||
"A": { "next": ["N0"] },
|
||||
"B": { "next": ["A#next"] },
|
||||
"C@A": { "next": ["N1"] }
|
||||
}
|
||||
```
|
||||
|
||||
In the above case, `"C@B" -> next` (i.e., `C@A#next`) is `[ "N1" ]` rather than `[ "C@N0" ]`.
|
||||
|
||||
2. Special cases caused by the order of operations between `@` and `+`
|
||||
|
||||
```json
|
||||
{
|
||||
"A": { "next": ["#back + N0"] },
|
||||
"B@A": {}
|
||||
}
|
||||
```
|
||||
|
||||
In the above case,
|
||||
|
||||
```cpp
|
||||
Task.get("A")->next = { "N0" };
|
||||
|
||||
Task.get_raw("B@A")->next = { "B#back + N0" };
|
||||
Task.get("B@A")->next = { "B", "N0" }; // Note that it is not [ "B", "B@N0" ]
|
||||
```
|
||||
|
||||
In fact, you can use this feature to avoid adding unnecessary prefixes by simply defining
|
||||
|
||||
```json
|
||||
{
|
||||
"A": { "next": ["#none + N0"] }
|
||||
}
|
||||
```
|
||||
|
||||
## Runtime Task Modification
|
||||
|
||||
- `Task.lazy_parse()` loads JSON task configuration files at runtime. Lazy_parse rules match [Multi-File Tasks](#multi-file-tasks).
|
||||
- `Task.lazy_parse()` loads JSON task configuration files at runtime. Lazy_parse rules match [Multi-File Task](#multi-file-task).
|
||||
- `Task.set_task_base()` modifies a task's `baseTask` field.
|
||||
|
||||
### Usage Example
|
||||
@@ -329,19 +425,6 @@ default:
|
||||
}
|
||||
```
|
||||
|
||||
## Expression Calculation
|
||||
|
||||
| Symbol | Meaning | Example |
|
||||
| :---------: | :------------------------------------------------------: | :------------------------------------: |
|
||||
| `@` | Template task | `Fight@ReturnTo` |
|
||||
| `#` (unary) | Virtual task | `#self` |
|
||||
| `#` (binary) | Virtual task | `StartUpThemes#next` |
|
||||
| `*` | Repeat multiple tasks | `(ClickCornerAfterPRTS+ClickCorner)*5` |
|
||||
| `+` | Task list merge (in next-type attributes, only first occurrence of same-name tasks kept) | `A+B` |
|
||||
| `^` | Task list difference (in first but not second, order preserved) | `(A+A+B+C)^(A+B+D)` (result is `C`) |
|
||||
|
||||
Operators `@`, `#`, `*`, `+`, `^` have precedence: `#` (unary) > `@` = `#` (binary) > `*` > `+` = `^`.
|
||||
|
||||
## Schema Validation
|
||||
|
||||
This project configures JSON schema validation for `tasks.json`, schema file is `docs/maa_tasks_schema.json`.
|
||||
|
||||
@@ -12,11 +12,11 @@ dir:
|
||||

|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
# MaaAssistantArknights
|
||||
# MAA
|
||||
|
||||

|
||||

|
||||
 
|
||||

|
||||

|
||||
 
|
||||
 
|
||||
|
||||
MAA stands for MAA Assistant Arknights
|
||||
@@ -48,28 +48,24 @@ Please read the [documentation](./manual/newbie.md) and then visit the [official
|
||||
|
||||
See it in action!
|
||||
|
||||
```component Image4
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/en-us/readme/1-light.png",
|
||||
"dark": "images/en-us/readme/1-dark.png"
|
||||
},
|
||||
{
|
||||
"light": "images/en-us/readme/2-light.png",
|
||||
"dark": "images/en-us/readme/2-dark.png"
|
||||
},
|
||||
{
|
||||
"light": "images/en-us/readme/3-light.png",
|
||||
"dark": "images/en-us/readme/3-dark.png"
|
||||
},
|
||||
{
|
||||
"light": "images/en-us/readme/4-light.png",
|
||||
"dark": "images/en-us/readme/4-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/en-us/readme/1-light.png',
|
||||
dark: 'images/en-us/readme/1-dark.png'
|
||||
},
|
||||
{
|
||||
light: 'images/en-us/readme/2-light.png',
|
||||
dark: 'images/en-us/readme/2-dark.png'
|
||||
},
|
||||
{
|
||||
light: 'images/en-us/readme/3-light.png',
|
||||
dark: 'images/en-us/readme/3-dark.png'
|
||||
},
|
||||
{
|
||||
light: 'images/en-us/readme/4-light.png',
|
||||
dark: 'images/en-us/readme/4-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
## Usage Instructions
|
||||
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
---
|
||||
home: true
|
||||
navbar: false
|
||||
containerClass: home
|
||||
heroText: MAA 文档站 | Document
|
||||
tagline: 选择语言 | Select Language
|
||||
heroAlt: MAA Logo
|
||||
heroImage: /images/maa-logo_512x512.png
|
||||
heroFullScreen: true
|
||||
actions:
|
||||
- text: 简体中文
|
||||
link: ./zh-cn/
|
||||
type: primary
|
||||
|
||||
- text: 繁體中文
|
||||
link: ./zh-tw/
|
||||
type: primary
|
||||
|
||||
- text: English
|
||||
link: ./en-us/
|
||||
type: primary
|
||||
|
||||
- text: 日本語
|
||||
link: ./ja-jp/
|
||||
type: primary
|
||||
|
||||
- text: 한국어
|
||||
link: ./ko-kr/
|
||||
type: primary
|
||||
---
|
||||
@@ -9,7 +9,13 @@ icon: jam:write-f
|
||||
このドキュメントの目的は、ドキュメント作成者がテーマが提供する機能をより良く活用し、読みやすさを向上させることを指導することです。
|
||||
:::
|
||||
|
||||
私たちのドキュメントは [vuepress](https://github.com/vuejs/vuepress) に基づいて構築されており、[vuepress-theme-hope](https://github.com/vuepress-theme-hope/vuepress-theme-hope) テーマが使用されています。詳細な説明については[公式ドキュメント](https://theme-hope.vuejs.press/)をご覧いただけます。ここでは一部の一般的な機能について紹介します。
|
||||
私たちのドキュメントは [vuepress](https://github.com/vuejs/vuepress) に基づいて構築されており、[vuepress-theme-plume](https://github.com/pengzhanbo/vuepress-theme-plume) テーマが使用されています。詳細な説明については[公式ドキュメント](https://theme-plume.vuejs.press/)をご覧いただけます。ここでは一部の一般的な機能について紹介します。
|
||||
|
||||
## ローカルデプロイ
|
||||
|
||||
1. [pnpm](https://pnpm.io/installation) をインストールし、[Pull Request ワークフローの概要](./development.md#github-pull-request-プロセス概要)を参照してリポジトリをローカルにクローンします。
|
||||
2. `docs` ディレクトリでターミナルを開き、`pnpm i` を実行して依存関係をインストールします。
|
||||
3. `pnpm run dev` を実行してデプロイします。
|
||||
|
||||
## コンテナ
|
||||
|
||||
|
||||
@@ -24,16 +24,12 @@ repo、コードやその他のリソースファイルを保存する場所で
|
||||
|
||||
👇 これはMAAのリポジトリです(一般的にMAAのメインリポジトリと呼ばれます)。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/repository-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/repository-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/repository-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/repository-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
### Fork(複製)
|
||||
|
||||
@@ -44,16 +40,12 @@ repo、コードやその他のリソースファイルを保存する場所で
|
||||
区別するために、元のMAAリポジトリは「主リポジトリ」「upstream(上流リポジトリ)」「origin(元のリポジトリ)」と呼ばれます。
|
||||
それぞれの人がコピーできるので、コピーしたものを「個人リポジトリ」と呼びます。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/fork-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/fork-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/fork-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/fork-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
### Pull Request(プルリクエスト、マージリクエスト)
|
||||
|
||||
@@ -65,16 +57,12 @@ repo、コードやその他のリソースファイルを保存する場所で
|
||||
|
||||
👇 以下は、現在承認待ちの提出されたPRの例です。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pull-request-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pull-request-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pull-request-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pull-request-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
### Conflict(コンフリクト)
|
||||
|
||||
@@ -87,164 +75,116 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい
|
||||
|
||||
1. まず、MAAのメインリポジトリにアクセスして、コードをforkします。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/fork-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/fork-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/fork-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/fork-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
2. 「Copy the master branch only」オプションを外して、Create Forkをクリックします。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-2-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-2-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-2-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-2-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
3. 次に、あなたの個人リポジトリに移動し、「あなたの名前/ MaaAssistantArknights」というタイトルが表示され、下に「MAAメインリポジトリから複製されたMaaAssistantArknights/MaaAssistantArknights」という文言が表示されます。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-3-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-3-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-3-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-3-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
4. 変更するファイルを探します。 "Go to file" をクリックしてグローバル検索を行うか、下のフォルダーから直接検索することもできます(ファイルの場所を知っている場合)。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-4-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-4-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-4-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-4-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
5. ファイルを開いたら、ファイルの右上隅にある✏️をクリックして編集を開始します。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-5-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-5-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-5-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-5-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
6. 変更を加えます!(もちろん、リソースファイルなどの場合は、まずMAAフォルダー内で変更をテストし、問題がないことを確認してから、ウェブページに貼り付けて変更を行ってください)
|
||||
7. 変更が完了したら、一番下までスクロールして、変更内容を記述します。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-7-1-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-7-1-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-7-1-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-7-1-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-7-2-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-7-2-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-7-2-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-7-2-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
8. 変更するもう1つのファイルがある場合は、5-8を繰り返してください。
|
||||
9. 変更が完了したら、PRを行います!個人リポジトリのPull Requestタブをクリックします。
|
||||
「Compare & Pull Request」ボタンがある場合は、それをクリックしてください。ない場合は、「New Pull Request」をクリックしてください。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-9-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-9-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-9-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-9-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
10. これでメインリポジトリに移動します。PRする内容を確認してください。
|
||||
スクリーンショットのように、真ん中に左向きの矢印があり、右側の「個人名/MAA」のdevブランチを「メインリポジトリ/MAA」のdevブランチにマージすることを申請しています。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-10-1-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-10-1-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-10-1-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-10-1-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
次に、タイトルや変更内容などを記述して、承認をリクエストします。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-10-2-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-10-2-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-10-2-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-10-2-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
11. MAAチームの大佬たちに承認していただきましょう!もちろん、意見を提供してくださることもあるかもしれません
|
||||
👇例えば(純粋に娯楽のために、本気にしないでください)
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-11-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-11-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-11-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-11-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
12. 大佬たちがさらに小さな問題を修正するように言った場合、あなたの個人のリポジトリに戻って、以前のdevブランチに切り替え、手順3-9を繰り返すだけで大丈夫です!
|
||||
手順2(再度フォークする)を実行する必要はなく、手順10(再度プルリクエストする)を実行する必要もありません。現在のプルリクエストはまだ承認待ちの状態にあり、後続の変更はこのプルリクエストに直接反映されます。
|
||||
👇 以下は例です。最下部に「再度変更デモを変更」というメッセージが追加されたことがわかります。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-12-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-12-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-12-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-12-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
13. 大佬たちの承認を得たら、すべて完了です! バージョンがリリースされた後、あなたのGitHubプロフィールアイコンは自動的に貢献者リストに追加されます。皆様のご奉仕に深く感謝申し上げます!
|
||||
~~なんで全部二次元キャラなんだろう、あ、私も二次元好きだったわ。ま、いいか~~
|
||||
@@ -263,19 +203,15 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい
|
||||
|
||||
私が言ったことが何を意味するのか分からない/関係ない場合は、左側のボタンをクリックしてください。
|
||||
|
||||
```component Image1
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-14-1-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-14-1-dark.png"
|
||||
},
|
||||
{
|
||||
"light": "images/zh-cn/pr-tutorial/pr-14-2-light.png",
|
||||
"dark": "images/zh-cn/pr-tutorial/pr-14-2-dark.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-14-1-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-14-1-dark.png'
|
||||
},
|
||||
{
|
||||
light: 'images/zh-cn/pr-tutorial/pr-14-2-light.png',
|
||||
dark: 'images/zh-cn/pr-tutorial/pr-14-2-dark.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
その後、ステップ3-14を繰り返し、変更を加え、PRを提出することができます。
|
||||
|
||||
104
docs/ja-jp/develop/vsc-ext-tutorial.md
Normal file
104
docs/ja-jp/develop/vsc-ext-tutorial.md
Normal file
@@ -0,0 +1,104 @@
|
||||
---
|
||||
order: 8
|
||||
icon: iconoir:code-brackets
|
||||
---
|
||||
|
||||
# Dedicated VSCode Extension Tutorial
|
||||
|
||||
* [Extension Store](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support)
|
||||
* [Repository](https://github.com/neko-para/maa-support-extension)
|
||||
|
||||
## Installation
|
||||
|
||||
Searching `Maa` and installing it from VSCode extensions list is recommended.
|
||||
|
||||
## Features
|
||||
|
||||
### Control Panel
|
||||
|
||||
A dedicated control panel is added to the left, with icon 
|
||||
|
||||
The major features of the extension are based on the `interface.json` configuration. Select the activated `interface.json` on the top of the control panel.
|
||||
|
||||
The extension has a `Maa` compatiable mode. If `src/MaaCore` folder exists inside the opened workspace, the mode will be enabled automatically.
|
||||
|
||||
### Semantic resource analysis
|
||||
|
||||
Select expected resource via the `Resource` select inside the control panel. The extension will index and diagnose resource via corresponding paths.
|
||||
|
||||
If you find that the editing json isn't hinted by the extension, please check if the activated resource contains it.
|
||||
|
||||
> The term `definitions of task / task defs` refers to key props of task objects.
|
||||
>
|
||||
> The term `references of task / task refs` refers to values containing task name (e.g. in `next`) in other task objects.
|
||||
|
||||
#### Query task defs / task refs
|
||||
|
||||
The extension supports Jump to task defs, Jump to task refs and View task defs.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to parse `template task`, supporting querying task defs and task refs in conjunction with base tasks. Images that has the same name of the task will be shown when hovering the task defs.
|
||||
|
||||
#### Query / open images
|
||||
|
||||
The extension supports open images.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to recursively search for the image.
|
||||
|
||||
#### Task completion
|
||||
|
||||
The extension supports autocompletion according to all known tasks.
|
||||
|
||||
When enabling the `Maa` compatible mode, typing `@` will trigger completion.
|
||||
|
||||
#### Image path completion
|
||||
|
||||
The extension supports autocompletion according to the path of all known images.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to recursively search for the image.
|
||||
|
||||
#### Check tasks / image paths
|
||||
|
||||
The extension supports scheduled scanning and diagnosing all tasks.
|
||||
|
||||
* Check if contains task defs with same names.
|
||||
* Check if contains unknown task refs.
|
||||
* Check if contains unknown image refs.
|
||||
* Check if contains duplicated task refs in a single task.
|
||||
|
||||
#### Multiple paths resource support
|
||||
|
||||
The extension supports resource with multiple paths. The extension will perform logical overlapping according to specified order, thus content loaded later can reference content loaded earlier.
|
||||
|
||||
### Evaluate Task / Tsak List Expression (Only Maa)
|
||||
|
||||
Evaluating the expanded task object and the sources of each properties, and the result of the task list expression via the control panel.
|
||||
|
||||
### MaaPiCli feature (Only MaaFramework projects)
|
||||
|
||||
Scanning and selecting controllers, selecting resource, adding and manipulating tasks, and launching tasks can be done via the control panel.
|
||||
|
||||
### Take screenshots and crop images
|
||||
|
||||
Searching and launching `Maa: open crop tool` inside VSCode command panel can open `Screenshots / Crop` panel.
|
||||
|
||||
> Use `Ctrl+Shift+P` (`Command+Shift+P` on MacOS) to open command panel
|
||||
|
||||
* After selecting and connecting to the controller, use `Screencap` button to obtain screenshots
|
||||
* Use `Upload` button to manually upload images.
|
||||
* Hold `Ctrl` key and select cropping area
|
||||
* Use wheels to zoom
|
||||
* After finishing cropping, use `Download` button to save the cropping result to the folder of the topest layer of the activated resource
|
||||
|
||||
### Bottom status bar
|
||||
|
||||
#### MaaSupport \[Extension Version\]
|
||||
|
||||
Click to reveal control panel
|
||||
|
||||
#### MaaFramework \[MaaFw Version\]
|
||||
|
||||
Click to switch `MaaFramework` version used by the extension
|
||||
|
||||
> When used for the first time, the preset version will be downloaded.
|
||||
>
|
||||
> Search command `Maa: select fetch registry` to switch downloading source (npm / cnpm).
|
||||
9
docs/ja-jp/manual/README.md
Normal file
9
docs/ja-jp/manual/README.md
Normal file
@@ -0,0 +1,9 @@
|
||||
---
|
||||
title: 使用説明
|
||||
icon: mdi:user
|
||||
index: false
|
||||
dir:
|
||||
order: 1
|
||||
---
|
||||
|
||||
<Catalog base='/ja-jp/manual/' />
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
title: CLI ユーザーガイド
|
||||
icon: material-symbols:terminal
|
||||
index: false
|
||||
index: true
|
||||
dir:
|
||||
order: 6
|
||||
---
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 4
|
||||
order: 2
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
|
||||
@@ -179,6 +179,8 @@ MAA は現在 `bluestacks.conf` の保存場所をレジストリから読み取
|
||||
- 国際版のデフォルトパスは `C:\ProgramData\BlueStacks_nxt\bluestacks.conf` です。
|
||||
- 中国本土版のデフォルトパスは `C:\ProgramData\BlueStacks_nxt_cn\bluestacks.conf` です。
|
||||
|
||||
注意:`C:\ProgramData`は隠しディレクトリです。必要に応じて、このアドレスをファイルエクスプローラのアドレスバーに直接貼り付けて、アクセスしてください。
|
||||
|
||||
2. 初めて使用する場合は、一度 MAA を実行して、MAA が設定ファイルを自動生成するようにします。
|
||||
|
||||
3. **MAA を閉じた後に**、`gui.json` を開き、`Configurations` の下の現在の設定名フィールド(設定-切り替え設定 で確認できます。デフォルトは `Default`)を検索し、`Bluestacks.Config.Path` フィールドを検索して、`bluestacks.conf` の完全なパスを入力します。(スラッシュはエスケープ `\\` を使用してください)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 4
|
||||
order: 2
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ title: 詳細説明
|
||||
icon: mdi:information-outline
|
||||
index: false
|
||||
dir:
|
||||
order: 2
|
||||
order: 4
|
||||
---
|
||||
|
||||
<Catalog base='/ja-jp/manual/introduction/' />
|
||||
|
||||
@@ -3,27 +3,54 @@ order: 7
|
||||
icon: ri:game-fill
|
||||
---
|
||||
|
||||
# 自动肉鸽
|
||||
# 自動ローグ
|
||||
|
||||
MAAはデフォルトで最新のテーマを選択しますが、`自動ロゲット` - `ロゲットテーマ`でターゲットテーマを変更することができます。
|
||||
|
||||
- ゲーム内で該当のロゲットテーマを端末でピン留めしてください。現在は自動ナビゲートも可能ですが、長期的な使用可否は保証されません。
|
||||
- **ターゲットテーマ**でない探索は事前に手動で終了してください。
|
||||
- MAAは難易度を自動で選択しません。難易度を選択していない場合、難易度選択画面で停止したり、繰り返し進出したりします。
|
||||
- 設定で分隊編成、開始時のオペレーター(単一オペレーター名のみ)などを選択できます。
|
||||
::: warning
|
||||
すべての自動バトルに関連する機能は、少なくとも 60 フレームの安定したゲームフレームレートが必要です。これには自動バトルや自動ローグが含まれますが、これに限りません。
|
||||
:::
|
||||
|
||||
- ゲーム内で該当のロゲットテーマを端末に追加してください。現在は自動ナビゲートも可能ですが、長期的な使用可否は保証されません。
|
||||
- **ターゲットテーマ**でない探索は事前に手動で終了してください。
|
||||
- 設定では、テーマ、難易度、分隊、最初のオペレーター(単一のオペレーター名のみ)などを選択できます。
|
||||
- MAA は、サポートオペレーターでの開始を使用できます。まず「一般設定」→「最初のオペレーター」に目標オペレーター名を入力し、「高度な設定」→「「最初のオペレーター」をサポートから選択」を有効にしてください。
|
||||
- 新しくインストールしたクライアントで初めてプレイする場合:
|
||||
- 難易度選択ボタンは表示されません。ゲーム内で一度手動で難易度を選択し、その後 MAA が自動で選択できます。
|
||||
- 大マップなどの画面に入ると新手のチュートリアルが表示されます。読み終わったら手動で閉じてください。
|
||||
|
||||
## おすすめのスタート
|
||||
|
||||
::: details _最終更新日 2025/8/30_
|
||||
|
||||
| テーマ | 難易度 | 分隊 | 職業組 | オペレーター |
|
||||
| ---------- | --------------- | --------------------------- | -------- | ------------ |
|
||||
| ファントム | 正式調査·2 | 指揮分隊 / 突撃戦術分隊 | 前線支援 | ソーンズ |
|
||||
| ミヅキ | 波瀾万丈·3~7 | 人文主義分隊 / 精神論分隊 | 攻守一体 | ウィシャデル |
|
||||
| サーミ | 自然の猛威·4~10 | 特訓分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
|
||||
| サルカズ | 魂に直面·4~10 | 位置測定分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
|
||||
| 界園 | 請君入園·3~10 | 指揮分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
|
||||
|
||||
難易度の推奨は、`敵の難易度`、`希望消費`、`スコア倍率`などの要素を総合的に考慮しています。高い練度でテストした場合、比較的安定しており、実際の状況やニーズに応じて自由に調整できます。
|
||||
|
||||
| テーマ | 備考 |
|
||||
| ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| ファントム | `正式調査·3` およびそれ以上の難易度で開始すると、希望消費を減少させるアイテムが手に入る場合があり、そのため開始時に六星オペレーターを召集できないことがあります。 |
|
||||
| ミヅキ | `波瀾万丈·4` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `精神論分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。<br>`精神論分隊` はアカウントの練度が高い場合に適しており、運に頼る必要があります。 |
|
||||
| サーミ | `自然の猛威·6` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `特訓分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。 |
|
||||
| サルカズ | `魂に直面·15` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `歴史再編`内でまだ `位置測定分隊強化Ⅱ`を有効にしていない場合、 `位置測定分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。<br> `位置測定分隊`を選択した場合、回避戦略が採用され、 `魂のしおり`を素早く取得できますが、基本的にエンディングをクリアすることはできません。<br>源石錐を収集戦略を使用した場合、開始時の分隊は `破棘成金分隊` とならば、商店更新戦略を使用してプロセスを加速します。 |
|
||||
| 界園 | `請君入園·15` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `指揮分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。<br>難易度が `請君入園·3`に設定され、源石錐を収集戦略を使用して開始時の分隊が `指揮分隊` とならば、 `時の果て` でスキップ戦略を使用してプロセスを加速します。 |
|
||||
|
||||
::: details 固定方法「PIN UP」
|
||||

|
||||
:::
|
||||
|
||||
## 戦闘戦略
|
||||
|
||||
MAAはロゲット内のすべての操作を予め設定された戦略で行い、すべてのステージ戦闘は内蔵された作業ファイルを呼び出して行われます。該当ステージの作業が存在しない場合、賢くない汎用的な意思決定ツリーを使用して戦闘を行います。
|
||||
MAA はゲーム内のすべての操作を予め設定された戦略で行い、すべてのステージ戦闘は内蔵された作業ファイルを呼び出して行われます。該当ステージの作業が存在しない場合、賢くない汎用的な意思決定ツリーを使用して戦闘を行います。
|
||||
|
||||
詳細については[ロゲットプロトコル](../../protocol/integrated-strategy-schema.md)をご参照ください。
|
||||
|
||||
- オペレーターおよびレベルを自動で識別し、最適なオペレーターとスキルを自動で選択します。
|
||||
- 商店のアイテムを識別し、より強力なコレクションを優先して購入します。
|
||||
- 商店のアイテムを識別し、より強力なアイテムを優先して購入します。
|
||||
|
||||
## 異常検出
|
||||
|
||||
|
||||
@@ -8,6 +8,10 @@ icon: material-symbols:task
|
||||
`resource/tasks` の使用方法と各フィールドの説明
|
||||
|
||||
::: tip
|
||||
It is recommended to use [Visual Studio Code](https://code.visualstudio.com/) and install [Maa Pipeline Support](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) extension for efficient editing. For more details, please visit the extension's homepage and the [docs](../develop/vsc-ext-tutorial.md).
|
||||
:::
|
||||
|
||||
::: warning
|
||||
JSONファイルはコメントをサポートしていません。テキスト内のコメントはプレゼンテーション用にのみ使用されます。直接コピーして使用しないでください。
|
||||
:::
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@ dir:
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
|
||||
# MaaAssistantArknights
|
||||
# MAA
|
||||
|
||||

|
||||

|
||||
 
|
||||

|
||||

|
||||
 
|
||||
 
|
||||
|
||||
MAAは、MAA Assistant Arknightsです。
|
||||
@@ -49,20 +49,16 @@ MAAは、MAA Assistant Arknightsです。
|
||||
|
||||
UIを見れば使い方もすぐ分かる!
|
||||
|
||||
```component Image2
|
||||
{
|
||||
"imageList": [
|
||||
{
|
||||
"light": "images/ja-jp/readme/1-light.png",
|
||||
"dark": "images/ja-jp/readme/1-light.png"
|
||||
},
|
||||
{
|
||||
"light": "images/ja-jp/readme/2-light.png",
|
||||
"dark": "images/ja-jp/readme/2-light.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
<ImageGrid :imageList="[
|
||||
{
|
||||
light: 'images/ja-jp/readme/1-light.png',
|
||||
dark: 'images/ja-jp/readme/1-light.png'
|
||||
},
|
||||
{
|
||||
light: 'images/ja-jp/readme/2-light.png',
|
||||
dark: 'images/ja-jp/readme/2-light.png'
|
||||
}
|
||||
]" />
|
||||
|
||||
## マニュアル
|
||||
|
||||
|
||||
@@ -9,12 +9,12 @@ icon: jam:write-f
|
||||
이 문서의 목적은 문서 작성자가 주제가 제공하는 기능을 더 잘 활용하여 더 읽기 쉬운 효과를 얻는 데 도움을 주는 것입니다.
|
||||
:::
|
||||
|
||||
우리의 문서는 [vuepress](https://github.com/vuejs/vuepress)로 작성되었으며, [vuepress-theme-hope](https://github.com/vuepress-theme-hope/vuepress-theme-hope) 테마를 사용하고 있습니다. 더 자세한 설명은 [공식 문서](https://theme-hope.vuejs.press/zh/)를 참조할 수 있으며, 여기서는 일부 일반적인 기능에 대해서만 소개하겠습니다.
|
||||
우리의 문서는 [vuepress](https://github.com/vuejs/vuepress)로 작성되었으며, [vuepress-theme-plume](https://github.com/pengzhanbo/vuepress-theme-plume) 테마를 사용하고 있습니다. 더 자세한 설명은 [공식 문서](https://theme-plume.vuejs.press/)를 참조할 수 있으며, 여기서는 일부 일반적인 기능에 대해서만 소개하겠습니다.
|
||||
|
||||
## 로컬 배포
|
||||
|
||||
1. [pnpm](https://pnpm.io/installation)을 설치하고, [Pull Request 가이드](./development.md#github-pull-request-진행-과정)을 참고해, 저장소를 로컬에 클론합니다.
|
||||
2. `website` 경로에서 새로운 터미널을 열고, `pnpm i` 을 실행하여 의존성 파일을 다운로드합니다.
|
||||
2. `docs` 경로에서 새로운 터미널을 열고, `pnpm i` 을 실행하여 의존성 파일을 다운로드합니다.
|
||||
3. `pnpm run dev` 를 실행하여 배포를 시작합니다.
|
||||
|
||||
## 컨테이너
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user