Compare commits
331 Commits
feat/githu
...
feat/pocke
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1335b86b4d | ||
|
|
43cecbbedd | ||
|
|
1d63f39c1f | ||
|
|
848c5331cf | ||
|
|
29a2448421 | ||
|
|
3a4fbd0193 | ||
|
|
73361fdc5b | ||
|
|
bc3ad67a02 | ||
|
|
0f7a8c5246 | ||
|
|
893c37e5d0 | ||
|
|
f30b1899cc | ||
|
|
fef326b367 | ||
|
|
91a33a9f5b | ||
|
|
7fd1c8941c | ||
|
|
951f7835a7 | ||
|
|
b310735a34 | ||
|
|
473ddc24e6 | ||
|
|
bd98173e01 | ||
|
|
7cca2b2357 | ||
|
|
02a397c749 | ||
|
|
c69e212be9 | ||
|
|
598c1fa541 | ||
|
|
34540de430 | ||
|
|
5cf99f870a | ||
|
|
fa9159fde7 | ||
|
|
ff9ba449dd | ||
|
|
c3e11e75a0 | ||
|
|
de10aeb983 | ||
|
|
2e7aa2d1f0 | ||
|
|
99d16f91bc | ||
|
|
4fed9fd491 | ||
|
|
94c9ea2cfb | ||
|
|
f212344585 | ||
|
|
dae1c9b541 | ||
|
|
928224f73b | ||
|
|
6eb02d9045 | ||
|
|
9ffdb6fc42 | ||
|
|
acc6520f28 | ||
|
|
9f6a642349 | ||
|
|
87dee5c8ad | ||
|
|
3b863c176e | ||
|
|
dec6961d9c | ||
|
|
978dde365a | ||
|
|
be8d124211 | ||
|
|
e48fe00d6c | ||
|
|
cdf5847bc9 | ||
|
|
88aac0099a | ||
|
|
9bfdec238c | ||
|
|
e299977244 | ||
|
|
a6f991a6e5 | ||
|
|
755d928123 | ||
|
|
50cb0ed9f7 | ||
|
|
9b58ede500 | ||
|
|
d4fc9e2531 | ||
|
|
42b272398a | ||
|
|
b0076809aa | ||
|
|
20ddfedfb7 | ||
|
|
c89b63b78e | ||
|
|
09830dde00 | ||
|
|
18cd3a9495 | ||
|
|
d3a4696e2a | ||
|
|
21429db907 | ||
|
|
e158b73337 | ||
|
|
51153ce76d | ||
|
|
e9fdeaf476 | ||
|
|
478c493589 | ||
|
|
2712b9cf48 | ||
|
|
68039317be | ||
|
|
e8d4a64e14 | ||
|
|
713dd2b5a2 | ||
|
|
ddee6b8aea | ||
|
|
d4163b10b3 | ||
|
|
b6c3dd98a5 | ||
|
|
0b2140a7ad | ||
|
|
a8657429be | ||
|
|
371a54c2f2 | ||
|
|
5b6e54de14 | ||
|
|
f704533086 | ||
|
|
e2de008ef6 | ||
|
|
ace0dbcad7 | ||
|
|
254d8a21a8 | ||
|
|
2d08f5f87f | ||
|
|
13aa6286d1 | ||
|
|
55bca1b173 | ||
|
|
26a1ee9eec | ||
|
|
7b0b0f6d5b | ||
|
|
6df0ee07f2 | ||
|
|
69dde6100c | ||
|
|
a2f82fa1b4 | ||
|
|
bad3639340 | ||
|
|
5526f29113 | ||
|
|
5aaaae758f | ||
|
|
1d057ac63d | ||
|
|
75410a1913 | ||
|
|
5e9501ba8e | ||
|
|
272fd395e0 | ||
|
|
ea5f5e6b3a | ||
|
|
d5aa510fc6 | ||
|
|
01a864650a | ||
|
|
774b12dc96 | ||
|
|
53804bbbbe | ||
|
|
91500aca09 | ||
|
|
a4444dc7e0 | ||
|
|
6ec07666d8 | ||
|
|
ab8a1f1782 | ||
|
|
4c428607fb | ||
|
|
b8a51ba171 | ||
|
|
3909a037fd | ||
|
|
063fc498bd | ||
|
|
5e9655b543 | ||
|
|
cb4d9c43e3 | ||
|
|
9342969191 | ||
|
|
7ee9415863 | ||
|
|
8d75c42adc | ||
|
|
3373651ed1 | ||
|
|
f1cf3d0710 | ||
|
|
1c116be819 | ||
|
|
5e378259ce | ||
|
|
a8a43c5789 | ||
|
|
f95a2dd39e | ||
|
|
b3c2b871ea | ||
|
|
5aaa208dee | ||
|
|
6bf79144ac | ||
|
|
1573af9f54 | ||
|
|
43e5e9b6bd | ||
|
|
5ca253b51d | ||
|
|
85f1a719a3 | ||
|
|
423a37bfbb | ||
|
|
5b1d8b2805 | ||
|
|
fc74d96efc | ||
|
|
b6e347d15b | ||
|
|
c6ad3c756a | ||
|
|
9d82cb8fb5 | ||
|
|
50ddefa763 | ||
|
|
47a6424c26 | ||
|
|
b842261f20 | ||
|
|
1b4092188d | ||
|
|
77c0a1d837 | ||
|
|
b28497f1a4 | ||
|
|
cc0a959013 | ||
|
|
396ba7043a | ||
|
|
71d85cf6d0 | ||
|
|
37bef043a3 | ||
|
|
4551b82364 | ||
|
|
a57d8cf46d | ||
|
|
140aec0cbe | ||
|
|
184aeed007 | ||
|
|
485f1f7e0a | ||
|
|
e467f9007e | ||
|
|
31d66f722c | ||
|
|
0bcfc2eadc | ||
|
|
334a2e5f70 | ||
|
|
f79da224ae | ||
|
|
21e3728b99 | ||
|
|
478df7d5c0 | ||
|
|
206829dfa6 | ||
|
|
0a38d42985 | ||
|
|
863478d0e0 | ||
|
|
d5f186a897 | ||
|
|
041f00e07d | ||
|
|
2ebaa0a978 | ||
|
|
e5c6bc5191 | ||
|
|
8ae3d9a952 | ||
|
|
0ed11717a7 | ||
|
|
9c41379645 | ||
|
|
ae53e6ac63 | ||
|
|
ac432c841c | ||
|
|
9e1165243c | ||
|
|
2bfbc1b8c2 | ||
|
|
be853ba12d | ||
|
|
2cbc61b085 | ||
|
|
984f09872a | ||
|
|
45624a50a5 | ||
|
|
0e172089a5 | ||
|
|
ee910d176d | ||
|
|
fd6f70f5e0 | ||
|
|
bbee68d4f8 | ||
|
|
879d136fe7 | ||
|
|
184d26cad2 | ||
|
|
a1bd49951d | ||
|
|
6eec5cbaf2 | ||
|
|
01ca06d6e6 | ||
|
|
ddbac35c1b | ||
|
|
b1dd6114fc | ||
|
|
0e1cf6d040 | ||
|
|
f9543a890e | ||
|
|
e2f661edd7 | ||
|
|
d6a179ea43 | ||
|
|
ad3439be7a | ||
|
|
72796f2799 | ||
|
|
46b28d5df3 | ||
|
|
1736c93b09 | ||
|
|
b219e74d2b | ||
|
|
0b480c3f28 | ||
|
|
8a450576bc | ||
|
|
e977734c7b | ||
|
|
d85f3c38f6 | ||
|
|
fd0037ba62 | ||
|
|
7983519488 | ||
|
|
0f0b7c9517 | ||
|
|
f440353dc4 | ||
|
|
f5e8c68a60 | ||
|
|
8a5d5b7a7b | ||
|
|
a684711df1 | ||
|
|
5f3730b767 | ||
|
|
a330053500 | ||
|
|
189ee960f9 | ||
|
|
674b4e25d0 | ||
|
|
7a758bce84 | ||
|
|
f0bdccdf0d | ||
|
|
8b4b1e9b43 | ||
|
|
546bfc399c | ||
|
|
2984b35da2 | ||
|
|
dbf47ce5ae | ||
|
|
b60eea2def | ||
|
|
74350ef1e0 | ||
|
|
6b0631aa46 | ||
|
|
3932290c2e | ||
|
|
a03d45e651 | ||
|
|
b1092542d4 | ||
|
|
179a59651d | ||
|
|
ef347db33b | ||
|
|
20a17b2704 | ||
|
|
df2f2a6783 | ||
|
|
e3d63894b2 | ||
|
|
6aecdf86ff | ||
|
|
797bf26c40 | ||
|
|
d04410d1f6 | ||
|
|
4ab5c5416b | ||
|
|
01d4a4b27b | ||
|
|
4e58606a79 | ||
|
|
9efc6efcdf | ||
|
|
e657f1beb3 | ||
|
|
d84da5d01a | ||
|
|
686a929d1b | ||
|
|
7ab2274d5e | ||
|
|
273fd28389 | ||
|
|
81b95a0979 | ||
|
|
994e78e787 | ||
|
|
f48c1b9d21 | ||
|
|
9581f7cc94 | ||
|
|
ccd65ad9fa | ||
|
|
01d7896831 | ||
|
|
9860e6163e | ||
|
|
d4d8b2d6be | ||
|
|
a7b6144435 | ||
|
|
da5953ee91 | ||
|
|
e7a081c1a5 | ||
|
|
d685ce0e89 | ||
|
|
115eaff478 | ||
|
|
5efef16a2e | ||
|
|
2ed2376763 | ||
|
|
ee147b0083 | ||
|
|
697ce6e33e | ||
|
|
dc5f1506f4 | ||
|
|
8b41e0518d | ||
|
|
39997e0b1c | ||
|
|
860c4ee3d9 | ||
|
|
31c54233c7 | ||
|
|
0ea0f751fc | ||
|
|
6c26417a28 | ||
|
|
1bc0a0df0c | ||
|
|
415766bfe5 | ||
|
|
ae493cff4e | ||
|
|
65bdd25c0d | ||
|
|
0fd393b9ed | ||
|
|
6c631b1015 | ||
|
|
2e724180a9 | ||
|
|
806a97d5ae | ||
|
|
10f2528453 | ||
|
|
21b4d5f226 | ||
|
|
672e121e4a | ||
|
|
1b022b8afb | ||
|
|
157a586524 | ||
|
|
02f326c053 | ||
|
|
e579462aa6 | ||
|
|
9c671bded9 | ||
|
|
f507bae326 | ||
|
|
cc4bffa716 | ||
|
|
70e9031ac9 | ||
|
|
1559f08173 | ||
|
|
7dad3879ad | ||
|
|
7fd2a8783b | ||
|
|
f45ccaeeb5 | ||
|
|
4c67e80f91 | ||
|
|
fe0eca5a00 | ||
|
|
8e21efdcf5 | ||
|
|
4244e2ef88 | ||
|
|
10598b3e74 | ||
|
|
f2f158ba67 | ||
|
|
ba8a2182db | ||
|
|
0347e82a47 | ||
|
|
29e0c36c2d | ||
|
|
fd7062773a | ||
|
|
66dbfb6990 | ||
|
|
a8a2299880 | ||
|
|
03c3991a1f | ||
|
|
462440d784 | ||
|
|
6d6cb1c1d6 | ||
|
|
6691f7c52c | ||
|
|
47545a831c | ||
|
|
5d56ff9cd2 | ||
|
|
f6b20861c5 | ||
|
|
62ffdc73cb | ||
|
|
75733e82ec | ||
|
|
62cee63841 | ||
|
|
ff8aeceada | ||
|
|
e5666653ff | ||
|
|
3c7d7ae100 | ||
|
|
9af863655d | ||
|
|
af0840aa45 | ||
|
|
09043136b6 | ||
|
|
fd18e5704f | ||
|
|
5b50a9864f | ||
|
|
dba73b39a6 | ||
|
|
c2196759d2 | ||
|
|
db1c86f20d | ||
|
|
42db60eb88 | ||
|
|
911c6836ce | ||
|
|
0d2186ab3b | ||
|
|
8570023f94 | ||
|
|
569800bf9c | ||
|
|
f528f5c233 | ||
|
|
5aa16e1c71 | ||
|
|
2428a4610c | ||
|
|
5d8c0213a5 | ||
|
|
f76461ac31 | ||
|
|
a26909a019 | ||
|
|
906760e680 | ||
|
|
5a4cffa02d | ||
|
|
a6b2c03af3 |
@@ -1,12 +1,9 @@
|
||||
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
|
||||
# for clang-format 17.0.1
|
||||
Language: Json
|
||||
IndentWidth: 4
|
||||
---
|
||||
Language: Cpp
|
||||
BasedOnStyle: 'WebKit'
|
||||
BasedOnStyle: "WebKit"
|
||||
# AccessModifierOffset: 2
|
||||
AlignAfterOpenBracket: 'AlwaysBreak'
|
||||
AlignAfterOpenBracket: "AlwaysBreak"
|
||||
AlignArrayOfStructures: None
|
||||
AlignConsecutiveAssignments: None
|
||||
AlignConsecutiveBitFields: None
|
||||
@@ -63,15 +60,15 @@ BraceWrapping:
|
||||
BreakAfterAttributes: Never
|
||||
BreakAfterJavaFieldAnnotations: true
|
||||
BreakArrays: true
|
||||
BreakBeforeBinaryOperators: NonAssignment
|
||||
BreakBeforeBinaryOperators: None
|
||||
BreakBeforeBraces: Custom
|
||||
BreakBeforeConceptDeclarations: Always
|
||||
BreakBeforeInlineASMColon: OnlyMultiline
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
BreakInheritanceList: BeforeComma
|
||||
BreakConstructorInitializers: AfterColon
|
||||
BreakInheritanceList: AfterColon
|
||||
BreakStringLiterals: true
|
||||
ColumnLimit: 100
|
||||
ColumnLimit: 120
|
||||
# CommentPragmas: '^ MEO pragma:'
|
||||
CompactNamespaces: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
@@ -87,12 +84,12 @@ FixNamespaceComments: true
|
||||
# - foreach
|
||||
# - Q_FOREACH
|
||||
# - BOOST_FOREACH
|
||||
# IfMacros:
|
||||
# IfMacros:
|
||||
# - 'KJ_IF_MAYBE'
|
||||
IncludeBlocks: Preserve
|
||||
# IncludeCategories:
|
||||
# IncludeIsMainRegex:
|
||||
# IncludeIsMainSourceRegex:
|
||||
# IncludeIsMainRegex:
|
||||
# IncludeIsMainSourceRegex:
|
||||
IndentAccessModifiers: false
|
||||
IndentCaseBlocks: false
|
||||
IndentCaseLabels: false
|
||||
@@ -130,7 +127,7 @@ NamespaceIndentation: None
|
||||
# ObjCSpaceAfterProperty:
|
||||
# ObjCSpaceBeforeProtocolList:
|
||||
PackConstructorInitializers: Never
|
||||
# PenaltyBreakAssignment:
|
||||
# PenaltyBreakAssignment:
|
||||
# PenaltyBreakBeforeFirstCallParameter:
|
||||
# PenaltyBreakComment:
|
||||
# PenaltyBreakFirstLessLess:
|
||||
@@ -183,7 +180,7 @@ SpacesInLineCommentPrefix:
|
||||
SpacesInParens: Never
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: c++20
|
||||
# StatementAttributeLikeMacros:
|
||||
# StatementAttributeLikeMacros:
|
||||
# StatementMacros:
|
||||
TabWidth: 4
|
||||
# TypeNames:
|
||||
|
||||
@@ -7,10 +7,7 @@
|
||||
"postCreateCommand": "sudo sh -ce 'apt update && apt install g++-12 -y && echo export CC=gcc-12 CXX=g++-12 >> /etc/profile.d/set-compiler.sh'",
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
"llvm-vs-code-extensions.vscode-clangd",
|
||||
"DavidAnson.vscode-markdownlint"
|
||||
]
|
||||
"extensions": ["llvm-vs-code-extensions.vscode-clangd", "DavidAnson.vscode-markdownlint"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
1
.gitattributes
vendored
@@ -8,4 +8,5 @@
|
||||
|
||||
*.json text eol=lf
|
||||
*.md text eol=lf
|
||||
*.yml text eol=lf
|
||||
*.yaml text eol=lf
|
||||
|
||||
18
.github/ISSUE_TEMPLATE/cn-bug-report.yaml
vendored
@@ -1,20 +1,20 @@
|
||||
name: Bug 反馈(使用中文)
|
||||
description: 识别错误、操作异常、连接错误等
|
||||
labels: ['bug']
|
||||
labels: ["bug"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已查看最新测试版本的更新内容,并未提及该 Bug 已被修复的情况
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(pinned issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已查看最新测试版本的更新内容,并未提及该 Bug 已被修复的情况
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(pinned issue),确认我的问题未被提及
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
|
||||
10
.github/ISSUE_TEMPLATE/cn-feature-request.yaml
vendored
@@ -1,16 +1,16 @@
|
||||
name: 需求建议(使用中文)
|
||||
description: 新功能、建议等
|
||||
labels: ['enhancement']
|
||||
labels: ["enhancement"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我基本确定这是一个新功能/建议,而不是遇到了 Bug(不确定的话请附上日志)
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我基本确定这是一个新功能/建议,而不是遇到了 Bug(不确定的话请附上日志)
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
|
||||
35
.github/ISSUE_TEMPLATE/cn-mumu-report.yaml
vendored
@@ -1,26 +1,24 @@
|
||||
name: MuMu 截图增强反馈(使用中文)
|
||||
description: 有关 MuMu 截图增强功能的集中反馈
|
||||
labels: ['mumu api']
|
||||
labels: ["mumu api"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我正在使用最新的 MAA 内测版本和最新的**官版** MuMu 模拟器
|
||||
required: true
|
||||
- label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确,并确认在关闭截图增强模式后问题消失
|
||||
required: true
|
||||
- label: 我未开启高帧率模式,且显存使用策略为“画面表现更好”
|
||||
required: false
|
||||
- label: 我正在使用后台保活功能,并确定该问题仅在开启后台保活时出现
|
||||
required: false
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我正在使用最新的 MAA 内测版本和最新的**官版** MuMu 模拟器
|
||||
required: true
|
||||
- label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确,并确认在关闭截图增强模式后问题消失
|
||||
required: true
|
||||
- label: 我关闭了后台保活和高帧率模式,且显存使用策略为“画面表现更好”
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -32,13 +30,14 @@ body:
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: >-
|
||||
请提供 MAA 版本和 MuMu 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。MuMu 版本可在右上角菜单按钮 -> 关于 MuMu 中找到。
|
||||
description: |
|
||||
请提供 MAA 版本和 MuMu 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
|
||||
MuMu 版本可在右上角菜单按钮 -> 关于 MuMu 中找到。
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
UI Version:
|
||||
Core Version:
|
||||
MuMu 版本号:
|
||||
MuMu 版本号:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/cn-others.yaml
vendored
@@ -1,6 +1,6 @@
|
||||
name: 其他议题(使用中文)
|
||||
description: 提出问题,而不是 Bug 反馈或需求建议
|
||||
labels: ['question']
|
||||
labels: ["question"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
40
.github/ISSUE_TEMPLATE/en-bug-report.yaml
vendored
@@ -2,32 +2,32 @@ name: Bug Report (in English)
|
||||
description: >-
|
||||
Recognition errors, operation abnormalities,
|
||||
connection errors, etc.
|
||||
labels: ['bug']
|
||||
labels: ["bug"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Before raising the issue...
|
||||
options:
|
||||
- label: >-
|
||||
I understand that Issues are for feedback and problem solving,
|
||||
not trolling the comments section, and will provide as
|
||||
much information as possible to help solve the problem.
|
||||
required: true
|
||||
- label: >-
|
||||
I filled in a short, clear title
|
||||
so that developers could quickly identify the general problem
|
||||
when going through the issue list.
|
||||
Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: >-
|
||||
I have checked the latest beta update and there is no mention
|
||||
of the bug being fixed.
|
||||
required: true
|
||||
- label: >-
|
||||
I have reviewed the pinned issues and confirmed that my issue
|
||||
is not mentioned.
|
||||
required: true
|
||||
- label: >-
|
||||
I understand that Issues are for feedback and problem solving,
|
||||
not trolling the comments section, and will provide as
|
||||
much information as possible to help solve the problem.
|
||||
required: true
|
||||
- label: >-
|
||||
I filled in a short, clear title
|
||||
so that developers could quickly identify the general problem
|
||||
when going through the issue list.
|
||||
Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: >-
|
||||
I have checked the latest beta update and there is no mention
|
||||
of the bug being fixed.
|
||||
required: true
|
||||
- label: >-
|
||||
I have reviewed the pinned issues and confirmed that my issue
|
||||
is not mentioned.
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
|
||||
10
.github/ISSUE_TEMPLATE/en-feature-request.yaml
vendored
@@ -1,16 +1,16 @@
|
||||
name: Feature Request (in English)
|
||||
description: New features, suggestions, etc.
|
||||
labels: ['enhancement']
|
||||
labels: ["enhancement"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Before raising the issue...
|
||||
options:
|
||||
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)
|
||||
required: true
|
||||
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/en-others.yaml
vendored
@@ -1,6 +1,6 @@
|
||||
name: Others (in English)
|
||||
description: Ask a question rather than a bug report or feature request.
|
||||
labels: ['question']
|
||||
labels: ["question"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
15
.github/dependabot.yaml
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: github-actions
|
||||
directory: /.github/workflows
|
||||
schedule:
|
||||
interval: weekly
|
||||
commit-message:
|
||||
prefix: ci
|
||||
assignees:
|
||||
- constrat
|
||||
- AnnAngela
|
||||
groups:
|
||||
github-actions:
|
||||
patterns:
|
||||
- "*"
|
||||
1025
.github/issue-checker.yml
vendored
1
.github/release_reviewers.yaml
vendored
@@ -11,7 +11,6 @@ reviewers:
|
||||
# A list of assignees to be added to pull requests (GitHub user name)
|
||||
assignees:
|
||||
- AnnAngela
|
||||
|
||||
# A list of keywords to be skipped the process that add reviewers if pull requests include it
|
||||
# skipKeywords:
|
||||
# - wip
|
||||
|
||||
2
.github/workflows/ci.yml
vendored
@@ -457,7 +457,7 @@ jobs:
|
||||
find . -type f | while read f; do mv -fvt . $f; done
|
||||
|
||||
- name: Release to Github
|
||||
uses: softprops/action-gh-release@v1
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
body_path: CHANGELOG.md
|
||||
files: |
|
||||
|
||||
6
.github/workflows/gen-changelog.yml
vendored
@@ -2,7 +2,7 @@ name: gen-changelog
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
types:
|
||||
- opened
|
||||
- reopened
|
||||
- ready_for_review
|
||||
@@ -79,7 +79,7 @@ jobs:
|
||||
git commit -m "$commit_msg"
|
||||
|
||||
- name: Create PR
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
uses: peter-evans/create-pull-request@v6
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
title: ${{ steps.extract_tag.outputs.pr_title }}
|
||||
@@ -93,6 +93,6 @@ jobs:
|
||||
AnnAngela
|
||||
|
||||
- name: Add reviewers to release PR
|
||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
||||
uses: kentaro-m/auto-assign-action@v2.0.0
|
||||
with:
|
||||
configuration-path: ".github/release_reviewers.yaml"
|
||||
|
||||
75
.github/workflows/markdown-checker.yml
vendored
@@ -1,49 +1,68 @@
|
||||
name: Lint Markdown files
|
||||
name: Check Markdown files
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- dev
|
||||
paths:
|
||||
- "**/*.md"
|
||||
- ".github/workflows/lint-markdown.yml"
|
||||
- "docs/**"
|
||||
- ".github/workflows/markdown-checker.yml"
|
||||
pull_request:
|
||||
branches:
|
||||
- dev
|
||||
paths:
|
||||
- "**/*.md"
|
||||
- ".github/workflows/lint-markdown.yml"
|
||||
- "docs/**"
|
||||
- ".github/workflows/markdown-checker.yml"
|
||||
schedule:
|
||||
- cron: "44 7 * * 2"
|
||||
- cron: "44 7 * * 2" # Every Tuesday at 7:44 AM UTC
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Lint Markdown
|
||||
check-links:
|
||||
name: Check Dead Links
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
pull-requests: write
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
- name: Lint Markdown
|
||||
uses: DavidAnson/markdownlint-cli2-action@v16
|
||||
- name: Cache lychee
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
config: docs/.markdownlint.yaml
|
||||
globs: |
|
||||
README.md
|
||||
docs/**/*.md
|
||||
path: .lycheecache
|
||||
key: cache-lychee-${{ github.sha }}
|
||||
restore-keys: cache-lychee-
|
||||
|
||||
# check-links:
|
||||
# name: Check Dead Links
|
||||
# runs-on: ubuntu-latest
|
||||
# steps:
|
||||
# - name: Check out code
|
||||
# uses: actions/checkout@v4
|
||||
# with:
|
||||
# show-progress: false
|
||||
#
|
||||
# - name: Check Dead Link
|
||||
# uses: umbrelladocs/action-linkspector@v1
|
||||
# with:
|
||||
# # Use github-pr-review when triggered by a pull request; otherwise, use github-check
|
||||
# reporter: ${{ github.event_name == 'pull_request' && 'github-pr-review' || 'github-check' }}
|
||||
# filter_mode: nofilter
|
||||
# fail_on_error: true
|
||||
- name: Check dead links
|
||||
uses: lycheeverse/lychee-action@v1
|
||||
with:
|
||||
# 主要用于检查相对链接,对于 Github Actions 无法访问的网站,或者失效的外部网站,可以通过 --exclude 参数排除
|
||||
args: >
|
||||
--verbose --no-progress --cache --max-cache-age 1d
|
||||
--exclude 'https://ark.yituliu.cn/.*'
|
||||
--exclude 'https://map\.ark-nights\.com/areas'
|
||||
--exclude 'https://.*\.maa-org\.net/.*'
|
||||
--exclude 'https://support\.bluestacks\.com/.*'
|
||||
--exclude 'https://www\.bigfun\.cn/.*'
|
||||
--exclude 'https://myqqbot\.com/.*'
|
||||
--exclude 'http://xn--\w+\.com/'
|
||||
--exclude 'https://mywebsite\.com/.*'
|
||||
--exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md'
|
||||
--exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md'
|
||||
-- './docs/**/*.md' './README.md'
|
||||
|
||||
- name: Comment (only for PR)
|
||||
if: github.event_name == 'pull_request' && env.lychee_exit_code != 0
|
||||
uses: marocchino/sticky-pull-request-comment@v2
|
||||
with:
|
||||
message: |
|
||||
Dead links found in the documentation. Please fix them.
|
||||
Details: https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/${{ github.run_id }}
|
||||
|
||||
- name: Exit with lychee exit code
|
||||
run: exit ${{ env.lychee_exit_code }}
|
||||
|
||||
5
.github/workflows/pr-checker.yml
vendored
@@ -4,7 +4,6 @@ on:
|
||||
pull_request_target:
|
||||
types: [opened, edited, ready_for_review, reopened, synchronize]
|
||||
|
||||
|
||||
jobs:
|
||||
check_commit_name_in_pr:
|
||||
if: ${{ !github.event.pull_request.merged && github.base_ref != 'master' }}
|
||||
@@ -52,8 +51,8 @@ jobs:
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: context.payload.pull_request.number,
|
||||
body: `## ⚠️ Found ${invalidCommits.length} invalid commit(s):\n\n${invalidCommitInfoList}\n\n---\nPlease follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format.`
|
||||
body: `## ⚠️ Found ${invalidCommits.length} invalid commit(s):\n\n${invalidCommitInfoList}\n\n---\nPlease follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format, and do not use merge commits.`
|
||||
});
|
||||
|
||||
core.setFailed(`Found ${invalidCommits.length} invalid commit(s):\n${invalidCommitNames.join("\n-------------------\n")}`);
|
||||
}
|
||||
}
|
||||
|
||||
4
.github/workflows/release-ota.yml
vendored
@@ -9,12 +9,12 @@ on:
|
||||
limit:
|
||||
description: Number of releases to fetch from MaaAssistantArknights, 2 at least
|
||||
required: false
|
||||
default: '31'
|
||||
default: "31"
|
||||
type: number
|
||||
limit_2:
|
||||
description: Number of releases to fetch from MaaRelease
|
||||
required: false
|
||||
default: '30'
|
||||
default: "30"
|
||||
type: number
|
||||
|
||||
env:
|
||||
|
||||
230
.github/workflows/res-update-game.yml
vendored
@@ -11,38 +11,18 @@ on:
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
update-game-resources:
|
||||
clone-resources-official:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout MAA
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
token: ${{ secrets.MISTEOWORKFLOW }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
run: |
|
||||
python3 maadeps-download.py x64-windows
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1
|
||||
|
||||
- name: Build Resource Updater
|
||||
run: |
|
||||
MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
|
||||
|
||||
- name: Clone ArknightsGameResource for Official
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: yuanyan3060/ArknightsGameResource
|
||||
ref: main
|
||||
path: .\tools\ResourceUpdater\x64\Release\Official
|
||||
path: ./Official
|
||||
sparse-checkout-cone-mode: false
|
||||
sparse-checkout: |
|
||||
/levels.json
|
||||
/item
|
||||
@@ -54,15 +34,25 @@ jobs:
|
||||
/gamedata/excel/gacha_table.json
|
||||
/gamedata/excel/roguelike_topic_table.json
|
||||
/gamedata/excel/activity_table.json
|
||||
sparse-checkout-cone-mode: false
|
||||
|
||||
- name: Upload Official
|
||||
uses: actions/upload-artifact@v4.3.4
|
||||
with:
|
||||
name: official
|
||||
path: ./Official
|
||||
|
||||
clone-resources-overseas:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone ArknightsGameResource_Yostar for Overseas
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: Kengxxiao/ArknightsGameData_Yostar
|
||||
ref: main
|
||||
path: .\tools\ResourceUpdater\x64\Release\Overseas
|
||||
path: ./Overseas
|
||||
sparse-checkout-cone-mode: false
|
||||
sparse-checkout: |
|
||||
/en_US/gamedata/excel/item_table.json
|
||||
/en_US/gamedata/excel/building_data.json
|
||||
@@ -85,72 +75,180 @@ jobs:
|
||||
/ko_KR/gamedata/excel/gacha_table.json
|
||||
/ko_KR/gamedata/excel/roguelike_topic_table.json
|
||||
/ko_KR/gamedata/excel/activity_table.json
|
||||
sparse-checkout-cone-mode: false
|
||||
|
||||
- name: Upload Official
|
||||
uses: actions/upload-artifact@v4.3.4
|
||||
with:
|
||||
name: overseas
|
||||
path: ./Overseas
|
||||
|
||||
clone-resources-txwy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone arknights-toolbox-update for Taiwan
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: arkntools/arknights-toolbox-update
|
||||
ref: data-tw
|
||||
path: .\tools\ResourceUpdater\x64\Release\Overseas\zh_TW\gamedata\excel
|
||||
path: ./excel
|
||||
token: ${{ secrets.ARKNTOOLS_MAA_RESOURCE_UPDATER}}
|
||||
|
||||
- name: Upload Official
|
||||
uses: actions/upload-artifact@v4.3.4
|
||||
with:
|
||||
name: txwy
|
||||
path: ./excel
|
||||
|
||||
update-game-resources:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout MAA
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
# TL;DR https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9872#issuecomment-2251378371
|
||||
# actions/checkout uses ${{ secrets.GITHUB_TOKEN }} by default, meaning all steps will inherit it
|
||||
persist-credentials: false # Needed to bypass protection rules in Push changes
|
||||
show-progress: false
|
||||
|
||||
- name: Restore ResourceUpdater.exe from cache
|
||||
id: cache-resupd
|
||||
uses: actions/cache/restore@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-resource-updater-main-cpp-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
|
||||
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
python3 maadeps-download.py x64-windows
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
||||
- name: Build Resource Updater
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
|
||||
|
||||
- name: Save ResourceUpdater.exe to cache
|
||||
if: always() && steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-resource-updater-main-cpp-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
|
||||
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
|
||||
|
||||
- name: Download txwy
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: txwy
|
||||
path: ./tools/ResourceUpdater/x64/Release/Overseas/zh_TW/gamedata/excel
|
||||
|
||||
- name: Download Overseas
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: overseas
|
||||
path: ./tools/ResourceUpdater/x64/Release/Overseas
|
||||
|
||||
- name: Download Official
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: official
|
||||
path: ./tools/ResourceUpdater/x64/Release/Official
|
||||
|
||||
- name: Run Resource Updater
|
||||
run: |
|
||||
.\tools\ResourceUpdater\x64\Release\ResourceUpdater.exe
|
||||
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
|
||||
|
||||
- name: Overseas Tasks Ordering
|
||||
- name: Task Sorting
|
||||
run: |
|
||||
python3 tools/TaskSorter/TaskSorter.py
|
||||
|
||||
- name: Check if only sorted
|
||||
id: check_only_sorted
|
||||
- name: Cache Prettier
|
||||
id: cache-prettier
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-prettier
|
||||
path: ./node_modules
|
||||
|
||||
- name: Install Prettier
|
||||
if: steps.cache-prettier.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
npm i prettier --no-save
|
||||
|
||||
- name: Run Prettier on modified Jsons
|
||||
run: |
|
||||
Invoke-Expression "npx prettier -w $(git diff --name-only --diff-filter=ACM 2>$null | Where-Object { $_ -match '\.json$' })"
|
||||
|
||||
- name: Check if only sorted and Templates
|
||||
id: check_sorted_templates
|
||||
run: |
|
||||
git status
|
||||
|
||||
$diff = $(git diff --numstat HEAD | findstr -i resource)
|
||||
$gd = git diff --numstat HEAD 2>$null | findstr -i resource
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
echo "no diff"
|
||||
Write-Output "no diff"
|
||||
exit 0
|
||||
}
|
||||
|
||||
echo "diff: "$diff
|
||||
$sp = $($diff -split "\s+")
|
||||
$numbers = $($sp | Where-Object { $_ -match "^\d+$" })
|
||||
echo "numbers: "$numbers
|
||||
Write-Output ""
|
||||
Write-Output $gd
|
||||
Write-Output ""
|
||||
|
||||
$length = $numbers.Length
|
||||
$noDiff = $true
|
||||
for ($i = 0; $i -lt $length; $i += 2) {
|
||||
$firstNumber = $numbers[$i]
|
||||
$secondNumber = $numbers[$i+1]
|
||||
$diff = $false
|
||||
$hasPng = $false
|
||||
|
||||
if ($firstNumber -gt 1) {
|
||||
$noDiff = $false
|
||||
break
|
||||
}
|
||||
|
||||
if ($firstNumber -ne $secondNumber) {
|
||||
$noDiff = $false
|
||||
$diffLines = $gd -split "`n"
|
||||
|
||||
foreach ($line in $diffLines) {
|
||||
$parts = $line -split "\s+"
|
||||
$filePath = $parts[2]
|
||||
$firstNumber = $parts[0]
|
||||
$secondNumber = $parts[1]
|
||||
|
||||
if ($filePath -match "\.png$") {
|
||||
$hasPng = $true
|
||||
}
|
||||
|
||||
if ($firstNumber -gt 1 -or $firstNumber -ne $secondNumber) {
|
||||
$diff = $true
|
||||
}
|
||||
|
||||
if ($hasPng -and $diff) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
echo "noDiff: "$noDiff
|
||||
echo "only_sorted=$noDiff" >> $env:GITHUB_OUTPUT
|
||||
|
||||
$changes = $hasPng -or $diff
|
||||
|
||||
Write-Output "diff: $diff"
|
||||
Write-Output "hasPng: $hasPng"
|
||||
Write-Output "changes: $changes"
|
||||
|
||||
Write-Output "contains_png=$hasPng" >> $env:GITHUB_OUTPUT
|
||||
Write-Output "changes=$changes" >> $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Optimize Templates
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
run: |
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py resource/template/items/ resource/template/infrast/
|
||||
|
||||
- name: Cancelling
|
||||
if: steps.check_only_sorted.outputs.only_sorted == 'True'
|
||||
uses: andymckay/cancel-action@0.3
|
||||
if: steps.check_sorted_templates.outputs.changes != 'True'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
- name: Add files to git
|
||||
if: steps.check_only_sorted.outputs.only_sorted != 'True'
|
||||
if: steps.check_sorted_templates.outputs.changes == 'True'
|
||||
id: add_files
|
||||
run: |
|
||||
git status
|
||||
|
||||
git config user.name "$env:GITHUB_ACTOR"
|
||||
git config user.email "$env:GITHUB_ACTOR@users.noreply.github.com"
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add .
|
||||
|
||||
$commit_msg = "${{ github.event.inputs.commit_message }}"
|
||||
@@ -161,23 +259,25 @@ jobs:
|
||||
}
|
||||
git commit -m "$commit_msg" -m "[skip changelog]"
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
echo "have_commits=True" >> $env:GITHUB_OUTPUT
|
||||
Write-Output "have_commits=True" >> $env:GITHUB_OUTPUT
|
||||
}
|
||||
|
||||
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
|
||||
|
||||
- name: Cancelling
|
||||
if: steps.add_files.outputs.have_commits != 'True'
|
||||
uses: andymckay/cancel-action@0.3
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
- name: Push changes # push the output folder to your repo
|
||||
- name: Push changes
|
||||
if: steps.add_files.outputs.have_commits == 'True'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.MISTEOWORKFLOW }}
|
||||
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
|
||||
- name: Update OTA resource
|
||||
if: steps.add_files.outputs.have_commits == 'True'
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
run: |
|
||||
gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
|
||||
|
||||
@@ -185,5 +285,3 @@ jobs:
|
||||
# if: steps.add_files.outputs.have_commits == 'True'
|
||||
# run: |
|
||||
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
|
||||
# env:
|
||||
# GH_TOKEN: ${{ github.token }}
|
||||
|
||||
13
.github/workflows/smoke-testing.yml
vendored
@@ -34,10 +34,10 @@ jobs:
|
||||
with:
|
||||
show-progress: false
|
||||
submodules: recursive
|
||||
|
||||
|
||||
- name: Restore dependencies
|
||||
run: dotnet restore
|
||||
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -45,7 +45,8 @@ jobs:
|
||||
python3 maadeps-download.py x64-windows
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
||||
- name: Build MaaSample
|
||||
run: |
|
||||
MSBUILD src/Cpp/MaaSample.slnf /t:rebuild /p:Configuration="Debug" /p:Platform="x64" /m
|
||||
@@ -57,15 +58,15 @@ jobs:
|
||||
- name: Run tests - YostarJP
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe YostarJP
|
||||
|
||||
|
||||
- name: Run tests - YostarEN
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe YostarEN
|
||||
|
||||
|
||||
- name: Run tests - YostarKR
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe YostarKR
|
||||
|
||||
|
||||
- name: Run tests - txwy
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe txwy
|
||||
|
||||
39
.github/workflows/stale.yml
vendored
Normal file
@@ -0,0 +1,39 @@
|
||||
name: "Inactive Issues auto close"
|
||||
|
||||
env: # config
|
||||
daysBeforeStale: 90 # Number of days of inactivity before marking as stale
|
||||
daysBeforeClose: 7 # Number of days to wait after marking as stale before closing
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 */6 * * *" # Runs daily at midnight, temporarily runs every 6 hours for heavy workload
|
||||
workflow_dispatch: # Allows manual triggering
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
actions: write # Workaround for https://github.com/actions/stale/issues/1090
|
||||
issues: write
|
||||
# Completely disable stalling for PRs
|
||||
pull-requests: none
|
||||
contents: none
|
||||
steps:
|
||||
- name: Close inactive issues
|
||||
uses: actions/stale@v9
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
days-before-stale: ${{ env.daysBeforeStale }}
|
||||
days-before-close: ${{ env.daysBeforeClose }}
|
||||
stale-issue-label: "stale"
|
||||
stale-issue-message: |
|
||||
This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
|
||||
该问题已长时间处于闲置状态,${{ env.daysBeforeClose }} 天后将自动关闭。
|
||||
exempt-issue-labels: "keep-open, MAA Team, enhancement"
|
||||
days-before-pr-stale: -1 # Completely disable stalling for PRs
|
||||
days-before-pr-close: -1 # Completely disable closing for PRs
|
||||
|
||||
# Temporary to reduce the huge issues number
|
||||
ascending: true
|
||||
operations-per-run: 800
|
||||
debug-only: false
|
||||
2
.github/workflows/website-workflow.yml
vendored
@@ -43,7 +43,7 @@ jobs:
|
||||
with:
|
||||
node-version: 20
|
||||
cache: pnpm
|
||||
cache-dependency-path: './website/pnpm-lock.yaml'
|
||||
cache-dependency-path: "./website/pnpm-lock.yaml"
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
3
.gitignore
vendored
@@ -448,3 +448,6 @@ enc_temp_folder/*
|
||||
# CF 活动关卡(异格夜刀),手动改的地图
|
||||
/resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
|
||||
/src/MaaWpfGui/FodyWeavers.xml
|
||||
|
||||
# 链接检查缓存
|
||||
.lycheecache
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
dirs:
|
||||
- .
|
||||
useGitIgnore: true
|
||||
ignorePatterns:
|
||||
- pattern: "^https?://127.0.0.1(:\\d+)?/"
|
||||
@@ -1,132 +1,127 @@
|
||||
{
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"title": "Build Schema",
|
||||
"$ref": "#/definitions/build",
|
||||
"definitions": {
|
||||
"build": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"Continue": {
|
||||
"type": "boolean",
|
||||
"description": "Indicates to continue a previously failed build attempt"
|
||||
},
|
||||
"Help": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the help text for this build assembly"
|
||||
},
|
||||
"Host": {
|
||||
"type": "string",
|
||||
"description": "Host for execution. Default is 'automatic'",
|
||||
"enum": [
|
||||
"AppVeyor",
|
||||
"AzurePipelines",
|
||||
"Bamboo",
|
||||
"Bitbucket",
|
||||
"Bitrise",
|
||||
"GitHubActions",
|
||||
"GitLab",
|
||||
"Jenkins",
|
||||
"Rider",
|
||||
"SpaceAutomation",
|
||||
"TeamCity",
|
||||
"Terminal",
|
||||
"TravisCI",
|
||||
"VisualStudio",
|
||||
"VSCode"
|
||||
]
|
||||
},
|
||||
"NoLogo": {
|
||||
"type": "boolean",
|
||||
"description": "Disables displaying the NUKE logo"
|
||||
},
|
||||
"Partition": {
|
||||
"type": "string",
|
||||
"description": "Partition to use on CI"
|
||||
},
|
||||
"Plan": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the execution plan (HTML)"
|
||||
},
|
||||
"Profile": {
|
||||
"type": "array",
|
||||
"description": "Defines the profiles to load",
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"Root": {
|
||||
"type": "string",
|
||||
"description": "Root directory during build execution"
|
||||
},
|
||||
"Skip": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be skipped. Empty list skips all dependencies",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Target": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be invoked. Default is '{default_target}'",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Verbosity": {
|
||||
"type": "string",
|
||||
"description": "Logging verbosity during build execution. Default is 'Normal'",
|
||||
"enum": [
|
||||
"Minimal",
|
||||
"Normal",
|
||||
"Quiet",
|
||||
"Verbose"
|
||||
]
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"title": "Build Schema",
|
||||
"$ref": "#/definitions/build",
|
||||
"definitions": {
|
||||
"build": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"Continue": {
|
||||
"type": "boolean",
|
||||
"description": "Indicates to continue a previously failed build attempt"
|
||||
},
|
||||
"Help": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the help text for this build assembly"
|
||||
},
|
||||
"Host": {
|
||||
"type": "string",
|
||||
"description": "Host for execution. Default is 'automatic'",
|
||||
"enum": [
|
||||
"AppVeyor",
|
||||
"AzurePipelines",
|
||||
"Bamboo",
|
||||
"Bitbucket",
|
||||
"Bitrise",
|
||||
"GitHubActions",
|
||||
"GitLab",
|
||||
"Jenkins",
|
||||
"Rider",
|
||||
"SpaceAutomation",
|
||||
"TeamCity",
|
||||
"Terminal",
|
||||
"TravisCI",
|
||||
"VisualStudio",
|
||||
"VSCode"
|
||||
]
|
||||
},
|
||||
"NoLogo": {
|
||||
"type": "boolean",
|
||||
"description": "Disables displaying the NUKE logo"
|
||||
},
|
||||
"Partition": {
|
||||
"type": "string",
|
||||
"description": "Partition to use on CI"
|
||||
},
|
||||
"Plan": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the execution plan (HTML)"
|
||||
},
|
||||
"Profile": {
|
||||
"type": "array",
|
||||
"description": "Defines the profiles to load",
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"Root": {
|
||||
"type": "string",
|
||||
"description": "Root directory during build execution"
|
||||
},
|
||||
"Skip": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be skipped. Empty list skips all dependencies",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Target": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be invoked. Default is '{default_target}'",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Verbosity": {
|
||||
"type": "string",
|
||||
"description": "Logging verbosity during build execution. Default is 'Normal'",
|
||||
"enum": ["Minimal", "Normal", "Quiet", "Verbose"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"$schema": "./build.schema.json",
|
||||
"Solution": "tools/MaaBuilder.sln"
|
||||
"$schema": "./build.schema.json",
|
||||
"Solution": "tools/MaaBuilder.sln"
|
||||
}
|
||||
|
||||
56
.pre-commit-config.yaml
Normal file
@@ -0,0 +1,56 @@
|
||||
default_install_hook_types: [pre-commit, prepare-commit-msg]
|
||||
ci:
|
||||
autofix_commit_msg: "chore: Auto update by pre-commit hooks [skip changelog]"
|
||||
autofix_prs: true
|
||||
repos:
|
||||
- repo: https://github.com/shssoichiro/oxipng
|
||||
rev: v9.1.2
|
||||
hooks:
|
||||
- id: oxipng
|
||||
args: ["-q", "-o", "2", "-s", "--ng"]
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: v4.0.0-alpha.8
|
||||
hooks:
|
||||
- id: prettier
|
||||
types_or:
|
||||
- yaml
|
||||
- json
|
||||
- repo: https://github.com/DavidAnson/markdownlint-cli2
|
||||
rev: v0.13.0
|
||||
hooks:
|
||||
- id: markdownlint-cli2
|
||||
files: ^docs/.*|^README\.md$
|
||||
types:
|
||||
- markdown
|
||||
args: ["--fix", "--config", "docs/.markdownlint.yaml", "#**/node_modules"]
|
||||
#- repo: https://github.com/lycheeverse/lychee
|
||||
# rev: v0.15.1
|
||||
# hooks:
|
||||
# - id: lychee
|
||||
# files: ^docs/.*|^README\.md$
|
||||
# types:
|
||||
# - markdown
|
||||
# args:
|
||||
# #- --verbose
|
||||
# - --quiet
|
||||
# - --no-progress
|
||||
# - --exclude
|
||||
# - 'https://map\.ark-nights\.com/areas'
|
||||
# - --exclude
|
||||
# - 'https://.*\.maa-org\.net/.*'
|
||||
# - --exclude
|
||||
# - 'https://support\.bluestacks\.com/.*'
|
||||
# - --exclude
|
||||
# - 'https://www\.bigfun\.cn/.*'
|
||||
# - --exclude
|
||||
# - 'https://myqqbot\.com/.*'
|
||||
# - --exclude
|
||||
# - 'http://xn--\w+\.com/'
|
||||
# - --exclude
|
||||
# - 'https://mywebsite\.com/.*'
|
||||
# - --exclude
|
||||
# - '/image/*'
|
||||
# - --exclude-path
|
||||
# - "docs/zh-tw/manual/introduction/introduction_old.md"
|
||||
# - --exclude-path
|
||||
# - "docs/ja-jp/manual/introduction/introduction_old.md"
|
||||
10
.prettierignore
Normal file
@@ -0,0 +1,10 @@
|
||||
**/node_modules/
|
||||
|
||||
MaaDeps/
|
||||
3rdparty/
|
||||
src/maa-cli
|
||||
src/MaaMacGui
|
||||
|
||||
website/
|
||||
resource/Arknights-Tile-Pos/
|
||||
tools/OptimizeTemplates/optimize_templates.json
|
||||
17
.prettierrc
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"tabWidth": 4,
|
||||
"printWidth": 120,
|
||||
"useTabs": false,
|
||||
"bracketSameLine": true,
|
||||
"bracketSpacing": true,
|
||||
"endOfLine": "auto",
|
||||
"overrides": [
|
||||
{
|
||||
"files": [".clang-format", "**/*.yml", "**/*.yaml"],
|
||||
"options": {
|
||||
"parser": "yaml",
|
||||
"tabWidth": 2
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
128
CHANGELOG.md
@@ -1,15 +1,135 @@
|
||||
## v5.4.1
|
||||
## v5.5.0-beta.1
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 适配萨卡兹肉鸽 (#9677) @DavidWang19 @Daydreamer114 @Alan-Charred @SherkeyXD @Lemon-miaow
|
||||
* Mac GUI 添加萨米肉鸽策略 @hguandl
|
||||
* WPF Gui support for roguelike collapsal paradigm task plugin (#9648) @DavidWang19
|
||||
* 由ci生成的非正式/公测/内测版判断为调试版本并且不再检查更新 (#9632) @SherkeyXD @zzyyyl
|
||||
* 隐式空 text 检测仅对无基任务生效 @zzyyyl
|
||||
* change glossary from markdown to JSON @AlisaAkiron
|
||||
* update turbo to v2 @AlisaAkiron
|
||||
* 添加萨米肉鸽天途半道关卡战斗策略 (#9337) @Daydreamer114
|
||||
* 增加识别坍缩范式的插件,增加萨米肉鸽刷隐藏坍缩范式模式 (#9172) @Alan-Charred
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 增加 BattlePauseCancel 重试上限 @zzyyyl
|
||||
* cache 统一默认为 false (#9642) @zzyyyl
|
||||
* 重新加入 tasks.json 的默认值检查 (#9583) @zzyyyl
|
||||
* Caching for ResourceUpdater @Constrat
|
||||
* 优化夺路而跳部署策略 (#9726) @Daydreamer114
|
||||
* update Sarkaz shopping.json (#9721) @CASUUU @SherkeyXD
|
||||
* 自动战斗-战斗列表 批量导入关卡名正则优化 (#9723) @status102
|
||||
* 优化第一层作战策略黑名单 (#9710) @Daydreamer114
|
||||
* 适配新干员用法&调整萨卡兹肉鸽4星优先度 (#9713) @Lancarus
|
||||
* 优化所有肉鸽文件的json排版 @SherkeyXD
|
||||
* 优化战斗策略应对天灾年代之刺 (#9702) @Daydreamer114
|
||||
* 优化格式 @ABA2396
|
||||
* 复用RoguelikeCollapsalParadigmTaskPlugin插件 (#9682) @status102
|
||||
* 优化更新策略 @ABA2396
|
||||
* 更新部分配置修改为全局配置 @ABA2396
|
||||
* 优化版本更新 @ABA2396
|
||||
* 更新checkout至v4 这怎么还有个漏网之鱼) @SherkeyXD
|
||||
* 删除 tasks.json 冗余行 (#9645) @zzyyyl
|
||||
* add log output (#9636) @status102
|
||||
* 肉鸽资源加载逻辑及目录结构重构 (#9555) @Alan-Charred @SherkeyXD
|
||||
* 修改win7相关问题描述&更新运行库 @Rbqwow
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 尝试修复肉鸽第四层开头卡死的问题 @DavidWang19
|
||||
* 修复 萨卡兹肉鸽 LastReward5 少前缀的问题 @zzyyyl
|
||||
* 萨卡兹肉鸽战斗结束领奖励时因思绪异常而卡死 (#9731) @Daydreamer114 @DavidWang19
|
||||
* 增加猩红甬道的OcrReplace @DavidWang19
|
||||
* 修复肉鸽每层识别 @DavidWang19
|
||||
* 调整失与得阈值 @DavidWang19
|
||||
* 修复萨卡兹肉鸽卡死在结算界面的问题 @DavidWang19
|
||||
* 修复萨卡兹肉鸽商店不能刷新的问题 @DavidWang19
|
||||
* 修复肉鸽关卡通用策略无法识别费用的问题 @DavidWang19
|
||||
* 删除萨卡兹肉鸽开局负荷干员与舍弃思绪功能模板匹配文件名重复描述 (#9722) @Daydreamer114
|
||||
* 调整树洞阈值 @DavidWang19
|
||||
* 萨卡兹肉鸽舍弃思绪识别位置修改 (#9717) @Daydreamer114
|
||||
* 调整节点阈值 @DavidWang19
|
||||
* 修复卡死在紧急安全检查的问题 @DavidWang19
|
||||
* 修复萨卡兹肉鸽卡死在战斗失败的问题 @DavidWang19
|
||||
* 修改材料名称注释 @ABA2396
|
||||
* 修复被随机排序破坏的超链接 @Rbqwow
|
||||
* tweak Reed Alter, Noir Corne alter regex @Constrat
|
||||
* 自动战斗开始时移除召唤物类头像缓存,以避免跨局错误识别相似技能的召唤物 (#9649) @status102
|
||||
* 修复连接前同步参数时日志报错的问题 (#9644) @zzyyyl
|
||||
* roi out of bounds @zzyyyl
|
||||
* 修复萨米肉鸽因插件注册顺序导致的无法运行问题 (#9633) @Alan-Charred
|
||||
* 修复坍缩范式插件导致的Gui和傀影/水月肉鸽初始化Bug (#9573) @Alan-Charred
|
||||
* 为InfrastEnteredFlag添加延迟以避免信用通知对右上角基建提醒的遮挡 (#9597) @Viel0320
|
||||
* allow CMake build MaaCore with ASST_DEBUG under macOS @Alan-Charred
|
||||
* leak fastdeploy objects to avoid crash @dantmnf
|
||||
* Roguelike Invest System offset (#9590) @Alan-Charred
|
||||
* add zh-tw glossary for weblate @AlisaAkiron
|
||||
* merge glossary json into one for better webalte compatibility @AlisaAkiron
|
||||
* fix typings in Recruit task @horror-proton
|
||||
* 修复字体和评论区分类 @Rbqwow
|
||||
* wrong proxy detection @Rbqwow
|
||||
* switch account failed when MuMuEmulator12Extras is enabled @EvATive7
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* website docs (#9287) @ABA2396 @Rbqwow @Constrat @wangl-cc @HX3N @SherkeyXD
|
||||
* 修改win7相关问题描述&更新运行库 @Rbqwow
|
||||
* update glossary @HX3N
|
||||
* 修改Task协议文档,以符合cache默认值 @status102
|
||||
* CHANGELOG中文档修改独立分类 @SherkeyXD
|
||||
* fix Weblate status preview in README (#9616) @Lemon-miaow
|
||||
* fix a bad link @Rbqwow
|
||||
* make i18n warnings show only once @Rbqwow
|
||||
* 修复字体和评论区分类 @Rbqwow
|
||||
* 增加关于肉鸽任务刷探索范式功能的说明 (#9552) @Alan-Charred
|
||||
* website docs **translation needed** (#9287) @ABA2396 @HX3N @Constrat @wallsman @Rbqwow @wangl-cc @SherkeyXD
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* OD navigation (#9729) @Manicsteiner
|
||||
* 添加弹窗提示 @ABA2396
|
||||
* ignore more site (#9698) @wangl-cc
|
||||
* use lychee to check dead links (#9675) @wangl-cc
|
||||
* bump `maa-cli` to 0.4.8 and update documents (#9683) @wangl-cc
|
||||
* update ja-jp.xaml @Manicsteiner
|
||||
* 萨米肉鸽配置文件/插件单独文件夹 (#9651) @Alan-Charred
|
||||
* make AskRestartToApplySettingsYoStarEN static @ABA2396
|
||||
* 统一肉鸽模式介绍文字 (#9669) @Alan-Charred
|
||||
* link for yostaren resolution [skip changelo] @Constrat
|
||||
* Translations update from MAA Weblate (#9640) @AlisaAkiron @Rbqwow
|
||||
* Style/gui consistency (#9567) @Constrat
|
||||
* 删除 Qodana 静态检查 (#9553) @SherkeyXD
|
||||
* 增加 ResourceUpdater 日志 @ABA2396
|
||||
* pref: 将Head和ETag请求设置为`Connection: close` @ChingCdesu
|
||||
* Translations update from MAA Weblate (#9598) @AlisaAkiron
|
||||
* update python API (#9538) @EvATive7
|
||||
|
||||
### For Overseas
|
||||
|
||||
* YoStar -> Yostar only for interfaces (#9548) @Constrat
|
||||
* SSS#4 Automaton Arena @Constrat
|
||||
* Global SSS#4 copilot (Translation work in progress) @Constrat
|
||||
|
||||
#### txwy
|
||||
|
||||
* 繁中服部分角色無法正確辨識 (#9647) @momomochi987
|
||||
* 補充繁中服保全派駐#3 相關內容 (#9701) @momomochi987
|
||||
* 修正繁中服薩米肉鴿獎勵無法多選一的問題 (#9584) @momomochi987
|
||||
|
||||
#### YostarEN
|
||||
|
||||
* Global SSS#4 copilot adaptation @Constrat
|
||||
* YoStarEN resolution warning on client switch (#9539) @Constrat @ABA2396
|
||||
* YostarEN SSS#4 buffs and branches @Constrat
|
||||
|
||||
#### YostarJP
|
||||
|
||||
* YostarJP WB navigation (#9715) @Manicsteiner
|
||||
* YostarJP add SSSBuffChoose (#9629) @Manicsteiner
|
||||
* Update ja-jp.json @wallsman
|
||||
* YostarJP cor fix and roguelike shop text (#9591) @Manicsteiner
|
||||
|
||||
#### YostarKR
|
||||
|
||||
* YostarKR add SSSBuffChoose @HX3N
|
||||
* YostarKR WB navigation @HX3N
|
||||
* YostarKR ocr fix and remove SkipThePreBattlePlot @HX3N
|
||||
|
||||
@@ -90,7 +90,8 @@ if(USE_MAADEPS)
|
||||
endif()
|
||||
|
||||
find_package(onnxruntime CONFIG REQUIRED) # provided by onnxruntime>=1.16
|
||||
list(APPEND maa_libs onnxruntime::onnxruntime)
|
||||
find_package(pocketpy REQUIRED)
|
||||
list(APPEND maa_libs onnxruntime::onnxruntime pocketpy)
|
||||
if(DEFINED fastdeploy_SOURCE_DIR)
|
||||
# TODO: FetchContent github.com/MaaAssistantArknights/FastDeploy
|
||||
if(NOT DEFINED fastdeploy_BINARY_DIR)
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EN/@EntryIndexedValue">EN</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SWMINIMIZE/@EntryIndexedValue">SWMINIMIZE</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=AP/@EntryIndexedValue">AP</s:String>
|
||||
|
||||
@@ -107,7 +107,7 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
### CLI 支持
|
||||
|
||||
MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/intro.html)
|
||||
MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/)
|
||||
|
||||
## 加入我们
|
||||
|
||||
|
||||
@@ -223,6 +223,4 @@ MD052: true
|
||||
# MD053/link-image-reference-definitions - Link and image reference definitions should be needed
|
||||
MD053:
|
||||
# Ignored definitions
|
||||
ignored_definitions: [
|
||||
"//"
|
||||
]
|
||||
ignored_definitions: ["//"]
|
||||
|
||||
@@ -1,83 +1,88 @@
|
||||
export default {
|
||||
appId: '99JM20SIFG',
|
||||
apiKey: '32ad931040facd36d2e99c3cb8e425e1',
|
||||
indexName: 'maa',
|
||||
appId: "99JM20SIFG",
|
||||
apiKey: "7596a5a8c95cd64d4cf3050c9a4f878e",
|
||||
indexName: "maa",
|
||||
// 这里应该把所有本地化配置都放入 locales 中
|
||||
locales: {
|
||||
'/': {
|
||||
placeholder: '搜索',
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: '搜索',
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: '清除查询条件',
|
||||
cancelButtonText: '取消',
|
||||
"/zh-cn/": {
|
||||
placeholder: "搜索",
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: "搜索",
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: "清除查询条件",
|
||||
cancelButtonText: "取消",
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: "搜索历史",
|
||||
noRecentSearchesText: "没有搜索历史",
|
||||
saveRecentSearchButtonTitle: "保存至搜索历史",
|
||||
removeRecentSearchButtonTitle: "从搜索历史中移除",
|
||||
favoriteSearchesTitle: "收藏",
|
||||
removeFavoriteSearchButtonTitle: "从收藏中移除",
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: "无法获取结果",
|
||||
helpText: "你可能需要检查你的网络连接",
|
||||
},
|
||||
footer: {
|
||||
selectText: "选择",
|
||||
navigateText: "切换",
|
||||
closeText: "关闭",
|
||||
searchByText: "搜索提供者",
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: "无法找到相关结果",
|
||||
suggestedQueryText: "你可以尝试查询",
|
||||
reportMissingResultsText: "你认为该查询应该有结果?",
|
||||
reportMissingResultsLinkText: "点击反馈",
|
||||
},
|
||||
},
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: '搜索历史',
|
||||
noRecentSearchesText: '没有搜索历史',
|
||||
saveRecentSearchButtonTitle: '保存至搜索历史',
|
||||
removeRecentSearchButtonTitle: '从搜索历史中移除',
|
||||
favoriteSearchesTitle: '收藏',
|
||||
removeFavoriteSearchButtonTitle: '从收藏中移除',
|
||||
},
|
||||
"/en-us/": {
|
||||
placeholder: "Search",
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: "Search",
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: "Clear the query",
|
||||
cancelButtonText: "Cancel",
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: "Recent",
|
||||
noRecentSearchesText: "No recent searches",
|
||||
saveRecentSearchButtonTitle: "Save this search",
|
||||
removeRecentSearchButtonTitle:
|
||||
"Remove this search from history",
|
||||
favoriteSearchesTitle: "Favorite",
|
||||
removeFavoriteSearchButtonTitle:
|
||||
"Remove this search from favorites",
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: "Unable to fetch results",
|
||||
helpText:
|
||||
"You might want to check your network connection.",
|
||||
},
|
||||
footer: {
|
||||
selectText: "to select",
|
||||
navigateText: "to navigate",
|
||||
closeText: "to close",
|
||||
searchByText: "Search by",
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: "No results for",
|
||||
suggestedQueryText: "Try searching for",
|
||||
reportMissingResultsText:
|
||||
"Believe this query should return results?",
|
||||
reportMissingResultsLinkText: "Let us know.",
|
||||
},
|
||||
},
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: '无法获取结果',
|
||||
helpText: '你可能需要检查你的网络连接',
|
||||
},
|
||||
footer: {
|
||||
selectText: '选择',
|
||||
navigateText: '切换',
|
||||
closeText: '关闭',
|
||||
searchByText: '搜索提供者',
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: '无法找到相关结果',
|
||||
suggestedQueryText: '你可以尝试查询',
|
||||
reportMissingResultsText: '你认为该查询应该有结果?',
|
||||
reportMissingResultsLinkText: '点击反馈',
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
'/en-us/': {
|
||||
placeholder: 'Search',
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: 'Search',
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: 'Clear the query',
|
||||
cancelButtonText: 'Cancel',
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: 'Recent',
|
||||
noRecentSearchesText: 'No recent searches',
|
||||
saveRecentSearchButtonTitle: 'Save this search',
|
||||
removeRecentSearchButtonTitle: 'Remove this search from history',
|
||||
favoriteSearchesTitle: 'Favorite',
|
||||
removeFavoriteSearchButtonTitle: 'Remove this search from favorites',
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: 'Unable to fetch results',
|
||||
helpText: 'You might want to check your network connection.',
|
||||
},
|
||||
footer: {
|
||||
selectText: 'to select',
|
||||
navigateText: 'to navigate',
|
||||
closeText: 'to close',
|
||||
searchByText: 'Search by',
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: 'No results for',
|
||||
suggestedQueryText: 'Try searching for',
|
||||
reportMissingResultsText: 'Believe this query should return results?',
|
||||
reportMissingResultsLinkText: 'Let us know.',
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 49 KiB |
@@ -9,7 +9,7 @@ icon: jam:write-f
|
||||
The purpose of this document is to guide document writers to better utilize the functionalities provided by the theme, thus achieving a more readable effect.
|
||||
:::
|
||||
|
||||
Our documentation is built on [vuepress](https://github.com/vuejs/vuepress) and utilizes the [vuepress-theme-hope](https://github.com/vuepress-theme-hope/vuepress-theme-hope) theme. You can also refer to the [official documentation](https://theme-hope.vuejs.press/en/) for more detailed explanations. Here, we only introduce some common functionalities.
|
||||
Our documentation is built on [vuepress](https://github.com/vuejs/vuepress) and utilizes the [vuepress-theme-hope](https://github.com/vuepress-theme-hope/vuepress-theme-hope) theme. You can also refer to the [official documentation](https://theme-hope.vuejs.press/) for more detailed explanations. Here, we only introduce some common functionalities.
|
||||
|
||||
## Deploy Locally
|
||||
|
||||
|
||||
@@ -77,8 +77,8 @@ Refer to the implementation of `__main__` in [Python demo](https://github.com/Ma
|
||||
|
||||
### C
|
||||
|
||||
Refer to the implementation of [CppSample](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/CppSample/main.cpp)
|
||||
Refer to the implementation of [CppSample](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/Cpp/main.cpp)
|
||||
|
||||
### C Sharp
|
||||
|
||||
Refer to the implementation of [MaaWpfGui](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/MaaWpfGui/Helper/AsstProxy.cs)
|
||||
Refer to the implementation of [MaaWpfGui](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/MaaWpfGui/Main/AsstProxy.cs)
|
||||
|
||||
@@ -6,4 +6,12 @@ dir:
|
||||
order: 6
|
||||
---
|
||||
|
||||
A simple CLI for MAA written in Rust.
|
||||
|
||||
## Features
|
||||
|
||||
- Run predefined or custom tasks, like `maa fight` or `maa run <task>`;
|
||||
- Install and update MaaCore and resources with `maa install` and `maa update`;
|
||||
- Update self with `maa self update`.
|
||||
|
||||
<Catalog base='/en-us/manual/cli/' />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 4
|
||||
order: 3
|
||||
icon: material-symbols:settings
|
||||
---
|
||||
|
||||
@@ -277,10 +277,14 @@ params = { stage = "CE-6" }
|
||||
[tasks.variants.params.stage]
|
||||
default = "1-7" # default value of stage, optional (if not given, user can input empty value to re-prompt)
|
||||
description = "a stage to fight" # description of the input, optional
|
||||
|
||||
# query the medicine to use only when stage is 1-7
|
||||
[tasks.variants.params.medicine]
|
||||
# dependency of parameters, the key is the name of parameter, the value is the expected value of dependency parameter
|
||||
# when set, the parameter will be required to input only if all dependency parameters are satisfied
|
||||
deps = { stage = "1-7" }
|
||||
# a parameter can be optional with `optional` field
|
||||
# if the condition is not matched, the parameter will be ignored
|
||||
# the `condition` field can be used to specify the condition of the parameter
|
||||
# where the condition can be a table, whose keys are name of other parameters and values are the expected value
|
||||
conditions = { stage = "1-7" }
|
||||
default = 1000
|
||||
description = "medicine to use"
|
||||
```
|
||||
@@ -449,13 +453,11 @@ The JSON schema of configuration files can be found at [`schemas` directory][sch
|
||||
With the help of JSON schema, you can get auto-completion and validation in some editors with plugins.
|
||||
|
||||
[task-types]: ../../protocol/integration.md#list-of-task-types
|
||||
[emulator-ports]: ../faq.md#common-adb-ports-for-popular-android-emulators
|
||||
[playcover-doc]: ../device/macos.md#-playcover-the-software-runs-most-fluently-for-its-nativity-
|
||||
[example-config]: https://github.com/MaaAssistantArknights/maa-cli/tree/main/maa-cli/config_examples
|
||||
[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
|
||||
[wangl-cc-dotfiles]: https://github.com/wangl-cc/dotfiles/tree/master/.config/maa
|
||||
[schema-dir]: https://github.com/MaaAssistantArknights/maa-cli/tree/main/maa-cli/schemas
|
||||
[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
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 5
|
||||
order: 4
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
@@ -23,5 +23,3 @@ When running the maa-cli task, you may see some logs that look like this:
|
||||
```
|
||||
|
||||
This log is output by `fastdeploy`, which is a dependency of MaaCore. For the officially compiled MaaCore, this log cannot be closed. However, if you are using a package manager to install maa-cli, you can try installing the package manager's version of MaaCore which uses a newer version of `fastdeploy` without logs enabled by default.
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 2
|
||||
order: 1
|
||||
icon: material-symbols:download
|
||||
---
|
||||
|
||||
@@ -55,10 +55,10 @@ Homebrew users can install maa-cli via the unofficial [tap](https://github.com/M
|
||||
|
||||
If package managers are not available on your system or you prefer not to use them, you can download the precompiled binaries for your platform from the following links. After decompressing, place the executable file in your `PATH` to use.
|
||||
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-x86_64-pc-windows-msvc.zip)
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-pc-windows-msvc.zip)
|
||||
|
||||
If your platform is not listed above, you can try to compile and install it yourself (see below).
|
||||
|
||||
@@ -116,5 +116,3 @@ For users who installed via package managers, MaaCore can be installed via packa
|
||||
```
|
||||
|
||||
**NOTE**: Only users who installed maa-cli via package managers can install MaaCore via package managers. Otherwise, please use the `maa install` command to install. In addition, the `maa install` downloads the official precompiled MaaCore, while the MaaCore installed by package managers has different compilation options and dependency versions from the official precompiled version. This does not affect the use of maa-cli but may cause differences in the functionality and performance of MaaCore. For example, the MaaCore installed by package managers uses a newer version of `fastdeploy`, while the official precompiled MaaCore uses an older version of `fastdeploy`. In the new version of `fastdeploy`, logs can be hidden, which can eliminate some unnecessary log output.
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
---
|
||||
order: 1
|
||||
icon: material-symbols:toc
|
||||
---
|
||||
|
||||
# Introduction
|
||||
|
||||
A simple CLI for [MAA][maa-home] written in Rust.
|
||||
|
||||
## Features
|
||||
|
||||
- Run predefined or custom tasks, like `maa fight` or `maa run <task>`;
|
||||
- Install and update MaaCore and resources with `maa install` and `maa update`;
|
||||
- Update self with `maa self update`.
|
||||
|
||||
[maa-home]: https://github.com/MaaAssistantArknights/MaaAssistantArknights
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 3
|
||||
order: 2
|
||||
icon: material-symbols:summarize
|
||||
---
|
||||
|
||||
@@ -26,9 +26,19 @@ maa self update
|
||||
|
||||
**Note**: Users who install maa-cli via a package manager should use the package manager to update maa-cli, this command is invalid for these users.
|
||||
|
||||
## Initialize Configuration
|
||||
|
||||
Once MaaCore is installed, you can run tasks directly without additional configuration. The default configuration may not be suitable for all users. Therefore, you can initialize the configuration by running the following command:
|
||||
|
||||
```bash
|
||||
maa init
|
||||
```
|
||||
|
||||
With this command, you can configure [the relevant configurations of MaaCore][config-core] interactively.
|
||||
|
||||
## Run Tasks
|
||||
|
||||
Once MaaCore is installed, you can run tasks directly without additional configuration. The default configuration may not be suitable for all users. If you encounter problems when running tasks, you can refer to the [Configuration Document][config-core] to modify the configuration.
|
||||
After installing and configuring MaaCore, you can run tasks. maa-cli supports two types of tasks: predefined tasks and custom tasks.
|
||||
|
||||
### Predefined tasks
|
||||
|
||||
@@ -48,8 +58,7 @@ maa startup YoStarEN && maa fight BB-7 -m 3 && maa closedown
|
||||
|
||||
### Custom Tasks
|
||||
|
||||
Due to the multitude of tasks supported by MAA, maa-cli cannot provide predefined options for all tasks. Additionally, you may need to run multiple tasks as shown in the example above. To address this issue, maa-cli offers custom task functionality. Custom tasks allow for the combination of different tasks and provide finer control over the parameters of each task as well as the execution order. Furthermore, custom tasks support conditional statements, enabling you to decide whether to execute a task based on certain conditions or to execute a task with specific parameters. This can be used to automate your daily tasks.
|
||||
A custom task is defined in a configuration file. The location and format of the configuration file are described in the [Custom Task Document][custom-task]. After defining the configuration file, you can run the custom task by `maa run <task>`, where `<task>` is the name of the custom task, excluding the extension.
|
||||
Due to the multitude of tasks supported by MAA, maa-cli cannot provide predefined options for all tasks. Additionally, you may need to run multiple tasks as shown in the example above. To address this issue, maa-cli offers custom task functionality. Custom tasks allow for the combination of different tasks and provide finer control over the parameters of each task as well as the execution order. Furthermore, custom tasks support conditional statements, enabling you to decide whether to execute a task based on certain conditions or to execute a task with specific parameters. This can be used to automate your daily tasks. A custom task is defined in a configuration file. The location and format of the configuration file are described in the [Custom Task Document][custom-task]. After defining the configuration file, you can run the custom task by `maa run <task>`, where `<task>` is the name of the custom task, excluding the extension.
|
||||
|
||||
### Task Summary
|
||||
|
||||
@@ -85,7 +94,5 @@ Except for the above subcommands, maa-cli also provides other subcommands:
|
||||
|
||||
More command usage can be viewed by `maa help`, and the usage of specific commands can be viewed by `maa help <command>`.
|
||||
|
||||
[config-core]: ./config.md#maacore-related-configurations
|
||||
[custom-task]: ./config.md#custom-tasks
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
[config-core]: config.md#maacore-related-configurations
|
||||
[custom-task]: config.md#custom-tasks
|
||||
|
||||
@@ -5,10 +5,6 @@ icon: mdi:plug
|
||||
|
||||
# Connection
|
||||
|
||||
:::note
|
||||
For information about physical machines, please also check [Android Physical Devices](./device/android.md).
|
||||
:::
|
||||
|
||||
## ADB Path
|
||||
|
||||
:::info Technical Details
|
||||
@@ -179,6 +175,6 @@ Adaptation for backend live is very imperfect, there are always all kinds of ine
|
||||
|
||||
## ADB Lite
|
||||
|
||||
The ADB Client independently implemented by MAA can avoid continuously opening multiple ADB processes and reduce performance loss compared to the original ADB, but some screenshot methods are not available.
|
||||
An ADB Client independently implemented by MAA uses TCP to communicate directly with the ADB Server. Compared with the original ADB, it can avoid opening multiple ADB processes continuously and reduce performance overhead, but some screenshot methods are unavailable.<sup>[PR](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/3315)</sup>
|
||||
|
||||
It is recommended to enable it, but the specific advantages and disadvantages need feedback. ~~Help us do some testing x2~~
|
||||
|
||||
@@ -11,7 +11,7 @@ You can choose one of the following installation methods:
|
||||
|
||||
### Use maa-cli
|
||||
|
||||
[maa-cli](https://github.com/MaaAssistantArknights/maa-cli) is a simple CLI for MAA made with Rust. Please read installation and usage tutorials in [User Guide for CLI](./1.6-USER_GUIDE_FOR_CLI).
|
||||
[maa-cli](https://github.com/MaaAssistantArknights/maa-cli) is a simple CLI for MAA made with Rust. Please read installation and usage tutorials in [User Guide for CLI](../cli/).
|
||||
|
||||
### Use Wine
|
||||
|
||||
@@ -103,7 +103,7 @@ Enable it by placing `MaaDesktopIntegration.so` generated by MAA Wine Bridge in
|
||||
|
||||
#### 3. Tasks Settings
|
||||
|
||||
Customizing tasks: Reference to [AsstAppendTask](https://maa.plus/docs/en-us/3.1-INTEGRATION.html#asstappendtask) and modify [`# 任务及参数请参考 docs/集成文档.md`](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/722f0ddd4765715199a5dc90ea1bec2940322344/src/Python/sample.py#L54) section in `sample.py`.
|
||||
Customizing tasks: Reference to [AsstAppendTask](../../protocol/integration.md#asstappendtask) and modify [`# 任务及参数请参考 docs/集成文档.md`](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/722f0ddd4765715199a5dc90ea1bec2940322344/src/Python/sample.py#L54) section in `sample.py`.
|
||||
|
||||
## Emulator Supports
|
||||
|
||||
|
||||
@@ -27,12 +27,12 @@ const fullySupport = shuffleArray([
|
||||
{
|
||||
name: 'Bluestacks 5',
|
||||
link: 'https://www.bluestacks.com/',
|
||||
note: 'Fully compatible. Need to turn on `Allow ADB connections` in the emulator `Settings` - `Engine Settings`. Known to be compatible with Hyper-V.\n\n- Recommended to download [Offline Installer](https://support.bluestacks.com/hc/en-us/articles/4402611273485-BlueStacks-5-offline-installer) to avoid slow and bundled installation; recommend installing [Android 11](https://support.bluestacks.com/hc/en-us/articles/4402611273485-BlueStacks-5-offline-installer#:~:text=To%20install%20BlueStacks%205%20Android%2011) version; to uninstall it, please use the official [Uninstall Tool](https://support.bluestacks.com/hc/en-us/articles/360057724751-How-to-uninstall-BlueStacks-5-BlueStacks-X-and-BlueStacks-Services-completely-from-your-PC) to get rid of the residue.\n- If the adb port number keeps changing irregularly and is different every time you start it, it may be because your computer has [Hyper-V](https://support.bluestacks.com/hc/en-us/articles/4415238471053-System-requirements-for-BlueStacks-5-on-Hyper-V-enabled-Windows-10-and-11) enabled. MAA will now try to automatically read the port number within the Blue Stacker emulator configuration file, if this does not work/you have a need to multi-open/have more than one emulator kernel installed, please refer to the [Connection (TODO)](../connection.md#the-port-number-of-bluestack-emulator-hyper-v-is-different-every-time-it-is-started) to make changes. Since Hyper-V runs as administrator, operations that don\'t involve adb such as auto-shutdown of the emulator, auto-detect connection, etc. also need to run MAA as administrator.',
|
||||
note: 'Fully compatible. Need to turn on `Allow ADB connections` in the emulator `Settings` - `Engine Settings`. Known to be compatible with Hyper-V.\n\n- Recommended to download [Offline Installer](https://support.bluestacks.com/hc/en-us/articles/4402611273485-BlueStacks-5-offline-installer) to avoid slow and bundled installation; recommend installing [Android 11](https://support.bluestacks.com/hc/en-us/articles/4402611273485-BlueStacks-5-offline-installer#:~:text=To%20install%20BlueStacks%205%20Android%2011) version; to uninstall it, please use the official [Uninstall Tool](https://support.bluestacks.com/hc/en-us/articles/360057724751-How-to-uninstall-BlueStacks-5-BlueStacks-X-and-BlueStacks-Services-completely-from-your-PC) to get rid of the residue.\n- If the adb port number keeps changing irregularly and is different every time you start it, it may be because your computer has [Hyper-V](https://support.bluestacks.com/hc/en-us/articles/4415238471053-System-requirements-for-BlueStacks-5-on-Hyper-V-enabled-Windows-10-and-11) enabled. MAA will now try to automatically read the port number within the Blue Stacker emulator configuration file, if this does not work/you have a need to multi-open/have more than one emulator kernel installed, please refer to the [Connection (TODO)](../connection.html#the-port-number-of-bluestack-emulator-hyper-v-is-different-every-time-it-is-started) to make changes. Since Hyper-V runs as administrator, operations that don\'t involve adb such as auto-shutdown of the emulator, auto-detect connection, etc. also need to run MAA as administrator.',
|
||||
},
|
||||
{
|
||||
name: 'MuMu Emulator 12',
|
||||
link: 'https://mumu.163.com/',
|
||||
note: 'Fully compatible, with additional support for the [exclusive Extreme Control Mode](../connection.md#mumu-screenshot-enhanced-mode). Known to be compatible with Hyper-V.\n\n- The "Exit emulator when done" function may occasionally be abnormal, if you encounter it, please contact MuMu official for feedback;\n- If you are using MuMu 12 version 3.5.4 ~ 3.5.7, please disable the "Keep alive in the background" function in MuMu 12 Settings - Others. "Keep alive while hanging in the background" (see [Official Announcement](https://mumu.163.com/help/20230802/35047_1102450.html) for details);\n- You need to check the port information of the corresponding instance through the ADB button of MuMu 12 Multiple Opener when you open more than one instance, and change the port number of the connection address in MAA `Settings` - `Connection Settings` to the corresponding port.',
|
||||
note: 'Fully compatible, with additional support for the [exclusive Extreme Control Mode](../connection.html#mumu-screenshot-enhanced-mode). Known to be compatible with Hyper-V.\n\n- The "Exit emulator when done" function may occasionally be abnormal, if you encounter it, please contact MuMu official for feedback;\n- If you are using MuMu 12 version 3.5.4 ~ 3.5.7, please disable the "Keep alive in the background" function in MuMu 12 Settings - Others. "Keep alive while hanging in the background" (see [Official Announcement](https://mumu.163.com/help/20230802/35047_1102450.html) for details);\n- You need to check the port information of the corresponding instance through the ADB button of MuMu 12 Multiple Opener when you open more than one instance, and change the port number of the connection address in MAA `Settings` - `Connection Settings` to the corresponding port.',
|
||||
},
|
||||
{
|
||||
name: 'LDPlayer',
|
||||
|
||||
@@ -93,7 +93,7 @@ Appends a task.
|
||||
}
|
||||
```
|
||||
|
||||
Supports some of the special stages,Please refer to [autoLocalization example](..\..\..\tools\AutoLocalization\example\en-us.xaml#L260).
|
||||
Supports some of the special stages,Please refer to [autoLocalization example](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/tools/AutoLocalization/example/en-us.xaml#L260).
|
||||
|
||||
- `Recruit`
|
||||
Recruitment
|
||||
|
||||
@@ -67,7 +67,7 @@ As JSON format does not support comments, please remove the comments when using
|
||||
|
||||
|
||||
"strategies": [ // Required
|
||||
// It will deploy the tool_men in each object according to the order.
|
||||
// It will deploy the tool_men in each object according to the order.
|
||||
// If the current hand does not have any tool_men, it will deploy the next object.
|
||||
{
|
||||
"core": "Thorns",
|
||||
@@ -109,7 +109,7 @@ As JSON format does not support comments, please remove the comments when using
|
||||
],
|
||||
"draw_as_possible": true, // "Deploy Operator" button. Whether to use it when available. Optional, default is true.
|
||||
"actions": [ // Optional
|
||||
// It reuses the logic of copying homework.
|
||||
// It reuses the logic of copying homework.
|
||||
// If the condition of the action is met, the action is executed. Otherwise, the strategies above are executed.
|
||||
{
|
||||
"type": "Deploy Operator" // New type. Click the "Deploy Operator" button. It is invalid when "draw_as_possible" is true.
|
||||
@@ -145,6 +145,4 @@ As JSON format does not support comments, please remove the comments when using
|
||||
|
||||
## Example
|
||||
|
||||
[SSS_阿卡胡拉丛林.json](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/resource/copilot/SSS_阿卡胡拉丛林.json)
|
||||
|
||||
[SSS_多索雷斯在建地块.json](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/resource/copilot/SSS_多索雷斯在建地块.json)
|
||||
<https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/resource/copilot/>
|
||||
|
||||
@@ -65,7 +65,7 @@ Usage of `resource/tasks.json` and description of each field
|
||||
// Auto-scaling to 1280x720; default when not filled [ 0, 0, 1280, 720 ]
|
||||
// Fill in as much as possible, reducing the recognition range can reduce performance consumption and speed up recognition
|
||||
|
||||
"cache": true, // Optional, indicates whether the task uses caching or not, default is true;
|
||||
"cache": false, // Optional, indicates whether the task uses caching or not, default is false;
|
||||
// After the first recognition, only the first recognized position will be recognized forever, enable to save performance significantly
|
||||
// but only for tasks where the location of the target to be recognized will not change at all, set to false if the location of the target to be recognized will change
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ If you encounter a bug, or have a strong demand for a certain function, welcome
|
||||
|
||||
### CLI Support
|
||||
|
||||
MAA supports command line interface (CLI) operation, supports Linux, macOS and Windows, and can be used for automated scripts or on servers without graphical interfaces. Check [CLI Guide](./manual/cli/intro.md)
|
||||
MAA supports command line interface (CLI) operation, supports Linux, macOS and Windows, and can be used for automated scripts or on servers without graphical interfaces. Check [CLI Guide](./manual/cli/)
|
||||
|
||||
## Join us
|
||||
|
||||
|
||||
@@ -496,7 +496,8 @@
|
||||
"char_4125_rdoc": "Doc",
|
||||
"char_4126_fuze": "Fuze",
|
||||
"char_4131_odda": "Odda",
|
||||
"char_4137_udflow": "Underflow"
|
||||
"char_4137_udflow": "Underflow",
|
||||
"char_4147_mitm": "Mitm"
|
||||
},
|
||||
"6": {
|
||||
"char_003_kalts": "Kal'tsit",
|
||||
@@ -593,7 +594,8 @@
|
||||
"char_4132_ascln": "Ascalon",
|
||||
"char_4133_logos": "Logos",
|
||||
"char_4134_cetsyr": "Civilight Eterna",
|
||||
"char_4145_ulpia": "Ulpianus"
|
||||
"char_4145_ulpia": "Ulpianus",
|
||||
"char_4146_nymph": "Nymph"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -248,7 +248,8 @@
|
||||
"char_4000_jnight": "ジャスティスナイト",
|
||||
"char_4077_palico": "テラ大陸調査団",
|
||||
"char_4091_ulika": "U-Official",
|
||||
"char_4093_frston": "Friston-3"
|
||||
"char_4093_frston": "Friston-3",
|
||||
"char_4136_phonor": ""
|
||||
},
|
||||
"2": {
|
||||
"char_009_12fce": "12F",
|
||||
@@ -337,7 +338,8 @@
|
||||
"char_4063_quartz": "クォーツ",
|
||||
"char_4067_lolxh": "羅小黒",
|
||||
"char_4100_caper": "ケイパー",
|
||||
"char_4107_vrdant": "ヴァーダント"
|
||||
"char_4107_vrdant": "ヴァーダント",
|
||||
"char_4130_luton": ""
|
||||
},
|
||||
"5": {
|
||||
"char_002_amiya": "アーミヤ",
|
||||
@@ -487,7 +489,15 @@
|
||||
"char_4106_bryota": "ブライオファイタ",
|
||||
"char_4109_baslin": "ベースライン",
|
||||
"char_4110_delphn": "デルフィーン",
|
||||
"char_4114_harold": "ハロルド"
|
||||
"char_4114_harold": "ハロルド",
|
||||
"char_4119_wanqin": "",
|
||||
"char_4122_grabds": "",
|
||||
"char_4124_iana": "",
|
||||
"char_4125_rdoc": "",
|
||||
"char_4126_fuze": "",
|
||||
"char_4131_odda": "",
|
||||
"char_4137_udflow": "",
|
||||
"char_4147_mitm": ""
|
||||
},
|
||||
"6": {
|
||||
"char_003_kalts": "ケルシー",
|
||||
@@ -577,8 +587,15 @@
|
||||
"char_4087_ines": "イネス",
|
||||
"char_4088_hodrer": "へドリー",
|
||||
"char_4098_vvana": "ヴィヴィアナ",
|
||||
"char_4116_blkkgt": "デーゲンブレヒャー"
|
||||
"char_4117_ray": "レイ"
|
||||
"char_4116_blkkgt": "デーゲンブレヒャー",
|
||||
"char_4117_ray": "レイ",
|
||||
"char_4121_zuole": "",
|
||||
"char_4123_ela": "",
|
||||
"char_4132_ascln": "",
|
||||
"char_4133_logos": "",
|
||||
"char_4134_cetsyr": "",
|
||||
"char_4145_ulpia": "",
|
||||
"char_4146_nymph": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -248,7 +248,8 @@
|
||||
"char_4000_jnight": "저스티스 나이트",
|
||||
"char_4077_palico": "테라 대륙 조사단",
|
||||
"char_4091_ulika": "U-Official",
|
||||
"char_4093_frston": "Friston-3"
|
||||
"char_4093_frston": "Friston-3",
|
||||
"char_4136_phonor": ""
|
||||
},
|
||||
"2": {
|
||||
"char_009_12fce": "12F",
|
||||
@@ -337,7 +338,8 @@
|
||||
"char_4063_quartz": "쿼츠",
|
||||
"char_4067_lolxh": "나소흑",
|
||||
"char_4100_caper": "케이퍼",
|
||||
"char_4107_vrdant": "버던트"
|
||||
"char_4107_vrdant": "버던트",
|
||||
"char_4130_luton": ""
|
||||
},
|
||||
"5": {
|
||||
"char_002_amiya": "아미야",
|
||||
@@ -479,7 +481,7 @@
|
||||
"char_4071_peper": "파프리카",
|
||||
"char_4078_bdhkgt": "지에윈",
|
||||
"char_4079_haini": "",
|
||||
"char_4081_warmy": "",
|
||||
"char_4081_warmy": "워미",
|
||||
"char_4083_chimes": "윈드차임스",
|
||||
"char_4102_threye": "발라크빈",
|
||||
"char_4104_coldst": "콜드샷",
|
||||
@@ -487,7 +489,15 @@
|
||||
"char_4106_bryota": "브라이오피타",
|
||||
"char_4109_baslin": "베이스라인",
|
||||
"char_4110_delphn": "델핀",
|
||||
"char_4114_harold": "해럴드"
|
||||
"char_4114_harold": "해럴드",
|
||||
"char_4119_wanqin": "",
|
||||
"char_4122_grabds": "",
|
||||
"char_4124_iana": "",
|
||||
"char_4125_rdoc": "",
|
||||
"char_4126_fuze": "",
|
||||
"char_4131_odda": "",
|
||||
"char_4137_udflow": "",
|
||||
"char_4147_mitm": ""
|
||||
},
|
||||
"6": {
|
||||
"char_003_kalts": "켈시",
|
||||
@@ -577,7 +587,15 @@
|
||||
"char_4087_ines": "이네스",
|
||||
"char_4088_hodrer": "외드레르",
|
||||
"char_4098_vvana": "비비아나",
|
||||
"char_4116_blkkgt": "데겐블레허"
|
||||
"char_4116_blkkgt": "데겐블레허",
|
||||
"char_4117_ray": "레이",
|
||||
"char_4121_zuole": "",
|
||||
"char_4123_ela": "",
|
||||
"char_4132_ascln": "",
|
||||
"char_4133_logos": "",
|
||||
"char_4134_cetsyr": "",
|
||||
"char_4145_ulpia": "",
|
||||
"char_4146_nymph": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -496,7 +496,8 @@
|
||||
"char_4125_rdoc": "医生",
|
||||
"char_4126_fuze": "导火索",
|
||||
"char_4131_odda": "奥达",
|
||||
"char_4137_udflow": "深巡"
|
||||
"char_4137_udflow": "深巡",
|
||||
"char_4147_mitm": "渡桥"
|
||||
},
|
||||
"6": {
|
||||
"char_003_kalts": "凯尔希",
|
||||
@@ -593,7 +594,8 @@
|
||||
"char_4132_ascln": "阿斯卡纶",
|
||||
"char_4133_logos": "逻各斯",
|
||||
"char_4134_cetsyr": "魔王",
|
||||
"char_4145_ulpia": "乌尔比安"
|
||||
"char_4145_ulpia": "乌尔比安",
|
||||
"char_4146_nymph": "妮芙"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ icon: iconoir:developer
|
||||
|
||||
### プログラミングの仕方がわからないので、JSONファイルやドキュメントなどを少し変更したいのですが、どうすればいいですか?
|
||||
|
||||
[「パラスちゃん」も理解できるGitHubのPull Requestの使用ガイド](./純WebサイトのPRチュートリアル.md)へようこそ(純WebサイトのPRチュートリアル)
|
||||
[「パラスちゃん」も理解できるGitHubのPull Requestの使用ガイド](./pr-tutorial.md)へようこそ(純WebサイトのPRチュートリアル)
|
||||
|
||||
### プログラミングの仕方を知っていますが、GitHub/C++/...... に触れたことがありません、どうすればいいですか?
|
||||
|
||||
@@ -120,4 +120,4 @@ GitHub codespace を作成して C++ 開発環境を自動的に構成する
|
||||
|
||||
[](https://codespaces.new/MaaAssistantArknights/MaaAssistantArknights)
|
||||
|
||||
次に、 vscode または [Linuxチュートリアル](./Linuxチュートリアル.md) のプロンプトに従って、 GCC 12 および CMake プロジェクトを構成します。
|
||||
次に、 vscode または [Linuxチュートリアル](./linux-tutorial.md) のプロンプトに従って、 GCC 12 および CMake プロジェクトを構成します。
|
||||
|
||||
@@ -5,7 +5,9 @@ icon: bxs:bot
|
||||
|
||||
# Issue Botの使う方
|
||||
|
||||
Issue Botのアクションは[issue-checker](https://github.com/zzyyyl/issue-checker)になっており、設定ファイルである[issue-checker.yml](.github/issue-checker.yml)を利用します。
|
||||
Issue Botのアクションは[issue-checker](https://github.com/zzyyyl/issue-checker)になっており、設定ファイルである[issue-checker.yml][issue-checker]を利用します。
|
||||
|
||||
[issue-checker]: https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/.github/issue-checker.yml
|
||||
|
||||
::: warning
|
||||
Commitizenの仕様でコミットしていない場合、マージリクエストは`ambiguous`とマークされることに注意してください。
|
||||
@@ -17,7 +19,7 @@ Commitizenの仕様でコミットしていない場合、マージリクエス
|
||||
|
||||
- `module`, `Client`, `ambiguous`, `translation required`などのラベルを Issue および Pull Request に追加します。
|
||||
Issue Botは、キーワードを元にカテゴリーを追加します。
|
||||
キーワードは[設定ファイル](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/.github/issue-checker.yml)を確認して下さい。
|
||||
キーワードは[設定ファイル][issue-checker]を確認して下さい。
|
||||
- 作成者が可視性がパブリックに設定されている MAA メンバーであるの Issue と Pull Request の場合、`MAA Team`ラベルを追加しました。
|
||||
|
||||
#### Issuesとコメント
|
||||
|
||||
@@ -63,11 +63,11 @@ MAAの構築方法はまだ議論されていますが、このチュートリ
|
||||
## その他のインストール方法
|
||||
|
||||
- AUR: [maa-assistant-arknights](https://aur.archlinux.org/packages/maa-assistant-arknights)
|
||||
- NUR: [nur.repos.cryolitia.MaaAssistantArknights](https://github.com/nix-community/nur-combined/tree/master/repos/cryolitia/pkgs/MaaAssistantArknights/default.nix#L138)
|
||||
- NUR: [nur.repos.cryolitia.MaaAssistantArknights](https://github.com/nix-community/nur-combined/tree/master/repos/cryolitia/pkgs/maa-assistant-arknights/default.nix#L138)
|
||||
|
||||
## 統合ドキュメント
|
||||
|
||||
[~~ドキュメントとは言えないかもしれません~~](../プロトコルドキュメント/統合ドキュメント.md)
|
||||
[~~ドキュメントとは言えないかもしれません~~](../protocol/integration.md)
|
||||
|
||||
### Python
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ icon: ri:earth-fill
|
||||
このチュートリアルを始める前に、以下の内容を確認してください。
|
||||
|
||||
1. 必要なソフトウェアをインストールし、正しく設定されていること。大陸版クライアントまたは海外版クライアントの `readme.md` に、サポートされている機能が正しく動作するための情報があるはずです。
|
||||
2. [タスクAPI](../プロトコルドキュメント/タスクAPI.md) を読み、各フィールドの意味と使い方の基本を理解していること。また、コード中の `@` と `#` の意味と使い方を理解しておくこと。
|
||||
2. [タスクAPI](../protocol/task-schema.md) を読み、各フィールドの意味と使い方の基本を理解していること。また、コード中の `@` と `#` の意味と使い方を理解しておくこと。
|
||||
3. 大陸版クライアントの `task.json` ファイルとテンプレート画像が海外クライアントに記載されていない、または不足している場合、代替手段として使用されることを理解していること。海外クライアントの `task.json` の内容は、大陸版のタスクのフィールドに合わせて書き換える必要があります。
|
||||
4. ある程度の英語力があり、英語のログを読むことができ、ログから不足している画像やその他の情報を見つけることができること。
|
||||
5. タスクチェーンに従って、個別に修正を行うことが推奨されることを理解していること。例えば、Awardタスクを修正する場合、`template image`, `text`, `roi` をその `next` フィールドの順序に従って段階的に修正する必要があります。こうすることで、すべてのタスクが修正後に正常に動作することを確認し、エラーを簡単に発見することができます。また、一度に多くのコンテンツを修正した場合に、どのタスクで止まっているのか忘れてしまうといった混乱も防ぐことができます。
|
||||
@@ -138,4 +138,4 @@ ROIの範囲を変更するには
|
||||
|
||||
## 変更を送信する
|
||||
|
||||
[Github Pull Requst ガイド](./開発を開始.md#github-pull-request-プロセス概要)を参照してください。
|
||||
[Github Pull Requst ガイド](../develop/development.md#github-pull-request-プロセス概要)を参照してください。
|
||||
|
||||
@@ -11,7 +11,7 @@ icon: mingcute:git-pull-request-fill
|
||||
|
||||
::: warning
|
||||
このガイドでは、多くの概念を簡略化し、より多くの人々が実際に使用できるように、不格好であるが簡単な操作が含まれています。また、正しくない説明もありますので、大変恐れ入りますが、専門家の方々にはお許しください。
|
||||
Gitの使用経験とプログラミングの基礎がある場合、[Github Pull Request プロセス概要](./開発を開始.md#github-pull-request-プロセス概要)など、より上級のチュートリアルを見ることができます。
|
||||
Gitの使用経験とプログラミングの基礎がある場合、[Github Pull Request プロセス概要](./development.md#github-pull-request-プロセス概要)など、より上級のチュートリアルを見ることができます。
|
||||
:::
|
||||
|
||||
## 基本概念および用語の説明
|
||||
|
||||
@@ -6,4 +6,16 @@ dir:
|
||||
order: 6
|
||||
---
|
||||
|
||||
::: important Translation Required
|
||||
This page is outdated and maybe still in Simplified Chinese. Translation is needed.
|
||||
:::
|
||||
|
||||
一个使用 Rust 编写的简单 MAA 命令行工具。
|
||||
|
||||
## 功能
|
||||
|
||||
- 运行预定义或自定义的任务,例如 `maa fight`,`maa run <task>`;
|
||||
- 使用 `maa install` 和 `maa update` 安装和更新MaaCore及资源;
|
||||
- 使用 `maa self update` 更新自身。
|
||||
|
||||
<Catalog base='/ja-jp/manual/cli/' />
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
---
|
||||
order: 4
|
||||
order: 3
|
||||
icon: material-symbols:settings
|
||||
---
|
||||
|
||||
# 配置 maa-cli
|
||||
# 配置
|
||||
|
||||
::: important Translation Required
|
||||
This page is outdated and maybe still in Simplified Chinese. Translation is needed.
|
||||
@@ -268,10 +268,13 @@ params = { stage = "CE-6" }
|
||||
[tasks.variants.params.stage]
|
||||
default = "1-7" # 默认的关卡,可选(如果没有默认值,输入空值将会重新提示输入)
|
||||
description = "a stage to fight" # 描述,可选
|
||||
|
||||
# 当输入的关卡是 1-7 时,需要输入使用理智药的数量
|
||||
[tasks.variants.params.medicine]
|
||||
# 依赖的参数,键为参数名,值为依赖的参数的预期值
|
||||
# 当设置时,只有所有的依赖参数都满足预期值时,这个参数才会被要求输入
|
||||
deps = { stage = "1-7" }
|
||||
# 参数可以设置为条件参数,这样只有满足条件时才需要输入
|
||||
# conditions 字段是一个表,其中键是同一层级下其他参数名,值是期望的值
|
||||
# 这里的条件是 stage 是 1-7, 如果存在多个条件,那么所有条件都必须满足
|
||||
conditions = { stage = "1-7" }
|
||||
default = 1000
|
||||
description = "medicine to use"
|
||||
```
|
||||
@@ -440,13 +443,11 @@ url = "https://github.com/MaaAssistantArknights/MaaResource.git"
|
||||
- CLI 配置的 JSON Schema 文件为 [`cli.schema.json`][cli-schema]。
|
||||
|
||||
[task-types]: ../../protocol/integration.md#任务类型一览
|
||||
[emulator-ports]: ../../manual/faq.md#模拟器调试端口
|
||||
[playcover-doc]: ../../manual/device/macos.md#-playcover原生运行最流畅-
|
||||
[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
|
||||
[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
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
---
|
||||
order: 5
|
||||
order: 4
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
# maa-cli 常见问题
|
||||
# 常见问题
|
||||
|
||||
::: important Translation Required
|
||||
This page is outdated and maybe still in Simplified Chinese. Translation is needed.
|
||||
@@ -31,5 +31,3 @@ MaaCore 的依赖 `fastdeploy` 会输出一些日志,因此你在运行 maa-cl
|
||||
## 3. 在 macOS 下使用 maa-cli 启动的 PlayCover 游戏客户端,无法代理作战且肉鸽无法结算
|
||||
|
||||
由于未知原因,通过终端启动的 PlayCover 游戏客户端无法代理作战,且肉鸽无法结算。但是该状况仅限于通过终端运行的 maa-cli。因此如果你是在终端交互使用,那么你可能需要手动启动游戏。如果你是通过 cron 等方式运行 maa-cli,那么该问题不会影响你的使用。
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
---
|
||||
order: 2
|
||||
order: 1
|
||||
icon: material-symbols:download
|
||||
---
|
||||
|
||||
# 安装及编译 maa-cli
|
||||
# 安装及编译
|
||||
|
||||
::: important Translation Required
|
||||
This page is outdated and maybe still in Simplified Chinese. Translation is needed.
|
||||
@@ -59,10 +59,10 @@ Homebrew 用户可以通过非官方的 [tap](https://github.com/MaaAssistantArk
|
||||
|
||||
如果你的系统不受支持或者不想使用包管理器,你可以点击以下链接下载对应平台的预编译二进制文件,解压后将可执行文件放入 `PATH` 中即可使用。
|
||||
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-x86_64-pc-windows-msvc.zip)
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-pc-windows-msvc.zip)
|
||||
|
||||
如果你的平台不在上述列表中,可以尝试自行编译安装(参见下文)。
|
||||
|
||||
@@ -120,5 +120,3 @@ maa install
|
||||
```
|
||||
|
||||
**注意**:只有使用包管理器安装 maa-cli 的用户才能使用包管理器安装 MaaCore,否则请使用 `maa install` 命令安装。此外,`maa install` 通过下载官方预编译的 MaaCore,而包管理器安装的 MaaCore 的编译选项和依赖版本与官方预编译的版本不同。这不会影响 maa-cli 的使用,但可能会导致 MaaCore 的功能和性能有所不同。比如,包管理器安装的 MaaCore 使用较新版本的 `fastdeploy`,而官方预编译的 MaaCore 使用较旧版本的 `fastdeploy`。而在新版本的 `fastdeploy` 中,日志可以被隐藏,这可以消除了一些不必要的日志输出。
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
---
|
||||
order: 1
|
||||
icon: material-symbols:toc
|
||||
---
|
||||
|
||||
# maa-cli 介绍
|
||||
|
||||
::: important Translation Required
|
||||
This page is outdated and maybe still in Simplified Chinese. Translation is needed.
|
||||
:::
|
||||
|
||||
一个使用 Rust 编写的简单 [MAA][maa-home] 命令行工具。
|
||||
|
||||
## 功能
|
||||
|
||||
- 运行预定义或自定义的任务,例如 `maa fight`,`maa run <task>`;
|
||||
- 使用 `maa install` 和 `maa update` 安装和更新MaaCore及资源;
|
||||
- 使用 `maa self update` 更新自身。
|
||||
|
||||
## 文档
|
||||
|
||||
- [安装及编译](install.md)
|
||||
- [使用](usage.md)
|
||||
- [配置](config.md)
|
||||
- [常见问题](faq.md)
|
||||
|
||||
[maa-home]: https://github.com/MaaAssistantArknights/MaaAssistantArknights/
|
||||
@@ -1,9 +1,9 @@
|
||||
---
|
||||
order: 3
|
||||
order: 2
|
||||
icon: material-symbols:summarize
|
||||
---
|
||||
|
||||
# 使用 maa-cli
|
||||
# 使用
|
||||
|
||||
::: important Translation Required
|
||||
This page is outdated and maybe still in Simplified Chinese. Translation is needed.
|
||||
@@ -30,9 +30,19 @@ maa self update
|
||||
|
||||
**注意**:使用包管理器安装 maa-cli 的用户请使用包管理器更新 maa-cli,此命令在这些用户中无效。
|
||||
|
||||
## 初始化配置
|
||||
|
||||
一旦完成了 MaaCore 的安装,通常情况下,你无需额外配置就可以直接运行任务。默认配置可能不适用于所有用户,因此你可以通过以下命令来初始化配置:
|
||||
|
||||
```bash
|
||||
maa init
|
||||
```
|
||||
|
||||
通过这个命令,你可以交互式地配置 [MaaCore 的相关配置][config-core]。
|
||||
|
||||
## 运行任务
|
||||
|
||||
一旦完成了 MaaCore 的安装,通常情况下,你无需额外配置就可以直接运行任务。默认配置可能不适用于所有用户,如果你在运行任务时遇到问题,你可以参考 [配置文档][config-core] 修改配置。
|
||||
完成 MaaCore 的安装和配置后,你可以运行任务了。maa-cli 支持两种类型的任务:预定义任务和自定义任务。
|
||||
|
||||
### 预定义任务
|
||||
|
||||
@@ -91,7 +101,5 @@ maa-cli 默认会向标准误 (stderr) 输出日志。`--log-file` 选项可以
|
||||
|
||||
更多命令的使用方法可以通过 `maa help` 查看,具体命令的使用方法可以 通过 `maa help <command>` 查看。
|
||||
|
||||
[config-core]: config.md#MaaCore-相关配置
|
||||
[config-core]: config.md#maacore-相关配置
|
||||
[custom-task]: config.md#自定义任务
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -5,10 +5,6 @@ icon: mdi:plug
|
||||
|
||||
# 接続設定
|
||||
|
||||
:::note
|
||||
実機に関する問題については、[Android 実機](./device/android.md) を参照してください。
|
||||
:::
|
||||
|
||||
## ADB パス
|
||||
|
||||
:::info 技術的詳細
|
||||
|
||||
@@ -15,7 +15,7 @@ icon: teenyicons:linux-alt-solid
|
||||
|
||||
::: tip
|
||||
プリコンパイル済みバージョンには、比較的新しいLinuxディストリビューション(Ubuntu 22.04)でコンパイルされた動的ライブラリが含まれており、システムに古いバージョンのlibstdc++がある場合、ABIの非互換性に遭遇する可能性があります
|
||||
[Linuxコンパイル・チュートリアル](../../開発関連/Linuxチュートリアル.md) を参照して再コンパイルまたはコンテナを使用して実行できます
|
||||
[Linuxコンパイル・チュートリアル](../../develop/linux-tutorial.md) を参照して再コンパイルまたはコンテナを使用して実行できます
|
||||
:::
|
||||
|
||||
- Arch Linuxシリーズのリリース版は、aur パッケージ [maa-assistant-arknights](https://aur.archlinux.org/packages/maa-assistant-arknights)を選択する使用し、インストール後のプロンプトに従ってファイルを編集することができる
|
||||
@@ -54,7 +54,7 @@ icon: teenyicons:linux-alt-solid
|
||||
|
||||
### 3. タスク構成
|
||||
|
||||
カストムタスク: 必要に応じて [統合ドキュメント](../../プロトコルドキュメント/統合ドキュメント.md) を参照し、 `sample.py` の [`# タスクとパラメーターについては 統合ドキュメント`](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/722f0ddd4765715199a5dc90ea1bec2940322344/src/Python/sample.py#L54) 欄を変更する
|
||||
カストムタスク: 必要に応じて [統合ドキュメント](../../protocol/integration.md) を参照し、 `sample.py` の [`# タスクとパラメーターについては 統合ドキュメント`](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/722f0ddd4765715199a5dc90ea1bec2940322344/src/Python/sample.py#L54) 欄を変更する
|
||||
|
||||
## エミュレータのサポート
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ icon: basil:apple-solid
|
||||
# Mac でのエミューレータ
|
||||
|
||||
::: tip
|
||||
問題が発生した場合は、まず [よくある質問](../よくある質問.md) を参照してください
|
||||
問題が発生した場合は、まず [よくある質問](../faq.md) を参照してください
|
||||
:::
|
||||
|
||||
## Apple Silicon チップ
|
||||
@@ -53,7 +53,7 @@ icon: basil:apple-solid
|
||||
|
||||
### ✅ [NOX](https://www.yeshen.com/)
|
||||
|
||||
サポートされています。現在、 Ma cの MAAX バージョンはエミュレータの自動適応をサポートしていないため、MAAの `設定` - `接続設定` で、 `adb` に `127.0.0.1:62001`を接続する必要があり、ポートはデフォルトの` 5555 `ではないことに注意し、エミュレータポートに関する詳細な説明は[一般的なエミュレータadbポート](../よくある質問.md#一般的なAndroidエミュレータのadbポート)を参照してください。
|
||||
サポートされています。現在、 Ma cの MAAX バージョンはエミュレータの自動適応をサポートしていないため、MAAの `設定` - `接続設定` で、 `adb` に `127.0.0.1:62001`を接続する必要があり、ポートはデフォルトの` 5555 `ではないことに注意し、エミュレータポートに関する詳細な説明は[一般的なエミュレータadbポート](../faq.md#一般的なAndroidエミュレータのadbポート)を参照してください。
|
||||
|
||||
補足:mac の NOX の adb バイナリファイルの場所は `/Applications/NoxAppPlayer.app/Contents/MacOS/adb` 、親ディレクトリ `MacOS` の下で `adb devices` コマンドを使用してadbポートを表示できます。
|
||||
|
||||
|
||||
@@ -5,10 +5,6 @@ icon: ri:windows-fill
|
||||
|
||||
# Windows でのエミューレータ
|
||||
|
||||
::: tip
|
||||
問題がある場合は [よくある質問](../よくある質問.md)を、先にお読みください。
|
||||
:::
|
||||
|
||||
以下のシミュレーターの順番は、ランダムに生成されたものであり、順不同である。
|
||||
|
||||
<script setup>
|
||||
|
||||
@@ -64,7 +64,7 @@ MAA はバージョン 5.0 で .NET 8 に更新され、エンドユーザーに
|
||||
## 接続エラー
|
||||
|
||||
::: tip
|
||||
[エミュレータのサポート](./エミュレータのサポート) を参照して、エミュレータがサポートされていることを確認してください。
|
||||
[エミュレータのサポート](./device/) を参照して、エミュレータがサポートされていることを確認してください。
|
||||
:::
|
||||
|
||||
### adbと接続アドレスが正しいことを確認する
|
||||
@@ -109,7 +109,7 @@ Android Phone Assistant は adb を使用してスマホと通信しますが、
|
||||
|
||||
### エミュレーターを変更する
|
||||
|
||||
[エミュレータのサポート](./エミュレータのサポート) を参照してください。
|
||||
[エミュレータのサポート](./device/) を参照してください。
|
||||
|
||||
## 接続に成功した後、固まり、全く操作できなくなる
|
||||
|
||||
@@ -185,7 +185,7 @@ MAA はレジストリから `bluestacks.conf` の保存場所を読み取ろう
|
||||
|
||||
- `UI調整`を使用している場合は、0に調整してください。
|
||||
- CN以外のクライアントをお使いの場合は、`設定` - `対象クライアント` - `クライアントバージョン` の選択でご確認ください。また、非CNクライアントでは全ての機能がサポートされているわけではありませんので、各国語のドキュメントを参照してください。
|
||||
- 自動ローグを実行している場合、[詳細説明](./詳細説明.md#自動統合戦略-ローグライク)を参照し、`スタート` - `自動ローグ` - `主題`で正しいテーマを選択してください。
|
||||
- 自動ローグを実行している場合、[詳細説明](./introduction/integrated-strategy.md)を参照し、`スタート` - `自動ローグ` - `主題`で正しいテーマを選択してください。
|
||||
- `Adb Input` のタッチモードで動作が遅いのは正常です。オートバトルなどが必要な場合は他のモードに切り替えてみてください。
|
||||
|
||||
### スクリーンショットに時間がかかる/長すぎるというメッセージが表示される
|
||||
|
||||
@@ -41,7 +41,7 @@ JSONファイルはコメントをサポートしていません。テキスト
|
||||
|
||||
### オペレーターの分類
|
||||
|
||||
ゲーム理解に基づいて、オペレーターを異なる **_groups_** (グループ、関連概念は[自動戦闘フロープロトコル](./自動戦闘API.md)を参照)に分類します
|
||||
ゲーム理解に基づいて、オペレーターを異なる **_groups_** (グループ、関連概念は[自動戦闘フロープロトコル](./copilot-schema.md)を参照)に分類します
|
||||
|
||||
::: info 注意
|
||||
|
||||
@@ -86,7 +86,7 @@ JSONファイルはコメントをサポートしていません。テキスト
|
||||
1. 既存のグループの紹介
|
||||
|
||||
ファントムテーマを例に取ると:主にオペレーターを以下のように分類しています
|
||||
| グループ | 主な考慮事項 | 主に職種を含む | オペレーターの例 |
|
||||
| グループ | 主な考慮事項 | 主に職種を含む | オペレーターの例 |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| **_地面阻挡_** | 場に立つことと雑魚を清掃 | 重装、前衛 | 庇護衛士、基石、ラ・プルマ、マウンテン、M3、リィンとシーンの召喚ユニット、スポット、重装予備隊員 |
|
||||
| **_地面单切_** | 一人でエリートモンスターと戦う | 執行者-特殊 | スルト、血掟テキサス、キリンRヤトウ、M3、レッド |
|
||||
|
||||
@@ -101,7 +101,7 @@ TaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const char* p
|
||||
}
|
||||
```
|
||||
|
||||
いくつかの特別ステージ名もサポートしています、[組み込み例](..\..\tools\AutoLocalization\example\ja-jp.xaml#L230)をご参照ください
|
||||
いくつかの特別ステージ名もサポートしています、[組み込み例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/tools/AutoLocalization/example/ja-jp.xaml#L230)をご参照ください
|
||||
|
||||
- `Recruit`
|
||||
公開求人
|
||||
@@ -248,7 +248,7 @@ TaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const char* p
|
||||
}
|
||||
```
|
||||
|
||||
自動操縦JSONの詳細については、[自動戦闘API](./自動戦闘API.md)を参照してください
|
||||
自動操縦JSONの詳細については、[自動戦闘API](./copilot-schema.md)を参照してください
|
||||
|
||||
- `SSSCopilot`
|
||||
保全駐在の自動戦闘
|
||||
@@ -261,7 +261,7 @@ TaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const char* p
|
||||
}
|
||||
```
|
||||
|
||||
保全駐在の自動操縦JSONの詳細については、[保全駐在API](./保全駐在API.md)
|
||||
保全駐在の自動操縦JSONの詳細については、[保全駐在API](./sss-schema.md)
|
||||
|
||||
- `Depot`
|
||||
倉庫アイテム認識
|
||||
|
||||
@@ -134,6 +134,4 @@ JSONファイルはコメントをサポートしていません。テキスト
|
||||
|
||||
## サンプルファイル
|
||||
|
||||
[SSS_阿卡胡拉丛林.json](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/resource/copilot/SSS_阿卡胡拉丛林.json)
|
||||
|
||||
[SSS_多索雷斯在建地块.json](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/resource/copilot/SSS_多索雷斯在建地块.json)
|
||||
<https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/resource/copilot/>
|
||||
|
||||
@@ -69,7 +69,7 @@ JSONファイルはコメントをサポートしていません。テキスト
|
||||
// 1280 * 720 に自動スケーリングします;指定されていない場合はデフォルトで [ 0, 0, 1280, 720 ]
|
||||
// できるだけ記入し、認識範囲を縮小するとパフォーマンス消費が低下し、認識が高速化されます
|
||||
|
||||
"cache": true, // オプション、タスクがキャッシュを使用するかどうかを示します、デフォルトは true です;
|
||||
"cache": false, // オプション、タスクがキャッシュを使用するかどうかを示します、デフォルトは false です;
|
||||
// 最初の認識後、常に最初に認識された位置のみが永久に認識されます。パフォーマンスを著しく向上させるために有効にします
|
||||
// ただし、特定する対象場所が全く変わらないタスクのみ適用され、特定する対象場所が変わる場合は false に設定してください
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ MAAは、MAA Assistant Arknightsです。
|
||||
## 機能一覧
|
||||
|
||||
- 自動作戦、ドロップ認識および [PenguinStats](https://penguin-stats.io/) と [Yituliu](https://ark.yituliu.cn/) へデータアップロード。
|
||||
- 自動基地シフト、オペレーター効率計算、単一設備内に最適なソリューション;[カスタムシフト](./プロトコルドキュメント/基地シフトAPI.md)にも対応しています。
|
||||
- 自動基地シフト、オペレーター効率計算、単一設備内に最適なソリューション;[カスタムシフト](./protocol/base-scheduling-schema.md)にも対応しています。
|
||||
- 自動公開求人、緊急招集票を使う、使い切るのもサポート。[PenguinStats](https://penguin-stats.io/result/stage/recruit/recruit)と[Yituliu](https://ark.yituliu.cn/survey/maarecruitdata)へ公開求人データのアップロード。
|
||||
- 高スターの公開求人を選択するのに便利な公開求人のパネルの手動認識をサポートします。~~(この上級エリートとCost回復はシージかシージか)~~
|
||||
- 所持オペレーターを認識し、既存および未所有のオペレーターの記録サポート、公開求人を手動で設定するためのヒントを提供することもできます。(日本サーバーではオペレーターの名前部分のフォントサイズが異なるため認識にややブレがあります)
|
||||
@@ -83,7 +83,7 @@ UIを見れば使い方もすぐ分かる!
|
||||
|
||||
### 基本設定
|
||||
|
||||
はじめに[エミュレータのサポート](./manual/device)と[MAA使用説明書](./manual/introduction.md)を参照してください。
|
||||
はじめに[エミュレータのサポート](./manual/device)と[MAA使用説明書](./manual/introduction/)を参照してください。
|
||||
|
||||
## よくある質問
|
||||
|
||||
@@ -138,11 +138,11 @@ MAA は中国語(簡体字)を第一言語とし、翻訳見出しはすべ
|
||||
2. Visual Studio 2022 で `MAA.sln` を開き、`MaaWpfGui` を右クリックして、スタートアップ プロジェクトとして設定します。
|
||||
3. VS 上記の設定で 'RelWithDebInfo' 'x64' を選択します (Release パッケージまたは ARM プラットフォームをコンパイルしている場合は、この手順を無視してください)
|
||||
4. `MaaWpfGui` を右クリックし、[プロパティ] - [デバッグ] - [ローカル デバッグを有効にする] を選択します (これにより、C++ コアにブレークポイントを掛けることができます)。
|
||||
5. (オプション) PR を送信する場合は、[clang-formatを有効にする](./開発関連/開発を開始.md#visual-studioでclang-formatを有効にする)を有効にすることをお勧めします。
|
||||
5. (オプション) PR を送信する場合は、[clang-formatを有効にする](./develop/development.md#visual-studioでclang-formatを有効にする)を有効にすることをお勧めします。
|
||||
|
||||
### Linux | macOS
|
||||
|
||||
[Linuxチュートリアル](./開発関連/Linuxチュートリアル.md)を参照してください。
|
||||
[Linuxチュートリアル](./develop/linux-tutorial.md)を参照してください。
|
||||
|
||||
### API
|
||||
|
||||
@@ -154,23 +154,23 @@ MAA は中国語(簡体字)を第一言語とし、翻訳見出しはすべ
|
||||
- [Java HTTPインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/Java/Readme.md)
|
||||
- [Rustインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/master/src/Rust/src/maa_sys):[HTTPインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/tree/master/src/Rust)
|
||||
- [TypeScriptインターフェース](https://github.com/MaaAssistantArknights/MaaAsstElectronUI/tree/main/packages/main/coreLoader)
|
||||
- [Woolangインターフェース](src/Woolang/maa.wo):[統合例](src/Woolang/main.wo)
|
||||
- [統合ドキュメント](./プロトコルドキュメント/統合ドキュメント.md)
|
||||
- [コールバックAPI](./プロトコルドキュメント/コールバックAPI.md)
|
||||
- [タスクAPI](./プロトコルドキュメント/タスクAPI.md)
|
||||
- [自動戦闘API](./プロトコルドキュメント/自動戦闘API.md)
|
||||
- [Woolangインターフェース](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/Woolang/maa.wo):[統合例](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/Woolang/demo.wo)
|
||||
- [統合ドキュメント](./protocol/integration.md)
|
||||
- [コールバックAPI](./protocol/callback-schema.md)
|
||||
- [タスクAPI](./protocol/task-schema.md)
|
||||
- [自動戦闘API](./protocol/copilot-schema.md)
|
||||
|
||||
### グローバル版を含む海外クライアントの対応について
|
||||
|
||||
[海外版クライアントの対応について](./開発関連/海外クライアントの対応.md)をご覧ください。大陸版で既にサポートされている機能を他地域クライアントへ移植するための必要作業の大半は、簡単なJSONの修正と(作業に必要な)スクリーンショットの提出で済みます。。
|
||||
[海外版クライアントの対応について](./develop/overseas-client-adaptation.md)をご覧ください。大陸版で既にサポートされている機能を他地域クライアントへ移植するための必要作業の大半は、簡単なJSONの修正と(作業に必要な)スクリーンショットの提出で済みます。。
|
||||
|
||||
### 開発に参加したいがGitHubの使い方がよくわかりません
|
||||
|
||||
[Githubプルリクエストのプロセス](./開発関連/開発を開始.md)
|
||||
[Githubプルリクエストのプロセス](./develop/development.md#introduction-to-github-pull-request-flow)
|
||||
|
||||
### Issue bot
|
||||
|
||||
詳細については[Issue bot 使用方法](./開発関連/IssueBotの使う方.md)を参照してください。
|
||||
詳細については[Issue bot 使用方法](./develop/issue-bot-usage.md)を参照してください。
|
||||
|
||||
## 謝辞
|
||||
|
||||
|
||||
@@ -90,6 +90,33 @@ icon: iconoir:developer
|
||||
Visual Studio 2022를 열면 관련된 git 작업을 명령 줄 도구 대신 vs 자체 "Git 변경사항"을 사용하여 수행할 수 있습니다.
|
||||
:::
|
||||
|
||||
## MAA 파일의 포매팅 요구 사항
|
||||
|
||||
MAA는 리포지토리의 코드 및 리소스 파일들을 아름답고 일관적으로 유지하기 위해 일련의 포매팅 도구를 사용합니다.
|
||||
|
||||
제출하기 전에 포맷을 지정했거나 [Pre-commit Hooks를 사용하여 자동 포매팅을 활성화](#pre-commit-hooks를-사용하여-자동-포매팅을-활성화)를 했는지 확인하세요.
|
||||
|
||||
현재 활성화된 포매팅 도구는 다음과 같습니다:
|
||||
|
||||
| 파일 유형 | 포매팅 도구 |
|
||||
| --- | --- |
|
||||
| C++ | [clang-format](https://clang.llvm.org/docs/ClangFormat.html) |
|
||||
| Json/Yaml | [Prettier](https://prettier.io/) |
|
||||
| Markdown | [markdownlint](https://github.com/DavidAnson/markdownlint-cli2) |
|
||||
|
||||
### Pre-commit Hooks를 사용하여 자동 포매팅을 활성화
|
||||
|
||||
1. Python 및 Node 환경이 컴퓨터에 설치되어 있는지 확인하세요.
|
||||
|
||||
2. 프로젝트 루트 디렉터리에서 다음 명령을 실행하세요.
|
||||
|
||||
```bash
|
||||
pip install pre-commit
|
||||
pre-commit install
|
||||
```
|
||||
|
||||
이제, 매번 커밋할 때마다 포매팅 도구가 자동으로 실행되어 코드 형식이 규칙에 맞는지 확인합니다.
|
||||
|
||||
## Visual Studio에서 clang-format 사용 설정
|
||||
|
||||
1. clang-format 17 또는 그 이상 버전을 설치합니다.
|
||||
|
||||
@@ -70,8 +70,8 @@ MAA의 빌드 방법은 여전히 논의 중입니다. 이 튜토리얼의 내
|
||||
|
||||
### C
|
||||
|
||||
[CppSample](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/CppSample/main.cpp)의 구현을 참조하세요.
|
||||
[CppSample](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/Cpp/main.cpp)의 구현을 참조하세요.
|
||||
|
||||
### C\#
|
||||
|
||||
[MaaWpfGui](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/MaaWpfGui/Helper/AsstProxy.cs)의 구현을 참조하세요.
|
||||
[MaaWpfGui](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/src/MaaWpfGui/Main/AsstProxy.cs)의 구현을 참조하세요.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 4
|
||||
order: 3
|
||||
icon: material-symbols:settings
|
||||
---
|
||||
|
||||
@@ -435,14 +435,12 @@ url = "https://github.com/MaaAssistantArknights/MaaResource.git"
|
||||
- MaaCore 설정의 JSON Schema 파일은 [`asst.schema.json`][asst-schema]입니다.
|
||||
- CLI 설정의 JSON Schema 파일은 [`cli.schema.json`][cli-schema]입니다.
|
||||
|
||||
[task-types]: ../../protocol/integration.md#任务类型一览
|
||||
[emulator-ports]: ../../manual/faq.md#模拟器调试端口
|
||||
[playcover-doc]: ../../manual/device/macos.md#-playcover原生运行最流畅-
|
||||
[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
|
||||
[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
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 5
|
||||
order: 4
|
||||
icon: ph:question-fill
|
||||
---
|
||||
|
||||
@@ -27,5 +27,3 @@ MaaCore의 종속성인 `fastdeploy`가 일부 로그를 출력합니다. 따라
|
||||
## 3. macOS에서 maa-cli로 실행한 PlayCover 게임 클라이언트가 전투를 대리할 수 없고 로그라이크 모드를 완료할 수 없습니다
|
||||
|
||||
알 수 없는 이유로, 터미널을 통해 실행한 PlayCover 게임 클라이언트는 전투를 대리할 수 없고 로그라이크 모드를 완료할 수 없습니다. 하지만 이 문제는 터미널에서 실행한 maa-cli에만 해당됩니다. 터미널에서 상호작용할 때는 게임을 수동으로 실행해야 할 수도 있습니다. cron 등의 방법으로 maa-cli를 실행하는 경우, 이 문제는 영향을 미치지 않습니다.
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
order: 2
|
||||
order: 1
|
||||
icon: material-symbols:download
|
||||
---
|
||||
|
||||
@@ -55,10 +55,10 @@ Homebrew 사용자는 비공식 [tap](https://github.com/MaaAssistantArknights/h
|
||||
|
||||
지원되지 않는 시스템을 사용하거나 패키지 관리자를 사용하지 않으려는 경우, 아래 링크를 통해 해당 플랫폼의 사전 컴파일된 바이너리 파일을 다운로드하고, 압축을 풀어 실행 파일을 `PATH`에 추가하여 사용할 수 있습니다.
|
||||
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-v0.4.5-x86_64-pc-windows-msvc.zip)
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-pc-windows-msvc.zip)
|
||||
|
||||
위의 목록에 없는 플랫폼의 경우, 직접 컴파일하여 설치할 수 있습니다(아래 참조).
|
||||
|
||||
@@ -116,5 +116,3 @@ maa install
|
||||
```
|
||||
|
||||
**주의**: 패키지 관리자를 통해 maa-cli를 설치한 경우에만 패키지 관리자를 통해 MaaCore를 설치할 수 있습니다. 그렇지 않으면 `maa install` 명령어를 사용해야 합니다. 또한, `maa install` 명령어는 공식적으로 사전 컴파일된 MaaCore를 다운로드합니다. 패키지 관리자를 통해 설치된 MaaCore는 컴파일 옵션과 종속성 버전이 공식 사전 컴파일 버전과 다를 수 있습니다. 이는 maa-cli의 사용에 영향을 미치지 않지만, MaaCore의 기능과 성능에 차이가 있을 수 있습니다. 예를 들어, 패키지 관리자를 통해 설치된 MaaCore는 최신 버전의 `fastdeploy`를 사용하고, 공식 사전 컴파일된 MaaCore는 구버전의 `fastdeploy`를 사용합니다. 최신 버전의 `fastdeploy`에서는 로그를 숨길 수 있어 불필요한 로그 출력을 줄일 수 있습니다.
|
||||
|
||||
<!-- markdownlint-disable-file MD013 -->
|
||||
|
||||