Compare commits
1846 Commits
feat/githu
...
v5.11.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0a0657f42 | ||
|
|
447d6d0aee | ||
|
|
cc2968c2e9 | ||
|
|
562e84aa97 | ||
|
|
bab71d1da4 | ||
|
|
e1fab541e5 | ||
|
|
8d12d313f5 | ||
|
|
c643045b57 | ||
|
|
b72b30ab6d | ||
|
|
d1e6ca611a | ||
|
|
47b8fc72a5 | ||
|
|
a0047a6d49 | ||
|
|
4eef588031 | ||
|
|
00439ecfa9 | ||
|
|
24542bc4fc | ||
|
|
8b4dd70b48 | ||
|
|
ea4256a9f2 | ||
|
|
395d53fe0c | ||
|
|
a6a02e5c6e | ||
|
|
f55db60431 | ||
|
|
881a852d96 | ||
|
|
ef9fbf81da | ||
|
|
2a31a33194 | ||
|
|
7317087458 | ||
|
|
92b69fbe93 | ||
|
|
a4369b7d59 | ||
|
|
a73f1fe939 | ||
|
|
ae69496159 | ||
|
|
6b1854afe7 | ||
|
|
0128c309a9 | ||
|
|
3053680369 | ||
|
|
0b3bfa9678 | ||
|
|
16db020f04 | ||
|
|
fd95858e65 | ||
|
|
45c803def4 | ||
|
|
74c7cb0bc6 | ||
|
|
cd15f14d5c | ||
|
|
01e4b2470f | ||
|
|
b7c763375e | ||
|
|
4f35c1d7c4 | ||
|
|
19fc7d3472 | ||
|
|
ae4239597d | ||
|
|
be67372350 | ||
|
|
4e382eccd4 | ||
|
|
96c6abe1c9 | ||
|
|
a02a7a91ee | ||
|
|
dce5d55672 | ||
|
|
7e46255ca6 | ||
|
|
3b25f8d8da | ||
|
|
70119da5b2 | ||
|
|
7629c089f4 | ||
|
|
4c38bb4094 | ||
|
|
2f7bea450b | ||
|
|
1cc457266f | ||
|
|
1b89299c9c | ||
|
|
570648a89c | ||
|
|
35d9b03b96 | ||
|
|
14c68fb69d | ||
|
|
0d746a4053 | ||
|
|
06685f185c | ||
|
|
bde76c94cb | ||
|
|
2b573aedaf | ||
|
|
b1cabfca1a | ||
|
|
588ec01baf | ||
|
|
6a9390170d | ||
|
|
d81b61dd46 | ||
|
|
74989c14ef | ||
|
|
7b1f41a064 | ||
|
|
848201f71a | ||
|
|
d3ab6c4060 | ||
|
|
229bdb6514 | ||
|
|
d7f4f974d3 | ||
|
|
411bba66f8 | ||
|
|
9cfde0b6a6 | ||
|
|
424fe44e30 | ||
|
|
074088de08 | ||
|
|
012671159c | ||
|
|
21ce4d5fbb | ||
|
|
12c57cc762 | ||
|
|
64f4358c77 | ||
|
|
8fb2734f7c | ||
|
|
ff7fff97fa | ||
|
|
e57efd0d79 | ||
|
|
e4c03d2775 | ||
|
|
42dfa2233c | ||
|
|
f6882998dd | ||
|
|
da7b0bf51a | ||
|
|
8c4a47916b | ||
|
|
3c965f556b | ||
|
|
b5113dee24 | ||
|
|
c925d4d85b | ||
|
|
d11893a05a | ||
|
|
272d71fa29 | ||
|
|
5140055482 | ||
|
|
0a38544023 | ||
|
|
6dc53704b8 | ||
|
|
9577fc4e95 | ||
|
|
355cbbc32b | ||
|
|
6311c1c612 | ||
|
|
d5d5daee8e | ||
|
|
d684b3b6f0 | ||
|
|
d56404207f | ||
|
|
2d5aee85f8 | ||
|
|
c4f3a1c795 | ||
|
|
88673a2f16 | ||
|
|
15c60163a8 | ||
|
|
d18e824c70 | ||
|
|
3587b57a3a | ||
|
|
fec66d5c05 | ||
|
|
92144559a9 | ||
|
|
0389430f17 | ||
|
|
cbd71c0d74 | ||
|
|
d57487dfb0 | ||
|
|
8bbc4c2209 | ||
|
|
540ac8939c | ||
|
|
2b45705ffd | ||
|
|
e9e20e78c3 | ||
|
|
62da79859f | ||
|
|
91b4fc1025 | ||
|
|
79fb27cbac | ||
|
|
81cd1ae247 | ||
|
|
1e6bab9a0b | ||
|
|
4d70df7457 | ||
|
|
7081bb3a43 | ||
|
|
07023b15a4 | ||
|
|
e96c698fe9 | ||
|
|
e250f780c0 | ||
|
|
94d445d354 | ||
|
|
11ea7470b4 | ||
|
|
70cf5096f3 | ||
|
|
85e6f51724 | ||
|
|
ec3c3543f3 | ||
|
|
0696fde360 | ||
|
|
d73d4e7e8c | ||
|
|
8cc0779541 | ||
|
|
c778353cda | ||
|
|
ccca4afc53 | ||
|
|
524d5fa2a0 | ||
|
|
fdbe389995 | ||
|
|
3065689ed2 | ||
|
|
2654499f62 | ||
|
|
32dac5731c | ||
|
|
8a4fb52830 | ||
|
|
74aa188bd4 | ||
|
|
9b2400040f | ||
|
|
29e74c1f50 | ||
|
|
b3d4269476 | ||
|
|
68776ea8af | ||
|
|
4a11d0eeb0 | ||
|
|
941a98d90a | ||
|
|
f549c1feee | ||
|
|
fe1deb1f23 | ||
|
|
941c5bee4e | ||
|
|
f803a6510d | ||
|
|
dc016a982c | ||
|
|
0b1b48a42f | ||
|
|
1c5bbd1602 | ||
|
|
14b99f8538 | ||
|
|
f22f817ed2 | ||
|
|
e7925f5191 | ||
|
|
30fe628a30 | ||
|
|
5e126b6c09 | ||
|
|
84a8313d6c | ||
|
|
f69bab0594 | ||
|
|
3c9b3c53fc | ||
|
|
3977bdd69d | ||
|
|
79c656e271 | ||
|
|
fc8e43037e | ||
|
|
d4f49b60fc | ||
|
|
02b0234a27 | ||
|
|
26aed3ea0f | ||
|
|
bf656ab6eb | ||
|
|
f450292a51 | ||
|
|
488040a140 | ||
|
|
4ddf92e827 | ||
|
|
db81dd428a | ||
|
|
df5ee99fc0 | ||
|
|
2d9637372e | ||
|
|
437bf628f1 | ||
|
|
7b2b69dd03 | ||
|
|
79e526833b | ||
|
|
cf4ea870cb | ||
|
|
8c6d72c88d | ||
|
|
f7a5bad3a9 | ||
|
|
1523683633 | ||
|
|
ac2b7d461d | ||
|
|
a724ddddfb | ||
|
|
bdd3b3396f | ||
|
|
94f5a264ca | ||
|
|
b4a674efe5 | ||
|
|
2f61a4d31f | ||
|
|
c36a4cab44 | ||
|
|
901e61ae78 | ||
|
|
c246b30991 | ||
|
|
cc138a42df | ||
|
|
bf01575dc1 | ||
|
|
e7aab4d034 | ||
|
|
185b980d9e | ||
|
|
033f24731a | ||
|
|
8fa17ad8af | ||
|
|
23fa98b4d4 | ||
|
|
310e59e582 | ||
|
|
d7f34153a7 | ||
|
|
8e494d47fb | ||
|
|
4c95f3504e | ||
|
|
247e47a754 | ||
|
|
2b7a590aa6 | ||
|
|
25e32840aa | ||
|
|
53ba8f28b6 | ||
|
|
24bb091e4d | ||
|
|
122b32731e | ||
|
|
2f8d624bcb | ||
|
|
fbb8193091 | ||
|
|
99406da8eb | ||
|
|
50652cda12 | ||
|
|
fdffb9cc89 | ||
|
|
7eb9fcaed2 | ||
|
|
0c534b94b9 | ||
|
|
cd0a53fbe5 | ||
|
|
39997a467b | ||
|
|
7ea94ef014 | ||
|
|
47d8b0f604 | ||
|
|
89fe3ddcc2 | ||
|
|
0e7a5e8974 | ||
|
|
c7cf92df67 | ||
|
|
885a1a8a6c | ||
|
|
70f26f5f73 | ||
|
|
82859d6a12 | ||
|
|
a8c04a4b17 | ||
|
|
d166461c12 | ||
|
|
6a2f25a8bd | ||
|
|
3d127fba5f | ||
|
|
bae7fcbe90 | ||
|
|
0935da1cd6 | ||
|
|
c987b3a3e1 | ||
|
|
e7742bc226 | ||
|
|
bdea1f5554 | ||
|
|
184da533a5 | ||
|
|
8bed0b9705 | ||
|
|
214a3021b0 | ||
|
|
a8398e017a | ||
|
|
3a311dbd6d | ||
|
|
219459eb7e | ||
|
|
9a8dc9b9a4 | ||
|
|
9b490f37f6 | ||
|
|
03a99a9a99 | ||
|
|
e9bb0681a2 | ||
|
|
962f8b200d | ||
|
|
8ccf5da63e | ||
|
|
5445ca5c53 | ||
|
|
3175d67da3 | ||
|
|
b69203ffa5 | ||
|
|
09cee87600 | ||
|
|
c27ae95a89 | ||
|
|
bbfa3a21eb | ||
|
|
fad068ba71 | ||
|
|
66684553a5 | ||
|
|
6435d700a9 | ||
|
|
37bf2841b4 | ||
|
|
12bfe03c58 | ||
|
|
cb1a609350 | ||
|
|
64f55cd2c6 | ||
|
|
449838625c | ||
|
|
748293b91a | ||
|
|
e9db404960 | ||
|
|
4cc3051da5 | ||
|
|
a2902fdd29 | ||
|
|
94031f7da9 | ||
|
|
fc3bade2df | ||
|
|
1c1852b940 | ||
|
|
1ed394b034 | ||
|
|
63fb2293c4 | ||
|
|
d6b24b26c0 | ||
|
|
1c14b211d3 | ||
|
|
3e4ca1111c | ||
|
|
efa0050cb7 | ||
|
|
343ceb40f5 | ||
|
|
b634aef1c4 | ||
|
|
36feae8e16 | ||
|
|
82a6326be2 | ||
|
|
d58ed52cbe | ||
|
|
5e959927f4 | ||
|
|
1d24adfa89 | ||
|
|
53916b3b9d | ||
|
|
4edc788c13 | ||
|
|
f3b07e8f84 | ||
|
|
4254668bfb | ||
|
|
0295638422 | ||
|
|
300c2284e4 | ||
|
|
4ac175d1f0 | ||
|
|
ae1adb84fb | ||
|
|
b4df55d4d6 | ||
|
|
bdb16e5a32 | ||
|
|
6ae13d87a0 | ||
|
|
0be44e2696 | ||
|
|
a8d6be994a | ||
|
|
ffa7ce55ee | ||
|
|
378ecd7629 | ||
|
|
d847ecfeed | ||
|
|
d30637c3fc | ||
|
|
a277fa550c | ||
|
|
f349fa8421 | ||
|
|
66411c76f1 | ||
|
|
f52d9ca449 | ||
|
|
b54a3d52fa | ||
|
|
f1d60f3654 | ||
|
|
5e47bed765 | ||
|
|
89fd84518b | ||
|
|
9ded9435f4 | ||
|
|
5fe64e4105 | ||
|
|
067944a472 | ||
|
|
f5aa884005 | ||
|
|
90751cdb53 | ||
|
|
8ef3a34ddf | ||
|
|
1f18b8647e | ||
|
|
f1f2255b5b | ||
|
|
7925360b22 | ||
|
|
e6862636a6 | ||
|
|
89ced63090 | ||
|
|
225b6155fa | ||
|
|
a080a3f8e4 | ||
|
|
3757626b2a | ||
|
|
e13f1e357a | ||
|
|
57d79eddcf | ||
|
|
3b91c61816 | ||
|
|
04e2524d40 | ||
|
|
4b4fdb9a03 | ||
|
|
75a279b25e | ||
|
|
3f2db7d83f | ||
|
|
56ec14acb9 | ||
|
|
84f6ebd897 | ||
|
|
4a19a0417f | ||
|
|
fd40a8c218 | ||
|
|
8c05d5063b | ||
|
|
d5617d6304 | ||
|
|
216d78f6e8 | ||
|
|
20ab374337 | ||
|
|
72119ac361 | ||
|
|
3de378b7f7 | ||
|
|
a17ac2ea69 | ||
|
|
38e3ff5c50 | ||
|
|
c5ce1f79c2 | ||
|
|
9cb69b49d7 | ||
|
|
1456e11803 | ||
|
|
ddd926e073 | ||
|
|
46aa097801 | ||
|
|
3c97864f0a | ||
|
|
e83d188d10 | ||
|
|
5a028c506d | ||
|
|
4a4e8e47a9 | ||
|
|
5256640fc3 | ||
|
|
be01c24635 | ||
|
|
75e14c8379 | ||
|
|
0b0e007d05 | ||
|
|
2306eb40ae | ||
|
|
ab0d6324cb | ||
|
|
a4de0ef66c | ||
|
|
f013a5980d | ||
|
|
616c12951b | ||
|
|
14bab28e63 | ||
|
|
755aeff1cd | ||
|
|
2a93ea01d2 | ||
|
|
1d3f543fbd | ||
|
|
059cd38f73 | ||
|
|
2916be666d | ||
|
|
2996de0a18 | ||
|
|
6c91a87474 | ||
|
|
d0c03174d9 | ||
|
|
5bbd4923a8 | ||
|
|
315216d7fd | ||
|
|
17251bb417 | ||
|
|
9f10c31f33 | ||
|
|
aff03a3bbd | ||
|
|
62195dfa0b | ||
|
|
b2ec0007e4 | ||
|
|
3c30f19198 | ||
|
|
02229b32db | ||
|
|
ed166e1011 | ||
|
|
d7545f20fe | ||
|
|
730da23524 | ||
|
|
ff124dd085 | ||
|
|
8e41170298 | ||
|
|
da937c6d5a | ||
|
|
afcfdd394d | ||
|
|
b2392e419e | ||
|
|
4d2978ff07 | ||
|
|
bd0a51ecb3 | ||
|
|
1270f69261 | ||
|
|
f12729ec6a | ||
|
|
b0ca5f6165 | ||
|
|
9c5ba9e3ae | ||
|
|
70aa3558f0 | ||
|
|
89a0c947a6 | ||
|
|
5b97f8d063 | ||
|
|
99d4fc16f7 | ||
|
|
950c7959b8 | ||
|
|
7355f3e2f7 | ||
|
|
5c59ce6662 | ||
|
|
82ede27999 | ||
|
|
bff501f250 | ||
|
|
bcd8b02270 | ||
|
|
9d633c100c | ||
|
|
fe90503f6d | ||
|
|
fe470f3188 | ||
|
|
ffeb9d3e6e | ||
|
|
f6d0426ee7 | ||
|
|
d1818c4b44 | ||
|
|
ebe4775a71 | ||
|
|
3036c88ada | ||
|
|
98630837bb | ||
|
|
a69d5d92f3 | ||
|
|
42982a8fad | ||
|
|
6865ed0f80 | ||
|
|
9086c0df30 | ||
|
|
c3f034f977 | ||
|
|
fe1e105df3 | ||
|
|
ec17e7f799 | ||
|
|
963b250aa6 | ||
|
|
0dced4556b | ||
|
|
023518bf0d | ||
|
|
8449677510 | ||
|
|
8ba4ba137d | ||
|
|
611379083e | ||
|
|
2e6388420a | ||
|
|
a4984e9831 | ||
|
|
71216b8d4d | ||
|
|
d1f242090e | ||
|
|
c7572b5864 | ||
|
|
e1e210c99d | ||
|
|
63885d1a04 | ||
|
|
a8233796be | ||
|
|
51874622e4 | ||
|
|
043ce3aa2b | ||
|
|
a6bbd936e0 | ||
|
|
90d816c619 | ||
|
|
902a70db23 | ||
|
|
84b471bed5 | ||
|
|
c711f3e05e | ||
|
|
cea619c62f | ||
|
|
bc39c2d2ec | ||
|
|
3ecbf8bc26 | ||
|
|
5cca9e5e1f | ||
|
|
e740012e81 | ||
|
|
2d05141535 | ||
|
|
57c0692444 | ||
|
|
5e40d92a61 | ||
|
|
6ade1ab7a6 | ||
|
|
ed3d64e849 | ||
|
|
6c7376f445 | ||
|
|
ef08237fd6 | ||
|
|
9a0013026f | ||
|
|
2a598bda65 | ||
|
|
b28ffcc13e | ||
|
|
2dcd54a2d8 | ||
|
|
acf4c9ccc7 | ||
|
|
ccbf15e5a2 | ||
|
|
e2ad6b69f8 | ||
|
|
b152814afb | ||
|
|
5014fb8e70 | ||
|
|
3d2307fced | ||
|
|
8f483ae1ed | ||
|
|
b1ad1b2b55 | ||
|
|
c533e7379a | ||
|
|
1f69ccb654 | ||
|
|
627fa36b69 | ||
|
|
82e2c2ad6d | ||
|
|
f678f65c8e | ||
|
|
aee8ba3aea | ||
|
|
2b7a457cbd | ||
|
|
f02208c7c6 | ||
|
|
482f013697 | ||
|
|
2802e169d3 | ||
|
|
1049b17d9e | ||
|
|
28f5e009a2 | ||
|
|
906de62d58 | ||
|
|
9be4b9c157 | ||
|
|
e0b963aef8 | ||
|
|
2445453de0 | ||
|
|
eaeaab7b18 | ||
|
|
5d45fc7ec2 | ||
|
|
d464d87d07 | ||
|
|
e7872bb76e | ||
|
|
e83888d548 | ||
|
|
cc3afa83bd | ||
|
|
fce556ff46 | ||
|
|
6e965ef2da | ||
|
|
afc39b5843 | ||
|
|
b430f36bb4 | ||
|
|
7d6212026b | ||
|
|
5480c20328 | ||
|
|
2e9950ab60 | ||
|
|
dcfe9510d2 | ||
|
|
9f24927367 | ||
|
|
cdb7e781bf | ||
|
|
22c26483dc | ||
|
|
2f6a6dfafc | ||
|
|
5dc3512bb8 | ||
|
|
6943051574 | ||
|
|
5cbebd574f | ||
|
|
53d58e1b54 | ||
|
|
723c27bab2 | ||
|
|
65b5a586c6 | ||
|
|
9a41644725 | ||
|
|
d2d80a2858 | ||
|
|
62dd266c63 | ||
|
|
ef504ddcb9 | ||
|
|
0ae9f9ed5c | ||
|
|
a497a3cfc3 | ||
|
|
72265d2db2 | ||
|
|
e3b6ab3962 | ||
|
|
f7772bc814 | ||
|
|
d3796ea4b3 | ||
|
|
6fecfa640d | ||
|
|
ea1c74ab01 | ||
|
|
7e251a154b | ||
|
|
8bc6dc9bb9 | ||
|
|
798869cbdb | ||
|
|
fcbf8838c7 | ||
|
|
085d401ec5 | ||
|
|
00850f209d | ||
|
|
deb9ad3e11 | ||
|
|
ae49d0c3fe | ||
|
|
26f46a7464 | ||
|
|
e24b5e18be | ||
|
|
5e5b18edea | ||
|
|
beabba92e3 | ||
|
|
c85c66a126 | ||
|
|
b7835b84ed | ||
|
|
a3b483ffe8 | ||
|
|
7ab291a843 | ||
|
|
246df99a78 | ||
|
|
fc01083c47 | ||
|
|
139d87cdb1 | ||
|
|
7ffcbbff1b | ||
|
|
0d6ad34b92 | ||
|
|
69da388948 | ||
|
|
d20cc1031e | ||
|
|
ce08ab921e | ||
|
|
3f8a9ff8bc | ||
|
|
018e54ffe0 | ||
|
|
64ae91b048 | ||
|
|
d23f6b1b18 | ||
|
|
5172acf64b | ||
|
|
d77e280434 | ||
|
|
de181e805b | ||
|
|
783c77d2d9 | ||
|
|
9c7efd138b | ||
|
|
4ffde96d99 | ||
|
|
f10d011893 | ||
|
|
7fd7dea530 | ||
|
|
dee8df8f78 | ||
|
|
e5874b581b | ||
|
|
f45ddc4a70 | ||
|
|
1e4cfd04a0 | ||
|
|
9a6c8b57e6 | ||
|
|
8d80c4d1da | ||
|
|
393ce18356 | ||
|
|
332785354b | ||
|
|
158fc9849d | ||
|
|
7c617ec62c | ||
|
|
54878c88ea | ||
|
|
09cdf4e14c | ||
|
|
a3499053a8 | ||
|
|
3493160256 | ||
|
|
fc6bf94b13 | ||
|
|
69c8c0e2f2 | ||
|
|
db3ab147a1 | ||
|
|
79a7174c78 | ||
|
|
033a8732f3 | ||
|
|
c0b71c5ddf | ||
|
|
13fd031941 | ||
|
|
10726377c6 | ||
|
|
fa49fd7789 | ||
|
|
87e6d9a442 | ||
|
|
f4a3c8afda | ||
|
|
dd0a08c708 | ||
|
|
683a64feda | ||
|
|
b13bc21cad | ||
|
|
fa83a5a8df | ||
|
|
69fc490459 | ||
|
|
bdf0a6fd27 | ||
|
|
f685f37905 | ||
|
|
c7038260ed | ||
|
|
0f7f454074 | ||
|
|
20d79460f0 | ||
|
|
6c1b91749a | ||
|
|
30ae6d2ad9 | ||
|
|
9b9b201a63 | ||
|
|
a331c55bf8 | ||
|
|
5d099b4eb9 | ||
|
|
4770311c55 | ||
|
|
a5c642a9ca | ||
|
|
df63d861a5 | ||
|
|
95f620f08c | ||
|
|
504da130e7 | ||
|
|
3f53c2b3fb | ||
|
|
9367a86f96 | ||
|
|
fa3dffaf9f | ||
|
|
385541a44d | ||
|
|
c2849d2c32 | ||
|
|
b3a2e710ab | ||
|
|
26bb6b29f5 | ||
|
|
92ea90ac0e | ||
|
|
e699b8c890 | ||
|
|
e25ef273ba | ||
|
|
7b3d741440 | ||
|
|
83d158d015 | ||
|
|
562ffbf5d3 | ||
|
|
90e4508011 | ||
|
|
194c34c189 | ||
|
|
cf9fc094b6 | ||
|
|
f445e26b73 | ||
|
|
1d28f6e830 | ||
|
|
71a7f8aa05 | ||
|
|
cc26e0815c | ||
|
|
48d2d25996 | ||
|
|
167739b5c5 | ||
|
|
ece52124a9 | ||
|
|
5e3988ba91 | ||
|
|
192ad2cf6f | ||
|
|
627dbe4189 | ||
|
|
f8e6880899 | ||
|
|
df21dcb201 | ||
|
|
73bf9f4e21 | ||
|
|
69da70c1ba | ||
|
|
9d00d3851e | ||
|
|
bd44c5f0fa | ||
|
|
1759f8c234 | ||
|
|
cdc9903e9f | ||
|
|
6f31264c48 | ||
|
|
1c686c4b5a | ||
|
|
6ef35b1e74 | ||
|
|
f50f72678e | ||
|
|
e6102b579e | ||
|
|
2d214bb3ea | ||
|
|
142c8aad3c | ||
|
|
0185d4908d | ||
|
|
3fcff1f09d | ||
|
|
7ab323d3dd | ||
|
|
5d76565ba2 | ||
|
|
236742c3ab | ||
|
|
6f72b444ac | ||
|
|
5e1e931c2d | ||
|
|
b6a7d3bfc8 | ||
|
|
6f16995ce6 | ||
|
|
9e15bf6a60 | ||
|
|
d3d2cd307b | ||
|
|
55a3f83e8a | ||
|
|
c234f0f4d9 | ||
|
|
501cc62096 | ||
|
|
4ab1e3704b | ||
|
|
f88c90aa0c | ||
|
|
c3a36da016 | ||
|
|
afbbedd88f | ||
|
|
122af971c3 | ||
|
|
90e5f37a9f | ||
|
|
e1a4010e98 | ||
|
|
30310ca40a | ||
|
|
b5a93c5f9f | ||
|
|
20fed4c971 | ||
|
|
90f9ba7e9e | ||
|
|
2530598b6f | ||
|
|
0a132b241f | ||
|
|
d07506012f | ||
|
|
e1b8fefd12 | ||
|
|
80a55c9327 | ||
|
|
ea6ccf4885 | ||
|
|
4b258d57bc | ||
|
|
35607fd056 | ||
|
|
bda8c30f18 | ||
|
|
9a6a2ad31b | ||
|
|
aa02e5e23d | ||
|
|
ae18f00679 | ||
|
|
f4ba45957a | ||
|
|
e59a5e2b7a | ||
|
|
f40036d6df | ||
|
|
d8f3dded11 | ||
|
|
49aa88a35c | ||
|
|
43a9d2ec9f | ||
|
|
574e4da878 | ||
|
|
7cd1047886 | ||
|
|
261e4f22cf | ||
|
|
f42f527015 | ||
|
|
f38c88c7f4 | ||
|
|
525140fa75 | ||
|
|
0075b59da1 | ||
|
|
cb331b653c | ||
|
|
e78420fac6 | ||
|
|
e7e32a22fa | ||
|
|
8bd0ce5626 | ||
|
|
94ff657808 | ||
|
|
608efbec1f | ||
|
|
e15a15e074 | ||
|
|
db8265086e | ||
|
|
ebe7c808d5 | ||
|
|
af7a93c179 | ||
|
|
50251278ed | ||
|
|
6c25ec2f46 | ||
|
|
f202c0f0d3 | ||
|
|
259925c1f2 | ||
|
|
f9bfec7dee | ||
|
|
8f97191ee9 | ||
|
|
2c212376b8 | ||
|
|
b9824460c5 | ||
|
|
1f0b884e33 | ||
|
|
4d6567ffdd | ||
|
|
89ce9ae546 | ||
|
|
82a5f53ff1 | ||
|
|
ae77c07311 | ||
|
|
c4e320526c | ||
|
|
4734d2600d | ||
|
|
a47597879c | ||
|
|
1e6a985bc7 | ||
|
|
557abe700e | ||
|
|
b8ea0d41a7 | ||
|
|
ffb7da7a58 | ||
|
|
9c80f7a04d | ||
|
|
d2040d3328 | ||
|
|
885f248364 | ||
|
|
bac30b6678 | ||
|
|
2a8cb64801 | ||
|
|
d77778fb5d | ||
|
|
eef2a80b36 | ||
|
|
0618dd6e50 | ||
|
|
463bd84c6f | ||
|
|
bc14b6cf27 | ||
|
|
ef2873c977 | ||
|
|
331bfa11ce | ||
|
|
b27df9b509 | ||
|
|
a7be240c4a | ||
|
|
40c0898427 | ||
|
|
34a2b083d8 | ||
|
|
a99c900658 | ||
|
|
5a3698a396 | ||
|
|
5cf3f0ac7b | ||
|
|
389ce2d5fd | ||
|
|
2e4bb63acf | ||
|
|
02ff6e0c63 | ||
|
|
2b3435b66d | ||
|
|
fbca4a6bf0 | ||
|
|
1c00f4277e | ||
|
|
fca3c26564 | ||
|
|
838a1d9844 | ||
|
|
08f44e066d | ||
|
|
ba596c74f8 | ||
|
|
6081a04f2e | ||
|
|
7744a30869 | ||
|
|
e9003c772c | ||
|
|
a0e1fc1b2d | ||
|
|
ae1a8cfcba | ||
|
|
77f812b1ac | ||
|
|
5e11128fa2 | ||
|
|
1d6481448a | ||
|
|
46d4c5ceb2 | ||
|
|
701579d863 | ||
|
|
a12f3d8fc9 | ||
|
|
f998118d44 | ||
|
|
07129479a8 | ||
|
|
f8f9a70dca | ||
|
|
abb471ba74 | ||
|
|
40327e4f4a | ||
|
|
b1c607518c | ||
|
|
26781dd864 | ||
|
|
4bd5b9ee79 | ||
|
|
32535dc79f | ||
|
|
b224518303 | ||
|
|
fb0410174c | ||
|
|
fa9bc36f3b | ||
|
|
927ab19e3e | ||
|
|
79b024ecfb | ||
|
|
6529b8b1bc | ||
|
|
32c64823ee | ||
|
|
e4cf893ed5 | ||
|
|
a9e2eb901e | ||
|
|
ca2d9ccf0b | ||
|
|
43d184c57c | ||
|
|
6866c57f48 | ||
|
|
7023d7ea57 | ||
|
|
ee96efeede | ||
|
|
7e5aa9402c | ||
|
|
1ec890214d | ||
|
|
ccdd0c9e06 | ||
|
|
7d31fc8c29 | ||
|
|
a82e162957 | ||
|
|
aa55e51b2c | ||
|
|
c6e929933f | ||
|
|
c552395b56 | ||
|
|
d82934783b | ||
|
|
9262fe180a | ||
|
|
ce6fb339e1 | ||
|
|
a793341181 | ||
|
|
c2a285eaa2 | ||
|
|
598575d13c | ||
|
|
c59fb8413c | ||
|
|
1293504c64 | ||
|
|
9b92283954 | ||
|
|
02dc16d5a3 | ||
|
|
2056cbef00 | ||
|
|
e9336d78ec | ||
|
|
8829cdc70f | ||
|
|
453ce619f8 | ||
|
|
77a66a1aee | ||
|
|
86a4f23038 | ||
|
|
5deda05370 | ||
|
|
854c8af83f | ||
|
|
ab62d1e6e7 | ||
|
|
3aa60a91e6 | ||
|
|
6b571b2c63 | ||
|
|
c6c640c2a6 | ||
|
|
e5d5a48033 | ||
|
|
8857eb03ea | ||
|
|
93ed600d1c | ||
|
|
a9eb6ed025 | ||
|
|
4e395b62ae | ||
|
|
45e8548b07 | ||
|
|
a89e2e4143 | ||
|
|
56afb55340 | ||
|
|
593c00a36f | ||
|
|
db09953636 | ||
|
|
506e1228cf | ||
|
|
f73edd5874 | ||
|
|
7e304a8a23 | ||
|
|
bacb892a46 | ||
|
|
f59f539817 | ||
|
|
2396a7e67f | ||
|
|
c17593e913 | ||
|
|
7e32a8ce40 | ||
|
|
18af8f0bf8 | ||
|
|
5f4d505f0f | ||
|
|
f4a6d50e17 | ||
|
|
5b19ee109d | ||
|
|
576c0b472b | ||
|
|
533662d9e9 | ||
|
|
92d4b012cb | ||
|
|
be872da15b | ||
|
|
1bf3ce832e | ||
|
|
9b1b5bc2e9 | ||
|
|
0485307acb | ||
|
|
9f30777e73 | ||
|
|
c6c6b862ca | ||
|
|
773a5ceff4 | ||
|
|
e3d69ba4e5 | ||
|
|
1d0de2fcfa | ||
|
|
29d052e34f | ||
|
|
60516bf79c | ||
|
|
30acf5d150 | ||
|
|
b31810faaa | ||
|
|
41bb236867 | ||
|
|
0d85a37dc7 | ||
|
|
4c07483079 | ||
|
|
b39678faad | ||
|
|
8454075468 | ||
|
|
9d96081f47 | ||
|
|
13befbf153 | ||
|
|
13bb0a9261 | ||
|
|
c109854749 | ||
|
|
89d016e88e | ||
|
|
aa014333af | ||
|
|
6acb8301c2 | ||
|
|
28fbe72e24 | ||
|
|
39ac002224 | ||
|
|
f4362b44f9 | ||
|
|
78f3e7678b | ||
|
|
76c5708be7 | ||
|
|
62bc8bd007 | ||
|
|
f618d776d7 | ||
|
|
8ce0950ff4 | ||
|
|
92b4fee512 | ||
|
|
b5c62832ed | ||
|
|
d510c12f94 | ||
|
|
b88de666f1 | ||
|
|
df285b9a66 | ||
|
|
c7d4d6362a | ||
|
|
50bcd9de1c | ||
|
|
9511070f3d | ||
|
|
bbfbf96b83 | ||
|
|
39d0ad576e | ||
|
|
33e69aaeb8 | ||
|
|
ac6944dbae | ||
|
|
a04a4b837f | ||
|
|
42b773f219 | ||
|
|
4dfc4dc3c6 | ||
|
|
ba93f8c8e9 | ||
|
|
b6b15f498f | ||
|
|
4528b2213e | ||
|
|
5c645e7564 | ||
|
|
d8f321564c | ||
|
|
c479834d38 | ||
|
|
f3fa4ff001 | ||
|
|
35f3bb193f | ||
|
|
45a5e14dde | ||
|
|
f2b96645c8 | ||
|
|
5349fe0635 | ||
|
|
cfef166602 | ||
|
|
0ecaaa5400 | ||
|
|
022fcc2b13 | ||
|
|
f3ede6858a | ||
|
|
d862a2fec5 | ||
|
|
4d824d08af | ||
|
|
69e7b399b6 | ||
|
|
117e074a84 | ||
|
|
4a07315e19 | ||
|
|
1610e3b81a | ||
|
|
ee360c3ddf | ||
|
|
9273cf6abe | ||
|
|
e60d708548 | ||
|
|
784b94a440 | ||
|
|
bd926c64f6 | ||
|
|
f65210ed93 | ||
|
|
6569089abb | ||
|
|
950961a089 | ||
|
|
5a10df22d3 | ||
|
|
881e46f499 | ||
|
|
8aa9b63306 | ||
|
|
872b400bec | ||
|
|
1608136bea | ||
|
|
fdb9f7e295 | ||
|
|
d869103497 | ||
|
|
f40ba2e58f | ||
|
|
17cb0ae3e4 | ||
|
|
af9dd71b30 | ||
|
|
4c6deb571a | ||
|
|
e13f4611d1 | ||
|
|
6dcb77f168 | ||
|
|
5872d6606e | ||
|
|
5875de69aa | ||
|
|
9a1f59206d | ||
|
|
d5ed0db686 | ||
|
|
962dcc3b51 | ||
|
|
25e409f8d0 | ||
|
|
f7a4b4bac4 | ||
|
|
3910bfa0fa | ||
|
|
20cebf57cd | ||
|
|
f94b1d2c11 | ||
|
|
11c1cdcae8 | ||
|
|
14f25c8638 | ||
|
|
d1fad4efd4 | ||
|
|
cdd4c4c78e | ||
|
|
808e0d2863 | ||
|
|
465f49fbe4 | ||
|
|
75e723a1b4 | ||
|
|
1199b7de42 | ||
|
|
d141db3680 | ||
|
|
43ec787767 | ||
|
|
49e74fa293 | ||
|
|
dcf9f0ffe1 | ||
|
|
cc9e3a516c | ||
|
|
77de769213 | ||
|
|
eccc5e08f8 | ||
|
|
ee9c1f38ba | ||
|
|
21c33e68ea | ||
|
|
b03e5a56e9 | ||
|
|
de26d22f79 | ||
|
|
75c82df749 | ||
|
|
64eb5536e1 | ||
|
|
fcf5bb696c | ||
|
|
e227d71813 | ||
|
|
bdfc1f139c | ||
|
|
9b80ba96c7 | ||
|
|
2afb29191a | ||
|
|
d929b433db | ||
|
|
6fe87e4eca | ||
|
|
8edcf183a5 | ||
|
|
5a66f65287 | ||
|
|
207172b366 | ||
|
|
a04269bdcb | ||
|
|
736b0055d8 | ||
|
|
7888158f1b | ||
|
|
18257c70e7 | ||
|
|
55e8436b5f | ||
|
|
4798f4df06 | ||
|
|
f7d9856c85 | ||
|
|
5470c313e2 | ||
|
|
3be685c560 | ||
|
|
ec93472984 | ||
|
|
c8c90c1604 | ||
|
|
89261430cb | ||
|
|
971699bcbe | ||
|
|
046b3329ea | ||
|
|
0fd48d774a | ||
|
|
92d187558e | ||
|
|
7c3c5b81d4 | ||
|
|
019e483f91 | ||
|
|
62eae0ad59 | ||
|
|
ae923d65f9 | ||
|
|
46f5475df0 | ||
|
|
c3a5471ca2 | ||
|
|
8e6ba0e21a | ||
|
|
b2b8137d16 | ||
|
|
c0eb5a2819 | ||
|
|
3d44d574a2 | ||
|
|
13886380a6 | ||
|
|
cb87f2f614 | ||
|
|
eb70b3ddd2 | ||
|
|
8d0e9bb9c0 | ||
|
|
10d51c6c38 | ||
|
|
ffdf42a72f | ||
|
|
4dde138858 | ||
|
|
4db4297c4f | ||
|
|
f07ff1bf27 | ||
|
|
77808ffca2 | ||
|
|
a737e978bd | ||
|
|
af5ff9b07b | ||
|
|
5f9e4905ac | ||
|
|
78e82ced53 | ||
|
|
3509638773 | ||
|
|
637b302cc3 | ||
|
|
c80a6fff05 | ||
|
|
4a493fb466 | ||
|
|
4a156f4c7f | ||
|
|
db4b80e967 | ||
|
|
72a78402fb | ||
|
|
af27e95fdc | ||
|
|
d539d26ac8 | ||
|
|
bceea3bd93 | ||
|
|
3625fb18c4 | ||
|
|
2991ab3ad7 | ||
|
|
078d8ee50d | ||
|
|
ed8873580b | ||
|
|
dc153b34c7 | ||
|
|
d57e74a2e6 | ||
|
|
0af22cd776 | ||
|
|
7ec665dd91 | ||
|
|
fa0786d627 | ||
|
|
d201dea34f | ||
|
|
637f67d4a1 | ||
|
|
7521b526ee | ||
|
|
6c4582faa6 | ||
|
|
0171d9c025 | ||
|
|
8b34d53358 | ||
|
|
008d06b7b5 | ||
|
|
5e8241fc7c | ||
|
|
cb1b627e20 | ||
|
|
a4463100c1 | ||
|
|
c89362ab82 | ||
|
|
eb11ed16ef | ||
|
|
b0d54c8a3f | ||
|
|
498ea5f6a4 | ||
|
|
39fe945e30 | ||
|
|
9994819e13 | ||
|
|
969493a031 | ||
|
|
5bdc822b7a | ||
|
|
90fac774ce | ||
|
|
5fdea2ada4 | ||
|
|
6188a2ba3f | ||
|
|
facbff3ef2 | ||
|
|
c3f867624c | ||
|
|
48e2f72008 | ||
|
|
d79690a269 | ||
|
|
17ef91e259 | ||
|
|
f70f4500e1 | ||
|
|
575a0fce81 | ||
|
|
ba35b711d2 | ||
|
|
56f1bf6b66 | ||
|
|
d41e436f4f | ||
|
|
a0dd8e60df | ||
|
|
6b89a87a02 | ||
|
|
d3b09741c7 | ||
|
|
56654a4ddf | ||
|
|
a4a2b8456b | ||
|
|
7631e9a5d2 | ||
|
|
bc4694a1a0 | ||
|
|
cab776350a | ||
|
|
ffe8bfcf09 | ||
|
|
5f3f93473f | ||
|
|
66a9b4ebfa | ||
|
|
435a374915 | ||
|
|
d04f2f64b4 | ||
|
|
ed489bab8f | ||
|
|
77a3e49cfd | ||
|
|
70aded1a40 | ||
|
|
6c2ed8a0b7 | ||
|
|
e64140408c | ||
|
|
8a4bf6ae0c | ||
|
|
945ff7ca30 | ||
|
|
54e6481310 | ||
|
|
4c3a65c407 | ||
|
|
788275c131 | ||
|
|
0bf6beac84 | ||
|
|
8c68d90a3d | ||
|
|
1d06e808f8 | ||
|
|
9f8c3f583d | ||
|
|
58056d0ccb | ||
|
|
9bf4111d98 | ||
|
|
653f1c296a | ||
|
|
2816d36221 | ||
|
|
b5080423ef | ||
|
|
7464b1b06b | ||
|
|
2c5f79c2a5 | ||
|
|
bd52348126 | ||
|
|
17b04ae60d | ||
|
|
52998a5db0 | ||
|
|
ca4458f20d | ||
|
|
884edc604b | ||
|
|
ebc0d3e26d | ||
|
|
1905d5923b | ||
|
|
48df7ee075 | ||
|
|
aaeb6f4c11 | ||
|
|
c0e3756a96 | ||
|
|
bade06bee1 | ||
|
|
9032f77010 | ||
|
|
8b31031f8b | ||
|
|
420e743bce | ||
|
|
21e19ccdcb | ||
|
|
dde048fb4c | ||
|
|
2190016c06 | ||
|
|
b094bf8600 | ||
|
|
74ed921355 | ||
|
|
cd9ba50d57 | ||
|
|
a2b1c8a95b | ||
|
|
99fe87a005 | ||
|
|
f260c78bb9 | ||
|
|
d788c5ad73 | ||
|
|
84af1ee70e | ||
|
|
92f24ec988 | ||
|
|
4937464195 | ||
|
|
810d347e95 | ||
|
|
6b6a20e6d3 | ||
|
|
cc150d9a4a | ||
|
|
7330494e58 | ||
|
|
63064ca3ca | ||
|
|
ccc9d046c8 | ||
|
|
6bf06c6c72 | ||
|
|
ff84e07881 | ||
|
|
03a7440473 | ||
|
|
ebdb594515 | ||
|
|
5e0aaecc3e | ||
|
|
fe4449d2ea | ||
|
|
09ed6d6ff7 | ||
|
|
4b781d9a9d | ||
|
|
ee1f24f60e | ||
|
|
f5f9873684 | ||
|
|
fdbd7a05f0 | ||
|
|
62b530b48f | ||
|
|
0c774de473 | ||
|
|
8de4d75683 | ||
|
|
366881fe8f | ||
|
|
92e477dd45 | ||
|
|
5ef663af0d | ||
|
|
7d02255b46 | ||
|
|
a7e545034c | ||
|
|
e1556c4b45 | ||
|
|
c45b685c17 | ||
|
|
f4f016b407 | ||
|
|
634b22175d | ||
|
|
e07baaafec | ||
|
|
165afc8d90 | ||
|
|
657a1c254f | ||
|
|
38139b9091 | ||
|
|
bf10bcdaa6 | ||
|
|
87cd2f107f | ||
|
|
0e3d51db02 | ||
|
|
332d067112 | ||
|
|
4c348d6cf0 | ||
|
|
148dfede6c | ||
|
|
9639c04448 | ||
|
|
de8ba8af63 | ||
|
|
d719a81d1c | ||
|
|
d2ce2399b9 | ||
|
|
59ee90dd10 | ||
|
|
736f836232 | ||
|
|
d319bac4a5 | ||
|
|
06785bad3f | ||
|
|
a3f7b0af9a | ||
|
|
7681b80ec8 | ||
|
|
3509e1ae1b | ||
|
|
0dea692e41 | ||
|
|
bd346bd578 | ||
|
|
2116fbf347 | ||
|
|
a61c6130e2 | ||
|
|
80c34a07e1 | ||
|
|
a0bfa4cd48 | ||
|
|
6f431852e3 | ||
|
|
11605b7982 | ||
|
|
86dfe16551 | ||
|
|
f47020ce7f | ||
|
|
7855c64765 | ||
|
|
d120a04206 | ||
|
|
f7ab391eff | ||
|
|
c96f2e66b2 | ||
|
|
cfdc61eb46 | ||
|
|
3b6404b7e6 | ||
|
|
0879dc2788 | ||
|
|
c847cb6942 | ||
|
|
0e51aaba09 | ||
|
|
73841ee525 | ||
|
|
67e30955f7 | ||
|
|
290d10418c | ||
|
|
946a164907 | ||
|
|
444bb7909e | ||
|
|
e585b91339 | ||
|
|
24de93fbfb | ||
|
|
53deb4d0d3 | ||
|
|
3994e845ad | ||
|
|
b3e1cba56b | ||
|
|
0074cf0ae0 | ||
|
|
5cabfa755f | ||
|
|
9a14f70223 | ||
|
|
eb591c0343 | ||
|
|
11aeb1ccb8 | ||
|
|
05ac9c286d | ||
|
|
cdc69eea08 | ||
|
|
c82aeb0256 | ||
|
|
7e9b5d0006 | ||
|
|
f64aca75a5 | ||
|
|
b6cb642778 | ||
|
|
87b01d90f8 | ||
|
|
9e76c47a09 | ||
|
|
9487cc8b06 | ||
|
|
411b8f6a4f | ||
|
|
ae1c6a6b8f | ||
|
|
5505f8030f | ||
|
|
24377f19a2 | ||
|
|
2ec467ef04 | ||
|
|
fef78b2e6b | ||
|
|
3c40a48ab5 | ||
|
|
8a3595991a | ||
|
|
7505461ccc | ||
|
|
89f35b616d | ||
|
|
b557d9f8c6 | ||
|
|
c7fe02ebbb | ||
|
|
402d68f478 | ||
|
|
06a8cb68ff | ||
|
|
c707825a92 | ||
|
|
9c69899620 | ||
|
|
56f4702278 | ||
|
|
72446cedd3 | ||
|
|
286b2e147d | ||
|
|
c01b52a6d2 | ||
|
|
0afe548fd6 | ||
|
|
06d45ea0bf | ||
|
|
43a097d03b | ||
|
|
54a4a789c3 | ||
|
|
22f0231587 | ||
|
|
d762da42e1 | ||
|
|
b1241f4f74 | ||
|
|
f50ab269d7 | ||
|
|
d39f4a0327 | ||
|
|
fc9cb70024 | ||
|
|
ed94f0af51 | ||
|
|
104f8e8de7 | ||
|
|
5253bdc808 | ||
|
|
91fbaff4f4 | ||
|
|
7bda539e49 | ||
|
|
6277e5fa47 | ||
|
|
d194f4895f | ||
|
|
d0310dc61c | ||
|
|
cf659e0055 | ||
|
|
dcfddbdfdd | ||
|
|
242eab79c7 | ||
|
|
75a25f0711 | ||
|
|
e29304dd9f | ||
|
|
856b7ee4d3 | ||
|
|
2ba4eb866a | ||
|
|
74b05d60e1 | ||
|
|
875af8f213 | ||
|
|
a3173eb04c | ||
|
|
749a97775f | ||
|
|
adf2501615 | ||
|
|
33a5f275a1 | ||
|
|
0095c44431 | ||
|
|
13b127c468 | ||
|
|
9108f01264 | ||
|
|
4c05c081c3 | ||
|
|
d5e4d0efd7 | ||
|
|
880917b64c | ||
|
|
0e6ed98b68 | ||
|
|
e207a74995 | ||
|
|
daa6596b41 | ||
|
|
d3b26140e3 | ||
|
|
f89b59e680 | ||
|
|
2829a5701d | ||
|
|
96fdcb55d2 | ||
|
|
740e49cc4e | ||
|
|
f8f13fc533 | ||
|
|
463fdfdaab | ||
|
|
57c5185104 | ||
|
|
9c26964779 | ||
|
|
3898c2fc42 | ||
|
|
1749cd18c3 | ||
|
|
0085e1242f | ||
|
|
b78e7109f2 | ||
|
|
5328640ace | ||
|
|
e722615273 | ||
|
|
faa68bf51e | ||
|
|
b8f49ca656 | ||
|
|
a0c1904ae9 | ||
|
|
b71e535541 | ||
|
|
01ab3165f6 | ||
|
|
44731c7771 | ||
|
|
0773d31fd7 | ||
|
|
86318dc3ff | ||
|
|
46abd60d9d | ||
|
|
2dceadbd7d | ||
|
|
9e2f4084a8 | ||
|
|
5731c4e0be | ||
|
|
c776897e72 | ||
|
|
ae071ab379 | ||
|
|
8b43f4a1ec | ||
|
|
24ad0b1802 | ||
|
|
cfc26bf7ba | ||
|
|
b41a99a719 | ||
|
|
5c0825328c | ||
|
|
cacec2b614 | ||
|
|
c63af68d6c | ||
|
|
99962c1405 | ||
|
|
d488a5afba | ||
|
|
592f47200c | ||
|
|
77518e50a6 | ||
|
|
42799aafda | ||
|
|
8c6b2514e6 | ||
|
|
c6a8967c8b | ||
|
|
bb2a44c539 | ||
|
|
7c7f44bb45 | ||
|
|
5e7e988de0 | ||
|
|
d08b3f4d4d | ||
|
|
1ef2e664f1 | ||
|
|
aa083beaaf | ||
|
|
8704585bb0 | ||
|
|
8eec24a15c | ||
|
|
58f44d8fb8 | ||
|
|
b8437e4035 | ||
|
|
fe17ecfccc | ||
|
|
67735d600a | ||
|
|
a544fcb683 | ||
|
|
909d875426 | ||
|
|
5abad4e282 | ||
|
|
5d75f4a214 | ||
|
|
e00e230d27 | ||
|
|
f4ed000684 | ||
|
|
0e5b83cf80 | ||
|
|
e1c3d5083c | ||
|
|
519cc493e0 | ||
|
|
9017e60538 | ||
|
|
bc1c01a1bc | ||
|
|
920d5735f8 | ||
|
|
0095332a0a | ||
|
|
086d68cb8c | ||
|
|
0f2b501974 | ||
|
|
837c5bc04a | ||
|
|
271985fcb4 | ||
|
|
eb141d6eda | ||
|
|
adf7ea8a79 | ||
|
|
dc923fa092 | ||
|
|
ce0ed9b169 | ||
|
|
4c9cd8ae91 | ||
|
|
69de3b94a9 | ||
|
|
7e35d609f6 | ||
|
|
7f17ea83d6 | ||
|
|
db733b6310 | ||
|
|
be58898ac9 | ||
|
|
4a266c905b | ||
|
|
4abae82403 | ||
|
|
484e8a9c23 | ||
|
|
4b1750f093 | ||
|
|
fd959ae341 | ||
|
|
08fa9313c3 | ||
|
|
8088a840c9 | ||
|
|
872bc5e78d | ||
|
|
4450e4f36c | ||
|
|
2e4809bb25 | ||
|
|
5f5eccda72 | ||
|
|
954e4a68f0 | ||
|
|
5108899bc3 | ||
|
|
83bf7d5718 | ||
|
|
99e8f47ce1 | ||
|
|
b54a1bc4fc | ||
|
|
3134f3d468 | ||
|
|
db14568241 | ||
|
|
f0b06ba771 | ||
|
|
1ceec50e50 | ||
|
|
e745dc9d7b | ||
|
|
43f7f1f167 | ||
|
|
9f6b6f0257 | ||
|
|
a03972b19c | ||
|
|
b5d7bbd631 | ||
|
|
aed6652217 | ||
|
|
199d9d350d | ||
|
|
12849a7ca0 | ||
|
|
77305e2f52 | ||
|
|
f44095e8e7 | ||
|
|
cbc2a18c7a | ||
|
|
4deeeb8ea2 | ||
|
|
018e0a82cc | ||
|
|
16e6093633 | ||
|
|
f77d978aec | ||
|
|
1d1f67c55d | ||
|
|
698990562e | ||
|
|
0372a7d36c | ||
|
|
8581db53f9 | ||
|
|
2beedb7e0d | ||
|
|
0bb28cc626 | ||
|
|
fe7cc5f7b0 | ||
|
|
6781323d55 | ||
|
|
a8e0c2a63e | ||
|
|
18c5555388 | ||
|
|
64e429ea02 | ||
|
|
c51aeecd06 | ||
|
|
cf87918d79 | ||
|
|
8682a6e6cf | ||
|
|
55d3883d58 | ||
|
|
dedc3c7d4a | ||
|
|
0d7b37e38b | ||
|
|
29d52c3832 | ||
|
|
5720d7d887 | ||
|
|
513823ba5d | ||
|
|
c17c036a0f | ||
|
|
a8d406e57c | ||
|
|
72c85b3f5b | ||
|
|
7986f03568 | ||
|
|
1d5f19a418 | ||
|
|
03c50e634a | ||
|
|
a614dda122 | ||
|
|
3f842303d8 | ||
|
|
8a04d42a92 | ||
|
|
afedc19d57 | ||
|
|
7d502f9e42 | ||
|
|
c551d393cb | ||
|
|
07d7e32348 | ||
|
|
16912e3290 | ||
|
|
b6a3c61dfe | ||
|
|
ad56e24127 | ||
|
|
724ce1f541 | ||
|
|
68f463760a | ||
|
|
10eac1ffc6 | ||
|
|
7476bb67a1 | ||
|
|
57c9df9dc9 | ||
|
|
5beecae05f | ||
|
|
b80265f24d | ||
|
|
87bc5cf235 | ||
|
|
5f7c76e007 | ||
|
|
1efd262315 | ||
|
|
89ac713d92 | ||
|
|
29ca30cb99 | ||
|
|
d905457092 | ||
|
|
4f88127091 | ||
|
|
c8f2696d4c | ||
|
|
7fc2531a8c | ||
|
|
95ea69a78f | ||
|
|
557329075f | ||
|
|
bbe5602bf6 | ||
|
|
2ad1f22298 | ||
|
|
84acb20806 | ||
|
|
171c5891ec | ||
|
|
338e4e40b1 | ||
|
|
e32c6bb2d6 | ||
|
|
5fc26287cb | ||
|
|
298e995c6b | ||
|
|
8bbce5b3e5 | ||
|
|
7b205f62fe | ||
|
|
6527c9859e | ||
|
|
5ccaab3302 | ||
|
|
6035f67aad | ||
|
|
a930afe949 | ||
|
|
3d73780c01 | ||
|
|
06709a4057 | ||
|
|
4571877241 | ||
|
|
9711111a36 | ||
|
|
6b9aa97eec | ||
|
|
fe32a357a0 | ||
|
|
d21ab5c668 | ||
|
|
140c75d461 | ||
|
|
30e59cbdbe | ||
|
|
0a2b003fce | ||
|
|
2a7ecf6074 | ||
|
|
640eed235b | ||
|
|
d915385031 | ||
|
|
112c576a95 | ||
|
|
b42d5ecd62 | ||
|
|
de955494aa | ||
|
|
5a93b0427b | ||
|
|
d9b641e6b5 | ||
|
|
9bcf350706 | ||
|
|
f4d767df04 | ||
|
|
93120e9a18 | ||
|
|
eddb064957 | ||
|
|
aef7bba79b | ||
|
|
ba7e4fc995 | ||
|
|
4bec53c435 | ||
|
|
c17ec74461 | ||
|
|
4a93784be0 | ||
|
|
19e35c7457 | ||
|
|
54c84d4322 | ||
|
|
abd064150a | ||
|
|
1820aa9120 | ||
|
|
f36173fa45 | ||
|
|
1d34d82cd1 | ||
|
|
456319cffd | ||
|
|
f3c5e34d16 | ||
|
|
871d88ffe1 | ||
|
|
b31728b9c4 | ||
|
|
7872ae0fae | ||
|
|
4c688fad87 | ||
|
|
34ba4248a4 | ||
|
|
fb2fe90953 | ||
|
|
bf6256573a | ||
|
|
8dc21b9b52 | ||
|
|
513ddd4f2b | ||
|
|
1e8b218970 | ||
|
|
6a03d27714 | ||
|
|
1a2619419f | ||
|
|
873ea0e4bf | ||
|
|
8447cd1c28 | ||
|
|
06ea04e31e | ||
|
|
e692059267 | ||
|
|
78c0a0cbaf | ||
|
|
dfa200a83b | ||
|
|
ad4f69e349 | ||
|
|
c2b980317a | ||
|
|
98d6d21020 | ||
|
|
f5822e645d | ||
|
|
f2f093aa87 | ||
|
|
2208b5252d | ||
|
|
1d59efdce2 | ||
|
|
43cecbbedd | ||
|
|
1d63f39c1f | ||
|
|
848c5331cf | ||
|
|
29a2448421 | ||
|
|
3a4fbd0193 | ||
|
|
73361fdc5b | ||
|
|
bc3ad67a02 | ||
|
|
0f7a8c5246 | ||
|
|
893c37e5d0 | ||
|
|
f30b1899cc | ||
|
|
fef326b367 | ||
|
|
91a33a9f5b | ||
|
|
7fd1c8941c | ||
|
|
951f7835a7 | ||
|
|
b310735a34 | ||
|
|
473ddc24e6 | ||
|
|
bd98173e01 | ||
|
|
7cca2b2357 | ||
|
|
02a397c749 | ||
|
|
c69e212be9 | ||
|
|
598c1fa541 | ||
|
|
34540de430 | ||
|
|
5cf99f870a | ||
|
|
fa9159fde7 | ||
|
|
ff9ba449dd | ||
|
|
c3e11e75a0 | ||
|
|
de10aeb983 | ||
|
|
2e7aa2d1f0 | ||
|
|
99d16f91bc | ||
|
|
4fed9fd491 | ||
|
|
94c9ea2cfb | ||
|
|
f212344585 | ||
|
|
dae1c9b541 | ||
|
|
928224f73b | ||
|
|
6eb02d9045 | ||
|
|
9ffdb6fc42 | ||
|
|
acc6520f28 | ||
|
|
9f6a642349 | ||
|
|
87dee5c8ad | ||
|
|
3b863c176e | ||
|
|
dec6961d9c | ||
|
|
978dde365a | ||
|
|
be8d124211 | ||
|
|
e48fe00d6c | ||
|
|
cdf5847bc9 | ||
|
|
88aac0099a | ||
|
|
9bfdec238c | ||
|
|
e299977244 | ||
|
|
a6f991a6e5 | ||
|
|
755d928123 | ||
|
|
50cb0ed9f7 | ||
|
|
9b58ede500 | ||
|
|
d4fc9e2531 | ||
|
|
42b272398a | ||
|
|
b0076809aa | ||
|
|
20ddfedfb7 | ||
|
|
c89b63b78e | ||
|
|
09830dde00 | ||
|
|
18cd3a9495 | ||
|
|
d3a4696e2a | ||
|
|
21429db907 | ||
|
|
e158b73337 | ||
|
|
51153ce76d | ||
|
|
e9fdeaf476 | ||
|
|
478c493589 | ||
|
|
2712b9cf48 | ||
|
|
68039317be | ||
|
|
9def4fd479 | ||
|
|
e8d4a64e14 | ||
|
|
c97abfdeb0 | ||
|
|
713dd2b5a2 | ||
|
|
ddee6b8aea | ||
|
|
d4163b10b3 | ||
|
|
b6c3dd98a5 | ||
|
|
0b2140a7ad | ||
|
|
a8657429be | ||
|
|
371a54c2f2 | ||
|
|
5b6e54de14 | ||
|
|
f704533086 | ||
|
|
e2de008ef6 | ||
|
|
ace0dbcad7 | ||
|
|
254d8a21a8 | ||
|
|
2d08f5f87f | ||
|
|
13aa6286d1 | ||
|
|
55bca1b173 | ||
|
|
26a1ee9eec | ||
|
|
7b0b0f6d5b | ||
|
|
6df0ee07f2 | ||
|
|
69dde6100c | ||
|
|
a2f82fa1b4 | ||
|
|
bad3639340 | ||
|
|
5526f29113 | ||
|
|
5aaaae758f | ||
|
|
1d057ac63d | ||
|
|
75410a1913 | ||
|
|
5e9501ba8e | ||
|
|
272fd395e0 | ||
|
|
ea5f5e6b3a | ||
|
|
d5aa510fc6 | ||
|
|
01a864650a | ||
|
|
774b12dc96 | ||
|
|
53804bbbbe | ||
|
|
91500aca09 | ||
|
|
a4444dc7e0 | ||
|
|
6ec07666d8 | ||
|
|
ab8a1f1782 | ||
|
|
4c428607fb | ||
|
|
b8a51ba171 | ||
|
|
3909a037fd | ||
|
|
063fc498bd | ||
|
|
5e9655b543 | ||
|
|
cb4d9c43e3 | ||
|
|
9342969191 | ||
|
|
7ee9415863 | ||
|
|
8d75c42adc | ||
|
|
3373651ed1 | ||
|
|
f1cf3d0710 | ||
|
|
1c116be819 | ||
|
|
5e378259ce | ||
|
|
a8a43c5789 | ||
|
|
f95a2dd39e | ||
|
|
b3c2b871ea | ||
|
|
5aaa208dee | ||
|
|
6bf79144ac | ||
|
|
1573af9f54 | ||
|
|
43e5e9b6bd | ||
|
|
5ca253b51d | ||
|
|
85f1a719a3 | ||
|
|
423a37bfbb | ||
|
|
5b1d8b2805 | ||
|
|
fc74d96efc | ||
|
|
b6e347d15b | ||
|
|
c6ad3c756a | ||
|
|
9d82cb8fb5 | ||
|
|
50ddefa763 | ||
|
|
47a6424c26 | ||
|
|
b842261f20 | ||
|
|
1b4092188d | ||
|
|
77c0a1d837 | ||
|
|
b28497f1a4 | ||
|
|
cc0a959013 | ||
|
|
396ba7043a | ||
|
|
71d85cf6d0 | ||
|
|
37bef043a3 | ||
|
|
4551b82364 | ||
|
|
a57d8cf46d | ||
|
|
140aec0cbe | ||
|
|
184aeed007 | ||
|
|
485f1f7e0a | ||
|
|
e467f9007e | ||
|
|
31d66f722c | ||
|
|
0bcfc2eadc | ||
|
|
334a2e5f70 | ||
|
|
f79da224ae | ||
|
|
21e3728b99 | ||
|
|
478df7d5c0 | ||
|
|
206829dfa6 | ||
|
|
0a38d42985 | ||
|
|
863478d0e0 | ||
|
|
d5f186a897 | ||
|
|
041f00e07d | ||
|
|
2ebaa0a978 | ||
|
|
e5c6bc5191 | ||
|
|
8ae3d9a952 | ||
|
|
0ed11717a7 | ||
|
|
9c41379645 | ||
|
|
ae53e6ac63 | ||
|
|
ac432c841c | ||
|
|
9e1165243c | ||
|
|
2bfbc1b8c2 | ||
|
|
be853ba12d | ||
|
|
2cbc61b085 | ||
|
|
984f09872a | ||
|
|
45624a50a5 | ||
|
|
0e172089a5 | ||
|
|
ee910d176d | ||
|
|
fd6f70f5e0 | ||
|
|
bbee68d4f8 | ||
|
|
879d136fe7 | ||
|
|
184d26cad2 | ||
|
|
a1bd49951d | ||
|
|
6eec5cbaf2 | ||
|
|
01ca06d6e6 | ||
|
|
ddbac35c1b | ||
|
|
b1dd6114fc | ||
|
|
0e1cf6d040 | ||
|
|
f9543a890e | ||
|
|
e2f661edd7 | ||
|
|
d6a179ea43 | ||
|
|
ad3439be7a | ||
|
|
72796f2799 | ||
|
|
46b28d5df3 | ||
|
|
1736c93b09 | ||
|
|
b219e74d2b | ||
|
|
0b480c3f28 | ||
|
|
8a450576bc | ||
|
|
e977734c7b | ||
|
|
d85f3c38f6 | ||
|
|
fd0037ba62 | ||
|
|
7983519488 | ||
|
|
0f0b7c9517 | ||
|
|
f440353dc4 | ||
|
|
f5e8c68a60 | ||
|
|
8a5d5b7a7b | ||
|
|
a684711df1 | ||
|
|
5f3730b767 | ||
|
|
a330053500 | ||
|
|
189ee960f9 | ||
|
|
674b4e25d0 | ||
|
|
7a758bce84 | ||
|
|
f0bdccdf0d | ||
|
|
8b4b1e9b43 | ||
|
|
546bfc399c | ||
|
|
2984b35da2 | ||
|
|
dbf47ce5ae | ||
|
|
b60eea2def | ||
|
|
74350ef1e0 | ||
|
|
6b0631aa46 | ||
|
|
3932290c2e | ||
|
|
a03d45e651 | ||
|
|
b1092542d4 | ||
|
|
179a59651d | ||
|
|
ef347db33b | ||
|
|
20a17b2704 | ||
|
|
df2f2a6783 | ||
|
|
e3d63894b2 | ||
|
|
6aecdf86ff | ||
|
|
797bf26c40 | ||
|
|
d04410d1f6 | ||
|
|
4ab5c5416b | ||
|
|
01d4a4b27b | ||
|
|
4e58606a79 | ||
|
|
9efc6efcdf | ||
|
|
e657f1beb3 | ||
|
|
d84da5d01a | ||
|
|
686a929d1b | ||
|
|
7ab2274d5e | ||
|
|
273fd28389 | ||
|
|
81b95a0979 | ||
|
|
994e78e787 | ||
|
|
f48c1b9d21 | ||
|
|
9581f7cc94 | ||
|
|
ccd65ad9fa | ||
|
|
01d7896831 | ||
|
|
9860e6163e | ||
|
|
d4d8b2d6be | ||
|
|
a7b6144435 | ||
|
|
da5953ee91 | ||
|
|
e7a081c1a5 | ||
|
|
d685ce0e89 | ||
|
|
115eaff478 | ||
|
|
5efef16a2e | ||
|
|
2ed2376763 | ||
|
|
ee147b0083 | ||
|
|
697ce6e33e | ||
|
|
dc5f1506f4 | ||
|
|
8b41e0518d | ||
|
|
39997e0b1c | ||
|
|
860c4ee3d9 | ||
|
|
31c54233c7 | ||
|
|
0ea0f751fc | ||
|
|
6c26417a28 | ||
|
|
1bc0a0df0c | ||
|
|
415766bfe5 | ||
|
|
ae493cff4e | ||
|
|
65bdd25c0d | ||
|
|
0fd393b9ed | ||
|
|
6c631b1015 | ||
|
|
2e724180a9 | ||
|
|
806a97d5ae | ||
|
|
10f2528453 | ||
|
|
21b4d5f226 | ||
|
|
672e121e4a | ||
|
|
1b022b8afb | ||
|
|
157a586524 | ||
|
|
02f326c053 | ||
|
|
e579462aa6 | ||
|
|
9c671bded9 | ||
|
|
f507bae326 | ||
|
|
cc4bffa716 | ||
|
|
70e9031ac9 | ||
|
|
1559f08173 | ||
|
|
7dad3879ad | ||
|
|
7fd2a8783b | ||
|
|
f45ccaeeb5 | ||
|
|
4c67e80f91 | ||
|
|
fe0eca5a00 | ||
|
|
8e21efdcf5 | ||
|
|
4244e2ef88 | ||
|
|
10598b3e74 | ||
|
|
f2f158ba67 | ||
|
|
ba8a2182db | ||
|
|
0347e82a47 | ||
|
|
29e0c36c2d | ||
|
|
fd7062773a | ||
|
|
66dbfb6990 | ||
|
|
a8a2299880 | ||
|
|
03c3991a1f | ||
|
|
462440d784 | ||
|
|
6d6cb1c1d6 | ||
|
|
6691f7c52c | ||
|
|
47545a831c | ||
|
|
5d56ff9cd2 | ||
|
|
f6b20861c5 | ||
|
|
62ffdc73cb | ||
|
|
75733e82ec | ||
|
|
62cee63841 | ||
|
|
ff8aeceada | ||
|
|
e5666653ff | ||
|
|
3c7d7ae100 | ||
|
|
9af863655d | ||
|
|
af0840aa45 | ||
|
|
09043136b6 | ||
|
|
fd18e5704f | ||
|
|
5b50a9864f | ||
|
|
dba73b39a6 | ||
|
|
c2196759d2 | ||
|
|
db1c86f20d | ||
|
|
42db60eb88 | ||
|
|
911c6836ce | ||
|
|
0d2186ab3b | ||
|
|
8570023f94 | ||
|
|
569800bf9c | ||
|
|
f528f5c233 | ||
|
|
5aa16e1c71 | ||
|
|
2428a4610c | ||
|
|
5d8c0213a5 | ||
|
|
f76461ac31 | ||
|
|
a26909a019 | ||
|
|
906760e680 | ||
|
|
5a4cffa02d | ||
|
|
a6b2c03af3 |
@@ -1,12 +1,9 @@
|
||||
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
|
||||
# for clang-format 17.0.1
|
||||
Language: Json
|
||||
IndentWidth: 4
|
||||
---
|
||||
Language: Cpp
|
||||
BasedOnStyle: 'WebKit'
|
||||
BasedOnStyle: "WebKit"
|
||||
# AccessModifierOffset: 2
|
||||
AlignAfterOpenBracket: 'AlwaysBreak'
|
||||
AlignAfterOpenBracket: "AlwaysBreak"
|
||||
AlignArrayOfStructures: None
|
||||
AlignConsecutiveAssignments: None
|
||||
AlignConsecutiveBitFields: None
|
||||
@@ -63,15 +60,15 @@ BraceWrapping:
|
||||
BreakAfterAttributes: Never
|
||||
BreakAfterJavaFieldAnnotations: true
|
||||
BreakArrays: true
|
||||
BreakBeforeBinaryOperators: NonAssignment
|
||||
BreakBeforeBinaryOperators: None
|
||||
BreakBeforeBraces: Custom
|
||||
BreakBeforeConceptDeclarations: Always
|
||||
BreakBeforeInlineASMColon: OnlyMultiline
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
BreakInheritanceList: BeforeComma
|
||||
BreakConstructorInitializers: AfterColon
|
||||
BreakInheritanceList: AfterColon
|
||||
BreakStringLiterals: true
|
||||
ColumnLimit: 100
|
||||
ColumnLimit: 120
|
||||
# CommentPragmas: '^ MEO pragma:'
|
||||
CompactNamespaces: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
@@ -87,12 +84,12 @@ FixNamespaceComments: true
|
||||
# - foreach
|
||||
# - Q_FOREACH
|
||||
# - BOOST_FOREACH
|
||||
# IfMacros:
|
||||
# IfMacros:
|
||||
# - 'KJ_IF_MAYBE'
|
||||
IncludeBlocks: Preserve
|
||||
# IncludeCategories:
|
||||
# IncludeIsMainRegex:
|
||||
# IncludeIsMainSourceRegex:
|
||||
# IncludeIsMainRegex:
|
||||
# IncludeIsMainSourceRegex:
|
||||
IndentAccessModifiers: false
|
||||
IndentCaseBlocks: false
|
||||
IndentCaseLabels: false
|
||||
@@ -130,7 +127,7 @@ NamespaceIndentation: None
|
||||
# ObjCSpaceAfterProperty:
|
||||
# ObjCSpaceBeforeProtocolList:
|
||||
PackConstructorInitializers: Never
|
||||
# PenaltyBreakAssignment:
|
||||
# PenaltyBreakAssignment:
|
||||
# PenaltyBreakBeforeFirstCallParameter:
|
||||
# PenaltyBreakComment:
|
||||
# PenaltyBreakFirstLessLess:
|
||||
@@ -183,7 +180,7 @@ SpacesInLineCommentPrefix:
|
||||
SpacesInParens: Never
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: c++20
|
||||
# StatementAttributeLikeMacros:
|
||||
# StatementAttributeLikeMacros:
|
||||
# StatementMacros:
|
||||
TabWidth: 4
|
||||
# TypeNames:
|
||||
|
||||
@@ -7,10 +7,7 @@
|
||||
"postCreateCommand": "sudo sh -ce 'apt update && apt install g++-12 -y && echo export CC=gcc-12 CXX=g++-12 >> /etc/profile.d/set-compiler.sh'",
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
"llvm-vs-code-extensions.vscode-clangd",
|
||||
"DavidAnson.vscode-markdownlint"
|
||||
]
|
||||
"extensions": ["llvm-vs-code-extensions.vscode-clangd", "DavidAnson.vscode-markdownlint"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ a5daac889a55baf8895918d4964f20dad1938470
|
||||
206df466fd5e3d8ef80387049b0c5011fb58cada
|
||||
c9b5aa638a97397ab8666031ea646904527afc09
|
||||
559c913fca0dd0966896396e251be13f76ea3e52
|
||||
|
||||
# Re-structure again.
|
||||
4b3b84df8f487be0ac86506c28dbebc4635f1282
|
||||
91abbb7f175b93a58368a136acf3799666f770d2
|
||||
@@ -29,3 +30,18 @@ c9b5aa638a97397ab8666031ea646904527afc09
|
||||
bae271c09bb79e5cc2a7f8491ce882d276ac97b4
|
||||
3d83b80dd67d996a5f4f1732fe1eb36cacc7605e
|
||||
21617270bcef2456cb7f89e54560ca6788450711
|
||||
|
||||
# resource/*.json prettier mass styling
|
||||
d84da5d01a872540d520bc87408d4524e07cfa39
|
||||
546bfc399cdd140a9812f44b5e6bc89fccfda5fa
|
||||
f0bdccdf0da7fac29f475951f0f43d3ab56a7ffe
|
||||
7a758bce844bc2778f04a789195efbd17681dac7
|
||||
5f3730b76785b1168125eb3b5edbed399722f8f9
|
||||
bc3ad67a02cb3b8e154c06955cf17091c4265000
|
||||
|
||||
# usage: add "[blame ignore]" to the commit message
|
||||
# This file is managed by an automated workflow
|
||||
# Do not add, remove or modify lines below this comment
|
||||
# as they are automatically appended
|
||||
# --------------------------------------------------- #
|
||||
f7772bc814c52f9a5e65af02404cf54b70fe0a32
|
||||
|
||||
1
.gitattributes
vendored
@@ -8,4 +8,5 @@
|
||||
|
||||
*.json text eol=lf
|
||||
*.md text eol=lf
|
||||
*.yml text eol=lf
|
||||
*.yaml text eol=lf
|
||||
|
||||
1
.github/.last-blame-ignore-commit
vendored
Normal file
@@ -0,0 +1 @@
|
||||
272d71fa2938f945832f86232532b86a9e5406b8
|
||||
54
.github/ISSUE_TEMPLATE/cn-bug-report.yaml
vendored
@@ -1,20 +1,22 @@
|
||||
name: Bug 反馈(使用中文)
|
||||
description: 识别错误、操作异常、连接错误等
|
||||
labels: ['bug']
|
||||
labels: ["bug"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
description: |
|
||||
请确认自己完成了要求之后再进行勾选
|
||||
options:
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已查看最新测试版本的更新内容,并未提及该 Bug 已被修复的情况
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(pinned issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我使用的是当前更新版本的最新版,且已查看版本发布至今和 Pull Requests 中尚未发布的更新内容,并未提及该 Bug 已被修复的情况
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue)(公告)、活跃议题(Open Issue)、已关闭议题(Closed Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -30,28 +32,45 @@ body:
|
||||
请提供 MAA 版本。可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
UI Version:
|
||||
Core Version:
|
||||
MAA Version:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: 日志文件
|
||||
label: 日志和配置文件
|
||||
description: |
|
||||
**请在关闭MAA后,上传 `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点**
|
||||
**请在关闭 MAA 后,上传以下 5 个文件:**
|
||||
1. `debug` 文件夹中的 `asst.log` `gui.log` `asst.bak.log` 和 `gui.bak.log` 日志文件,并说明问题出现的大致时间点
|
||||
2. `config` 文件夹中的 `gui.json` 配置文件
|
||||
|
||||
如果你在使用 MacBook,请点击屏幕左上角的“文件”,点击“打开日志文件夹”
|
||||
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
|
||||
placeholder: |
|
||||
请确认上传文件前已关闭 MAA
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: configuration
|
||||
attributes:
|
||||
label: 配置信息
|
||||
description: |
|
||||
请说明操作系统及版本、模拟器品牌、模拟器分辨率、DPI、帧率;
|
||||
若正在使用 MuMu 12 或雷电 9,请说明截图增强是否开启;
|
||||
最后请说明 GPU 加速推理是否开启,若开启请提供 GPU 型号。
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: 截图
|
||||
label: 截图或录屏
|
||||
description: |
|
||||
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
|
||||
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
|
||||
用其他的工具(如QQ)截取的图片包含窗口边框,不利于我们排除bug
|
||||
`debug` 文件夹下有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
用其他的工具(如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定,不利于我们排除bug
|
||||
若文件体积过大可压缩后再上传
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
@@ -59,7 +78,6 @@ body:
|
||||
attributes:
|
||||
label: 还有别的吗?
|
||||
description: |
|
||||
使用的模拟器?操作系统?相关的配置?链接?参考资料?
|
||||
任何能让我们对你所遇到的问题有更多了解的东西
|
||||
validations:
|
||||
required: false
|
||||
|
||||
14
.github/ISSUE_TEMPLATE/cn-feature-request.yaml
vendored
@@ -1,16 +1,20 @@
|
||||
name: 需求建议(使用中文)
|
||||
description: 新功能、建议等
|
||||
labels: ['enhancement']
|
||||
labels: ["enhancement"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我基本确定这是一个新功能/建议,而不是遇到了 Bug(不确定的话请附上日志)
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我基本确定这是一个新功能/建议,而不是遇到了 Bug(不确定的话请附上日志)
|
||||
required: true
|
||||
- label: 我使用的是当前更新版本的最新版,且已查看版本发布至今和 Pull Requests 中尚未发布的更新内容,确认我的建议未被提及
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue)(公告)、活跃议题(Open Issue)、已关闭议题(Closed Issue),确认我的建议未被提及
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
|
||||
85
.github/ISSUE_TEMPLATE/cn-ld-report.yaml
vendored
Normal file
@@ -0,0 +1,85 @@
|
||||
name: 雷电截图增强反馈(使用中文)
|
||||
description: 有关雷电 9 截图增强功能的集中反馈
|
||||
labels: ["LD9 API"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我正在使用最新的 MAA 公测版本和最新的官版雷电 9 模拟器
|
||||
required: true
|
||||
- label: 我已参考文档确定安装路径、实例编号填写正确,并确认在关闭截图增强模式后问题消失
|
||||
required: true
|
||||
- label: 我未开启高帧率,且模拟器帧数设置为 60
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
label: 问题描述
|
||||
description: 描述问题时请尽可能详细
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: |
|
||||
请提供 MAA 版本和雷电 9 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
|
||||
雷电 9 版本可在右上角菜单按钮 -> 关于雷电 中找到。
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
MAA Version:
|
||||
雷电 9 版本号:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: MAA 日志和配置文件
|
||||
description: |
|
||||
**请在关闭 MAA 后,上传以下三个文件:**
|
||||
1. `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点
|
||||
若 asst.log 文件小于 10 KB,则需同时上传 asst.log.bak 文件
|
||||
2. `config` 文件夹中的 `gui.json` 配置文件
|
||||
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
|
||||
placeholder: |
|
||||
请确认上传文件前已关闭 MAA
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: ldlogs
|
||||
attributes:
|
||||
label: 雷电 9 诊断信息
|
||||
description: |
|
||||
**在雷电 9 右上角菜单按钮 -> 诊断信息 中点击 复制信息,并将全部内容粘贴进来。**
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: 截图
|
||||
description: |
|
||||
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
|
||||
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
|
||||
用其他的工具(如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定,不利于我们排除bug
|
||||
若文件体积过大可压缩后再上传
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
id: others
|
||||
attributes:
|
||||
label: 其他
|
||||
description: |
|
||||
GPU 加速推理是否开启,若开启请提供 GPU 型号。
|
||||
亦或者任何能让我们对你所遇到的问题有更多了解的东西
|
||||
validations:
|
||||
required: false
|
||||
63
.github/ISSUE_TEMPLATE/cn-mumu-report.yaml
vendored
@@ -1,26 +1,24 @@
|
||||
name: MuMu 截图增强反馈(使用中文)
|
||||
description: 有关 MuMu 截图增强功能的集中反馈
|
||||
labels: ['mumu api']
|
||||
labels: ["MuMu API"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: 在提问之前...
|
||||
options:
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我正在使用最新的 MAA 内测版本和最新的**官版** MuMu 模拟器
|
||||
required: true
|
||||
- label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确,并确认在关闭截图增强模式后问题消失
|
||||
required: true
|
||||
- label: 我未开启高帧率模式,且显存使用策略为“画面表现更好”
|
||||
required: false
|
||||
- label: 我正在使用后台保活功能,并确定该问题仅在开启后台保活时出现
|
||||
required: false
|
||||
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
|
||||
required: true
|
||||
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
|
||||
required: true
|
||||
- label: 我已检查了置顶议题(Pinned Issue),确认我的问题未被提及
|
||||
required: true
|
||||
- label: 我正在使用最新的 MAA 公测版本和最新的官版或方舟专版 MuMu 模拟器
|
||||
required: true
|
||||
- label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确,并确认在关闭截图增强模式后问题消失
|
||||
required: true
|
||||
- label: 我未开启后台保活,模拟器帧数为 60,显存使用策略为“画面表现更好”
|
||||
required: false
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -32,22 +30,27 @@ body:
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: >-
|
||||
请提供 MAA 版本和 MuMu 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。MuMu 版本可在右上角菜单按钮 -> 关于 MuMu 中找到。
|
||||
description: |
|
||||
请提供 MAA 版本和 MuMu 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
|
||||
MuMu 版本可在右上角菜单按钮 -> 关于 MuMu 中找到。
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
UI Version:
|
||||
Core Version:
|
||||
MuMu 版本号:
|
||||
Resource Version:
|
||||
MAA Version:
|
||||
MuMu 版本号:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: MAA 日志文件
|
||||
label: MAA 日志和配置文件
|
||||
description: |
|
||||
**上传 `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点**
|
||||
**请在关闭 MAA 后,上传以下三个文件:**
|
||||
1. `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点
|
||||
若 asst.log 文件小于 10 KB,则需同时上传 asst.log.bak 文件
|
||||
2. `config` 文件夹中的 `gui.json` 配置文件
|
||||
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
|
||||
placeholder: |
|
||||
请确认上传文件前已关闭 MAA
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
@@ -64,18 +67,20 @@ body:
|
||||
attributes:
|
||||
label: 截图
|
||||
description: |
|
||||
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
|
||||
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
|
||||
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
|
||||
用其他的工具(如QQ)截取的图片包含窗口边框,不利于我们排除bug
|
||||
`debug` 文件夹下有一些自动截图的错误图片,若有相关的,请一并打包上传
|
||||
用其他的工具(如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定,不利于我们排除bug
|
||||
若文件体积过大可压缩后再上传
|
||||
validations:
|
||||
required: false
|
||||
- type: textarea
|
||||
id: others
|
||||
attributes:
|
||||
label: 还有别的吗?
|
||||
label: 其他
|
||||
description: |
|
||||
操作系统?相关的配置?链接?参考资料?
|
||||
任何能让我们对你所遇到的问题有更多了解的东西
|
||||
GPU 加速推理是否开启,若开启请提供 GPU 型号。
|
||||
亦或者任何能让我们对你所遇到的问题有更多了解的东西
|
||||
validations:
|
||||
required: false
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/cn-others.yaml
vendored
@@ -1,6 +1,6 @@
|
||||
name: 其他议题(使用中文)
|
||||
description: 提出问题,而不是 Bug 反馈或需求建议
|
||||
labels: ['question']
|
||||
labels: ["question"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
90
.github/ISSUE_TEMPLATE/en-bug-report.yaml
vendored
@@ -2,32 +2,35 @@ name: Bug Report (in English)
|
||||
description: >-
|
||||
Recognition errors, operation abnormalities,
|
||||
connection errors, etc.
|
||||
labels: ['bug']
|
||||
labels: ["bug"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Before raising the issue...
|
||||
description: |
|
||||
Please ensure that you have completed the requirements before checking the box.
|
||||
options:
|
||||
- label: >-
|
||||
I understand that Issues are for feedback and problem solving,
|
||||
not trolling the comments section, and will provide as
|
||||
much information as possible to help solve the problem.
|
||||
required: true
|
||||
- label: >-
|
||||
I filled in a short, clear title
|
||||
so that developers could quickly identify the general problem
|
||||
when going through the issue list.
|
||||
Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: >-
|
||||
I have checked the latest beta update and there is no mention
|
||||
of the bug being fixed.
|
||||
required: true
|
||||
- label: >-
|
||||
I have reviewed the pinned issues and confirmed that my issue
|
||||
is not mentioned.
|
||||
required: true
|
||||
- label: >-
|
||||
I understand that Issues are for feedback and problem solving,
|
||||
not trolling the comments section, and will provide as
|
||||
much information as possible to help solve the problem.
|
||||
required: true
|
||||
- label: >-
|
||||
I filled in a short, clear title
|
||||
so that developers could quickly identify the general problem
|
||||
when going through the issue list.
|
||||
Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: >-
|
||||
I am using the latest version of the current update and have reviewed
|
||||
both the updates released so far and the unreleased changes in the Pull Requests,
|
||||
there is no mention of the bug being fixed.
|
||||
required: true
|
||||
- label: >-
|
||||
I have reviewed the Pinned issue (Announcements), Open issues, and Closed issues
|
||||
to ensure that my issue has not been mentioned.
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
@@ -43,28 +46,45 @@ body:
|
||||
Please provide the MAA version. Can be found in MAA -> Settings -> Update. (Click to copy)
|
||||
placeholder: |
|
||||
Resource Version:
|
||||
UI Version:
|
||||
Core Version:
|
||||
MAA Version:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: logs
|
||||
attributes:
|
||||
label: Log files
|
||||
label: Log and config files
|
||||
description: >-
|
||||
**After closing the MAA, upload the `asst.log` and `gui.log` log file in the `debug` folder and**
|
||||
**indicate the approximate point in time when the problem occurred.**
|
||||
**After closing MAA, upload the following 5 files:**
|
||||
1. The `asst.log` `gui.log` `asst.bak.log` and `gui.bak.log` log file in the `debug` folder, and indicate the approximate point in time when the problem occurred.
|
||||
2. The `gui.json` config file in the `config` folder
|
||||
|
||||
If you are using MacBook, please click the "File" option in the top-left corner of the screen, then click "Open Log Folder".
|
||||
**Please drag and drop the full file in, not your own cuttings or copies;**
|
||||
**compress it before uploading if too large.**
|
||||
placeholder: |
|
||||
Please confirm that MAA is not running before uploading files.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: configuration
|
||||
attributes:
|
||||
label: Configuration information
|
||||
description: |
|
||||
Please specify the operating system and version, emulator brand, emulator resolution, DPI, and frame rate;
|
||||
If you are using MuMu 12 or LDPlayer 9, please specify whether Screenshot Enhancement is enabled;
|
||||
Finally, please specify whether GPU accelerated inference is enabled, and if so, provide the GPU model.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: Screenshots
|
||||
label: Screenshots or recordings
|
||||
description: >-
|
||||
If available, add screenshots to help explain your problem,
|
||||
In the `debug` directory, within the functionally categorized folders,
|
||||
there are some error images captured automatically.
|
||||
If related to this issue, please upload them together.
|
||||
|
||||
If available, upload screenshots and recordings to help explain your problem,
|
||||
including but not limited to screenshots of MAA software,
|
||||
screenshots of game screens.
|
||||
|
||||
@@ -72,11 +92,11 @@ body:
|
||||
the **original image** taken by the emulator's own screenshot tool
|
||||
(or via adb).
|
||||
|
||||
Screenshots taken with other tools may contain the frames of the window/emulator, which makes it harder for us to debug.
|
||||
Screenshots taken with other tools may contain the frames of the window/emulator
|
||||
and their aspect ratio and resolution are inconsistent,
|
||||
which makes it harder for us to debug.
|
||||
|
||||
The `debug` folder has some automatic screenshots of the error images,
|
||||
if you have any,
|
||||
please upload them together.
|
||||
If the file siz is too large, you may compress it before uploading.
|
||||
|
||||
validations:
|
||||
required: false
|
||||
@@ -84,11 +104,7 @@ body:
|
||||
id: others
|
||||
attributes:
|
||||
label: Anthing else?
|
||||
description: >-
|
||||
Emulator used, operating system, related configuration, links,
|
||||
reference material, etc.
|
||||
|
||||
Anything that will give us more insight into the problem
|
||||
you are having.
|
||||
description: |
|
||||
Anything that will give us more insight into the problem you are having.
|
||||
validations:
|
||||
required: false
|
||||
|
||||
14
.github/ISSUE_TEMPLATE/en-feature-request.yaml
vendored
@@ -1,16 +1,20 @@
|
||||
name: Feature Request (in English)
|
||||
description: New features, suggestions, etc.
|
||||
labels: ['enhancement']
|
||||
labels: ["enhancement"]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Before raising the issue...
|
||||
options:
|
||||
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)
|
||||
required: true
|
||||
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
|
||||
required: true
|
||||
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)
|
||||
required: true
|
||||
- label: I am using the latest version of the current update and have reviewed both the updates released so far and the unreleased changes in the Pull Requests, but there is no mention of this feature/suggestion being added.
|
||||
required: true
|
||||
- label: I have reviewed the Pinned issue (Announcements), Open issues, and Closed issues to ensure that my feature/suggestion has not been mentioned.
|
||||
required: true
|
||||
- type: textarea
|
||||
id: describe
|
||||
attributes:
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/en-others.yaml
vendored
@@ -1,6 +1,6 @@
|
||||
name: Others (in English)
|
||||
description: Ask a question rather than a bug report or feature request.
|
||||
labels: ['question']
|
||||
labels: ["question"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: describe
|
||||
|
||||
18
.github/dependabot.yaml
vendored
Normal file
@@ -0,0 +1,18 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: github-actions
|
||||
directory: /.github/workflows
|
||||
schedule:
|
||||
interval: weekly
|
||||
commit-message:
|
||||
prefix: ci
|
||||
assignees:
|
||||
- constrat
|
||||
- AnnAngela
|
||||
groups:
|
||||
github-actions:
|
||||
patterns:
|
||||
- "*"
|
||||
ignore:
|
||||
- dependency-name: "Nerixyz/actionsx-prettier"
|
||||
versions: ["3.0.0"]
|
||||
1057
.github/issue-checker.yml
vendored
1
.github/release_reviewers.yaml
vendored
@@ -11,7 +11,6 @@ reviewers:
|
||||
# A list of assignees to be added to pull requests (GitHub user name)
|
||||
assignees:
|
||||
- AnnAngela
|
||||
|
||||
# A list of keywords to be skipped the process that add reviewers if pull requests include it
|
||||
# skipKeywords:
|
||||
# - wip
|
||||
|
||||
48
.github/workflows/blame-ignore.yml
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
name: Git Blame Ignore
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "45 21 * * *" # Runs daily at 22:00 UTC
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
blame-ignore:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: false # Needed to bypass protection rules in Push changes
|
||||
|
||||
- name: Check blame
|
||||
id: check_changes
|
||||
run: |
|
||||
LAST_CHECKED_COMMIT=$(cat .github/.last-blame-ignore-commit 2>/dev/null || git rev-list --max-parents=0 HEAD)
|
||||
|
||||
git log $LAST_CHECKED_COMMIT..HEAD --pretty=format:"%H %s" --grep="\[blame ignore\]" | awk '{print $1}' >> .git-blame-ignore-revs
|
||||
|
||||
git diff --quiet .git-blame-ignore-revs
|
||||
|
||||
- name: Commit and Push changes
|
||||
if: ${{ steps.check_changes.outcome == 'failure' }}
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
git rev-parse HEAD > .github/.last-blame-ignore-commit
|
||||
|
||||
git add .github/.last-blame-ignore-commit .git-blame-ignore-revs
|
||||
git commit -m "chore: auto blame ignore" -m "[skip changelog]"
|
||||
|
||||
- name: Push changes
|
||||
if: ${{ steps.check_changes.outcome == 'failure' }}
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
branch: ${{ github.ref }}
|
||||
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
|
||||
- name: Stop if no changes
|
||||
if: ${{ steps.check_changes.outcome == 'success' }}
|
||||
uses: andymckay/cancel-action@0.5
|
||||
83
.github/workflows/ci.yml
vendored
@@ -28,8 +28,17 @@ on:
|
||||
- "!**/*.md"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
meta:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
tag: ${{ steps.set_tag.outputs.tag }}
|
||||
@@ -89,6 +98,11 @@ jobs:
|
||||
path: CHANGELOG.md
|
||||
|
||||
windows:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
|
||||
needs: meta
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -121,7 +135,16 @@ jobs:
|
||||
if: steps.cache-nuget.outputs.cache-hit != 'true'
|
||||
run: dotnet restore
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-${{ matrix.lowercase_target }}-maadeps-${{ hashFiles('./maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
@@ -179,11 +202,18 @@ jobs:
|
||||
path: artifacts
|
||||
|
||||
ubuntu:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
|
||||
needs: meta
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
matrix:
|
||||
arch: [aarch64, x86_64]
|
||||
permissions:
|
||||
actions: write
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
@@ -199,9 +229,8 @@ jobs:
|
||||
|
||||
- name: Setup ccache
|
||||
uses: Chocobo1/setup-ccache-action@v1
|
||||
with:
|
||||
remove_stale_cache: false
|
||||
|
||||
# Caching not necessary on ubuntu runner
|
||||
- name: Bootstrap MaaDeps
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -270,9 +299,9 @@ jobs:
|
||||
cp -v tools/AppImage/io.github.maaassistantarknights.maaassistantarknights.metainfo.xml Maa.AppDir/usr/share/metainfo/
|
||||
wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||
# appimagetool with embedded runtime does not support cross build, till AppImage/appimagetool 7a10b8
|
||||
wget "https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-${{ matrix.arch }}"
|
||||
wget "https://github.com/AppImage/type2-runtime/releases/download/old/runtime-fuse3-${{ matrix.arch }}"
|
||||
chmod a+x appimagetool-x86_64.AppImage
|
||||
ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --runtime-file runtime-${{ matrix.arch }} Maa.AppDir
|
||||
ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --runtime-file runtime-fuse3-${{ matrix.arch }} Maa.AppDir
|
||||
chmod a+x MaaAssistantArknights-${{ matrix.arch }}.AppImage
|
||||
mv -v MaaAssistantArknights-${{ matrix.arch }}.AppImage $GITHUB_WORKSPACE/release/MAA-${{ needs.meta.outputs.tag }}-linux-${{ matrix.arch }}.AppImage
|
||||
|
||||
@@ -291,6 +320,11 @@ jobs:
|
||||
release/*.tar.gz
|
||||
|
||||
macOS-Core:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
|
||||
needs: meta
|
||||
runs-on: macos-14
|
||||
strategy:
|
||||
@@ -306,6 +340,7 @@ jobs:
|
||||
run: |
|
||||
brew install ninja
|
||||
|
||||
# Caching not necessary on macOS runner
|
||||
- name: Bootstrap MaaDeps
|
||||
run: |
|
||||
[[ ${{ matrix.arch }} = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx"
|
||||
@@ -329,6 +364,11 @@ jobs:
|
||||
path: "install/*.dylib"
|
||||
|
||||
macOS-GUI:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
|
||||
needs: [meta, macOS-Core]
|
||||
runs-on: macos-14
|
||||
steps:
|
||||
@@ -357,6 +397,11 @@ jobs:
|
||||
p12-file-base64: ${{ secrets.HGUANDL_SIGN_CERT_P12 }}
|
||||
p12-password: ${{ secrets.HGUANDL_SIGN_CERT_PASSWD }}
|
||||
|
||||
- name: Setup Xcode Toolchain
|
||||
if: true
|
||||
run: |
|
||||
sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
|
||||
|
||||
- name: Build Universal Binaries
|
||||
run: |
|
||||
mkdir build
|
||||
@@ -364,6 +409,24 @@ jobs:
|
||||
lipo -create install-arm64/$LIB_NAME install-x86_64/$LIB_NAME -output build/$LIB_NAME
|
||||
done
|
||||
|
||||
- name: Archive Runtime Files
|
||||
run: |
|
||||
mkdir runtime && cd runtime
|
||||
name='MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal'
|
||||
mkdir "$name" && cd "$name"
|
||||
cp -v ../../build/*.dylib .
|
||||
ln -vs libonnxruntime*.dylib libonnxruntime.dylib
|
||||
ln -vs libopencv_world4*.dylib libopencv_world4.dylib
|
||||
cp -vr ../../resource .
|
||||
cd .. || exit 1
|
||||
zip -yrX9 "$name.zip" "$name"
|
||||
|
||||
- name: Upload MAA runtime to Github
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: MAA-macos-runtime-universal
|
||||
path: runtime/MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal.zip
|
||||
|
||||
- name: Build XCFramework
|
||||
run: |
|
||||
xcodebuild -create-xcframework -library libMaaCore.dylib -headers ../include -output MaaCore.xcframework
|
||||
@@ -439,8 +502,12 @@ jobs:
|
||||
path: ${{ startsWith(github.ref, 'refs/tags/v') && 'release/MAA*' || 'src/MaaMacGui/MAA.xcarchive/**' }}
|
||||
|
||||
release:
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
needs: [meta, windows, ubuntu, macOS-GUI]
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: (github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name) && startsWith(github.ref, 'refs/tags/v')
|
||||
|
||||
needs: [meta, windows, ubuntu, macOS-Core, macOS-GUI]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download MAA from Github
|
||||
@@ -457,7 +524,7 @@ jobs:
|
||||
find . -type f | while read f; do mv -fvt . $f; done
|
||||
|
||||
- name: Release to Github
|
||||
uses: softprops/action-gh-release@v1
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
body_path: CHANGELOG.md
|
||||
files: |
|
||||
|
||||
7
.github/workflows/gen-changelog.yml
vendored
@@ -2,7 +2,7 @@ name: gen-changelog
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
types:
|
||||
- opened
|
||||
- reopened
|
||||
- ready_for_review
|
||||
@@ -79,8 +79,9 @@ jobs:
|
||||
git commit -m "$commit_msg"
|
||||
|
||||
- name: Create PR
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
uses: peter-evans/create-pull-request@v7
|
||||
with:
|
||||
sign-commits: true
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
title: ${{ steps.extract_tag.outputs.pr_title }}
|
||||
body-path: ${{ format('{0}/{1}', runner.temp, 'output' ) }}
|
||||
@@ -93,6 +94,6 @@ jobs:
|
||||
AnnAngela
|
||||
|
||||
- name: Add reviewers to release PR
|
||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
||||
uses: kentaro-m/auto-assign-action@v2.0.0
|
||||
with:
|
||||
configuration-path: ".github/release_reviewers.yaml"
|
||||
|
||||
3
.github/workflows/issue-checker.yml
vendored
@@ -1,4 +1,5 @@
|
||||
name: "Issue Checker"
|
||||
|
||||
on:
|
||||
issues:
|
||||
types: [opened, edited]
|
||||
@@ -16,7 +17,7 @@ jobs:
|
||||
triage:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: zzyyyl/issue-checker@v1.8
|
||||
- uses: MaaAssistantArknights/issue-checker@v1.14
|
||||
with:
|
||||
repo-token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
configuration-path: .github/issue-checker.yml
|
||||
|
||||
75
.github/workflows/markdown-checker.yml
vendored
@@ -1,49 +1,56 @@
|
||||
name: Lint Markdown files
|
||||
name: Check Dead Links
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- "**/*.md"
|
||||
- ".github/workflows/lint-markdown.yml"
|
||||
pull_request:
|
||||
paths:
|
||||
- "**/*.md"
|
||||
- ".github/workflows/lint-markdown.yml"
|
||||
schedule:
|
||||
- cron: "44 7 * * 2"
|
||||
- cron: "0 0 * * 2" # Every Tuesday at 00:00 UTC
|
||||
push:
|
||||
branches:
|
||||
- dev
|
||||
paths:
|
||||
- "**/*.md"
|
||||
- "docs/**"
|
||||
- ".github/workflows/markdown-checker.yml"
|
||||
pull_request:
|
||||
branches:
|
||||
- dev
|
||||
paths:
|
||||
- "**/*.md"
|
||||
- "docs/**"
|
||||
- ".github/workflows/markdown-checker.yml"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Lint Markdown
|
||||
check-links:
|
||||
if: ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
|
||||
name: Check Dead Links
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
pull-requests: write
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
|
||||
- name: Lint Markdown
|
||||
uses: DavidAnson/markdownlint-cli2-action@v16
|
||||
- name: Check dead links
|
||||
uses: lycheeverse/lychee-action@v2
|
||||
with:
|
||||
config: docs/.markdownlint.yaml
|
||||
globs: |
|
||||
README.md
|
||||
docs/**/*.md
|
||||
# 仅检查内部链接和 Github 相关链接
|
||||
args: >
|
||||
--verbose --no-progress --cache --max-cache-age 1d
|
||||
--exclude 'https?://.*'
|
||||
--include 'https?://github\.com/.*'
|
||||
--include 'https?://raw\.githubusercontent\.com/.*'
|
||||
--include 'https?://user-images\.githubusercontent\.com/.*'
|
||||
--exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md'
|
||||
--exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md'
|
||||
--exclude 'files/MAA_Runtime_Fix_Pwsh.ps1$'
|
||||
-- './docs/**/*.md' './README.md'
|
||||
|
||||
# check-links:
|
||||
# name: Check Dead Links
|
||||
# runs-on: ubuntu-latest
|
||||
# steps:
|
||||
# - name: Check out code
|
||||
# uses: actions/checkout@v4
|
||||
# with:
|
||||
# show-progress: false
|
||||
#
|
||||
# - name: Check Dead Link
|
||||
# uses: umbrelladocs/action-linkspector@v1
|
||||
# with:
|
||||
# # Use github-pr-review when triggered by a pull request; otherwise, use github-check
|
||||
# reporter: ${{ github.event_name == 'pull_request' && 'github-pr-review' || 'github-check' }}
|
||||
# filter_mode: nofilter
|
||||
# fail_on_error: true
|
||||
- name: Comment (only for PR)
|
||||
if: failure() && github.event_name == 'pull_request'
|
||||
uses: marocchino/sticky-pull-request-comment@v2
|
||||
with:
|
||||
message: |
|
||||
Dead links found in the documentation. Please fix them.
|
||||
Details: https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/${{ github.run_id }}
|
||||
|
||||
108
.github/workflows/optimize-templates.yml
vendored
Normal file
@@ -0,0 +1,108 @@
|
||||
name: Optimize PNG Templates
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "dev"
|
||||
paths:
|
||||
- "resource/**/*.png"
|
||||
- "docs/.vuepress/public/images/**"
|
||||
- "website/apps/web/public/**"
|
||||
- "website/apps/web/src/assets/links/**"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
commit_message:
|
||||
description: "Commit Message"
|
||||
type: string
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
optimize-png:
|
||||
# Skip workflow to prevent double consecutive runs
|
||||
# Skip workflow on PR merges
|
||||
if: ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check for 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)
|
||||
|
||||
if [[ "$pr_merge_status" == "[ ]" ]]; then
|
||||
echo "Direct push detected. Proceeding..."
|
||||
echo "is_pr=False" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "PR merge detected. Exiting."
|
||||
echo "is_pr=True" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
else
|
||||
echo "Manual trigger detected. Proceeding..."
|
||||
echo "is_pr=False" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Checkout repository
|
||||
if: steps.check_push.outputs.is_pr != 'True'
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup python
|
||||
if: steps.check_push.outputs.is_pr != 'True'
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Cache Python packages
|
||||
id: cache_python
|
||||
if: steps.check_push.outputs.is_pr != 'True' && always()
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.pythonLocation }}/lib/python3.11/site-packages
|
||||
key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.check_push.outputs.is_pr != 'True' && steps.cache_python.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
pip install -r tools/OptimizeTemplates/requirements.txt
|
||||
|
||||
- name: Setup oxipng
|
||||
if: steps.check_push.outputs.is_pr != 'True'
|
||||
uses: baptiste0928/cargo-install@v3
|
||||
with:
|
||||
crate: oxipng
|
||||
|
||||
- name: Run optimize_templates
|
||||
if: steps.check_push.outputs.is_pr != 'True'
|
||||
run: |
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py
|
||||
|
||||
- name: Commit changes
|
||||
id: commit_changes
|
||||
if: steps.check_push.outputs.is_pr != 'True'
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
git add .
|
||||
|
||||
if git diff-index --quiet HEAD --; then
|
||||
echo "No changes to commit"
|
||||
else
|
||||
commit_msg="${{ github.event.inputs.commit_message }}"
|
||||
if [ -z "$commit_msg" ]; then
|
||||
commit_msg="chore: Auto Templates Optimization"
|
||||
fi
|
||||
git commit -m "$commit_msg" -m "Triggered by ${{github.sha}}" -m "[skip changelog]"
|
||||
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
|
||||
echo "have_commits=True" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Push changes
|
||||
if: steps.check_push.outputs.is_pr != 'True' && steps.commit_changes.outputs.have_commits == 'True'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
branch: ${{ github.ref }}
|
||||
7
.github/workflows/pr-checker.yml
vendored
@@ -4,7 +4,6 @@ on:
|
||||
pull_request_target:
|
||||
types: [opened, edited, ready_for_review, reopened, synchronize]
|
||||
|
||||
|
||||
jobs:
|
||||
check_commit_name_in_pr:
|
||||
if: ${{ !github.event.pull_request.merged && github.base_ref != 'master' }}
|
||||
@@ -39,7 +38,7 @@ jobs:
|
||||
per_page: 100
|
||||
});
|
||||
|
||||
const regex = /^((build|chore|ci|docs?|feat!?|fix|perf|refactor|rft|style|test|i18n|typo)[\:\.\(\,]|[Rr]evert|[Rr]elease)/;
|
||||
const regex = /^((build|chore|ci|docs?|feat!?|fix|perf|refactor|rft|style|test|i18n|typo|debug)[\:\.\(\,]|[Rr]evert|[Rr]elease)/;
|
||||
const invalidCommits = commits.filter(commit => !regex.test(commit.commit.message) || commit.parents.length > 1);
|
||||
|
||||
console.log(`Checked ${commits.length} commit(s)`);
|
||||
@@ -52,8 +51,8 @@ jobs:
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: context.payload.pull_request.number,
|
||||
body: `## ⚠️ Found ${invalidCommits.length} invalid commit(s):\n\n${invalidCommitInfoList}\n\n---\nPlease follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format.`
|
||||
body: `## ⚠️ Found ${invalidCommits.length} invalid commit(s):\n\n${invalidCommitInfoList}\n\n---\nPlease follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format, and do not use merge commits.`
|
||||
});
|
||||
|
||||
core.setFailed(`Found ${invalidCommits.length} invalid commit(s):\n${invalidCommitNames.join("\n-------------------\n")}`);
|
||||
}
|
||||
}
|
||||
|
||||
174
.github/workflows/release-nightly-ota.yml
vendored
@@ -1,6 +1,8 @@
|
||||
name: release-nightly-ota
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 22 * * *" # Runs daily at 22:00 UTC
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
release_body:
|
||||
@@ -11,15 +13,15 @@ on:
|
||||
description: "Commit to build (git checkout)"
|
||||
type: string
|
||||
required: false
|
||||
limit:
|
||||
limit_maa:
|
||||
description: "Number of releases to fetch from MaaAssistantArknights"
|
||||
required: true
|
||||
default: 30
|
||||
default: "10"
|
||||
type: number
|
||||
limit_2:
|
||||
limit_mr:
|
||||
description: "Number of releases to fetch from MaaRelease"
|
||||
required: true
|
||||
default: 30
|
||||
default: "10"
|
||||
type: number
|
||||
|
||||
jobs:
|
||||
@@ -27,9 +29,7 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- msbuild_target: x64
|
||||
lowercase_target: x64
|
||||
msbuild_target: [x64]
|
||||
fail-fast: false
|
||||
env:
|
||||
MAABUILDER_TARGET_PLATFORM: ${{ matrix.msbuild_target }}
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
tag: ${{ steps.set_tag.outputs.tag }}
|
||||
pre_version: ${{ steps.set_tag.outputs.pre_version }}
|
||||
main_tag_name: ${{ steps.push_main_tag.outputs.main_tag_name }}
|
||||
changelog: ${{ steps.generate_changelog.outputs.changelog }}
|
||||
changelog: ${{ steps.read_changelog.outputs.content }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@@ -47,41 +47,82 @@ jobs:
|
||||
fetch-depth: 0
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Checkout ref
|
||||
- name: Checkout ref (if provided)
|
||||
if: inputs.ref != ''
|
||||
run: |
|
||||
if ("${{ inputs.ref }}" -ne "") {
|
||||
git checkout --progress --recurse-submodules ${{ inputs.ref || 'dev' }}
|
||||
}
|
||||
git checkout --progress --recurse-submodules ${{ inputs.ref }}
|
||||
|
||||
- name: Install semver
|
||||
run: |
|
||||
npm install --global --progress semver
|
||||
|
||||
- name: Set tag
|
||||
- name: Check for Changes and Set tag
|
||||
id: set_tag
|
||||
run: |
|
||||
# pre_version是上一个公版,这里需要拉上一个tag,避免堆积过多commit
|
||||
$latest_tag=$(git describe --tags --abbrev=0)
|
||||
echo "latest_tag=$latest_tag" >> $env:GITHUB_OUTPUT
|
||||
$described = $(git describe --tags --long --match 'v*')
|
||||
$ids = $($described -split "-")
|
||||
if ($ids.length -eq 3) {
|
||||
$ver = "v$(semver --increment $ids[0].Substring(1))"
|
||||
$pre_version = "$($ids[0])"
|
||||
$dist = `printf "%03d"` $ids[1]
|
||||
echo "tag=$ver-alpha.1.d$($dist).$($ids[2])" >> $env:GITHUB_OUTPUT
|
||||
echo "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
|
||||
# Fetch the latest tag from the repository
|
||||
$latest_tag = git describe --tags --abbrev=0
|
||||
|
||||
# Check for changes between the latest tag and HEAD
|
||||
$recent_changes = git log "$latest_tag..HEAD" --oneline
|
||||
|
||||
if (-not $recent_changes) {
|
||||
Write-Output "No commits. Cancelling workflow..."
|
||||
Write-Output "cancel_run=true" >> $env:GITHUB_ENV
|
||||
exit 0
|
||||
} else {
|
||||
Write-Output "Recent commits: $recent_changes"
|
||||
Write-Output "Commits found. Continuing build..."
|
||||
Write-Output "cancel_run=false" >> $env:GITHUB_ENV
|
||||
}
|
||||
|
||||
Write-Output "Previous Tag: $latest_tag"
|
||||
Write-Output "latest_tag=$latest_tag" >> $env:GITHUB_OUTPUT
|
||||
|
||||
# Get the full description of the current commit
|
||||
$described = git describe --tags --long --match 'v*'
|
||||
Write-Output "New Described: $described"
|
||||
$ids = $described -split "-"
|
||||
|
||||
if ($ids.Length -eq 3) {
|
||||
# Extract and parse the current version
|
||||
$current_version = $ids[0].Substring(1)
|
||||
$parts = $current_version -split '\.'
|
||||
if ($parts.Length -ne 3) {
|
||||
Write-Error "Invalid version format: $current_version. Expected 'major.minor.patch'."
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Increment the patch version
|
||||
$parts[2] = [int]$parts[2] + 1
|
||||
$new_version = "$($parts[0]).$($parts[1]).$($parts[2])"
|
||||
|
||||
# Construct the new tag and pre_version
|
||||
$ver = "v$new_version"
|
||||
$pre_version = $ids[0]
|
||||
$dist = "{0:D3}" -f [int]$ids[1]
|
||||
|
||||
Write-Output "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
|
||||
Write-Output "New Tag: $ver-alpha.1.d$dist.$($ids[2])"
|
||||
Write-Output "tag=$ver-alpha.1.d$dist.$($ids[2])" >> $env:GITHUB_OUTPUT
|
||||
|
||||
exit 0
|
||||
}
|
||||
if ($ids.length -eq 4) {
|
||||
$dist = `printf "%03d"` $ids[2]
|
||||
$pre_version = "$($ids[0])""-""$($ids[1])"
|
||||
echo "tag=$($ids[0])-$($ids[1]).d$($dist).$($ids[3])" >> $env:GITHUB_OUTPUT
|
||||
echo "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
|
||||
|
||||
if ($ids.Length -eq 4) {
|
||||
$dist = "{0:D3}" -f [int]$ids[2]
|
||||
$pre_version = "$($ids[0])-$($ids[1])"
|
||||
|
||||
Write-Output "Pre Version: $pre_version"
|
||||
Write-Output "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
|
||||
|
||||
Write-Output "tag: $pre_version.d$dist.$($ids[3])"
|
||||
Write-Output "tag=$pre_version.d$dist.$($ids[3])" >> $env:GITHUB_OUTPUT
|
||||
|
||||
exit 0
|
||||
}
|
||||
|
||||
exit 1
|
||||
|
||||
- name: Stop if no changes
|
||||
if: env.cancel_run == 'true'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
- name: Push tag to main repo
|
||||
id: push_main_tag
|
||||
run: |
|
||||
@@ -97,13 +138,21 @@ jobs:
|
||||
id: generate_changelog
|
||||
run: |
|
||||
python3 tools/ChangelogGenerator/changelog_generator.py --latest "${{ steps.set_tag.outputs.latest_tag }}" --tag "${{ steps.set_tag.outputs.tag }}"
|
||||
$content=$(((Get-Content .\changelog.md) | Select-Object -Skip 2) -join "\n\n")
|
||||
echo "changelog=$content" >> $env:GITHUB_OUTPUT
|
||||
echo $content
|
||||
Get-Content .\changelog.md | Select-Object -Skip 2 | Out-File -FilePath changelog_notag.md -Encoding utf8
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PYTHONIOENCODING: "utf-8"
|
||||
|
||||
- name: Stop if no changes
|
||||
if: steps.generate_changelog.outputs.cancel_run == 'true'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
- name: Read Changelog to variable
|
||||
id: read_changelog
|
||||
uses: juliangruber/read-file-action@v1
|
||||
with:
|
||||
path: ./changelog_notag.md
|
||||
|
||||
- name: Cache .nuke/temp, ~/.nuget/packages
|
||||
id: cache-nuget
|
||||
uses: actions/cache@v4
|
||||
@@ -111,17 +160,26 @@ jobs:
|
||||
path: |
|
||||
.nuke/temp
|
||||
~/.nuget/packages
|
||||
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
|
||||
key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
|
||||
|
||||
- name: Restore dependencies
|
||||
if: steps.cache-nuget.outputs.cache-hit != 'true'
|
||||
run: dotnet restore
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-${{ matrix.msbuild_target }}-maadeps-${{ hashFiles('./maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
run: |
|
||||
python3 maadeps-download.py ${{ matrix.lowercase_target }}-windows
|
||||
if: steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python3 maadeps-download.py ${{ matrix.msbuild_target }}-windows
|
||||
|
||||
- name: Taggify Version
|
||||
run: |
|
||||
@@ -159,7 +217,7 @@ jobs:
|
||||
- name: Upload MAA to Github
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: MAA-win-${{ matrix.lowercase_target }}
|
||||
name: MAA-win-${{ matrix.msbuild_target }}
|
||||
path: artifacts
|
||||
|
||||
push-tag:
|
||||
@@ -212,8 +270,17 @@ jobs:
|
||||
run: |
|
||||
mkdir -pv build-ota && cd build-ota
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 30 }} | tee ./release_maa.txt
|
||||
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
|
||||
# Convert inputs to integers
|
||||
limit_maa=${{ inputs.limit_maa || 10 }}
|
||||
limit_maa=${limit_maa%.*}
|
||||
echo "Parsed limit_maa: $limit_maa"
|
||||
|
||||
limit_mr=${{ inputs.limit_mr || 10 }}
|
||||
limit_mr=${limit_mr%.*}
|
||||
echo "Parsed limit_mr: $limit_mr"
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit_maa | tee ./release_maa.txt
|
||||
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_mr | tee ./release_mr.txt
|
||||
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
|
||||
|
||||
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
|
||||
@@ -242,22 +309,6 @@ jobs:
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Make release body
|
||||
id: make_release_body
|
||||
shell: bash
|
||||
run: |
|
||||
pre_version=${{ needs.build-win-nightly.outputs.pre_version }}
|
||||
cur_version=${{ needs.build-win-nightly.outputs.main_tag_name }}
|
||||
echo -e "${{ inputs.release_body || '' }}\n\n${{ needs.build-win-nightly.outputs.changelog }}\n\n**Full Changelog**: [$pre_version -> $cur_version](https://github.com/$GITHUB_REPOSITORY/compare/$pre_version...$cur_version)" > alpha_changelog.md
|
||||
export r=$(cat alpha_changelog.md)
|
||||
|
||||
# https://github.com/svenstaro/upload-release-action
|
||||
r="${r//'%'/'%25'}" # Multiline escape sequences for %
|
||||
r="${r//$'\n'/'%0A'}" # Multiline escape sequences for '\n'
|
||||
r="${r//$'\r'/'%0D'}" # Multiline escape sequences for '\r'
|
||||
echo $r
|
||||
echo "full_release_body=$r" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Upload to MaaRelease
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
@@ -268,7 +319,12 @@ jobs:
|
||||
tag: ${{ env.release_tag }}
|
||||
prerelease: true
|
||||
overwrite: true
|
||||
body: ${{ steps.make_release_body.outputs.full_release_body }}
|
||||
body: |
|
||||
${{ inputs.release_body || '' }}
|
||||
|
||||
${{ needs.build-win-nightly.outputs.changelog }}
|
||||
|
||||
**Full Changelog**: [${{ needs.build-win-nightly.outputs.pre_version }} -> ${{ needs.build-win-nightly.outputs.main_tag_name }}](https://github.com/${{ github.repository }}/compare/${{ needs.build-win-nightly.outputs.pre_version }}...${{ needs.build-win-nightly.outputs.main_tag_name }})
|
||||
|
||||
- name: Setup release mirror
|
||||
run: |
|
||||
|
||||
43
.github/workflows/release-ota.yml
vendored
@@ -9,12 +9,12 @@ on:
|
||||
limit:
|
||||
description: Number of releases to fetch from MaaAssistantArknights, 2 at least
|
||||
required: false
|
||||
default: '31'
|
||||
default: "31"
|
||||
type: number
|
||||
limit_2:
|
||||
description: Number of releases to fetch from MaaRelease
|
||||
required: false
|
||||
default: '30'
|
||||
default: "30"
|
||||
type: number
|
||||
|
||||
env:
|
||||
@@ -37,8 +37,18 @@ jobs:
|
||||
id: fetchReleaseInfo
|
||||
run: |
|
||||
mkdir -pv build-ota && cd build-ota
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
|
||||
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
|
||||
|
||||
# Convert inputs to integers
|
||||
limit=${{ inputs.limit || 31 }}
|
||||
limit=${limit%.*}
|
||||
echo "Parsed limit: $limit"
|
||||
|
||||
limit_2=${{ inputs.limit_2 || 30 }}
|
||||
limit_2=${limit_2%.*}
|
||||
echo "Parsed limit_2: $limit_2"
|
||||
|
||||
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit | tee ./release_maa.txt
|
||||
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit $limit_2 | tee ./release_mr.txt
|
||||
head -n 1 ./release_maa.txt | awk '{ print $1 }' > ./config
|
||||
|
||||
tail -n +1 ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
|
||||
@@ -156,31 +166,6 @@ jobs:
|
||||
run: |
|
||||
find ./packages -type f ! \( -name 'MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg' -o -name '*.delta' -o -name '*.xml' \) -print -delete
|
||||
|
||||
- name: Unpack the .dmg files for .dylib
|
||||
run: |
|
||||
cd ${{ runner.temp }}
|
||||
mkdir -p macos-runtime-temp
|
||||
echo ::group::Attaching release package...
|
||||
hdiutil attach ${{ github.workspace }}/packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg
|
||||
echo ::endgroup::
|
||||
echo ::group::Copying files...
|
||||
cp -v /Volumes/MAA/MAA.app/Contents/Frameworks/*.dylib macos-runtime-temp/
|
||||
cp -vr /Volumes/MAA/MAA.app/Contents/Resources/resource macos-runtime-temp/resource
|
||||
echo ::endgroup::
|
||||
echo ::group::Linking files...
|
||||
libonnxruntime_file=$(basename macos-runtime-temp/libonnxruntime*.dylib)
|
||||
ln -vs $libonnxruntime_file macos-runtime-temp/libonnxruntime.dylib
|
||||
libopencv_world_file=$(basename macos-runtime-temp/libopencv_world*.dylib)
|
||||
ln -vs $libopencv_world_file macos-runtime-temp/libopencv_world4.dylib
|
||||
echo ::endgroup::
|
||||
cd macos-runtime-temp
|
||||
echo ::group::Compressing files...
|
||||
zip -yrX9 ${{ github.workspace }}/packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-runtime-universal.zip *
|
||||
echo ::endgroup::
|
||||
echo ::group::Detaching release package...
|
||||
hdiutil detach /Volumes/MAA
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Upload to MaaRelease
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
|
||||
287
.github/workflows/res-update-game.yml
vendored
@@ -2,7 +2,7 @@ name: res-update-game
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "*/20 * * * *"
|
||||
- cron: "*/20 * * * *" # Runs every 20 minutes
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
commit_message:
|
||||
@@ -11,38 +11,18 @@ on:
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
update-game-resources:
|
||||
clone-resources-official:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout MAA
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
token: ${{ secrets.MISTEOWORKFLOW }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
run: |
|
||||
python3 maadeps-download.py x64-windows
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1
|
||||
|
||||
- name: Build Resource Updater
|
||||
run: |
|
||||
MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
|
||||
|
||||
- name: Clone ArknightsGameResource for Official
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: yuanyan3060/ArknightsGameResource
|
||||
ref: main
|
||||
path: .\tools\ResourceUpdater\x64\Release\Official
|
||||
path: ./Official
|
||||
sparse-checkout-cone-mode: false
|
||||
sparse-checkout: |
|
||||
/levels.json
|
||||
/item
|
||||
@@ -54,15 +34,26 @@ jobs:
|
||||
/gamedata/excel/gacha_table.json
|
||||
/gamedata/excel/roguelike_topic_table.json
|
||||
/gamedata/excel/activity_table.json
|
||||
sparse-checkout-cone-mode: false
|
||||
|
||||
- name: Upload Official
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: official
|
||||
path: ./Official
|
||||
compression-level: 0
|
||||
|
||||
clone-resources-overseas:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone ArknightsGameResource_Yostar for Overseas
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: Kengxxiao/ArknightsGameData_Yostar
|
||||
ref: main
|
||||
path: .\tools\ResourceUpdater\x64\Release\Overseas
|
||||
path: ./Overseas
|
||||
sparse-checkout-cone-mode: false
|
||||
sparse-checkout: |
|
||||
/en_US/gamedata/excel/item_table.json
|
||||
/en_US/gamedata/excel/building_data.json
|
||||
@@ -85,105 +76,231 @@ jobs:
|
||||
/ko_KR/gamedata/excel/gacha_table.json
|
||||
/ko_KR/gamedata/excel/roguelike_topic_table.json
|
||||
/ko_KR/gamedata/excel/activity_table.json
|
||||
sparse-checkout-cone-mode: false
|
||||
|
||||
- name: Upload Official
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: overseas
|
||||
path: ./Overseas
|
||||
compression-level: 0
|
||||
|
||||
clone-resources-txwy:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone arknights-toolbox-update for Taiwan
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
show-progress: false
|
||||
repository: arkntools/arknights-toolbox-update
|
||||
ref: data-tw
|
||||
path: .\tools\ResourceUpdater\x64\Release\Overseas\zh_TW\gamedata\excel
|
||||
path: ./excel
|
||||
token: ${{ secrets.ARKNTOOLS_MAA_RESOURCE_UPDATER}}
|
||||
|
||||
- name: Download stages.json from Penguin Stats
|
||||
run: |
|
||||
cd "./excel"
|
||||
|
||||
baseUrl="https://penguin-stats.io/PenguinStats/api/v2/stages?server="
|
||||
|
||||
parameters=("CN" "US" "JP" "KR")
|
||||
|
||||
for param in "${parameters[@]}"; do
|
||||
{
|
||||
if curl -s -o "stages_${param}.json" "${baseUrl}${param}"; then
|
||||
echo "Successfully fetched data for ${param}"
|
||||
else
|
||||
echo "Failed to fetch data for ${param}" >&2
|
||||
exit 1
|
||||
fi
|
||||
} &
|
||||
done
|
||||
wait
|
||||
|
||||
- name: Upload Official
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: txwy
|
||||
path: ./excel
|
||||
compression-level: 0
|
||||
|
||||
update-game-resources:
|
||||
# In case of rate limitations on the runners/instances, add dependency, by removing the comment
|
||||
|
||||
# needs: [clone-resources-official, clone-resources-overseas, clone-resources-txwy]
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout MAA
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
# TL;DR https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9872#issuecomment-2251378371
|
||||
# actions/checkout uses ${{ secrets.GITHUB_TOKEN }} by default, meaning all steps will inherit it
|
||||
persist-credentials: false # Needed to bypass protection rules in Push changes
|
||||
show-progress: false
|
||||
fetch-depth: 3
|
||||
|
||||
- name: Restore ResourceUpdater.exe from cache
|
||||
id: cache-resupd
|
||||
uses: actions/cache/restore@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-resource-updater-main-cpp-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
|
||||
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
|
||||
|
||||
- name: Cache MaaDeps
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-maadeps-${{ hashFiles('./maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true' && steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python3 maadeps-download.py x64-windows
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
||||
- name: Build Resource Updater
|
||||
if: steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
|
||||
|
||||
- name: Save ResourceUpdater.exe to cache
|
||||
if: always() && steps.cache-resupd.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-resource-updater-main-cpp-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
|
||||
path: |
|
||||
./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
|
||||
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
|
||||
|
||||
- name: Download txwy
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: txwy
|
||||
path: ./tools/ResourceUpdater/x64/Release/Overseas/zh_TW/gamedata/excel
|
||||
|
||||
- name: Download Overseas
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: overseas
|
||||
path: ./tools/ResourceUpdater/x64/Release/Overseas
|
||||
|
||||
- name: Download Official
|
||||
uses: actions/download-artifact@v4.1.8
|
||||
with:
|
||||
name: official
|
||||
path: ./tools/ResourceUpdater/x64/Release/Official
|
||||
|
||||
- name: Run Resource Updater
|
||||
run: |
|
||||
.\tools\ResourceUpdater\x64\Release\ResourceUpdater.exe
|
||||
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
|
||||
|
||||
- name: Overseas Tasks Ordering
|
||||
- name: Task Sorting
|
||||
id: task_sorting
|
||||
run: |
|
||||
python3 tools/TaskSorter/TaskSorter.py
|
||||
Write-Output "gitdiff=$(git diff --name-only --diff-filter=ACM 2>$null | Select-String -Pattern '\.json$' -List)" >> $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Check if only sorted
|
||||
id: check_only_sorted
|
||||
- name: Run prettier
|
||||
uses: Nerixyz/actionsx-prettier@v3-adj
|
||||
with:
|
||||
args: -w ${{ steps.task_sorting.outputs.gitdiff }}
|
||||
|
||||
- name: Check if only sorted and Templates
|
||||
id: check_sorted_templates
|
||||
run: pwsh tools/ResourceUpdater/validator.ps1
|
||||
|
||||
- name: Setup python
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Cache Python packages
|
||||
if: always() && steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
id: cache_python
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.pythonLocation }}/Lib/site-packages
|
||||
key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.cache_python.outputs.cache-hit != 'true' && steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
run: |
|
||||
git status
|
||||
pip install -r tools/OptimizeTemplates/requirements.txt
|
||||
|
||||
$diff = $(git diff --numstat HEAD | findstr -i resource)
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
echo "no diff"
|
||||
exit 0
|
||||
}
|
||||
- name: Setup oxipng
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
uses: baptiste0928/cargo-install@v3
|
||||
with:
|
||||
crate: oxipng
|
||||
|
||||
echo "diff: "$diff
|
||||
$sp = $($diff -split "\s+")
|
||||
$numbers = $($sp | Where-Object { $_ -match "^\d+$" })
|
||||
echo "numbers: "$numbers
|
||||
|
||||
$length = $numbers.Length
|
||||
$noDiff = $true
|
||||
for ($i = 0; $i -lt $length; $i += 2) {
|
||||
$firstNumber = $numbers[$i]
|
||||
$secondNumber = $numbers[$i+1]
|
||||
|
||||
if ($firstNumber -gt 1) {
|
||||
$noDiff = $false
|
||||
break
|
||||
}
|
||||
|
||||
if ($firstNumber -ne $secondNumber) {
|
||||
$noDiff = $false
|
||||
break
|
||||
}
|
||||
}
|
||||
echo "noDiff: "$noDiff
|
||||
echo "only_sorted=$noDiff" >> $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Cancelling
|
||||
if: steps.check_only_sorted.outputs.only_sorted == 'True'
|
||||
uses: andymckay/cancel-action@0.3
|
||||
- name: Run optimize_templates
|
||||
if: steps.check_sorted_templates.outputs.contains_png == 'True'
|
||||
run: |
|
||||
python3 tools/OptimizeTemplates/optimize_templates.py -p resource/template/items/ resource/template/infrast/
|
||||
|
||||
- name: Add files to git
|
||||
if: steps.check_only_sorted.outputs.only_sorted != 'True'
|
||||
if: steps.check_sorted_templates.outputs.changes == 'True'
|
||||
id: add_files
|
||||
run: |
|
||||
git status
|
||||
|
||||
git config user.name "$env:GITHUB_ACTOR"
|
||||
git config user.email "$env:GITHUB_ACTOR@users.noreply.github.com"
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add .
|
||||
|
||||
$commit_msg = "${{ github.event.inputs.commit_message }}"
|
||||
if (-not [string]::IsNullOrWhiteSpace($commit_msg)) {
|
||||
$commit_msg = $commit_msg.Trim()
|
||||
} else {
|
||||
if ([string]::IsNullOrWhiteSpace($commit_msg)) {
|
||||
$commit_msg = "chore: Auto Update Game Resources - $(Get-Date -Format 'yyyy-MM-dd')"
|
||||
} else {
|
||||
$commit_msg = $commit_msg.Trim()
|
||||
}
|
||||
git commit -m "$commit_msg" -m "[skip changelog]"
|
||||
|
||||
$run_url = "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
||||
|
||||
git commit -m "$commit_msg" -m "$run_url" -m "[skip changelog]"
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
echo "have_commits=True" >> $env:GITHUB_OUTPUT
|
||||
Write-Output "have_commits=True" >> $env:GITHUB_OUTPUT
|
||||
}
|
||||
|
||||
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
|
||||
git pull origin ${{ github.ref_name }} --rebase
|
||||
|
||||
- name: Cancelling
|
||||
if: steps.add_files.outputs.have_commits != 'True'
|
||||
uses: andymckay/cancel-action@0.3
|
||||
|
||||
- name: Push changes # push the output folder to your repo
|
||||
- name: Push changes
|
||||
if: steps.add_files.outputs.have_commits == 'True'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.MISTEOWORKFLOW }}
|
||||
branch: ${{ github.ref }}
|
||||
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
|
||||
- name: Update OTA resource
|
||||
if: steps.add_files.outputs.have_commits == 'True'
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.MAA_RESOURCE_SYNC }}
|
||||
run: |
|
||||
gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
|
||||
|
||||
# - name: Delete cache
|
||||
# if: always()
|
||||
# env:
|
||||
# GH_TOKEN: ${{ github.token }}
|
||||
# run: |
|
||||
# echo "Deleting the cache..."
|
||||
# gh cache delete
|
||||
|
||||
- name: Add cancelled status
|
||||
if: steps.check_sorted_templates.outputs.changes != 'True' || steps.add_files.outputs.have_commits != 'True'
|
||||
uses: andymckay/cancel-action@0.5
|
||||
|
||||
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
|
||||
# if: steps.add_files.outputs.have_commits == 'True'
|
||||
# run: |
|
||||
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
|
||||
# env:
|
||||
# GH_TOKEN: ${{ github.token }}
|
||||
|
||||
106
.github/workflows/smoke-testing.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: test
|
||||
name: smoke-testing
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -25,8 +25,16 @@ on:
|
||||
- "!**/*.md"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
smoke-testing:
|
||||
build:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
@@ -34,45 +42,93 @@ jobs:
|
||||
with:
|
||||
show-progress: false
|
||||
submodules: recursive
|
||||
|
||||
|
||||
- name: Cache .nuke/temp, ~/.nuget/packages
|
||||
id: cache-nuget
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
.nuke/temp
|
||||
~/.nuget/packages
|
||||
key: ${{ runner.os }}-x64-${{ hashFiles('**/global.json', '**/*.csproj') }}
|
||||
|
||||
- name: Restore dependencies
|
||||
if: steps.cache-nuget.outputs.cache-hit != 'true'
|
||||
run: dotnet restore
|
||||
|
||||
|
||||
- name: Cache MaaDeps
|
||||
id: cache-maadeps
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
./MaaDeps
|
||||
key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('./maadeps-download.py') }}
|
||||
|
||||
- name: Bootstrap MaaDeps
|
||||
if: steps.cache-maadeps.outputs.cache-hit != 'true'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python3 maadeps-download.py x64-windows
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
||||
- name: Build MaaSample
|
||||
run: |
|
||||
MSBUILD src/Cpp/MaaSample.slnf /t:rebuild /p:Configuration="Debug" /p:Platform="x64" /m
|
||||
MSBUILD src/Cpp/MaaSample.slnf -t:restore,build -p:Configuration="Debug" -p:Platform="x64" -m
|
||||
|
||||
- name: Run tests - Official #用来判断是不是国服资源出错导致外服全炸
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe
|
||||
- name: Save build artifact to cache
|
||||
uses: actions/cache/save@v4
|
||||
with:
|
||||
key: DELETE_KEY-smoke-testing-artifact-${{ github.ref }}
|
||||
path: |
|
||||
./x64/Debug
|
||||
|
||||
- name: Run tests - YostarJP
|
||||
test:
|
||||
# Prevent duplicate runs on organization branches with PRs
|
||||
if: github.event_name != 'pull_request' ||
|
||||
github.event.pull_request.head.repo.full_name !=
|
||||
github.event.pull_request.base.repo.full_name
|
||||
|
||||
needs: build
|
||||
runs-on: windows-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
client: [Official, YostarJP, YostarEN, YostarKR, txwy]
|
||||
|
||||
steps:
|
||||
- name: Restore build artifact from cache
|
||||
id: cache-smoke-testing
|
||||
uses: actions/cache/restore@v4
|
||||
with:
|
||||
key: DELETE_KEY-smoke-testing-artifact-${{ github.ref }}
|
||||
path: |
|
||||
./x64/Debug
|
||||
|
||||
- name: Run tests - ${{ matrix.client }}
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe YostarJP
|
||||
|
||||
- name: Run tests - YostarEN
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe YostarEN
|
||||
|
||||
- name: Run tests - YostarKR
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe YostarKR
|
||||
|
||||
- name: Run tests - txwy
|
||||
run: |
|
||||
.\x64\Debug\Sample.exe txwy
|
||||
./x64/Debug/Sample.exe ${{ matrix.client }}
|
||||
|
||||
- name: Upload logs
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: log
|
||||
path: .\x64\Debug\debug
|
||||
name: log-${{ matrix.client }}
|
||||
path: ./x64/Debug/debug
|
||||
|
||||
- name: Delete cache
|
||||
if: always()
|
||||
run: |
|
||||
if ("${{ matrix.client }}" -eq "Official") {
|
||||
$cacheKey = "DELETE_KEY-smoke-testing-artifact-${{ github.ref }}"
|
||||
|
||||
Write-Host "Deleting cache: $cacheKey"
|
||||
|
||||
curl -L -X DELETE `
|
||||
-H "Accept: application/vnd.github+json" `
|
||||
-H "Authorization: Bearer ${{secrets.MAA_ACTION_READ_WRITE}}" `
|
||||
-H "X-GitHub-Api-Version: 2022-11-28" `
|
||||
"https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/actions/caches?key=$cacheKey"
|
||||
}
|
||||
|
||||
38
.github/workflows/stale.yml
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
name: "Inactive Issues Closer"
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 0 * * *" # Runs daily at UTC 00:00
|
||||
workflow_dispatch: # Allows manual triggering
|
||||
|
||||
env: # config
|
||||
daysBeforeStale: 90 # Number of days of inactivity before marking as stale
|
||||
daysBeforeClose: 7 # Number of days to wait after marking as stale before closing
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
actions: write # Workaround for https://github.com/actions/stale/issues/1090
|
||||
issues: write
|
||||
# Completely disable stalling for PRs
|
||||
pull-requests: none
|
||||
contents: none
|
||||
steps:
|
||||
- name: Close inactive issues
|
||||
uses: actions/stale@v9
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
days-before-stale: ${{ env.daysBeforeStale }}
|
||||
days-before-close: ${{ env.daysBeforeClose }}
|
||||
stale-issue-label: "stale"
|
||||
stale-issue-message: |
|
||||
This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
|
||||
该问题已长时间处于闲置状态,${{ env.daysBeforeClose }} 天后将自动关闭。
|
||||
exempt-issue-labels: "keep-open, MAA Team, enhancement"
|
||||
days-before-pr-stale: -1 # Completely disable stalling for PRs
|
||||
days-before-pr-close: -1 # Completely disable closing for PRs
|
||||
|
||||
# Temporary to reduce the huge issues number
|
||||
# operations-per-run: 500
|
||||
debug-only: false
|
||||
5
.github/workflows/sync-resource.yml
vendored
@@ -1,16 +1,17 @@
|
||||
name: sync-resource
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- dev
|
||||
paths:
|
||||
- "resource/**"
|
||||
- ".github/workflows/sync-resource.yml"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
sync-reource:
|
||||
sync-resource:
|
||||
if: github.repository_owner == 'MaaAssistantArknights'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
|
||||
2
.github/workflows/website-workflow.yml
vendored
@@ -43,7 +43,7 @@ jobs:
|
||||
with:
|
||||
node-version: 20
|
||||
cache: pnpm
|
||||
cache-dependency-path: './website/pnpm-lock.yaml'
|
||||
cache-dependency-path: "./website/pnpm-lock.yaml"
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
9
.gitignore
vendored
@@ -437,6 +437,9 @@ tools/**/*.png
|
||||
.vscode
|
||||
enc_temp_folder/*
|
||||
|
||||
# RoguelikeRecruitmentTool 导出的 Excel 文件
|
||||
tools/RoguelikeRecruitmentTool/output
|
||||
|
||||
# Nuke
|
||||
.nuke/temp/*
|
||||
|
||||
@@ -448,3 +451,9 @@ enc_temp_folder/*
|
||||
# CF 活动关卡(异格夜刀),手动改的地图
|
||||
/resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
|
||||
/src/MaaWpfGui/FodyWeavers.xml
|
||||
|
||||
# 链接检查缓存
|
||||
.lycheecache
|
||||
|
||||
# MaaDeps
|
||||
/MaaDeps/*
|
||||
|
||||
5
.gitmodules
vendored
@@ -4,11 +4,6 @@
|
||||
[submodule "src/MaaMacGui"]
|
||||
path = src/MaaMacGui
|
||||
url = https://github.com/MaaAssistantArknights/MaaMacGui.git
|
||||
[submodule "MaaDeps"]
|
||||
path = MaaDeps
|
||||
url = https://github.com/MaaAssistantArknights/MaaDeps
|
||||
shallow = true
|
||||
branch = master
|
||||
[submodule "src/maa-cli"]
|
||||
path = src/maa-cli
|
||||
url = https://github.com/MaaAssistantArknights/maa-cli.git
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
dirs:
|
||||
- .
|
||||
useGitIgnore: true
|
||||
ignorePatterns:
|
||||
- pattern: "^https?://127.0.0.1(:\\d+)?/"
|
||||
@@ -1,132 +1,127 @@
|
||||
{
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"title": "Build Schema",
|
||||
"$ref": "#/definitions/build",
|
||||
"definitions": {
|
||||
"build": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"Continue": {
|
||||
"type": "boolean",
|
||||
"description": "Indicates to continue a previously failed build attempt"
|
||||
},
|
||||
"Help": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the help text for this build assembly"
|
||||
},
|
||||
"Host": {
|
||||
"type": "string",
|
||||
"description": "Host for execution. Default is 'automatic'",
|
||||
"enum": [
|
||||
"AppVeyor",
|
||||
"AzurePipelines",
|
||||
"Bamboo",
|
||||
"Bitbucket",
|
||||
"Bitrise",
|
||||
"GitHubActions",
|
||||
"GitLab",
|
||||
"Jenkins",
|
||||
"Rider",
|
||||
"SpaceAutomation",
|
||||
"TeamCity",
|
||||
"Terminal",
|
||||
"TravisCI",
|
||||
"VisualStudio",
|
||||
"VSCode"
|
||||
]
|
||||
},
|
||||
"NoLogo": {
|
||||
"type": "boolean",
|
||||
"description": "Disables displaying the NUKE logo"
|
||||
},
|
||||
"Partition": {
|
||||
"type": "string",
|
||||
"description": "Partition to use on CI"
|
||||
},
|
||||
"Plan": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the execution plan (HTML)"
|
||||
},
|
||||
"Profile": {
|
||||
"type": "array",
|
||||
"description": "Defines the profiles to load",
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"Root": {
|
||||
"type": "string",
|
||||
"description": "Root directory during build execution"
|
||||
},
|
||||
"Skip": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be skipped. Empty list skips all dependencies",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Target": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be invoked. Default is '{default_target}'",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Verbosity": {
|
||||
"type": "string",
|
||||
"description": "Logging verbosity during build execution. Default is 'Normal'",
|
||||
"enum": [
|
||||
"Minimal",
|
||||
"Normal",
|
||||
"Quiet",
|
||||
"Verbose"
|
||||
]
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"title": "Build Schema",
|
||||
"$ref": "#/definitions/build",
|
||||
"definitions": {
|
||||
"build": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"Continue": {
|
||||
"type": "boolean",
|
||||
"description": "Indicates to continue a previously failed build attempt"
|
||||
},
|
||||
"Help": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the help text for this build assembly"
|
||||
},
|
||||
"Host": {
|
||||
"type": "string",
|
||||
"description": "Host for execution. Default is 'automatic'",
|
||||
"enum": [
|
||||
"AppVeyor",
|
||||
"AzurePipelines",
|
||||
"Bamboo",
|
||||
"Bitbucket",
|
||||
"Bitrise",
|
||||
"GitHubActions",
|
||||
"GitLab",
|
||||
"Jenkins",
|
||||
"Rider",
|
||||
"SpaceAutomation",
|
||||
"TeamCity",
|
||||
"Terminal",
|
||||
"TravisCI",
|
||||
"VisualStudio",
|
||||
"VSCode"
|
||||
]
|
||||
},
|
||||
"NoLogo": {
|
||||
"type": "boolean",
|
||||
"description": "Disables displaying the NUKE logo"
|
||||
},
|
||||
"Partition": {
|
||||
"type": "string",
|
||||
"description": "Partition to use on CI"
|
||||
},
|
||||
"Plan": {
|
||||
"type": "boolean",
|
||||
"description": "Shows the execution plan (HTML)"
|
||||
},
|
||||
"Profile": {
|
||||
"type": "array",
|
||||
"description": "Defines the profiles to load",
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"Root": {
|
||||
"type": "string",
|
||||
"description": "Root directory during build execution"
|
||||
},
|
||||
"Skip": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be skipped. Empty list skips all dependencies",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Target": {
|
||||
"type": "array",
|
||||
"description": "List of targets to be invoked. Default is '{default_target}'",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"Default",
|
||||
"DevBuild",
|
||||
"DevBuildDefault",
|
||||
"DevBuildReleaseSimulation",
|
||||
"ReleaseMaa",
|
||||
"SetMaaChangeLog",
|
||||
"SetPackageBundled",
|
||||
"SetVersion",
|
||||
"UseClean",
|
||||
"UseCommitVersion",
|
||||
"UseMaaChangeLog",
|
||||
"UseMaaDevBundle",
|
||||
"UseMaaRelease",
|
||||
"UsePublishArtifact",
|
||||
"UsePublishRelease",
|
||||
"UseRsVersion",
|
||||
"UseTagVersion",
|
||||
"WithCompileCoreRelease",
|
||||
"WithCompileWpfRelease",
|
||||
"WithSyncRes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Verbosity": {
|
||||
"type": "string",
|
||||
"description": "Logging verbosity during build execution. Default is 'Normal'",
|
||||
"enum": ["Minimal", "Normal", "Quiet", "Verbose"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"$schema": "./build.schema.json",
|
||||
"Solution": "tools/MaaBuilder.sln"
|
||||
"$schema": "./build.schema.json",
|
||||
"Solution": "tools/MaaBuilder.sln"
|
||||
}
|
||||
|
||||
31
.pre-commit-config.yaml
Normal file
@@ -0,0 +1,31 @@
|
||||
default_install_hook_types: [pre-commit, prepare-commit-msg]
|
||||
ci:
|
||||
autofix_commit_msg: "chore: Auto update by pre-commit hooks [skip changelog]"
|
||||
autofix_prs: true
|
||||
repos:
|
||||
- repo: https://github.com/shssoichiro/oxipng
|
||||
rev: v9.1.2
|
||||
hooks:
|
||||
- id: oxipng
|
||||
args: ["-q", "-o", "2", "-s", "--ng"]
|
||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||
rev: v17.0.1
|
||||
hooks:
|
||||
- id: clang-format
|
||||
files: ^src/MaaCore/.*
|
||||
args: ["--assume-filename", ".clang-format"]
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: v4.0.0-alpha.8
|
||||
hooks:
|
||||
- id: prettier
|
||||
types_or:
|
||||
- yaml
|
||||
- json
|
||||
- repo: https://github.com/DavidAnson/markdownlint-cli2
|
||||
rev: v0.13.0
|
||||
hooks:
|
||||
- id: markdownlint-cli2
|
||||
files: ^docs/.*|^README\.md$
|
||||
types:
|
||||
- markdown
|
||||
args: ["--fix", "--config", "docs/.markdownlint.yaml", "#**/node_modules"]
|
||||
10
.prettierignore
Normal file
@@ -0,0 +1,10 @@
|
||||
**/node_modules/
|
||||
|
||||
MaaDeps/
|
||||
3rdparty/
|
||||
src/maa-cli
|
||||
src/MaaMacGui
|
||||
|
||||
website/
|
||||
resource/Arknights-Tile-Pos/
|
||||
tools/OptimizeTemplates/optimize_templates.json
|
||||
17
.prettierrc
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"tabWidth": 4,
|
||||
"printWidth": 120,
|
||||
"useTabs": false,
|
||||
"bracketSameLine": true,
|
||||
"bracketSpacing": true,
|
||||
"endOfLine": "auto",
|
||||
"overrides": [
|
||||
{
|
||||
"files": [".clang-format", "**/*.yml", "**/*.yaml"],
|
||||
"options": {
|
||||
"parser": "yaml",
|
||||
"tabWidth": 2
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
2
3rdparty/EmulatorExtras
vendored
@@ -39,8 +39,8 @@ inline matrix4x4 camera_matrix_from_trans(
|
||||
const vec3d& euler,
|
||||
double ratio,
|
||||
double fov_2_y = 20 * degree,
|
||||
double far = 1000,
|
||||
double near = 0.3)
|
||||
double far_c = 1000,
|
||||
double near_c = 0.3)
|
||||
{
|
||||
const double cos_y = std::cos(euler[0]);
|
||||
const double sin_y = std::sin(euler[0]);
|
||||
@@ -66,11 +66,11 @@ inline matrix4x4 camera_matrix_from_trans(
|
||||
0, -sin_x, -cos_x, 0, //
|
||||
0, 0, 0, 1,
|
||||
};
|
||||
const matrix4x4 proj = {
|
||||
const matrix4x4 proj = matrix4x4 {
|
||||
// clang-format off
|
||||
ratio / tan_f, 0, 0, 0,
|
||||
0, 1 / tan_f, 0, 0,
|
||||
0, 0, -(far + near) / (far - near), -(far * near * 2) / (far - near),
|
||||
0, 0, -(far_c + near_c) / (far_c - near_c), -(far_c * near_c * 2) / (far_c - near_c),
|
||||
0, 0, -1, 0,
|
||||
// clang-format on
|
||||
};
|
||||
@@ -78,14 +78,13 @@ inline matrix4x4 camera_matrix_from_trans(
|
||||
return proj * matrixX * matrixY * translate;
|
||||
}
|
||||
|
||||
inline cv::Point
|
||||
world_to_screen(const Level& level, const vec3d& world_pos, bool side, const vec3d& offset = {})
|
||||
inline cv::Point world_to_screen(const Level& level, const vec3d& world_pos, bool side, const vec3d& offset = {})
|
||||
{
|
||||
static constexpr double width = 1280;
|
||||
static constexpr double height = 720;
|
||||
static constexpr int width = 1280;
|
||||
static constexpr int height = 720;
|
||||
const vec3d pos_cam = camera_pos(level, side, width, height) + offset;
|
||||
const vec3d euler = camera_euler_angles_yxz(level, side);
|
||||
const matrix4x4 matrix = camera_matrix_from_trans(pos_cam, euler, height / width);
|
||||
const matrix4x4 matrix = camera_matrix_from_trans(pos_cam, euler, static_cast<double>(height) / width);
|
||||
auto result = matrix * cv::Point3d(world_pos);
|
||||
result = result / result(3);
|
||||
result = (result + cv::Vec4d::ones()) / 2.;
|
||||
@@ -107,12 +106,7 @@ inline vec3d get_tile_world_pos(const Level& level, int tile_y, int tile_x)
|
||||
};
|
||||
}
|
||||
|
||||
inline auto get_tile_screen_pos(
|
||||
const Level& level,
|
||||
int tile_y,
|
||||
int tile_x,
|
||||
bool side = false,
|
||||
const vec3d& offset = {})
|
||||
inline auto get_tile_screen_pos(const Level& level, int tile_y, int tile_x, bool side = false, const vec3d& offset = {})
|
||||
{
|
||||
return world_to_screen(level, get_tile_world_pos(level, tile_y, tile_x), side, offset);
|
||||
}
|
||||
|
||||
188
CHANGELOG.md
@@ -1,15 +1,185 @@
|
||||
## v5.4.1
|
||||
## v5.11.1
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* 适配界面主题「大荒」与「视相」 (#11449) @SherkeyXD
|
||||
* 支持 XX-EX1 类型关卡名列表添加 @ABA2396
|
||||
* 添加运行库安装脚本 @ABA2396
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* StartButton1 ocrReplace syntax error in JP tasks.json @Constrat
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* website docs (#9287) @ABA2396 @Rbqwow @Constrat @wangl-cc @HX3N @SherkeyXD
|
||||
* 修改win7相关问题描述&更新运行库 @Rbqwow
|
||||
* fix a bad link @Rbqwow
|
||||
* make i18n warnings show only once @Rbqwow
|
||||
* 修复字体和评论区分类 @Rbqwow
|
||||
* 更新文档 (#11430) @Rbqwow @SherkeyXD
|
||||
|
||||
### For Overseas
|
||||
### 其他 | Other
|
||||
|
||||
#### YostarEN
|
||||
* MAA 启动相关改为全局配置 @ABA2396
|
||||
* 界面设置改为全局配置 @ABA2396
|
||||
* 热键改为全局配置 @ABA2396
|
||||
|
||||
* YoStarEN resolution warning on client switch (#9539) @Constrat @ABA2396
|
||||
## v5.11.0
|
||||
|
||||
### 没有摸鱼 | Highlight
|
||||
|
||||
本次更新,我们将精力放在优化上面,Windows 和 MacOS 版的用户应该能感觉到<del>一丢丢的</del>流畅度提升,其他方面的改动如下:
|
||||
|
||||
#### 其他
|
||||
|
||||
1. 由于近期游戏版本更新,在当前理智不足 45 点时,碎石后不会超过理智上线,因此葛朗台模式在检测到碎石理智不溢出时不再等待下一跳理智;
|
||||
2. 这个版本我们更新了内置的保全派驻的荒地群兽音乐厅和多索雷斯在建地块的新作业;
|
||||
3. 这个版本随附的游戏资源数据更新至【跨年欢庆·中坚#1225】。
|
||||
|
||||
### 新增 | New
|
||||
|
||||
* RA2 multi-crafting @Constrat
|
||||
* RS-5 导航 @ABA2396
|
||||
* add discord webhook external notification (#11373) @liang36176381
|
||||
* 重新适配 DepotEnter 多界面主题 @ABA2396
|
||||
* 更新 243 极限效率一天四换排班表(20241216 修订) @bodayw
|
||||
* Mac GUI重构&多语言 (#11295) @hguandl
|
||||
* SideStory「出苍白海」导航 (#11294) @SherkeyXD
|
||||
* YostarJP manually add BP new operators (#11286) @Manicsteiner
|
||||
* add BP new operators @Constrat
|
||||
* YostarEN BP navigation @Constrat
|
||||
* SSS#5 ocr replace for conductive elements @Constrat
|
||||
* SSS#5 for global @Constrat
|
||||
* 为选择线索添加判定 (#11323) @Alan-Charred @pre-commit-ci[bot]
|
||||
* enhance MAA website animation for a more elegant appearance (#11303) @chisato2233
|
||||
|
||||
### 改进 | Improved
|
||||
|
||||
* 更新繁中服進入肉鴿的方式 (#11386) @momomochi987
|
||||
* use API instead of gh cache @Constrat
|
||||
* Revert "chore: 改进Python脚本中incremental_path参数说明" @ABA2396
|
||||
* WpfGui重构 拆分`一键长草-刷理智任务` (#11223) @status102
|
||||
* 账号切换退出账号增加OCR (#11258) @Daydreamer114
|
||||
* 优化葛朗台,碎石在理智不会溢出时不再等待 @status102
|
||||
* 优化 StageManager 代码结构 (#11233) @ABA2396 @status102
|
||||
* WpfGui重构 拆分`一键长草-领取奖励任务` (#11228) @status102
|
||||
* WpfGui重构 拆分`一键长草-基建任务`任务 (#11219) @status102
|
||||
* WpfGui重构 拆分`一键长草-获取信用及购物任务` (#11218) @status102
|
||||
* 简化绑定 @status102
|
||||
* WpfGui重构 拆分`一键长草-自动肉鸽` (#11201) @status102
|
||||
* 优化参数解析 @ABA2396
|
||||
* WpfGui重构 拆分`设置-远程控制` (#11202) @status102
|
||||
* WpfGui重构 拆分`设置-定时执行` (#11192) @status102
|
||||
* WpfGui重构 部分拆分`设置-关于` (#11330) @status102
|
||||
* WpfGui重构 拆分`设置-性能设置` (#11329) @status102
|
||||
* 更新保全派驻荒地群兽音乐厅,多索雷斯在建地块新作业 (#11318) @Saratoga-Official @pre-commit-ci[bot]
|
||||
* WpfGui重构 拆分`一键长草-公招任务` (#11311) @status102
|
||||
* 优化仓库识别显示,减少读取文件次数,优化文件占用 @ABA2396
|
||||
|
||||
### 修复 | Fix
|
||||
|
||||
* “启动 MAA 后直接最小化”选项功能失效 @ABA2396
|
||||
* RA2 crafting list fix e1177db34895254ab068f1b8462445466836b93b @Constrat
|
||||
* Mac GUI 界面改进和修复 (#11422) @hguandl
|
||||
* crop ClueSelected template to make sure it works under long clue names (#11409) @Alan-Charred @pre-commit-ci[bot]
|
||||
* RA删除存档时重复识别 (#11406) @Daydreamer114
|
||||
* git init to allow gh commands @Constrat
|
||||
* GH_TOKEN for smoke testing + fail_fast @Constrat
|
||||
* 卡达,玛露西尔基建技能效率错误 @ABA2396
|
||||
* resource updater txwy second error from intern-kun @Constrat
|
||||
* txwy gamedata xaml typo intern-kun fucked up [again] @Constrat
|
||||
* 修复肉鸽选难度偶现识别错误 @ABA2396
|
||||
* 生息演算无存档刷点模式,允许在确认离开当前区块后没有 Loading Text 的情况下等待 (#11381) @Alan-Charred
|
||||
* Try to fix the compilation failure on aarch64 (#11378) @Roland125
|
||||
* powershell instead of bash @Constrat
|
||||
* precommit for blame-ignore + bypass on artifact missing @Constrat
|
||||
* ci release nightly ota if condition @Constrat
|
||||
* 萨卡兹肉鸽点刺成锭分队开局思维阻塞 (#11276) @Daydreamer114
|
||||
* missing battle_data BP event @Constrat
|
||||
* 双击托盘图标可能导致窗口位置错误 @ABA2396
|
||||
* Mac GUI日志&肉鸽难度设置 (#11273) @hguandl
|
||||
* 为 ios端降低 Sarkaz@Roguelike@DecreaseBurdenAbandonThought 任务模版匹配的 threshold (#11266) @Alan-Charred
|
||||
* 干员识别中出现卫戍中的 4★ 预备干员 及 特有 6★ @ABA2396
|
||||
* Mac GUI 优化作业列表 (#11250) @hguandl
|
||||
* 新下载的 MAA 会在加载关卡时报错 @ABA2396
|
||||
* 繁中服無法訪問好友 (#11248) @momomochi987 @pre-commit-ci[bot]
|
||||
* macOS 肉鸽参数&客户端包名 (#11245) @hguandl
|
||||
* UI 更新后自动填充有概率拉取其他设施内干员 @ABA2396
|
||||
* 避免非预期的任务参数设置检查 (#11232) @status102
|
||||
* 肉鸽构想不足过高阈值导致 mac 版无法识别 @Daydreamer114
|
||||
* 切换配置后不会自动启动 @ABA2396
|
||||
* API 中被删除的已关闭活动关卡被误判为常驻关卡 @ABA2396
|
||||
* 刷理智失败次数限制未生效 @ABA2396
|
||||
* 修改邮件通知中特殊字符的处理方式 (#11169) @LogicDX342 @status102
|
||||
* 访问好友在部分背景下无法进入 @ABA2396
|
||||
* 命令行切换配置后弹出公告 @ABA2396
|
||||
* 加载顺序 @ABA2396
|
||||
* 使用命令行切换配置时有可能使关卡选择被覆盖 @ABA2396
|
||||
* IS2 missing templates for recruiting and obtaining relics (#11196) @nnnn1111 @pre-commit-ci[bot]
|
||||
* not entering recruitment when in mall with recruitment permit item on screen @Constrat
|
||||
* 荒芜拉普兰德 OcrReplace (#11184) @Saratoga-Official
|
||||
* 设置Xcode版本为15.3 (#11298) @hguandl
|
||||
* Shu EN regex @Constrat
|
||||
* YostarKR improved StageBoskyPassageEnter recognition score (#11351) @HX3N
|
||||
* CheckComboBox 初始化报错 @ABA2396
|
||||
* SSS recruitment flag EN @Constrat
|
||||
* YostarKR improved StageMysteriousPresageEnter recognition score (#11336) @HX3N @pre-commit-ci[bot]
|
||||
* 网络卡顿导致领邮件失败 (#11333) @Daydreamer114
|
||||
* 进入去伪存真后识别太快导致错过 close collection 识别 @Daydreamer114
|
||||
* 小工具-公招识别 绑定失效 @status102
|
||||
* 增加 Tales@RA@ResourceGained 任务的 roi (#11322) @Alan-Charred
|
||||
* YostarJP MedicineExpiringTime ocr fix (#11307) @Manicsteiner
|
||||
* 将萨卡兹肉鸽 CloseCollection 的 Continue 和 Close 改为 RGBCount (#11302) @Daydreamer114
|
||||
* 仓库识别无法识别 ”万“ @ABA2396
|
||||
* 移除多余的阻止休眠设置选项 (#11301) @Rbqwow
|
||||
|
||||
### 文档 | Docs
|
||||
|
||||
* 更新 README (#11398) @ABA2396 @pre-commit-ci[bot]
|
||||
* 任务流程协议 管理员权限FAQ 牛牛监控 (#11375) @Rbqwow @ABA2396
|
||||
* Auto Update Changelogs of v5.11.0-beta.1 (#11297) @github-actions[bot]
|
||||
* 修改常见问题中的下载/安装问题的描述 (#11229) @ClozyA
|
||||
* Auto Update Changelogs of v5.11.0-beta.2 (#11367) @github-actions[bot]
|
||||
* 新手上路增加非 Windows 指引;macOS 和 Android 实体设备添加说明 (#11227) @Daydreamer114 @ABA2396 @Rbqwow
|
||||
* 增加Mac模拟器:蓝叠模拟器air版 (#11349) @MikeQu223
|
||||
|
||||
### 其他 | Other
|
||||
|
||||
* tw OcrReplace 添加关卡内道具 (#11431) @Daydreamer114
|
||||
* bump maa-cli to 0.5.2 (#11428) @wangl-cc
|
||||
* YostarKR HE rerun navigation @HX3N
|
||||
* smoke-testing bash -> powershell @Constrat
|
||||
* Translated using Weblate (Chinese (Traditional)) @momomochi987
|
||||
* 適配繁中服「圍攻行動」主題介面 @momomochi987
|
||||
* 繁中服「水晶箭行動」活動導航 @momomochi987
|
||||
* suppress false positive warning of gcc12 @horror-proton
|
||||
* 添加 python 资源加载示例 @ABA2396
|
||||
* Revert "feat: DepotEnter适配界面主题 (#7145)" @ABA2396
|
||||
* Revert "chore: 在Python脚本中添加活动关导航下载与加载的示例 (#3916)" @ABA2396
|
||||
* 移除设置指引的 skip @ABA2396
|
||||
* revert: changes from blame-ignore test @Constrat
|
||||
* Revert "fix: ci release nightly ota if condition" @Constrat
|
||||
* Release v5.11.0-beta.2 (#11366) @ABA2396
|
||||
* Release v5.11.0-beta.1 (#11299) @ABA2396
|
||||
* Release v5.11.0-beta.1 (#11291) @ABA2396
|
||||
* remove Yostar servers reclamation algorithm temp edits @Manicsteiner
|
||||
* 管理员权限启动无法使用开机自启 (#11290) @ABA2396 @momomochi987
|
||||
* 因为资源版本上报失败时添加提示 @ABA2396
|
||||
* YostarKR add BP new operators (#11285) @HX3N
|
||||
* 移除多余代码 @ABA2396
|
||||
* YostarKR BP navigation (#11279) @HX3N
|
||||
* YostarJP BP navigation @Manicsteiner
|
||||
* Translations update from MAA Weblate (#11255) @AlisaAkiron
|
||||
* WpfGui`游戏设置`修改为`运行设置` (#11209) @status102 @Constrat
|
||||
* EN tweaks [skip ci] @Constrat
|
||||
* 通过控制台退出模拟器时不再kill端口 @ABA2396
|
||||
* YostarJP ocr replace 魔王 (#11222) @Manicsteiner
|
||||
* 成功代理不再减少任务失败计数 @ABA2396
|
||||
* 移除过渡代码 @ABA2396
|
||||
* YostarKR SSSBuffChoose ocr fix @HX3N
|
||||
* automatically remove spaces for YoStarKR in CharsNameOcrReplace (#11205) @Constrat
|
||||
* YostarKR SSS#5 ocr added (#11200) @HX3N
|
||||
* 拆分 设置-界面设置 (#11188) @status102
|
||||
* 繁中服保全派駐的新定向導能元件 @momomochi987
|
||||
* 拆分 设置-游戏设置 (#11185) @status102
|
||||
* rename `ExternalNotificationDataContext` to `ExternalNotificationSettings` @status102
|
||||
* rename `VersionUpdateDataContext` to `VersionUpdateSettings` @status102
|
||||
* add YostarJP ocrReplace 黑角 (#11350) @liang36176381 @Manicsteiner
|
||||
* ci/nightly-schedule (#11317) @Constrat @pre-commit-ci[bot]
|
||||
* 简化完成后动作UI绑定 (#11316) @status102
|
||||
|
||||
@@ -46,8 +46,14 @@ if (MSVC)
|
||||
else ()
|
||||
target_compile_options(MaaCore PRIVATE "-Wall;-Werror;-Wextra;-Wpedantic;-Wno-missing-field-initializers")
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
|
||||
target_compile_options(MaaCore PRIVATE "-Wno-restrict")
|
||||
target_compile_options(MaaCore PRIVATE "-Wno-restrict;-Wno-array-bounds;-Wno-stringop-overread")
|
||||
endif()
|
||||
# LLVM clang 16 will failed with `error: no member named 'join' in namespace 'std::ranges::views'`, but Apple clang 16 won't
|
||||
# value defined in https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
|
||||
if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
|
||||
OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17))
|
||||
target_compile_options(MaaCore PRIVATE "-fexperimental-library")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (WIN32)
|
||||
|
||||
17
DependencySetup_依赖库安装.bat
Normal file
@@ -0,0 +1,17 @@
|
||||
@echo off
|
||||
chcp 65001
|
||||
setlocal enabledelayedexpansion
|
||||
|
||||
openfiles >nul 2>&1
|
||||
if %errorlevel% neq 0 (
|
||||
echo 正在获取管理员权限...
|
||||
powershell -Command "Start-Process cmd.exe -ArgumentList '/c %~dpnx0' -Verb RunAs"
|
||||
exit /b
|
||||
)
|
||||
|
||||
winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
|
||||
winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
|
||||
|
||||
echo 运行库修复完成,请重启电脑后再次尝试运行 MAA。
|
||||
echo The runtime library repair is complete. Please restart your computer and try running MAA again.
|
||||
pause
|
||||
@@ -1,4 +1,7 @@
|
||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EN/@EntryIndexedValue">EN</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SWMINIMIZE/@EntryIndexedValue">SWMINIMIZE</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=AP/@EntryIndexedValue">AP</s:String>
|
||||
@@ -28,7 +31,14 @@
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=WSA/@EntryIndexedValue">WSA</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=XYAZ/@EntryIndexedValue">XYAZ</s:String>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acast/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acfend/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acguad/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acpion/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acspec/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=acsupo/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=advapi/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Aero/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Affero/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=aguard/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=amedic/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=amiya/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -41,12 +51,22 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bluestacks/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=bsconsole/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ccast/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=cdfend/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=cguard/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=cmedic/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Collapsal/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=cpione/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=csnipe/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=cspec/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=csuppo/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ctrler/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=desp/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=dnplayer/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ehem/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=esource/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Favourite/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=filetime/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=findstr/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHW/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHWINFO/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -61,7 +81,12 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Inited/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=iter/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=jsend/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ldconsole/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ldplayer/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=LD_0027s/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=leidian/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Lolicon/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=lpwndpl/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ls_005B_0022sub/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -77,6 +102,7 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=netstat/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nonfriend/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=notstationed/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=objstr/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Originite/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -88,9 +114,12 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=pidl/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=powrprof/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=ppidl/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Prts/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=pwfi/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=qmsg/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Raidian/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=rcast/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=rdfend/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=rguard/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -99,13 +128,16 @@
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Roguelike/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=rsnipe/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sami/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sarkaz/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Screencap/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=sctp/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilog/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Showminimized/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Shownormal/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=specialaccess/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=SSS/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=STGM/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Stormeye/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=strlen/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Stylet/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=subtask/@EntryIndexedValue">True</s:Boolean>
|
||||
|
||||
1
MaaDeps
69
README.md
@@ -2,7 +2,7 @@
|
||||
|
||||
<div align="center">
|
||||
|
||||
<img alt="LOGO" src="https://cdn.jsdelivr.net/gh/MaaAssistantArknights/design@main/logo/maa-logo_512x512.png" width="256" height="256" />
|
||||
<img alt="LOGO" src="./docs/.vuepress/public/images/maa-logo_512x512.png" width="256" height="256" />
|
||||
|
||||
# MaaAssistantArknights
|
||||
|
||||
@@ -37,6 +37,10 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
</div>
|
||||
|
||||
## 下载与安装
|
||||
|
||||
请阅读[文档](https://maa.plus/docs/zh-cn/manual/newbie.html)后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载,并参考[新手上路](https://maa.plus/docs/zh-cn/manual/newbie.html)进行安装。
|
||||
|
||||
## 亮点功能
|
||||
|
||||
- 刷理智,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/),[一图流](https://ark.yituliu.cn/)
|
||||
@@ -55,50 +59,31 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
<details><summary>话不多说,看图!</summary>
|
||||
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/image/zh-cn/readme/1-dark.png">
|
||||
<img alt="zh1" src="./docs/.vuepress/public/image/zh-cn/readme/1-light.png">
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/1-dark.png">
|
||||
<img alt="zh1" src="./docs/.vuepress/public/images/zh-cn/readme/1-light.png">
|
||||
</picture>
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/image/zh-cn/readme/2-dark.png">
|
||||
<img alt="zh2" src="./docs/.vuepress/public/image/zh-cn/readme/2-light.png">
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/2-dark.png">
|
||||
<img alt="zh2" src="./docs/.vuepress/public/images/zh-cn/readme/2-light.png">
|
||||
</picture>
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/image/zh-cn/readme/3-dark.png">
|
||||
<img alt="zh3" src="./docs/.vuepress/public/image/zh-cn/readme/3-light.png">
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/3-dark.png">
|
||||
<img alt="zh3" src="./docs/.vuepress/public/images/zh-cn/readme/3-light.png">
|
||||
</picture>
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/image/zh-cn/readme/4-dark.png">
|
||||
<img alt="zh4" src="./docs/.vuepress/public/image/zh-cn/readme/4-light.png">
|
||||
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/4-dark.png">
|
||||
<img alt="zh4" src="./docs/.vuepress/public/images/zh-cn/readme/4-light.png">
|
||||
</picture>
|
||||
|
||||
</details>
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
|
||||
## 下载地址
|
||||
|
||||
前往[官网](https://maa.plus)自动匹配镜像源并下载稳定版,或:
|
||||
|
||||
- [稳定版/公测版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
|
||||
- [内测版](https://github.com/MaaAssistantArknights/MaaRelease/releases)
|
||||
|
||||
## 使用说明
|
||||
|
||||
### 基本说明
|
||||
### 功能介绍
|
||||
|
||||
请参阅 [新手上路](https://maa.plus/docs/zh-cn/manual/newbie.html) 与 [功能介绍](https://maa.plus/docs/zh-cn/manual/introduction/)。
|
||||
|
||||
### 常见问题
|
||||
|
||||
- 软件一打开就闪退;
|
||||
- 连接错误、不知道 ADB 路径怎么填写;
|
||||
- 连接成功了,但没反应;
|
||||
- 如何连接自定义端口;
|
||||
- 下载速度慢,且镜像站无法打开网页;
|
||||
- 下载到一半提示“登陆”/“鉴权”;
|
||||
- 连接正常,任务开始了,但是没反应。
|
||||
|
||||
请参阅 [常见问题](https://maa.plus/docs/zh-cn/manual/faq.html)
|
||||
请参阅 [用户手册](https://maa.plus/docs/zh-cn/manual/)。
|
||||
|
||||
### 外服支持
|
||||
|
||||
@@ -107,7 +92,7 @@ MAA 的意思是 MAA Assistant Arknights
|
||||
|
||||
### CLI 支持
|
||||
|
||||
MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/intro.html)
|
||||
MAA 支持命令行界面(CLI)操作,支持 Linux,macOS 和 Windows,可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/)
|
||||
|
||||
## 加入我们
|
||||
|
||||
@@ -198,13 +183,13 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
|
||||
- ~~干员及基建数据:[PRTS Wiki](http://prts.wiki/)~~
|
||||
- 关卡数据:[企鹅物流数据统计](https://penguin-stats.cn/)
|
||||
- 游戏数据及资源:[明日方舟客户端素材](https://github.com/yuanyan3060/ArknightsGameResource)
|
||||
- ~~游戏数据:[《明日方舟》游戏数据](https://github.com/Kengxxiao/ArknightsGameData)~~
|
||||
- 游戏数据:[《明日方舟》Yostar游戏数据](https://github.com/Kengxxiao/ArknightsGameData_YoStar)
|
||||
|
||||
### 贡献/参与者
|
||||
|
||||
感谢所有参与到开发/测试中的朋友们,是大家的帮助让 MAA 越来越好! (\*´▽`)ノノ
|
||||
|
||||
[](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
|
||||
[](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
|
||||
|
||||
## 声明
|
||||
|
||||
@@ -212,12 +197,26 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
|
||||
- 本软件 logo 并非使用 AGPL 3.0 协议开源,[耗毛](https://weibo.com/u/3251357314)、vie 两位画师及软件全体开发者保留所有权利。不得以 AGPL 3.0 协议已授权为由在未经授权的情况下使用本软件 logo,不得在未经授权的情况下将本软件 logo 用于任何用途。
|
||||
- 本软件开源、免费,仅供学习交流使用。若您遇到商家使用本软件进行代练并收费,可能由于设备或时间等原因,产生的任何问题及后果与本软件无关。
|
||||
|
||||
### DirectML 支持说明
|
||||
|
||||
本软件支持 GPU 加速功能,但 GPU 加速依赖于 Microsoft 提供的 DirectML(Microsoft.AI.DirectML)。为了方便用户,我们随安装包附带了一个未修改的 DirectML.dll 文件。
|
||||
|
||||
#### 关于 DirectML.dll
|
||||
|
||||
- 来源:Microsoft 官方
|
||||
- 许可证:请参考 Microsoft 的 DirectML 使用条款
|
||||
[DirectML 官方文档](https://learn.microsoft.com/en-us/windows/ai/directml/)
|
||||
|
||||
DirectML.dll 是 Microsoft 提供的独立组件,不属于本软件的开源部分,也不受 AGPL-3.0 的约束。
|
||||
|
||||
如果您不需要 GPU 支持,可以安全地删除该 DLL 文件,软件核心功能仍然可以正常运行。
|
||||
|
||||
## 广告
|
||||
|
||||
用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)
|
||||
用户交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)
|
||||
自动战斗 JSON 作业分享:[prts.plus](https://prts.plus) 或 [抄作业.com](http://抄作业.com)
|
||||
Bilibili 直播间:[直播间](https://live.bilibili.com/2808861) 每晚直播敲代码,近期很长一段时间应该都是在写本软件~
|
||||
自动战斗 JSON 作业分享:[prts.plus](https://prts.plus)
|
||||
Bilibili 直播间:[MrEO 直播间](https://live.bilibili.com/2808861) 直播敲代码 & [MAA-Official 直播间](https://live.bilibili.com/27548877) 游戏/杂谈
|
||||
|
||||
技术群(舟无关、禁水):[内卷地狱!(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)
|
||||
开发者群:[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
|
||||
|
||||
@@ -7,12 +7,12 @@ if (BUILD_XCFRAMEWORK)
|
||||
|
||||
add_custom_command(OUTPUT OpenCV.xcframework
|
||||
COMMAND rm -rf OpenCV.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libopencv_world4.407.dylib" -output OpenCV.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libopencv_world4.408.dylib" -output OpenCV.xcframework
|
||||
)
|
||||
|
||||
add_custom_command(OUTPUT ONNXRuntime.xcframework
|
||||
COMMAND rm -rf ONNXRuntime.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libonnxruntime.1.14.1.dylib" -output ONNXRuntime.xcframework
|
||||
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libonnxruntime.1.18.0.dylib" -output ONNXRuntime.xcframework
|
||||
)
|
||||
|
||||
add_custom_command(OUTPUT fastdeploy_ppocr.xcframework
|
||||
|
||||
@@ -223,6 +223,4 @@ MD052: true
|
||||
# MD053/link-image-reference-definitions - Link and image reference definitions should be needed
|
||||
MD053:
|
||||
# Ignored definitions
|
||||
ignored_definitions: [
|
||||
"//"
|
||||
]
|
||||
ignored_definitions: ["//"]
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
import { defineClientConfig } from "vuepress/client";
|
||||
import ImageGrid from "../components/ImageGrid.vue";
|
||||
import Image1 from "../components/Image1.vue";
|
||||
import Image2 from "../components/Image2.vue";
|
||||
import Image4 from "../components/Image4.vue";
|
||||
|
||||
export default defineClientConfig({
|
||||
enhance: ({ app }) => {
|
||||
app.component("ImageGrid", ImageGrid);
|
||||
app.component("Image1", Image1);
|
||||
app.component("Image2", Image2);
|
||||
app.component("Image4", Image4);
|
||||
},
|
||||
});
|
||||
|
||||
@@ -1,83 +1,88 @@
|
||||
export default {
|
||||
appId: '99JM20SIFG',
|
||||
apiKey: '32ad931040facd36d2e99c3cb8e425e1',
|
||||
indexName: 'maa',
|
||||
appId: "99JM20SIFG",
|
||||
apiKey: "7596a5a8c95cd64d4cf3050c9a4f878e",
|
||||
indexName: "maa",
|
||||
// 这里应该把所有本地化配置都放入 locales 中
|
||||
locales: {
|
||||
'/': {
|
||||
placeholder: '搜索',
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: '搜索',
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: '清除查询条件',
|
||||
cancelButtonText: '取消',
|
||||
"/zh-cn/": {
|
||||
placeholder: "搜索",
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: "搜索",
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: "清除查询条件",
|
||||
cancelButtonText: "取消",
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: "搜索历史",
|
||||
noRecentSearchesText: "没有搜索历史",
|
||||
saveRecentSearchButtonTitle: "保存至搜索历史",
|
||||
removeRecentSearchButtonTitle: "从搜索历史中移除",
|
||||
favoriteSearchesTitle: "收藏",
|
||||
removeFavoriteSearchButtonTitle: "从收藏中移除",
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: "无法获取结果",
|
||||
helpText: "你可能需要检查你的网络连接",
|
||||
},
|
||||
footer: {
|
||||
selectText: "选择",
|
||||
navigateText: "切换",
|
||||
closeText: "关闭",
|
||||
searchByText: "搜索提供者",
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: "无法找到相关结果",
|
||||
suggestedQueryText: "你可以尝试查询",
|
||||
reportMissingResultsText: "你认为该查询应该有结果?",
|
||||
reportMissingResultsLinkText: "点击反馈",
|
||||
},
|
||||
},
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: '搜索历史',
|
||||
noRecentSearchesText: '没有搜索历史',
|
||||
saveRecentSearchButtonTitle: '保存至搜索历史',
|
||||
removeRecentSearchButtonTitle: '从搜索历史中移除',
|
||||
favoriteSearchesTitle: '收藏',
|
||||
removeFavoriteSearchButtonTitle: '从收藏中移除',
|
||||
},
|
||||
"/en-us/": {
|
||||
placeholder: "Search",
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: "Search",
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: "Clear the query",
|
||||
cancelButtonText: "Cancel",
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: "Recent",
|
||||
noRecentSearchesText: "No recent searches",
|
||||
saveRecentSearchButtonTitle: "Save this search",
|
||||
removeRecentSearchButtonTitle:
|
||||
"Remove this search from history",
|
||||
favoriteSearchesTitle: "Favorite",
|
||||
removeFavoriteSearchButtonTitle:
|
||||
"Remove this search from favorites",
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: "Unable to fetch results",
|
||||
helpText:
|
||||
"You might want to check your network connection.",
|
||||
},
|
||||
footer: {
|
||||
selectText: "to select",
|
||||
navigateText: "to navigate",
|
||||
closeText: "to close",
|
||||
searchByText: "Search by",
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: "No results for",
|
||||
suggestedQueryText: "Try searching for",
|
||||
reportMissingResultsText:
|
||||
"Believe this query should return results?",
|
||||
reportMissingResultsLinkText: "Let us know.",
|
||||
},
|
||||
},
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: '无法获取结果',
|
||||
helpText: '你可能需要检查你的网络连接',
|
||||
},
|
||||
footer: {
|
||||
selectText: '选择',
|
||||
navigateText: '切换',
|
||||
closeText: '关闭',
|
||||
searchByText: '搜索提供者',
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: '无法找到相关结果',
|
||||
suggestedQueryText: '你可以尝试查询',
|
||||
reportMissingResultsText: '你认为该查询应该有结果?',
|
||||
reportMissingResultsLinkText: '点击反馈',
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
'/en-us/': {
|
||||
placeholder: 'Search',
|
||||
translations: {
|
||||
button: {
|
||||
buttonText: 'Search',
|
||||
},
|
||||
modal: {
|
||||
searchBox: {
|
||||
resetButtonTitle: 'Clear the query',
|
||||
cancelButtonText: 'Cancel',
|
||||
},
|
||||
startScreen: {
|
||||
recentSearchesTitle: 'Recent',
|
||||
noRecentSearchesText: 'No recent searches',
|
||||
saveRecentSearchButtonTitle: 'Save this search',
|
||||
removeRecentSearchButtonTitle: 'Remove this search from history',
|
||||
favoriteSearchesTitle: 'Favorite',
|
||||
removeFavoriteSearchButtonTitle: 'Remove this search from favorites',
|
||||
},
|
||||
errorScreen: {
|
||||
titleText: 'Unable to fetch results',
|
||||
helpText: 'You might want to check your network connection.',
|
||||
},
|
||||
footer: {
|
||||
selectText: 'to select',
|
||||
navigateText: 'to navigate',
|
||||
closeText: 'to close',
|
||||
searchByText: 'Search by',
|
||||
},
|
||||
noResultsScreen: {
|
||||
noResultsText: 'No results for',
|
||||
suggestedQueryText: 'Try searching for',
|
||||
reportMissingResultsText: 'Believe this query should return results?',
|
||||
reportMissingResultsLinkText: 'Let us know.',
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
101
docs/.vuepress/public/files/MAA_Runtime_Fix_Pwsh.ps1
Normal file
@@ -0,0 +1,101 @@
|
||||
# This file MUST use GBK encoding, whatever the system language is.
|
||||
# You may do more testing, but at least it works like this for me.
|
||||
# Fuck Microsoft.
|
||||
# 修改请使用 GBK 编码保存。
|
||||
# 如果能用 UTF-8 保存而不乱码,那就去做,我实在是研究不明白微软的屎了。
|
||||
# 你或许想加一条 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 来解决问题。
|
||||
# 但很神奇的,这根本不管用,甚至还会让中文汉字渲染重叠在一起。
|
||||
# 我在 CMD 里面都能 chcp 65001 换成 UTF-8。
|
||||
# 微软什么时候能把 PowerShell 7 集成到系统里。
|
||||
# 我由衷的认为 Windows 中预装的 PowerShell 就是一坨屎,甚至不如 CMD。
|
||||
# 用 PowerShell 写这东西真成为了一盘醋包的饺子了。
|
||||
|
||||
# 检查 PowerShell 脚本运行策略
|
||||
# 我真理解不了这个运行策略的存在意义了,明明叫脚本运行策略,却可以用脚本修改。
|
||||
# 我既可以在不提权的情况下允许所有脚本运行,也可以直接启动一个运行所有脚本运行的会话。
|
||||
# 本脚本在测试时发现,在不修改策略且不提权的情况下也可以正常运行,只是在安装运行库时需要点安装程序的 UAC 弹窗。
|
||||
# 而不修改策略且提权时反而因为脚本策略运行不了了,这是什么品种的管理员权限。
|
||||
# $ExecutionPolicy = Get-ExecutionPolicy
|
||||
# if ($ExecutionPolicy -eq 'Restricted' -or $ExecutionPolicy -eq 'AllSigned') {
|
||||
# Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
|
||||
# Write-Host "已修改当前用户的 PowerShell 脚本运行策略为 RemoteSigned 以便运行此脚本。"
|
||||
# Write-Host "这只需运行一次,且理应不会产生较大的安全风险。"
|
||||
# Write-Host "如果您对此有疑虑,请在脚本运行结束后,在 PowerShell 中运行以下命令将策略值清空。"
|
||||
# Write-Host "Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser"
|
||||
# Pause
|
||||
# }
|
||||
|
||||
# 获取 UAC 权限并启动一个 RemoteSigned 脚本策略会话
|
||||
If (-Not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)) {
|
||||
Write-Host "正在获取管理员权限..."
|
||||
Start-Process powershell.exe "-ExecutionPolicy RemoteSigned -File `"$PSCommandPath`" -ArgumentList `"$PSCommandPath`"" -Verb RunAs
|
||||
Exit
|
||||
}
|
||||
|
||||
# 读取系统代理并应用
|
||||
$Internet_Settings = Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings'
|
||||
if ($Internet_Settings.ProxyEnable -eq 1) {
|
||||
$env:HTTP_PROXY = "http://$($Internet_Settings.ProxyServer)"
|
||||
$env:HTTPS_PROXY = "http://$($Internet_Settings.ProxyServer)"
|
||||
Write-Host "已应用系统代理:$($Internet_Settings.ProxyServer)。"
|
||||
}
|
||||
# else {
|
||||
# Write-Host "未启用系统代理。"
|
||||
# }
|
||||
Remove-Variable -Name Internet_Settings
|
||||
|
||||
# 新建下载用临时文件夹
|
||||
New-Item -Path "$env:TEMP" -Name "MAA_Runtime_Fix_Pwsh" -ItemType "Directory" | Out-Null
|
||||
|
||||
# 使用 BITS 下载运行库安装包
|
||||
Write-Host "正在下载运行库安装包..."
|
||||
# Start-Sleep -Seconds 1
|
||||
Start-BitsTransfer -Source "https://aka.ms/vs/17/release/vc_redist.x64.exe" -Destination "$env:TEMP\MAA_Runtime_Fix_Pwsh\vc_redist.x64.exe"
|
||||
Start-BitsTransfer -Source "https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/8.0.11/windowsdesktop-runtime-8.0.11-win-x64.exe" -Destination "$env:TEMP\MAA_Runtime_Fix_Pwsh\windowsdesktop-runtime-8.0.11-win-x64.exe"
|
||||
|
||||
# 卸载 vc++ 和 dotnet8
|
||||
Write-Host ""
|
||||
Write-Host "尝试调用 WinGet 卸载已安装的运行库..."
|
||||
winget uninstall "Microsoft.VCRedist.2015+.x64" "Microsoft.DotNet.DesktopRuntime.8" --force --all-versions
|
||||
|
||||
# 安装 vc++
|
||||
Write-Host ""
|
||||
Write-Host "正在安装/修复 Microsoft Visual C++ 可再发行程序包..."
|
||||
$vcProcess = Start-Process "$env:TEMP\MAA_Runtime_Fix_Pwsh\vc_redist.x64.exe" -ArgumentList '/repair', '/passive', '/norestart' -PassThru
|
||||
$vcProcess.WaitForExit()
|
||||
|
||||
# 安装 dotnet8
|
||||
Write-Host "正在安装/修复 .NET 桌面运行时 8..."
|
||||
$dotnetProcess = Start-Process "$env:TEMP\MAA_Runtime_Fix_Pwsh\windowsdesktop-runtime-8.0.11-win-x64.exe" -ArgumentList '/repair', '/passive', '/norestart' -PassThru
|
||||
$dotnetProcess.WaitForExit()
|
||||
|
||||
# 删除临时文件夹
|
||||
Write-Host ""
|
||||
Write-Host "正在清理临时文件..."
|
||||
Remove-Item -Path "$env:TEMP\MAA_Runtime_Fix_Pwsh" -Recurse -Force
|
||||
|
||||
Write-Host "运行库修复完成,请再次尝试运行 MAA。"
|
||||
Write-Host ""
|
||||
Pause
|
||||
|
||||
# 使用 winget 安装/更新运行库并卸载旧版本
|
||||
# winget install "Microsoft.VCRedist.2015+.x64" "Microsoft.DotNet.DesktopRuntime.8" --uninstall-previous --accept-package-agreements
|
||||
|
||||
# 使用 winget 下载运行库安装包
|
||||
# winget download --id "Microsoft.VCRedist.2015+.x64" -d "$env:TEMP\MAA_Runtime_Fix_Pwsh\"
|
||||
# winget download --id "Microsoft.DotNet.DesktopRuntime.8" -d "$env:TEMP\MAA_Runtime_Fix_Pwsh\"
|
||||
|
||||
# 不使用 winget 卸载 vc++
|
||||
# 会进行卸载 但是卸不掉
|
||||
# Get-Package -Name "Microsoft Visual C++ 2015-2022 Redistributable (x64) - *" | Uninstall-Package -Force
|
||||
|
||||
# 不使用 winget 卸载 dotnet8
|
||||
# 会进行卸载 但是卸不掉
|
||||
# Get-Package -Name "Microsoft Windows Desktop Runtime - 8.* (x64)" | Uninstall-Package -Force
|
||||
|
||||
# 下载安装包那里注释了一个睡一秒是因为本来下载文件的那个进度条会把上面输出过的所有内容都覆盖掉,上来就只能看到个下载进度条,别的啥也看不到。
|
||||
# 但当我去掉新建文件夹时输出的一大坨东西之后,这行就能露出来了。
|
||||
# 我建议每个人都去看一下 PowerShell 的 New-Item 新建文件夹能输出多大一坨玩意。
|
||||
# 还有 PowerShell 弱智一样的进度条显示机制,非得搞个固定不透明一大坨的浮窗上去干什么,就不能和别人一样在命令底部显示吗。
|
||||
|
||||
# 再用 Pwsh 写脚本我就是傻逼。
|
||||
|
Before Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 63 KiB |
|
Before Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 691 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/1-dark.png
Normal file
|
After Width: | Height: | Size: 46 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/1-light.png
Normal file
|
After Width: | Height: | Size: 42 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/2-dark.png
Normal file
|
After Width: | Height: | Size: 42 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/2-light.png
Normal file
|
After Width: | Height: | Size: 38 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/3-dark.png
Normal file
|
After Width: | Height: | Size: 42 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/3-light.png
Normal file
|
After Width: | Height: | Size: 40 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/4-dark.png
Normal file
|
After Width: | Height: | Size: 71 KiB |
BIN
docs/.vuepress/public/images/en-us/readme/4-light.png
Normal file
|
After Width: | Height: | Size: 64 KiB |
|
After Width: | Height: | Size: 420 KiB |
BIN
docs/.vuepress/public/images/ja-jp/introduction-i.s.-pin-up.png
Normal file
|
After Width: | Height: | Size: 301 KiB |
BIN
docs/.vuepress/public/images/ja-jp/readme/1-light.png
Normal file
|
After Width: | Height: | Size: 34 KiB |
BIN
docs/.vuepress/public/images/ja-jp/readme/2-light.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 643 KiB |
BIN
docs/.vuepress/public/images/ko-kr/readme/1-light.png
Normal file
|
After Width: | Height: | Size: 26 KiB |
BIN
docs/.vuepress/public/images/ko-kr/readme/2-light.png
Normal file
|
After Width: | Height: | Size: 29 KiB |
BIN
docs/.vuepress/public/images/maa-logo_512x512.png
Normal file
|
After Width: | Height: | Size: 266 KiB |
|
After Width: | Height: | Size: 429 KiB |
BIN
docs/.vuepress/public/images/zh-cn/copilot-click-like.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 27 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/fork-dark.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/fork-light.png
Normal file
|
After Width: | Height: | Size: 1018 B |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-1-dark.png
Normal file
|
After Width: | Height: | Size: 59 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-1-light.png
Normal file
|
After Width: | Height: | Size: 59 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-2-dark.png
Normal file
|
After Width: | Height: | Size: 63 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-10-2-light.png
Normal file
|
After Width: | Height: | Size: 64 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-11-dark.png
Normal file
|
After Width: | Height: | Size: 83 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-11-light.png
Normal file
|
After Width: | Height: | Size: 85 KiB |
BIN
docs/.vuepress/public/images/zh-cn/pr-tutorial/pr-12-dark.png
Normal file
|
After Width: | Height: | Size: 86 KiB |