Compare commits
871 Commits
v5.28.5
...
feat/mainc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee566c5fb7 | ||
|
|
40d5bdd560 | ||
|
|
01a2329d18 | ||
|
|
c52cf81b94 | ||
|
|
2a9c963fef | ||
|
|
0817bc1c9f | ||
|
|
c36e5cfd9a | ||
|
|
3fbda5b98d | ||
|
|
50cbc2e10d | ||
|
|
30dd7d0afa | ||
|
|
80280bb62d | ||
|
|
e7362d2d35 | ||
|
|
f77d85f542 | ||
|
|
00e577f6d2 | ||
|
|
6d32795ffa | ||
|
|
a72571ce90 | ||
|
|
59fa039a72 | ||
|
|
adb8863cf6 | ||
|
|
7bab2b2312 | ||
|
|
b55b2c6bd6 | ||
|
|
3d46fc1d0c | ||
|
|
e62a9a08a9 | ||
|
|
f7f9a4f44c | ||
|
|
9ab3265188 | ||
|
|
e1572d8bba | ||
|
|
761ea19e8b | ||
|
|
d9ad52053b | ||
|
|
1ddee84199 | ||
|
|
45b89b7089 | ||
|
|
c8a0c982b9 | ||
|
|
910cd47dfa | ||
|
|
63d499816d | ||
|
|
d734109155 | ||
|
|
c45e6a3d10 | ||
|
|
5e712c04eb | ||
|
|
dc9c9dfee6 | ||
|
|
ec7cbeeb1c | ||
|
|
c3ccd36d02 | ||
|
|
283309d3c1 | ||
|
|
43d5c429ae | ||
|
|
bb15f533b2 | ||
|
|
424b916265 | ||
|
|
656ba9d749 | ||
|
|
2a4cd8b7c8 | ||
|
|
e862101764 | ||
|
|
c095cc6d6f | ||
|
|
a0a6cf6739 | ||
|
|
f21f7cfd92 | ||
|
|
10989582ee | ||
|
|
a0b73022cd | ||
|
|
5bc7364eb6 | ||
|
|
7c3d531177 | ||
|
|
b4d75f194e | ||
|
|
f642273b7a | ||
|
|
3da747a59a | ||
|
|
cfb2a70ac3 | ||
|
|
3c763afa2d | ||
|
|
173d8f50ac | ||
|
|
867a7b5ea7 | ||
|
|
3469aa3777 | ||
|
|
f7c85a9803 | ||
|
|
19241cf186 | ||
|
|
51d6fc3ce1 | ||
|
|
d7f7614de6 | ||
|
|
5de1387402 | ||
|
|
08956dc9e8 | ||
|
|
d32484e366 | ||
|
|
206f5bf97c | ||
|
|
f1827ad99a | ||
|
|
a68f740fe3 | ||
|
|
483a484ae7 | ||
|
|
ad26721541 | ||
|
|
ba6f52f974 | ||
|
|
3782fb1fcb | ||
|
|
0ea2845b5b | ||
|
|
96b95bf5e4 | ||
|
|
256e3e3f58 | ||
|
|
9629226688 | ||
|
|
7dd93eb756 | ||
|
|
f91324fbe8 | ||
|
|
8eb62c2a7b | ||
|
|
d473c2c3f6 | ||
|
|
8785c9d00a | ||
|
|
02cf529bf8 | ||
|
|
2b8e88cdc5 | ||
|
|
e05fe43662 | ||
|
|
d84c5b3311 | ||
|
|
5162a77701 | ||
|
|
24c3e7e945 | ||
|
|
fc1643a728 | ||
|
|
86baa18ad9 | ||
|
|
45a6695a15 | ||
|
|
f39ae39f7d | ||
|
|
6c0bde0611 | ||
|
|
93b7d47cc7 | ||
|
|
8365874e28 | ||
|
|
cb03a617d2 | ||
|
|
a6f309fa88 | ||
|
|
9a214aaf0e | ||
|
|
ff97d59d58 | ||
|
|
d94961f737 | ||
|
|
3ad1c7096d | ||
|
|
9a5ad94920 | ||
|
|
d832875951 | ||
|
|
68a9a82107 | ||
|
|
42088719c5 | ||
|
|
c4f229930e | ||
|
|
5f0f0da82e | ||
|
|
a0a475764b | ||
|
|
59f848b7f7 | ||
|
|
6c0c84c649 | ||
|
|
fd18bfee21 | ||
|
|
b5bba18200 | ||
|
|
4149344318 | ||
|
|
8537612c37 | ||
|
|
6cc28ae344 | ||
|
|
67d73e8e2e | ||
|
|
7fe05d3261 | ||
|
|
4e94fdf133 | ||
|
|
cab1d602c9 | ||
|
|
8d983f2c8c | ||
|
|
a76ac22c13 | ||
|
|
c45f76785d | ||
|
|
1fde5dd93b | ||
|
|
630aae99bc | ||
|
|
cb50ad4a46 | ||
|
|
13d88119b3 | ||
|
|
156335da1c | ||
|
|
3eeb45b3b4 | ||
|
|
c9c587053a | ||
|
|
f7875e3033 | ||
|
|
58bf3b3a82 | ||
|
|
33716c8350 | ||
|
|
c822ad0310 | ||
|
|
647efc8ade | ||
|
|
759a81b03a | ||
|
|
3652fc4bea | ||
|
|
d51e971f3d | ||
|
|
99848bb7b3 | ||
|
|
f273a6f410 | ||
|
|
d68efb6333 | ||
|
|
13f9ccfc4d | ||
|
|
a0ef5f705a | ||
|
|
bfe7c0eabc | ||
|
|
36b776d42c | ||
|
|
9badef9093 | ||
|
|
6e895b50ae | ||
|
|
31832c411a | ||
|
|
7ca53518cc | ||
|
|
b836758ce4 | ||
|
|
97b5944216 | ||
|
|
5645e893e6 | ||
|
|
bfa2ab4e93 | ||
|
|
85df2a4059 | ||
|
|
3422cc375f | ||
|
|
5e36bac060 | ||
|
|
10d40be9f8 | ||
|
|
0e0c6665e8 | ||
|
|
7ad52310cf | ||
|
|
f18329cea9 | ||
|
|
012dd635de | ||
|
|
fe77da4391 | ||
|
|
295daad11d | ||
|
|
fcc40f97c8 | ||
|
|
875fc4ec6d | ||
|
|
d95523439b | ||
|
|
6f33c7a7ad | ||
|
|
066e836a6e | ||
|
|
8994cec168 | ||
|
|
14296d6a90 | ||
|
|
5a6f94b742 | ||
|
|
71566544b5 | ||
|
|
0fa1ae48e0 | ||
|
|
78848c5f3e | ||
|
|
d3532ab8ed | ||
|
|
bdd299a85e | ||
|
|
51a8837b09 | ||
|
|
d407a034c7 | ||
|
|
79027bc9f0 | ||
|
|
11a6f45481 | ||
|
|
52afaa37be | ||
|
|
a8b7ae2474 | ||
|
|
edcc7857ef | ||
|
|
ef1987e02a | ||
|
|
c95dd34533 | ||
|
|
dd9ce36953 | ||
|
|
102aa5dc85 | ||
|
|
f23e43cadc | ||
|
|
0e5097fe0b | ||
|
|
4ed05750e5 | ||
|
|
a64be68417 | ||
|
|
32b7cbbf9d | ||
|
|
8a075b7f05 | ||
|
|
07aeb4b354 | ||
|
|
5de92ba180 | ||
|
|
1e1e0f14fe | ||
|
|
5281d95710 | ||
|
|
38974951b9 | ||
|
|
73f7feec97 | ||
|
|
26dd914a79 | ||
|
|
c8b9147f19 | ||
|
|
ecbed74dd6 | ||
|
|
99f294d572 | ||
|
|
2d2d490f44 | ||
|
|
599cbfd5dc | ||
|
|
ebc5ec8047 | ||
|
|
7fefe97301 | ||
|
|
af96544893 | ||
|
|
33e7225119 | ||
|
|
9a456dcaec | ||
|
|
8634826c01 | ||
|
|
07068c14da | ||
|
|
02917c04dd | ||
|
|
e933074535 | ||
|
|
777d471a98 | ||
|
|
bde877c915 | ||
|
|
55c0c29589 | ||
|
|
819707fc42 | ||
|
|
86700994ba | ||
|
|
3c41f7662b | ||
|
|
3cf198e5e1 | ||
|
|
15c53df25b | ||
|
|
1bf5ae8e7f | ||
|
|
8fe346fac8 | ||
|
|
5f08be41b1 | ||
|
|
89b0b243f9 | ||
|
|
892e4e14cb | ||
|
|
abf8d62c30 | ||
|
|
01e35405d9 | ||
|
|
5b8c050e82 | ||
|
|
1c3ae38368 | ||
|
|
c7db3681be | ||
|
|
898fbea848 | ||
|
|
40057b0022 | ||
|
|
27d94c7de0 | ||
|
|
8612eead4e | ||
|
|
f179ca1822 | ||
|
|
0712fba4c4 | ||
|
|
17a08252f1 | ||
|
|
26e035dabe | ||
|
|
67e9ade712 | ||
|
|
c5c72d9ab0 | ||
|
|
18f76c918c | ||
|
|
cf1a6bbdae | ||
|
|
272c30a5d0 | ||
|
|
5d87a2c9ec | ||
|
|
b6f71355a8 | ||
|
|
49839ff439 | ||
|
|
a58a4b7383 | ||
|
|
d3611bbbf5 | ||
|
|
bc9d10316a | ||
|
|
f63da7c794 | ||
|
|
0ff111cc20 | ||
|
|
63e87aaabf | ||
|
|
0d7c54dd53 | ||
|
|
bcca9bbb8a | ||
|
|
ca2f4d5b8d | ||
|
|
dde61c5e6d | ||
|
|
5a0f94e8c3 | ||
|
|
66e44f45e7 | ||
|
|
e454290827 | ||
|
|
08b4f4eae1 | ||
|
|
1fd7f71f64 | ||
|
|
7d1e18fb39 | ||
|
|
289ba1d431 | ||
|
|
09df60e3d2 | ||
|
|
29ccd0f4ff | ||
|
|
d58b86cfb4 | ||
|
|
0fca6fda6d | ||
|
|
35d375a746 | ||
|
|
1f9222b7f0 | ||
|
|
f7b43bdac1 | ||
|
|
39e595d6fc | ||
|
|
af23150152 | ||
|
|
6ea89637ad | ||
|
|
0c4e81c4b3 | ||
|
|
e14b993890 | ||
|
|
22e17bac31 | ||
|
|
502c61e88e | ||
|
|
2951e5b5e9 | ||
|
|
690f4b4f62 | ||
|
|
964424a084 | ||
|
|
be674bc681 | ||
|
|
fd03b66f83 | ||
|
|
90de6f03b1 | ||
|
|
71ab040728 | ||
|
|
7b0589013b | ||
|
|
eac775dc83 | ||
|
|
31e7844ca1 | ||
|
|
566a1b1c30 | ||
|
|
d9daa078c0 | ||
|
|
4361b5dcbe | ||
|
|
24033e42af | ||
|
|
9c1216332d | ||
|
|
2fff5e4b7b | ||
|
|
8202acabe4 | ||
|
|
6ada0e0cb4 | ||
|
|
c3c21e8b5c | ||
|
|
dae67ed303 | ||
|
|
12791e94d1 | ||
|
|
092d46bac0 | ||
|
|
fcd29a0efb | ||
|
|
5c2451ba44 | ||
|
|
b71ab1c96b | ||
|
|
99e8dd707a | ||
|
|
a712d0bce1 | ||
|
|
ab624f8adc | ||
|
|
32b13dfc75 | ||
|
|
a2480d5286 | ||
|
|
c036a32a68 | ||
|
|
eeb78ee38f | ||
|
|
6a484e7926 | ||
|
|
e04b0b08e2 | ||
|
|
e813d62f4b | ||
|
|
bc72adb8f9 | ||
|
|
a44b4c7cbd | ||
|
|
407bca4bf5 | ||
|
|
192a106d8e | ||
|
|
f5ed9d60a6 | ||
|
|
9839f3b3d0 | ||
|
|
62043a97f2 | ||
|
|
0b073ed84f | ||
|
|
2c357840c8 | ||
|
|
45511c0a12 | ||
|
|
ccbc877034 | ||
|
|
e1b769a43c | ||
|
|
6d3440647d | ||
|
|
4eea1612f2 | ||
|
|
284553361a | ||
|
|
9f48a35118 | ||
|
|
34c8416527 | ||
|
|
6086b721e6 | ||
|
|
9626e1b5ce | ||
|
|
91b0b9a2b1 | ||
|
|
df5a776419 | ||
|
|
37ae3f0e61 | ||
|
|
24d229f383 | ||
|
|
780a8b3e9f | ||
|
|
ee9d73e4fc | ||
|
|
eadb0833e5 | ||
|
|
76f012c25a | ||
|
|
91cd39bae3 | ||
|
|
d64fe1c879 | ||
|
|
ab4d60b1c9 | ||
|
|
3fab803de2 | ||
|
|
0a1f510b66 | ||
|
|
75ec134118 | ||
|
|
344e43392b | ||
|
|
f96f8f46e2 | ||
|
|
69d5418eba | ||
|
|
9692a57069 | ||
|
|
8c51743ee5 | ||
|
|
885b747ca8 | ||
|
|
008673d9eb | ||
|
|
a5b6f17e83 | ||
|
|
1ed2952767 | ||
|
|
5099827e1f | ||
|
|
535625afcd | ||
|
|
1c1ad37797 | ||
|
|
4ef45c056a | ||
|
|
5fcf5dbd6a | ||
|
|
0ae353c15f | ||
|
|
d652661ca1 | ||
|
|
a7e4c79b7f | ||
|
|
5f364c5886 | ||
|
|
3bf073abdf | ||
|
|
1dfa49bda2 | ||
|
|
174a1b882d | ||
|
|
0fbed82550 | ||
|
|
954e9ad61f | ||
|
|
fa9f443bcf | ||
|
|
23f59ed2c9 | ||
|
|
cb3dd38f23 | ||
|
|
6c4819e909 | ||
|
|
0d21d3b909 | ||
|
|
b34c5f6909 | ||
|
|
9e1e7dc2e4 | ||
|
|
c3046c6411 | ||
|
|
e5b6ba5888 | ||
|
|
2c67e23334 | ||
|
|
ed08eb3d78 | ||
|
|
44b2d4d1f7 | ||
|
|
98758bfbec | ||
|
|
243e89d948 | ||
|
|
4ec68ce699 | ||
|
|
91ef092905 | ||
|
|
a46f17774c | ||
|
|
3943bb0d46 | ||
|
|
99294b9f67 | ||
|
|
b5eb6f2b19 | ||
|
|
c6c844626a | ||
|
|
b50eb305eb | ||
|
|
3e114a4d60 | ||
|
|
1d6c99f77c | ||
|
|
feffd27a35 | ||
|
|
0ba193f895 | ||
|
|
d6fa6c87b7 | ||
|
|
61614b8a6f | ||
|
|
6fe58eeceb | ||
|
|
349ea1078c | ||
|
|
8acbcaae11 | ||
|
|
af2e1879fb | ||
|
|
bf0f555233 | ||
|
|
78f0adf0a4 | ||
|
|
cf1f7ba5f5 | ||
|
|
7369c28a1e | ||
|
|
73badc0a67 | ||
|
|
f6d5887229 | ||
|
|
92f22ec499 | ||
|
|
a20f0f684f | ||
|
|
16f5331dc3 | ||
|
|
71b2186dc6 | ||
|
|
0c35daa458 | ||
|
|
1dabdd4043 | ||
|
|
0a3ee5676e | ||
|
|
c2ec6e0c0a | ||
|
|
7438df5ada | ||
|
|
a58c0c55d9 | ||
|
|
0f05a95c82 | ||
|
|
c27a79da36 | ||
|
|
26880c62c7 | ||
|
|
61d26fbe26 | ||
|
|
eee6c64d23 | ||
|
|
363da5be9d | ||
|
|
f5ce1e8728 | ||
|
|
656e774366 | ||
|
|
1e58932ea8 | ||
|
|
7c7916aa95 | ||
|
|
17b7b16069 | ||
|
|
eb85bf2f36 | ||
|
|
efc4a57d74 | ||
|
|
10c4b2d8ef | ||
|
|
aa3830ee91 | ||
|
|
ff11dfc080 | ||
|
|
f590bffcbf | ||
|
|
ad76ab4956 | ||
|
|
e4ece2cff0 | ||
|
|
4980fa1e8c | ||
|
|
e7d83dda91 | ||
|
|
921de77f9b | ||
|
|
ea085c600d | ||
|
|
54569e636e | ||
|
|
6a06789ece | ||
|
|
47f1d0c939 | ||
|
|
4230d695e7 | ||
|
|
f65cb918eb | ||
|
|
d276eea233 | ||
|
|
c54dd5450b | ||
|
|
8ac2b1bc58 | ||
|
|
8101f35923 | ||
|
|
20b317b07a | ||
|
|
4a42d1142b | ||
|
|
ed2594b5c7 | ||
|
|
cca39cf410 | ||
|
|
a14f7c3a3a | ||
|
|
430c389a90 | ||
|
|
dcbd843534 | ||
|
|
f3e0c6a527 | ||
|
|
279d9092a4 | ||
|
|
d25edcbbbd | ||
|
|
2751467878 | ||
|
|
95bc306404 | ||
|
|
776ee22d79 | ||
|
|
f6427b1f3f | ||
|
|
9fa2971da6 | ||
|
|
44d74846f4 | ||
|
|
f60af3f51e | ||
|
|
ff6660aa75 | ||
|
|
886f2a43dd | ||
|
|
4ebacda6be | ||
|
|
8deeea77d3 | ||
|
|
b9a850a8c1 | ||
|
|
58de47bca7 | ||
|
|
dd703da02f | ||
|
|
efadf87944 | ||
|
|
fae39b8fa4 | ||
|
|
6e0e3998b9 | ||
|
|
5a30197362 | ||
|
|
60e191adf7 | ||
|
|
a02e9b8fc0 | ||
|
|
224ede8c31 | ||
|
|
82ee510499 | ||
|
|
6f99eb5a7b | ||
|
|
04b7b11dfc | ||
|
|
352ae52ca1 | ||
|
|
1b98edc30a | ||
|
|
bb9fc88042 | ||
|
|
ccf6df9046 | ||
|
|
2c82a696d8 | ||
|
|
4ec4d33d49 | ||
|
|
df79e53b31 | ||
|
|
1bcb29ded2 | ||
|
|
96d2ccac88 | ||
|
|
6784e6fcab | ||
|
|
577399c1f6 | ||
|
|
a46387b28b | ||
|
|
cea14f843b | ||
|
|
6657421336 | ||
|
|
1091dfceb1 | ||
|
|
b385b472e4 | ||
|
|
91971ce650 | ||
|
|
d6723d93de | ||
|
|
58d71d79c1 | ||
|
|
31eb59e5ff | ||
|
|
2288392dde | ||
|
|
be4a96a06f | ||
|
|
34fa52495f | ||
|
|
b877be6b30 | ||
|
|
95d2d1dcf3 | ||
|
|
48ca14e835 | ||
|
|
cce5463e5c | ||
|
|
f98ccb6eaf | ||
|
|
c963384124 | ||
|
|
d3aaf5645e | ||
|
|
f6b4072780 | ||
|
|
f404eaa3c8 | ||
|
|
eab9143533 | ||
|
|
9456f73ea7 | ||
|
|
59db82e638 | ||
|
|
29f63322ba | ||
|
|
eac2d39834 | ||
|
|
4abf4d63d0 | ||
|
|
ab32660f41 | ||
|
|
c2b0c1f177 | ||
|
|
20c437b32b | ||
|
|
cfb973e037 | ||
|
|
7e962c4394 | ||
|
|
39d156cc26 | ||
|
|
7abd89480b | ||
|
|
a158b12ddf | ||
|
|
24aec64266 | ||
|
|
459c55df40 | ||
|
|
c151f97af1 | ||
|
|
a67e2b4fb9 | ||
|
|
e3734a715f | ||
|
|
27ec293dca | ||
|
|
3e9f19cc22 | ||
|
|
50e9767f0c | ||
|
|
22c0593343 | ||
|
|
3d42e5e55f | ||
|
|
c6037cc4d7 | ||
|
|
9cde16b262 | ||
|
|
5bd9a40560 | ||
|
|
c679542c5f | ||
|
|
2b222eae65 | ||
|
|
9feba528e2 | ||
|
|
dde55b8310 | ||
|
|
06f2740ce4 | ||
|
|
e1cf1ff24a | ||
|
|
154adf2266 | ||
|
|
e29c1243c6 | ||
|
|
7525028f36 | ||
|
|
a5c25fddda | ||
|
|
5467030be4 | ||
|
|
5fae60911d | ||
|
|
534ad0a7a0 | ||
|
|
8ed11ba8ec | ||
|
|
b404672b0b | ||
|
|
6ee4544d92 | ||
|
|
cc58382158 | ||
|
|
637ebc87ad | ||
|
|
2f3dbf55d2 | ||
|
|
215d76e38d | ||
|
|
0fd4b8185e | ||
|
|
c4d361a363 | ||
|
|
286908d41e | ||
|
|
bd4039d442 | ||
|
|
e87608411f | ||
|
|
a0e5f9b3a6 | ||
|
|
1456fbb91c | ||
|
|
6eaf74a289 | ||
|
|
edc8768b2e | ||
|
|
1ce8ff4262 | ||
|
|
d0b594cdc0 | ||
|
|
807adf92fa | ||
|
|
7397e1ac00 | ||
|
|
c7c8466b10 | ||
|
|
e0c226f7bb | ||
|
|
de4b86fda8 | ||
|
|
21181c2872 | ||
|
|
01b59f54fe | ||
|
|
03634ae516 | ||
|
|
2621b0a77b | ||
|
|
cf42b1a9fd | ||
|
|
f28c10a0b1 | ||
|
|
6ae3cb685c | ||
|
|
16e23a32b7 | ||
|
|
5fd5c8a90f | ||
|
|
9673b62ec7 | ||
|
|
fab4a272fd | ||
|
|
2dddb7b231 | ||
|
|
292624166f | ||
|
|
d85291a97a | ||
|
|
cd0273d321 | ||
|
|
c7d9fc37f6 | ||
|
|
5bc1d2835d | ||
|
|
2ecb2b7206 | ||
|
|
0943c48f4e | ||
|
|
a2c99dc72d | ||
|
|
d036a2594c | ||
|
|
0a89c82ba1 | ||
|
|
0224f51076 | ||
|
|
e7cc61eb9a | ||
|
|
25a9712102 | ||
|
|
3ac22778d8 | ||
|
|
be7159f554 | ||
|
|
da0445ddbc | ||
|
|
b5dff5a285 | ||
|
|
a5cd79a70e | ||
|
|
35d31555b0 | ||
|
|
aa34f54f22 | ||
|
|
824e774b2b | ||
|
|
9f002b8f16 | ||
|
|
e5cf3be9ed | ||
|
|
02bf291f85 | ||
|
|
32ab6ce890 | ||
|
|
e95f7e9a78 | ||
|
|
98e26cd9de | ||
|
|
be19d7c5a8 | ||
|
|
4741a8f6d2 | ||
|
|
d43b416837 | ||
|
|
5d20d86080 | ||
|
|
0d446c83dd | ||
|
|
2b4dc643ed | ||
|
|
b2cbde245e | ||
|
|
a7603b66cd | ||
|
|
66baf1be55 | ||
|
|
5433a52b24 | ||
|
|
2e0d0e1313 | ||
|
|
744605548c | ||
|
|
7585be794b | ||
|
|
822d509455 | ||
|
|
36d59a1f7f | ||
|
|
5949146267 | ||
|
|
9cf5b65be2 | ||
|
|
f5c5417f6b | ||
|
|
e935a04674 | ||
|
|
f2460215ac | ||
|
|
367b513cc8 | ||
|
|
d477412cab | ||
|
|
e3170cef94 | ||
|
|
54f40c2708 | ||
|
|
1944164d9c | ||
|
|
16d9d812b8 | ||
|
|
ade38a68a0 | ||
|
|
45ab2e7ba5 | ||
|
|
581df2fc7b | ||
|
|
a7a5d44276 | ||
|
|
52561a7a7c | ||
|
|
48c518c80b | ||
|
|
62c407c81d | ||
|
|
d368dca271 | ||
|
|
fc60270576 | ||
|
|
d7b1c83baa | ||
|
|
e68db16dce | ||
|
|
4f8bf54398 | ||
|
|
23d54a51c6 | ||
|
|
2a2cfec777 | ||
|
|
d988d2537c | ||
|
|
e1d0432e09 | ||
|
|
3835659ac9 | ||
|
|
ac8680d768 | ||
|
|
8c6b3bf559 | ||
|
|
aa1b267278 | ||
|
|
017c6bdce5 | ||
|
|
ccd5d30ac0 | ||
|
|
e20f02c5d2 | ||
|
|
925bb69111 | ||
|
|
232d4adb04 | ||
|
|
2bae56659b | ||
|
|
b70d662a3e | ||
|
|
25222f6e9a | ||
|
|
25786dabeb | ||
|
|
b8b020e839 | ||
|
|
45162e093e | ||
|
|
61fbba4b12 | ||
|
|
86376c9118 | ||
|
|
dcc2c05aee | ||
|
|
48315226dd | ||
|
|
7817b15929 | ||
|
|
b683cdc400 | ||
|
|
9d24679cab | ||
|
|
957f821976 | ||
|
|
b1d7950843 | ||
|
|
0bb546d1d8 | ||
|
|
49ad57dc2c | ||
|
|
42d8699e63 | ||
|
|
8dbc73e0fe | ||
|
|
0148b78711 | ||
|
|
dc50e93075 | ||
|
|
a5e7477b90 | ||
|
|
093320a4c8 | ||
|
|
db2dfbce78 | ||
|
|
c1a0d38037 | ||
|
|
2380db976b | ||
|
|
6f52b01076 | ||
|
|
4fd44e2315 | ||
|
|
1cbe7e2670 | ||
|
|
9d4a9b801b | ||
|
|
442474cce1 | ||
|
|
5880499330 | ||
|
|
419d3a6711 | ||
|
|
e0e037fd8d | ||
|
|
7ca6845b35 | ||
|
|
55beea8593 | ||
|
|
801d656329 | ||
|
|
0cd1d1b63e | ||
|
|
e71037a1b0 | ||
|
|
fef77f5780 | ||
|
|
ca9807ce09 | ||
|
|
32c6429825 | ||
|
|
56f6ef419c | ||
|
|
6532e29d88 | ||
|
|
1c294925d2 | ||
|
|
58a0e07854 | ||
|
|
e735da403c | ||
|
|
b4b1aa69c6 | ||
|
|
69bc5bcf83 | ||
|
|
250eebd81f | ||
|
|
9bdfc02de5 | ||
|
|
d75c028852 | ||
|
|
a3ea60b014 | ||
|
|
6d72632617 | ||
|
|
1fd8c03e32 | ||
|
|
f155bc4867 | ||
|
|
16da7903ba | ||
|
|
bee37d42ab | ||
|
|
a3d3b54fcf | ||
|
|
0072770349 | ||
|
|
38b5d0332b | ||
|
|
7937882099 | ||
|
|
74256dc3d2 | ||
|
|
c376af8dff | ||
|
|
4846ad64e3 | ||
|
|
573bd6f0a4 | ||
|
|
5c40c4b6e8 | ||
|
|
78a27ebfa6 | ||
|
|
ee4f966f75 | ||
|
|
14f331e964 | ||
|
|
18dd3b2034 | ||
|
|
9c12b659cf | ||
|
|
365af6653d | ||
|
|
b467138bee | ||
|
|
1539769b0c | ||
|
|
4400d05cfa | ||
|
|
970860d4f4 | ||
|
|
3824fb1c3e | ||
|
|
aa9dc2ee4d | ||
|
|
66b95cb1e7 | ||
|
|
c641e35ee5 | ||
|
|
389812279d | ||
|
|
e11a90e252 | ||
|
|
ebc980f154 | ||
|
|
d44735e969 | ||
|
|
3916aa0211 | ||
|
|
28267a5490 | ||
|
|
1bc27e05b2 | ||
|
|
4edcb7dad7 | ||
|
|
e6862591e8 | ||
|
|
2c3b95ddca | ||
|
|
fd5449d2de | ||
|
|
2f88a7e2e8 | ||
|
|
1f7dcde3f9 | ||
|
|
131b6c4983 | ||
|
|
03d814e211 | ||
|
|
be08678390 | ||
|
|
724326b309 | ||
|
|
3b50040cde | ||
|
|
28f1fbbc6a | ||
|
|
1fd58e846e | ||
|
|
3e9992598a | ||
|
|
fbb40d4a7e | ||
|
|
05fc329eb3 | ||
|
|
415fb7d8fc | ||
|
|
0f25d34076 | ||
|
|
07b808dc30 | ||
|
|
84b54d395a | ||
|
|
c80954862b | ||
|
|
6d8bab3588 | ||
|
|
90ecbb9a74 | ||
|
|
7143cd2a72 | ||
|
|
cffc52ae0a | ||
|
|
b62dc10967 | ||
|
|
0af9ee5e95 | ||
|
|
27c748ad89 | ||
|
|
e91efce7db | ||
|
|
46e2025699 | ||
|
|
11edd2a030 | ||
|
|
02b1e0e15e | ||
|
|
c7d947fc03 | ||
|
|
2106057d13 | ||
|
|
46c2464bb4 | ||
|
|
3b3383ef4b | ||
|
|
0abc18ef10 | ||
|
|
c154e24cf3 | ||
|
|
b956f1690a | ||
|
|
087dc66617 | ||
|
|
087c34a67d | ||
|
|
0b30335044 | ||
|
|
dd23959f41 | ||
|
|
3a7e5780b6 | ||
|
|
98fbcd1712 | ||
|
|
f3a1812eff | ||
|
|
e2d666785a | ||
|
|
e0c2338531 | ||
|
|
08cfe7c4c2 | ||
|
|
58d5b5c02b | ||
|
|
b5164c333c | ||
|
|
487df8ffc4 | ||
|
|
84182aa9c1 | ||
|
|
dc68f34960 | ||
|
|
d39074c831 | ||
|
|
5e54cabc80 | ||
|
|
d59e70d08a | ||
|
|
8020cafac4 | ||
|
|
7fd6ffae14 | ||
|
|
9a8df0ea4e | ||
|
|
199ab432f0 | ||
|
|
c897693363 | ||
|
|
ea623bbb16 | ||
|
|
08d7105a94 | ||
|
|
5b8a260deb | ||
|
|
79a658c8db | ||
|
|
3d796dec56 | ||
|
|
8a824c23af | ||
|
|
37d4185cbe | ||
|
|
8921ccf093 | ||
|
|
165ad9ecb0 | ||
|
|
1d3c2fd049 | ||
|
|
04615fb22c | ||
|
|
c7dbd48709 | ||
|
|
b2929100ba | ||
|
|
e5653427e0 | ||
|
|
2adc3699c6 | ||
|
|
0563565f80 | ||
|
|
51ee0fea1c | ||
|
|
5ff48c456c | ||
|
|
9fd19c908d | ||
|
|
7ebedec7b8 | ||
|
|
7b4aed0abe | ||
|
|
b6c34b8363 | ||
|
|
7d7221cd74 | ||
|
|
4f5afa8bef | ||
|
|
d8b728eebe | ||
|
|
035e2632a5 | ||
|
|
0845c19dd6 | ||
|
|
460eb6c6d6 | ||
|
|
1bb3132896 | ||
|
|
a233635d80 | ||
|
|
bb4af376d3 | ||
|
|
e835681bf7 | ||
|
|
2599e8d6be | ||
|
|
a1ff0cbee5 | ||
|
|
4deb53bb22 | ||
|
|
7eab0a76aa | ||
|
|
6893755bd4 | ||
|
|
a262337abd | ||
|
|
7d4c42822f | ||
|
|
e44e113190 | ||
|
|
a448cf0af8 | ||
|
|
0ce038a616 | ||
|
|
f9f08a69a6 | ||
|
|
3218989811 | ||
|
|
f775c6cfeb | ||
|
|
41572b1834 | ||
|
|
18c0fd6be7 | ||
|
|
8ac592d217 | ||
|
|
97dfaf6dcd | ||
|
|
0e6104e790 | ||
|
|
1acaab0b75 | ||
|
|
4eff8d066a |
@@ -2,29 +2,25 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu
|
||||
|
||||
USER vscode
|
||||
|
||||
ENV CONDA_DIR=/home/vscode/miniconda
|
||||
ENV PATH="$CONDA_DIR/bin:$PATH"
|
||||
ENV PATH="/home/vscode/.local/bin:${PATH}"
|
||||
|
||||
ARG PYTHON_VERSION=3.12
|
||||
ARG PYTHON_VERSION=3.12.11
|
||||
ARG NODEJS_VERSION=24
|
||||
|
||||
# Install Miniconda
|
||||
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \
|
||||
&& bash ~/miniconda.sh -b -p $CONDA_DIR \
|
||||
&& rm ~/miniconda.sh \
|
||||
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main \
|
||||
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
|
||||
# Install and setup mise and uv
|
||||
RUN curl https://mise.run | sh
|
||||
RUN curl -LsSf https://astral.sh/uv/install.sh | sh
|
||||
|
||||
# Configure conda environment
|
||||
RUN eval "$(conda shell.bash hook)" \
|
||||
&& conda create -n maa \
|
||||
&& conda activate maa \
|
||||
&& conda install -y \
|
||||
python=$PYTHON_VERSION \
|
||||
conda-forge::nodejs=$NODEJS_VERSION \
|
||||
&& pip install pre-commit
|
||||
# Activate mise
|
||||
RUN echo 'eval "$(mise activate bash)"' >> ~/.bashrc
|
||||
|
||||
# Finalize conda setup
|
||||
RUN conda init \
|
||||
&& conda config --set auto_activate false \
|
||||
&& echo "conda activate maa" >> ~/.bashrc
|
||||
# Setup Python and Node.js
|
||||
RUN mise use -g node@$NODEJS_VERSION
|
||||
RUN uv python install $PYTHON_VERSION
|
||||
|
||||
# Create and activate venv
|
||||
RUN uv venv --clear ~/.venv/maa
|
||||
RUN echo "source ~/.venv/maa/bin/activate" >> ~/.bashrc
|
||||
|
||||
# Install tools
|
||||
RUN uv tool install prek
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#!/bin/bash
|
||||
WORKSPACE=$(pwd)
|
||||
|
||||
# conda activate maa
|
||||
|
||||
echo "===================="
|
||||
cd "$WORKSPACE"
|
||||
echo "Setting up git safe.directory..."
|
||||
|
||||
@@ -2,36 +2,51 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu
|
||||
|
||||
USER vscode
|
||||
|
||||
ENV CONDA_DIR=/home/vscode/miniconda
|
||||
ENV PATH="$CONDA_DIR/bin:$PATH"
|
||||
ENV PATH="/home/vscode/.local/bin:${PATH}"
|
||||
|
||||
ARG CLANGD_VERSION=20
|
||||
ARG PYTHON_VERSION=3.12
|
||||
ARG PYTHON_VERSION=3.12.11
|
||||
ARG NODEJS_VERSION=24
|
||||
|
||||
# Add kitware's apt repository (for cmake)
|
||||
RUN curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo gpg --dearmor -o /usr/share/keyrings/kitware-archive-keyring.gpg
|
||||
RUN cat <<EOF | sudo tee /etc/apt/sources.list.d/kitware.sources
|
||||
Types: deb
|
||||
URIs: https://apt.kitware.com/ubuntu
|
||||
Suites: $(lsb_release -cs)
|
||||
Components: main
|
||||
Architectures: $(dpkg --print-architecture)
|
||||
Signed-By: /usr/share/keyrings/kitware-archive-keyring.gpg
|
||||
EOF
|
||||
|
||||
# Install system dependencies
|
||||
RUN sudo apt update \
|
||||
&& sudo apt upgrade -y \
|
||||
&& sudo apt install -y \
|
||||
cmake
|
||||
cmake \
|
||||
fish \
|
||||
&& sudo rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Miniconda
|
||||
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \
|
||||
&& bash ~/miniconda.sh -b -p ${CONDA_DIR} \
|
||||
&& rm ~/miniconda.sh \
|
||||
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main \
|
||||
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
|
||||
# Initialize fish
|
||||
RUN fish -c exit
|
||||
|
||||
# Configure conda environment
|
||||
RUN eval "$(conda shell.bash hook)" \
|
||||
&& conda create -n maa \
|
||||
&& conda activate maa \
|
||||
&& conda install -y \
|
||||
python=${PYTHON_VERSION} \
|
||||
conda-forge::nodejs=${NODEJS_VERSION} \
|
||||
&& pip install pre-commit black isort
|
||||
# Install and setup mise and uv
|
||||
RUN curl https://mise.run | sh
|
||||
RUN curl -LsSf https://astral.sh/uv/install.sh | sh
|
||||
|
||||
# Finalize conda setup
|
||||
RUN conda init \
|
||||
&& conda config --set auto_activate false \
|
||||
&& echo "conda activate maa" >> ~/.bashrc
|
||||
# Activate mise
|
||||
RUN echo 'eval "$(mise activate bash)"' >> ~/.bashrc
|
||||
RUN echo 'mise activate fish | source' >> ~/.config/fish/config.fish
|
||||
|
||||
# Setup Python and Node.js
|
||||
RUN mise use -g node@$NODEJS_VERSION
|
||||
RUN uv python install $PYTHON_VERSION
|
||||
|
||||
# Create and activate venv
|
||||
RUN uv venv --clear ~/.venv/maa
|
||||
RUN echo "source ~/.venv/maa/bin/activate" >> ~/.bashrc
|
||||
RUN echo "source ~/.venv/maa/bin/activate.fish" >> ~/.config/fish/config.fish
|
||||
|
||||
# Install tools
|
||||
RUN uv tool install prek
|
||||
RUN uv tool install ruff
|
||||
|
||||
@@ -25,8 +25,7 @@
|
||||
"xaver.clang-format",
|
||||
"llvm-vs-code-extensions.vscode-clangd",
|
||||
"ms-python.python",
|
||||
"ms-python.black-formatter",
|
||||
"ms-python.isort",
|
||||
"charliermarsh.ruff",
|
||||
"esbenp.prettier-vscode",
|
||||
"DavidAnson.vscode-markdownlint",
|
||||
"yzhang.markdown-all-in-one",
|
||||
@@ -43,7 +42,7 @@
|
||||
|
||||
// Language-specific formatting
|
||||
"[python]": {
|
||||
"editor.defaultFormatter": "ms-python.black-formatter",
|
||||
"editor.defaultFormatter": "charliermarsh.ruff",
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.organizeImports": "explicit"
|
||||
}
|
||||
@@ -55,19 +54,12 @@
|
||||
"editor.defaultFormatter": "xaver.clang-format"
|
||||
},
|
||||
|
||||
// Python formatting and linting
|
||||
"isort.args": ["--profile", "black"],
|
||||
|
||||
// Python runtime
|
||||
"python.terminal.launchArgs": ["-u"],
|
||||
"python.defaultInterpreterPath": "/home/vscode/miniconda/envs/maa/bin/python",
|
||||
"python.defaultInterpreterPath": "/home/vscode/.venv/maa/bin/python",
|
||||
"python.terminal.activateEnvironment": false,
|
||||
|
||||
// CMake settings
|
||||
"cmake.configureSettings": {
|
||||
"BUILD_DEBUG_DEMO": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "src/MaaUtils/MaaDeps/cmake/maa-x64-linux-toolchain.cmake"
|
||||
},
|
||||
"cmake.configureOnOpen": false,
|
||||
|
||||
// Performance optimizations
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#!/bin/bash
|
||||
WORKSPACE=$(pwd)
|
||||
|
||||
# conda activate maa
|
||||
|
||||
echo "===================="
|
||||
cd "$WORKSPACE"
|
||||
echo "Setting up git safe.directory..."
|
||||
@@ -27,14 +25,14 @@ echo "Installing Python dependencies..."
|
||||
for req_file in tools/*/requirements.txt; do
|
||||
if [ -f "$req_file" ]; then
|
||||
echo "Installing from $req_file"
|
||||
pip install -r "$req_file"
|
||||
uv pip install -r "$req_file"
|
||||
fi
|
||||
done
|
||||
|
||||
for req_file in tools/*/requirements-dev.txt; do
|
||||
if [ -f "$req_file" ]; then
|
||||
echo "Installing from $req_file"
|
||||
pip install -r "$req_file"
|
||||
uv pip install -r "$req_file"
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
@@ -55,3 +55,4 @@ dce6e317c8e56836662b64ac4b3d1a69b4ff4dd8
|
||||
# as they are automatically appended
|
||||
# --------------------------------------------------- #
|
||||
f7772bc814c52f9a5e65af02404cf54b70fe0a32
|
||||
ca9807ce099e5cae133293df8dfcd2b56b0e06bd
|
||||
|
||||
2
.github/.last-blame-ignore-commit
vendored
@@ -1 +1 @@
|
||||
272d71fa2938f945832f86232532b86a9e5406b8
|
||||
1944164d9c47549d71c3b25987e9299404cc16f3
|
||||
|
||||
2
.github/issue-checker.yml
vendored
@@ -252,7 +252,7 @@ labels:
|
||||
# `module: fight`
|
||||
- name: fight
|
||||
content: "module: fight"
|
||||
regexes: "刷图|刷理智|剿灭|刷.{0,6}材料|关卡选择|战斗|作战|[戰戦][鬥闘]|[Ff]ight|[Bb]attle|[Aa]nihilation"
|
||||
regexes: "刷图|理智|剿灭|刷.{0,6}材料|关卡选择|战斗|作战|[戰戦][鬥闘]|[Ff]ight|[Bb]attle|[Aa]nihilation"
|
||||
skip-if:
|
||||
- skip all
|
||||
- skip module
|
||||
|
||||
62
.github/pr_cache_remover.ps1
vendored
@@ -1,38 +1,46 @@
|
||||
$totalClearedSize = 0
|
||||
$cacheList = gh cache list --json id,ref,sizeInBytes | ConvertFrom-Json
|
||||
$prCaches = $cacheList | Where-Object { $_.ref -like "*merge*" }
|
||||
|
||||
if (-not $prCaches) {
|
||||
Write-Output "No PR caches found."
|
||||
exit
|
||||
$branchSet = @{}
|
||||
git ls-remote --heads origin | ForEach-Object {
|
||||
if ($_ -match 'refs/heads/(.+)$') { $branchSet[$matches[1]] = $true }
|
||||
}
|
||||
|
||||
foreach ($cache in $prCaches) {
|
||||
$cacheId = $cache.id
|
||||
$cacheRef = $cache.ref
|
||||
$cacheSizeInBytes = $cache.sizeInBytes
|
||||
foreach ($cache in $cacheList) {
|
||||
$shouldDelete = $false
|
||||
|
||||
if ($cacheRef -match "refs/pull/(\d+)/merge") {
|
||||
if ($cache.ref -match "refs/pull/(\d+)/merge") {
|
||||
$prNumber = $matches[1]
|
||||
|
||||
Write-Host "PR #${prNumber}: " -NoNewline
|
||||
|
||||
$prStatus = gh pr view $prNumber --json state | ConvertFrom-Json
|
||||
|
||||
Write-Host $prStatus.state -NoNewline
|
||||
|
||||
if ($prStatus.state -eq "MERGED" -or $prStatus.state -eq "CLOSED") {
|
||||
Write-Host " -> DELETING"
|
||||
|
||||
gh cache delete $cacheId
|
||||
|
||||
try {
|
||||
$prStatus = (gh pr view $prNumber --json state | ConvertFrom-Json).state
|
||||
Write-Host "$prStatus" -NoNewline
|
||||
$shouldDelete = $prStatus -in @("MERGED", "CLOSED")
|
||||
}
|
||||
catch {
|
||||
Write-Host "NOT FOUND" -NoNewline
|
||||
$shouldDelete = $true
|
||||
}
|
||||
}
|
||||
elseif ($cache.ref -match "refs/heads/(.+)" -and $matches[1] -ne "dev") {
|
||||
$branchName = $matches[1]
|
||||
$exists = $branchSet.ContainsKey($branchName)
|
||||
|
||||
Write-Host "Branch '$branchName': $(if ($exists) { 'EXISTS' } else { 'DELETED' })" -NoNewline
|
||||
$shouldDelete = -not $exists
|
||||
}
|
||||
else {
|
||||
continue
|
||||
}
|
||||
|
||||
$totalClearedSize += $cacheSizeInBytes
|
||||
}
|
||||
else {
|
||||
Write-Host ""
|
||||
}
|
||||
if ($shouldDelete) {
|
||||
Write-Host " -> DELETING"
|
||||
gh cache delete $cache.id
|
||||
$totalClearedSize += $cache.sizeInBytes
|
||||
}
|
||||
else {
|
||||
Write-Host ""
|
||||
}
|
||||
}
|
||||
|
||||
$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
|
||||
Write-Output "Cleared size: $formattedSize MB"
|
||||
Write-Output "Cleared size: $("{0:N2}" -f ($totalClearedSize / 1MB)) MB"
|
||||
|
||||
3
.github/stale_cache_cleanup.ps1
vendored
@@ -11,7 +11,8 @@ $keyPatterns = @(
|
||||
"macOS-arm64-maadeps",
|
||||
"Linux-x64-maadeps",
|
||||
"Linux-arm64-maadeps",
|
||||
"Smoke-testing"
|
||||
"Smoke-testing",
|
||||
"prek-v1|Linux|X64"
|
||||
)
|
||||
|
||||
# Filter caches matching any of our key patterns
|
||||
|
||||
3
.github/stale_cache_dev.ps1
vendored
@@ -19,7 +19,8 @@ $keyPatterns = @(
|
||||
"macOS-arm64-maadeps",
|
||||
"Linux-x64-maadeps",
|
||||
"Linux-arm64-maadeps",
|
||||
"Smoke-testing"
|
||||
"Smoke-testing",
|
||||
"prek-v1|Linux|X64"
|
||||
)
|
||||
|
||||
foreach ($pattern in $keyPatterns) {
|
||||
|
||||
1
.github/workflows/blame-ignore.yml
vendored
@@ -20,6 +20,7 @@ jobs:
|
||||
|
||||
- name: Check blame
|
||||
id: check_changes
|
||||
continue-on-error: true
|
||||
run: |
|
||||
LAST_CHECKED_COMMIT=$(cat .github/.last-blame-ignore-commit 2>/dev/null || git rev-list --max-parents=0 HEAD)
|
||||
|
||||
|
||||
132
.github/workflows/ci.yml
vendored
@@ -4,18 +4,6 @@ on:
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
branches-ignore:
|
||||
- "master"
|
||||
paths:
|
||||
- ".github/workflows/ci.yml"
|
||||
- "3rdparty/include/**"
|
||||
- "cmake/**"
|
||||
- "CMakeLists.txt"
|
||||
- "include/**"
|
||||
- "src/**"
|
||||
- "tools/maadeps-download.py"
|
||||
- "!**/*.md"
|
||||
pull_request:
|
||||
branches:
|
||||
- "dev"
|
||||
paths:
|
||||
@@ -23,6 +11,18 @@ on:
|
||||
- "3rdparty/include/**"
|
||||
- "cmake/**"
|
||||
- "CMakeLists.txt"
|
||||
- "CMakePresets.json"
|
||||
- "include/**"
|
||||
- "src/**"
|
||||
- "tools/maadeps-download.py"
|
||||
- "!**/*.md"
|
||||
pull_request:
|
||||
paths:
|
||||
- ".github/workflows/ci.yml"
|
||||
- "3rdparty/include/**"
|
||||
- "cmake/**"
|
||||
- "CMakeLists.txt"
|
||||
- "CMakePresets.json"
|
||||
- "include/**"
|
||||
- "src/**"
|
||||
- "tools/maadeps-download.py"
|
||||
@@ -30,7 +30,7 @@ on:
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }}
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
@@ -41,6 +41,10 @@ jobs:
|
||||
tag: ${{ steps.set_tag.outputs.tag }}
|
||||
prerelease: ${{ steps.set_pre.outputs.prerelease }}
|
||||
steps:
|
||||
- name: Show concurrency group
|
||||
run: |
|
||||
echo "Concurrency Group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }}"
|
||||
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
@@ -84,7 +88,7 @@ jobs:
|
||||
echo "[已有 Mirror酱 CDK?前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=MAA&source=maagh-release)" >> CHANGELOG.md
|
||||
|
||||
- name: Upload changelog to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
with:
|
||||
name: changelog
|
||||
@@ -112,7 +116,7 @@ jobs:
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: |
|
||||
@@ -126,23 +130,30 @@ jobs:
|
||||
run: |
|
||||
python3 tools/maadeps-download.py ${{ matrix.arch }}-windows
|
||||
|
||||
- name: Config cmake
|
||||
- name: Configure, build and install
|
||||
run: |
|
||||
mkdir -p build
|
||||
cmake -B build ${{ matrix.arch == 'arm64' && '-A ARM64' }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMAADEPS_TRIPLET='maa-${{ matrix.arch }}-windows' -DINSTALL_RESOURCE=ON -DINSTALL_PYTHON=ON -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' -DBUILD_WPF_GUI=OFF
|
||||
cmake -B build --preset ${{ matrix.arch == 'arm64' && 'windows-publish-arm64' || 'windows-publish-x64' }} -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
|
||||
cmake --build --preset ${{ matrix.arch == 'arm64' && 'windows-publish-arm64' || 'windows-publish-x64' }} --parallel $env:NUMBER_OF_PROCESSORS
|
||||
cmake --install build --config RelWithDebInfo
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build build --config RelWithDebInfo --parallel $env:NUMBER_OF_PROCESSORS
|
||||
- name: Download MaaFramework
|
||||
if: matrix.arch == 'x64'
|
||||
uses: robinraju/release-downloader@v1
|
||||
with:
|
||||
repository: MaaXYZ/MaaFramework
|
||||
latest: true
|
||||
fileName: '*win-x86_64*.zip'
|
||||
extract: true
|
||||
out-file-path: MaaFramework-temp
|
||||
|
||||
- name: Install
|
||||
- name: Copy MaaWin32ControlUnit
|
||||
if: matrix.arch == 'x64'
|
||||
run: |
|
||||
mkdir -p install
|
||||
cmake --install build --prefix install --config RelWithDebInfo
|
||||
cp MaaFramework-temp/bin/*Win32ControlUnit* install/
|
||||
|
||||
- name: Cache .nuke/temp, ~/.nuget/packages
|
||||
id: cache-nuget
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: |
|
||||
@@ -184,7 +195,7 @@ jobs:
|
||||
continue-on-error: true
|
||||
|
||||
- name: Upload PDB files
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAAComponent-DebugSymbol-win-${{ matrix.arch }}
|
||||
path: install/MAAComponent-DebugSymbol-${{ needs.meta.outputs.tag }}-win-${{ matrix.arch }}.zip
|
||||
@@ -205,7 +216,7 @@ jobs:
|
||||
Compress-Archive -Destination MAA-${{ needs.meta.outputs.tag }}-win-${{ matrix.arch }}.zip -Path ./*
|
||||
|
||||
- name: Upload MAA to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAA-win-${{ matrix.arch }}
|
||||
path: install/MAA-*.zip
|
||||
@@ -232,7 +243,7 @@ jobs:
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: ./src/MaaUtils/MaaDeps
|
||||
@@ -245,28 +256,14 @@ jobs:
|
||||
run: |
|
||||
python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
|
||||
|
||||
- name: Config cmake
|
||||
- name: Configure, build and install
|
||||
run: |
|
||||
mkdir -p build
|
||||
cmake -B build \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux' \
|
||||
-DINSTALL_RESOURCE=ON \
|
||||
-DINSTALL_PYTHON=ON \
|
||||
-DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
|
||||
-DCMAKE_TOOLCHAIN_FILE=src/MaaUtils/MaaDeps/cmake/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build build --config RelWithDebInfo --parallel $(nproc)
|
||||
cmake --preset ${{ matrix.arch == 'x86_64' && 'linux-publish-x64' || 'linux-publish-arm64' }} -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
|
||||
cmake --build --preset ${{ matrix.arch == 'x86_64' && 'linux-publish-x64' || 'linux-publish-arm64' }} --parallel $(nproc)
|
||||
cmake --install build --config RelWithDebInfo
|
||||
env:
|
||||
CLICOLOR_FORCE: 1
|
||||
|
||||
- name: Install
|
||||
run: |
|
||||
mkdir -p install
|
||||
cmake --install build --prefix install --config RelWithDebInfo
|
||||
|
||||
- name: Setup cross compile toolchains for CLI
|
||||
uses: ./src/maa-cli/.github/actions/setup
|
||||
with:
|
||||
@@ -274,10 +271,10 @@ jobs:
|
||||
|
||||
- name: Build CLI
|
||||
run: |
|
||||
cargo build --release --locked --package maa-cli --features vendored-openssl
|
||||
cargo build --release --locked --package maa-cli --features git2/vendored-openssl
|
||||
cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/install/maa
|
||||
cargo build --release --locked --package maa-cli --no-default-features \
|
||||
--features git2,vendored-openssl
|
||||
--features git2,git2/vendored-openssl
|
||||
cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/appimage-maa
|
||||
working-directory: src/maa-cli
|
||||
|
||||
@@ -324,7 +321,7 @@ jobs:
|
||||
tar czvf $GITHUB_WORKSPACE/release/MAA-${{ needs.meta.outputs.tag }}-linux-${{ matrix.arch }}.tar.gz .
|
||||
|
||||
- name: Upload MAA to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAA-linux-${{ matrix.arch }}
|
||||
path: |
|
||||
@@ -356,7 +353,7 @@ jobs:
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: ./src/MaaUtils/MaaDeps
|
||||
@@ -368,23 +365,14 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Config cmake
|
||||
- name: Configure, build and install
|
||||
run: |
|
||||
cmake -B build -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_OSX_ARCHITECTURES='${{ matrix.arch }}' \
|
||||
-DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build build --config RelWithDebInfo --parallel $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Install
|
||||
run: |
|
||||
cmake --install build --prefix install --config RelWithDebInfo
|
||||
cmake -B build --preset ${{ matrix.arch == 'x86_64' && 'macos-publish-x64' || 'macos-publish-arm64' }} -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
|
||||
cmake --build --preset ${{ matrix.arch == 'x86_64' && 'macos-publish-x64' || 'macos-publish-arm64' }} --parallel $(sysctl -n hw.logicalcpu)
|
||||
cmake --install build --config RelWithDebInfo
|
||||
|
||||
- name: Upload MAA to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAACore-macos-${{ matrix.arch }}
|
||||
path: "install/*.dylib"
|
||||
@@ -410,27 +398,27 @@ jobs:
|
||||
git submodule update --init --depth 1 src/MaaMacGui
|
||||
|
||||
- name: Download MAA (arm64) from GitHub
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: MAACore-macos-arm64
|
||||
path: install-arm64
|
||||
|
||||
- name: Download MAA (x64) from GitHub
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: MAACore-macos-x86_64
|
||||
path: install-x86_64
|
||||
|
||||
- name: Install Developer ID certificate
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
uses: apple-actions/import-codesign-certs@v5
|
||||
uses: apple-actions/import-codesign-certs@v6
|
||||
with:
|
||||
p12-file-base64: ${{ secrets.HGUANDL_SIGN_CERT_P12 }}
|
||||
p12-password: ${{ secrets.HGUANDL_SIGN_CERT_PASSWD }}
|
||||
|
||||
- name: Download provisioning profiles
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
uses: apple-actions/download-provisioning-profiles@v4
|
||||
uses: apple-actions/download-provisioning-profiles@v5
|
||||
with:
|
||||
bundle-id: "com.hguandl.MeoAsstMac"
|
||||
issuer-id: ${{ secrets.HGUANDL_APPSTORE_ISSUER }}
|
||||
@@ -462,7 +450,7 @@ jobs:
|
||||
zip -yrX9 "$name.zip" "$name"
|
||||
|
||||
- name: Upload MAA runtime to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAA-macos-runtime-universal
|
||||
path: runtime/MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal.zip
|
||||
@@ -544,7 +532,7 @@ jobs:
|
||||
working-directory: release
|
||||
|
||||
- name: Upload MAA to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAA-macos-universal
|
||||
path: ${{ startsWith(github.ref, 'refs/tags/v') && 'release/MAA*' || 'src/MaaMacGui/MAA.xcarchive/**' }}
|
||||
@@ -556,7 +544,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download MAA from GitHub
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
path: assets
|
||||
|
||||
@@ -569,7 +557,7 @@ jobs:
|
||||
find . -type f | while read f; do mv -fvt . $f; done
|
||||
|
||||
- name: Publish release to GitHub
|
||||
uses: softprops/action-gh-release@v2.4.2
|
||||
uses: softprops/action-gh-release@v2.5.0
|
||||
with:
|
||||
body_path: CHANGELOG.md
|
||||
files: |
|
||||
|
||||
56
.github/workflows/codeql-core.yml
vendored
@@ -1,56 +0,0 @@
|
||||
name: CodeQL Code Analysis
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: ["dev"]
|
||||
paths:
|
||||
- ".github/workflows/codeql-core.yml"
|
||||
- "3rdparty/include/**"
|
||||
- "cmake/**"
|
||||
- "CMakeLists.txt"
|
||||
- "include/**"
|
||||
- "src/**"
|
||||
- "!**/*.md"
|
||||
- "!**/*.xaml"
|
||||
schedule:
|
||||
- cron: "45 11 * * *" # Runs daily at 11:45 UTC
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
actions: write
|
||||
contents: read
|
||||
packages: read
|
||||
security-events: write
|
||||
|
||||
jobs:
|
||||
analyze-manual:
|
||||
name: Analyze MaaCore and MaaWpfGui
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
- name: Setup CodeQL
|
||||
uses: github/codeql-action/init@v4
|
||||
with:
|
||||
languages: c-cpp,csharp
|
||||
build-mode: manual
|
||||
|
||||
- name: Run CodeQL
|
||||
uses: github/codeql-action/analyze@v4
|
||||
|
||||
- name: Delete old caches
|
||||
shell: pwsh
|
||||
run: |
|
||||
$oldCaches = gh cache list --key codeql --order asc --json key | ConvertFrom-Json | Select-Object -SkipLast 1
|
||||
foreach ($cache in $oldCaches) {
|
||||
if ($cache.key) {
|
||||
Write-Host "Deleting cache: $($cache.key)"
|
||||
gh cache delete $cache.key
|
||||
}
|
||||
}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
37
.github/workflows/codeql-wf.yml
vendored
@@ -1,37 +0,0 @@
|
||||
name: CodeQL Workflow Analysis
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: ["dev"]
|
||||
paths:
|
||||
- ".github/**/*.yml"
|
||||
schedule:
|
||||
- cron: "00 12 * * *" # Runs daily at 12:00 UTC
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
actions: write
|
||||
contents: read
|
||||
security-events: write
|
||||
|
||||
jobs:
|
||||
analyze-workflows:
|
||||
name: Analyze GitHub Workflows
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
- name: Setup CodeQL for GitHub Actions
|
||||
uses: github/codeql-action/init@v4
|
||||
with:
|
||||
languages: actions
|
||||
build-mode: none
|
||||
|
||||
- name: Run CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v4
|
||||
with:
|
||||
category: "/language:multi-none"
|
||||
2
.github/workflows/markdown-checker.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
||||
show-progress: false
|
||||
|
||||
- name: Cache lychee responses
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: .lycheecache
|
||||
|
||||
11
.github/workflows/optimize-templates.yml
vendored
@@ -18,18 +18,19 @@ jobs:
|
||||
optimize-png:
|
||||
name: Optimize PNG Images
|
||||
# Skip workflow to prevent double consecutive runs
|
||||
# Skip workflow on PR merges
|
||||
if: github.repository_owner == 'MaaAssistantArknights' && ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
|
||||
if: github.repository_owner == 'MaaAssistantArknights' && github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
# Skip workflow on PR merges
|
||||
- name: Check if it is a direct push
|
||||
id: check_push
|
||||
run: |
|
||||
if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
|
||||
pr_merge_status=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||
"https://api.github.com/repos/${{ github.repository }}/commits/${{ github.event.after }}/pulls" | xargs)
|
||||
pr_count=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||
"https://api.github.com/repos/${{ github.repository }}/commits/${{ github.event.after }}/pulls" \
|
||||
| jq 'length')
|
||||
|
||||
if [[ "$pr_merge_status" == "[ ]" ]]; then
|
||||
if [[ "$pr_count" == "0" ]]; then
|
||||
echo "Direct push detected. Proceeding..."
|
||||
echo "is_pr=False" >> $GITHUB_OUTPUT
|
||||
else
|
||||
|
||||
36
.github/workflows/pre-commit-scheduled.yml
vendored
Normal file
@@ -0,0 +1,36 @@
|
||||
name: Scheduled Pre-commit
|
||||
|
||||
on:
|
||||
schedule:
|
||||
# 每天 UTC 21:00 运行(北京时间 5:00)
|
||||
- cron: "0 21 * * *"
|
||||
workflow_dispatch: # 允许手动触发
|
||||
|
||||
jobs:
|
||||
pre-commit:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
show-progress: false
|
||||
|
||||
- name: Setup and run Prek
|
||||
uses: j178/prek-action@v1
|
||||
id: pre-commit
|
||||
continue-on-error: true
|
||||
with:
|
||||
extra-args: '--all-files'
|
||||
|
||||
- name: Commit and push changes
|
||||
if: steps.pre-commit.outcome == 'failure' && github.repository_owner == 'MaaAssistantArknights'
|
||||
uses: actions-js/push@master
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
message: "chore: Auto update by pre-commit hooks
|
||||
|
||||
https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
|
||||
[skip changelog]"
|
||||
branch: ${{ github.ref }}
|
||||
37
.github/workflows/release-nightly-ota.yml
vendored
@@ -171,7 +171,7 @@ jobs:
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: |
|
||||
@@ -185,23 +185,30 @@ jobs:
|
||||
run: |
|
||||
python3 tools/maadeps-download.py ${{ matrix.arch }}-windows
|
||||
|
||||
- name: Config cmake
|
||||
- name: Configure, build and install
|
||||
run: |
|
||||
mkdir -p build
|
||||
cmake -B build ${{ matrix.arch == 'arm64' && '-A ARM64' }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMAADEPS_TRIPLET='maa-${{ matrix.arch }}-windows' -DINSTALL_RESOURCE=ON -DINSTALL_PYTHON=ON -DMAA_HASH_VERSION='${{ steps.set_tag.outputs.tag }}' -DBUILD_WPF_GUI=OFF
|
||||
cmake -B build --preset ${{ matrix.arch == 'arm64' && 'windows-publish-arm64' || 'windows-publish-x64' }} -DMAA_HASH_VERSION='${{ steps.set_tag.outputs.tag }}'
|
||||
cmake --build --preset ${{ matrix.arch == 'arm64' && 'windows-publish-arm64' || 'windows-publish-x64' }} --parallel $env:NUMBER_OF_PROCESSORS
|
||||
cmake --install build --config RelWithDebInfo
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build build --config RelWithDebInfo --parallel $env:NUMBER_OF_PROCESSORS
|
||||
- name: Download MaaFramework
|
||||
if: matrix.arch == 'x64'
|
||||
uses: robinraju/release-downloader@v1
|
||||
with:
|
||||
repository: MaaXYZ/MaaFramework
|
||||
latest: true
|
||||
fileName: '*win-x86_64*.zip'
|
||||
extract: true
|
||||
out-file-path: MaaFramework-temp
|
||||
|
||||
- name: Install
|
||||
- name: Copy MaaWin32ControlUnit
|
||||
if: matrix.arch == 'x64'
|
||||
run: |
|
||||
mkdir -p install
|
||||
cmake --install build --prefix install --config RelWithDebInfo
|
||||
cp MaaFramework-temp/bin/*Win32ControlUnit* install/
|
||||
|
||||
- name: Cache .nuke/temp, ~/.nuget/packages
|
||||
id: cache-nuget
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: |
|
||||
@@ -233,7 +240,7 @@ jobs:
|
||||
|
||||
- name: Publish WPF GUI
|
||||
run: |
|
||||
dotnet publish src/MaaWpfGui/MaaWpfGui.csproj -c Release -o install
|
||||
dotnet publish src/MaaWpfGui/MaaWpfGui.csproj -c Release -p:Platform=${{ matrix.arch == 'arm64' && 'ARM64' || 'x64' }} -o install
|
||||
|
||||
- name: Collect PDB files
|
||||
run: |
|
||||
@@ -242,7 +249,7 @@ jobs:
|
||||
continue-on-error: true
|
||||
|
||||
- name: Upload PDB files
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAAComponent-DebugSymbol-win-${{ matrix.arch }}
|
||||
path: install/MAAComponent-DebugSymbol-${{ steps.set_tag.outputs.tag }}-win-${{ matrix.arch }}.zip
|
||||
@@ -258,7 +265,7 @@ jobs:
|
||||
cp tools/DependencySetup_依赖库安装.bat install
|
||||
|
||||
- name: Upload MAA to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MAA-win-${{ matrix.arch }}
|
||||
path: install
|
||||
@@ -319,7 +326,7 @@ jobs:
|
||||
show-progress: false
|
||||
|
||||
- name: Download MAA from GitHub
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: MAA-win-${{ matrix.target }}
|
||||
path: ${{ format('{0}/{1}', 'build-ota', needs.build-win-nightly.outputs.tag) }}
|
||||
|
||||
4
.github/workflows/release-ota.yml
vendored
@@ -77,7 +77,7 @@ jobs:
|
||||
PUSH_REMOTE: https://github-actions[bot]:${{ secrets.MAARELEASE_RELEASE }}@github.com/${{ github.repository_owner }}/MaaRelease
|
||||
|
||||
- name: Upload release config to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: MaaReleaseConfig
|
||||
path: ./build-ota/config
|
||||
@@ -96,7 +96,7 @@ jobs:
|
||||
- x64
|
||||
steps:
|
||||
- name: Download release config
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: MaaReleaseConfig
|
||||
path: ./MaaReleaseConfig
|
||||
|
||||
115
.github/workflows/release-package-distribution.yml
vendored
@@ -18,6 +18,11 @@ on:
|
||||
type: boolean
|
||||
required: false
|
||||
default: true
|
||||
maa_cos:
|
||||
description: "Upload to MAA COS"
|
||||
type: boolean
|
||||
required: false
|
||||
default: true
|
||||
|
||||
env:
|
||||
RELEASE_TAG_RAW: ${{ github.event.inputs.release_tag || 'latest' }}
|
||||
@@ -55,78 +60,49 @@ jobs:
|
||||
name: Upload to MirrorChyan
|
||||
needs: meta
|
||||
if: ${{ github.event.inputs.mirrorchyan == 'true' }}
|
||||
runs-on: macos-latest
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- os: win
|
||||
arch: x64
|
||||
filename: "*MAA-*-win-x64.zip"
|
||||
extra_zip: false
|
||||
- os: win
|
||||
arch: arm64
|
||||
filename: "*MAA-*-win-arm64.zip"
|
||||
extra_zip: false
|
||||
- os: macos
|
||||
arch: arm64
|
||||
filename: "MAA-*-macos-universal.dmg"
|
||||
extra_zip: true
|
||||
- os: macos
|
||||
arch: x64
|
||||
filename: "MAA-*-macos-universal.dmg"
|
||||
extra_zip: true
|
||||
|
||||
env:
|
||||
RELEASE_TAG: ${{ needs.meta.outputs.RELEASE_TAG }}
|
||||
|
||||
steps:
|
||||
- name: Upload MAA win x64
|
||||
- name: Upload MAA ${{ matrix.os }} ${{ matrix.arch }}
|
||||
uses: MirrorChyan/uploading-action@v1
|
||||
continue-on-error: true
|
||||
with:
|
||||
filetype: latest-release
|
||||
filename: "*MAA-*-win-x64.zip"
|
||||
filename: ${{ matrix.filename }}
|
||||
extra_zip: ${{ matrix.extra_zip }}
|
||||
tag: ${{ env.RELEASE_TAG }}
|
||||
mirrorchyan_rid: MAA
|
||||
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
owner: ${{ github.repository_owner }}
|
||||
repo: ${{ github.event.repository.name }}
|
||||
upload_token: ${{ secrets.MirrorChyanUploadToken }}
|
||||
os: win
|
||||
arch: x64
|
||||
|
||||
- name: Upload MAA win arm64
|
||||
uses: MirrorChyan/uploading-action@v1
|
||||
continue-on-error: true
|
||||
with:
|
||||
filetype: latest-release
|
||||
filename: "*MAA-*-win-arm64.zip"
|
||||
tag: ${{ env.RELEASE_TAG }}
|
||||
mirrorchyan_rid: MAA
|
||||
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
owner: ${{ github.repository_owner }}
|
||||
repo: ${{ github.event.repository.name }}
|
||||
upload_token: ${{ secrets.MirrorChyanUploadToken }}
|
||||
os: win
|
||||
arch: arm64
|
||||
|
||||
- name: Upload MAA macos arm64
|
||||
uses: MirrorChyan/uploading-action@v1
|
||||
continue-on-error: true
|
||||
with:
|
||||
filetype: latest-release
|
||||
filename: "MAA-*-macos-universal.dmg"
|
||||
extra_zip: true
|
||||
tag: ${{ env.RELEASE_TAG }}
|
||||
mirrorchyan_rid: MAA
|
||||
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
owner: ${{ github.repository_owner }}
|
||||
repo: ${{ github.event.repository.name }}
|
||||
upload_token: ${{ secrets.MirrorChyanUploadToken }}
|
||||
os: macos
|
||||
arch: arm64
|
||||
|
||||
- name: Upload MAA macos x64
|
||||
uses: MirrorChyan/uploading-action@v1
|
||||
continue-on-error: true
|
||||
with:
|
||||
filetype: latest-release
|
||||
filename: "MAA-*-macos-universal.dmg"
|
||||
extra_zip: true
|
||||
tag: ${{ env.RELEASE_TAG }}
|
||||
mirrorchyan_rid: MAA
|
||||
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
owner: ${{ github.repository_owner }}
|
||||
repo: ${{ github.event.repository.name }}
|
||||
upload_token: ${{ secrets.MirrorChyanUploadToken }}
|
||||
os: macos
|
||||
arch: x64
|
||||
os: ${{ matrix.os }}
|
||||
arch: ${{ matrix.arch }}
|
||||
|
||||
winget:
|
||||
name: Upload to WinGet
|
||||
@@ -149,3 +125,30 @@ jobs:
|
||||
release-tag: ${{ env.RELEASE_TAG }}
|
||||
fork-user: MaaAssistantArknights
|
||||
token: ${{ secrets.MAABOT_WINGET_TOKEN }}
|
||||
|
||||
maa_cos:
|
||||
name: Upload to MAA COS
|
||||
needs: meta
|
||||
if: ${{ github.event.inputs.maa_cos == 'true' && !contains(needs.meta.outputs.RELEASE_TAG, '-') }}
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true
|
||||
env:
|
||||
FILENAME: MAA-${{ needs.meta.outputs.RELEASE_TAG }}-win-x64.zip
|
||||
|
||||
steps:
|
||||
- uses: robinraju/release-downloader@v1
|
||||
with:
|
||||
repository: 'MaaAssistantArknights/MaaAssistantArknights'
|
||||
latest: true
|
||||
fileName: ${{ env.FILENAME }}
|
||||
out-file-path: 'downloads'
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Upload to COS
|
||||
uses: zkqiang/tencent-cos-action@v0.1.0
|
||||
with:
|
||||
args: upload -rs downloads/${{ env.FILENAME }} MAA/${{ env.FILENAME }}
|
||||
secret_id: ${{ secrets.MISTEO_MAA_COS_SECRET_ID }}
|
||||
secret_key: ${{ secrets.MISTEO_MAA_COS_SECRET_KEY }}
|
||||
bucket: ${{ secrets.MISTEO_MAA_COS_BUCKET }}
|
||||
region: ${{ secrets.MISTEO_MAA_COS_REG }}
|
||||
|
||||
4
.github/workflows/release-preparation.yml
vendored
@@ -80,7 +80,7 @@ jobs:
|
||||
git commit -m "$commit_msg"
|
||||
|
||||
- name: Create changelog PR
|
||||
uses: peter-evans/create-pull-request@v7
|
||||
uses: peter-evans/create-pull-request@v8
|
||||
with:
|
||||
sign-commits: true
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -95,7 +95,7 @@ jobs:
|
||||
AnnAngela
|
||||
|
||||
- name: Assign reviewers to release PR
|
||||
uses: kentaro-m/auto-assign-action@v2.0.0
|
||||
uses: kentaro-m/auto-assign-action@v2.0.1
|
||||
with:
|
||||
configuration-path: ".github/release_reviewers.yaml"
|
||||
|
||||
|
||||
42
.github/workflows/res-update-game.yml
vendored
@@ -37,7 +37,7 @@ jobs:
|
||||
/gamedata/excel/activity_table.json
|
||||
|
||||
- name: Upload Official resources
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: official
|
||||
path: ./Official
|
||||
@@ -80,7 +80,7 @@ jobs:
|
||||
/kr/gamedata/excel/activity_table.json
|
||||
|
||||
- name: Upload Overseas resources
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: overseas
|
||||
path: ./Overseas
|
||||
@@ -133,7 +133,7 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Upload Taiwan resources
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: txwy
|
||||
path: ./excel
|
||||
@@ -159,7 +159,7 @@ jobs:
|
||||
|
||||
- name: Restore ResourceUpdater from cache
|
||||
id: resupd-cache
|
||||
uses: actions/cache/restore@v4
|
||||
uses: actions/cache/restore@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
|
||||
@@ -170,7 +170,7 @@ jobs:
|
||||
- name: Cache MaaDeps
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
id: maadeps-cache
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: |
|
||||
@@ -184,29 +184,17 @@ jobs:
|
||||
run: |
|
||||
python3 tools/maadeps-download.py arm64-osx
|
||||
|
||||
- name: Config cmake
|
||||
- name: Config, Build & Install ResourceUpdater
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cd tools/ResourceUpdater
|
||||
mkdir -p build
|
||||
cmake -B build -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DMAADEPS_TRIPLET='maa-arm64-osx' \
|
||||
-DWITH_HASH_VERSION=ON
|
||||
|
||||
- name: Build
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake --build tools/ResourceUpdater/build --config Release --parallel $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Install
|
||||
if: steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake --install tools/ResourceUpdater/build --prefix tools/ResourceUpdater --config Release
|
||||
cmake --preset res-updater-macos-arm64
|
||||
cmake --build --preset res-updater-macos-arm64 --parallel $(sysctl -n hw.logicalcpu)
|
||||
cmake --install build --config Release
|
||||
|
||||
- name: Save ResourceUpdater to cache
|
||||
if: always() && steps.resupd-cache.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v4
|
||||
uses: actions/cache/save@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
|
||||
@@ -225,19 +213,19 @@ jobs:
|
||||
ttl: 15
|
||||
|
||||
- name: Download txwy
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: txwy
|
||||
path: ./tools/ResourceUpdater/Overseas/tw/gamedata/excel
|
||||
|
||||
- name: Download Overseas
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: overseas
|
||||
path: ./tools/ResourceUpdater/Overseas
|
||||
|
||||
- name: Download Official
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: official
|
||||
path: ./tools/ResourceUpdater/Official
|
||||
@@ -271,7 +259,7 @@ jobs:
|
||||
- name: Cache python packages
|
||||
if: always() && steps.update_version.outputs.contains_png == 'True'
|
||||
id: cache_python
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: ${{ env.pythonLocation }}/Lib/site-packages
|
||||
@@ -291,7 +279,7 @@ jobs:
|
||||
- name: Optimize png images
|
||||
if: steps.update_version.outputs.contains_png == 'True'
|
||||
run: |
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py -p resource/template/items/ resource/template/infrast/
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py --no-cleanup -p resource/template/items/ resource/template/infrast/
|
||||
|
||||
- name: Commit changes
|
||||
if: steps.update_version.outputs.changes == 'True'
|
||||
|
||||
37
.github/workflows/smoke-testing.yml
vendored
@@ -4,6 +4,8 @@ permissions:
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "dev"
|
||||
paths:
|
||||
- ".github/workflows/smoke-testing.yml"
|
||||
- "3rdparty/include/**"
|
||||
@@ -32,7 +34,7 @@ on:
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }}
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
@@ -54,7 +56,7 @@ jobs:
|
||||
- name: Restore cache for Smoke Test
|
||||
if: ${{ steps.cache_key.outputs.key != '' }}
|
||||
id: smoke-cache
|
||||
uses: actions/cache/restore@v4
|
||||
uses: actions/cache/restore@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
key: ${{ steps.cache_key.outputs.key }}
|
||||
@@ -74,7 +76,7 @@ jobs:
|
||||
- name: Cache MaaDeps
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
id: maadeps-cache
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: ./src/MaaUtils/MaaDeps
|
||||
@@ -87,27 +89,12 @@ jobs:
|
||||
run: |
|
||||
python3 tools/maadeps-download.py arm64-osx
|
||||
|
||||
- name: Config cmake
|
||||
- name: Configure, build and install
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
mkdir -p build
|
||||
cmake -B build -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=Debug \
|
||||
-DMAADEPS_TRIPLET='maa-arm64-osx' \
|
||||
-DBUILD_SMOKE_TEST=ON \
|
||||
-DINSTALL_RESOURCE=ON \
|
||||
-DWITH_HASH_VERSION=ON
|
||||
|
||||
- name: Build
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
cmake --build build --config Debug --parallel $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Install
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
mkdir -p install
|
||||
cmake --install build --prefix install --config Debug
|
||||
cmake -B build --preset smoke-test
|
||||
cmake --build build --preset smoke-test --parallel $(sysctl -n hw.logicalcpu)
|
||||
cmake --install build --config Debug
|
||||
|
||||
- name: Make link to Smoke Test cache
|
||||
if: steps.smoke-cache.outputs.cache-hit == 'true'
|
||||
@@ -120,21 +107,21 @@ jobs:
|
||||
|
||||
- name: Save cache for Smoke Test (only in dev)
|
||||
if: steps.smoke-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev'
|
||||
uses: actions/cache/save@v4
|
||||
uses: actions/cache/save@v5
|
||||
continue-on-error: true
|
||||
with:
|
||||
key: ${{ steps.cache_key.outputs.key }}
|
||||
path: |
|
||||
./install/libfastdeploy_ppocr.dylib
|
||||
./install/libMaaUtils.dylib
|
||||
./install/libMaaCore.dylib
|
||||
./install/libMaaUtils.dylib
|
||||
./install/libonnxruntime.1.19.2.dylib
|
||||
./install/libopencv_world4.4.11.0.dylib
|
||||
./install/smoke_test
|
||||
|
||||
- name: Upload logs
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: logs
|
||||
path: ./install/debug
|
||||
|
||||
2
.github/workflows/website-workflow.yml
vendored
@@ -61,7 +61,7 @@ jobs:
|
||||
working-directory: "./docs"
|
||||
|
||||
- name: Upload artifact to GitHub
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: dist
|
||||
path: "./docs/.vuepress/dist"
|
||||
|
||||
12
.gitignore
vendored
@@ -411,10 +411,10 @@ FodyWeavers.xsd
|
||||
# VS Code files for those working on multiple tools
|
||||
**/.vscode/*
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
# !.vscode/settings.json
|
||||
# !.vscode/tasks.json
|
||||
# !.vscode/launch.json
|
||||
# !.vscode/extensions.json
|
||||
*.code-workspace
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
@@ -434,7 +434,6 @@ FodyWeavers.xsd
|
||||
screen.png
|
||||
adb_screen.png
|
||||
tools/**/*.png
|
||||
.vscode
|
||||
enc_temp_folder/*
|
||||
|
||||
# RoguelikeRecruitmentTool 导出的 Excel 文件
|
||||
@@ -479,3 +478,6 @@ install
|
||||
|
||||
# pnpm cache
|
||||
.pnpm-store
|
||||
|
||||
# CMake user presets
|
||||
CMakeUserPresets.json
|
||||
|
||||
@@ -1,23 +1,22 @@
|
||||
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.5
|
||||
rev: v10.0.0
|
||||
hooks:
|
||||
- id: oxipng
|
||||
name: PNG Image Compression
|
||||
args: ["-q", "-o", "2", "-s", "--ng"]
|
||||
|
||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||
rev: v21.1.1
|
||||
rev: v21.1.8
|
||||
hooks:
|
||||
- id: clang-format
|
||||
name: Clang-Format (MaaCore)
|
||||
files: ^src/MaaCore/.*
|
||||
args: ["--assume-filename", ".clang-format"]
|
||||
|
||||
- repo: https://github.com/rbubley/mirrors-prettier
|
||||
rev: v3.6.2
|
||||
rev: v3.7.4
|
||||
hooks:
|
||||
- id: prettier
|
||||
name: Prettier (Config Files)
|
||||
@@ -28,17 +27,13 @@ repos:
|
||||
- id: prettier
|
||||
name: Prettier (Documentation)
|
||||
files: ^docs/.*
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 25.9.0
|
||||
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.14.10
|
||||
hooks:
|
||||
- id: black
|
||||
name: Black Formatter (Python)
|
||||
- repo: https://github.com/pycqa/isort
|
||||
rev: 6.0.1
|
||||
hooks:
|
||||
- id: isort
|
||||
name: Isort (Python)
|
||||
args: ["--profile", "black", "--filter-files"]
|
||||
- id: ruff-format
|
||||
name: Ruff format (Python)
|
||||
|
||||
- repo: https://github.com/DavidAnson/markdownlint-cli2
|
||||
rev: v0.18.1
|
||||
hooks:
|
||||
|
||||
3
.vscode/settings.json
vendored
@@ -15,5 +15,6 @@
|
||||
"files.associations": {
|
||||
"**/resource/tasks/**/*.json": "jsonc"
|
||||
},
|
||||
"C_Cpp.exclusionPolicy": "checkFilesAndFolders"
|
||||
"C_Cpp.exclusionPolicy": "checkFilesAndFolders",
|
||||
"cmake.outputLogEncoding": "UTF-8"
|
||||
}
|
||||
|
||||
@@ -115,15 +115,15 @@ static constexpr double rel_pos_x = 1.3143386840820312;
|
||||
static constexpr double rel_pos_y = 1.314337134361267;
|
||||
static constexpr double rel_pos_z = -0.3967874050140381;
|
||||
|
||||
inline auto get_retreat_screen_pos(const Level& level)
|
||||
inline auto get_retreat_screen_pos(const Level& level, bool has_multi_stages = false)
|
||||
{
|
||||
const vec3d relative_pos = { -rel_pos_x, +rel_pos_y, rel_pos_z };
|
||||
const vec3d relative_pos = { -rel_pos_x + (has_multi_stages ? level.view[0].x : 0), +rel_pos_y, rel_pos_z };
|
||||
return world_to_screen(level, relative_pos, true);
|
||||
}
|
||||
|
||||
inline auto get_skill_screen_pos(const Level& level)
|
||||
inline auto get_skill_screen_pos(const Level& level, bool has_multi_stages = false)
|
||||
{
|
||||
const vec3d relative_pos = { +rel_pos_x, -rel_pos_y, rel_pos_z };
|
||||
const vec3d relative_pos = { +rel_pos_x + (has_multi_stages ? level.view[0].x : 0), -rel_pos_y, rel_pos_z };
|
||||
return world_to_screen(level, relative_pos, true);
|
||||
}
|
||||
|
||||
|
||||
418
CHANGELOG.md
@@ -1,276 +1,268 @@
|
||||
## v5.28.5
|
||||
## v6.3.2
|
||||
|
||||
### Highlights
|
||||
### 拉电线不知天地为何物 | Highlight
|
||||
|
||||
#### 继续修 BUG
|
||||
本次版本更新真的是千呼万唤始出来,也恰逢新年版本和 PC 端的发布,我们在这个版本提供了对 PC 端的初步支持,也合并了 SideStory 「辞岁行」 的数据。
|
||||
|
||||
在这个版本,我们继续修复了大量 BUG,并且优化了遇到各类错误时的调试体验。
|
||||
#### Windows 端一键长草任务配置重构
|
||||
|
||||
#### 错误处理方面
|
||||
本次更新我们对 Windows 端 「一键长草」 任务配置进行了重构,解决了一些痛点。
|
||||
|
||||
* 出错时鼠标悬浮在任务错误日志上即可查看出错时的截图,方便快速定位问题。
|
||||
* 「生成日志压缩包」 功能现在支持同时打包 `debug` 文件夹的截图,并支持分卷压缩,在 GitHub 之类有文件大小限制的地方可以传分卷包(单个分卷最大 20 MB),更加灵活方便。
|
||||
现在牛牛支持添加多个重复类型任务,并支持重命名。现在你可以通过 「一键长草」 任务左下角的加号按钮添加多个同类型任务,并可以通过拖拽任务来调整任务执行顺序,以及右键点击任务右侧的齿轮图标重命名和删除任务,这样你就可以更灵活地管理任务。
|
||||
|
||||
#### 自动战斗方面
|
||||
牛牛也新增了理智作战任务的周计划设置,可按星期数(如星期三、星期二、星期五等)设置任务是否执行。这样你就可以结合上面提到的添加任务,<u>在理智作战任务前添加另一个理智作战任务,并将其设置为仅打当期剿灭、仅在星期一运行</u>,更多用法等你探索~
|
||||
|
||||
* 自动战斗在只缺一个干员的时候,现在支持自动借缺少的干员,让自动战斗更加智能和便捷。
|
||||
* 根据 B 站官号投票动态的结果,我们优化了自动战斗界面的显示效果,布局更加合理,操作更加便捷。
|
||||
另外,在牛牛执行一键长草流程时,各个任务的勾选框会根据其运行状态以不同颜色进行区分,直观反馈任务被跳过、已完成、运行中或执行失败等状态。
|
||||
|
||||
#### 肉鸽相关修复
|
||||
注:由于牛牛现已支持 「理智作战」 周计划并可添加多个同类型任务,本次更新**移除了原有 「剿灭作战」 任务失败后自动尝试下一个已开放的备选逻辑**,如有需要请参照上方的示例添加对应任务。
|
||||
|
||||
修复了大量集成战略相关问题,包括界园肉鸽 boss 识别、通宝配置解析、不期而遇事件识别、萨米肉鸽任务链等,提升了肉鸽自动化的稳定性。
|
||||
#### PC 端初步支持
|
||||
|
||||
本次更新,牛牛已支持控制 PC 端明日方舟了~不过有以下限制:
|
||||
|
||||
* 由于 Windows 的限制,PC 端在被控制时**不可以处于最小化窗口状态**,否则游戏画面不会被渲染,也就无法被牛牛识别;
|
||||
* 由于 Win32 API 和某反作弊软件的限制,牛牛在控制 PC 端时**必须要直接控制鼠标(不能模拟点击)**,期间不建议你使用鼠标。
|
||||
|
||||
另外,由于维护人手有限,PC 端的适配可能长期处于不稳定状态,部分功能可能出现异常或暂时无法使用。
|
||||
|
||||
我们非常欢迎社区开发者协助适配并提交改进,共同完善对 PC 端的支持。
|
||||
|
||||
#### 其他方面
|
||||
|
||||
我们发现,牛牛在使用 GPU 推理时,如果 GPU 驱动过旧可能会产生兼容性问题,因此我们添加了一项检测,当发现你的 GPU 驱动超过 2 年没有更新时会给出提示,我们建议你更新驱动以获得更好的体验。
|
||||
|
||||
#### 基建会客室线索处理(v5.28.5 及以上版本)
|
||||
|
||||
* 支持会客室快捷置入线索与一键赠送重复线索功能,提升基建线索管理效率。
|
||||
* 我们继续对界园肉鸽进行适配,包括 DLC 2 的更新支持;
|
||||
* 我们优化了自动编队的识别,现在支持对作业要求的精英化、等级和模组的识别,如果发现你的干员不满足要求将会有对应提示;
|
||||
* 相应的,干员识别功能也支持显示精英化和等级了。
|
||||
|
||||
----
|
||||
|
||||
In this version, we continued to fix numerous bugs and optimized the debugging experience when encountering various types of errors.
|
||||
#### Restructuring of *Farming* Configuration for Windows
|
||||
|
||||
#### Mini-game - PV-Fireworks Committee (v5.28.2 and above)
|
||||
In this update, we have restructured the *Farming* configuration for Windows, addressing several pain points.
|
||||
|
||||
Added support for the PV-Fireworks Committee mini-game. Start from the leftmost side of the mini-game interface.
|
||||
MAA now supports adding multiple tasks of the same type and renaming them. You can add multiple tasks of the same type using the plus button at the bottom left of the *Farming* panel, adjust the execution order by dragging tasks, and rename or delete tasks by right-clicking the gear icon on the right side of each task. This allows for more flexible task management.
|
||||
|
||||
#### Error Handling
|
||||
MAA also supports weekly schedule settings for *Combat* tasks, allowing you to specify on which days of the week (e.g., Monday, Thursday) a task should run. For example, you can add another *Combat* task before your existing one and set it to only run Current Annihilation on Mondays. More usage scenarios await your exploration!
|
||||
|
||||
* When an error occurs, hovering the mouse over the task error log now displays a screenshot, allowing you to quickly locate the problem.
|
||||
* The "Generate Support Payload" feature now supports packaging screenshots of the `debug` folder simultaneously and supports multi-part compression. This allows for uploading multi-part packages (each part up to 20 MB) to platforms with file size limits, such as GitHub.
|
||||
Additionally, when MAA executes the *Farming* process, the checkboxes for each task will be color-coded to indicate their status: skipped, completed, running, or failed, providing intuitive feedback.
|
||||
|
||||
#### *EN Only* I.S. stuck issues.
|
||||
Note: Since MAA now supports weekly schedules for *Combat* tasks and allows adding multiple tasks of the same type, this update **removes the previous logic that automatically attempted the next available alternative stage after a "Current Annihilation" task failure**. If needed, please refer to the example above to add corresponding tasks.
|
||||
|
||||
* The maintainers are aware of MAA getting stuck in the formation before starting an I.S. fighting stage. We still haven't been able to 100% deduct (and reproduce) the issue. Multiple fixes have been attempted. This stable version attemps to fix by completely overwriting the current template `Quick Select`. After various discussions on the Discord support channel, it appears the template really was the issue(?). Comparing with the older template (pre Tragodia update) the position seems slightly changed (and apparently) even the clicking box hence why the issues.
|
||||
#### Preliminary PC Client Support (**[CN ONLY]**)
|
||||
|
||||
#### *Copilot*
|
||||
In this update, MAA now supports controlling the PC client of Arknights.
|
||||
|
||||
* When only one operator is missing in *Copilot*, MAA can now supports automatically borrow the missing Support Unit, making *Copilot* more intelligent and convenient.
|
||||
* Based on the results of a poll on the official Bilibili account, we optimized the layout of the *Copilot* interface, making it more intuitive and easier to use.
|
||||
However, due to limited maintenance resources, PC client adaptation may remain unstable for a long period, and some features may experience issues or be temporarily unavailable.
|
||||
|
||||
#### *Auto I.S.* Fixes
|
||||
We warmly welcome community developers to assist with adaptation and submit improvements to collectively enhance PC client support.
|
||||
|
||||
We fixed numerous issues related to *Auto I.S.*, including Boss recognition in the *Sui's Garden of Grotesqueries*, Tongbao configuration parsing, Encounter event recognition, and quest chains in the *Expeditioner's Jǫklumarkar*, improving the stability of *Auto I.S.*.
|
||||
#### Other Updates
|
||||
|
||||
#### Other Aspects
|
||||
|
||||
We found that outdated GPU drivers may cause compatibility issues when MAA performs GPU inference. Therefore, we added a detection feature that alerts you when your GPU driver has not been updated for more than 2 years and recommends updating it for a better experience.
|
||||
|
||||
#### *Infrastructure* Reception Room Clue Handling (v5.28.5 and above)
|
||||
|
||||
* Support for quick clue insertion and one-click sending of duplicate clues in the Reception Room, improving infrastructure clue management efficiency.
|
||||
* Continued adaptation for *Sui's Garden of Grotesqueries*, including support for DLC 2 updates (**[CN ONLY]**)
|
||||
* Optimized recognition in *Auto Squad*, which now supports identifying elite, level, and module requirements. If your operators do not meet the requirements, you will receive corresponding prompts.
|
||||
* The operator recognition feature now also supports displaying elite and level information.
|
||||
|
||||
----
|
||||
|
||||
以下是详细内容:
|
||||
|
||||
## v5.28.0
|
||||
## v6.3.2
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 任务错误日志鼠标悬浮可以查看出错时截图 @ABA2396
|
||||
* 自动战斗支持切换技能用法使用坐标 @status102
|
||||
* 为 GPU 加速添加超过 2 年的驱动版本检测 (#14690) @Rbqwow @status102
|
||||
* 睡眠休眠前增加倒计时弹窗 @ABA2396
|
||||
* 生息演算支援道具名称改为全字匹配 @ABA2396
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 改进自动借助战功能 (#11105) @Alan-Charred
|
||||
* 优化自动战斗界面显示 (#14795) @ABA2396 @HX3N @Constrat @Manicsteiner @status102
|
||||
* 日志汇报打包 debug 截图,支持分卷,修改存储路径 @ABA2396
|
||||
* 拆分多主题识别任务 (#14774) @SherkeyXD
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 部分名片无法进入线索交接 @ABA2396
|
||||
* 修复放弃通宝的后续任务逻辑 (#14840) @travellerse
|
||||
* 在未进入缩小的全局总览的时可能进错宿舍 @ABA2396
|
||||
* 修复 "入暂亭" 事件 (#14684) @Alan-Charred
|
||||
* 修复界园肉鸽第 3 层与第 5 层 boss 无法区分、第 5 层 boss 前暂停设置无效 @ABA2396
|
||||
* 修复界园树洞偶发点击到剩余烛火,导致无法进入下一个节点 (#14806) @travellerse
|
||||
* 修复通宝配置解析逻辑及左侧通宝解析失败的情况 (#14802, #14820) @travellerse
|
||||
* 修正通宝识别中的坐标 (#14829) @travellerse
|
||||
* 修复集成战略萨米主题下凹密闻板相关功能 (#14755) @Alan-Charred
|
||||
* 简化萨米肉鸽 "诡秘的预感" 相关任务链 (#14749) @Alan-Charred
|
||||
* 修正不期而遇事件名 OCR 以区分禳解的 3 个相近选项,添加不期而遇事件名 OCR 替换 (#14799, #14588) @travellerse
|
||||
* 肉鸽可能卡进剧目获取界面和收藏品界面 @Saratoga-Official
|
||||
* 肉鸽允许跳过招募组合直接开始初始招募 (#14713) @Alan-Charred
|
||||
* 保存招募券结束后等待确认招募按钮消失 (#14773) @travellerse
|
||||
* 防止生息演算重置地图视图时因截图延迟卡死 (#14721) @Alan-Charred
|
||||
* 给 open_series_list 加上失败截图机制 (#14693) @Alan-Charred
|
||||
* 投资入口识别失败 @Saratoga-Official
|
||||
* 进一步调整 WpfGui 助战选项显示布局 @Alan-Charred
|
||||
* 上调助战栏位匹配分数阈值 (#14796) @Alan-Charred
|
||||
* 单文件模式下总是传递借助战 @ABA2396
|
||||
* 自动借助战错误显示 @ABA2396
|
||||
* 干员识别包含 盟约·辅助干员 和 领主·Sharp @ABA2396
|
||||
* 干员识别复制结果到剪贴板时丢失未拥有干员 @status102
|
||||
* 关卡复核会把 8 识别成 g @Saratoga-Official
|
||||
* 通关角标识别错误 @ABA2396
|
||||
* 刷理智指定次数未完全消耗警告在剩余理智也会提示 @status102
|
||||
* 避免输出空矩阵 @ABA2396
|
||||
* RA 导航错误 @ABA2396
|
||||
* build WpfGui for ARM architecture (#14722) @Alan-Charred
|
||||
* copilot file name (#14821) @Manicsteiner
|
||||
* JP paradox @Manicsteiner
|
||||
* KR 引航任务识别 @Daydreamer114
|
||||
* KR AD navigation (#14742) @HX3N
|
||||
* ocrReplace for EN (#14740) @Alan-Charred @Saratoga-Official
|
||||
* reduce template size for QuickFormation RL @Constrat
|
||||
* Sami IS EN 3rd floor regex @Constrat
|
||||
* regex AD navigation EN @Constrat
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* 自动战斗文档添加 copilot_list, is_raid, is_paradox, loop_times 注释 @Alan-Charred
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 移除过旧的 `add_user_additional` 参数弃用提示 @status102
|
||||
* 简化 ROI 修正逻辑 @ABA2396
|
||||
* 调整 ExportOperBox 内的变量命名与结构 @ABA2396
|
||||
* 清日志时手动清除 ToolTip @ABA2396
|
||||
* std::signal 自动舍弃 abort / terminate 上方栈 @status102
|
||||
* 分卷压缩包大小改成 20 MB @ABA2396
|
||||
* 向 MaaCore 工程增加 tasks 文件以便检索 (#14731) @status102
|
||||
* 更新多模板截图工具 @SherkeyXD
|
||||
* 移除部分无需的 include @status102
|
||||
* 路径迁移 @status102
|
||||
* 修复 UI 细节 @hguandl
|
||||
* 干员识别按照 稀有度->精英化->等级->潜能->Id 排序 @ABA2396
|
||||
* 优化识别工具中列表小于 5 时的显示效果 @ABA2396
|
||||
* optimize templates @Constrat
|
||||
* JP ocr edits (#14748) @Manicsteiner
|
||||
* KR tweak SupportUnitUsage translation @HX3N
|
||||
* KR @hguandl
|
||||
* SSS#8 for global (#14803) @Manicsteiner
|
||||
|
||||
----
|
||||
|
||||
## v5.28.1
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* PV-烟花筹委会 小游戏 @ABA2396 @weinibuliu
|
||||
* 刷理智失败次数达到上限时报错 @ABA2396
|
||||
* update meojson to v5.0.0 (#14849) @MistEO
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* wpf Debug 压缩包切片增加时间前缀 @status102
|
||||
* 改进 ImageCropper @weinibuliu
|
||||
* 更新肉鸽协议文档和界园肉鸽商品列表 (#14873) @DavidWang19
|
||||
* increase score for AddOperatorTradeAggressive EN @Constrat
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 基建换班卡死在无人机使用界面 @ABA2396
|
||||
* 齐聚主题会在基建同时存在红蓝两个提示的时候无法进入 @ABA2396
|
||||
* 战斗列表只有第一关会使用助战干员 @status102
|
||||
* 避免通宝插件通过任务链作用到通宝以外的地方 (#14867) @travellerse
|
||||
* 功能入口添加重试机制 (#14872) @ABA2396
|
||||
* fix regex_error(error_badrepeat) @Constrat
|
||||
* 4 星公招时间显示错误 @ABA2396
|
||||
* 刷理智自定义剿灭关卡在特定情况的绑定错误 @status102
|
||||
* 在禁用刷理智-自定义剿灭关卡后需要手动切换任务以刷新列表中显示的剿灭关卡, 尽管不影响实际运行 @status102
|
||||
* 会客室任务失败重试时尝试关闭赠送线索界面 @ABA2396
|
||||
* 肉鸽开局种子无法通过 Wpf 设置两位数难度 @status102
|
||||
* 小工具-公招识别 3~5 星选择时间无法修改 @status102
|
||||
* 小工具-干员识别 开始识别按钮启用状态绑定失效 @status102
|
||||
* 自动公招任务 3~5 星确认时间在修改后未能刷新 UI @status102
|
||||
* EN AveMujica terminal new template @Constrat
|
||||
* EN IS tentative fix increasing roi for encounter and more replace regex @Constrat
|
||||
* English text overflow on long strings in middle column @Constrat
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* issue 模板修改 25 MB 压缩包上传提示 (#14850) @Rbqwow
|
||||
* 删除一些过时内容 (#15700) @JasonHuang79
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 遗漏的 MaaCore.pdb 和 MaaUtils/pdb
|
||||
* 整理截图 @ABA2396
|
||||
* 调整 StartToVisit 阈值 @ABA2396
|
||||
* remove and sort usings (#14877) @SherkeyXD
|
||||
* 增加 id 格式验证 @ABA2396
|
||||
* 明确周计划和定时更新使用游戏时间而非现实时间 @ABA2396
|
||||
* 移除老主线导航逻辑 (#15644) @SherkeyXD
|
||||
* 繁中服「夢鄉」主題 (#15699) @momomochi987
|
||||
* Yostar servers SSS#9 and ShamareThumbnail (#15732) @Manicsteiner @Constrat
|
||||
|
||||
----
|
||||
|
||||
## v5.28.2
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 概率无法进入小游戏第八关之后的关卡 @weinibuliu
|
||||
|
||||
----
|
||||
|
||||
## v5.28.3
|
||||
## v6.3.1
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 支持 PV 小游戏从当前关卡开始 @ABA2396
|
||||
* PV 小游戏 macOS 支持 @hguandl
|
||||
* OperNameAnalyzer 支持左对齐检测 (#15682) @ABA2396
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 优化 PV 小游戏识别范围与部分复杂背景关卡的识别 @ABA2396
|
||||
* 优化卫戍协议流程 @ABA2396
|
||||
* 调整小游戏描述 @ABA2396
|
||||
* 配置迁移自动为启用备选且首个关卡为剿灭模式的刷理智任务自动添加额外的刷理智任务 @status102
|
||||
* 忽略干员属性要求 不再允许跳过精英化要求 (#15697) @status102 @Constrat @HX3N
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 修复宿舍确认按钮识别(yj 的小杯 UI) @ABA2396
|
||||
* 修复 PV 小游戏进入关卡时遇到网络连接会少选烟花样片 @ABA2396
|
||||
* 修复 MaaCore 异常日志基址解析 @status102
|
||||
* 修复 Windows 平台的 pdb 文件压缩 @status102
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* Debug 截图默认保存最近 10 张 @ABA2396
|
||||
* 繁中服「眾生行記」活動導航 @momomochi987
|
||||
* 繁中服「爭鋒頻道:青草城」小遊戲 @momomochi987
|
||||
|
||||
----
|
||||
|
||||
## v5.28.4
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 关卡选择验证输入,非当期活动的关卡名会当做未开放关卡 @ABA2396
|
||||
* 當左上角進行中活動因太多被折疊時,增加展開領取的狀態判斷 (#14957) @momomochi987
|
||||
* UR 活动导航 @ABA2396
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 优化小游戏任务选择逻辑及提示 (#14951) @Daydreamer114 @ABA2396
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 繁中服周年月卡領取及贈送單抽的處理錯誤 (#14953) @momomochi987
|
||||
* 卫戍协议因网络问题卡在结算界面 @Saratoga-Official
|
||||
* 代理失败后等待动画结束后再点击任务失败 @ABA2396
|
||||
* 自定义基建排班使用无人机加速未进驻干员的设施导致卡死 @ABA2396
|
||||
* 干员识别异常(荒芜拉普兰德) (#14934) @dikxingmengya
|
||||
* issue-checker.yml 中 MacGui 正则不包含 MacGui @Rbqwow
|
||||
* 预提交模板优化配置 @Constrat
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 調整繁中服傀影肉鴿能夠選擇的難度 (#14952) @momomochi987
|
||||
|
||||
----
|
||||
|
||||
## v5.28.5
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 支持会客室快捷置入线索与一键赠送重复线索 (#14966) @ABA2396
|
||||
* 通知渠道支持钉钉 (#14884) @Kagura-Nanaa
|
||||
* 下载日志独立展示,更新设置中新增下载进度提示 @ABA2396
|
||||
* LogDebug 宏支持 DEBUG.txt 特性 (#14977) @status102
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 优化会客室线索识别范围 @ABA2396
|
||||
* 优化绑定 @ABA2396
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 主线/故事集/SideStory 禁用循环次数 @ABA2396
|
||||
* 未勾选自动下载时仍提示下载 @ABA2396
|
||||
* JP AveMujica event ocr @Manicsteiner
|
||||
* EN IS StageRefresh @Constrat
|
||||
* i'm kinda stupid @Constrat
|
||||
* update refresh node EN IS5 @Constrat
|
||||
* EN IS fix trader store templates AGAIN @Constrat
|
||||
* EN Yu OCR for Yutenji @Constrat
|
||||
* 自动编队选择技能时点击到技能描述/技能范围 @status102
|
||||
* 自动编队期间如有干员属性要求被忽略, 则禁用自动化投票 @status102
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* 自动战斗编队注释 @ABA2396
|
||||
* 更新基建会客室线索相关文档 @ABA2396
|
||||
* 更新 api 链接 @ABA2396
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 模板优化 @Constrat
|
||||
* YostarKR CharsNameOcrReplace remove space @ABA2396
|
||||
* UserAdditional 非 json 格式返回原始字符串 @status102
|
||||
* 使用屏幕宽高常量代替硬编码 @status102
|
||||
* 屏幕外的干员跳过技能就绪检测 @status102
|
||||
* 調整繁中服界園肉鴿 OCR (2/?) @momomochi987
|
||||
* color [INF] for smoke testing as well @Constrat
|
||||
* 调整单字干员正则 @ABA2396
|
||||
* 調整繁中服界園肉鴿 OCR (#15678) @momomochi987
|
||||
* 删除干员名开头/末尾的_<> @ABA2396
|
||||
* 添加响石、赤刃明霄陈基建技能加成 (#15674) @drway
|
||||
* 保全派驻自动战斗使用二值化结果识别干员名 @ABA2396
|
||||
* 删除无用的正则替换 @ABA2396
|
||||
* 自动战斗使用二值化结果识别干员名 @ABA2396
|
||||
* 仅在 VS Code 中添加辅助项目 (#15669) @status102
|
||||
* JP OperNameAnalyzer specialParams @Manicsteiner
|
||||
|
||||
## v6.3.0
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 支持 PC 端明日方舟 (#15407) @MistEO @ABA2396
|
||||
* SideStory「辞岁行」导航及地图数据更新 @SherkeyXD @status102
|
||||
* 界园肉鸽 DLC 2 分队更新、通宝数据更新、可选难度提高至 18、支持指定种子开局 (#15588) @SherkeyXD @status102 @HX3N @Manicsteiner
|
||||
* 繁中服界園肉鴿初步適配 (#15605) @momomochi987
|
||||
* 干员识别支持显示精英化、等级与潜能 @ABA2396
|
||||
* 自动编队识别精英化、等级及模组要求 (#15161) @status102 @Manicsteiner @Constrat @HX3N
|
||||
* 芯片本支持显示库存数量 @ABA2396
|
||||
* 新增注入弹窗不再提醒的勾选框,勾选后使用软件渲染 @ABA2396
|
||||
* WpfGui 清空缓存按钮 (#15582) @soundofautumn @Constrat @HX3N @momomochi987
|
||||
* 自定干员名称无效时的错误处理及本地化支持 (#15556) @yali-hzy @HX3N
|
||||
* 设置指引增加右键重命名/删除提示 @ABA2396
|
||||
* 新 Config 加载时移除旧 Config 中不存在的配置 @status102
|
||||
* 日志中额外记录 TaskChain 与 taskId ~~免得有人把 Fight 改成开始唤醒~~ @ABA2396
|
||||
* YostarEN/JP/KR Dreamland、JieGarden 和 AveMujica 主题支持 @Constrat @Manicsteiner @HX3N
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* Wpf 一键长草任务配置重构,支持添加多个同类型任务、重命名和周计划设置 (#15385) @status102 @ABA2396 @momomochi987 @HX3N
|
||||
* 刷理智过期关卡逻辑/样式优化 @status102 @ABA2396
|
||||
* 关卡候选列表刷新及关卡选择下拉列表刷新 (#15562) @status102 @HX3N @Constrat @Manicsteiner @momomochi987
|
||||
* 优化自动战斗界面布局 (#15512) @yali-hzy
|
||||
* 优化任务设置按钮悬浮提示 @ABA2396
|
||||
* 优化设置右键菜单布局 @ABA2396
|
||||
* 优化干员识别、仓库识别显示 @ABA2396
|
||||
* 配置迁移检查优化与简化 @status102 @ABA2396
|
||||
* 开始唤醒任务未设置账号切换时,禁用手动切换按钮 @status102
|
||||
* 自动战斗掉线重连、自动肉鸽在战斗结束前延迟「停止」动作添加多任务共用提示 @ABA2396 @status102
|
||||
* 剿灭卡使用到上限时不报错停止 @ABA2396
|
||||
* 剿灭关卡通过 ends_with 判断 @ABA2396
|
||||
* 刷理智任务高级设置 UI 调整选项顺序和显示优化 @status102
|
||||
* 自动战斗自动编队检查`干员等级&精英化`及`技能等级`拆分 @status102
|
||||
* 自动战斗不支持技能重置说明中,干员名遵循干员名语言设置 @status102
|
||||
* 自动战斗作业列表使用相对路径代替绝对路径 @status102
|
||||
* TaskQueue 重命名与移除时显示任务序号 @status102
|
||||
* TaskQueue 任务开始&完成显示修改后的任务名 @status102
|
||||
* 追加自定干员允许不切换技能 @status102
|
||||
* 存在 crash.log 时,Wpf 尝试获取 dumps 文件 (#15432) @status102
|
||||
* 移除过时的参数兼容 @status102
|
||||
* 消除部分编译警告 (#15578) @yali-hzy
|
||||
* NumberOcrReplace 新增规则 (#14186) @Manicsteiner
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* 配置迁移相关问题修复:迁移后切换回原配置、删除配置时未删除 .new、多配置用户删除 Default 配置时迁移异常、剩余理智启用状态和关卡选择迁移问题 @status102 @ABA2396
|
||||
* 刷理智任务相关修复:切换刷理智任务时读取错误关卡列表、运行时不允许添加关卡 @status102
|
||||
* 自动编队相关修复:识别技能等级匹配失败、干员技能描述过长时点击位置错误、禁用快速选中以修复外服干员技能描述过长的错误选中、干员等级跨精英化时判断出错、干员等级不足 i18n 未启用、干员组干员未解析精英化及等级属性、先兼容旧作业中不合理的技能选择 @status102
|
||||
* 公招加速券识别问题修复 @status102
|
||||
* LoadApiCache 路径拼接错误 @ABA2396
|
||||
* 主线导航及外服主线导航问题修复 @SherkeyXD @ABA2396
|
||||
* 在赠送线索时弹出上次线索交流结束的提示时无法返回 @ABA2396
|
||||
* 粘贴作业集代码后下方的链接未重置为作业站链接 @ABA2396
|
||||
* 修复移动已打开设置的任务后,当前的设置面板无法继续修改的问题 @ABA2396
|
||||
* 萨米肉鸽刷开局功能异常 @ABA2396
|
||||
* 肉鸽烧水分队切换界面后错误重置 @status102
|
||||
* 保证通宝优先级未定义时不会加载崩溃 fallback 到默认值 @SherkeyXD
|
||||
* SEH 错误终止运行 @status102
|
||||
* 启动 MAA 时若没有任何任务,则追加一套默认任务 @status102
|
||||
* 启动客户端绑定失效问题修复 @status102
|
||||
* 关卡列表显示不刷新 @status102
|
||||
* 选中完成后动作时添加新任务未能隐藏完成后动作设置 UI @status102
|
||||
* 刷理智使用源石 CheckBox 勾选后不生效 @status102
|
||||
* 退出 MAA 时重置变量不再刷新 UI @status102
|
||||
* 初始化 StartEnabled 属性为 true (#15596) @yali-hzy
|
||||
* 自动战斗切换活动类型未清空解析缓存 @status102
|
||||
* 修复任务出错日志可能晚于任务完成日志显示的问题 @ABA2396
|
||||
* 开始干员识别前重置潜能状态 @ABA2396
|
||||
* 修复生息演算商店无法正常购买皮肤的问题 (#15585) @drway
|
||||
* 手动输入关卡名时,不移除过期关卡 @status102
|
||||
* 过期关卡重置模式补充自动迁移 @status102
|
||||
* OR 关卡掉落界面关卡名识别问题 @ABA2396
|
||||
* EX 关符合时 1 被识别为 | @ABA2396
|
||||
* NumberOcrReplace 移除`|`和`/` (#15625) @status102
|
||||
* 移除单字干员 ocr 替换中的 +*?避免误判 @Saratoga-Official
|
||||
* 涤火杰西卡识别 @ABA2396
|
||||
* 日服酒神、見字祠识别 @Saratoga-Official
|
||||
* YostarKR Roguelike@ChooseOperConfirm @HX3N
|
||||
* YostarKR use ' ' in ocrReplace to preserve '\n' for InfrastTrainingTask @HX3N
|
||||
* EN Greyy Alter regex @Constrat
|
||||
* EN IS6 encounter @Constrat
|
||||
* EN IS TradeInvest templates text font change @Constrat
|
||||
* EN IS ShoppingConfirm text font change @Constrat
|
||||
* EN refresh node template @Constrat
|
||||
* JP AT minigame confirm (#15427) @Manicsteiner
|
||||
* JP JieGardenStrategyChange @Saratoga-Official
|
||||
* add MaaWin32ControlUnit to nightly build (#15447) @Manicsteiner
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* 集成文档统一格式,同时显示 field-group 和示例代码 (#15409) @ABA2396 @Manicsteiner @Constrat @momomochi987
|
||||
* 繁中文件大更新 (#15480) @momomochi987
|
||||
* 修正开发文档中的格式错误及笔误 (#15516) @yali-hzy
|
||||
* 自动战斗作业文档干员技能值范围补上 0 @status102
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* 作业集 Parse 后不删除历史记录,避免错过作业抛出的错误 @ABA2396
|
||||
* 辞岁行地图 2026-02-10 Map 更新 @status102
|
||||
* 繁中服不上报企鹅物流 @ABA2396
|
||||
* devcontainer 适配 CMakePresets.json (#15606) @lucienshawls
|
||||
* 移除不再使用的 VirtualizingWrapPanel 与 NoAutomationDataGrid @ABA2396
|
||||
* 调整清理图片缓存样式,增加提示 @ABA2396
|
||||
* 补全缺少的翻译 @ABA2396
|
||||
* 优化 emoji @ABA2396
|
||||
* 自动战斗-自动编队干员不支持技能说明国际化 (#15609) @status102 @Constrat @HX3N @Manicsteiner
|
||||
* 自动战斗编队技能等级不足 i18n,CN 使用理智药及碎石文案 (#15435) @status102 @HX3N
|
||||
* 增加借助战 OF-1 在后续刷理智选择`当前/上次`导致禁用时的输出 (#15478) @status102 @Manicsteiner @Constrat @HX3N @ABA2396 @momomochi987
|
||||
* remove regex from `text` field in EN Sui IS @Constrat
|
||||
* KR AnnouncementNotFinishedConfirm、ReceptionOptionsRequireInfrast、CreditFightWhenOF-1Warning、MiniGame ConversationRoom and HoneyFruit 支持 @HX3N
|
||||
* EN minigame honeyfruit、IS6 tip 支持 @Constrat
|
||||
* JP MiniGame HoneyFruit 支持 @Manicsteiner
|
||||
* YostarJP ocr fix for roguelike @Manicsteiner
|
||||
* manual data for txwy @Constrat
|
||||
* optimize templates @Constrat
|
||||
* fix casing typo and related context (#15656) @ittuann @Daydreamer114
|
||||
|
||||
@@ -35,6 +35,13 @@ if(BUILD_WPF_GUI)
|
||||
include_external_msproject(MaaWpfGui ${PROJECT_SOURCE_DIR}/src/MaaWpfGui/MaaWpfGui.csproj)
|
||||
|
||||
add_dependencies(MaaWpfGui MaaCore)
|
||||
if(DEFINED ENV{VSCODE_PID})
|
||||
add_custom_target(run-MaaWpfGui
|
||||
COMMAND "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/MAA.exe"
|
||||
DEPENDS MaaWpfGui
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(INSTALL_PYTHON)
|
||||
|
||||
348
CMakePresets.json
Normal file
@@ -0,0 +1,348 @@
|
||||
{
|
||||
"version": 10,
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 23,
|
||||
"patch": 0
|
||||
},
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "windows-base",
|
||||
"hidden": true,
|
||||
"generator": "Visual Studio 18 2026",
|
||||
"binaryDir": "${sourceDir}/build",
|
||||
"$comment": [
|
||||
"Base for Windows presets; Visual Studio is multi-config (Debug/Release/RelWithDebInfo in same build dir)",
|
||||
"see https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2018%202026.html"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"BUILD_WPF_GUI": "ON",
|
||||
"BUILD_DEBUG_DEMO": "ON",
|
||||
"INSTALL_RESOURCE": "OFF",
|
||||
"INSTALL_PYTHON": "OFF"
|
||||
},
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux-base",
|
||||
"hidden": true,
|
||||
"generator": "Ninja Multi-Config",
|
||||
"binaryDir": "${sourceDir}/build",
|
||||
"$comment": [
|
||||
"Base for Linux presets; Ninja is multi-config (Debug/Release/RelWithDebInfo in same build dir)",
|
||||
"see https://cmake.org/cmake/help/latest/generator/Ninja%20Multi-Config.html",
|
||||
"clangd uses compile_commands.json to provide code completion and navigation",
|
||||
"so CMAKE_EXPORT_COMPILE_COMMANDS is set to ON",
|
||||
"see https://clangd.llvm.org/installation.html"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
||||
},
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos-base",
|
||||
"hidden": true,
|
||||
"generator": "Ninja Multi-Config",
|
||||
"binaryDir": "${sourceDir}/build",
|
||||
"$comment": [
|
||||
"Base for macOS presets; Ninja is multi-config (Debug/Release/RelWithDebInfo in same build dir)",
|
||||
"see https://cmake.org/cmake/help/latest/generator/Ninja%20Multi-Config.html",
|
||||
"clangd uses compile_commands.json to provide code completion and navigation",
|
||||
"so CMAKE_EXPORT_COMPILE_COMMANDS is set to ON",
|
||||
"see https://clangd.llvm.org/installation.html"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
||||
},
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows-x64",
|
||||
"inherits": "windows-base",
|
||||
"displayName": "Windows x64",
|
||||
"architecture": "x64",
|
||||
"cacheVariables": {
|
||||
"MAADEPS_TRIPLET": "maa-x64-windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows-arm64",
|
||||
"inherits": "windows-base",
|
||||
"displayName": "Windows arm64",
|
||||
"architecture": "ARM64",
|
||||
"cacheVariables": {
|
||||
"MAADEPS_TRIPLET": "maa-arm64-windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux-x64",
|
||||
"inherits": "linux-base",
|
||||
"displayName": "Linux x64",
|
||||
"toolchainFile": "src/MaaUtils/MaaDeps/cmake/maa-x64-linux-toolchain.cmake",
|
||||
"cacheVariables": {
|
||||
"MAADEPS_TRIPLET": "maa-x64-linux"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux-arm64",
|
||||
"inherits": "linux-base",
|
||||
"displayName": "Linux arm64",
|
||||
"toolchainFile": "src/MaaUtils/MaaDeps/cmake/maa-arm64-linux-toolchain.cmake",
|
||||
"cacheVariables": {
|
||||
"MAADEPS_TRIPLET": "maa-arm64-linux"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos-arm64",
|
||||
"inherits": "macos-base",
|
||||
"displayName": "macOS arm64",
|
||||
"cacheVariables": {
|
||||
"CMAKE_OSX_ARCHITECTURES": "arm64"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos-x64",
|
||||
"inherits": "macos-base",
|
||||
"displayName": "macOS x64",
|
||||
"cacheVariables": {
|
||||
"CMAKE_OSX_ARCHITECTURES": "x86_64"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "publish-base",
|
||||
"$comment":[
|
||||
"All the name contains 'publish' are used for github actions",
|
||||
"see .github/workflows/ci.yml"
|
||||
],
|
||||
"hidden": true,
|
||||
"installDir": "install",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
|
||||
"INSTALL_RESOURCE": "ON",
|
||||
"INSTALL_PYTHON": "ON",
|
||||
"BUILD_WPF_GUI": "OFF",
|
||||
"BUILD_DEBUG_DEMO": "OFF"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows-publish-x64",
|
||||
"inherits": ["publish-base", "windows-x64"],
|
||||
"$comment": [
|
||||
"github actions only support Visual Studio 17 2022",
|
||||
"see https://github.com/actions/runner-images/issues/13291"
|
||||
],
|
||||
"generator": "Visual Studio 17 2022",
|
||||
"displayName": "Windows x64 Publish"
|
||||
},
|
||||
{
|
||||
"name": "windows-publish-arm64",
|
||||
"inherits": ["publish-base", "windows-arm64"],
|
||||
"$comment": [
|
||||
"github actions only support Visual Studio 17 2022",
|
||||
"see https://github.com/actions/runner-images/issues/13291"
|
||||
],
|
||||
"generator": "Visual Studio 17 2022",
|
||||
"displayName": "Windows arm64 Publish"
|
||||
},
|
||||
{
|
||||
"name": "linux-publish-x64",
|
||||
"inherits": ["publish-base", "linux-x64"],
|
||||
"displayName": "Linux x64 Publish"
|
||||
},
|
||||
{
|
||||
"name": "linux-publish-arm64",
|
||||
"inherits": ["publish-base", "linux-arm64"],
|
||||
"displayName": "Linux arm64 Publish"
|
||||
},
|
||||
{
|
||||
"name": "macos-publish-x64",
|
||||
"inherits": ["publish-base", "macos-x64"],
|
||||
"displayName": "macOS x64 Publish"
|
||||
},
|
||||
{
|
||||
"name": "macos-publish-arm64",
|
||||
"inherits": ["publish-base", "macos-arm64"],
|
||||
"displayName": "macOS arm64 Publish"
|
||||
},
|
||||
{
|
||||
"name": "smoke-test",
|
||||
"$comment":[
|
||||
"this preset is used for smoke testing",
|
||||
"see .github/workflows/smoke-testing.yml"
|
||||
],
|
||||
"inherits": "macos-arm64",
|
||||
"displayName": "macOS arm64 Smoke Test",
|
||||
"installDir": "install",
|
||||
"cacheVariables": {
|
||||
"BUILD_SMOKE_TEST": "ON",
|
||||
"INSTALL_RESOURCE": "ON",
|
||||
"WITH_HASH_VERSION": "ON"
|
||||
}
|
||||
}
|
||||
],
|
||||
"buildPresets": [
|
||||
{
|
||||
"name": "windows-x64-Debug",
|
||||
"displayName": "Build Windows x64 Debug",
|
||||
"configurePreset": "windows-x64",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "windows-x64-Release",
|
||||
"displayName": "Build Windows x64 Release",
|
||||
"configurePreset": "windows-x64",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "windows-x64-RelWithDebInfo",
|
||||
"displayName": "Build Windows x64 RelWithDebInfo",
|
||||
"configurePreset": "windows-x64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "windows-arm64-Debug",
|
||||
"displayName": "Build Windows arm64 Debug",
|
||||
"configurePreset": "windows-arm64",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "windows-arm64-Release",
|
||||
"displayName": "Build Windows arm64 Release",
|
||||
"configurePreset": "windows-arm64",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "windows-arm64-RelWithDebInfo",
|
||||
"displayName": "Build Windows arm64 RelWithDebInfo",
|
||||
"configurePreset": "windows-arm64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "linux-x64-Debug",
|
||||
"displayName": "Build Linux x64 Debug",
|
||||
"configurePreset": "linux-x64",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "linux-x64-Release",
|
||||
"displayName": "Build Linux x64 Release",
|
||||
"configurePreset": "linux-x64",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "linux-x64-RelWithDebInfo",
|
||||
"displayName": "Build Linux x64 RelWithDebInfo",
|
||||
"configurePreset": "linux-x64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "linux-arm64-Debug",
|
||||
"displayName": "Build Linux arm64 Debug",
|
||||
"configurePreset": "linux-arm64",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "linux-arm64-Release",
|
||||
"displayName": "Build Linux arm64 Release",
|
||||
"configurePreset": "linux-arm64",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "linux-arm64-RelWithDebInfo",
|
||||
"displayName": "Build Linux arm64 RelWithDebInfo",
|
||||
"configurePreset": "linux-arm64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "macos-x64-Debug",
|
||||
"displayName": "Build macOS x64 Debug",
|
||||
"configurePreset": "macos-x64",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "macos-x64-Release",
|
||||
"displayName": "Build macOS x64 Release",
|
||||
"configurePreset": "macos-x64",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "macos-x64-RelWithDebInfo",
|
||||
"displayName": "Build macOS x64 RelWithDebInfo",
|
||||
"configurePreset": "macos-x64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "macos-arm64-Debug",
|
||||
"displayName": "Build macOS arm64 Debug",
|
||||
"configurePreset": "macos-arm64",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "macos-arm64-Release",
|
||||
"displayName": "Build macOS arm64 Release",
|
||||
"configurePreset": "macos-arm64",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "macos-arm64-RelWithDebInfo",
|
||||
"displayName": "Build macOS arm64 RelWithDebInfo",
|
||||
"configurePreset": "macos-arm64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "windows-publish-x64",
|
||||
"displayName": "Build Windows x64 Publish",
|
||||
"configurePreset": "windows-publish-x64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "windows-publish-arm64",
|
||||
"displayName": "Build Windows arm64 Publish",
|
||||
"configurePreset": "windows-publish-arm64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "linux-publish-x64",
|
||||
"displayName": "Build Linux x64 Publish",
|
||||
"configurePreset": "linux-publish-x64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "linux-publish-arm64",
|
||||
"displayName": "Build Linux arm64 Publish",
|
||||
"configurePreset": "linux-publish-arm64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "macos-publish-x64",
|
||||
"displayName": "Build macOS x64 Publish",
|
||||
"configurePreset": "macos-publish-x64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "macos-publish-arm64",
|
||||
"displayName": "Build macOS arm64 Publish",
|
||||
"configurePreset": "macos-publish-arm64",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "smoke-test",
|
||||
"displayName": "Build macOS arm64 Smoke Test",
|
||||
"configurePreset": "smoke-test",
|
||||
"configuration": "Debug"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -46,7 +46,7 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
## 亮点功能
|
||||
|
||||
- 刷理智,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/),[一图流](https://ark.yituliu.cn/)
|
||||
- 理智作战,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/),[一图流](https://ark.yituliu.cn/)
|
||||
- 智能基建换班,自动计算干员效率,单设施内最优解;同时也支持 [自定义排班](https://docs.maa.plus/zh-cn/protocol/base-scheduling-schema.html)
|
||||
- 自动公招,可选使用加急许可,一次全部刷完!公招数据自动上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit),[一图流](https://ark.yituliu.cn/survey/maarecruitdata)
|
||||
- 支持手动识别公招界面,方便对高星公招做出选择 ~~(你的这个高资回费出的是推王呢还是推王呢)~~
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
## 受支持的版本 / Supported Versions
|
||||
|
||||
我们仅对 v5 的最新稳定版提供安全支持,如有安全问题,我们将会尽可能快地发布新的稳定版解决。
|
||||
我们仅对 v6 的最新稳定版提供安全支持,如有安全问题,我们将会尽可能快地发布新的稳定版解决。
|
||||
|
||||
内测版、公测版仅供测试,我们不会对其提供安全支持。
|
||||
|
||||
We only provide security support for the latest Stable Release versions of v5. If there are security issues, we will release a new stable version as soon as possible to solve them.
|
||||
We only provide security support for the latest Stable Release versions of v6. If there are security issues, we will release a new stable version as soon as possible to solve them.
|
||||
|
||||
The Nightly Release version and the Beta Release version are for testing only, and we will not provide security support for them.
|
||||
|
||||
|
||||
@@ -1,33 +1,81 @@
|
||||
if (BUILD_XCFRAMEWORK)
|
||||
add_custom_command(OUTPUT MaaCore.xcframework
|
||||
COMMAND rm -rf MaaCore.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library libMaaCore.dylib -headers ${PROJECT_SOURCE_DIR}/include -output MaaCore.xcframework
|
||||
set(XCFRAMEWORK_DIR "${CMAKE_BINARY_DIR}/xcframework")
|
||||
file(MAKE_DIRECTORY ${XCFRAMEWORK_DIR})
|
||||
|
||||
# Macro to find a unique library file
|
||||
macro(find_unique_library lib_name glob_pattern output_var)
|
||||
file(GLOB _libs CONFIGURE_DEPENDS "${MAADEPS_DIR}/runtime/${MAADEPS_TRIPLET}/${glob_pattern}")
|
||||
if(_libs)
|
||||
list(LENGTH _libs _cnt)
|
||||
if(_cnt EQUAL 1)
|
||||
list(GET _libs 0 ${output_var})
|
||||
message(STATUS "Found ${lib_name}: ${${output_var}}")
|
||||
else()
|
||||
message(FATAL_ERROR "Ambiguous ${lib_name} dylibs: ${_libs}")
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "${lib_name} library not found in ${MAADEPS_DIR}/runtime/${MAADEPS_TRIPLET}/")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
add_custom_command(OUTPUT ${XCFRAMEWORK_DIR}/MaaCore.xcframework
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${XCFRAMEWORK_DIR}/MaaCore.xcframework"
|
||||
COMMAND xcodebuild -create-xcframework
|
||||
-library $<TARGET_FILE:MaaCore>
|
||||
-headers ${PROJECT_SOURCE_DIR}/include
|
||||
-output MaaCore.xcframework
|
||||
DEPENDS MaaCore
|
||||
WORKING_DIRECTORY ${XCFRAMEWORK_DIR}
|
||||
COMMENT "Generating MaaCore.xcframework"
|
||||
)
|
||||
|
||||
add_custom_command(OUTPUT MaaUtils.xcframework
|
||||
COMMAND rm -rf MaaUtils.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library libMaaUtils.dylib -output MaaUtils.xcframework
|
||||
add_custom_command(OUTPUT ${XCFRAMEWORK_DIR}/MaaUtils.xcframework
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${XCFRAMEWORK_DIR}/MaaUtils.xcframework"
|
||||
COMMAND xcodebuild -create-xcframework
|
||||
-library $<TARGET_FILE:MaaUtils>
|
||||
-output MaaUtils.xcframework
|
||||
DEPENDS MaaUtils
|
||||
WORKING_DIRECTORY ${XCFRAMEWORK_DIR}
|
||||
COMMENT "Generating MaaUtils.xcframework"
|
||||
)
|
||||
|
||||
add_custom_command(OUTPUT OpenCV.xcframework
|
||||
COMMAND rm -rf OpenCV.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${MAADEPS_DIR}/runtime/${MAADEPS_TRIPLET}/libopencv_world4.408.dylib" -output OpenCV.xcframework
|
||||
find_unique_library("OpenCV" "libopencv_world*.dylib" OPENCV_LIB)
|
||||
add_custom_command(OUTPUT ${XCFRAMEWORK_DIR}/OpenCV.xcframework
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${XCFRAMEWORK_DIR}/OpenCV.xcframework"
|
||||
COMMAND xcodebuild -create-xcframework
|
||||
-library "${OPENCV_LIB}"
|
||||
-output OpenCV.xcframework
|
||||
WORKING_DIRECTORY ${XCFRAMEWORK_DIR}
|
||||
COMMENT "Generating OpenCV.xcframework"
|
||||
)
|
||||
|
||||
add_custom_command(OUTPUT ONNXRuntime.xcframework
|
||||
COMMAND rm -rf ONNXRuntime.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${MAADEPS_DIR}/runtime/${MAADEPS_TRIPLET}/libonnxruntime.1.18.0.dylib" -output ONNXRuntime.xcframework
|
||||
find_unique_library("ONNXRuntime" "libonnxruntime*.dylib" ONNXRUNTIME_LIB)
|
||||
add_custom_command(OUTPUT ${XCFRAMEWORK_DIR}/ONNXRuntime.xcframework
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${XCFRAMEWORK_DIR}/ONNXRuntime.xcframework"
|
||||
COMMAND xcodebuild -create-xcframework
|
||||
-library "${ONNXRUNTIME_LIB}"
|
||||
-output ONNXRuntime.xcframework
|
||||
WORKING_DIRECTORY ${XCFRAMEWORK_DIR}
|
||||
COMMENT "Generating ONNXRuntime.xcframework"
|
||||
)
|
||||
|
||||
add_custom_command(OUTPUT fastdeploy_ppocr.xcframework
|
||||
COMMAND rm -rf fastdeploy_ppocr.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${MAADEPS_DIR}/runtime/${MAADEPS_TRIPLET}/libfastdeploy_ppocr.dylib" -output fastdeploy_ppocr.xcframework
|
||||
add_custom_command(OUTPUT ${XCFRAMEWORK_DIR}/fastdeploy_ppocr.xcframework
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${XCFRAMEWORK_DIR}/fastdeploy_ppocr.xcframework"
|
||||
COMMAND xcodebuild -create-xcframework
|
||||
-library "${MAADEPS_DIR}/runtime/${MAADEPS_TRIPLET}/libfastdeploy_ppocr.dylib"
|
||||
-output fastdeploy_ppocr.xcframework
|
||||
WORKING_DIRECTORY ${XCFRAMEWORK_DIR}
|
||||
COMMENT "Generating fastdeploy_ppocr.xcframework"
|
||||
)
|
||||
|
||||
add_custom_target(MaaXCFramework ALL
|
||||
DEPENDS MaaCore MaaCore.xcframework MaaUtils MaaUtils.xcframework OpenCV.xcframework ONNXRuntime.xcframework fastdeploy_ppocr.xcframework
|
||||
DEPENDS
|
||||
MaaCore
|
||||
${XCFRAMEWORK_DIR}/MaaCore.xcframework
|
||||
MaaUtils
|
||||
${XCFRAMEWORK_DIR}/MaaUtils.xcframework
|
||||
${XCFRAMEWORK_DIR}/OpenCV.xcframework
|
||||
${XCFRAMEWORK_DIR}/ONNXRuntime.xcframework
|
||||
${XCFRAMEWORK_DIR}/fastdeploy_ppocr.xcframework
|
||||
)
|
||||
endif (BUILD_XCFRAMEWORK)
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ function(create_resource_link TARGET_NAME OUTPUT_DIR)
|
||||
COMMENT "Creating junction for resource directory for ${TARGET_NAME}"
|
||||
)
|
||||
else()
|
||||
# Unix/Linux/macOS 使用符号链接
|
||||
# UNIX/Linux/macOS 使用符号链接
|
||||
add_custom_command(
|
||||
TARGET ${TARGET_NAME}
|
||||
POST_BUILD
|
||||
|
||||
@@ -2,7 +2,7 @@ export default {
|
||||
provider: 'algolia' as const,
|
||||
appId: '9ARM1N4899',
|
||||
apiKey: 'f42bf1d18c786d5a46da30eccac5cb34',
|
||||
indexName: 'maa',
|
||||
indexName: 'MaaAssistantArknights',
|
||||
locales: {
|
||||
'/zh-cn/': {
|
||||
placeholder: '搜索',
|
||||
|
||||
|
Before Width: | Height: | Size: 691 KiB After Width: | Height: | Size: 690 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 420 KiB After Width: | Height: | Size: 419 KiB |
|
Before Width: | Height: | Size: 301 KiB After Width: | Height: | Size: 301 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 643 KiB After Width: | Height: | Size: 641 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 70 KiB |
|
Before Width: | Height: | Size: 429 KiB After Width: | Height: | Size: 429 KiB |
|
Before Width: | Height: | Size: 934 KiB After Width: | Height: | Size: 931 KiB |
|
Before Width: | Height: | Size: 926 KiB After Width: | Height: | Size: 925 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 57 KiB |
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 76 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 366 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/1-dark.png
Normal file
|
After Width: | Height: | Size: 40 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/1-light.png
Normal file
|
After Width: | Height: | Size: 40 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/2-dark.png
Normal file
|
After Width: | Height: | Size: 41 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/2-light.png
Normal file
|
After Width: | Height: | Size: 41 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/3-dark.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/3-light.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/4-dark.png
Normal file
|
After Width: | Height: | Size: 60 KiB |
BIN
docs/.vuepress/public/images/zh-tw/readme/4-light.png
Normal file
|
After Width: | Height: | Size: 60 KiB |
@@ -15,7 +15,7 @@ You can [Ask DeepWiki](https://deepwiki.com/MaaAssistantArknights/MaaAssistantAr
|
||||
|
||||
## I don't know programming but just want to modify some JSON files/documents, how can I do it?
|
||||
|
||||
Welcome to the [Web-based PR Tutorial](./pr-tutorial.md) that anyone can understand (purely web-based on Github.com)
|
||||
Welcome to the [Web-based PR Tutorial](./pr-tutorial.md) that anyone can understand (purely web-based on GitHub.com)
|
||||
|
||||
## I want to make simple modifications to a few lines of code, but configuring the environment is too tedious and pure web editing is difficult to use. What should I do?
|
||||
|
||||
@@ -58,32 +58,44 @@ We've preset several different development environments for you to choose from:
|
||||
```
|
||||
|
||||
5. Configure development environment
|
||||
- Download and install `Visual Studio 2022 Community`, selecting `Desktop development with C++` and `.NET Desktop Development` during installation.
|
||||
- Download and install `CMake`
|
||||
- Download and install `Visual Studio 2026 Community`, selecting `Desktop development with C++` and `.NET Desktop Development` during installation.
|
||||
|
||||
6. Double-click `MAA.sln` to open the project in Visual Studio.
|
||||
7. Configure Visual Studio settings
|
||||
- Select `RelWithDebInfo` and `x64` in the top configuration bar (Skip for Release builds or ARM platforms)
|
||||
- Right-click `MaaWpfGui` → Properties → Debug → Enable native debugging (This enables breakpoints in C++ Core)
|
||||
6. Execute cmake project configuration
|
||||
|
||||
8. Now you're ready to happily ~~mess around~~ start developing!
|
||||
9. Commit regularly with meaningful messages during development
|
||||
If you're not familiar with git usage, you might want to create a new branch for changes instead of committing directly to `dev`:
|
||||
|
||||
```bash
|
||||
git branch your_own_branch
|
||||
git checkout your_own_branch
|
||||
```cmd
|
||||
cmake --preset windows-x64
|
||||
```
|
||||
|
||||
This keeps your changes isolated from upstream `dev` updates.
|
||||
7. Double-click `build/MAA.slnx` to open the project in Visual Studio.
|
||||
8. Configure Visual Studio settings
|
||||
- Select `Debug` and `x64` in the top configuration bar
|
||||
- Right-click `MaaWpfGui` - Set as Startup Project
|
||||
- Press F5 to run
|
||||
|
||||
10. After development, push your local branch (e.g. `dev`) to your remote repository:
|
||||
::: tip
|
||||
To debug Win32Controller (Windows window control) features, you need to manually download the corresponding platform package from [MaaFramework Releases](https://github.com/MaaXYZ/MaaFramework/releases), and place `MaaWin32ControlUnit.dll` from the `bin` directory into MAA's DLL directory (e.g. `build/bin/Debug`). PRs for an auto-download script are welcome!
|
||||
:::
|
||||
|
||||
9. Now you're ready to happily ~~mess around~~ start developing!
|
||||
10. Commit regularly with meaningful messages during development
|
||||
If you're not familiar with git usage, you might want to create a new branch for changes instead of committing directly to `dev`:
|
||||
|
||||
```bash
|
||||
git branch your_own_branch
|
||||
git checkout your_own_branch
|
||||
```
|
||||
|
||||
This keeps your changes isolated from upstream `dev` updates.
|
||||
|
||||
11. After development, push your local branch (e.g. `dev`) to your remote repository:
|
||||
|
||||
```bash
|
||||
git push origin dev
|
||||
```
|
||||
|
||||
11. Submit a Pull Request at the [MAA main repository](https://github.com/MaaAssistantArknights/MaaAssistantArknights). Ensure your changes are based on the `dev` branch, not `master`.
|
||||
12. To sync upstream changes:
|
||||
12. Submit a Pull Request at the [MAA main repository](https://github.com/MaaAssistantArknights/MaaAssistantArknights). Ensure your changes are based on the `dev` branch, not `master`.
|
||||
13. To sync upstream changes:
|
||||
1. Add upstream repository:
|
||||
|
||||
```bash
|
||||
@@ -108,12 +120,48 @@ We've preset several different development environments for you to choose from:
|
||||
git merge # merge
|
||||
```
|
||||
|
||||
4. Repeat steps 7, 8, 9, 10.
|
||||
4. Repeat steps 8, 9, 10, 11.
|
||||
|
||||
::: tip
|
||||
After opening Visual Studio, Git operations can be performed using VS's built-in "Git Changes" instead of command-line tools.
|
||||
:::
|
||||
|
||||
## Using VS Code for Development (Optional)
|
||||
|
||||
::: warning
|
||||
**Visual Studio is the recommended IDE for development.** The MAA project is primarily built around Visual Studio, and the complete environment setup described above covers all development needs with the best out-of-the-box experience. The VS Code workflow is provided only as an alternative for developers already familiar with VS Code + CMake + clangd, and requires more configuration effort.
|
||||
:::
|
||||
|
||||
If you prefer VS Code, you can use CMake, clangd, and related extensions for code completion, navigation, and debugging. After completing steps 1–6 above (clone, dependencies, CMake configuration), follow these steps:
|
||||
|
||||
### Recommended Extensions
|
||||
|
||||
Install from the VS Code marketplace:
|
||||
|
||||
| Extension | Purpose |
|
||||
| --------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- |
|
||||
| [CMake Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) | CMake configure, build, and debug integration |
|
||||
| [clangd](https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd) | C++ IntelliSense, code navigation, diagnostics (LSP-based) |
|
||||
| [C/C++](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) | Debug C++ programs (works with CMake Tools or launch.json) |
|
||||
|
||||
::: tip
|
||||
When using clangd, set `C_Cpp.intelliSenseEngine` to `disabled` to avoid conflicts with the C/C++ extension's IntelliSense.
|
||||
:::
|
||||
|
||||
### Setup Steps
|
||||
|
||||
1. Open the project root folder in VS Code
|
||||
2. **CMake Tools**:
|
||||
- Select a Configure Preset from the status bar (e.g. `windows-x64`, `linux-x64`)
|
||||
- Select a Build Preset and run configure/build
|
||||
3. **clangd**: Works on Windows with MSVC without needing `compile_commands.json`. On Linux/macOS, presets enable `CMAKE_EXPORT_COMPILE_COMMANDS` and clangd uses `build/compile_commands.json` automatically
|
||||
4. **Debugging**: The project includes `.vscode/launch.json` for launching MaaWpfGui or Debug Demo
|
||||
|
||||
### Build and Debug Shortcuts
|
||||
|
||||
- **Build**: `Ctrl+Shift+B` or via CMake Tools status bar
|
||||
- **Debug**: F5 or choose a configuration from the Run and Debug panel
|
||||
|
||||
## MAA File Formatting Requirements
|
||||
|
||||
MAA uses a series of formatting tools to ensure that the code and resource files in the repository are visually unified for easy maintenance and reading.
|
||||
@@ -125,7 +173,7 @@ The currently enabled formatting tools are as follows:
|
||||
| File Type | Format Tool |
|
||||
| --------- | --------------------------------------------------------------- |
|
||||
| C++ | [clang-format](https://clang.llvm.org/docs/ClangFormat.html) |
|
||||
| Json/Yaml | [Prettier](https://prettier.io/) |
|
||||
| JSON/YAML | [Prettier](https://prettier.io/) |
|
||||
| Markdown | [markdownlint](https://github.com/DavidAnson/markdownlint-cli2) |
|
||||
|
||||
### Use Pre-commit Hooks to Automatically Format Code
|
||||
|
||||
@@ -3,14 +3,23 @@ order: 8
|
||||
icon: iconoir:code-brackets
|
||||
---
|
||||
|
||||
# Dedicated VSCode Extension Tutorial
|
||||
# Dedicated VS Code Extension Tutorial
|
||||
|
||||
- [Extension Store](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support)
|
||||
- [Repository](https://github.com/neko-para/maa-support-extension)
|
||||
The extension provides a series of convenient development capabilities for MaaAssistantArknights/MaaFramework, including but not limited to the following features:
|
||||
|
||||
- tasks.json support, including `template preview`, `next jump`, `task reference`, etc.
|
||||
- Screenshot / Crop image
|
||||
|
||||
For details, please visit [Extension Store](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) or [Repository](https://github.com/neko-para/maa-support-extension).
|
||||
|
||||
## Installation
|
||||
|
||||
Searching `Maa` and installing it from VSCode extensions list is recommended.
|
||||
Searching `Maa` and installing it from VS Code extensions list is recommended.
|
||||
|
||||
::: tip
|
||||
When used for the first time, the extension will automatically download the preset version of resources.
|
||||
Search command `Maa: select fetch registry` to switch the download source (npm / cnpm).
|
||||
:::
|
||||
|
||||
## Features
|
||||
|
||||
@@ -36,7 +45,9 @@ If you find that the editing json isn't hinted by the extension, please check if
|
||||
|
||||
The extension supports Jump to task defs, Jump to task refs and View task defs.
|
||||
|
||||
When enabling the `Maa` compatible mode, the extension will be able to parse `template task`, supporting querying task defs and task refs in conjunction with base tasks. Images that has the same name of the task will be shown when hovering the task defs.
|
||||
When enabling the `Maa` compatible mode, the extension will be able to parse `template task`, supporting querying task defs and task refs in conjunction with base tasks. Images that have the same name as the task will be shown when hovering the task defs.
|
||||
|
||||
Use `Ctrl+T` to quickly query and jump to a task definition.
|
||||
|
||||
#### Query / open images
|
||||
|
||||
@@ -77,17 +88,37 @@ Evaluating the expanded task object and the sources of each properties, and the
|
||||
|
||||
Scanning and selecting controllers, selecting resource, adding and manipulating tasks, and launching tasks can be done via the control panel.
|
||||
|
||||
### Take screenshots and crop images
|
||||
### Take screenshots and crop images / Quick recognition
|
||||
|
||||
Searching and launching `Maa: open crop tool` inside VSCode command panel can open `Screenshots / Crop` panel.
|
||||
Searching and launching `Maa: open crop tool` inside VS Code command panel can open `Screenshots / Crop` panel.
|
||||
|
||||
> Use `Ctrl+Shift+P` (`Command+Shift+P` on MacOS) to open command panel
|
||||
> Use `Ctrl+Shift+P` (`Command+Shift+P` on macOS) to open command panel
|
||||
|
||||
- After selecting and connecting to the controller, use `Screencap` button to obtain screenshots
|
||||
- Use `Upload` button to manually upload images.
|
||||
- Hold `Ctrl` key and select cropping area
|
||||
- Use wheels to zoom
|
||||
- After finishing cropping, use `Download` button to save the cropping result to the folder of the topest layer of the activated resource
|
||||
- Use `Copy` button to copy the ROI as an array to the clipboard.
|
||||
- Click `Tool` button to open the recognition tool panel, where you can directly test recognition on the current image.
|
||||
|
||||
::: warning
|
||||
|
||||
If OCR recognition returns an empty result, please check whether the [OCR model](https://github.com/MaaXYZ/MaaFramework/blob/main/docs/en_us/1.1-QuickStarted.md#text-recognition-model-files) is configured correctly.
|
||||
|
||||
For MAA, the extension will maintain the models used automatically; you only need to select the proper resource.
|
||||
|
||||
:::
|
||||
|
||||
### Log View
|
||||
|
||||
#### MaaFramework Log
|
||||
|
||||
Search and execute `Maa: open maa log` in the VS Code command panel to view the `maa.log` generated during debugging.
|
||||
|
||||
#### Maa Pipeline Support Extension Log
|
||||
|
||||
Search and execute `Maa: open extension log` in the VS Code command panel to view the `mse.log` generated during debugging.
|
||||
|
||||
### Bottom status bar
|
||||
|
||||
@@ -95,10 +126,6 @@ Searching and launching `Maa: open crop tool` inside VSCode command panel can op
|
||||
|
||||
Click to reveal control panel
|
||||
|
||||
#### MaaFramework \[MaaFw Version\]
|
||||
#### MaaFramework [MaaFw Version]
|
||||
|
||||
Click to switch `MaaFramework` version used by the extension
|
||||
|
||||
> When used for the first time, the preset version will be downloaded.
|
||||
>
|
||||
> Search command `Maa: select fetch registry` to switch downloading source (npm / cnpm).
|
||||
Click to switch `MaaFramework` version used by the extension. The selectable versions are limited to those supported by the current extension. If the version you need is not in the list, please consider changing the extension version.
|
||||
|
||||
@@ -3,123 +3,194 @@ order: 1
|
||||
icon: material-symbols:download
|
||||
---
|
||||
|
||||
# Install and Build
|
||||
# Installation and Compilation
|
||||
|
||||
There are multiple ways to install maa-cli, including package managers, precompiled binaries, and building from source with `cargo`.
|
||||
There are multiple ways to install maa-cli, including pre-compiled binaries, package managers, and building from source with `cargo`.
|
||||
|
||||
## Pre-compiled Binaries
|
||||
|
||||
The easiest way to install maa-cli is by using the installation script:
|
||||
|
||||
::: tabs#pre-compile
|
||||
|
||||
@tab:active Linux and macOS
|
||||
|
||||
```bash
|
||||
curl -fsSL https://raw.githubusercontent.com/MaaAssistantArknights/maa-cli/main/install.sh | bash
|
||||
```
|
||||
|
||||
@tab Windows (PowerShell)
|
||||
|
||||
```powershell
|
||||
Invoke-WebRequest -Uri "https://raw.githubusercontent.com/MaaAssistantArknights/maa-cli/main/install.ps1" -OutFile install.ps1; .\install.ps1
|
||||
```
|
||||
|
||||
:::
|
||||
|
||||
You can later update maa-cli by running `maa self update`.
|
||||
|
||||
If your platform is not listed above, you can try to [build from source](#build-from-source).
|
||||
|
||||
## Install via Package Manager
|
||||
|
||||
For macOS and supported Linux distributions, it is recommended to install maa-cli using a package manager.
|
||||
For macOS and supported Linux distributions, you can install maa-cli using a package manager.
|
||||
|
||||
### macOS
|
||||
|
||||
Homebrew users can install maa-cli via the unofficial [tap](https://github.com/MaaAssistantArknights/homebrew-tap/):
|
||||
|
||||
- Stable release:
|
||||
::: code-tabs
|
||||
|
||||
```bash
|
||||
brew install MaaAssistantArknights/tap/maa-cli
|
||||
```
|
||||
@tab:active Stable
|
||||
|
||||
- Beta releases:
|
||||
```bash :no-line-numbers
|
||||
brew install MaaAssistantArknights/tap/maa-cli
|
||||
```
|
||||
|
||||
```bash
|
||||
brew install MaaAssistantArknights/tap/maa-cli-beta
|
||||
```
|
||||
@tab Unstable/Pre-release
|
||||
|
||||
```bash :no-line-numbers
|
||||
brew install MaaAssistantArknights/tap/maa-cli-beta
|
||||
```
|
||||
|
||||
:::
|
||||
|
||||
### Linux
|
||||
|
||||
- Arch Linux users can install the [AUR package](https://aur.archlinux.org/packages/maa-cli/):
|
||||
Arch, Nix, and Linux Homebrew users can install maa-cli via their package managers.
|
||||
|
||||
```bash
|
||||
yay -S maa-cli
|
||||
```
|
||||
#### Arch Linux
|
||||
|
||||
- ❄️ Nix users can run directly:
|
||||
You can install the [AUR package](https://aur.archlinux.org/packages/maa-cli/):
|
||||
|
||||
```bash
|
||||
# Stable release
|
||||
nix run nixpkgs#maa-cli
|
||||
```
|
||||
::: code-tabs
|
||||
|
||||
```bash
|
||||
# Nightly build
|
||||
nix run github:Cryolitia/nur-packages#maa-cli-nightly
|
||||
```
|
||||
@tab:active paru
|
||||
|
||||
Stable is packaged in [nixpkgs](https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/ma/maa-cli/package.nix), using the nixpkgs Rust toolchain; Nightly is in [NUR](https://github.com/Cryolitia/nur-packages/blob/master/pkgs/maa-assistant-arknights/maa-cli.nix), using the Beta Channel Rust toolchain, automatically updated and built daily by GitHub Actions.
|
||||
```bash :no-line-numbers
|
||||
paru -S maa-cli
|
||||
```
|
||||
|
||||
- Users using Homebrew on Linux please refer to the macOS installation method above.
|
||||
@tab yay
|
||||
|
||||
## Precompiled Binaries
|
||||
```bash :no-line-numbers
|
||||
yay -S maa-cli
|
||||
```
|
||||
|
||||
If package managers are not available on your system or you prefer not to use them, you can download the precompiled binaries for your platform from the following links. After decompressing, place the executable file in your `PATH` to use.
|
||||
:::
|
||||
|
||||
- [macOS](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-universal-apple-darwin.zip)
|
||||
- [Linux x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-unknown-linux-gnu.tar.gz)
|
||||
- [Linux aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-unknown-linux-gnu.tar.gz)
|
||||
- [Windows x86_64 (x64, amd64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-x86_64-pc-windows-msvc.zip)
|
||||
- [Windows aarch64 (arm64)](https://github.com/MaaAssistantArknights/maa-cli/releases/latest/download/maa_cli-aarch64-pc-windows-msvc.zip)
|
||||
#### ❄️ Nix
|
||||
|
||||
If your platform is not listed above, you can try to compile and install it yourself (see below).
|
||||
Users can run directly:
|
||||
|
||||
::: code-tabs
|
||||
|
||||
@tab:active Stable
|
||||
|
||||
```bash :no-line-numbers
|
||||
nix run nixpkgs#maa-cli
|
||||
```
|
||||
|
||||
@tab Nightly Build
|
||||
|
||||
```bash :no-line-numbers
|
||||
nix run github:Cryolitia/nur-packages#maa-cli-nightly
|
||||
```
|
||||
|
||||
:::
|
||||
|
||||
The stable version is packaged in [nixpkgs](https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/ma/maa-cli/package.nix), using the Rust toolchain from `nixpkgs`; the nightly build is in [NUR](https://github.com/Cryolitia/nur-packages/blob/master/pkgs/maa-assistant-arknights/maa-cli.nix), using the Beta channel Rust toolchain, and is automatically updated and verified daily by a GitHub Actions.
|
||||
|
||||
#### Homebrew
|
||||
|
||||
For users who use Homebrew on Linux, please refer to the macOS installation method.
|
||||
|
||||
#### Other Distributions
|
||||
|
||||
Please use the [pre-compiled binaries](#pre-compiled-binaries) or [build from source](#build-from-source).
|
||||
|
||||
We welcome interested developers to submit maa-cli to the official or user repositories of more distributions!
|
||||
|
||||
## Build from Source
|
||||
|
||||
Rust developers can compile and install maa-cli themselves via `cargo`:
|
||||
Rust developers can compile and install maa-cli using `cargo`:
|
||||
|
||||
- Stable version:
|
||||
::: code-tabs
|
||||
|
||||
```bash
|
||||
cargo install --git https://github.com/MaaAssistantArknights/maa-cli.git --bin maa --tag stable --locked
|
||||
```
|
||||
@tab:active Stable Version
|
||||
|
||||
- Development version:
|
||||
```bash :no-line-numbers
|
||||
cargo install --git https://github.com/MaaAssistantArknights/maa-cli.git --bin maa --tag stable --locked
|
||||
```
|
||||
|
||||
```bash
|
||||
cargo install --git https://github.com/MaaAssistantArknights/maa-cli.git --bin maa --locked
|
||||
```
|
||||
@tab Development Version
|
||||
|
||||
### Features
|
||||
```bash :no-line-numbers
|
||||
cargo install --git https://github.com/MaaAssistantArknights/maa-cli.git --bin maa --locked
|
||||
```
|
||||
|
||||
When compiling from source, you can disable the default features with `--no-default-features` and then enable specific features with `--features`. The available features are:
|
||||
:::
|
||||
|
||||
- `cli_installer`: Provide `maa self update` command to update self, this feature is enabled by default;
|
||||
- `core_installer`: Provide `maa install` and `maa update` commands to install and update MaaCore and resources, this feature is enabled by default;
|
||||
- `git2`: Provide `libgit2` resource backend, this feature is enabled by default;
|
||||
- `vendored-openssl`: Build OpenSSL library by self instead of using system library, this feature is disabled by default;
|
||||
::: warning
|
||||
The Minimum Supported Rust Version (MSRV) for maa-cli is currently 1.88. Please note that the MSRV may change at any time, and we recommend always using the latest Rust toolchain for the best experience.
|
||||
:::
|
||||
|
||||
## Install MaaCore
|
||||
### Build Options
|
||||
|
||||
maa-cli only provides an interface for MaaCore, it needs MaaCore and resources to run tasks, which can be installed by maa-cli once it is installed:
|
||||
When compiling from source, you can disable default features with `--no-default-features` and then enable specific features with `--features`. The available features are:
|
||||
|
||||
```bash
|
||||
- `cli_installer`: Enables the `maa self update` command for self-updating. Enabled by default.
|
||||
- `core_installer`: Enables the `maa install` and `maa update` commands for installing and updating MaaCore and its resources. Enabled by default.
|
||||
- `git2`: Provides the `libgit2` backend for resource updates. Enabled by default.
|
||||
|
||||
## Install MaaCore and Resources
|
||||
|
||||
maa-cli only provides a command-line interface; it requires MaaCore and resources to run tasks.
|
||||
|
||||
Your steps will differ depending on the installation method and platform:
|
||||
|
||||
::: tabs#maacore
|
||||
|
||||
@tab:active Pre-compiled
|
||||
For users of pre-compiled binaries or those who built from source, maa-cli can help you install and update:
|
||||
|
||||
```bash :no-line-numbers
|
||||
maa install
|
||||
```
|
||||
|
||||
For Windows platform users, before running the `maa install` command, please run the following command as administrator in Command Prompt or PowerShell to install the required VC++ toolset:
|
||||
@tab Windows
|
||||
For Windows users, before running `maa install`, please run the following command as an administrator in Command Prompt or PowerShell to install the necessary VC++ runtime:
|
||||
|
||||
- Windows:
|
||||
```bat :no-line-numbers
|
||||
winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
|
||||
```
|
||||
|
||||
```bat
|
||||
winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
|
||||
```
|
||||
Then run `maa install`.
|
||||
|
||||
For users who installed via package managers, MaaCore can also be installed via package managers:
|
||||
@tab Arch
|
||||
You can use maa-cli to install the pre-compiled MaaCore:
|
||||
|
||||
- Homebrew:
|
||||
```bash :no-line-numbers
|
||||
maa install
|
||||
```
|
||||
|
||||
```bash
|
||||
brew install MaaAssistantArknights/tap/maa-core
|
||||
```
|
||||
You can also install maa-core via the [AUR](https://aur.archlinux.org/packages/maa-assistant-arknights/):
|
||||
|
||||
- Arch Linux:
|
||||
```bash :no-line-numbers
|
||||
paru -S maa-assistant-arknights
|
||||
```
|
||||
|
||||
```bash
|
||||
yay -S maa-assistant-arknights
|
||||
```
|
||||
or
|
||||
|
||||
- Nix:
|
||||
```bash :no-line-numbers
|
||||
yay -S maa-assistant-arknights
|
||||
```
|
||||
|
||||
maa-cli on Nix depends on the MaaCore package, so no additional installation is required.
|
||||
@tab Nix
|
||||
maa-cli on Nix has a hard dependency on MaaCore, so Nix users do not need to, and should not, install MaaCore manually.
|
||||
|
||||
**NOTE**: Only users who installed maa-cli via package managers can install MaaCore via package managers. Otherwise, please use the `maa install` command to install. In addition, the `maa install` downloads the official precompiled MaaCore, while the MaaCore installed by package managers has different compilation options and dependency versions from the official precompiled version, potentially causing variations in behavior and performance.
|
||||
:::
|
||||
|
||||
::: warning
|
||||
`maa install` downloads the officially pre-compiled MaaCore. MaaCore installed via package managers may use different compile options and dependency versions, which might lead to slight differences in performance and functionality.
|
||||
:::
|
||||
|
||||
@@ -7,6 +7,12 @@ icon: material-symbols:summarize
|
||||
|
||||
maa-cli's main functionality is to automate Arknights game tasks by calling MaaCore. Additionally, for convenience, maa-cli also provides functions to manage MaaCore.
|
||||
|
||||
::: tip
|
||||
|
||||
For users who installed maa-cli via the Windows Package Manager (winget) , `maa` in the following commands needs to be replaced with `maa-cli` .
|
||||
|
||||
:::
|
||||
|
||||
## Manage MaaCore
|
||||
|
||||
maa-cli can install and update MaaCore and resources by running the following commands:
|
||||
|
||||