From a5495f880312eafd36fbf5167c7339d759aa8a65 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 14 Mar 2026 02:29:11 +0800 Subject: [PATCH] chore: update branch `dev` to `dev-v2` --- .github/ISSUE_TEMPLATE/cn-bug-report.yaml | 2 +- .github/ISSUE_TEMPLATE/cn-feature-request.yaml | 2 +- .github/ISSUE_TEMPLATE/en-bug-report.yaml | 2 +- .github/ISSUE_TEMPLATE/en-feature-request.yaml | 2 +- .github/pr_cache_remover.ps1 | 2 +- .github/stale_cache_dev.ps1 | 16 ++++++++-------- .github/workflows/blame-ignore.yml | 2 +- .github/workflows/ci.yml | 8 ++++---- .github/workflows/markdown-checker.yml | 4 ++-- .github/workflows/optimize-templates.yml | 2 +- .github/workflows/pr-auto-tag.yml | 6 +++--- .github/workflows/release-preparation.yml | 4 ++-- .github/workflows/res-update-game.yml | 6 +++--- .github/workflows/smoke-testing.yml | 8 ++++---- .github/workflows/sync-resource.yml | 2 +- .github/workflows/website-workflow.yml | 2 +- README.md | 2 +- docs/en-us/manual/connection.md | 2 +- docs/en-us/protocol/callback-schema.md | 2 +- docs/en-us/readme.md | 14 +++++++------- docs/ja-jp/manual/connection.md | 2 +- docs/ja-jp/protocol/callback-schema.md | 2 +- docs/ja-jp/readme.md | 14 +++++++------- docs/ko-kr/manual/connection.md | 2 +- docs/ko-kr/protocol/callback-schema.md | 2 +- docs/ko-kr/readme.md | 14 +++++++------- docs/zh-cn/manual/connection.md | 2 +- docs/zh-cn/protocol/callback-schema.md | 2 +- docs/zh-cn/readme.md | 14 +++++++------- docs/zh-tw/manual/connection.md | 2 +- docs/zh-tw/protocol/callback-schema.md | 2 +- docs/zh-tw/readme.md | 14 +++++++------- src/MaaWpfGui/MaaWpfGui.csproj | 2 +- 33 files changed, 82 insertions(+), 82 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cn-bug-report.yaml b/.github/ISSUE_TEMPLATE/cn-bug-report.yaml index 9df017ac5b..0585e4e6a1 100644 --- a/.github/ISSUE_TEMPLATE/cn-bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/cn-bug-report.yaml @@ -13,7 +13,7 @@ body: required: false - label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等 required: false - - label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容并未提及该 Bug 已被修复的情况 + - label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev-v2/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容并未提及该 Bug 已被修复的情况 required: false - 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 diff --git a/.github/ISSUE_TEMPLATE/cn-feature-request.yaml b/.github/ISSUE_TEMPLATE/cn-feature-request.yaml index cee786ec21..ae87fd06b3 100644 --- a/.github/ISSUE_TEMPLATE/cn-feature-request.yaml +++ b/.github/ISSUE_TEMPLATE/cn-feature-request.yaml @@ -13,7 +13,7 @@ body: required: false - label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等 required: false - - label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容,确认我的建议未被提及 + - label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev-v2/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容,确认我的建议未被提及 required: false - 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 diff --git a/.github/ISSUE_TEMPLATE/en-bug-report.yaml b/.github/ISSUE_TEMPLATE/en-bug-report.yaml index 82c360d602..1bfb2c4db3 100644 --- a/.github/ISSUE_TEMPLATE/en-bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/en-bug-report.yaml @@ -13,7 +13,7 @@ body: required: true - label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc. required: true - - label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of the bug being fixed. + - label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev-v2/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of the bug being fixed. required: true - label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution. required: false diff --git a/.github/ISSUE_TEMPLATE/en-feature-request.yaml b/.github/ISSUE_TEMPLATE/en-feature-request.yaml index d3772a9ecd..b316ee7e6e 100644 --- a/.github/ISSUE_TEMPLATE/en-feature-request.yaml +++ b/.github/ISSUE_TEMPLATE/en-feature-request.yaml @@ -13,7 +13,7 @@ body: required: true - label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc. required: true - - label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of this feature/suggestion being added. + - label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev-v2/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of this feature/suggestion being added. required: true - label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution. required: false diff --git a/.github/pr_cache_remover.ps1 b/.github/pr_cache_remover.ps1 index 8f035346ba..e4f472ed5f 100644 --- a/.github/pr_cache_remover.ps1 +++ b/.github/pr_cache_remover.ps1 @@ -22,7 +22,7 @@ foreach ($cache in $cacheList) { $shouldDelete = $true } } - elseif ($cache.ref -match "refs/heads/(.+)" -and $matches[1] -ne "dev") { + elseif ($cache.ref -match "refs/heads/(.+)" -and $matches[1] -ne "dev-v2") { $branchName = $matches[1] $exists = $branchSet.ContainsKey($branchName) diff --git a/.github/stale_cache_dev.ps1 b/.github/stale_cache_dev.ps1 index eee62daed4..57021e8b20 100644 --- a/.github/stale_cache_dev.ps1 +++ b/.github/stale_cache_dev.ps1 @@ -1,11 +1,11 @@ $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" } +# Filter for dev-v2 branch caches only +$devCaches = $cacheList | Where-Object { $_.ref -eq "refs/heads/dev-v2" } if (-not $devCaches) { - Write-Output "No caches found for dev branch." + Write-Output "No caches found for dev-v2 branch." exit } @@ -24,13 +24,13 @@ $keyPatterns = @( ) foreach ($pattern in $keyPatterns) { - Write-Output "Processing dev branch caches for pattern: $pattern" + Write-Output "Processing dev-v2 branch caches for pattern: $pattern" - # Filter for caches matching the current key pattern within dev branch + # Filter for caches matching the current key pattern within dev-v2 branch $matchingCaches = $devCaches | Where-Object { $_.key -like "*$pattern*" } if (-not $matchingCaches) { - Write-Output " No dev branch caches found for pattern: $pattern" + Write-Output " No dev-v2 branch caches found for pattern: $pattern" continue } @@ -39,7 +39,7 @@ foreach ($pattern in $keyPatterns) { # Keep the first one (latest) and delete the rest $latestCache = $sortedCaches[0] - Write-Output " Keeping latest dev branch cache: '$($latestCache.key)' (ID: $($latestCache.id))" + Write-Output " Keeping latest dev-v2 branch cache: '$($latestCache.key)' (ID: $($latestCache.id))" # Delete all except the latest one for ($i = 1; $i -lt $sortedCaches.Count; $i++) { @@ -47,7 +47,7 @@ foreach ($pattern in $keyPatterns) { $cacheId = $cache.id $cacheKey = $cache.key - Write-Output " Deleting dev branch cache: '$cacheKey' (ID: $cacheId)" + Write-Output " Deleting dev-v2 branch cache: '$cacheKey' (ID: $cacheId)" gh cache delete $cacheId $totalClearedSize += $cache.sizeInBytes diff --git a/.github/workflows/blame-ignore.yml b/.github/workflows/blame-ignore.yml index 0d90e527a3..9f47bd4758 100644 --- a/.github/workflows/blame-ignore.yml +++ b/.github/workflows/blame-ignore.yml @@ -22,7 +22,7 @@ jobs: id: check_changes continue-on-error: true run: | - LAST_CHECKED_COMMIT=$(cat .github/.last-blame-ignore-commit 2>/dev/null || git rev-list --max-parents=0 HEAD) + LAST_CHECKED_COMMIT=$(cat .github/.last-blame-ignore-commit 2>/dev-v2/null || git rev-list --max-parents=0 HEAD) git log $LAST_CHECKED_COMMIT..HEAD --pretty=format:"%H %s" --grep="\[blame ignore\]" | awk '{print $1}' >> .git-blame-ignore-revs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4603008296..5d1c757feb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: tags: - "v*" branches: - - "dev" + - "dev-v2" paths: - ".github/workflows/ci.yml" - "3rdparty/include/**" @@ -30,7 +30,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }} + group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev-v2' && format('-{0}', github.sha) || '' }} cancel-in-progress: true jobs: @@ -43,7 +43,7 @@ jobs: steps: - name: Show concurrency group run: | - echo "Concurrency Group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }}" + echo "Concurrency Group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev-v2' && format('-{0}', github.sha) || '' }}" - name: Checkout repository uses: actions/checkout@v6 @@ -59,7 +59,7 @@ jobs: tag="${{ github.ref_name }}" else # For PRs and branch pushes, use git describe or fallback - tag=$(git describe --tags --match "v*" HEAD 2>/dev/null || echo "v0.0.1-$(git rev-parse --short HEAD)") + tag=$(git describe --tags --match "v*" HEAD 2>/dev-v2/null || echo "v0.0.1-$(git rev-parse --short HEAD)") fi echo "tag=${tag}" | tee -a $GITHUB_OUTPUT diff --git a/.github/workflows/markdown-checker.yml b/.github/workflows/markdown-checker.yml index eb3896ee69..dac96c8dab 100644 --- a/.github/workflows/markdown-checker.yml +++ b/.github/workflows/markdown-checker.yml @@ -5,14 +5,14 @@ on: - cron: "0 0 * * 2" # Every Tuesday at 00:00 UTC push: branches: - - dev + - dev-v2 paths: - ".github/workflows/markdown-checker.yml" - "docs/**" - "**/*.md" pull_request: branches: - - dev + - dev-v2 paths: - ".github/workflows/markdown-checker.yml" - "docs/**" diff --git a/.github/workflows/optimize-templates.yml b/.github/workflows/optimize-templates.yml index c5ee689a8b..48638be4a2 100644 --- a/.github/workflows/optimize-templates.yml +++ b/.github/workflows/optimize-templates.yml @@ -3,7 +3,7 @@ name: PNG Image Optimization on: push: branches: - - "dev" + - "dev-v2" paths: - "docs/.vuepress/public/images/**" - "resource/**/*.png" diff --git a/.github/workflows/pr-auto-tag.yml b/.github/workflows/pr-auto-tag.yml index 1e4085c85c..1aafa4aca2 100644 --- a/.github/workflows/pr-auto-tag.yml +++ b/.github/workflows/pr-auto-tag.yml @@ -46,8 +46,8 @@ jobs: git tag -a "${{ steps.extract_tag.outputs.tag_name }}" -m "${{ steps.extract_tag.outputs.tag_name }}" -f git push origin "${{ steps.extract_tag.outputs.tag_name }}" - - name: Merge tag into dev and push + - name: Merge tag into dev-v2 and push run: | - git switch dev + git switch dev-v2 git merge "${{ steps.extract_tag.outputs.tag_name }}" - git push origin dev + git push origin dev-v2 diff --git a/.github/workflows/release-preparation.yml b/.github/workflows/release-preparation.yml index bf30047482..54ae85aa68 100644 --- a/.github/workflows/release-preparation.yml +++ b/.github/workflows/release-preparation.yml @@ -63,7 +63,7 @@ jobs: - name: Generate changelog run: | - git switch dev + git switch dev-v2 python3 tools/ChangelogGenerator/changelog_generator.py --tag "${{ steps.extract_tag.outputs.tag_name }}" --latest "${{ steps.extract_tag.outputs.latest }}" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -86,7 +86,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} title: ${{ steps.extract_tag.outputs.pr_title }} body-path: ${{ format('{0}/{1}', runner.temp, 'output' ) }} - base: "dev" + base: "dev-v2" branch: "changelog" delete-branch: true reviewers: | diff --git a/.github/workflows/res-update-game.yml b/.github/workflows/res-update-game.yml index d1a5028552..e7b5bf1f08 100644 --- a/.github/workflows/res-update-game.yml +++ b/.github/workflows/res-update-game.yml @@ -239,7 +239,7 @@ jobs: id: task_sorting run: | python3 tools/TaskSorter/TaskSorter.py - echo "gitdiff=$(echo $(git diff --name-only --diff-filter=ACM 2>/dev/null | grep '\.json$'))" >> $GITHUB_OUTPUT + echo "gitdiff=$(echo $(git diff --name-only --diff-filter=ACM 2>/dev-v2/null | grep '\.json$'))" >> $GITHUB_OUTPUT - name: Run prettier uses: Nerixyz/actionsx-prettier@v3-adj @@ -330,7 +330,7 @@ jobs: # gh workflow run release-nightly-ota.yml -f release_body="Auto Release of Resource Updates" - name: Upsert failure comment (single active) - if: failure() && github.ref == 'refs/heads/dev' + if: failure() && github.ref == 'refs/heads/dev-v2' run: | run_url="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" latest_id=$(gh api --paginate repos/${{ github.repository }}/issues/14493/comments | jq -r '.[] | select(.user.login=="github-actions[bot]") | .id' | tail -n 1) @@ -358,7 +358,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Minimize failure comment on success/cancelled - if: ${{ !failure() && github.ref == 'refs/heads/dev' }} + if: ${{ !failure() && github.ref == 'refs/heads/dev-v2' }} run: | latest_node=$(gh api --paginate repos/${{ github.repository }}/issues/14493/comments | jq -r '.[] | select(.user.login=="github-actions[bot]") | .node_id' | tail -n 1) if [ -n "$latest_node" ]; then diff --git a/.github/workflows/smoke-testing.yml b/.github/workflows/smoke-testing.yml index b23f4f9950..b8b09a1c80 100644 --- a/.github/workflows/smoke-testing.yml +++ b/.github/workflows/smoke-testing.yml @@ -5,7 +5,7 @@ permissions: on: push: branches: - - "dev" + - "dev-v2" paths: - ".github/workflows/smoke-testing.yml" - "3rdparty/include/**" @@ -34,7 +34,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }} + group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev-v2' && format('-{0}', github.sha) || '' }} cancel-in-progress: true jobs: @@ -105,8 +105,8 @@ jobs: run: | sh ./tools/SmokeTesting/run_tests.sh - - name: Save cache for Smoke Test (only in dev) - if: steps.smoke-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev' + - name: Save cache for Smoke Test (only in dev-v2) + if: steps.smoke-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev-v2' uses: actions/cache/save@v5 continue-on-error: true with: diff --git a/.github/workflows/sync-resource.yml b/.github/workflows/sync-resource.yml index 2f05e6867c..a0e71171c5 100644 --- a/.github/workflows/sync-resource.yml +++ b/.github/workflows/sync-resource.yml @@ -3,7 +3,7 @@ name: Resource Sync on: push: branches: - - dev + - dev-v2 paths: - ".github/workflows/sync-resource.yml" - "resource/**" diff --git a/.github/workflows/website-workflow.yml b/.github/workflows/website-workflow.yml index e4daa0f77d..5942f74cd2 100644 --- a/.github/workflows/website-workflow.yml +++ b/.github/workflows/website-workflow.yml @@ -4,7 +4,7 @@ on: push: branches: - "master" - - "dev" + - "dev-v2" paths: - ".github/workflows/website-workflow.yml" - "docs/**" diff --git a/README.md b/README.md index 2a8af91e3c..95aa252a0e 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体) ## 声明 -- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源,并附带额外 [用户协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md)。 +- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源,并附带额外 [用户协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/terms-of-service.md)。 - 本软件 logo 并非使用 AGPL 3.0 协议开源,[耗毛](https://weibo.com/u/3251357314)、vie 两位画师及软件全体开发者保留所有权利。不得以 AGPL 3.0 协议已授权为由在未经授权的情况下使用本软件 logo,不得在未经授权的情况下将本软件 logo 用于任何商业用途。 - 本软件开源、免费,仅供学习交流使用。若您遇到商家使用本软件进行代练并收费,可能是设备与时间等费用,产生的问题及后果与本软件无关。 diff --git a/docs/en-us/manual/connection.md b/docs/en-us/manual/connection.md index bf44b85aa8..9a5ae7a934 100644 --- a/docs/en-us/manual/connection.md +++ b/docs/en-us/manual/connection.md @@ -158,7 +158,7 @@ For `C:\ProgramData\BlueStacks_nxt\bluestacks.conf`: Select the configuration matching your emulator. If not listed, choose General Configuration. If that doesn't work, try any other available configuration. -For specific differences, see the [source code](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/resource/config.json#L57). +For specific differences, see the [source code](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/resource/config.json#L57). ### MuMu Screenshot Enhanced Mode diff --git a/docs/en-us/protocol/callback-schema.md b/docs/en-us/protocol/callback-schema.md index e64cb35b1e..293f56f569 100644 --- a/docs/en-us/protocol/callback-schema.md +++ b/docs/en-us/protocol/callback-schema.md @@ -6,7 +6,7 @@ icon: material-symbols:u-turn-left # Callback Message Protocol ::: info Note -Callback messages are rapidly evolving with each version update, so this document may become outdated. For the latest information, please refer to the [C# Integration Source Code](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/MaaWpfGui/Main/AsstProxy.cs) +Callback messages are rapidly evolving with each version update, so this document may become outdated. For the latest information, please refer to the [C# Integration Source Code](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/MaaWpfGui/Main/AsstProxy.cs) ::: ## Callback Function Prototype diff --git a/docs/en-us/readme.md b/docs/en-us/readme.md index 8143f62f38..846289ef77 100644 --- a/docs/en-us/readme.md +++ b/docs/en-us/readme.md @@ -109,15 +109,15 @@ Please refer to the [Development Guide](./develop/development.md). ### API -- [C interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/include/AsstCaller.h): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Cpp/main.cpp) -- [Python interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/asst/asst.py): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/sample.py) -- [Golang interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Golang/maa/maa.go) +- [C interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/include/AsstCaller.h): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Cpp/main.cpp) +- [Python interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/asst/asst.py): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/sample.py) +- [Golang interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Golang/maa/maa.go) - [Dart interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Dart) -- [Java interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) -- [Java HTTP interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/Readme.md) +- [Java interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java HTTP interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/Readme.md) - [Rust interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust/src/maa_sys): [HTTP interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust) - [TypeScript interface](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader) -- [Woolang interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/maa.wo): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/demo.wo) +- [Woolang interface](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/maa.wo): [Integration Example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/demo.wo) - [Integration Documentation](./protocol/integration.md) - [Callback Message Protocol](./protocol/callback-schema.md) - [Task Workflow Protocol](./protocol/task-schema.md) @@ -171,7 +171,7 @@ Thanks to all friends who have participated in development and testing - your he ## Disclaimer -- This software is open source under the [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) license, with additional [Terms of Service](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md). +- This software is open source under the [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) license, with additional [Terms of Service](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/terms-of-service.md). - The software's logo is NOT licensed under AGPL 3.0. The artists [耗毛](https://weibo.com/u/3251357314), vie, and all the software developers reserve all rights. The logo must not be used without authorization, even with AGPL 3.0 license claims, and must not be used for any commercial purposes without authorization. - This software is open source and free, intended only for learning and communication purposes. If you encounter merchants using this software for paid services, they may be charging for equipment and time costs; any problems and consequences arising from this are not related to this software. diff --git a/docs/ja-jp/manual/connection.md b/docs/ja-jp/manual/connection.md index fcc0ed3a24..9f9030feab 100644 --- a/docs/ja-jp/manual/connection.md +++ b/docs/ja-jp/manual/connection.md @@ -202,7 +202,7 @@ MAA は現在 `bluestacks.conf` の保存場所をレジストリから読み取 対応するエミュレーターの設定を選択してください。リストにない場合は汎用設定を選択してください。汎用設定が利用できない場合は他の利用可能な設定を試し、選択してください。 -具体的な違いについては、[ソースコード](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/resource/config.json#L57)をご覧ください。 +具体的な違いについては、[ソースコード](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/resource/config.json#L57)をご覧ください。 ### MuMu スクリーンショット強化モード diff --git a/docs/ja-jp/protocol/callback-schema.md b/docs/ja-jp/protocol/callback-schema.md index b8510e2806..e673ef7e06 100644 --- a/docs/ja-jp/protocol/callback-schema.md +++ b/docs/ja-jp/protocol/callback-schema.md @@ -10,7 +10,7 @@ This document is outdated due to the rapid update of the interface. Since the de ::: ::: info 注意 -コールバックメッセージがバージョンとともに更新される高速反復では、本書は古くなる可能性があります。最新のコンテンツを入手するには、[C#統合ソースコード](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/MaaWpfGui/Main/AsstProxy.cs) を参照してください。 +コールバックメッセージがバージョンとともに更新される高速反復では、本書は古くなる可能性があります。最新のコンテンツを入手するには、[C#統合ソースコード](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/MaaWpfGui/Main/AsstProxy.cs) を参照してください。 ::: ## Prototype diff --git a/docs/ja-jp/readme.md b/docs/ja-jp/readme.md index d5b0f952a1..e8a6ae5b68 100644 --- a/docs/ja-jp/readme.md +++ b/docs/ja-jp/readme.md @@ -97,15 +97,15 @@ MAA は中国語(簡体字)を第一言語とし、翻訳見出しはすべ ### API -- [Cインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/include/AsstCaller.h):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Cpp/main.cpp) -- [Pythonインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/asst/asst.py):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/sample.py) -- [Golangインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Golang/maa/maa.go) +- [Cインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/include/AsstCaller.h):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Cpp/main.cpp) +- [Pythonインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/asst/asst.py):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/sample.py) +- [Golangインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Golang/maa/maa.go) - [Dartインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Dart) -- [Javaインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) -- [Java HTTPインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/Readme.md) +- [Javaインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java HTTPインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/Readme.md) - [Rustインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust/src/maa_sys):[HTTPインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust) - [TypeScriptインターフェース](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader) -- [Woolangインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/maa.wo):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/demo.wo) +- [Woolangインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/maa.wo):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/demo.wo) - [統合ドキュメント](./protocol/integration.md) - [コールバックメッセージプロトコル](./protocol/callback-schema.md) - [タスクワークフロープロトコル](./protocol/task-schema.md) @@ -158,7 +158,7 @@ MAAをより良くするために開発・テストに貢献してくれたす ## 免責事項 -- 本ソフトウェアは [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) オープンソースライセンスを使用しています、また追加の [ユーザー規約](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md) が付属しています。 +- 本ソフトウェアは [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) オープンソースライセンスを使用しています、また追加の [ユーザー規約](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/terms-of-service.md) が付属しています。 - 本ソフトウェアのロゴはAGPL 3.0ライセンスを使用しており、オープンソースではなく、[耗毛](https://weibo.com/u/3251357314)とVie、2人のアーティストと開発者がすべての権利を留保しています。「AGPL 3.0ライセンスに基づいて許可されている」という理由で、許可がない場合に本ソフトウェアのロゴを無断で使用することは禁止しております。また、許可なく商業目的で本ソフトウェアのロゴを無断で使用することも禁止しております。 - 本ソフトウェアはオープンソースで無料であり、学習と研究のみの目的としています。販売者が本ソフトウェアの料金を請求する場合は、デバイスや時間の料金である可能性があります。発生した問題と結果は、本ソフトウェアとは一切関係ありません。 diff --git a/docs/ko-kr/manual/connection.md b/docs/ko-kr/manual/connection.md index 833665d49b..8d063e3c37 100644 --- a/docs/ko-kr/manual/connection.md +++ b/docs/ko-kr/manual/connection.md @@ -172,7 +172,7 @@ MAA 폴더에 직접 압축을 푸는 것을 권장합니다. 그러면 ADB 경 해당 에뮬레이터의 구성을 선택해야 합니다. 목록에 없으면 일반 구성을 선택하세요. 일반 구성이 작동하지 않으면 다른 사용 가능한 구성을 시도하세요. -자세한 차이점은 [소스 코드](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/resource/config.json#L57)를 참조하세요. +자세한 차이점은 [소스 코드](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/resource/config.json#L57)를 참조하세요. ### MuMu 스크린샷 강화 모드 diff --git a/docs/ko-kr/protocol/callback-schema.md b/docs/ko-kr/protocol/callback-schema.md index 406f54e582..2d57947778 100644 --- a/docs/ko-kr/protocol/callback-schema.md +++ b/docs/ko-kr/protocol/callback-schema.md @@ -6,7 +6,7 @@ icon: material-symbols:u-turn-left # 콜백 메시지 프로토콜 ::: info 정보 -콜백 메시지는 버전 업데이트를 통해 빠르게 변경되고 있으며 이 문서는 오래된 것일 수 있습니다. 최신 콘텐츠는 [C# 통합 소스 코드](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/MaaWpfGui/Main/AsstProxy.cs)를 참조하세요. +콜백 메시지는 버전 업데이트를 통해 빠르게 변경되고 있으며 이 문서는 오래된 것일 수 있습니다. 최신 콘텐츠는 [C# 통합 소스 코드](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/MaaWpfGui/Main/AsstProxy.cs)를 참조하세요. ::: ## 콜백 함수 프로토타입 diff --git a/docs/ko-kr/readme.md b/docs/ko-kr/readme.md index 0a3fffc49b..4d609ba10b 100644 --- a/docs/ko-kr/readme.md +++ b/docs/ko-kr/readme.md @@ -110,15 +110,15 @@ MAA는 중국어(간체)를 기본 언어로 하며, 번역 단어는 중국어( ### API -- [C 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/include/AsstCaller.h):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Cpp/main.cpp) -- [Python 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/asst/asst.py):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/sample.py) -- [Golang 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Golang/maa/maa.go) +- [C 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/include/AsstCaller.h):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Cpp/main.cpp) +- [Python 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/asst/asst.py):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/sample.py) +- [Golang 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Golang/maa/maa.go) - [Dart 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Dart) -- [Java 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) -- [Java HTTP 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/Readme.md) +- [Java 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java HTTP 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/Readme.md) - [Rust 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust/src/maa_sys):[HTTP 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust) - [TypeScript 인터페이스](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader) -- [Woolang 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/maa.wo):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/demo.wo) +- [Woolang 인터페이스](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/maa.wo):[예제](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/demo.wo) - [통합문서](./protocol/integration.md) - [콜백 프로토콜](./protocol/callback-schema.md) - [작업 프로토콜](./protocol/task-schema.md) @@ -172,7 +172,7 @@ MAA의 개선을 위한 개발/테스트에 기여해준 모든 친구들에게 ## 주의사항 -- 본 소프트웨어는 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 오픈소스 라이선스를 사용합니다, 또한 추가의 [사용자 계약](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md)이 포함됩니다. +- 본 소프트웨어는 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 오픈소스 라이선스를 사용합니다, 또한 추가의 [사용자 계약](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/terms-of-service.md)이 포함됩니다. - 이 프로그램의 로고는 AGPL 3.0 라이센스의 적용 대상이 아닙니다. [耗毛](https://weibo.com/u/3251357314)와 Vie 두 명의 아티스트와 프로그램의 개발자들이 모든 권리를 가집니다. 프로젝트가 AGPL 3.0 라이센스 하에 있다고 하더라도 프로그램의 로고는 동의 없이 사용되어서는 안 되며, 동의 없는 상업적 이용 또한 금지됩니다. - 이 프로그램은 오픈소스이자 무료이며 학습 및 커뮤니케이션 전용입니다. 이 프로그램을 이용해 장비값이나 시간당 수수료 등을 대가로 서비스를 제공하는 판매자로 인해 발생하는 문제와 결과는 프로그램의 개발자들에게는 책임이 없습니다. diff --git a/docs/zh-cn/manual/connection.md b/docs/zh-cn/manual/connection.md index 64315bec87..148e8d4355 100644 --- a/docs/zh-cn/manual/connection.md +++ b/docs/zh-cn/manual/connection.md @@ -164,7 +164,7 @@ MAA 可以通过当前**正在运行的单个模拟器**自动检测并填充 AD 需选择对应模拟器的配置,若列表中没有则选择通用配置。若通用配置不可用请尝试并选择其他任一可用的配置。 -具体区别可以阅读[源码](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/resource/config.json#L57)。 +具体区别可以阅读[源码](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/resource/config.json#L57)。 ### MuMu 截图增强模式 diff --git a/docs/zh-cn/protocol/callback-schema.md b/docs/zh-cn/protocol/callback-schema.md index 2ed9b68626..d0ab28b01d 100644 --- a/docs/zh-cn/protocol/callback-schema.md +++ b/docs/zh-cn/protocol/callback-schema.md @@ -6,7 +6,7 @@ icon: material-symbols:u-turn-left # 回调消息协议 ::: info 注意 -回调消息随版本更新飞速迭代中,本文档可能过时。如需获取最新内容可参考 [C# 集成源码](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/MaaWpfGui/Main/AsstProxy.cs) +回调消息随版本更新飞速迭代中,本文档可能过时。如需获取最新内容可参考 [C# 集成源码](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/MaaWpfGui/Main/AsstProxy.cs) ::: ## 回调函数原型 diff --git a/docs/zh-cn/readme.md b/docs/zh-cn/readme.md index 073554639c..2356cf380c 100644 --- a/docs/zh-cn/readme.md +++ b/docs/zh-cn/readme.md @@ -105,15 +105,15 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体) ### API -- [C 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/include/AsstCaller.h):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Cpp/main.cpp) -- [Python 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/asst/asst.py):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/sample.py) -- [Golang 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Golang/maa/maa.go) +- [C 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/include/AsstCaller.h):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Cpp/main.cpp) +- [Python 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/asst/asst.py):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/sample.py) +- [Golang 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Golang/maa/maa.go) - [Dart 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Dart) -- [Java 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) -- [Java HTTP 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/Readme.md) +- [Java 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java HTTP 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/Readme.md) - [Rust 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust/src/maa_sys):[HTTP 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust) - [TypeScript 接口](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader) -- [Woolang 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/maa.wo):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/demo.wo) +- [Woolang 接口](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/maa.wo):[集成示例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/demo.wo) - [集成文档](./protocol/integration.md) - [回调消息协议](./protocol/callback-schema.md) - [任务流程协议](./protocol/task-schema.md) @@ -167,7 +167,7 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体) ## 声明 -- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源,并附带额外 [用户协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md)。 +- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源,并附带额外 [用户协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/terms-of-service.md)。 - 本软件 logo 并非使用 AGPL 3.0 协议开源,[耗毛](https://weibo.com/u/3251357314)、vie 两位画师及软件全体开发者保留所有权利。不得以 AGPL 3.0 协议已授权为由在未经授权的情况下使用本软件 logo,不得在未经授权的情况下将本软件 logo 用于任何商业用途。 - 本软件开源、免费,仅供学习交流使用。若您遇到商家使用本软件进行代练并收费,可能是设备与时间等费用,产生的问题及后果与本软件无关。 diff --git a/docs/zh-tw/manual/connection.md b/docs/zh-tw/manual/connection.md index 90f1a3efa2..d6169f4991 100644 --- a/docs/zh-tw/manual/connection.md +++ b/docs/zh-tw/manual/connection.md @@ -164,7 +164,7 @@ MAA 可以透過目前**正在執行中的單一模擬器**,自動偵測並填 請選擇對應模擬器的配置,若清單中沒有則選擇「通用配置」。若通用配置不可用,請嘗試並選擇其他任一可用的配置。 -具體區別可以參閱 [原始碼](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/resource/config.json#L57)。 +具體區別可以參閱 [原始碼](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/resource/config.json#L57)。 ### MuMu 截圖增強模式 diff --git a/docs/zh-tw/protocol/callback-schema.md b/docs/zh-tw/protocol/callback-schema.md index 45bb76ffe5..040e65430a 100644 --- a/docs/zh-tw/protocol/callback-schema.md +++ b/docs/zh-tw/protocol/callback-schema.md @@ -6,7 +6,7 @@ icon: material-symbols:u-turn-left # 回呼訊息協定 ::: info 注意 -回呼訊息 (Callback) 隨版本更新快速迭代中,本文件可能過時。如需獲取最新內容可參考 [C# 整合原始碼](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/MaaWpfGui/Main/AsstProxy.cs) +回呼訊息 (Callback) 隨版本更新快速迭代中,本文件可能過時。如需獲取最新內容可參考 [C# 整合原始碼](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/MaaWpfGui/Main/AsstProxy.cs) ::: ## 回呼函式原型 diff --git a/docs/zh-tw/readme.md b/docs/zh-tw/readme.md index 128b06a944..f21a64f67f 100644 --- a/docs/zh-tw/readme.md +++ b/docs/zh-tw/readme.md @@ -107,15 +107,15 @@ MAA 以中文(簡體)為第一語言,翻譯詞條均以中文(簡體) ### API -- [C 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/include/AsstCaller.h):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Cpp/main.cpp) -- [Python 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/asst/asst.py):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Python/sample.py) -- [Golang 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Golang/maa/maa.go) +- [C 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/include/AsstCaller.h):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Cpp/main.cpp) +- [Python 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/asst/asst.py):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Python/sample.py) +- [Golang 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Golang):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Golang/maa/maa.go) - [Dart 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Dart) -- [Java 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) -- [Java HTTP 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Java/Readme.md) +- [Java 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java HTTP 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Java/Readme.md) - [Rust 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust/src/maa_sys):[HTTP 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/dev/src/Rust) - [TypeScript 介面](https://github.com/MaaX/tree/main/packages/main/coreLoader) -- [Woolang 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/maa.wo):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/src/Woolang/demo.wo) +- [Woolang 介面](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/maa.wo):[整合範例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/src/Woolang/demo.wo) - [整合文件](./protocol/integration.md) - [回呼訊息協定](./protocol/callback-schema.md) - [任務流程協定](./protocol/task-schema.md) @@ -169,7 +169,7 @@ MAA 以中文(簡體)為第一語言,翻譯詞條均以中文(簡體) ## 聲明 -- 本軟體使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 開源,並附帶額外 [用戶協議](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md)。 +- 本軟體使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 開源,並附帶額外 [用戶協議](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/terms-of-service.md)。 - 本軟體 logo 並非使用 AGPL 3.0 協議開源,[耗毛](https://weibo.com/u/3251357314)、vie 兩位畫師及軟體全體開發者保留所有權利。不得以 AGPL 3.0 協議已授權為由在未經授權的情況下使用本軟體 logo,不得在未經授權的情況下將本軟體 logo 用於任何商業用途。 - 本軟體開源、免費,僅供學習交流使用。若您遇到商家使用本軟體進行代練並收費,可能是設備與時間等費用,產生的問題及後果與本軟體無關。 diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 96008407fd..a6ffeab21a 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -70,7 +70,7 @@ MAA Team - https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/LICENSE + https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev-v2/LICENSE Copyright (c) 2021-2025 MAA Team https://docs.maa.plus/ README.md