From cc2968c2e92007d4690a623266ae5ab8e2e65dae Mon Sep 17 00:00:00 2001 From: Rbqwow <55343783+Rbqwow@users.noreply.github.com> Date: Sun, 29 Dec 2024 21:34:30 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3=20?= =?UTF-8?q?(#11430)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: 更新文档 对不起我忘记拆分 commit 了 优化 winget 安装运行库命令 添加 一键修复运行库.ps1 将 image 文件夹重命名为 images 添加账号切换执行时机说明 土下座 Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com> * docs: 跟上学姐的脚步 * fix: cli docs --------- Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com> --- .github/workflows/markdown-checker.yml | 7 +- .github/workflows/optimize-templates.yml | 2 +- DependencySetup_依赖库安装.bat | 6 +- README.md | 18 ++-- .../public/files/MAA_Runtime_Fix_Pwsh.ps1 | 101 ++++++++++++++++++ .../en-us/combat-start-interface-example.png | Bin .../{image => images}/en-us/readme/1-dark.png | Bin .../en-us/readme/1-light.png | Bin .../{image => images}/en-us/readme/2-dark.png | Bin .../en-us/readme/2-light.png | Bin .../{image => images}/en-us/readme/3-dark.png | Bin .../en-us/readme/3-light.png | Bin .../{image => images}/en-us/readme/4-dark.png | Bin .../en-us/readme/4-light.png | Bin .../ja-jp/combat-start-interface-example.png | Bin .../ja-jp/introduction-i.s.-pin-up.png | Bin .../ja-jp/readme/1-light.png | Bin .../ja-jp/readme/2-light.png | Bin .../ko-kr/combat-start-interface-example.png | Bin .../ko-kr/readme/1-light.png | Bin .../ko-kr/readme/2-light.png | Bin .../{image => images}/maa-logo_512x512.png | Bin .../zh-cn/combat-start-interface-example.png | Bin .../zh-cn/copilot-click-like.png | Bin .../development-enable-vs-clang-format.png | Bin .../zh-cn/pr-tutorial/fork-dark.png | Bin .../zh-cn/pr-tutorial/fork-light.png | Bin .../zh-cn/pr-tutorial/pr-10-1-dark.png | Bin .../zh-cn/pr-tutorial/pr-10-1-light.png | Bin .../zh-cn/pr-tutorial/pr-10-2-dark.png | Bin .../zh-cn/pr-tutorial/pr-10-2-light.png | Bin .../zh-cn/pr-tutorial/pr-11-dark.png | Bin .../zh-cn/pr-tutorial/pr-11-light.png | Bin .../zh-cn/pr-tutorial/pr-12-dark.png | Bin .../zh-cn/pr-tutorial/pr-12-light.png | Bin .../zh-cn/pr-tutorial/pr-14-1-dark.png | Bin .../zh-cn/pr-tutorial/pr-14-1-light.png | Bin .../zh-cn/pr-tutorial/pr-14-2-dark.png | Bin .../zh-cn/pr-tutorial/pr-14-2-light.png | Bin .../zh-cn/pr-tutorial/pr-2-dark.png | Bin .../zh-cn/pr-tutorial/pr-2-light.png | Bin .../zh-cn/pr-tutorial/pr-3-dark.png | Bin .../zh-cn/pr-tutorial/pr-3-light.png | Bin .../zh-cn/pr-tutorial/pr-4-dark.png | Bin .../zh-cn/pr-tutorial/pr-4-light.png | Bin .../zh-cn/pr-tutorial/pr-5-dark.png | Bin .../zh-cn/pr-tutorial/pr-5-light.png | Bin .../zh-cn/pr-tutorial/pr-7-1-dark.png | Bin .../zh-cn/pr-tutorial/pr-7-1-light.png | Bin .../zh-cn/pr-tutorial/pr-7-2-dark.png | Bin .../zh-cn/pr-tutorial/pr-7-2-light.png | Bin .../zh-cn/pr-tutorial/pr-9-dark.png | Bin .../zh-cn/pr-tutorial/pr-9-light.png | Bin .../zh-cn/pr-tutorial/pull-request-dark.png | Bin .../zh-cn/pr-tutorial/pull-request-light.png | Bin .../zh-cn/pr-tutorial/repository-dark.png | Bin .../zh-cn/pr-tutorial/repository-light.png | Bin .../{image => images}/zh-cn/readme/1-dark.png | Bin .../zh-cn/readme/1-light.png | Bin .../{image => images}/zh-cn/readme/2-dark.png | Bin .../zh-cn/readme/2-light.png | Bin .../{image => images}/zh-cn/readme/3-dark.png | Bin .../zh-cn/readme/3-light.png | Bin .../{image => images}/zh-cn/readme/4-dark.png | Bin .../zh-cn/readme/4-light.png | Bin .../{image/zh-tw/readme => images/zh-tw}/TODO | 0 docs/en-us/develop/development.md | 2 +- .../en-us/develop/documentation-guidelines.md | 4 +- docs/en-us/develop/pr-tutorial.md | 68 ++++++------ docs/en-us/manual/cli/config.md | 10 +- docs/en-us/manual/faq.md | 13 +-- docs/en-us/manual/introduction/combat.md | 2 +- docs/en-us/manual/introduction/copilot.md | 2 +- docs/en-us/manual/introduction/startup.md | 2 + docs/en-us/manual/newbie.md | 6 +- docs/en-us/readme.md | 18 ++-- docs/index.md | 2 +- docs/ja-jp/develop/development.md | 2 +- .../ja-jp/develop/documentation-guidelines.md | 4 +- docs/ja-jp/develop/pr-tutorial.md | 68 ++++++------ docs/ja-jp/manual/cli/config.md | 10 +- docs/ja-jp/manual/faq.md | 11 +- docs/ja-jp/manual/introduction/combat.md | 2 +- docs/ja-jp/manual/introduction/copilot.md | 2 +- .../introduction/integrated-strategy.md | 2 +- .../manual/introduction/introduction_old.md | 6 +- docs/ja-jp/manual/introduction/startup.md | 2 + docs/ja-jp/manual/newbie.md | 6 +- docs/ja-jp/readme.md | 10 +- docs/ko-kr/develop/development.md | 2 +- .../ko-kr/develop/documentation-guidelines.md | 4 +- docs/ko-kr/develop/pr-tutorial.md | 68 ++++++------ docs/ko-kr/manual/cli/config.md | 10 +- docs/ko-kr/manual/faq.md | 24 ++--- docs/ko-kr/manual/introduction/combat.md | 2 +- docs/ko-kr/manual/introduction/copilot.md | 2 +- docs/ko-kr/manual/introduction/startup.md | 2 + docs/ko-kr/manual/newbie.md | 6 +- docs/ko-kr/readme.md | 10 +- docs/zh-cn/develop/development.md | 2 +- .../zh-cn/develop/documentation-guidelines.md | 4 +- docs/zh-cn/develop/pr-tutorial.md | 68 ++++++------ docs/zh-cn/manual/cli/config.md | 10 +- docs/zh-cn/manual/faq.md | 10 +- docs/zh-cn/manual/introduction/combat.md | 2 +- docs/zh-cn/manual/introduction/copilot.md | 2 +- docs/zh-cn/manual/introduction/startup.md | 2 + docs/zh-cn/manual/newbie.md | 6 +- docs/zh-cn/readme.md | 18 ++-- docs/zh-tw/develop/development.md | 2 +- .../zh-tw/develop/documentation-guidelines.md | 4 +- docs/zh-tw/develop/pr-tutorial.md | 68 ++++++------ docs/zh-tw/manual/cli/config.md | 10 +- docs/zh-tw/manual/faq.md | 9 +- docs/zh-tw/manual/introduction/combat.md | 2 +- docs/zh-tw/manual/introduction/copilot.md | 2 +- .../manual/introduction/introduction_old.md | 4 +- docs/zh-tw/manual/introduction/startup.md | 2 + docs/zh-tw/manual/newbie.md | 6 +- docs/zh-tw/readme.md | 18 ++-- tools/OptimizeTemplates/optimize_templates.py | 2 +- 121 files changed, 429 insertions(+), 342 deletions(-) create mode 100644 docs/.vuepress/public/files/MAA_Runtime_Fix_Pwsh.ps1 rename docs/.vuepress/public/{image => images}/en-us/combat-start-interface-example.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/1-dark.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/1-light.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/2-dark.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/2-light.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/3-dark.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/3-light.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/4-dark.png (100%) rename docs/.vuepress/public/{image => images}/en-us/readme/4-light.png (100%) rename docs/.vuepress/public/{image => images}/ja-jp/combat-start-interface-example.png (100%) rename docs/.vuepress/public/{image => images}/ja-jp/introduction-i.s.-pin-up.png (100%) rename docs/.vuepress/public/{image => images}/ja-jp/readme/1-light.png (100%) rename docs/.vuepress/public/{image => images}/ja-jp/readme/2-light.png (100%) rename docs/.vuepress/public/{image => images}/ko-kr/combat-start-interface-example.png (100%) rename docs/.vuepress/public/{image => images}/ko-kr/readme/1-light.png (100%) rename docs/.vuepress/public/{image => images}/ko-kr/readme/2-light.png (100%) rename docs/.vuepress/public/{image => images}/maa-logo_512x512.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/combat-start-interface-example.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/copilot-click-like.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/development-enable-vs-clang-format.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/fork-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/fork-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-10-1-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-10-1-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-10-2-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-10-2-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-11-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-11-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-12-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-12-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-14-1-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-14-1-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-14-2-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-14-2-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-2-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-2-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-3-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-3-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-4-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-4-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-5-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-5-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-7-1-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-7-1-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-7-2-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-7-2-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-9-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pr-9-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pull-request-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/pull-request-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/repository-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/pr-tutorial/repository-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/1-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/1-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/2-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/2-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/3-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/3-light.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/4-dark.png (100%) rename docs/.vuepress/public/{image => images}/zh-cn/readme/4-light.png (100%) rename docs/.vuepress/public/{image/zh-tw/readme => images/zh-tw}/TODO (100%) diff --git a/.github/workflows/markdown-checker.yml b/.github/workflows/markdown-checker.yml index d53f4cacef..1ba023f747 100644 --- a/.github/workflows/markdown-checker.yml +++ b/.github/workflows/markdown-checker.yml @@ -37,13 +37,14 @@ jobs: with: # 仅检查内部链接和 Github 相关链接 args: > - --verbose --no-progress --cache --max-cache-age 1d + --verbose --no-progress --cache --max-cache-age 1d --exclude 'https?://.*' --include 'https?://github\.com/.*' --include 'https?://raw\.githubusercontent\.com/.*' --include 'https?://user-images\.githubusercontent\.com/.*' - --exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md' - --exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md' + --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) diff --git a/.github/workflows/optimize-templates.yml b/.github/workflows/optimize-templates.yml index e59bcf04a1..69473c70b7 100644 --- a/.github/workflows/optimize-templates.yml +++ b/.github/workflows/optimize-templates.yml @@ -6,7 +6,7 @@ on: - "dev" paths: - "resource/**/*.png" - - "docs/.vuepress/public/image/**" + - "docs/.vuepress/public/images/**" - "website/apps/web/public/**" - "website/apps/web/src/assets/links/**" workflow_dispatch: diff --git a/DependencySetup_依赖库安装.bat b/DependencySetup_依赖库安装.bat index 605905359d..5e52e7cceb 100644 --- a/DependencySetup_依赖库安装.bat +++ b/DependencySetup_依赖库安装.bat @@ -1,11 +1,11 @@ @echo off chcp 65001 +setlocal enabledelayedexpansion -:: 检查是否以管理员身份运行 openfiles >nul 2>&1 if %errorlevel% neq 0 ( echo 正在获取管理员权限... - powershell -Command "Start-Process cmd.exe -ArgumentList '/c %~0' -Verb RunAs" + powershell -Command "Start-Process cmd.exe -ArgumentList '/c %~dpnx0' -Verb RunAs" exit /b ) @@ -13,5 +13,5 @@ winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /nore winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force echo 运行库修复完成，请重启电脑后再次尝试运行 MAA。 -echo The runtime repair is complete. Please restart your computer and try running MAA again. +echo The runtime library repair is complete. Please restart your computer and try running MAA again. pause diff --git a/README.md b/README.md index def6301c5b..a78faeb62e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
-LOGO +LOGO # MaaAssistantArknights @@ -59,20 +59,20 @@ MAA 的意思是 MAA Assistant Arknights
话不多说，看图！ - - zh1 + + zh1 - - zh2 + + zh2 - - zh3 + + zh3 - - zh4 + + zh4
diff --git a/docs/.vuepress/public/files/MAA_Runtime_Fix_Pwsh.ps1 b/docs/.vuepress/public/files/MAA_Runtime_Fix_Pwsh.ps1 new file mode 100644 index 0000000000..67f7462b1a --- /dev/null +++ b/docs/.vuepress/public/files/MAA_Runtime_Fix_Pwsh.ps1 @@ -0,0 +1,101 @@ +# 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 űв +# ⲻвԵĴˣнűвԣȴýű޸ġ +# ҼȿڲȨнűУҲֱһнűеĻỰ +# űڲʱ֣ڲ޸IJҲȨҲУֻڰװпʱҪ㰲װ UAC +# ޸IJȨʱΪűвˣʲôƷֵĹԱȨޡ +# $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 дűҾɵơ diff --git a/docs/.vuepress/public/image/en-us/combat-start-interface-example.png b/docs/.vuepress/public/images/en-us/combat-start-interface-example.png similarity index 100% rename from docs/.vuepress/public/image/en-us/combat-start-interface-example.png rename to docs/.vuepress/public/images/en-us/combat-start-interface-example.png diff --git a/docs/.vuepress/public/image/en-us/readme/1-dark.png b/docs/.vuepress/public/images/en-us/readme/1-dark.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/1-dark.png rename to docs/.vuepress/public/images/en-us/readme/1-dark.png diff --git a/docs/.vuepress/public/image/en-us/readme/1-light.png b/docs/.vuepress/public/images/en-us/readme/1-light.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/1-light.png rename to docs/.vuepress/public/images/en-us/readme/1-light.png diff --git a/docs/.vuepress/public/image/en-us/readme/2-dark.png b/docs/.vuepress/public/images/en-us/readme/2-dark.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/2-dark.png rename to docs/.vuepress/public/images/en-us/readme/2-dark.png diff --git a/docs/.vuepress/public/image/en-us/readme/2-light.png b/docs/.vuepress/public/images/en-us/readme/2-light.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/2-light.png rename to docs/.vuepress/public/images/en-us/readme/2-light.png diff --git a/docs/.vuepress/public/image/en-us/readme/3-dark.png b/docs/.vuepress/public/images/en-us/readme/3-dark.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/3-dark.png rename to docs/.vuepress/public/images/en-us/readme/3-dark.png diff --git a/docs/.vuepress/public/image/en-us/readme/3-light.png b/docs/.vuepress/public/images/en-us/readme/3-light.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/3-light.png rename to docs/.vuepress/public/images/en-us/readme/3-light.png diff --git a/docs/.vuepress/public/image/en-us/readme/4-dark.png b/docs/.vuepress/public/images/en-us/readme/4-dark.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/4-dark.png rename to docs/.vuepress/public/images/en-us/readme/4-dark.png diff --git a/docs/.vuepress/public/image/en-us/readme/4-light.png b/docs/.vuepress/public/images/en-us/readme/4-light.png similarity index 100% rename from docs/.vuepress/public/image/en-us/readme/4-light.png rename to docs/.vuepress/public/images/en-us/readme/4-light.png diff --git a/docs/.vuepress/public/image/ja-jp/combat-start-interface-example.png b/docs/.vuepress/public/images/ja-jp/combat-start-interface-example.png similarity index 100% rename from docs/.vuepress/public/image/ja-jp/combat-start-interface-example.png rename to docs/.vuepress/public/images/ja-jp/combat-start-interface-example.png diff --git a/docs/.vuepress/public/image/ja-jp/introduction-i.s.-pin-up.png b/docs/.vuepress/public/images/ja-jp/introduction-i.s.-pin-up.png similarity index 100% rename from docs/.vuepress/public/image/ja-jp/introduction-i.s.-pin-up.png rename to docs/.vuepress/public/images/ja-jp/introduction-i.s.-pin-up.png diff --git a/docs/.vuepress/public/image/ja-jp/readme/1-light.png b/docs/.vuepress/public/images/ja-jp/readme/1-light.png similarity index 100% rename from docs/.vuepress/public/image/ja-jp/readme/1-light.png rename to docs/.vuepress/public/images/ja-jp/readme/1-light.png diff --git a/docs/.vuepress/public/image/ja-jp/readme/2-light.png b/docs/.vuepress/public/images/ja-jp/readme/2-light.png similarity index 100% rename from docs/.vuepress/public/image/ja-jp/readme/2-light.png rename to docs/.vuepress/public/images/ja-jp/readme/2-light.png diff --git a/docs/.vuepress/public/image/ko-kr/combat-start-interface-example.png b/docs/.vuepress/public/images/ko-kr/combat-start-interface-example.png similarity index 100% rename from docs/.vuepress/public/image/ko-kr/combat-start-interface-example.png rename to docs/.vuepress/public/images/ko-kr/combat-start-interface-example.png diff --git a/docs/.vuepress/public/image/ko-kr/readme/1-light.png b/docs/.vuepress/public/images/ko-kr/readme/1-light.png similarity index 100% rename from docs/.vuepress/public/image/ko-kr/readme/1-light.png rename to docs/.vuepress/public/images/ko-kr/readme/1-light.png diff --git a/docs/.vuepress/public/image/ko-kr/readme/2-light.png b/docs/.vuepress/public/images/ko-kr/readme/2-light.png similarity index 100% rename from docs/.vuepress/public/image/ko-kr/readme/2-light.png rename to docs/.vuepress/public/images/ko-kr/readme/2-light.png diff --git a/docs/.vuepress/public/image/maa-logo_512x512.png b/docs/.vuepress/public/images/maa-logo_512x512.png similarity index 100% rename from docs/.vuepress/public/image/maa-logo_512x512.png rename to docs/.vuepress/public/images/maa-logo_512x512.png diff --git a/docs/.vuepress/public/image/zh-cn/combat-start-interface-example.png b/docs/.vuepress/public/images/zh-cn/combat-start-interface-example.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/combat-start-interface-example.png rename to docs/.vuepress/public/images/zh-cn/combat-start-interface-example.png diff --git a/docs/.vuepress/public/image/zh-cn/copilot-click-like.png b/docs/.vuepress/public/images/zh-cn/copilot-click-like.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/copilot-click-like.png rename to docs/.vuepress/public/images/zh-cn/copilot-click-like.png diff --git a/docs/.vuepress/public/image/zh-cn/development-enable-vs-clang-format.png b/docs/.vuepress/public/images/zh-cn/development-enable-vs-clang-format.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/development-enable-vs-clang-format.png rename to docs/.vuepress/public/images/zh-cn/development-enable-vs-clang-format.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/fork-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/fork-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/fork-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/fork-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/fork-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/fork-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/fork-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/fork-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-1-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-1-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-1-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-1-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-1-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-1-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-1-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-1-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-2-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-2-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-2-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-2-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-2-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-2-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-2-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-2-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-11-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-11-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-11-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-11-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-12-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-12-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-12-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-12-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-1-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-1-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-1-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-1-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-1-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-1-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-1-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-1-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-2-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-2-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-2-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-2-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-2-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-2-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-2-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-14-2-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-2-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-2-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-2-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-2-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-3-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-3-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-3-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-3-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-4-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-4-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-4-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-4-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-5-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-5-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-5-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-5-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-1-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-1-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-1-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-1-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-1-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-1-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-1-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-1-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-2-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-2-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-2-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-2-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-2-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-2-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-2-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-7-2-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-9-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-9-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-9-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-9-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-9-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-9-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-9-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-9-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pull-request-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pull-request-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pull-request-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pull-request-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/pull-request-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/pull-request-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/pull-request-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/pull-request-light.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/repository-dark.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/repository-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/repository-dark.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/repository-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/pr-tutorial/repository-light.png b/docs/.vuepress/public/images/zh-cn/pr-tutorial/repository-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/pr-tutorial/repository-light.png rename to docs/.vuepress/public/images/zh-cn/pr-tutorial/repository-light.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/1-dark.png b/docs/.vuepress/public/images/zh-cn/readme/1-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/1-dark.png rename to docs/.vuepress/public/images/zh-cn/readme/1-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/1-light.png b/docs/.vuepress/public/images/zh-cn/readme/1-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/1-light.png rename to docs/.vuepress/public/images/zh-cn/readme/1-light.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/2-dark.png b/docs/.vuepress/public/images/zh-cn/readme/2-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/2-dark.png rename to docs/.vuepress/public/images/zh-cn/readme/2-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/2-light.png b/docs/.vuepress/public/images/zh-cn/readme/2-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/2-light.png rename to docs/.vuepress/public/images/zh-cn/readme/2-light.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/3-dark.png b/docs/.vuepress/public/images/zh-cn/readme/3-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/3-dark.png rename to docs/.vuepress/public/images/zh-cn/readme/3-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/3-light.png b/docs/.vuepress/public/images/zh-cn/readme/3-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/3-light.png rename to docs/.vuepress/public/images/zh-cn/readme/3-light.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/4-dark.png b/docs/.vuepress/public/images/zh-cn/readme/4-dark.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/4-dark.png rename to docs/.vuepress/public/images/zh-cn/readme/4-dark.png diff --git a/docs/.vuepress/public/image/zh-cn/readme/4-light.png b/docs/.vuepress/public/images/zh-cn/readme/4-light.png similarity index 100% rename from docs/.vuepress/public/image/zh-cn/readme/4-light.png rename to docs/.vuepress/public/images/zh-cn/readme/4-light.png diff --git a/docs/.vuepress/public/image/zh-tw/readme/TODO b/docs/.vuepress/public/images/zh-tw/TODO similarity index 100% rename from docs/.vuepress/public/image/zh-tw/readme/TODO rename to docs/.vuepress/public/images/zh-tw/TODO diff --git a/docs/en-us/develop/development.md b/docs/en-us/develop/development.md index 354a3c4cc0..2c10f64a22 100644 --- a/docs/en-us/develop/development.md +++ b/docs/en-us/develop/development.md @@ -126,7 +126,7 @@ The formatting tool will automatically run every time you submit to ensure that 3. In Visual Studio, search for 'clang-format' in Tools-Options. 4. Click `Enable ClangFormat support` and select `Use custom clang-format.exe file` and choose the `clang-format.exe` located in Step 2. -![Enable clang-format in Visual Studio](/image/zh-cn/development-enable-vs-clang-format.png) +![Enable clang-format in Visual Studio](/images/zh-cn/development-enable-vs-clang-format.png) You are all set with the clang-format integrated in Visual Studio supporting c++20 features! diff --git a/docs/en-us/develop/documentation-guidelines.md b/docs/en-us/develop/documentation-guidelines.md index dbedbddcc7..ebea7a35aa 100644 --- a/docs/en-us/develop/documentation-guidelines.md +++ b/docs/en-us/develop/documentation-guidelines.md @@ -107,9 +107,9 @@ You can use the `` component to add icons in markdown. This componen ``` - + ```markdown - + ``` ::: diff --git a/docs/en-us/develop/pr-tutorial.md b/docs/en-us/develop/pr-tutorial.md index 606539d19d..1e6cfabf4f 100644 --- a/docs/en-us/develop/pr-tutorial.md +++ b/docs/en-us/develop/pr-tutorial.md @@ -26,8 +26,8 @@ This chapter contains slightly dry content. If you're not interested, you can sk { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/repository-light.png", - "dark": "image/zh-cn/pr-tutorial/repository-dark.png" + "light": "images/zh-cn/pr-tutorial/repository-light.png", + "dark": "images/zh-cn/pr-tutorial/repository-dark.png" } ] } @@ -45,8 +45,8 @@ Since everyone can make a copy of their own, the copied repository is called a " { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -64,8 +64,8 @@ Of course, since it's a "request", it naturally requires approval. MAA Team may { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pull-request-light.png", - "dark": "image/zh-cn/pr-tutorial/pull-request-dark.png" + "light": "images/zh-cn/pr-tutorial/pull-request-light.png", + "dark": "images/zh-cn/pr-tutorial/pull-request-dark.png" } ] } @@ -84,8 +84,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -97,8 +97,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-2-dark.png" } ] } @@ -110,8 +110,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-3-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-3-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-3-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-3-dark.png" } ] } @@ -123,8 +123,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-4-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-4-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-4-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-4-dark.png" } ] } @@ -136,8 +136,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-5-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-5-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-5-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-5-dark.png" } ] } @@ -150,8 +150,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-1-dark.png" } ] } @@ -163,8 +163,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-2-dark.png" } ] } @@ -179,8 +179,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-9-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-9-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-9-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-9-dark.png" } ] } @@ -194,8 +194,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-1-dark.png" } ] } @@ -208,8 +208,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-2-dark.png" } ] } @@ -222,8 +222,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-11-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-11-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-11-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-11-dark.png" } ] } @@ -237,8 +237,8 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-12-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-12-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-12-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-12-dark.png" } ] } @@ -254,12 +254,12 @@ Now we have a conflict, as both of you have modified the A file but in different { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-14-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-1-dark.png" }, { - "light": "image/zh-cn/pr-tutorial/pr-14-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-2-dark.png" } ] } diff --git a/docs/en-us/manual/cli/config.md b/docs/en-us/manual/cli/config.md index b9d0d8d251..97824333f2 100644 --- a/docs/en-us/manual/cli/config.md +++ b/docs/en-us/manual/cli/config.md @@ -468,9 +468,9 @@ With the help of JSON schema, you can get auto-completion and validation in some [task-types]: ../../protocol/integration.md#list-of-task-types [emulator-ports]: ../../manual/connection.md#obtain-port-number [playcover-doc]: ../../manual/device/macos.md#%E2%9C%85-playcover-the-software-runs-most-fluently-for-its-nativity-%F0%9F%9A%80 -[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/config_examples +[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/config_examples [wangl-cc-dotfiles]: https://github.com/wangl-cc/dotfiles/tree/master/.config/maa -[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/ -[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/task.schema.json -[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/asst.schema.json -[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/cli.schema.json +[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/ +[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/task.schema.json +[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/asst.schema.json +[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/cli.schema.json diff --git a/docs/en-us/manual/faq.md b/docs/en-us/manual/faq.md index 6843350133..683d5154c8 100644 --- a/docs/en-us/manual/faq.md +++ b/docs/en-us/manual/faq.md @@ -9,17 +9,18 @@ If this is your first time using MAA, please read [Getting Started](./newbie.md) ::: warning -If you came here from the MAA error window, it is most likely due to not updating the runtime libraries. -The most common issues are runtime library problems, and people often miss the documentation and ask around, so we pinned this message. It's frustrating. +If MAA fails to run after an update, or if you’ve reached this page via an error window in MAA, it’s highly likely due to outdated runtime libraries. +The most frequent issue is runtime-related, yet many users ignore the documentation and ask around, so we replaced the pinned message with this. It's frustrating. -If MAA fails to run after an update, it is likely due to the runtime library version. You need to update the following two runtime libraries. -Please run the following command in the terminal, or manually download and install **both** runtime libraries. +Please run `DependencySetup_依赖库安装.bat` in the MAA directory, or execute the commands below in a terminal, ```sh -winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 +winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements && winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements ``` -- [Visual C++ Redistributable](https://aka.ms/vs/17/release/vc_redist.x64.exe) +or manually download and install the following **two** runtime libraries to resolve the issue. + +- [Visual C++ Redistributable x64](https://aka.ms/vs/17/release/vc_redist.x64.exe) - [.NET Desktop Runtime 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0#:~:text=Binaries-,Windows,-x64) ::: diff --git a/docs/en-us/manual/introduction/combat.md b/docs/en-us/manual/introduction/combat.md index 24e2b883ab..0dbfb00c74 100644 --- a/docs/en-us/manual/introduction/combat.md +++ b/docs/en-us/manual/introduction/combat.md @@ -52,7 +52,7 @@ order: 3 - For the SS event rerun, you can enter `SSReopen-XX` to clear XX-1 ~ XX-9 levels once. Example `SSReopen-IC`. ::: details Example -![Example](/image/en-us/combat-start-interface-example.png) +![Example](/images/en-us/combat-start-interface-example.png) ::: ### Annihilation Mode diff --git a/docs/en-us/manual/introduction/copilot.md b/docs/en-us/manual/introduction/copilot.md index 6acaf97083..949ebee113 100644 --- a/docs/en-us/manual/introduction/copilot.md +++ b/docs/en-us/manual/introduction/copilot.md @@ -32,7 +32,7 @@ Supports automatic combat for any `Squad Formation Stage` and `Stationary Securi - After enabling this feature, start automatic combat on the **map screen where the stages are located**. The automatic combat queue will stop if sanity is insufficient, combat fails, or the settlement is not three stars. - Ensure that the stages in the list are in the same area (can be navigated by swiping the map screen left or right). - Remember to like the tasks that you found helpful! - ![image](/image/zh-cn/copilot-click-like.png) + ![image](/images/zh-cn/copilot-click-like.png) ## Create Tasks diff --git a/docs/en-us/manual/introduction/startup.md b/docs/en-us/manual/introduction/startup.md index 0d0b521963..b53691efd9 100644 --- a/docs/en-us/manual/introduction/startup.md +++ b/docs/en-us/manual/introduction/startup.md @@ -13,6 +13,8 @@ Additional settings are required to automatically start the emulator. For detail ## Account Switch +This feature needs to be used together with configuration switching or scheduled execution. An account switch operation will be performed each time the `Startup` task is executed. + Only supports switching to logged-in accounts. Use the login name to search. Please ensure that the input content is unique among all logged-in accounts. Does not work on the global version. Example CN：`123****8901` can be input `123****8901`、`123`、`8901`、`3****8`. diff --git a/docs/en-us/manual/newbie.md b/docs/en-us/manual/newbie.md index c6e00c94dd..e5bf350977 100644 --- a/docs/en-us/manual/newbie.md +++ b/docs/en-us/manual/newbie.md @@ -15,11 +15,7 @@ icon: ri:guide-fill 2. Install the runtime library - MAA requires VCRedist x64 and .NET 8. Right-click the start button to open the terminal, paste the following command in it and Enter to install. - - ```sh - winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 - ``` + MAA requires VCRedist x64 and .NET 8. Please run `DependencySetup_依赖库安装.bat` in the MAA directory to install. Refer to [FAQ](faq.md#missing-runtime-libraries) for more information diff --git a/docs/en-us/readme.md b/docs/en-us/readme.md index f5593b3d3d..8672f6a845 100644 --- a/docs/en-us/readme.md +++ b/docs/en-us/readme.md @@ -9,7 +9,7 @@ dir: ::: center -![MAA Logo](/image/maa-logo_512x512.png =256x256) +![MAA Logo](/images/maa-logo_512x512.png =256x256) # MaaAssistantArknights @@ -52,20 +52,20 @@ Talk is cheap. Show me the pictures! { "imageList": [ { - "light": "image/en-us/readme/1-light.png", - "dark": "image/en-us/readme/1-dark.png" + "light": "images/en-us/readme/1-light.png", + "dark": "images/en-us/readme/1-dark.png" }, { - "light": "image/en-us/readme/2-light.png", - "dark": "image/en-us/readme/2-dark.png" + "light": "images/en-us/readme/2-light.png", + "dark": "images/en-us/readme/2-dark.png" }, { - "light": "image/en-us/readme/3-light.png", - "dark": "image/en-us/readme/3-dark.png" + "light": "images/en-us/readme/3-light.png", + "dark": "images/en-us/readme/3-dark.png" }, { - "light": "image/en-us/readme/4-light.png", - "dark": "image/en-us/readme/4-dark.png" + "light": "images/en-us/readme/4-light.png", + "dark": "images/en-us/readme/4-dark.png" } ] } diff --git a/docs/index.md b/docs/index.md index 7bfe0167c3..caef8957d7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,7 +5,7 @@ containerClass: home heroText: MAA 文档站 | Document tagline: 选择语言 | Select Language heroAlt: MAA Logo -heroImage: /image/maa-logo_512x512.png +heroImage: /images/maa-logo_512x512.png heroFullScreen: true actions: - text: 简体中文 diff --git a/docs/ja-jp/develop/development.md b/docs/ja-jp/develop/development.md index d08f789467..9df03be7b0 100644 --- a/docs/ja-jp/develop/development.md +++ b/docs/ja-jp/develop/development.md @@ -104,7 +104,7 @@ VS2022を開いた後、gitに関する操作はコマンドラインツール 3. Visual Studioで、 Tools-Optionsで 'clang-format'を検索します。 4. `clang-formatサポートを有効にする` をクリックし、下の `カスタムのclang-format.exeファイルを使用する` を選択し、最初取得した `clang-format.exe` を選択します。 -![Visual Studioでclang-formatを有効にする](/image/zh-cn/development-enable-vs-clang-format.png) +![Visual Studioでclang-formatを有効にする](/images/zh-cn/development-enable-vs-clang-format.png) そうすれば、 Visual Studio は c++20 構文をサポートする clang-format を問題なく使用できます！ diff --git a/docs/ja-jp/develop/documentation-guidelines.md b/docs/ja-jp/develop/documentation-guidelines.md index c797e2dd78..fd64cc4855 100644 --- a/docs/ja-jp/develop/documentation-guidelines.md +++ b/docs/ja-jp/develop/documentation-guidelines.md @@ -101,9 +101,9 @@ Markdown 内で `` コンポーネントを使用してアイコン ``` - + ```markdown - + ``` ::: diff --git a/docs/ja-jp/develop/pr-tutorial.md b/docs/ja-jp/develop/pr-tutorial.md index bb891a0706..3b915f2a0b 100644 --- a/docs/ja-jp/develop/pr-tutorial.md +++ b/docs/ja-jp/develop/pr-tutorial.md @@ -28,8 +28,8 @@ repo、コードやその他のリソースファイルを保存する場所で { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/repository-light.png", - "dark": "image/zh-cn/pr-tutorial/repository-dark.png" + "light": "images/zh-cn/pr-tutorial/repository-light.png", + "dark": "images/zh-cn/pr-tutorial/repository-dark.png" } ] } @@ -48,8 +48,8 @@ repo、コードやその他のリソースファイルを保存する場所で { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -69,8 +69,8 @@ repo、コードやその他のリソースファイルを保存する場所で { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pull-request-light.png", - "dark": "image/zh-cn/pr-tutorial/pull-request-dark.png" + "light": "images/zh-cn/pr-tutorial/pull-request-light.png", + "dark": "images/zh-cn/pr-tutorial/pull-request-dark.png" } ] } @@ -91,8 +91,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -104,8 +104,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-2-dark.png" } ] } @@ -117,8 +117,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-3-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-3-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-3-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-3-dark.png" } ] } @@ -130,8 +130,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-4-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-4-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-4-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-4-dark.png" } ] } @@ -143,8 +143,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-5-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-5-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-5-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-5-dark.png" } ] } @@ -157,8 +157,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-1-dark.png" } ] } @@ -168,8 +168,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-2-dark.png" } ] } @@ -183,8 +183,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-9-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-9-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-9-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-9-dark.png" } ] } @@ -197,8 +197,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-1-dark.png" } ] } @@ -210,8 +210,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-2-dark.png" } ] } @@ -224,8 +224,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-11-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-11-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-11-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-11-dark.png" } ] } @@ -239,8 +239,8 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-12-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-12-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-12-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-12-dark.png" } ] } @@ -267,12 +267,12 @@ Conflictを解決するのは少し面倒ですが、ここでは概念につい { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-14-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-1-dark.png" }, { - "light": "image/zh-cn/pr-tutorial/pr-14-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-2-dark.png" } ] } diff --git a/docs/ja-jp/manual/cli/config.md b/docs/ja-jp/manual/cli/config.md index a8842ff2fc..d210f94656 100644 --- a/docs/ja-jp/manual/cli/config.md +++ b/docs/ja-jp/manual/cli/config.md @@ -466,9 +466,9 @@ passphrase = "password" # ssh 密钥的密码 [task-types]: ../../protocol/integration.md#任务类型一览 [emulator-ports]: ../../manual/connection.md#获取端口号 [playcover-doc]: ../../manual/device/macos.md#✅-playcover-原生运行最流畅-🚀 -[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/config_examples +[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/config_examples [wangl-cc-dotfiles]: https://github.com/wangl-cc/dotfiles/tree/master/.config/maa -[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/ -[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/task.schema.json -[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/asst.schema.json -[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/cli.schema.json +[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/ +[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/task.schema.json +[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/asst.schema.json +[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/cli.schema.json diff --git a/docs/ja-jp/manual/faq.md b/docs/ja-jp/manual/faq.md index 0fe4190e2a..98f21fd814 100644 --- a/docs/ja-jp/manual/faq.md +++ b/docs/ja-jp/manual/faq.md @@ -9,16 +9,17 @@ icon: ph:question-fill ::: warning -MAA のエラーメッセージからここに来た場合、ほとんどの場合、ランタイムライブラリを更新していないことが原因です。 -最も多く発生する問題はランタイムライブラリの問題であり、ドキュメントを見逃して質問する人が多いため、このメッセージを固定しました。イライラします。 +MAAがアップデート後に動作しなくなった場合、またはエラーメッセージウィンドウを経由してここにたどり着いた場合、それは大体ランタイムが更新されていないことが原因です。 +最も多い問題はランタイム関連であり、それにもかかわらず多くの人がドキュメントを読まずに質問するため、トップメッセージをこれに変更しました。とてもイライラします。 -MAA が更新後に実行できない場合、ランタイムライブラリのバージョンが原因である可能性が高いです。以下の 2 つのランタイムライブラリを更新する必要があります。 -以下のコマンドをターミナルで実行するか、**両方の**ランタイムライブラリを手動でダウンロードしてインストールしてください。 +MAAディレクトリ内の `DependencySetup_依赖库安装.bat` を実行するか、以下のコマンドを端末で実行するか、 ```sh -winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 +winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements && winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements ``` +以下の**2つ**のランタイムライブラリを手動でダウンロードしてインストールして問題を解決してください。 + - [Visual C++ 再頒布可能パッケージ](https://aka.ms/vs/17/release/vc_redist.x64.exe) - [.NET デスクトップランタイム 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0#:~:text=Binaries-,Windows,-x64) diff --git a/docs/ja-jp/manual/introduction/combat.md b/docs/ja-jp/manual/introduction/combat.md index 0d7625b68a..da9b3bccc7 100644 --- a/docs/ja-jp/manual/introduction/combat.md +++ b/docs/ja-jp/manual/introduction/combat.md @@ -53,7 +53,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need - 复刻的 SS 活动。输入 `SSReopen-<关卡前缀>` ，可一次性刷完 XX-1 ~ XX-9 关，如 `SSReopen-IC`。 ::: details 画面例 -![画面例](/image/ja-jp/combat-start-interface-example.png) +![画面例](/images/ja-jp/combat-start-interface-example.png) ::: ### 剿灭模式 diff --git a/docs/ja-jp/manual/introduction/copilot.md b/docs/ja-jp/manual/introduction/copilot.md index 7c6d905504..133df3dd87 100644 --- a/docs/ja-jp/manual/introduction/copilot.md +++ b/docs/ja-jp/manual/introduction/copilot.md @@ -29,7 +29,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need - 开启本功能后改为在**关卡所在的地图界面**开始自动战斗。在理智不足/战斗失败/非三星结算时将停止自动战斗队列。 - 请确保列表中的关卡在同一区域（只通过左右滑动地图界面就可以导航到）。 - **请务必为优质作业点赞，以提高作业评分并激励作业制作者。** - ![image](/image/zh-cn/copilot-click-like.png) + ![image](/images/zh-cn/copilot-click-like.png) ## 写作业 diff --git a/docs/ja-jp/manual/introduction/integrated-strategy.md b/docs/ja-jp/manual/introduction/integrated-strategy.md index 8ad21a6abc..7b5762ff55 100644 --- a/docs/ja-jp/manual/introduction/integrated-strategy.md +++ b/docs/ja-jp/manual/introduction/integrated-strategy.md @@ -16,7 +16,7 @@ MAA 默认选择最新一期主题，可在 `自动肉鸽` - `肉鸽主题` 中 - 设置中可选择分队、开局干员（仅单个干员名）等。 ::: details 固定方法「PIN UP」 -![固定方法](/image/ja-jp/introduction-i.s.-pin-up.png) +![固定方法](/images/ja-jp/introduction-i.s.-pin-up.png) ::: ## 战斗策略 diff --git a/docs/ja-jp/manual/introduction/introduction_old.md b/docs/ja-jp/manual/introduction/introduction_old.md index e88ff42b51..596c76375d 100644 --- a/docs/ja-jp/manual/introduction/introduction_old.md +++ b/docs/ja-jp/manual/introduction/introduction_old.md @@ -22,7 +22,7 @@ icon: ic:baseline-article - 再刻印SSアクティビティは `SSReopen-XX` と入力するとXX-1～XX-9ステージを一度にクリアできます。 `SSReopen-IC` など。 ::: details 画面例 -![画面例](/image/ja-jp/combat-start-interface-example.png) +![画面例](/images/ja-jp/combat-start-interface-example.png) ::: - スタート画面の `理性剤使用数 + 割る源石の数`、`周回数指定`、`素材を限定` の3つのオプションはショートスイッチですので、**3つのオプションのいずれかを達成した場合**、それはタスクの完了と見なされます。 @@ -104,7 +104,7 @@ icon: ic:baseline-article - MAAがスタックしたり、難易度選択画面を何度も出たり入ったりする場合は、手動で難易度を選択してからこの機能を有効にしてください。 ::: details 固定方法「PIN UP」 -![固定方法](/image/ja-jp/introduction-i.s.-pin-up.png) +![固定方法](/images/ja-jp/introduction-i.s.-pin-up.png) ::: - 設定は分隊、最初の職業選択（最初に一つのオペレーターを指定する）等を設定できます。 @@ -145,7 +145,7 @@ icon: ic:baseline-article - リスト内のステージが同じエリアにあることを確認してください（マップ画面を左右にスワイプすることでのみナビゲートできます）。 - **攻略ファイルの採点を高め、クリエイターを激励するために、必ず良質な攻略ファイルに「いいね！」を押してください。** -![image](/image/zh-cn/copilot-click-like.png) +![image](/images/zh-cn/copilot-click-like.png) #### 攻略ファイルの作成 diff --git a/docs/ja-jp/manual/introduction/startup.md b/docs/ja-jp/manual/introduction/startup.md index 23911c7b24..b4e6d216ad 100644 --- a/docs/ja-jp/manual/introduction/startup.md +++ b/docs/ja-jp/manual/introduction/startup.md @@ -14,6 +14,8 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need ## 账号切换 +この機能は、設定の切り替えやスケジュール実行と一緒に使用する必要があります。`ウェイクアップ` タスクが実行されるたびに、アカウント切り替え操作が行われます。 + 仅支持切换至已登录的账号，使用登录名进行查找，请保证输入内容在所有已登录账号唯一。 - 例子： diff --git a/docs/ja-jp/manual/newbie.md b/docs/ja-jp/manual/newbie.md index c5f3b719d4..7f4f6ddba5 100644 --- a/docs/ja-jp/manual/newbie.md +++ b/docs/ja-jp/manual/newbie.md @@ -15,11 +15,7 @@ icon: ri:guide-fill 2. ランタイムライブラリをインストールする - MAAはVCRedist x64と.NET 8が必要です。スタートボタンを右クリックしてターミナルを開き、下記のコマンドを入力しエンターキーを押してインストールしてください。 - - ```sh - winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 - ``` + MAAはVCRedist x64と.NET 8が必要です。MAAディレクトリ内の `DependencySetup_依赖库安装.bat` を実行してインストールしてください。 3. 環境にあったバージョンのダウンロード diff --git a/docs/ja-jp/readme.md b/docs/ja-jp/readme.md index c13da613dc..165cc341a7 100644 --- a/docs/ja-jp/readme.md +++ b/docs/ja-jp/readme.md @@ -9,7 +9,7 @@ dir: ::: center -![MAA Logo](/image/maa-logo_512x512.png =256x256) +![MAA Logo](/images/maa-logo_512x512.png =256x256) @@ -53,12 +53,12 @@ UIを見れば使い方もすぐ分かる！ { "imageList": [ { - "light": "image/ja-jp/readme/1-light.png", - "dark": "image/ja-jp/readme/1-light.png" + "light": "images/ja-jp/readme/1-light.png", + "dark": "images/ja-jp/readme/1-light.png" }, { - "light": "image/ja-jp/readme/2-light.png", - "dark": "image/ja-jp/readme/2-light.png" + "light": "images/ja-jp/readme/2-light.png", + "dark": "images/ja-jp/readme/2-light.png" } ] } diff --git a/docs/ko-kr/develop/development.md b/docs/ko-kr/develop/development.md index 8e23ccea89..b440dcbe5b 100644 --- a/docs/ko-kr/develop/development.md +++ b/docs/ko-kr/develop/development.md @@ -130,7 +130,7 @@ MAA는 리포지토리의 코드 및 리소스 파일들을 아름답고 일관 3. Visual Studio에서 `도구`-`옵션`을 검색하여 `clang-format`을 클릭합니다. 4. `ClangFormat 지원 활성화`를 클릭하고 아래의 `사용자 정의 clang-format.exe 파일 사용`을 선택한 다음 2단계에서 찾은 `clang-format.exe`를 선택합니다. -![Visual Studio에서 clang-format 사용 설정](/image/zh-cn/development-enable-vs-clang-format.png) +![Visual Studio에서 clang-format 사용 설정](/images/zh-cn/development-enable-vs-clang-format.png) 이제 Visual Studio에서 C++20 구문을 지원하는 clang-format을 사용할 수 있습니다! diff --git a/docs/ko-kr/develop/documentation-guidelines.md b/docs/ko-kr/develop/documentation-guidelines.md index 626b885a45..41f4967bad 100644 --- a/docs/ko-kr/develop/documentation-guidelines.md +++ b/docs/ko-kr/develop/documentation-guidelines.md @@ -107,9 +107,9 @@ icon: jam:write-f ``` - + ```markdown - + ``` ::: diff --git a/docs/ko-kr/develop/pr-tutorial.md b/docs/ko-kr/develop/pr-tutorial.md index 20eebda561..88d1cebaef 100644 --- a/docs/ko-kr/develop/pr-tutorial.md +++ b/docs/ko-kr/develop/pr-tutorial.md @@ -26,8 +26,8 @@ repo로도 알려져 있으며 코드 및 다른 리소스 파일을 저장하 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/repository-light.png", - "dark": "image/zh-cn/pr-tutorial/repository-dark.png" + "light": "images/zh-cn/pr-tutorial/repository-light.png", + "dark": "images/zh-cn/pr-tutorial/repository-dark.png" } ] } @@ -46,8 +46,8 @@ repo로도 알려져 있으며 코드 및 다른 리소스 파일을 저장하 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -66,8 +66,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pull-request-light.png", - "dark": "image/zh-cn/pr-tutorial/pull-request-dark.png" + "light": "images/zh-cn/pr-tutorial/pull-request-light.png", + "dark": "images/zh-cn/pr-tutorial/pull-request-dark.png" } ] } @@ -87,8 +87,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -100,8 +100,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-2-dark.png" } ] } @@ -113,8 +113,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-3-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-3-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-3-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-3-dark.png" } ] } @@ -126,8 +126,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-4-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-4-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-4-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-4-dark.png" } ] } @@ -139,8 +139,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-5-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-5-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-5-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-5-dark.png" } ] } @@ -153,8 +153,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-1-dark.png" } ] } @@ -164,8 +164,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-2-dark.png" } ] } @@ -179,8 +179,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-9-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-9-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-9-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-9-dark.png" } ] } @@ -193,8 +193,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-1-dark.png" } ] } @@ -206,8 +206,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-2-dark.png" } ] } @@ -220,8 +220,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-11-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-11-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-11-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-11-dark.png" } ] } @@ -235,8 +235,8 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-12-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-12-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-12-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-12-dark.png" } ] } @@ -264,12 +264,12 @@ PR로도 알려져 있으며, "풀 리퀘스트"라는 용어는 너무 길고 { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-14-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-1-dark.png" }, { - "light": "image/zh-cn/pr-tutorial/pr-14-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-2-dark.png" } ] } diff --git a/docs/ko-kr/manual/cli/config.md b/docs/ko-kr/manual/cli/config.md index d06064d046..c6acdab4d7 100644 --- a/docs/ko-kr/manual/cli/config.md +++ b/docs/ko-kr/manual/cli/config.md @@ -449,9 +449,9 @@ passphrase = "password" # ssh 키의 암호 [task-types]: ../../protocol/integration.md#작업-유형-목록 [emulator-ports]: ../../manual/connection.md#포트-번호-입력 [playcover-doc]: ../../manual/device/macos.md#✅-playcover-제일-부드럽습니다-🚀 -[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/config_examples +[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/config_examples [wangl-cc-dotfiles]: https://github.com/wangl-cc/dotfiles/tree/master/.config/maa -[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/ -[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/task.schema.json -[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/asst.schema.json -[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/cli.schema.json +[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/ +[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/task.schema.json +[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/asst.schema.json +[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/cli.schema.json diff --git a/docs/ko-kr/manual/faq.md b/docs/ko-kr/manual/faq.md index 44ad16882a..170a98b235 100644 --- a/docs/ko-kr/manual/faq.md +++ b/docs/ko-kr/manual/faq.md @@ -9,16 +9,17 @@ MAA를 처음 사용하는 경우 [초보자 가이드](./newbie.md)를 읽어 ::: warning -MAA 오류 창에서 이 페이지로 이동한 경우, 대부분의 경우 런타임 라이브러리를 업데이트하지 않아 발생한 문제입니다. -가장 자주 발생하는 문제는 런타임 라이브러리 문제이며, 문서를 보지 않고 여기저기 묻는 사람들이 많아 이 메시지를 고정했습니다. 정말 답답합니다. +MAA가 업데이트 후 실행되지 않거나 MAA의 오류 창을 통해 여기에 도달했다면, 이는 대부분 실행 라이브러리가 업데이트되지 않은 문제 때문입니다. +가장 자주 발생하는 문제는 실행 라이브러리 문제이며, 많은 사람들이 문서를 읽지 않고 질문만 하기 때문에 공지 내용을 이걸로 교체했습니다. -MAA가 업데이트 후 실행되지 않는 경우, 런타임 라이브러리 버전 문제일 가능성이 큽니다. 다음 두 개의 런타임 라이브러리를 업데이트해야 합니다. -터미널에서 다음 명령을 실행하거나, **두 개의** 런타임 라이브러리를 수동으로 다운로드하여 설치하십시오. +MAA 디렉토리에서 `DependencySetup_依赖库安装.bat`를 실행하거나, 터미널에서 아래 명령을 실행하거나, ```sh -winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 +winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements && winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements ``` +아래**두 개**의 실행 라이브러리를 수동으로 다운로드하여 설치하여 문제를 해결하세요. + - [Visual C++ 재배포 가능 패키지](https://aka.ms/vs/17/release/vc_redist.x64.exe) - [.NET 데스크톱 런타임 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0#:~:text=Binaries-,Windows,-x64) @@ -32,18 +33,9 @@ winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 대부분의 경우, x64 아키텍처의 MAA를 사용해야 합니다. 즉, `MAA-*-win-x64.zip`을 다운로드해야 하며, `MAA-*-win-arm64.zip`이 아닙니다. - 자동 업데이트 후 기능이 누락되었거나 작동하지 않는 경우, 업데이트 과정에서 문제가 발생했을 수 있습니다. 전체 설치 패키지를 다시 다운로드하고 압축을 해제하세요. 압축 해제 후, 이전 `MAA` 폴더에 있는 `config` 폴더를 새로 압축 해제된 `MAA` 폴더로 직접 드래그하세요. -### 가능성 2: 런타임 문제 +### 런타임 문제 -::: info 안내 -이곳에서는 공식 설치 방법만 안내합니다. 공식 설치가 아닌 제 3자의 설치 패키지의 신뢰성은 보장할 수 없습니다. -::: - -- [VCRedist x64](https://aka.ms/vs/17/release/vc_redist.x64.exe)와 [.NET 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0#:~:text=Binaries-,Windows,-x64)를 설치하고 컴퓨터를 다시 시작한 후 MAA를 다시 실행해보세요. -Windows 10 또는 11을 사용하는 경우 winget 도구를 사용하여 설치할 수도 있습니다. 다음 명령어를 터미널에서 실행하세요. - - ```sh - winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 - ``` +웹 페이지 오른쪽 아래에 있는 위로 ↑ 화살표를 찾아 클릭하세요. #### Windows N/KN 관련 diff --git a/docs/ko-kr/manual/introduction/combat.md b/docs/ko-kr/manual/introduction/combat.md index 1e0ca41e47..63221d216d 100644 --- a/docs/ko-kr/manual/introduction/combat.md +++ b/docs/ko-kr/manual/introduction/combat.md @@ -49,7 +49,7 @@ order: 3 - 재개방된 사이드 스토리 이벤트. `SSReopen-<스테이지 접두사>`를 입력하면 XX-1~XX-9 스테이지를 한 번에 완료할 수 있습니다. 예: `SSReopen-IC`. ::: details 예시 화면 -![Image](/image/ko-kr/combat-start-interface-example.png) +![Image](/images/ko-kr/combat-start-interface-example.png) ::: ### 섬멸 작전 diff --git a/docs/ko-kr/manual/introduction/copilot.md b/docs/ko-kr/manual/introduction/copilot.md index 47d2fdc5f0..9f9006807d 100644 --- a/docs/ko-kr/manual/introduction/copilot.md +++ b/docs/ko-kr/manual/introduction/copilot.md @@ -28,7 +28,7 @@ Copilot은 `일반/이벤트 스테이지` 및 `보안파견` 등을 지원합 - 전투 목록에 있는 스테이지는 `동일한 지역`에 있어야 합니다. (지도를 좌우로 스크롤하여 이동할 수 있어야 합니다) - **우수한 Copilot 파일에 반드시 추천을 눌러 제작자를 격려하세요! 큰 도움이 됩니다!** - ![image](/image/zh-cn/copilot-click-like.png) + ![image](/images/zh-cn/copilot-click-like.png) ## Copilot 파일 작성 diff --git a/docs/ko-kr/manual/introduction/startup.md b/docs/ko-kr/manual/introduction/startup.md index 5097cea2a1..ff478d125c 100644 --- a/docs/ko-kr/manual/introduction/startup.md +++ b/docs/ko-kr/manual/introduction/startup.md @@ -12,6 +12,8 @@ order: 1 **글로벌 서버는 해당이 안됩니다. (CN만 가능)** +이 기능은 설정 전환 또는 정기 실행과 함께 사용해야 하며, `로그인` 작업이 실행될 때마다 계정 전환 작업이 수행됩니다. + 이미 로그인된 계정으로만 전환할 수 있습니다. 로그인 이름으로 검색되므로 입력 내용이 모든 로그인된 계정에서 고유하도록 해주세요. 예시: `123****8901`은 `123****8901`, `123`, `8901`, `3****8`로 입력될 수 있습니다. diff --git a/docs/ko-kr/manual/newbie.md b/docs/ko-kr/manual/newbie.md index 4310cb6f9a..6f64ffdc0d 100644 --- a/docs/ko-kr/manual/newbie.md +++ b/docs/ko-kr/manual/newbie.md @@ -17,11 +17,7 @@ icon: ri:guide-fill 2. 런타임 설치 - MAA는 VCRedist x64와 .NET 8이 필요합니다. 시작 버튼을 우클릭하여 터미널을 열고, 아래 명령어를 터미널에 붙여넣고 엔터를 눌러 설치합니다. - - ```sh - winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 - ``` + MAA는 VCRedist x64 및 .NET 8이 필요합니다. MAA 디렉토리의 `DependencySetup_依赖库安装.bat`를 실행하여 설치하세요. 자세한 정보는 [FAQ](./faq.md#가능성-2-런타임-문제)를 참조하세요. diff --git a/docs/ko-kr/readme.md b/docs/ko-kr/readme.md index 437ac897b7..952cb3cccf 100644 --- a/docs/ko-kr/readme.md +++ b/docs/ko-kr/readme.md @@ -9,7 +9,7 @@ dir: ::: center -![MAA Logo](/image/maa-logo_512x512.png =256x256) +![MAA Logo](/images/maa-logo_512x512.png =256x256) @@ -55,12 +55,12 @@ MAA는 MAA Assistant Arknights의 약자입니다 { "imageList": [ { - "light": "image/ko-kr/readme/1-light.png", - "dark": "image/ko-kr/readme/1-light.png" + "light": "images/ko-kr/readme/1-light.png", + "dark": "images/ko-kr/readme/1-light.png" }, { - "light": "image/ko-kr/readme/2-light.png", - "dark": "image/ko-kr/readme/2-light.png" + "light": "images/ko-kr/readme/2-light.png", + "dark": "images/ko-kr/readme/2-light.png" } ] } diff --git a/docs/zh-cn/develop/development.md b/docs/zh-cn/develop/development.md index 767915d530..392a861ce0 100644 --- a/docs/zh-cn/develop/development.md +++ b/docs/zh-cn/develop/development.md @@ -136,7 +136,7 @@ MAA 使用一系列的格式化工具来保证仓库中的代码和资源文件 3. 在 Visual Studio `工具-选项` 中搜索 `clang-format` 4. 点击 `启用 ClangFormat 支持`，然后选择下面的 `使用自定义 clang-format.exe 文件`，选择第 2 步找到的 `clang-format.exe` -![Visual Studio 设置 clang-format](/image/zh-cn/development-enable-vs-clang-format.png) +![Visual Studio 设置 clang-format](/images/zh-cn/development-enable-vs-clang-format.png) 然后你的 Visual Studio 就能愉快的使用支持 c++20 语法的 clang-format 啦！ diff --git a/docs/zh-cn/develop/documentation-guidelines.md b/docs/zh-cn/develop/documentation-guidelines.md index b67a15c819..ae5ceb0346 100644 --- a/docs/zh-cn/develop/documentation-guidelines.md +++ b/docs/zh-cn/develop/documentation-guidelines.md @@ -107,9 +107,9 @@ icon: jam:write-f ``` - + ```markdown - + ``` ::: diff --git a/docs/zh-cn/develop/pr-tutorial.md b/docs/zh-cn/develop/pr-tutorial.md index 3a51b92e72..c85eae729b 100644 --- a/docs/zh-cn/develop/pr-tutorial.md +++ b/docs/zh-cn/develop/pr-tutorial.md @@ -26,8 +26,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/repository-light.png", - "dark": "image/zh-cn/pr-tutorial/repository-dark.png" + "light": "images/zh-cn/pr-tutorial/repository-light.png", + "dark": "images/zh-cn/pr-tutorial/repository-dark.png" } ] } @@ -46,8 +46,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -66,8 +66,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pull-request-light.png", - "dark": "image/zh-cn/pr-tutorial/pull-request-dark.png" + "light": "images/zh-cn/pr-tutorial/pull-request-light.png", + "dark": "images/zh-cn/pr-tutorial/pull-request-dark.png" } ] } @@ -88,8 +88,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -101,8 +101,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-2-dark.png" } ] } @@ -114,8 +114,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-3-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-3-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-3-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-3-dark.png" } ] } @@ -127,8 +127,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-4-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-4-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-4-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-4-dark.png" } ] } @@ -140,8 +140,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-5-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-5-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-5-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-5-dark.png" } ] } @@ -154,8 +154,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-1-dark.png" } ] } @@ -167,8 +167,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-2-dark.png" } ] } @@ -183,8 +183,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-9-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-9-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-9-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-9-dark.png" } ] } @@ -198,8 +198,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-1-dark.png" } ] } @@ -212,8 +212,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-2-dark.png" } ] } @@ -226,8 +226,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-11-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-11-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-11-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-11-dark.png" } ] } @@ -241,8 +241,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-12-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-12-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-12-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-12-dark.png" } ] } @@ -258,12 +258,12 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-14-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-1-dark.png" }, { - "light": "image/zh-cn/pr-tutorial/pr-14-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-2-dark.png" } ] } diff --git a/docs/zh-cn/manual/cli/config.md b/docs/zh-cn/manual/cli/config.md index 93105ad521..d37164fb3e 100644 --- a/docs/zh-cn/manual/cli/config.md +++ b/docs/zh-cn/manual/cli/config.md @@ -462,9 +462,9 @@ passphrase = "password" # ssh 密钥的密码 [task-types]: ../../protocol/integration.md#任务类型一览 [emulator-ports]: ../../manual/connection.md#获取端口号 [playcover-doc]: ../../manual/device/macos.md#✅-playcover-原生运行最流畅-🚀 -[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/config_examples +[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/config_examples [wangl-cc-dotfiles]: https://github.com/wangl-cc/dotfiles/tree/master/.config/maa -[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/ -[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/task.schema.json -[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/asst.schema.json -[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/cli.schema.json +[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/ +[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/task.schema.json +[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/asst.schema.json +[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/cli.schema.json diff --git a/docs/zh-cn/manual/faq.md b/docs/zh-cn/manual/faq.md index 675e537e5a..7ea9990084 100644 --- a/docs/zh-cn/manual/faq.md +++ b/docs/zh-cn/manual/faq.md @@ -9,19 +9,19 @@ icon: ph:question-fill ::: warning -如果你是从 MAA 的报错窗口来到这的，那八成是由于未更新运行库而造成的问题。 +若 MAA 在某次更新后无法运行，或者单纯是从 MAA 的报错窗口来到这的，那八成是由于运行库未更新导致的问题。 出现次数最多的问题都是运行库问题，而总是有人看不到文档到处问，所以我们把置顶换成了这个。很气。 -若 MAA 在某次更新后无法运行，有很大可能是因为运行库版本而导致的问题，需更新以下两个运行库。 -请在终端中运行以下命令，或手动下载**两个**运行库并安装。 +请运行 MAA 目录下的 `DependencySetup_依赖库安装.bat`，或在终端中运行以下命令， ```sh -winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 +winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements && winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements ``` +或手动下载并安装以下**两个**运行库来解决问题。 + - [Visual C++ 可再发行程序包](https://aka.ms/vs/17/release/vc_redist.x64.exe) - [.NET 桌面运行时 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0#:~:text=Binaries-,Windows,-x64) - ::: ## 软件无法运行/闪退/报错 diff --git a/docs/zh-cn/manual/introduction/combat.md b/docs/zh-cn/manual/introduction/combat.md index 30f46b7b91..2a82785339 100644 --- a/docs/zh-cn/manual/introduction/combat.md +++ b/docs/zh-cn/manual/introduction/combat.md @@ -50,7 +50,7 @@ order: 3 - 复刻的 SS 活动。输入 `SSReopen-<关卡前缀>` ，可一次性刷完 XX-1 ~ XX-9 关，如 `SSReopen-IC`。 ::: details 示例画面 -![示例画面](/image/zh-cn/combat-start-interface-example.png) +![示例画面](/images/zh-cn/combat-start-interface-example.png) ::: ### 剿灭模式 diff --git a/docs/zh-cn/manual/introduction/copilot.md b/docs/zh-cn/manual/introduction/copilot.md index 70533f25b6..7caa3873a9 100644 --- a/docs/zh-cn/manual/introduction/copilot.md +++ b/docs/zh-cn/manual/introduction/copilot.md @@ -29,7 +29,7 @@ order: 9 - 开启本功能后改为在**关卡所在的地图界面**开始自动战斗。在理智不足/战斗失败/非三星结算时将停止自动战斗队列。 - 请确保列表中的关卡在同一区域（只通过左右滑动地图界面就可以导航到）。 - **请务必为优质作业点赞，以提高作业评分并激励作业制作者。** - ![image](/image/zh-cn/copilot-click-like.png) + ![image](/images/zh-cn/copilot-click-like.png) ## 写作业 diff --git a/docs/zh-cn/manual/introduction/startup.md b/docs/zh-cn/manual/introduction/startup.md index 797a52de83..26f69329c9 100644 --- a/docs/zh-cn/manual/introduction/startup.md +++ b/docs/zh-cn/manual/introduction/startup.md @@ -10,6 +10,8 @@ order: 1 ## 账号切换 +本功能需和切换配置或定时执行一起使用，会在每次执行 `开始唤醒` 任务时都进行一次账号切换操作。 + 仅支持切换至已登录的账号，使用登录名进行查找，请保证输入内容在所有已登录账号唯一。 - 例子： diff --git a/docs/zh-cn/manual/newbie.md b/docs/zh-cn/manual/newbie.md index 0178e82661..5d0c078d11 100644 --- a/docs/zh-cn/manual/newbie.md +++ b/docs/zh-cn/manual/newbie.md @@ -17,11 +17,7 @@ icon: ri:guide-fill 2. 安装运行库 - MAA 需要 VCRedist x64 和 .NET 8，请右键开始按钮打开终端，在终端内粘贴以下命令回车以进行安装。 - - ```sh - winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 - ``` + MAA 需要 VCRedist x64 和 .NET 8，请运行 MAA 目录下的 `DependencySetup_依赖库安装.bat` 以安装。 更多信息请参考[常见问题](./faq.md)置顶。 diff --git a/docs/zh-cn/readme.md b/docs/zh-cn/readme.md index d32efdeb8d..901d5fa819 100644 --- a/docs/zh-cn/readme.md +++ b/docs/zh-cn/readme.md @@ -9,7 +9,7 @@ dir: ::: center -![MAA Logo](/image/maa-logo_512x512.png =256x256) +![MAA Logo](/images/maa-logo_512x512.png =256x256) @@ -53,20 +53,20 @@ MAA 的意思是 MAA Assistant Arknights { "imageList": [ { - "light": "image/zh-cn/readme/1-light.png", - "dark": "image/zh-cn/readme/1-dark.png" + "light": "images/zh-cn/readme/1-light.png", + "dark": "images/zh-cn/readme/1-dark.png" }, { - "light": "image/zh-cn/readme/2-light.png", - "dark": "image/zh-cn/readme/2-dark.png" + "light": "images/zh-cn/readme/2-light.png", + "dark": "images/zh-cn/readme/2-dark.png" }, { - "light": "image/zh-cn/readme/3-light.png", - "dark": "image/zh-cn/readme/3-dark.png" + "light": "images/zh-cn/readme/3-light.png", + "dark": "images/zh-cn/readme/3-dark.png" }, { - "light": "image/zh-cn/readme/4-light.png", - "dark": "image/zh-cn/readme/4-dark.png" + "light": "images/zh-cn/readme/4-light.png", + "dark": "images/zh-cn/readme/4-dark.png" } ] } diff --git a/docs/zh-tw/develop/development.md b/docs/zh-tw/develop/development.md index 2e7050bd35..59bbfc3fbc 100644 --- a/docs/zh-tw/develop/development.md +++ b/docs/zh-tw/develop/development.md @@ -104,7 +104,7 @@ icon: iconoir:developer 3. 在 Visual Studio 的 工具-選項 中搜索 clang-format。 4. 點擊 `啟用 ClangFormat 支援`，然後選擇下面的 `使用自定義 clang-format.exe 檔案`，選擇第 2 步得到的 `clang-format.exe` -![Visual Studio 設定 clang-format](/image/zh-cn/development-enable-vs-clang-format.png) +![Visual Studio 設定 clang-format](/images/zh-cn/development-enable-vs-clang-format.png) 然後你的 Visual Studio 就能愉快的使用支援 c++20 語法的 clang-format 啦！ diff --git a/docs/zh-tw/develop/documentation-guidelines.md b/docs/zh-tw/develop/documentation-guidelines.md index bc245f70b9..56be40d174 100644 --- a/docs/zh-tw/develop/documentation-guidelines.md +++ b/docs/zh-tw/develop/documentation-guidelines.md @@ -107,9 +107,9 @@ icon: jam:write-f ``` - + ```markdown - + ``` ::: diff --git a/docs/zh-tw/develop/pr-tutorial.md b/docs/zh-tw/develop/pr-tutorial.md index 7db0bbaf16..d626fc3f98 100644 --- a/docs/zh-tw/develop/pr-tutorial.md +++ b/docs/zh-tw/develop/pr-tutorial.md @@ -25,8 +25,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/repository-light.png", - "dark": "image/zh-cn/pr-tutorial/repository-dark.png" + "light": "images/zh-cn/pr-tutorial/repository-light.png", + "dark": "images/zh-cn/pr-tutorial/repository-dark.png" } ] } @@ -45,8 +45,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -65,8 +65,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pull-request-light.png", - "dark": "image/zh-cn/pr-tutorial/pull-request-dark.png" + "light": "images/zh-cn/pr-tutorial/pull-request-light.png", + "dark": "images/zh-cn/pr-tutorial/pull-request-dark.png" } ] } @@ -87,8 +87,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/fork-light.png", - "dark": "image/zh-cn/pr-tutorial/fork-dark.png" + "light": "images/zh-cn/pr-tutorial/fork-light.png", + "dark": "images/zh-cn/pr-tutorial/fork-dark.png" } ] } @@ -100,8 +100,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-2-dark.png" } ] } @@ -113,8 +113,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-3-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-3-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-3-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-3-dark.png" } ] } @@ -126,8 +126,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-4-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-4-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-4-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-4-dark.png" } ] } @@ -139,8 +139,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-5-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-5-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-5-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-5-dark.png" } ] } @@ -153,8 +153,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-1-dark.png" } ] } @@ -164,8 +164,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-7-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-7-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-7-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-7-2-dark.png" } ] } @@ -179,8 +179,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-9-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-9-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-9-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-9-dark.png" } ] } @@ -193,8 +193,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-1-dark.png" } ] } @@ -206,8 +206,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-10-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-10-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-10-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-10-2-dark.png" } ] } @@ -220,8 +220,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-11-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-11-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-11-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-11-dark.png" } ] } @@ -235,8 +235,8 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-12-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-12-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-12-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-12-dark.png" } ] } @@ -262,12 +262,12 @@ icon: mingcute:git-pull-request-fill { "imageList": [ { - "light": "image/zh-cn/pr-tutorial/pr-14-1-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-1-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-1-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-1-dark.png" }, { - "light": "image/zh-cn/pr-tutorial/pr-14-2-light.png", - "dark": "image/zh-cn/pr-tutorial/pr-14-2-dark.png" + "light": "images/zh-cn/pr-tutorial/pr-14-2-light.png", + "dark": "images/zh-cn/pr-tutorial/pr-14-2-dark.png" } ] } diff --git a/docs/zh-tw/manual/cli/config.md b/docs/zh-tw/manual/cli/config.md index 75d76db078..b4906a31e1 100644 --- a/docs/zh-tw/manual/cli/config.md +++ b/docs/zh-tw/manual/cli/config.md @@ -465,9 +465,9 @@ passphrase = "password" # ssh 密钥的密码 [task-types]: ../../protocol/integration.md#任务类型一览 [emulator-ports]: ../../manual/connection.md#获取端口号 [playcover-doc]: ../../manual/device/macos.md#✅-playcover-原生运行最流畅-🚀 -[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/config_examples +[example-config]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/config_examples [wangl-cc-dotfiles]: https://github.com/wangl-cc/dotfiles/tree/master/.config/maa -[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/ -[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/task.schema.json -[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/asst.schema.json -[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/maa-cli/schemas/cli.schema.json +[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/ +[task-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/task.schema.json +[asst-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/asst.schema.json +[cli-schema]: https://github.com/MaaAssistantArknights/maa-cli/blob/main/crates/maa-cli/schemas/cli.schema.json diff --git a/docs/zh-tw/manual/faq.md b/docs/zh-tw/manual/faq.md index 63f158818f..4456924a08 100644 --- a/docs/zh-tw/manual/faq.md +++ b/docs/zh-tw/manual/faq.md @@ -9,16 +9,17 @@ icon: ph:question-fill ::: warning -如果你是從 MAA 的報錯窗口來到這的，那八成是由於未更新運行庫而造成的問題。 +若 MAA 在某次更新後無法運行，或者純粹是從 MAA 的報錯窗口來到這裡，那大概率是由於運行庫未更新導致的問題。 出現次數最多的問題都是運行庫問題，而總是有人看不到文檔到處問，所以我們把置頂換成了這個。很氣。 -若 MAA 在某次更新後無法運行，有很大可能是因為運行庫版本而導致的問題，需更新以下兩個運行庫。 -請在終端中運行以下命令，或手動下載**兩個**運行庫並安裝。 +請運行 MAA 目錄下的 `DependencySetup_依赖库安装.bat`，或者在終端中運行以下命令， ```sh -winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 +winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements && winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --force --uninstall-previous --accept-package-agreements ``` +或者手動下載並安裝以下**兩個**運行庫來解決問題。 + - [Visual C++ 可再發行程序包](https://aka.ms/vs/17/release/vc_redist.x64.exe) - [.NET 桌面運行時 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0#:~:text=Binaries-,Windows,-x64) diff --git a/docs/zh-tw/manual/introduction/combat.md b/docs/zh-tw/manual/introduction/combat.md index f4cd0c55d2..61e04099a3 100644 --- a/docs/zh-tw/manual/introduction/combat.md +++ b/docs/zh-tw/manual/introduction/combat.md @@ -53,7 +53,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need - 复刻的 SS 活动。输入 `SSReopen-<关卡前缀>` ，可一次性刷完 XX-1 ~ XX-9 关，如 `SSReopen-IC`。 ::: details 範例畫面 -![範例畫面](/image/zh-cn/combat-start-interface-example.png) +![範例畫面](/images/zh-cn/combat-start-interface-example.png) ::: ### 剿灭模式 diff --git a/docs/zh-tw/manual/introduction/copilot.md b/docs/zh-tw/manual/introduction/copilot.md index 7c6d905504..133df3dd87 100644 --- a/docs/zh-tw/manual/introduction/copilot.md +++ b/docs/zh-tw/manual/introduction/copilot.md @@ -29,7 +29,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need - 开启本功能后改为在**关卡所在的地图界面**开始自动战斗。在理智不足/战斗失败/非三星结算时将停止自动战斗队列。 - 请确保列表中的关卡在同一区域（只通过左右滑动地图界面就可以导航到）。 - **请务必为优质作业点赞，以提高作业评分并激励作业制作者。** - ![image](/image/zh-cn/copilot-click-like.png) + ![image](/images/zh-cn/copilot-click-like.png) ## 写作业 diff --git a/docs/zh-tw/manual/introduction/introduction_old.md b/docs/zh-tw/manual/introduction/introduction_old.md index 54b57134e6..19a97f6105 100644 --- a/docs/zh-tw/manual/introduction/introduction_old.md +++ b/docs/zh-tw/manual/introduction/introduction_old.md @@ -22,7 +22,7 @@ icon: ic:baseline-article ::: details 範例畫面 -![範例畫面](/image/zh-cn/combat-start-interface-example.png) +![範例畫面](/images/zh-cn/combat-start-interface-example.png) ::: - 主介面上的 `吃理智+吃石頭`、`指定次數`、`指定材料` 三者為 **短路開關（或門）**，即 **三者中的任一條件** 達到，均會視為任務完成，停止刷理智。 @@ -114,7 +114,7 @@ icon: ic:baseline-article - 若需要選擇助戰等，關閉 `自動編隊` 功能並手動編隊後再執行即可。 - 記得在作業分享站上給好用的作業點讚哦！ -![image](/image/zh-cn/copilot-click-like.png) +![image](/images/zh-cn/copilot-click-like.png) #### 寫作業 diff --git a/docs/zh-tw/manual/introduction/startup.md b/docs/zh-tw/manual/introduction/startup.md index 23911c7b24..0cd20fb398 100644 --- a/docs/zh-tw/manual/introduction/startup.md +++ b/docs/zh-tw/manual/introduction/startup.md @@ -14,6 +14,8 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need ## 账号切换 +本功能需與切換配置或定時執行一起使用，會在每次執行 `開始喚醒` 任務時都進行一次賬號切換操作。 + 仅支持切换至已登录的账号，使用登录名进行查找，请保证输入内容在所有已登录账号唯一。 - 例子： diff --git a/docs/zh-tw/manual/newbie.md b/docs/zh-tw/manual/newbie.md index 04305fdacc..51b12dca8a 100644 --- a/docs/zh-tw/manual/newbie.md +++ b/docs/zh-tw/manual/newbie.md @@ -17,11 +17,7 @@ icon: ri:guide-fill 2. 安裝運行庫 - MAA 需要 VCRedist x64 和 .NET 8，請右鍵開始按鈕打開終端，在終端內粘貼以下命令回車以進行安裝。 - - ```sh - winget install Microsoft.VCRedist.2015+.x64 Microsoft.DotNet.DesktopRuntime.8 - ``` + MAA 需要 VCRedist x64 和 .NET 8，請運行 MAA 目錄下的 `DependencySetup_依赖库安装.bat` 來安裝。 更多信息參考[常見問題](faq.md#可能性-2--執行庫問題)。 diff --git a/docs/zh-tw/readme.md b/docs/zh-tw/readme.md index 80575da0a6..ab342e54b9 100644 --- a/docs/zh-tw/readme.md +++ b/docs/zh-tw/readme.md @@ -9,7 +9,7 @@ dir: ::: center -![MAA Logo](/image/maa-logo_512x512.png =256x256) +![MAA Logo](/images/maa-logo_512x512.png =256x256) @@ -54,20 +54,20 @@ MAA 的意思是 MAA Assistant Arknights { "imageList": [ { - "light": "image/zh-cn/readme/1-light.png", - "dark": "image/zh-cn/readme/1-dark.png" + "light": "images/zh-cn/readme/1-light.png", + "dark": "images/zh-cn/readme/1-dark.png" }, { - "light": "image/zh-cn/readme/2-light.png", - "dark": "image/zh-cn/readme/2-dark.png" + "light": "images/zh-cn/readme/2-light.png", + "dark": "images/zh-cn/readme/2-dark.png" }, { - "light": "image/zh-cn/readme/3-light.png", - "dark": "image/zh-cn/readme/3-dark.png" + "light": "images/zh-cn/readme/3-light.png", + "dark": "images/zh-cn/readme/3-dark.png" }, { - "light": "image/zh-cn/readme/4-light.png", - "dark": "image/zh-cn/readme/4-dark.png" + "light": "images/zh-cn/readme/4-light.png", + "dark": "images/zh-cn/readme/4-dark.png" } ] } diff --git a/tools/OptimizeTemplates/optimize_templates.py b/tools/OptimizeTemplates/optimize_templates.py index b837cd9709..e46905f3ec 100644 --- a/tools/OptimizeTemplates/optimize_templates.py +++ b/tools/OptimizeTemplates/optimize_templates.py @@ -47,7 +47,7 @@ def get_file_id(file_path: str): m = re.search(r"resource/(.*)\.png", file_id) if m: return f"resource/{m.group(1)}" # docs\\.vuepress\\public\\image\\PATH\\TO\\xxx.png -> docs/PATH/TO/xxx - m = re.search(r"docs/.vuepress/public/image/(.*)\.png", file_id) + m = re.search(r"docs/.vuepress/public/images/(.*)\.png", file_id) if m: return f"docs/{m.group(1)}" # website\\apps\\web\\PATH\\TO\\xxx.png -> web/PATH/TO/xxx m = re.search(r"website/apps/web/(.*)\.png", file_id)