Compare commits
1229 Commits
feat/githu
...
v5.7.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ece52124a9 | ||
|
|
5e3988ba91 | ||
|
|
192ad2cf6f | ||
|
|
627dbe4189 | ||
|
|
f8e6880899 | ||
|
|
df21dcb201 | ||
|
|
73bf9f4e21 | ||
|
|
69da70c1ba | ||
|
|
9d00d3851e | ||
|
|
bd44c5f0fa | ||
|
|
1759f8c234 | ||
|
|
cdc9903e9f | ||
|
|
6f31264c48 | ||
|
|
1c686c4b5a | ||
|
|
6ef35b1e74 | ||
|
|
f50f72678e | ||
|
|
e6102b579e | ||
|
|
2d214bb3ea | ||
|
|
142c8aad3c | ||
|
|
0185d4908d | ||
|
|
3fcff1f09d | ||
|
|
7ab323d3dd | ||
|
|
5d76565ba2 | ||
|
|
236742c3ab | ||
|
|
6f72b444ac | ||
|
|
5e1e931c2d | ||
|
|
b6a7d3bfc8 | ||
|
|
6f16995ce6 | ||
|
|
9e15bf6a60 | ||
|
|
d3d2cd307b | ||
|
|
55a3f83e8a | ||
|
|
c234f0f4d9 | ||
|
|
501cc62096 | ||
|
|
4ab1e3704b | ||
|
|
f88c90aa0c | ||
|
|
c3a36da016 | ||
|
|
afbbedd88f | ||
|
|
122af971c3 | ||
|
|
90e5f37a9f | ||
|
|
e1a4010e98 | ||
|
|
30310ca40a | ||
|
|
b5a93c5f9f | ||
|
|
20fed4c971 | ||
|
|
90f9ba7e9e | ||
|
|
2530598b6f | ||
|
|
0a132b241f | ||
|
|
d07506012f | ||
|
|
e1b8fefd12 | ||
|
|
80a55c9327 | ||
|
|
ea6ccf4885 | ||
|
|
4b258d57bc | ||
|
|
35607fd056 | ||
|
|
bda8c30f18 | ||
|
|
9a6a2ad31b | ||
|
|
aa02e5e23d | ||
|
|
ae18f00679 | ||
|
|
f4ba45957a | ||
|
|
e59a5e2b7a | ||
|
|
f40036d6df | ||
|
|
d8f3dded11 | ||
|
|
49aa88a35c | ||
|
|
43a9d2ec9f | ||
|
|
574e4da878 | ||
|
|
7cd1047886 | ||
|
|
261e4f22cf | ||
|
|
f42f527015 | ||
|
|
f38c88c7f4 | ||
|
|
525140fa75 | ||
|
|
0075b59da1 | ||
|
|
cb331b653c | ||
|
|
e78420fac6 | ||
|
|
e7e32a22fa | ||
|
|
8bd0ce5626 | ||
|
|
94ff657808 | ||
|
|
608efbec1f | ||
|
|
e15a15e074 | ||
|
|
db8265086e | ||
|
|
ebe7c808d5 | ||
|
|
af7a93c179 | ||
|
|
50251278ed | ||
|
|
6c25ec2f46 | ||
|
|
f202c0f0d3 | ||
|
|
259925c1f2 | ||
|
|
f9bfec7dee | ||
|
|
8f97191ee9 | ||
|
|
2c212376b8 | ||
|
|
b9824460c5 | ||
|
|
1f0b884e33 | ||
|
|
4d6567ffdd | ||
|
|
89ce9ae546 | ||
|
|
82a5f53ff1 | ||
|
|
ae77c07311 | ||
|
|
c4e320526c | ||
|
|
4734d2600d | ||
|
|
a47597879c | ||
|
|
1e6a985bc7 | ||
|
|
557abe700e | ||
|
|
b8ea0d41a7 | ||
|
|
ffb7da7a58 | ||
|
|
9c80f7a04d | ||
|
|
d2040d3328 | ||
|
|
885f248364 | ||
|
|
bac30b6678 | ||
|
|
2a8cb64801 | ||
|
|
d77778fb5d | ||
|
|
eef2a80b36 | ||
|
|
0618dd6e50 | ||
|
|
463bd84c6f | ||
|
|
bc14b6cf27 | ||
|
|
ef2873c977 | ||
|
|
331bfa11ce | ||
|
|
b27df9b509 | ||
|
|
a7be240c4a | ||
|
|
40c0898427 | ||
|
|
34a2b083d8 | ||
|
|
a99c900658 | ||
|
|
5a3698a396 | ||
|
|
5cf3f0ac7b | ||
|
|
389ce2d5fd | ||
|
|
2e4bb63acf | ||
|
|
02ff6e0c63 | ||
|
|
2b3435b66d | ||
|
|
fbca4a6bf0 | ||
|
|
1c00f4277e | ||
|
|
fca3c26564 | ||
|
|
838a1d9844 | ||
|
|
08f44e066d | ||
|
|
ba596c74f8 | ||
|
|
6081a04f2e | ||
|
|
7744a30869 | ||
|
|
e9003c772c | ||
|
|
a0e1fc1b2d | ||
|
|
ae1a8cfcba | ||
|
|
77f812b1ac | ||
|
|
5e11128fa2 | ||
|
|
1d6481448a | ||
|
|
46d4c5ceb2 | ||
|
|
701579d863 | ||
|
|
a12f3d8fc9 | ||
|
|
f998118d44 | ||
|
|
07129479a8 | ||
|
|
f8f9a70dca | ||
|
|
abb471ba74 | ||
|
|
40327e4f4a | ||
|
|
b1c607518c | ||
|
|
26781dd864 | ||
|
|
4bd5b9ee79 | ||
|
|
32535dc79f | ||
|
|
b224518303 | ||
|
|
fb0410174c | ||
|
|
fa9bc36f3b | ||
|
|
927ab19e3e | ||
|
|
79b024ecfb | ||
|
|
6529b8b1bc | ||
|
|
32c64823ee | ||
|
|
e4cf893ed5 | ||
|
|
a9e2eb901e | ||
|
|
ca2d9ccf0b | ||
|
|
43d184c57c | ||
|
|
6866c57f48 | ||
|
|
7023d7ea57 | ||
|
|
ee96efeede | ||
|
|
7e5aa9402c | ||
|
|
1ec890214d | ||
|
|
ccdd0c9e06 | ||
|
|
7d31fc8c29 | ||
|
|
a82e162957 | ||
|
|
aa55e51b2c | ||
|
|
c6e929933f | ||
|
|
c552395b56 | ||
|
|
d82934783b | ||
|
|
9262fe180a | ||
|
|
ce6fb339e1 | ||
|
|
a793341181 | ||
|
|
c2a285eaa2 | ||
|
|
598575d13c | ||
|
|
c59fb8413c | ||
|
|
1293504c64 | ||
|
|
9b92283954 | ||
|
|
02dc16d5a3 | ||
|
|
2056cbef00 | ||
|
|
e9336d78ec | ||
|
|
8829cdc70f | ||
|
|
453ce619f8 | ||
|
|
77a66a1aee | ||
|
|
86a4f23038 | ||
|
|
5deda05370 | ||
|
|
854c8af83f | ||
|
|
ab62d1e6e7 | ||
|
|
3aa60a91e6 | ||
|
|
6b571b2c63 | ||
|
|
c6c640c2a6 | ||
|
|
e5d5a48033 | ||
|
|
8857eb03ea | ||
|
|
93ed600d1c | ||
|
|
a9eb6ed025 | ||
|
|
4e395b62ae | ||
|
|
45e8548b07 | ||
|
|
a89e2e4143 | ||
|
|
56afb55340 | ||
|
|
593c00a36f | ||
|
|
db09953636 | ||
|
|
506e1228cf | ||
|
|
f73edd5874 | ||
|
|
7e304a8a23 | ||
|
|
bacb892a46 | ||
|
|
f59f539817 | ||
|
|
2396a7e67f | ||
|
|
c17593e913 | ||
|
|
7e32a8ce40 | ||
|
|
18af8f0bf8 | ||
|
|
5f4d505f0f | ||
|
|
f4a6d50e17 | ||
|
|
5b19ee109d | ||
|
|
576c0b472b | ||
|
|
533662d9e9 | ||
|
|
92d4b012cb | ||
|
|
be872da15b | ||
|
|
1bf3ce832e | ||
|
|
9b1b5bc2e9 | ||
|
|
0485307acb | ||
|
|
9f30777e73 | ||
|
|
c6c6b862ca | ||
|
|
773a5ceff4 | ||
|
|
e3d69ba4e5 | ||
|
|
1d0de2fcfa | ||
|
|
29d052e34f | ||
|
|
60516bf79c | ||
|
|
30acf5d150 | ||
|
|
b31810faaa | ||
|
|
41bb236867 | ||
|
|
0d85a37dc7 | ||
|
|
4c07483079 | ||
|
|
b39678faad | ||
|
|
8454075468 | ||
|
|
9d96081f47 | ||
|
|
13befbf153 | ||
|
|
13bb0a9261 | ||
|
|
c109854749 | ||
|
|
89d016e88e | ||
|
|
aa014333af | ||
|
|
6acb8301c2 | ||
|
|
28fbe72e24 | ||
|
|
39ac002224 | ||
|
|
f4362b44f9 | ||
|
|
78f3e7678b | ||
|
|
76c5708be7 | ||
|
|
62bc8bd007 | ||
|
|
f618d776d7 | ||
|
|
8ce0950ff4 | ||
|
|
92b4fee512 | ||
|
|
b5c62832ed | ||
|
|
d510c12f94 | ||
|
|
b88de666f1 | ||
|
|
df285b9a66 | ||
|
|
c7d4d6362a | ||
|
|
50bcd9de1c | ||
|
|
9511070f3d | ||
|
|
bbfbf96b83 | ||
|
|
39d0ad576e | ||
|
|
33e69aaeb8 | ||
|
|
ac6944dbae | ||
|
|
a04a4b837f | ||
|
|
42b773f219 | ||
|
|
4dfc4dc3c6 | ||
|
|
ba93f8c8e9 | ||
|
|
b6b15f498f | ||
|
|
4528b2213e | ||
|
|
5c645e7564 | ||
|
|
d8f321564c | ||
|
|
c479834d38 | ||
|
|
f3fa4ff001 | ||
|
|
35f3bb193f | ||
|
|
45a5e14dde | ||
|
|
f2b96645c8 | ||
|
|
5349fe0635 | ||
|
|
cfef166602 | ||
|
|
0ecaaa5400 | ||
|
|
022fcc2b13 | ||
|
|
f3ede6858a | ||
|
|
d862a2fec5 | ||
|
|
4d824d08af | ||
|
|
69e7b399b6 | ||
|
|
117e074a84 | ||
|
|
4a07315e19 | ||
|
|
1610e3b81a | ||
|
|
ee360c3ddf | ||
|
|
9273cf6abe | ||
|
|
e60d708548 | ||
|
|
784b94a440 | ||
|
|
bd926c64f6 | ||
|
|
f65210ed93 | ||
|
|
6569089abb | ||
|
|
950961a089 | ||
|
|
5a10df22d3 | ||
|
|
881e46f499 | ||
|
|
8aa9b63306 | ||
|
|
872b400bec | ||
|
|
1608136bea | ||
|
|
fdb9f7e295 | ||
|
|
d869103497 | ||
|
|
f40ba2e58f | ||
|
|
17cb0ae3e4 | ||
|
|
af9dd71b30 | ||
|
|
4c6deb571a | ||
|
|
e13f4611d1 | ||
|
|
6dcb77f168 | ||
|
|
5872d6606e | ||
|
|
5875de69aa | ||
|
|
9a1f59206d | ||
|
|
d5ed0db686 | ||
|
|
962dcc3b51 | ||
|
|
25e409f8d0 | ||
|
|
f7a4b4bac4 | ||
|
|
3910bfa0fa | ||
|
|
20cebf57cd | ||
|
|
f94b1d2c11 | ||
|
|
11c1cdcae8 | ||
|
|
14f25c8638 | ||
|
|
d1fad4efd4 | ||
|
|
cdd4c4c78e | ||
|
|
808e0d2863 | ||
|
|
465f49fbe4 | ||
|
|
75e723a1b4 | ||
|
|
1199b7de42 | ||
|
|
d141db3680 | ||
|
|
43ec787767 | ||
|
|
49e74fa293 | ||
|
|
dcf9f0ffe1 | ||
|
|
cc9e3a516c | ||
|
|
77de769213 | ||
|
|
eccc5e08f8 | ||
|
|
ee9c1f38ba | ||
|
|
21c33e68ea | ||
|
|
b03e5a56e9 | ||
|
|
de26d22f79 | ||
|
|
75c82df749 | ||
|
|
64eb5536e1 | ||
|
|
fcf5bb696c | ||
|
|
e227d71813 | ||
|
|
bdfc1f139c | ||
|
|
9b80ba96c7 | ||
|
|
2afb29191a | ||
|
|
d929b433db | ||
|
|
6fe87e4eca | ||
|
|
8edcf183a5 | ||
|
|
5a66f65287 | ||
|
|
207172b366 | ||
|
|
a04269bdcb | ||
|
|
736b0055d8 | ||
|
|
7888158f1b | ||
|
|
18257c70e7 | ||
|
|
55e8436b5f | ||
|
|
4798f4df06 | ||
|
|
f7d9856c85 | ||
|
|
5470c313e2 | ||
|
|
3be685c560 | ||
|
|
ec93472984 | ||
|
|
c8c90c1604 | ||
|
|
89261430cb | ||
|
|
971699bcbe | ||
|
|
046b3329ea | ||
|
|
0fd48d774a | ||
|
|
92d187558e | ||
|
|
7c3c5b81d4 | ||
|
|
019e483f91 | ||
|
|
62eae0ad59 | ||
|
|
ae923d65f9 | ||
|
|
46f5475df0 | ||
|
|
c3a5471ca2 | ||
|
|
8e6ba0e21a | ||
|
|
b2b8137d16 | ||
|
|
c0eb5a2819 | ||
|
|
3d44d574a2 | ||
|
|
13886380a6 | ||
|
|
cb87f2f614 | ||
|
|
eb70b3ddd2 | ||
|
|
8d0e9bb9c0 | ||
|
|
10d51c6c38 | ||
|
|
ffdf42a72f | ||
|
|
4dde138858 | ||
|
|
4db4297c4f | ||
|
|
f07ff1bf27 | ||
|
|
77808ffca2 | ||
|
|
a737e978bd | ||
|
|
af5ff9b07b | ||
|
|
5f9e4905ac | ||
|
|
78e82ced53 | ||
|
|
3509638773 | ||
|
|
637b302cc3 | ||
|
|
c80a6fff05 | ||
|
|
4a493fb466 | ||
|
|
4a156f4c7f | ||
|
|
db4b80e967 | ||
|
|
72a78402fb | ||
|
|
af27e95fdc | ||
|
|
d539d26ac8 | ||
|
|
bceea3bd93 | ||
|
|
3625fb18c4 | ||
|
|
2991ab3ad7 | ||
|
|
078d8ee50d | ||
|
|
ed8873580b | ||
|
|
dc153b34c7 | ||
|
|
d57e74a2e6 | ||
|
|
0af22cd776 | ||
|
|
7ec665dd91 | ||
|
|
fa0786d627 | ||
|
|
d201dea34f | ||
|
|
637f67d4a1 | ||
|
|
7521b526ee | ||
|
|
6c4582faa6 | ||
|
|
0171d9c025 | ||
|
|
8b34d53358 | ||
|
|
008d06b7b5 | ||
|
|
5e8241fc7c | ||
|
|
cb1b627e20 | ||
|
|
a4463100c1 | ||
|
|
c89362ab82 | ||
|
|
eb11ed16ef | ||
|
|
b0d54c8a3f | ||
|
|
498ea5f6a4 | ||
|
|
39fe945e30 | ||
|
|
9994819e13 | ||
|
|
969493a031 | ||
|
|
5bdc822b7a | ||
|
|
90fac774ce | ||
|
|
5fdea2ada4 | ||
|
|
6188a2ba3f | ||
|
|
facbff3ef2 | ||
|
|
c3f867624c | ||
|
|
48e2f72008 | ||
|
|
d79690a269 | ||
|
|
17ef91e259 | ||
|
|
f70f4500e1 | ||
|
|
575a0fce81 | ||
|
|
ba35b711d2 | ||
|
|
56f1bf6b66 | ||
|
|
d41e436f4f | ||
|
|
a0dd8e60df | ||
|
|
6b89a87a02 | ||
|
|
d3b09741c7 | ||
|
|
56654a4ddf | ||
|
|
a4a2b8456b | ||
|
|
7631e9a5d2 | ||
|
|
bc4694a1a0 | ||
|
|
cab776350a | ||
|
|
ffe8bfcf09 | ||
|
|
5f3f93473f | ||
|
|
66a9b4ebfa | ||
|
|
435a374915 | ||
|
|
d04f2f64b4 | ||
|
|
ed489bab8f | ||
|
|
77a3e49cfd | ||
|
|
70aded1a40 | ||
|
|
6c2ed8a0b7 | ||
|
|
e64140408c | ||
|
|
8a4bf6ae0c | ||
|
|
945ff7ca30 | ||
|
|
54e6481310 | ||
|
|
4c3a65c407 | ||
|
|
788275c131 | ||
|
|
0bf6beac84 | ||
|
|
8c68d90a3d | ||
|
|
1d06e808f8 | ||
|
|
9f8c3f583d | ||
|
|
58056d0ccb | ||
|
|
9bf4111d98 | ||
|
|
653f1c296a | ||
|
|
2816d36221 | ||
|
|
b5080423ef | ||
|
|
7464b1b06b | ||
|
|
2c5f79c2a5 | ||
|
|
bd52348126 | ||
|
|
17b04ae60d | ||
|
|
52998a5db0 | ||
|
|
ca4458f20d | ||
|
|
884edc604b | ||
|
|
ebc0d3e26d | ||
|
|
1905d5923b | ||
|
|
48df7ee075 | ||
|
|
aaeb6f4c11 | ||
|
|
c0e3756a96 | ||
|
|
bade06bee1 | ||
|
|
9032f77010 | ||
|
|
8b31031f8b | ||
|
|
420e743bce | ||
|
|
21e19ccdcb | ||
|
|
dde048fb4c | ||
|
|
2190016c06 | ||
|
|
b094bf8600 | ||
|
|
74ed921355 | ||
|
|
cd9ba50d57 | ||
|
|
a2b1c8a95b | ||
|
|
99fe87a005 | ||
|
|
f260c78bb9 | ||
|
|
d788c5ad73 | ||
|
|
84af1ee70e | ||
|
|
92f24ec988 | ||
|
|
4937464195 | ||
|
|
810d347e95 | ||
|
|
6b6a20e6d3 | ||
|
|
cc150d9a4a | ||
|
|
7330494e58 | ||
|
|
63064ca3ca | ||
|
|
ccc9d046c8 | ||
|
|
6bf06c6c72 | ||
|
|
ff84e07881 | ||
|
|
03a7440473 | ||
|
|
ebdb594515 | ||
|
|
5e0aaecc3e | ||
|
|
fe4449d2ea | ||
|
|
09ed6d6ff7 | ||
|
|
4b781d9a9d | ||
|
|
ee1f24f60e | ||
|
|
f5f9873684 | ||
|
|
fdbd7a05f0 | ||
|
|
62b530b48f | ||
|
|
0c774de473 | ||
|
|
8de4d75683 | ||
|
|
366881fe8f | ||
|
|
92e477dd45 | ||
|
|
5ef663af0d | ||
|
|
7d02255b46 | ||
|
|
a7e545034c | ||
|
|
e1556c4b45 | ||
|
|
c45b685c17 | ||
|
|
f4f016b407 | ||
|
|
634b22175d | ||
|
|
e07baaafec | ||
|
|
165afc8d90 | ||
|
|
657a1c254f | ||
|
|
38139b9091 | ||
|
|
bf10bcdaa6 | ||
|
|
87cd2f107f | ||
|
|
0e3d51db02 | ||
|
|
332d067112 | ||
|
|
4c348d6cf0 | ||
|
|
148dfede6c | ||
|
|
9639c04448 | ||
|
|
de8ba8af63 | ||
|
|
d719a81d1c | ||
|
|
d2ce2399b9 | ||
|
|
59ee90dd10 | ||
|
|
736f836232 | ||
|
|
d319bac4a5 | ||
|
|
06785bad3f | ||
|
|
a3f7b0af9a | ||
|
|
7681b80ec8 | ||
|
|
3509e1ae1b | ||
|
|
0dea692e41 | ||
|
|
bd346bd578 | ||
|
|
2116fbf347 | ||
|
|
a61c6130e2 | ||
|
|
80c34a07e1 | ||
|
|
a0bfa4cd48 | ||
|
|
6f431852e3 | ||
|
|
11605b7982 | ||
|
|
86dfe16551 | ||
|
|
f47020ce7f | ||
|
|
7855c64765 | ||
|
|
d120a04206 | ||
|
|
f7ab391eff | ||
|
|
c96f2e66b2 | ||
|
|
cfdc61eb46 | ||
|
|
3b6404b7e6 | ||
|
|
0879dc2788 | ||
|
|
c847cb6942 | ||
|
|
0e51aaba09 | ||
|
|
73841ee525 | ||
|
|
67e30955f7 | ||
|
|
290d10418c | ||
|
|
946a164907 | ||
|
|
444bb7909e | ||
|
|
e585b91339 | ||
|
|
24de93fbfb | ||
|
|
53deb4d0d3 | ||
|
|
3994e845ad | ||
|
|
b3e1cba56b | ||
|
|
0074cf0ae0 | ||
|
|
5cabfa755f | ||
|
|
9a14f70223 | ||
|
|
eb591c0343 | ||
|
|
11aeb1ccb8 | ||
|
|
05ac9c286d | ||
|
|
cdc69eea08 | ||
|
|
c82aeb0256 | ||
|
|
7e9b5d0006 | ||
|
|
f64aca75a5 | ||
|
|
b6cb642778 | ||
|
|
87b01d90f8 | ||
|
|
9e76c47a09 | ||
|
|
9487cc8b06 | ||
|
|
411b8f6a4f | ||
|
|
ae1c6a6b8f | ||
|
|
5505f8030f | ||
|
|
24377f19a2 | ||
|
|
2ec467ef04 | ||
|
|
fef78b2e6b | ||
|
|
3c40a48ab5 | ||
|
|
8a3595991a | ||
|
|
7505461ccc | ||
|
|
89f35b616d | ||
|
|
b557d9f8c6 | ||
|
|
c7fe02ebbb | ||
|
|
402d68f478 | ||
|
|
06a8cb68ff | ||
|
|
c707825a92 | ||
|
|
9c69899620 | ||
|
|
56f4702278 | ||
|
|
72446cedd3 | ||
|
|
286b2e147d | ||
|
|
c01b52a6d2 | ||
|
|
0afe548fd6 | ||
|
|
06d45ea0bf | ||
|
|
43a097d03b | ||
|
|
54a4a789c3 | ||
|
|
22f0231587 | ||
|
|
d762da42e1 | ||
|
|
b1241f4f74 | ||
|
|
f50ab269d7 | ||
|
|
d39f4a0327 | ||
|
|
fc9cb70024 | ||
|
|
ed94f0af51 | ||
|
|
104f8e8de7 | ||
|
|
5253bdc808 | ||
|
|
91fbaff4f4 | ||
|
|
7bda539e49 | ||
|
|
6277e5fa47 | ||
|
|
d194f4895f | ||
|
|
d0310dc61c | ||
|
|
cf659e0055 | ||
|
|
dcfddbdfdd | ||
|
|
242eab79c7 | ||
|
|
75a25f0711 | ||
|
|
e29304dd9f | ||
|
|
856b7ee4d3 | ||
|
|
2ba4eb866a | ||
|
|
74b05d60e1 | ||
|
|
875af8f213 | ||
|
|
a3173eb04c | ||
|
|
749a97775f | ||
|
|
adf2501615 | ||
|
|
33a5f275a1 | ||
|
|
0095c44431 | ||
|
|
13b127c468 | ||
|
|
9108f01264 | ||
|
|
4c05c081c3 | ||
|
|
d5e4d0efd7 | ||
|
|
880917b64c | ||
|
|
0e6ed98b68 | ||
|
|
e207a74995 | ||
|
|
daa6596b41 | ||
|
|
d3b26140e3 | ||
|
|
f89b59e680 | ||
|
|
2829a5701d | ||
|
|
96fdcb55d2 | ||
|
|
740e49cc4e | ||
|
|
f8f13fc533 | ||
|
|
463fdfdaab | ||
|
|
57c5185104 | ||
|
|
9c26964779 | ||
|
|
3898c2fc42 | ||
|
|
1749cd18c3 | ||
|
|
0085e1242f | ||
|
|
b78e7109f2 | ||
|
|
5328640ace | ||
|
|
e722615273 | ||
|
|
faa68bf51e | ||
|
|
b8f49ca656 | ||
|
|
a0c1904ae9 | ||
|
|
b71e535541 | ||
|
|
01ab3165f6 | ||
|
|
44731c7771 | ||
|
|
0773d31fd7 | ||
|
|
86318dc3ff | ||
|
|
46abd60d9d | ||
|
|
2dceadbd7d | ||
|
|
9e2f4084a8 | ||
|
|
5731c4e0be | ||
|
|
c776897e72 | ||
|
|
ae071ab379 | ||
|
|
8b43f4a1ec | ||
|
|
24ad0b1802 | ||
|
|
cfc26bf7ba | ||
|
|
b41a99a719 | ||
|
|
5c0825328c | ||
|
|
cacec2b614 | ||
|
|
c63af68d6c | ||
|
|
99962c1405 | ||
|
|
d488a5afba | ||
|
|
592f47200c | ||
|
|
77518e50a6 | ||
|
|
42799aafda | ||
|
|
8c6b2514e6 | ||
|
|
c6a8967c8b | ||
|
|
bb2a44c539 | ||
|
|
7c7f44bb45 | ||
|
|
5e7e988de0 | ||
|
|
d08b3f4d4d | ||
|
|
1ef2e664f1 | ||
|
|
aa083beaaf | ||
|
|
8704585bb0 | ||
|
|
8eec24a15c | ||
|
|
58f44d8fb8 | ||
|
|
b8437e4035 | ||
|
|
fe17ecfccc | ||
|
|
67735d600a | ||
|
|
a544fcb683 | ||
|
|
909d875426 | ||
|
|
5abad4e282 | ||
|
|
5d75f4a214 | ||
|
|
e00e230d27 | ||
|
|
f4ed000684 | ||
|
|
0e5b83cf80 | ||
|
|
e1c3d5083c | ||
|
|
519cc493e0 | ||
|
|
9017e60538 | ||
|
|
bc1c01a1bc | ||
|
|
920d5735f8 | ||
|
|
0095332a0a | ||
|
|
086d68cb8c | ||
|
|
0f2b501974 | ||
|
|
837c5bc04a | ||
|
|
271985fcb4 | ||
|
|
eb141d6eda | ||
|
|
adf7ea8a79 | ||
|
|
dc923fa092 | ||
|
|
ce0ed9b169 | ||
|
|
4c9cd8ae91 | ||
|
|
69de3b94a9 | ||
|
|
7e35d609f6 | ||
|
|
7f17ea83d6 | ||
|
|
db733b6310 | ||
|
|
be58898ac9 | ||
|
|
4a266c905b | ||
|
|
4abae82403 | ||
|
|
484e8a9c23 | ||
|
|
4b1750f093 | ||
|
|
fd959ae341 | ||
|
|
08fa9313c3 | ||
|
|
8088a840c9 | ||
|
|
872bc5e78d | ||
|
|
4450e4f36c | ||
|
|
2e4809bb25 | ||
|
|
5f5eccda72 | ||
|
|
954e4a68f0 | ||
|
|
5108899bc3 | ||
|
|
83bf7d5718 | ||
|
|
99e8f47ce1 | ||
|
|
b54a1bc4fc | ||
|
|
3134f3d468 | ||
|
|
db14568241 | ||
|
|
f0b06ba771 | ||
|
|
1ceec50e50 | ||
|
|
e745dc9d7b | ||
|
|
43f7f1f167 | ||
|
|
9f6b6f0257 | ||
|
|
a03972b19c | ||
|
|
b5d7bbd631 | ||
|
|
aed6652217 | ||
|
|
199d9d350d | ||
|
|
12849a7ca0 | ||
|
|
77305e2f52 | ||
|
|
f44095e8e7 | ||
|
|
cbc2a18c7a | ||
|
|
4deeeb8ea2 | ||
|
|
018e0a82cc | ||
|
|
16e6093633 | ||
|
|
f77d978aec | ||
|
|
1d1f67c55d | ||
|
|
698990562e | ||
|
|
0372a7d36c | ||
|
|
8581db53f9 | ||
|
|
2beedb7e0d | ||
|
|
0bb28cc626 | ||
|
|
fe7cc5f7b0 | ||
|
|
6781323d55 | ||
|
|
a8e0c2a63e | ||
|
|
18c5555388 | ||
|
|
64e429ea02 | ||
|
|
c51aeecd06 | ||
|
|
cf87918d79 | ||
|
|
8682a6e6cf | ||
|
|
55d3883d58 | ||
|
|
dedc3c7d4a | ||
|
|
0d7b37e38b | ||
|
|
29d52c3832 | ||
|
|
5720d7d887 | ||
|
|
513823ba5d | ||
|
|
c17c036a0f | ||
|
|
a8d406e57c | ||
|
|
72c85b3f5b | ||
|
|
7986f03568 | ||
|
|
1d5f19a418 | ||
|
|
03c50e634a | ||
|
|
a614dda122 | ||
|
|
3f842303d8 | ||
|
|
8a04d42a92 | ||
|
|
afedc19d57 | ||
|
|
7d502f9e42 | ||
|
|
c551d393cb | ||
|
|
07d7e32348 | ||
|
|
16912e3290 | ||
|
|
b6a3c61dfe | ||
|
|
ad56e24127 | ||
|
|
724ce1f541 | ||
|
|
68f463760a | ||
|
|
10eac1ffc6 | ||
|
|
7476bb67a1 | ||
|
|
57c9df9dc9 | ||
|
|
5beecae05f | ||
|
|
b80265f24d | ||
|
|
87bc5cf235 | ||
|
|
5f7c76e007 | ||
|
|
1efd262315 | ||
|
|
89ac713d92 | ||
|
|
29ca30cb99 | ||
|
|
d905457092 | ||
|
|
4f88127091 | ||
|
|
c8f2696d4c | ||
|
|
7fc2531a8c | ||
|
|
95ea69a78f | ||
|
|
557329075f | ||
|
|
bbe5602bf6 | ||
|
|
2ad1f22298 | ||
|
|
84acb20806 | ||
|
|
171c5891ec | ||
|
|
338e4e40b1 | ||
|
|
e32c6bb2d6 | ||
|
|
5fc26287cb | ||
|
|
298e995c6b | ||
|
|
8bbce5b3e5 | ||
|
|
7b205f62fe | ||
|
|
6527c9859e | ||
|
|
5ccaab3302 | ||
|
|
6035f67aad | ||
|
|
a930afe949 | ||
|
|
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"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ a5daac889a55baf8895918d4964f20dad1938470
|
||||
206df466fd5e3d8ef80387049b0c5011fb58cada
|
||||
c9b5aa638a97397ab8666031ea646904527afc09
|
||||
559c913fca0dd0966896396e251be13f76ea3e52
|
||||
|
||||
# Re-structure again.
|
||||
4b3b84df8f487be0ac86506c28dbebc4635f1282
|
||||
91abbb7f175b93a58368a136acf3799666f770d2
|
||||
@@ -29,3 +30,17 @@ c9b5aa638a97397ab8666031ea646904527afc09
|
||||
bae271c09bb79e5cc2a7f8491ce882d276ac97b4
|
||||
3d83b80dd67d996a5f4f1732fe1eb36cacc7605e
|
||||
21617270bcef2456cb7f89e54560ca6788450711
|
||||
|
||||
# resource/*.json prettier mass styling
|
||||
d84da5d01a872540d520bc87408d4524e07cfa39
|
||||
546bfc399cdd140a9812f44b5e6bc89fccfda5fa
|
||||
f0bdccdf0da7fac29f475951f0f43d3ab56a7ffe
|
||||
7a758bce844bc2778f04a789195efbd17681dac7
|
||||
5f3730b76785b1168125eb3b5edbed399722f8f9
|
||||
bc3ad67a02cb3b8e154c06955cf17091c4265000
|
||||
|
||||
# usage: add "[blame ignore]" to the commit message
|
||||
# This file is managed by an automated workflow
|
||||
# Do not add, remove or modify lines below this comment
|
||||
# as they are automatically appended
|
||||
# --------------------------------------------------- #
|
||||
|
||||
1
.gitattributes
vendored
@@ -8,4 +8,5 @@
|
||||
|
||||
*.json text eol=lf
|
||||
*.md text eol=lf
|
||||
*.yml text eol=lf
|
||||
*.yaml text eol=lf
|
||||
|
||||
54
.github/ISSUE_TEMPLATE/cn-bug-report.yaml
vendored
@@ -1,20 +1,22 @@
|
||||
name: Bug 反馈(使用中文)
|
||||
description: 识别错误、操作异常、连接错误等
|
||||
labels: ['bug']
|
||||
labels: ["bug"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
description: |
|
||||
请确认自己完成了要求之后再进行勾选
|
||||
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: 我使用的是当前更新版本的最新版,且已查看版本发布至今和 Pull Requests 中尚未发布的更新内容,并未提及该 Bug 已被修复的情况
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue)(公告)、活跃议题(Open Issue)、已关闭议题(Closed Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -30,28 +32,45 @@ body:
|
||||
请提供 MAA 版本。可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
UI Version:
|
||||
Core Version:
|
||||
MAA Version:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: 日志文件
|
||||
label: 日志和配置文件
|
||||
description: |
|
||||
**请在关闭MAA后,上传 `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点**
|
||||
**请在关闭 MAA 后,上传以下 5 个文件:**
|
||||
1. `debug` 文件夹中的 `asst.log` `gui.log` `asst.bak.log` 和 `gui.bak.log` 日志文件,并说明问题出现的大致时间点
|
||||
2. `config` 文件夹中的 `gui.json` 配置文件
|
||||
|
||||
如果你在使用 MacBook,请点击左上角的“文件”,点击“打开日志文件夹”
|
||||
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
|
||||
placeholder: |
|
||||
请确认上传文件前已关闭 MAA
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: configuration
|
||||
attributes:
|
||||
label: 配置信息
|
||||
description: |
|
||||
请说明操作系统及版本、模拟器品牌、模拟器分辨率、DPI、帧率;
|
||||
若正在使用 MuMu 12,请说明 MuMu 截图增强是否开启;
|
||||
最后请说明 GPU 加速推理是否开启,若开启请提供 GPU 型号。
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: 截图
|
||||
label: 截图或录屏
|
||||
description: |
|
||||
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
|
||||
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
|
||||
用其他的工具(如QQ)截取的图片包含窗口边框,不利于我们排除bug
|
||||
`debug` 文件夹下有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
用其他的工具(如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定,不利于我们排除bug
|
||||
若文件体积过大可压缩后再上传
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
@@ -59,7 +78,6 @@ body:
|
||||
attributes:
|
||||
label: 还有别的吗?
|
||||
description: |
|
||||
使用的模拟器?操作系统?相关的配置?链接?参考资料?
|
||||
任何能让我们对你所遇到的问题有更多了解的东西
|
||||
validations:
|
||||
required: false
|
||||
|
||||
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:
|
||||
|
||||
85
.github/ISSUE_TEMPLATE/cn-ld-report.yaml
vendored
Normal file
@@ -0,0 +1,85 @@
|
||||
name: 雷电截图增强反馈(使用中文)
|
||||
description: 有关雷电 9 截图增强功能的集中反馈
|
||||
labels: ["LD9 API"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我正在使用最新的 MAA 公测版本和最新的官版雷电 9 模拟器
|
||||
required: true
|
||||
- label: 我已参考文档确定安装路径、实例编号填写正确,并确认在关闭截图增强模式后问题消失
|
||||
required: true
|
||||
- label: 我未开启高帧率,且模拟器帧数设置为 60
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
label: 问题描述
|
||||
description: 描述问题时请尽可能详细
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: |
|
||||
请提供 MAA 版本和雷电 9 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
|
||||
雷电 9 版本可在右上角菜单按钮 -> 关于雷电 中找到。
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
MAA Version:
|
||||
雷电 9 版本号:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: MAA 日志和配置文件
|
||||
description: |
|
||||
**请在关闭 MAA 后,上传以下三个文件:**
|
||||
1. `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点
|
||||
若 asst.log 文件小于 10 KB,则需同时上传 asst.log.bak 文件
|
||||
2. `config` 文件夹中的 `gui.json` 配置文件
|
||||
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
|
||||
placeholder: |
|
||||
请确认上传文件前已关闭 MAA
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: ldlogs
|
||||
attributes:
|
||||
label: 雷电 9 诊断信息
|
||||
description: |
|
||||
**在雷电 9 右上角菜单按钮 -> 诊断信息 中点击 复制信息,并将全部内容粘贴进来。**
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: 截图
|
||||
description: |
|
||||
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
|
||||
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
|
||||
用其他的工具(如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定,不利于我们排除bug
|
||||
若文件体积过大可压缩后再上传
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
id: others
|
||||
attributes:
|
||||
label: 其他
|
||||
description: |
|
||||
GPU 加速推理是否开启,若开启请提供 GPU 型号。
|
||||
亦或者任何能让我们对你所遇到的问题有更多了解的东西
|
||||
validations:
|
||||
required: false
|
||||
63
.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: 我未开启后台保活,模拟器帧数为 60,显存使用策略为“画面表现更好”
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -32,22 +30,27 @@ 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 版本号:
|
||||
Resource Version:
|
||||
MAA Version:
|
||||
MuMu 版本号:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: MAA 日志文件
|
||||
label: MAA 日志和配置文件
|
||||
description: |
|
||||
**上传 `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点**
|
||||
**请在关闭 MAA 后,上传以下三个文件:**
|
||||
1. `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点
|
||||
若 asst.log 文件小于 10 KB,则需同时上传 asst.log.bak 文件
|
||||
2. `config` 文件夹中的 `gui.json` 配置文件
|
||||
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
|
||||
placeholder: |
|
||||
请确认上传文件前已关闭 MAA
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
@@ -64,18 +67,20 @@ body:
|
||||
attributes:
|
||||
label: 截图
|
||||
description: |
|
||||
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
|
||||
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
|
||||
用其他的工具(如QQ)截取的图片包含窗口边框,不利于我们排除bug
|
||||
`debug` 文件夹下有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
用其他的工具(如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定,不利于我们排除bug
|
||||
若文件体积过大可压缩后再上传
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
id: others
|
||||
attributes:
|
||||
label: 还有别的吗?
|
||||
label: 其他
|
||||
description: |
|
||||
操作系统?相关的配置?链接?参考资料?
|
||||
任何能让我们对你所遇到的问题有更多了解的东西
|
||||
GPU 加速推理是否开启,若开启请提供 GPU 型号。
|
||||
亦或者任何能让我们对你所遇到的问题有更多了解的东西
|
||||
validations:
|
||||
required: false
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/cn-others.yaml
vendored
@@ -1,6 +1,6 @@
|
||||
name: 其他议题(使用中文)
|
||||
description: 提出问题,而不是 Bug 反馈或需求建议
|
||||
labels: ['question']
|
||||
labels: ["question"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
90
.github/ISSUE_TEMPLATE/en-bug-report.yaml
vendored
@@ -2,32 +2,35 @@ 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...
|
||||
description: |
|
||||
Please ensure that you have completed the requirements before checking the box.
|
||||
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 am using the latest version of the current update and have reviewed
|
||||
both the updates released so far and the unreleased changes in the Pull Requests,
|
||||
there is no mention of the bug being fixed.
|
||||
required: true
|
||||
- label: >-
|
||||
I have reviewed the Pinned issue (Announcements), Open issues, and Closed issues
|
||||
to ensure that my issue has not been mentioned.
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -43,28 +46,45 @@ body:
|
||||
Please provide the MAA version. Can be found in MAA -> Settings -> Update. (Click to copy)
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
UI Version:
|
||||
Core Version:
|
||||
MAA Version:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: Log files
|
||||
label: Log and config files
|
||||
description: >-
|
||||
**After closing the MAA, upload the `asst.log` and `gui.log` log file in the `debug` folder and**
|
||||
**indicate the approximate point in time when the problem occurred.**
|
||||
**After closing MAA, upload the following 5 files:**
|
||||
1. The `asst.log` `gui.log` `asst.bak.log` and `gui.bak.log` log file in the `debug` folder, and indicate the approximate point in time when the problem occurred.
|
||||
2. The `gui.json` config file in the `config` folder
|
||||
|
||||
If you are using MacBook, please click the "File" option in the top-left corner, then click "Open Log Folder".
|
||||
**Please drag and drop the full file in, not your own cuttings or copies;**
|
||||
**compress it before uploading if too large.**
|
||||
placeholder: |
|
||||
Please confirm that MAA is not running before uploading files.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: configuration
|
||||
attributes:
|
||||
label: Configuration information
|
||||
description: |
|
||||
Please specify the operating system and version, emulator brand, emulator resolution, DPI, and frame rate;
|
||||
If you are using MuMu 12, please specify whether MuMu Screenshot Enhancement is enabled;
|
||||
Finally, please specify whether GPU accelerated inference is enabled, and if so, provide the GPU model.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: Screenshots
|
||||
label: Screenshots or recordings
|
||||
description: >-
|
||||
If available, add screenshots to help explain your problem,
|
||||
In the `debug` directory, within the functionally categorized folders,
|
||||
there are some error images captured automatically.
|
||||
If related to this issue, please upload them together.
|
||||
|
||||
If available, upload screenshots and recordings to help explain your problem,
|
||||
including but not limited to screenshots of MAA software,
|
||||
screenshots of game screens.
|
||||
|
||||
@@ -72,11 +92,11 @@ body:
|
||||
the **original image** taken by the emulator's own screenshot tool
|
||||
(or via adb).
|
||||
|
||||
Screenshots taken with other tools may contain the frames of the window/emulator, which makes it harder for us to debug.
|
||||
Screenshots taken with other tools may contain the frames of the window/emulator
|
||||
and their aspect ratio and resolution are inconsistent,
|
||||
which makes it harder for us to debug.
|
||||
|
||||
The `debug` folder has some automatic screenshots of the error images,
|
||||
if you have any,
|
||||
please upload them together.
|
||||
If the file siz is too large, you may compress it before uploading.
|
||||
|
||||
validations:
|
||||
required: false
|
||||
@@ -84,11 +104,7 @@ body:
|
||||
id: others
|
||||
attributes:
|
||||
label: Anthing else?
|
||||
description: >-
|
||||
Emulator used, operating system, related configuration, links,
|
||||
reference material, etc.
|
||||
|
||||
Anything that will give us more insight into the problem
|
||||
you are having.
|
||||
description: |
|
||||
Anything that will give us more insight into the problem you are having.
|
||||
validations:
|
||||
required: false
|
||||
|
||||
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:
|
||||
- "*"
|
||||
1057
.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
|
||||
|
||||
38
.github/workflows/blame-ignore.yml
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
name: Blame Ignore Commit
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
blame-ignore:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: false # Needed to bypass protection rules in Push changes
|
||||
|
||||
- name: Get last checked commit
|
||||
run: |
|
||||
LAST_CHECKED_COMMIT=$(cat .last-checked-commit 2>/dev/null || git rev-list --max-parents=0 HEAD)
|
||||
echo "LAST_CHECKED_COMMIT=$LAST_CHECKED_COMMIT" >> $GITHUB_ENV
|
||||
|
||||
- name: Process commits and update blame ignore list
|
||||
run: |
|
||||
git log ${{ env.LAST_CHECKED_COMMIT }}..HEAD --pretty=format:"%H %s" --grep="\[blame ignore\]" | awk '{print $1}' >> .git-blame-ignore-revs
|
||||
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
git rev-parse HEAD > .last-checked-commit
|
||||
|
||||
git add .last-checked-commit .git-blame-ignore-revs
|
||||
git commit -m "chore: auto blame ignore" -m "[skip changelog]"
|
||||
|
||||
- name: Push changes
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
branch: ${{ github.ref }}
|
||||
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
36
.github/workflows/ci.yml
vendored
@@ -28,6 +28,10 @@ on:
|
||||
- "!**/*.md"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
meta:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -184,6 +188,8 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
arch: [aarch64, x86_64]
|
||||
permissions:
|
||||
actions: write
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
@@ -199,8 +205,6 @@ jobs:
|
||||
|
||||
- name: Setup ccache
|
||||
uses: Chocobo1/setup-ccache-action@v1
|
||||
with:
|
||||
remove_stale_cache: false
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
env:
|
||||
@@ -270,9 +274,9 @@ jobs:
|
||||
cp -v tools/AppImage/io.github.maaassistantarknights.maaassistantarknights.metainfo.xml Maa.AppDir/usr/share/metainfo/
|
||||
wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||
# appimagetool with embedded runtime does not support cross build, till AppImage/appimagetool 7a10b8
|
||||
wget "https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-${{ matrix.arch }}"
|
||||
wget "https://github.com/AppImage/type2-runtime/releases/download/old/runtime-fuse3-${{ matrix.arch }}"
|
||||
chmod a+x appimagetool-x86_64.AppImage
|
||||
ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --runtime-file runtime-${{ matrix.arch }} Maa.AppDir
|
||||
ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --runtime-file runtime-fuse3-${{ matrix.arch }} Maa.AppDir
|
||||
chmod a+x MaaAssistantArknights-${{ matrix.arch }}.AppImage
|
||||
mv -v MaaAssistantArknights-${{ matrix.arch }}.AppImage $GITHUB_WORKSPACE/release/MAA-${{ needs.meta.outputs.tag }}-linux-${{ matrix.arch }}.AppImage
|
||||
|
||||
@@ -357,6 +361,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
|
||||
@@ -364,6 +372,24 @@ jobs:
|
||||
lipo -create install-arm64/$LIB_NAME install-x86_64/$LIB_NAME -output build/$LIB_NAME
|
||||
done
|
||||
|
||||
- name: Archive Runtime Files
|
||||
run: |
|
||||
mkdir runtime && cd runtime
|
||||
name='MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal'
|
||||
mkdir "$name" && cd "$name"
|
||||
cp -v ../../build/*.dylib .
|
||||
ln -vs libonnxruntime*.dylib libonnxruntime.dylib
|
||||
ln -vs libopencv_world4*.dylib libopencv_world4.dylib
|
||||
cp -vr ../../resource .
|
||||
cd .. || exit 1
|
||||
zip -yrX9 "$name.zip" "$name"
|
||||
|
||||
- name: Upload MAA runtime to Github
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: MAA-macos-runtime-universal
|
||||
path: runtime/MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal.zip
|
||||
|
||||
- name: Build XCFramework
|
||||
run: |
|
||||
xcodebuild -create-xcframework -library libMaaCore.dylib -headers ../include -output MaaCore.xcframework
|
||||
@@ -457,7 +483,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: |
|
||||
|
||||
7
.github/workflows/gen-changelog.yml
vendored
@@ -2,7 +2,7 @@ name: gen-changelog
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
types:
|
||||
- opened
|
||||
- reopened
|
||||
- ready_for_review
|
||||
@@ -79,8 +79,9 @@ jobs:
|
||||
git commit -m "$commit_msg"
|
||||
|
||||
- name: Create PR
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
uses: peter-evans/create-pull-request@v7
|
||||
with:
|
||||
sign-commits: true
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
title: ${{ steps.extract_tag.outputs.pr_title }}
|
||||
body-path: ${{ format('{0}/{1}', runner.temp, 'output' ) }}
|
||||
@@ -93,6 +94,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"
|
||||
|
||||
2
.github/workflows/issue-checker.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
||||
triage:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: zzyyyl/issue-checker@v1.8
|
||||
- uses: MaaAssistantArknights/issue-checker@v1.14
|
||||
with:
|
||||
repo-token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
configuration-path: .github/issue-checker.yml
|
||||
|
||||
72
.github/workflows/markdown-checker.yml
vendored
@@ -1,49 +1,65 @@
|
||||
name: Lint Markdown files
|
||||
name: Check Dead Links
|
||||
|
||||
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:
|
||||
if: ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
|
||||
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 }}
|
||||
|
||||
83
.github/workflows/optimize-templates.yml
vendored
Normal file
@@ -0,0 +1,83 @@
|
||||
name: Auto Optimize PNG Templates
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "dev"
|
||||
paths:
|
||||
- "resource/**/*.png"
|
||||
- "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 "Triggered by ${{github.sha}}" -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 }}
|
||||
7
.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' }}
|
||||
@@ -39,7 +38,7 @@ jobs:
|
||||
per_page: 100
|
||||
});
|
||||
|
||||
const regex = /^((build|chore|ci|docs?|feat!?|fix|perf|refactor|rft|style|test|i18n|typo)[\:\.\(\,]|[Rr]evert|[Rr]elease)/;
|
||||
const regex = /^((build|chore|ci|docs?|feat!?|fix|perf|refactor|rft|style|test|i18n|typo|debug)[\:\.\(\,]|[Rr]evert|[Rr]elease)/;
|
||||
const invalidCommits = commits.filter(commit => !regex.test(commit.commit.message) || commit.parents.length > 1);
|
||||
|
||||
console.log(`Checked ${commits.length} commit(s)`);
|
||||
@@ -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")}`);
|
||||
}
|
||||
}
|
||||
|
||||
56
.github/workflows/release-nightly-ota.yml
vendored
@@ -14,12 +14,12 @@ on:
|
||||
limit:
|
||||
description: "Number of releases to fetch from MaaAssistantArknights"
|
||||
required: true
|
||||
default: 30
|
||||
default: "30"
|
||||
type: number
|
||||
limit_2:
|
||||
description: "Number of releases to fetch from MaaRelease"
|
||||
required: true
|
||||
default: 30
|
||||
default: "30"
|
||||
type: number
|
||||
|
||||
jobs:
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
tag: ${{ steps.set_tag.outputs.tag }}
|
||||
pre_version: ${{ steps.set_tag.outputs.pre_version }}
|
||||
main_tag_name: ${{ steps.push_main_tag.outputs.main_tag_name }}
|
||||
changelog: ${{ steps.generate_changelog.outputs.changelog }}
|
||||
changelog: ${{ steps.read_changelog.outputs.content }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@@ -75,9 +75,9 @@ jobs:
|
||||
}
|
||||
if ($ids.length -eq 4) {
|
||||
$dist = `printf "%03d"` $ids[2]
|
||||
$pre_version = "$($ids[0])""-""$($ids[1])"
|
||||
echo "tag=$($ids[0])-$($ids[1]).d$($dist).$($ids[3])" >> $env:GITHUB_OUTPUT
|
||||
$pre_version = "$($ids[0])-$($ids[1])"
|
||||
echo "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
|
||||
echo "tag=$pre_version.d$($dist).$($ids[3])" >> $env:GITHUB_OUTPUT
|
||||
exit 0
|
||||
}
|
||||
exit 1
|
||||
@@ -97,13 +97,17 @@ jobs:
|
||||
id: generate_changelog
|
||||
run: |
|
||||
python3 tools/ChangelogGenerator/changelog_generator.py --latest "${{ steps.set_tag.outputs.latest_tag }}" --tag "${{ steps.set_tag.outputs.tag }}"
|
||||
$content=$(((Get-Content .\changelog.md) | Select-Object -Skip 2) -join "\n\n")
|
||||
echo "changelog=$content" >> $env:GITHUB_OUTPUT
|
||||
echo $content
|
||||
Get-Content .\changelog.md | Select-Object -Skip 2 | Out-File -FilePath changelog_notag.md -Encoding utf8
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PYTHONIOENCODING: "utf-8"
|
||||
|
||||
- name: Read Changelog to variable
|
||||
id: read_changelog
|
||||
uses: juliangruber/read-file-action@v1
|
||||
with:
|
||||
path: ./changelog_notag.md
|
||||
|
||||
- name: Cache .nuke/temp, ~/.nuget/packages
|
||||
id: cache-nuget
|
||||
uses: actions/cache@v4
|
||||
@@ -212,8 +216,17 @@ jobs:
|
||||
run: |
|
||||
mkdir -pv build-ota && cd build-ota
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 30 }} | tee ./release_maa.txt
|
||||
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
|
||||
# Convert inputs to integers
|
||||
limit=${{ inputs.limit || 30 }}
|
||||
limit=${limit%.*}
|
||||
echo "Parsed limit: $limit"
|
||||
|
||||
limit_2=${{ inputs.limit_2 || 30 }}
|
||||
limit_2=${limit_2%.*}
|
||||
echo "Parsed limit_2: $limit_2"
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit | tee ./release_maa.txt
|
||||
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_2 | tee ./release_mr.txt
|
||||
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
|
||||
|
||||
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
|
||||
@@ -242,22 +255,6 @@ jobs:
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Make release body
|
||||
id: make_release_body
|
||||
shell: bash
|
||||
run: |
|
||||
pre_version=${{ needs.build-win-nightly.outputs.pre_version }}
|
||||
cur_version=${{ needs.build-win-nightly.outputs.main_tag_name }}
|
||||
echo -e "${{ inputs.release_body || '' }}\n\n${{ needs.build-win-nightly.outputs.changelog }}\n\n**Full Changelog**: [$pre_version -> $cur_version](https://github.com/$GITHUB_REPOSITORY/compare/$pre_version...$cur_version)" > alpha_changelog.md
|
||||
export r=$(cat alpha_changelog.md)
|
||||
|
||||
# https://github.com/svenstaro/upload-release-action
|
||||
r="${r//'%'/'%25'}" # Multiline escape sequences for %
|
||||
r="${r//$'\n'/'%0A'}" # Multiline escape sequences for '\n'
|
||||
r="${r//$'\r'/'%0D'}" # Multiline escape sequences for '\r'
|
||||
echo $r
|
||||
echo "full_release_body=$r" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Upload to MaaRelease
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
@@ -268,7 +265,12 @@ jobs:
|
||||
tag: ${{ env.release_tag }}
|
||||
prerelease: true
|
||||
overwrite: true
|
||||
body: ${{ steps.make_release_body.outputs.full_release_body }}
|
||||
body: |
|
||||
${{ inputs.release_body || '' }}
|
||||
|
||||
${{ needs.build-win-nightly.outputs.changelog }}
|
||||
|
||||
**Full Changelog**: [${{ needs.build-win-nightly.outputs.pre_version }} -> ${{ needs.build-win-nightly.outputs.main_tag_name }}](https://github.com/${{ github.repository }}/compare/${{ needs.build-win-nightly.outputs.pre_version }}...${{ needs.build-win-nightly.outputs.main_tag_name }})
|
||||
|
||||
- name: Setup release mirror
|
||||
run: |
|
||||
|
||||
43
.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:
|
||||
@@ -37,8 +37,18 @@ jobs:
|
||||
id: fetchReleaseInfo
|
||||
run: |
|
||||
mkdir -pv build-ota && cd build-ota
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
|
||||
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
|
||||
|
||||
# Convert inputs to integers
|
||||
limit=${{ inputs.limit || 31 }}
|
||||
limit=${limit%.*}
|
||||
echo "Parsed limit: $limit"
|
||||
|
||||
limit_2=${{ inputs.limit_2 || 30 }}
|
||||
limit_2=${limit_2%.*}
|
||||
echo "Parsed limit_2: $limit_2"
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit | tee ./release_maa.txt
|
||||
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit $limit_2 | tee ./release_mr.txt
|
||||
head -n 1 ./release_maa.txt | awk '{ print $1 }' > ./config
|
||||
|
||||
tail -n +1 ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
|
||||
@@ -156,31 +166,6 @@ jobs:
|
||||
run: |
|
||||
find ./packages -type f ! \( -name 'MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg' -o -name '*.delta' -o -name '*.xml' \) -print -delete
|
||||
|
||||
- name: Unpack the .dmg files for .dylib
|
||||
run: |
|
||||
cd ${{ runner.temp }}
|
||||
mkdir -p macos-runtime-temp
|
||||
echo ::group::Attaching release package...
|
||||
hdiutil attach ${{ github.workspace }}/packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg
|
||||
echo ::endgroup::
|
||||
echo ::group::Copying files...
|
||||
cp -v /Volumes/MAA/MAA.app/Contents/Frameworks/*.dylib macos-runtime-temp/
|
||||
cp -vr /Volumes/MAA/MAA.app/Contents/Resources/resource macos-runtime-temp/resource
|
||||
echo ::endgroup::
|
||||
echo ::group::Linking files...
|
||||
libonnxruntime_file=$(basename macos-runtime-temp/libonnxruntime*.dylib)
|
||||
ln -vs $libonnxruntime_file macos-runtime-temp/libonnxruntime.dylib
|
||||
libopencv_world_file=$(basename macos-runtime-temp/libopencv_world*.dylib)
|
||||
ln -vs $libopencv_world_file macos-runtime-temp/libopencv_world4.dylib
|
||||
echo ::endgroup::
|
||||
cd macos-runtime-temp
|
||||
echo ::group::Compressing files...
|
||||
zip -yrX9 ${{ github.workspace }}/packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-runtime-universal.zip *
|
||||
echo ::endgroup::
|
||||
echo ::group::Detaching release package...
|
||||
hdiutil detach /Volumes/MAA
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Upload to MaaRelease
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
|
||||
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"
|
||||
259
.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,105 +75,206 @@ 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:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
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: Download stages.json from Penguin Stats
|
||||
run: |
|
||||
cd "./excel"
|
||||
|
||||
baseUrl="https://penguin-stats.io/PenguinStats/api/v2/stages?server="
|
||||
|
||||
parameters=("CN" "US" "JP" "KR")
|
||||
|
||||
for param in "${parameters[@]}"; do
|
||||
{
|
||||
if curl -s -o "stages_${param}.json" "${baseUrl}${param}"; then
|
||||
echo "Successfully fetched data for ${param}"
|
||||
else
|
||||
echo "Failed to fetch data for ${param}" >&2
|
||||
exit 1
|
||||
fi
|
||||
} &
|
||||
done
|
||||
wait
|
||||
|
||||
- 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: pwsh tools/ResourceUpdater/validator.ps1
|
||||
|
||||
- name: Setup python
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Cache Python packages
|
||||
if: always() && steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
id: cache_python
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.pythonLocation }}/Lib/site-packages
|
||||
key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.cache_python.outputs.cache-hit != 'true' && steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
run: |
|
||||
git status
|
||||
pip install -r tools/OptimizeTemplates/requirements.txt
|
||||
|
||||
$diff = $(git diff --numstat HEAD | findstr -i resource)
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
echo "no diff"
|
||||
exit 0
|
||||
}
|
||||
- name: Setup oxipng
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
uses: baptiste0928/cargo-install@v3
|
||||
with:
|
||||
crate: oxipng
|
||||
|
||||
echo "diff: "$diff
|
||||
$sp = $($diff -split "\s+")
|
||||
$numbers = $($sp | Where-Object { $_ -match "^\d+$" })
|
||||
echo "numbers: "$numbers
|
||||
|
||||
$length = $numbers.Length
|
||||
$noDiff = $true
|
||||
for ($i = 0; $i -lt $length; $i += 2) {
|
||||
$firstNumber = $numbers[$i]
|
||||
$secondNumber = $numbers[$i+1]
|
||||
|
||||
if ($firstNumber -gt 1) {
|
||||
$noDiff = $false
|
||||
break
|
||||
}
|
||||
|
||||
if ($firstNumber -ne $secondNumber) {
|
||||
$noDiff = $false
|
||||
break
|
||||
}
|
||||
}
|
||||
echo "noDiff: "$noDiff
|
||||
echo "only_sorted=$noDiff" >> $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Cancelling
|
||||
if: steps.check_only_sorted.outputs.only_sorted == 'True'
|
||||
uses: andymckay/cancel-action@0.3
|
||||
- name: Run optimize_templates
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
run: |
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py -p resource/template/items/ resource/template/infrast/
|
||||
|
||||
- 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 }}"
|
||||
if (-not [string]::IsNullOrWhiteSpace($commit_msg)) {
|
||||
$commit_msg = $commit_msg.Trim()
|
||||
} else {
|
||||
if ([string]::IsNullOrWhiteSpace($commit_msg)) {
|
||||
$commit_msg = "chore: Auto Update Game Resources - $(Get-Date -Format 'yyyy-MM-dd')"
|
||||
} else {
|
||||
$commit_msg = $commit_msg.Trim()
|
||||
}
|
||||
git commit -m "$commit_msg" -m "[skip changelog]"
|
||||
|
||||
$run_url = "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
||||
|
||||
git commit -m "$commit_msg" -m "$run_url" -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
|
||||
git pull origin ${{ github.ref_name }} --rebase
|
||||
|
||||
- name: Cancelling
|
||||
if: steps.add_files.outputs.have_commits != 'True'
|
||||
uses: andymckay/cancel-action@0.3
|
||||
|
||||
- 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 }}
|
||||
branch: ${{ github.ref }}
|
||||
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: Add cancelled status
|
||||
if: steps.check_sorted_templates.outputs.changes != 'True' || steps.add_files.outputs.have_commits != 'True'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
|
||||
# if: steps.add_files.outputs.have_commits == 'True'
|
||||
# run: |
|
||||
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
|
||||
# env:
|
||||
# GH_TOKEN: ${{ github.token }}
|
||||
|
||||
17
.github/workflows/smoke-testing.yml
vendored
@@ -25,6 +25,10 @@ on:
|
||||
- "!**/*.md"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
smoke-testing:
|
||||
runs-on: windows-latest
|
||||
@@ -34,10 +38,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 +49,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 +62,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
|
||||
|
||||
38
.github/workflows/stale.yml
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
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 0 * * *" # Runs daily at UTC 00:00
|
||||
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
|
||||
operations-per-run: 500
|
||||
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
|
||||
|
||||
9
.gitignore
vendored
@@ -437,6 +437,9 @@ tools/**/*.png
|
||||
.vscode
|
||||
enc_temp_folder/*
|
||||
|
||||
# RoguelikeRecruitmentTool 导出的 Excel 文件
|
||||
tools/RoguelikeRecruitmentTool/output
|
||||
|
||||
# Nuke
|
||||
.nuke/temp/*
|
||||
|
||||
@@ -448,3 +451,9 @@ enc_temp_folder/*
|
||||
# CF 活动关卡(异格夜刀),手动改的地图
|
||||
/resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
|
||||
/src/MaaWpfGui/FodyWeavers.xml
|
||||
|
||||
# 链接检查缓存
|
||||
.lycheecache
|
||||
|
||||
# MaaDeps
|
||||
/MaaDeps/*
|
||||
|
||||
5
.gitmodules
vendored
@@ -4,11 +4,6 @@
|
||||
[submodule "src/MaaMacGui"]
|
||||
path = src/MaaMacGui
|
||||
url = https://github.com/MaaAssistantArknights/MaaMacGui.git
|
||||
[submodule "MaaDeps"]
|
||||
path = MaaDeps
|
||||
url = https://github.com/MaaAssistantArknights/MaaDeps
|
||||
shallow = true
|
||||
branch = master
|
||||
[submodule "src/maa-cli"]
|
||||
path = src/maa-cli
|
||||
url = https://github.com/MaaAssistantArknights/maa-cli.git
|
||||
|
||||
1
.last-checked-commit
Normal file
@@ -0,0 +1 @@
|
||||
7521b526ee2a272d267ff9cb60651ab0e012b63f
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
2
3rdparty/EmulatorExtras
vendored
@@ -39,8 +39,8 @@ inline matrix4x4 camera_matrix_from_trans(
|
||||
const vec3d& euler,
|
||||
double ratio,
|
||||
double fov_2_y = 20 * degree,
|
||||
double far = 1000,
|
||||
double near = 0.3)
|
||||
double far_c = 1000,
|
||||
double near_c = 0.3)
|
||||
{
|
||||
const double cos_y = std::cos(euler[0]);
|
||||
const double sin_y = std::sin(euler[0]);
|
||||
@@ -66,11 +66,11 @@ inline matrix4x4 camera_matrix_from_trans(
|
||||
0, -sin_x, -cos_x, 0, //
|
||||
0, 0, 0, 1,
|
||||
};
|
||||
const matrix4x4 proj = {
|
||||
const matrix4x4 proj = matrix4x4 {
|
||||
// clang-format off
|
||||
ratio / tan_f, 0, 0, 0,
|
||||
0, 1 / tan_f, 0, 0,
|
||||
0, 0, -(far + near) / (far - near), -(far * near * 2) / (far - near),
|
||||
0, 0, -(far_c + near_c) / (far_c - near_c), -(far_c * near_c * 2) / (far_c - near_c),
|
||||
0, 0, -1, 0,
|
||||
// clang-format on
|
||||
};
|
||||
@@ -78,14 +78,13 @@ inline matrix4x4 camera_matrix_from_trans(
|
||||
return proj * matrixX * matrixY * translate;
|
||||
}
|
||||
|
||||
inline cv::Point
|
||||
world_to_screen(const Level& level, const vec3d& world_pos, bool side, const vec3d& offset = {})
|
||||
inline cv::Point world_to_screen(const Level& level, const vec3d& world_pos, bool side, const vec3d& offset = {})
|
||||
{
|
||||
static constexpr double width = 1280;
|
||||
static constexpr double height = 720;
|
||||
static constexpr int width = 1280;
|
||||
static constexpr int height = 720;
|
||||
const vec3d pos_cam = camera_pos(level, side, width, height) + offset;
|
||||
const vec3d euler = camera_euler_angles_yxz(level, side);
|
||||
const matrix4x4 matrix = camera_matrix_from_trans(pos_cam, euler, height / width);
|
||||
const matrix4x4 matrix = camera_matrix_from_trans(pos_cam, euler, static_cast<double>(height) / width);
|
||||
auto result = matrix * cv::Point3d(world_pos);
|
||||
result = result / result(3);
|
||||
result = (result + cv::Vec4d::ones()) / 2.;
|
||||
@@ -107,12 +106,7 @@ inline vec3d get_tile_world_pos(const Level& level, int tile_y, int tile_x)
|
||||
};
|
||||
}
|
||||
|
||||
inline auto get_tile_screen_pos(
|
||||
const Level& level,
|
||||
int tile_y,
|
||||
int tile_x,
|
||||
bool side = false,
|
||||
const vec3d& offset = {})
|
||||
inline auto get_tile_screen_pos(const Level& level, int tile_y, int tile_x, bool side = false, const vec3d& offset = {})
|
||||
{
|
||||
return world_to_screen(level, get_tile_world_pos(level, tile_y, tile_x), side, offset);
|
||||
}
|
||||
|
||||
106
CHANGELOG.md
@@ -1,15 +1,101 @@
|
||||
## v5.4.1
|
||||
## v5.7.0
|
||||
|
||||
### 发生甚么事了 | Highlight
|
||||
|
||||
从本次版本开始,我们将会对正式版的更新笔记编写一份简要说明,以帮助你更好地掌握我们更新了啥。
|
||||
|
||||
* __对雷电模拟器支持截图增强模式__
|
||||
|
||||
在这个版本,我们新增了对雷电模拟器<del>(黄色 MuMu)</del>的截图增强模式支持,现在你也可以在雷电模拟器上看到两位数甚至一位数的截图延迟了,大幅度提升各项任务,特别是自动战斗、自动肉鸽、仓库和干员识别的效率。
|
||||
|
||||
目前需要雷电模拟器更新至 9.0.78 及以上版本,__注意 9.1.x 版本为 Vulkan 版暂时不支持截图增强__。
|
||||
|
||||
* __将生息演算的 `策略` 选项移至常规设置__
|
||||
|
||||
以前总有用户找不到生息验算任务的策略选项,运行结果与期待不符,以为出 bug 了,实际上是没选对策略。在这个版本,我们将策略选项从高级设置移动到常规设置中,方便用户更直观地选择所需的策略。
|
||||
|
||||
* __喜报!MAA 报错了!__
|
||||
|
||||
总有用户不看报错信息(__特别是里面的解决方案部分__),只会用口述表达,这个版本我们让报错信息窗口以喜报的形式呈现,希望你能先读完再按要求反馈问题。
|
||||
|
||||
* __修复了一些已知 bug,提升了 MAA 稳定性__
|
||||
|
||||
在这个版本对部分 bug 进行了修复,例如自动编队时偶现无法选择右侧职业筛选的问题。
|
||||
|
||||
* __资源与品质级更新__
|
||||
|
||||
这个版本随附游戏资源文件更新至24年10月矢量突破版本,新增了主线 14 章关卡自动导航数据,并优化了部分界面功能。
|
||||
|
||||
----
|
||||
|
||||
以下是本次更新详细内容。
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* ZT關卡導引更新 @XuQingTW
|
||||
* 掉落统计显示当前关卡名称 @ABA2396
|
||||
* 喜报!(报错界面) (#10578) @ABA2396 @SherkeyXD
|
||||
* LD 截图 (#10581) @ABA2396
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 将生息演算的 `策略` 选项移至常规设置 @ABA2396
|
||||
* 优化编队模板图片,识别不到对应职业图标时在 `全部` 中寻找 @ABA2396
|
||||
* 截图延迟过高时自动降低目标帧率 @ABA2396
|
||||
* 优化可清除内容的下拉框显示效果 @ABA2396 @Alan-Charred
|
||||
* 启动后对已有配置排序 @ABA2396
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 修复漏了的初始化 @MistEO
|
||||
* 肉鸽重新编队应在首页执行 @YueLengM
|
||||
* 自动编队偶现无法匹配职业图标 @ABA2396
|
||||
* 强制定时启动前显示窗口 导致程序崩溃 @ABA2396
|
||||
* 强制定时启动报错 @ABA2396
|
||||
* 下干员操作不显示干员组名字 @ABA2396
|
||||
* CV-4 navigation @SherkeyXD
|
||||
* Dormitory theme may block OCR sequence in EN fix #10645 @Constrat
|
||||
* YostarKR ocr fix @HX3N
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* website docs (#9287) @ABA2396 @Rbqwow @Constrat @wangl-cc @HX3N @SherkeyXD
|
||||
* 修改win7相关问题描述&更新运行库 @Rbqwow
|
||||
* fix a bad link @Rbqwow
|
||||
* make i18n warnings show only once @Rbqwow
|
||||
* 修复字体和评论区分类 @Rbqwow
|
||||
* 更新 bug-issue 模板 (#10675) @Daydreamer114
|
||||
* LD screenshot JP translate (#10659) @Manicsteiner @ABA2396
|
||||
* 更新雷电截图增强文档和 Issue 模板 (#10638) @Rbqwow @Constrat @HX3N
|
||||
* 文档错别字 @ABA2396
|
||||
|
||||
### For Overseas
|
||||
### 其他 | Other
|
||||
|
||||
#### YostarEN
|
||||
|
||||
* YoStarEN resolution warning on client switch (#9539) @Constrat @ABA2396
|
||||
* switch to StageSideStory.png for OD YostarKR @HX3N
|
||||
* switch to StageSideStory.png for OD YostarEN @Constrat
|
||||
* YostarKR switch OD navigation to template @HX3N
|
||||
* switch OD navigation to template @Constrat
|
||||
* txwy gamedata + various refactoring for resource updater @Constrat
|
||||
* perf!: Full multithread implementation for ResourceUpdater.exe + method refactoring @Constrat
|
||||
* InvokeAsync 前判断是否已经在 ui 线程 @ABA2396
|
||||
* 执行完成后动作前输出当前选择的动作 @ABA2396
|
||||
* uncommented update stages section. @Constrat
|
||||
* 调整肉鸽 StageTraderRefreshWithDice 任务的 roi 参数 (#10686) @Alan-Charred
|
||||
* renamed input directory @Constrat
|
||||
* resupd clone data script wrong location @Constrat
|
||||
* 降低 Tales@RA@LeaveCurrentZone 任务的 templThreshold (#10658) @Alan-Charred
|
||||
* ResourceUpdater always returning 0 even on error @Constrat
|
||||
* ResourceUpdater git diff not finding pngs @Constrat
|
||||
* ResourceUpdater.exe implements multi-threading + fix for missing foldartals Lighter implementation compared to #10683 @Constrat
|
||||
* 移除 ConnectSettingsUserControl 设计时高度限制 @ABA2396
|
||||
* removed wrong tooltip from AllowUseStoneSave @Constrat
|
||||
* EN tweak for Use Originium option @Constrat
|
||||
* EN tweak @Constrat
|
||||
* 调整 bug report @ABA2396
|
||||
* TimerSettings 改用 NumericUpDown 验证输入 @ABA2396
|
||||
* 定时启动添加日志 @ABA2396
|
||||
* 主定时器改用 Timer @ABA2396
|
||||
* 在 ui 线程清除日志 @ABA2396
|
||||
* 优化 RecognizerViewModel (#10641) @ABA2396 @status102
|
||||
* 截图测试使用GetFreshImage替代添加冗余任务 @status102
|
||||
* capture fresh image (#10460) @ABA2396
|
||||
* ss-open 使用 StageSideStory.png @ABA2396
|
||||
* OD tasks for navigation (from MaaRelease) @Constrat
|
||||
* SSS log EN tweak @Constrat
|
||||
* zh任务链完成耗时 @status102
|
||||
* tasks.json 十四章内容补充 (#10644) @Daydreamer114
|
||||
|
||||
@@ -48,6 +48,12 @@ else ()
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
|
||||
target_compile_options(MaaCore PRIVATE "-Wno-restrict")
|
||||
endif()
|
||||
# LLVM clang 16 will failed with `error: no member named 'join' in namespace 'std::ranges::views'`, but Apple clang 16 won't
|
||||
# value defined in https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
|
||||
if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
|
||||
OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17))
|
||||
target_compile_options(MaaCore PRIVATE "-fexperimental-library")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (WIN32)
|
||||
|
||||
@@ -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">
|
||||
<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>
|
||||
@@ -28,7 +31,9 @@
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=WSA/@EntryIndexedValue">WSA</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=XYAZ/@EntryIndexedValue">XYAZ</s:String>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acast/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=advapi/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Aero/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Affero/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=aguard/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=amedic/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=amiya/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -47,6 +52,7 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ehem/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=esource/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Favourite/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=filetime/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=findstr/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHW/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHWINFO/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -61,7 +67,10 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Inited/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=iter/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ldconsole/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=LD_0027s/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=leidian/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Lolicon/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=lpwndpl/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ls_005B_0022sub/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -88,6 +97,7 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=pidl/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=powrprof/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ppidl/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Prts/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=pwfi/@EntryIndexedValue">True</s:Boolean>
|
||||
|
||||
1
MaaDeps
17
README.md
@@ -2,7 +2,7 @@
|
||||
|
||||
<div align="center">
|
||||
|
||||
<img alt="LOGO" src="https://cdn.jsdelivr.net/gh/MaaAssistantArknights/design@main/logo/maa-logo_512x512.png" width="256" height="256" />
|
||||
<img alt="LOGO" src="./docs/.vuepress/public/image/maa-logo_512x512.png" width="256" height="256" />
|
||||
|
||||
# MaaAssistantArknights
|
||||
|
||||
@@ -77,10 +77,7 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
## 下载地址
|
||||
|
||||
前往[官网](https://maa.plus)自动匹配镜像源并下载稳定版,或:
|
||||
|
||||
- [稳定版/公测版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
|
||||
- [内测版](https://github.com/MaaAssistantArknights/MaaRelease/releases)
|
||||
[官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
|
||||
|
||||
## 使用说明
|
||||
|
||||
@@ -98,7 +95,7 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
- 下载到一半提示“登陆”/“鉴权”;
|
||||
- 连接正常,任务开始了,但是没反应。
|
||||
|
||||
请参阅 [常见问题](https://maa.plus/docs/zh-cn/manual/faq.html)
|
||||
请参阅 [常见问题](https://maa.plus/docs/zh-cn/manual/faq.html)。
|
||||
|
||||
### 外服支持
|
||||
|
||||
@@ -107,7 +104,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/)
|
||||
|
||||
## 加入我们
|
||||
|
||||
@@ -198,13 +195,13 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
|
||||
- ~~干员及基建数据:[PRTS Wiki](http://prts.wiki/)~~
|
||||
- 关卡数据:[企鹅物流数据统计](https://penguin-stats.cn/)
|
||||
- 游戏数据及资源:[明日方舟客户端素材](https://github.com/yuanyan3060/ArknightsGameResource)
|
||||
- ~~游戏数据:[《明日方舟》游戏数据](https://github.com/Kengxxiao/ArknightsGameData)~~
|
||||
- 游戏数据:[《明日方舟》Yostar游戏数据](https://github.com/Kengxxiao/ArknightsGameData_YoStar)
|
||||
|
||||
### 贡献/参与者
|
||||
|
||||
感谢所有参与到开发/测试中的朋友们,是大家的帮助让 MAA 越来越好! (\*´▽`)ノノ
|
||||
|
||||
[](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
|
||||
[](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
|
||||
|
||||
## 声明
|
||||
|
||||
@@ -216,7 +213,7 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
|
||||
|
||||
用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)
|
||||
用户交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)
|
||||
自动战斗 JSON 作业分享:[prts.plus](https://prts.plus) 或 [抄作业.com](http://抄作业.com)
|
||||
自动战斗 JSON 作业分享:[prts.plus](https://prts.plus)
|
||||
Bilibili 直播间:[直播间](https://live.bilibili.com/2808861) 每晚直播敲代码,近期很长一段时间应该都是在写本软件~
|
||||
|
||||
技术群(舟无关、禁水):[内卷地狱!(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)
|
||||
|
||||
@@ -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,8 +1,12 @@
|
||||
import { defineClientConfig } from "vuepress/client";
|
||||
import ImageGrid from "../components/ImageGrid.vue";
|
||||
import Image1 from "../components/Image1.vue";
|
||||
import Image2 from "../components/Image2.vue";
|
||||
import Image4 from "../components/Image4.vue";
|
||||
|
||||
export default defineClientConfig({
|
||||
enhance: ({ app }) => {
|
||||
app.component("ImageGrid", ImageGrid);
|
||||
app.component("Image1", Image1);
|
||||
app.component("Image2", Image2);
|
||||
app.component("Image4", Image4);
|
||||
},
|
||||
});
|
||||
|
||||
@@ -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 |
BIN
docs/.vuepress/public/image/maa-logo_512x512.png
Normal file
|
After Width: | Height: | Size: 266 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-dark.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/fork-light.png
Normal file
|
After Width: | Height: | Size: 1018 B |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-1-dark.png
Normal file
|
After Width: | Height: | Size: 59 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-1-light.png
Normal file
|
After Width: | Height: | Size: 59 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-2-dark.png
Normal file
|
After Width: | Height: | Size: 63 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-10-2-light.png
Normal file
|
After Width: | Height: | Size: 64 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11-dark.png
Normal file
|
After Width: | Height: | Size: 83 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-11-light.png
Normal file
|
After Width: | Height: | Size: 85 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12-dark.png
Normal file
|
After Width: | Height: | Size: 86 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-12-light.png
Normal file
|
After Width: | Height: | Size: 85 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-1-dark.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-1-light.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-2-dark.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-14-2-light.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2-dark.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-2-light.png
Normal file
|
After Width: | Height: | Size: 23 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3-dark.png
Normal file
|
After Width: | Height: | Size: 77 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-3-light.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4-dark.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-4-light.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5-dark.png
Normal file
|
After Width: | Height: | Size: 161 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-5-light.png
Normal file
|
After Width: | Height: | Size: 161 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-1-dark.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-1-light.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-2-dark.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-7-2-light.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-9-dark.png
Normal file
|
After Width: | Height: | Size: 83 KiB |
BIN
docs/.vuepress/public/image/zh-cn/pr-tutorial/pr-9-light.png
Normal file
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 78 KiB |
|
After Width: | Height: | Size: 78 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
After Width: | Height: | Size: 86 KiB |