Compare commits
401 Commits
feat/githu
...
v5.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbe5602bf6 | ||
|
|
2ad1f22298 | ||
|
|
84acb20806 | ||
|
|
171c5891ec | ||
|
|
338e4e40b1 | ||
|
|
e32c6bb2d6 | ||
|
|
5fc26287cb | ||
|
|
298e995c6b | ||
|
|
8bbce5b3e5 | ||
|
|
3d73780c01 | ||
|
|
06709a4057 | ||
|
|
4571877241 | ||
|
|
9711111a36 | ||
|
|
6b9aa97eec | ||
|
|
fe32a357a0 | ||
|
|
d21ab5c668 | ||
|
|
140c75d461 | ||
|
|
30e59cbdbe | ||
|
|
0a2b003fce | ||
|
|
2a7ecf6074 | ||
|
|
640eed235b | ||
|
|
d915385031 | ||
|
|
112c576a95 | ||
|
|
b42d5ecd62 | ||
|
|
de955494aa | ||
|
|
5a93b0427b | ||
|
|
d9b641e6b5 | ||
|
|
9bcf350706 | ||
|
|
f4d767df04 | ||
|
|
93120e9a18 | ||
|
|
eddb064957 | ||
|
|
aef7bba79b | ||
|
|
ba7e4fc995 | ||
|
|
4bec53c435 | ||
|
|
c17ec74461 | ||
|
|
4a93784be0 | ||
|
|
19e35c7457 | ||
|
|
54c84d4322 | ||
|
|
abd064150a | ||
|
|
1820aa9120 | ||
|
|
f36173fa45 | ||
|
|
1d34d82cd1 | ||
|
|
456319cffd | ||
|
|
f3c5e34d16 | ||
|
|
871d88ffe1 | ||
|
|
b31728b9c4 | ||
|
|
7872ae0fae | ||
|
|
4c688fad87 | ||
|
|
34ba4248a4 | ||
|
|
fb2fe90953 | ||
|
|
bf6256573a | ||
|
|
8dc21b9b52 | ||
|
|
513ddd4f2b | ||
|
|
1e8b218970 | ||
|
|
6a03d27714 | ||
|
|
1a2619419f | ||
|
|
873ea0e4bf | ||
|
|
8447cd1c28 | ||
|
|
06ea04e31e | ||
|
|
e692059267 | ||
|
|
78c0a0cbaf | ||
|
|
dfa200a83b | ||
|
|
ad4f69e349 | ||
|
|
c2b980317a | ||
|
|
98d6d21020 | ||
|
|
f5822e645d | ||
|
|
f2f093aa87 | ||
|
|
2208b5252d | ||
|
|
1d59efdce2 | ||
|
|
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 | ||
|
|
9def4fd479 | ||
|
|
e8d4a64e14 | ||
|
|
c97abfdeb0 | ||
|
|
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
|
||||
|
||||
10
.github/workflows/ci.yml
vendored
@@ -184,6 +184,8 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
arch: [aarch64, x86_64]
|
||||
permissions:
|
||||
actions: write
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
@@ -199,8 +201,6 @@ jobs:
|
||||
|
||||
- name: Setup ccache
|
||||
uses: Chocobo1/setup-ccache-action@v1
|
||||
with:
|
||||
remove_stale_cache: false
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
env:
|
||||
@@ -357,6 +357,10 @@ jobs:
|
||||
p12-file-base64: ${{ secrets.HGUANDL_SIGN_CERT_P12 }}
|
||||
p12-password: ${{ secrets.HGUANDL_SIGN_CERT_PASSWD }}
|
||||
|
||||
- name: Setup Xcode Toolchain
|
||||
run: |
|
||||
sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
|
||||
|
||||
- name: Build Universal Binaries
|
||||
run: |
|
||||
mkdir build
|
||||
@@ -457,7 +461,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"
|
||||
|
||||
71
.github/workflows/markdown-checker.yml
vendored
@@ -1,49 +1,64 @@
|
||||
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 相关链接
|
||||
args: >
|
||||
--verbose --no-progress --cache --max-cache-age 1d
|
||||
--exclude 'https?://.*'
|
||||
--include 'https?://github\.com/.*'
|
||||
--include 'https?://raw\.githubusercontent\.com/.*'
|
||||
--include 'https?://user-images\.githubusercontent\.com/.*'
|
||||
--exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md'
|
||||
--exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md'
|
||||
-- './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 }}
|
||||
|
||||
87
.github/workflows/optimize-templates.yml
vendored
Normal file
@@ -0,0 +1,87 @@
|
||||
name: Auto Optimize PNG Templates
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "dev"
|
||||
paths:
|
||||
- "resource/global/txwy/resource/template/**"
|
||||
- "resource/global/YostarEN/resource/template/**"
|
||||
- "resource/global/YostarJP/resource/template/**"
|
||||
- "resource/global/YostarKR/resource/template/**"
|
||||
- "resource/template/**"
|
||||
- "docs/.vuepress/public/image/**"
|
||||
- "website/apps/web/public/**"
|
||||
- "website/apps/web/src/assets/links/**"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
commit_message:
|
||||
description: "Commit Message"
|
||||
type: string
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
optimize-png:
|
||||
# Skip workflow to prevent double consecutive runs
|
||||
if: ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Cache Python packages
|
||||
id: cache_python
|
||||
if: always()
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.pythonLocation }}/lib/python3.11/site-packages
|
||||
key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.cache_python.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
pip install -r tools/OptimizeTemplates/requirements.txt
|
||||
|
||||
- name: Setup oxipng
|
||||
uses: baptiste0928/cargo-install@v3
|
||||
with:
|
||||
crate: oxipng
|
||||
|
||||
- name: Run optimize_templates
|
||||
run: |
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py
|
||||
|
||||
- name: Commit changes
|
||||
id: commit_changes
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
git add .
|
||||
|
||||
if git diff-index --quiet HEAD --; then
|
||||
echo "No changes to commit"
|
||||
else
|
||||
commit_msg="${{ github.event.inputs.commit_message }}"
|
||||
if [ -z "$commit_msg" ]; then
|
||||
commit_msg="chore: Auto Templates Optimization"
|
||||
fi
|
||||
git commit -m "$commit_msg" -m "[skip changelog]"
|
||||
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
|
||||
echo "have_commits=True" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Push changes
|
||||
if: steps.commit_changes.outputs.have_commits == 'True'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
branch: ${{ github.ref }}
|
||||
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:
|
||||
|
||||
306
.github/workflows/res-update-game-unix.yml
vendored
Normal file
@@ -0,0 +1,306 @@
|
||||
name: res-update-game-unix
|
||||
|
||||
on:
|
||||
# schedule:
|
||||
# - cron: "*/20 * * * *"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
commit_message:
|
||||
description: "Commit Message"
|
||||
type: string
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
clone-resources-official:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone ArknightsGameResource for Official
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: yuanyan3060/ArknightsGameResource
|
||||
ref: main
|
||||
path: ./Official
|
||||
sparse-checkout-cone-mode: false
|
||||
sparse-checkout: |
|
||||
/levels.json
|
||||
/item
|
||||
/building_skill
|
||||
/gamedata/excel/item_table.json
|
||||
/gamedata/excel/building_data.json
|
||||
/gamedata/excel/range_table.json
|
||||
/gamedata/excel/character_table.json
|
||||
/gamedata/excel/gacha_table.json
|
||||
/gamedata/excel/roguelike_topic_table.json
|
||||
/gamedata/excel/activity_table.json
|
||||
|
||||
- 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: ./Overseas
|
||||
sparse-checkout-cone-mode: false
|
||||
sparse-checkout: |
|
||||
/en_US/gamedata/excel/item_table.json
|
||||
/en_US/gamedata/excel/building_data.json
|
||||
/en_US/gamedata/excel/range_table.json
|
||||
/en_US/gamedata/excel/character_table.json
|
||||
/en_US/gamedata/excel/gacha_table.json
|
||||
/en_US/gamedata/excel/roguelike_topic_table.json
|
||||
/en_US/gamedata/excel/activity_table.json
|
||||
/ja_JP/gamedata/excel/item_table.json
|
||||
/ja_JP/gamedata/excel/building_data.json
|
||||
/ja_JP/gamedata/excel/range_table.json
|
||||
/ja_JP/gamedata/excel/character_table.json
|
||||
/ja_JP/gamedata/excel/gacha_table.json
|
||||
/ja_JP/gamedata/excel/roguelike_topic_table.json
|
||||
/ja_JP/gamedata/excel/activity_table.json
|
||||
/ko_KR/gamedata/excel/item_table.json
|
||||
/ko_KR/gamedata/excel/building_data.json
|
||||
/ko_KR/gamedata/excel/range_table.json
|
||||
/ko_KR/gamedata/excel/character_table.json
|
||||
/ko_KR/gamedata/excel/gacha_table.json
|
||||
/ko_KR/gamedata/excel/roguelike_topic_table.json
|
||||
/ko_KR/gamedata/excel/activity_table.json
|
||||
|
||||
- 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: ./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: ubuntu-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-unix-${{ hashFiles('./tools/ResourceUpdaterUnix/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdaterUnix/build/ResourceUpdaterUnix
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
python3 maadeps-download.py x64-linux
|
||||
|
||||
- name: Build ResourceUpdater
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake -S . -B build
|
||||
cd build
|
||||
make -j$(nproc)
|
||||
|
||||
- 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-unix-${{ hashFiles('./tools/ResourceUpdaterUnix/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdaterUnix/build/ResourceUpdaterUnix
|
||||
|
||||
- name: Download txwy
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: txwy
|
||||
path: ./tools/ResourceUpdaterUnix/build/Overseas/zh_TW/gamedata/excel
|
||||
|
||||
- name: Download Overseas
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: overseas
|
||||
path: ./tools/ResourceUpdaterUnix/build/Overseas
|
||||
|
||||
- name: Download Official
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: official
|
||||
path: ./tools/ResourceUpdaterUnix/build/Official
|
||||
|
||||
- name: Run Resource Updater
|
||||
run: |
|
||||
./tools/ResourceUpdaterUnix/build/ResourceUpdaterUnix
|
||||
|
||||
- name: Task Sorting
|
||||
run: |
|
||||
python3 tools/TaskSorter/TaskSorter.py
|
||||
|
||||
- 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: |
|
||||
npx prettier -w $(git diff --name-only --diff-filter=ACM 2>/dev/null | grep '\.json$')
|
||||
|
||||
- name: Check if only sorted and Templates
|
||||
id: check_sorted_templates
|
||||
run: |
|
||||
git status
|
||||
|
||||
gd=$(git diff --numstat HEAD 2>/dev/null | grep -i resource)
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "no diff"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "$gd"
|
||||
echo ""
|
||||
|
||||
diff=false
|
||||
hasPng=false
|
||||
|
||||
IFS=$'\n' read -rd '' -a diffLines <<<"$gd"
|
||||
|
||||
for line in "${diffLines[@]}"; do
|
||||
parts=($line)
|
||||
filePath=${parts[2]}
|
||||
firstNumber=${parts[0]}
|
||||
secondNumber=${parts[1]}
|
||||
|
||||
if [[ $filePath =~ \.png$ ]]; then
|
||||
hasPng=true
|
||||
fi
|
||||
|
||||
if [[ $firstNumber -gt 1 || $firstNumber -ne $secondNumber ]]; then
|
||||
diff=true
|
||||
fi
|
||||
|
||||
if $hasPng && $diff; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
changes=$($hasPng || $diff)
|
||||
|
||||
echo "diff: $diff"
|
||||
echo "hasPng: $hasPng"
|
||||
echo "changes: $changes"
|
||||
|
||||
echo "contains_png=$hasPng" >> $GITHUB_OUTPUT
|
||||
echo "changes=$changes" >> $GITHUB_OUTPUT
|
||||
- name: Setup python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Cache Python packages
|
||||
id: cache_python
|
||||
if: always()
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.pythonLocation }}/lib/python3.11/site-packages
|
||||
key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.cache_python.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
pip install -r tools/OptimizeTemplates/requirements.txt
|
||||
|
||||
- name: Setup oxipng
|
||||
uses: baptiste0928/cargo-install@v3
|
||||
with:
|
||||
crate: oxipng
|
||||
|
||||
- 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_sorted_templates.outputs.changes != 'True'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
- name: Add files to git
|
||||
if: steps.check_sorted_templates.outputs.changes == 'True'
|
||||
id: add_files
|
||||
run: |
|
||||
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 }}"
|
||||
if [ -n "$commit_msg" ]; then
|
||||
commit_msg=$(echo "$commit_msg" | xargs) # Trim whitespace
|
||||
else
|
||||
commit_msg="chore: Auto Update Game Resources - $(date +'%Y-%m-%d')"
|
||||
fi
|
||||
|
||||
git commit -m "$commit_msg" -m "[skip changelog]"
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "have_commits=True" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
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.5
|
||||
|
||||
- name: Push changes
|
||||
if: steps.add_files.outputs.have_commits == 'True'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
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
|
||||
|
||||
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
|
||||
# if: steps.add_files.outputs.have_commits == 'True'
|
||||
# run: |
|
||||
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
|
||||
219
.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,169 @@ 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
|
||||
id: task_sorting
|
||||
run: |
|
||||
python3 tools/TaskSorter/TaskSorter.py
|
||||
Write-Output "gitdiff=$(git diff --name-only --diff-filter=ACM 2>$null | Select-String -Pattern '\.json$' -List)" >> $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Check if only sorted
|
||||
id: check_only_sorted
|
||||
- name: Run prettier
|
||||
uses: actionsx/prettier@v3
|
||||
with:
|
||||
args: -w ${{ steps.task_sorting.outputs.gitdiff }}
|
||||
|
||||
- name: Check if only sorted and Templates
|
||||
id: check_sorted_templates
|
||||
run: |
|
||||
git status
|
||||
|
||||
$diff = $(git diff --numstat HEAD | findstr -i resource)
|
||||
$gitdiff = 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 $gitdiff
|
||||
|
||||
$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 = $gitdiff -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 +248,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 +274,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
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
325
CHANGELOG.md
@@ -1,15 +1,330 @@
|
||||
## v5.4.1
|
||||
## v5.5.0
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* change penguin CN mirror domain to alvorna.com (#9959) @GalvinGao
|
||||
* 适配萨卡兹肉鸽 (#9677) @DavidWang19 @SherkeyXD @Daydreamer114 @Lemon-miaow @Alan-Charred
|
||||
* Mac GUI 添加萨米肉鸽策略 @hguandl
|
||||
* WPF Gui support for roguelike collapsal paradigm task plugin (#9648) @DavidWang19
|
||||
* 添加萨米肉鸽天途半道关卡战斗策略 (#9337) @Daydreamer114
|
||||
* 增加识别坍缩范式的插件,增加萨米肉鸽刷隐藏坍缩范式模式 (#9172) @Alan-Charred
|
||||
* 肉鸽五层 BOSS 前暂停功能 (#9801) @SherkeyXD @Lancarus @DavidWang19
|
||||
* MultiTemplMatcher (#9850) @Alan-Charred
|
||||
* 隐藏托盘图标选项 (#9819) @Icexbb
|
||||
* 添加几个肉鸽作业 (#9854, #9868) @Saratoga-Official
|
||||
* Mac GUI 关闭游戏任务 @hguandl
|
||||
* Mac GUI 肉鸽凹精二和生息演算设置 @hguandl
|
||||
* 投资模式增加非开局干员直接招募第一位 (#9803) @Lancarus
|
||||
* 萨卡兹肉鸽自动印象重建 (#9789) @Lancarus
|
||||
* 添加思绪数据 @SherkeyXD
|
||||
* Mac GUI 支持萨卡兹肉鸽、开始/停止任务快捷键 @hguandl
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* Wpf肉鸽非刷等级模式时,隐藏第五层BOSS前停下设置 @status102
|
||||
* Mumu截图增强设置增加测试按钮 (#9881) @status102 @ABA2396
|
||||
* 优化夺路而跳部署策略 (#9726) @Daydreamer114
|
||||
* update Sarkaz shopping.json (#9721) @CASUUU @SherkeyXD
|
||||
* 自动战斗-战斗列表 批量导入关卡名正则优化 (#9723) @status102
|
||||
* 优化第一层作战策略黑名单 (#9710) @Daydreamer114
|
||||
* 适配新干员用法&调整萨卡兹肉鸽4星优先度 (#9713) @Lancarus
|
||||
* 优化战斗策略应对天灾年代之刺 (#9702) @Daydreamer114
|
||||
* 非萨米肉鸽时禁用仅萨米用插件 (#9888) @status102
|
||||
* 非萨米肉鸽时禁用仅萨米用插件 (#9880) @status102
|
||||
* 让我也康康今天又更新了啥 (#9879) @AnnAngela
|
||||
* 存款满后禁用肉鸽投资插件 @status102
|
||||
* 优化萨卡兹肉鸽部分策略 (#9871) @Lancarus
|
||||
* 萨卡兹肉鸽藏品排序.json (#9761) @CASUUU
|
||||
* 修改开始战斗时的理智药输出分隔符 @status102
|
||||
* 蓝图队速刷肉鸽 (#9773) @DavidWang19 @Lancarus @status102 @pre-commit-ci[bot]
|
||||
* 优化不期而遇策略 @SherkeyXD
|
||||
* 优化弹窗判断逻辑 @ABA2396
|
||||
* 优化萨卡兹肉鸽公害部署策略 (#9766) @Daydreamer114 @pre-commit-ci[bot]
|
||||
* 优化萨卡兹肉鸽安全检查部署策略 (#9759) @Daydreamer114
|
||||
* 优化萨卡兹肉鸽拆东补西部署策略 (#9744) @HYY1116
|
||||
* 优化萨卡兹肉鸽安全检查部署策略 (#9739) @Daydreamer114
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 印象加深后卡住时截图 @zzyyyl
|
||||
* 肉鸽部分范围点击任务点进萨卡兹肉鸽思绪界面 (#9953) @Daydreamer114
|
||||
* 萨卡兹肉鸽命运所指关卡识别使用 HSVCount 避免达不到阈值 @zzyyyl
|
||||
* 更新 先行一步 & 失与得 的掩码范围以增加得分 @zzyyyl
|
||||
* 萨卡兹肉鸽部分关卡识别使用 HSVCount 避免达不到阈值 (#9931) @zzyyyl
|
||||
* 尝试修复肉鸽第四层开头卡死的问题 @DavidWang19
|
||||
* 修复 萨卡兹肉鸽 LastReward5 少前缀的问题 @zzyyyl
|
||||
* 萨卡兹肉鸽战斗结束领奖励时因思绪异常而卡死 (#9731) @Daydreamer114 @DavidWang19
|
||||
* 增加猩红甬道的OcrReplace @DavidWang19
|
||||
* 修复肉鸽每层识别 @DavidWang19
|
||||
* 调整失与得阈值 @DavidWang19
|
||||
* 修复萨卡兹肉鸽卡死在结算界面的问题 @DavidWang19
|
||||
* 修复萨卡兹肉鸽商店不能刷新的问题 @DavidWang19
|
||||
* 修复肉鸽关卡通用策略无法识别费用的问题 @DavidWang19
|
||||
* 删除萨卡兹肉鸽开局负荷干员与舍弃思绪功能模板匹配文件名重复描述 (#9722) @Daydreamer114
|
||||
* 调整树洞阈值 @DavidWang19
|
||||
* 萨卡兹肉鸽舍弃思绪识别位置修改 (#9717) @Daydreamer114
|
||||
* 调整节点阈值 @DavidWang19
|
||||
* 修复卡死在紧急安全检查的问题 @DavidWang19
|
||||
* 修复萨卡兹肉鸽卡死在战斗失败的问题 @DavidWang19
|
||||
* 修改材料名称注释 @ABA2396
|
||||
* 修复被随机排序破坏的超链接 @Rbqwow
|
||||
* 自动战斗开始时移除召唤物类头像缓存,以避免跨局错误识别相似技能的召唤物 (#9649) @status102
|
||||
* 修复萨米肉鸽因插件注册顺序导致的无法运行问题 (#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
|
||||
* 完成制造通知弹出时,无法正确识别到所有宿舍 @ABA2396
|
||||
* 尝试修复萨卡兹肉鸽刷新节点次数耗尽卡死的问题 @zzyyyl
|
||||
* 尝试修复萨卡兹肉鸽刷新节点次数耗尽卡死的问题 @zzyyyl
|
||||
* prettified res-update workflow @Constrat
|
||||
* res-updt bypasses branch protection @Constrat
|
||||
* 修复印象加深后卡住的问题 @zzyyyl
|
||||
* 修复萨卡兹肉鸽刷新节点次数耗尽卡死的问题 @zzyyyl
|
||||
* 调整主界面多个掉落物识别阈值 @DavidWang19
|
||||
* 修复萨卡兹肉鸽的自动战斗文件 拆东补西.json 的语法问题 (#9903) @SST-03
|
||||
* 调整刷新按钮阈值 @DavidWang19
|
||||
* 合成思绪出现藏品二选一时卡住 (#9883) @Lancarus
|
||||
* 增加肉鸽分队存储及判断,避免蓝图队影响其他肉鸽存钱 @Lancarus
|
||||
* 修复 docsearch 路径错误的问题 @SherkeyXD
|
||||
* 肉鸽卡在干员技能面板 (#9843) @Lancarus
|
||||
* 肉鸽高级设置-投资模式启用购物选项说明补充:进入2层 @status102
|
||||
* 未开启自定义基建可能遇到的除数为0 @ABA2396
|
||||
* 修复基建排版表数量为为0时引起的崩溃问题 @SherkeyXD
|
||||
* 修正文档网页右上角search组件本地化显示问题 (#9804) @sevmeowple
|
||||
* 修复更换不同班次数的基建排班表可能遇到的数组越界 @ABA2396
|
||||
* 调整iOS萨卡兹肉鸽节点刷新模板识别阈值 @hguandl
|
||||
* 错误获取到萨米塌缩插件 (#9827) @status102
|
||||
* 修复肉鸽插件重复注册 (#9817) @status102
|
||||
* 更改开局选上一局奖励的顺序 @DavidWang19
|
||||
* 修复拿取掉落物时卡死的问题 @DavidWang19
|
||||
* 修复卡死在先行一步/驮兽归队等问题 @DavidWang19
|
||||
* 修复离开不期而遇后点进负荷界面的问题 @DavidWang19
|
||||
* 修复当蓝图队为第一个分队时无法识别的问题 @DavidWang19
|
||||
* 修复紧急作战刷新次数达到上限后卡死的问题 @DavidWang19
|
||||
* switch downloading artifact order @Constrat
|
||||
* 修复 methods 为空时直接崩溃的问题 @zzyyyl
|
||||
* 扩大肉鸽投资检测阈值,减少识别错误 (#9787) @status102
|
||||
* Revert "fix: 修复多次设置参数时肉鸽插件重复注册 (#9786)" @zzyyyl
|
||||
* hsv 匹配时不要修改原图 @zzyyyl
|
||||
* 修复多次设置参数时肉鸽插件重复注册 (#9786) @status102
|
||||
* 修复萨卡兹肉鸽无法识别思绪阻滞 (#9767) @Daydreamer114
|
||||
* 修复 pre-commit ci @zzyyyl
|
||||
* 修复肉鸽主题选择的导航问题 (#9756) @Lemon-miaow
|
||||
* 修复萨卡兹肉鸽卡死在思绪界面 (#9746) @Daydreamer114
|
||||
* 萨卡兹肉鸽重复使用思绪导致卡死 (#9738) @Daydreamer114
|
||||
* 修复萨卡兹肉鸽去伪存真印象重建后卡死 @zzyyyl
|
||||
* macOS CI Xcode版本 @hguandl
|
||||
* top operator unrecognized recruitment @Constrat
|
||||
* wrong variable format i'm dumb @Constrat
|
||||
* 修复 StrategyChange 时 next 丢失的问题 @zzyyyl
|
||||
* fix zip filename encoding issue @horror-proton
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* website docs (#9287) @ABA2396 @Rbqwow @Constrat @wangl-cc @HX3N @SherkeyXD
|
||||
* 修改win7相关问题描述&更新运行库 @Rbqwow
|
||||
* 本地加载所有图片 @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
|
||||
* 添加 adb-lite 说明 @Rbqwow
|
||||
* KR 添加 MAA 格式化要求说明 @HX3N
|
||||
* 添加 MAA 格式化要求说明 @SherkeyXD
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 修复连接前同步参数时日志报错的问题 (#9644) @zzyyyl
|
||||
* roi out of bounds @zzyyyl
|
||||
* test data @ABA2396
|
||||
* 肉鸽插件set_params补充 (#9893) @status102
|
||||
* set_params语义一致化 @status102
|
||||
* compile error @zzyyyl
|
||||
* 使用 oxipng 优化模板图片 @zzyyyl
|
||||
* parallelism for resource updater action (#9736) @Constrat
|
||||
* do the name and cropping direction feat with the CropRoi tool (#9679) @zayn7lie
|
||||
* prvent double consecutive runs @Constrat
|
||||
* 更新 DebugTask 方便模板匹配测试 @zzyyyl
|
||||
* 肉鸽Config部分返回改为const ref,移除部分变量 (#9741) @status102
|
||||
* cache and targeting for prettier res update game (#9777) @Constrat
|
||||
* 更新 OptimizeTemplates 使得图像优化的结果必定通过 pre-commit-ci 的检查 @zzyyyl
|
||||
* 优化资源更新流程 (#9635) @zzyyyl
|
||||
* 拆分肉鸽数据 (#9841) @status102
|
||||
* 迁移部分肉鸽数据 @status102
|
||||
* 减少肉鸽Config拷贝 @status102
|
||||
* 简化肉鸽Config和部分设置 (#9822) @status102
|
||||
* macOS编译脚本支持ccache @hguandl
|
||||
* 优化macOS编译脚本 @hguandl
|
||||
* 优化模板图片 @zzyyyl
|
||||
* 避免空 method 警告 @zzyyyl
|
||||
* 删除 tasks.json 冗余行 (#9645) @zzyyyl
|
||||
* add log output (#9636) @status102
|
||||
* 肉鸽资源加载逻辑及目录结构重构 (#9555) @Alan-Charred @SherkeyXD
|
||||
* 修改win7相关问题描述&更新运行库 @Rbqwow
|
||||
* oxipng @zzyyyl
|
||||
* 简单处理 DEBUG 的时候 OCR 很卡的问题 @zzyyyl
|
||||
* 使用 oxipng 优化模板图片 @zzyyyl
|
||||
* 更新 mask_range 生成工具 @zzyyyl
|
||||
* 简化RoguelikeTask set_params @status102
|
||||
* 修改 set_params 以避免语义不一致 @status102
|
||||
* 迁移肉鸽投资参数设置 @status102
|
||||
* 复用RoguelikeControl停止流程 @status102
|
||||
* find_plugin 追加 const 修饰 @status102
|
||||
* WpfGui添加对坍缩范式插件callback的nullable check (#9848) @Alan-Charred
|
||||
* 优化所有肉鸽文件的json排版 @SherkeyXD
|
||||
* 更新 mask-range 工具 @zzyyyl
|
||||
* Caching for ResourceUpdater @Constrat
|
||||
* 优化格式 @ABA2396
|
||||
* 复用RoguelikeCollapsalParadigmTaskPlugin插件 (#9682) @status102
|
||||
* 优化更新策略 @ABA2396
|
||||
* 更新部分配置修改为全局配置 @ABA2396
|
||||
* 优化版本更新 @ABA2396
|
||||
* 更新checkout至v4 这怎么还有个漏网之鱼) @SherkeyXD
|
||||
* 简化RoguelikeTask set_param (#9905) @status102
|
||||
* implement actionsx/prettier for resource updater (#9949) @Constrat
|
||||
* 更新 DebugTask 方便模板匹配测试 @zzyyyl
|
||||
* RGBCount 和 HSVCount 改为 数色 和 模板匹配 的几何平均;优化 count 的实现方法 @zzyyyl
|
||||
* allow cache overwriting @Constrat
|
||||
* feat!: mask_range 支持彩色掩码 (#9818) @zzyyyl
|
||||
* 删除 HashTaskInfo 相关 (#9724) @zzyyyl
|
||||
* 肉鸽插件增加每局重置,以免全部堆积到Config (#9828) @status102
|
||||
* numbers only in TimerSettings @Constrat
|
||||
* 支持自定义 MatchTemplate 匹配方法 (#9785) @zzyyyl
|
||||
* 禁止插件修改自身 enable @zzyyyl
|
||||
* 使用 set_params + set_enable 管理插件而不是延迟注册插件 @zzyyyl
|
||||
* feat!: 允许插件Verify期间自变更enable,以禁用非预期的启用 (#9876) @status102
|
||||
* close inactive issues (#9866) @Constrat @zzyyyl @pre-commit-ci[bot]
|
||||
* 肉鸽插件添加设置参数功能,设置失败的插件会被自动disable (#9862) @Alan-Charred
|
||||
* 插件 verify 前先判断 enable @zzyyyl
|
||||
* feat!: 增加图像匹配算法 RGBCount, HSVCount (#9795) @zzyyyl
|
||||
* 增加特定情况下检查到 roi 为全屏的警告 (#9674) @pre-commit-ci[bot] @zzyyyl
|
||||
* first implementation (#9927) @Constrat
|
||||
* optimize templates in resource updater @Constrat
|
||||
* 增加 BattlePauseCancel 重试上限 @zzyyyl
|
||||
* cache 统一默认为 false (#9642) @zzyyyl
|
||||
* 重新加入 tasks.json 的默认值检查 (#9583) @zzyyyl
|
||||
* 由ci生成的非正式/公测/内测版判断为调试版本并且不再检查更新 (#9632) @SherkeyXD @zzyyyl
|
||||
* 隐式空 text 检测仅对无基任务生效 @zzyyyl
|
||||
* change glossary from markdown to JSON @AlisaAkiron
|
||||
* update turbo to v2 @AlisaAkiron
|
||||
* 删去 CcoeffHSV, HSVCount 时的模板匹配采用 RGB 的 Ccoeff @zzyyyl
|
||||
* RGBCount 和 HSVCount 改为 数色 和 模板匹配 的算术平均 @zzyyyl
|
||||
* 数色算法现在改为原来的结果与 ccoeff 结果的点积 @zzyyyl
|
||||
* 萨卡兹肉鸽混乱或阻滞时先使用一个再舍弃 (#9727) @Daydreamer114
|
||||
* 萨卡兹肉鸽添加混乱与阻滞时舍弃思维功能 (#9711) @Daydreamer114
|
||||
* 修改弹窗尺寸 @ABA2396
|
||||
* 肉鸽继续尝试探索但并不直接放弃 @ABA2396
|
||||
* add res-update-game-unix.yml @Constrat
|
||||
* only check github and github raw links (#9855) @wangl-cc
|
||||
* Add requirements.txt for MaskRangeTool @zzyyyl
|
||||
* 整理 mask_range 工具 @zzyyyl
|
||||
* remove stale cache for ci (#9935) @SherkeyXD
|
||||
* remove testing image @zzyyyl
|
||||
* 调整 DebugTask 测试模板匹配时的输出信息 @zzyyyl
|
||||
* generate_mask_range 增加用于比较两图的函数 @zzyyyl
|
||||
* 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
|
||||
* Style/gui consistency (#9567) @Constrat
|
||||
* Update ja-jp.json @wallsman
|
||||
* 删除 Qodana 静态检查 (#9553) @SherkeyXD
|
||||
* 增加 ResourceUpdater 日志 @ABA2396
|
||||
* pref: 将Head和ETag请求设置为`Connection: close` @ChingCdesu
|
||||
* update python API (#9538) @EvATive7
|
||||
* website docs **translation needed** (#9287) @ABA2396 @wallsman @SherkeyXD @HX3N @Rbqwow @Constrat @wangl-cc
|
||||
* rollback @vuepress/plugin-docsearch version @SherkeyXD
|
||||
* cleaned up comments + alias @Constrat
|
||||
* git diff output formatting @Constrat
|
||||
* use github-actions[bot] credentials @Constrat
|
||||
* GenerateMaskRange 可以直接展示 mask_range 掩码后的图片 @zzyyyl
|
||||
* do not close enhancement issue @Rbqwow
|
||||
* dont close stale issue too late (#9899) @AnnAngela
|
||||
* 肉鸽坍缩范式插件代码整理 (#9833) @Alan-Charred
|
||||
* revert: 移除find_plugin @status102
|
||||
* Revert "feat!: 允许插件Verify期间自变更enable,以禁用非预期的启用 (#9876)" @zzyyyl
|
||||
* dont close issue too early (#9887) @AnnAngela
|
||||
* Manual Resource Update @Constrat
|
||||
* bump github actions versions (#9859) @dependabot[bot] @Constrat
|
||||
* dependabot gh actions automation (#9836) @Constrat
|
||||
* update-game-resources 时再输出 user 信息 @zzyyyl
|
||||
* Translations update from MAA Weblate (#9845) @AlisaAkiron
|
||||
* clang-format 格式修改 (#9586) @zzyyyl
|
||||
* format @status102
|
||||
* tweaks @Constrat
|
||||
* 完善pr-checker的提示 @SherkeyXD
|
||||
* markdown-checker exclude <https://ark.yituliu.cn/> @zzyyyl
|
||||
* 有 core 标签不打 ambiguous @zzyyyl
|
||||
* issue-bot 增加关键词 (#9771) @Rbqwow
|
||||
* avoid generate package.json & package-lock.json while res-update-game @zzyyyl
|
||||
* Add prettier in res-update-game @zzyyyl
|
||||
* Add prettier in res-update-game @zzyyyl
|
||||
* Update tools/OptimizeTemplates/optimize_templates.json @zzyyyl
|
||||
* 删去 pre-commit-ci 中 oxipng 的 --alpha 参数 @zzyyyl
|
||||
* Update .prettierignore @zzyyyl
|
||||
* Update .prettierignore @zzyyyl
|
||||
* OptimizeTemplates 脚本改为使用 oxipng @zzyyyl
|
||||
* bump maatouch to v1.1.0 (#9749) @Manicsteiner
|
||||
* 使用 pre-commit-ci 来格式化与压缩文件 (#9732) @SherkeyXD
|
||||
* Revert "feat(ci): allow cache overwriting" @Constrat
|
||||
* remove unused include + style @Constrat
|
||||
* add testing image @Constrat
|
||||
* remove testing image @Constrat
|
||||
* add testing image @Constrat
|
||||
* change name action @Constrat
|
||||
* install oxipng @Constrat
|
||||
* remove testing png @Constrat
|
||||
* fix docsearch base @SherkeyXD
|
||||
* auto optimize-templates.yml @Constrat
|
||||
* add requirements.txt for optimize-templates.py @Constrat
|
||||
* optimize templates perf and fixes @Constrat
|
||||
* Revert "ci: optimize templates perf and fixes" (#9929) @Constrat
|
||||
* optimize templates perf and fixes (#9928) @Constrat
|
||||
|
||||
### For Overseas
|
||||
|
||||
#### YostarEN
|
||||
* Global SSS#4 copilot adaptation @Constrat
|
||||
* tweak Reed Alter, Noir Corne alter regex @Constrat
|
||||
* SSS#4 Automaton Arena @Constrat
|
||||
* Global SSS#4 copilot (Translation work in progress) @Constrat
|
||||
* Translations update from MAA Weblate (#9640) @AlisaAkiron @Rbqwow
|
||||
* YoStar -> Yostar only for interfaces (#9548) @Constrat
|
||||
|
||||
#### txwy
|
||||
|
||||
* 補充繁中服保全派駐#3 相關內容 (#9701) @momomochi987
|
||||
* 繁中服「綠野幻夢」復刻活動導航 (#9913) @momomochi987
|
||||
* 修正繁中服薩米肉鴿獎勵無法多選一的問題 (#9584) @momomochi987
|
||||
* 繁中服部分角色無法正確辨識 (#9647) @momomochi987
|
||||
|
||||
#### YoStarEN
|
||||
|
||||
* YoStarEN resolution warning on client switch (#9539) @Constrat @ABA2396
|
||||
* YostarEN SSS#4 buffs and branches @Constrat
|
||||
|
||||
#### YoStarJP
|
||||
|
||||
* YostarJP HS navigation (#9958) @Manicsteiner
|
||||
* YostarJP WB navigation (#9715) @Manicsteiner
|
||||
* YostarJP add SSSBuffChoose (#9629) @Manicsteiner
|
||||
* YostarJP cor fix and roguelike shop text (#9591) @Manicsteiner
|
||||
|
||||
#### YoStarKR
|
||||
|
||||
* YostarKR WB navigation @HX3N
|
||||
* YostarKR add SSSBuffChoose @HX3N
|
||||
* YostarKR ocr fix and remove SkipThePreBattlePlot @HX3N
|
||||
|
||||
@@ -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.',
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
|
After Width: | Height: | Size: 691 KiB |
|
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 |
|
After Width: | Height: | Size: 420 KiB |
BIN
docs/.vuepress/public/image/ja-jp/introduction-i.s.-pin-up.png
Normal file
|
After Width: | Height: | Size: 301 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 |
|
After Width: | Height: | Size: 643 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 |
|
After Width: | Height: | Size: 429 KiB |
BIN
docs/.vuepress/public/image/zh-cn/copilot-click-like.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 27 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/fork.png
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-1.png
Normal file
|
After Width: | Height: | Size: 26 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10.png
Normal file
|
After Width: | Height: | Size: 29 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11.png
Normal file
|
After Width: | Height: | Size: 65 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12.png
Normal file
|
After Width: | Height: | Size: 69 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-13.png
Normal file
|
After Width: | Height: | Size: 68 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-15.png
Normal file
|
After Width: | Height: | Size: 108 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2.png
Normal file
|
After Width: | Height: | Size: 32 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4.png
Normal file
|
After Width: | Height: | Size: 50 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5.png
Normal file
|
After Width: | Height: | Size: 45 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-6.png
Normal file
|
After Width: | Height: | Size: 56 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-8.png
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pull-request.png
Normal file
|
After Width: | Height: | Size: 86 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/repository.png
Normal file
|
After Width: | Height: | Size: 108 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 |
@@ -97,7 +97,7 @@ Note: operations regarding Git can be done by VS2022 instead of command line too
|
||||
3. In Visual Studio, search for 'clang-format' in Tools-Options.
|
||||
4. Click `Enable ClangFormat support` and select `Use custom clang-format.exe file` and choose the `clang-format.exe` located in Step 2.
|
||||
|
||||

|
||||

|
||||
|
||||
You are all set with the clang-format integrated in Visual Studio supporting c++20 features!
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -18,11 +18,11 @@ This chapter contains slightly dry content. If you're not interested, you can sk
|
||||
|
||||
### Repository
|
||||
|
||||
"Repo" is short for "repository," which is the place where we store our code and other resource files.
|
||||
"Repo" is short for "repository", which is the place where we store our code and other resource files.
|
||||
|
||||
👇 You can think of the current web page and all of its contents as the repository for MAA (we usually refer to it as MAA's main repository).
|
||||
|
||||

|
||||

|
||||
|
||||
### Fork
|
||||
|
||||
@@ -32,7 +32,7 @@ Since it's a copy, let's assume it's called `MAA (1)`.
|
||||
To distinguish it from the original repository, we usually refer to the original MAA repository as "main repository", "upstream", or "origin".
|
||||
Since everyone can make a copy of their own, the copied repository is called a "personal repository".
|
||||
|
||||

|
||||

|
||||
|
||||
### Pull Request
|
||||
|
||||
@@ -42,7 +42,7 @@ Of course, since it's a "request", it naturally requires approval. MAA Team may
|
||||
|
||||
👇 The following are the PRs currently submitted by contributors and awaiting approval from MAA Team.
|
||||
|
||||

|
||||

|
||||
|
||||
### Conflict
|
||||
|
||||
@@ -53,53 +53,53 @@ Now we have a conflict, as both of you have modified the A file but in different
|
||||
|
||||
1. First, go to the MAA main repository and fork a copy of the code.
|
||||
|
||||

|
||||

|
||||
|
||||
2. Remove the "Only master branch" option, then click "Create Fork".
|
||||
|
||||

|
||||

|
||||
|
||||
3. You will be taken to your personal repository, which will have a title of "Your Name/MaaAssistantArknights", with a small note below stating "forked from MaaAssistantArknights/MaaAssistantArknights" (copied from the MAA main repository).
|
||||
|
||||

|
||||

|
||||
|
||||
4. Switch to the "dev" branch (the concept of branches is not relevant to this tutorial, so we will skip discussing it here, but you just need to follow these instructions to switch branches).
|
||||
|
||||

|
||||

|
||||
|
||||
5. Find the file you want to modify. You can click "Go to file" to search for it globally, or you can navigate through the folders below (if you know where the file is located).
|
||||
|
||||

|
||||

|
||||
|
||||
6. After opening the file, click on the ✏️ icon on the top right corner of the file to start editing.
|
||||
|
||||

|
||||

|
||||
|
||||
7. Make your changes! (If it's a resource file, we recommend testing the changes in your local MAA folder before pasting them in the web page to avoid errors).
|
||||
8. When you finish editing, scroll to the bottom of the page and describe your changes.
|
||||
|
||||

|
||||

|
||||
|
||||
9. Need to edit another file? Made a mistake and want to change it again? No problem! Simply repeat steps 5-8 for the other file.
|
||||
10. When all changes are made, create a Pull Request by going to the Pull Request tab in your personal repository.
|
||||
If there is a "Compare & Pull Request" button, that's great, just click it! If not, don't worry, clicking "New Pull Request" below is also the same (see step 11).
|
||||
|
||||

|
||||

|
||||
|
||||
11. Now you are in the main repository, please double-check the changes you want to PR.
|
||||
As shown in the figure, there is a leftward arrow, which means you want to merge the dev branch from your forked repository "Your name/MAA" to the dev branch of the main repository "MAA".
|
||||
Then, write a title and description of your changes, and click "Create Pull Request".
|
||||
|
||||

|
||||

|
||||
|
||||
12. Just wait for the MAA Team's experts to review it! Of course, they may also provide some comments,
|
||||
👇 for example (for entertainment purposes only, do not take it seriously):
|
||||

|
||||

|
||||
|
||||
13. If they request further changes, go back to your personal repository, switch to the dev branch, and repeat steps 3-9!
|
||||
Note that you do not need to redo step 2 (re-fork) or step 10 (re-Pull Request), your current Pull Request is still pending review, and subsequent changes will be added directly to this Pull Request.
|
||||
👇 For example, you can see that "revised demo" has been added at the bottom.
|
||||

|
||||

|
||||
|
||||
14. Once the experts approve the PR, you're all set! After the version is released, your GitHub avatar will automatically be added to the contributors list. Thank you very much for your selfless dedication!
|
||||
[](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
|
||||
@@ -110,6 +110,6 @@ Now we have a conflict, as both of you have modified the A file but in different
|
||||
|
||||
If you are not sure or don't care about what I said above, please click the button on the left.
|
||||
|
||||

|
||||

|
||||
|
||||
Then repeat steps 3-14, make changes and submit PR.
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -53,7 +53,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need
|
||||
- For the SS event rerun, you can enter `SSReopen-XX` to clear XX-1 ~ XX-9 levels once. Example `SSReopen-IC`.
|
||||
|
||||
::: details Example
|
||||

|
||||

|
||||
:::
|
||||
|
||||
### Annihilation Mode
|
||||
|
||||
@@ -29,7 +29,7 @@ Welcome to share your tasks with [prts.plus](https://prts.plus)!
|
||||
- 开启本功能后改为在**关卡所在的地图界面**开始自动战斗。在理智不足/战斗失败/非三星结算时将停止自动战斗队列。
|
||||
- 请确保列表中的关卡在同一区域 (只通过左右滑动地图界面就可以导航到)。
|
||||
- Remember to like the tasks that you think helpful!
|
||||

|
||||

|
||||
|
||||
## Create Tasks
|
||||
|
||||
|
||||
@@ -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": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||