fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,607 Commits 60 Branches 1,840 Tags
bf600267ba4ceea451c8d99a0a09c4ec97995086
Commit Graph

12607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
bf600267ba feat: 公招错误时保存截图 
link to #10302
 2024-08-20 19:13:09 +08:00
status102
7967c62b77 style: format 
[skip changelog]
 2024-08-20 16:49:26 +08:00
uye
fdb3f78574 fix: 多配置下公告和更新日志显示异常 2024-08-20 15:59:25 +08:00
status102
b45624ae52 fix: 修复保全战斗在core干员重复时只会放1次bug (#10306) 2024-08-20 15:07:00 +08:00
status102
05a1a9b383 perf: 保全开局水泥换牌兼容 2024-08-20 14:17:21 +08:00
status102
04bccb8c5f fix: 修复保全战斗在core干员重复时只会放1次bug 2024-08-20 14:16:35 +08:00
github-actions[bot]
db84f4dfc3 chore: Auto Update Game Resources - 2024-08-20 
[skip changelog]
 2024-08-20 00:59:54 +00:00
Weiyou Wang
3e8a2319a2 chore: 整理 tasks.json 中记录的肉鸽插件参数 (#10290) 
* refactor: 整理 tasks.json 中记录的肉鸽插件参数

* chore: delete unused roi fields
 2024-08-20 10:32:44 +10:00
status102
730b1733d0 Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core" (#10300) 
* Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core"

This reverts commit 970d2cfddc.

* Revert "feat: 保全作战相同location以json写的策略顺序执行"

This reverts commit 29db7fabd9.
 2024-08-20 08:00:50 +08:00
Rbqwow
e7009f7c75 docs: 修改下载地址 
[skip changelog]
 2024-08-20 06:23:24 +08:00
晓丶梦丶仁
970d2cfddc feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core 2024-08-20 00:47:59 +08:00
晓丶梦丶仁
29db7fabd9 feat: 保全作战相同location以json写的策略顺序执行 2024-08-20 00:47:59 +08:00
uye
95811c8e2a fix: ProxyType 重启不生效 2024-08-19 23:44:23 +08:00
uye
4a873757df chore: 优化界面显示 2024-08-19 23:40:40 +08:00
Constrat
e49e6546e3 style: git blame ignore revs 2024-08-19 16:41:51 +02:00
github-actions[bot]
ee3abf7ba6 chore: auto blame ignore 
[skip changelog]
 2024-08-19 14:38:01 +00:00
Constrat
a1893ecf8d fix: rev-list instead of rev-parse 2024-08-19 16:37:13 +02:00
Constrat
db2eec05bb docs: git blame ignore 2024-08-19 16:34:37 +02:00
Constrat
89d947f17a chore: clearout git blame 2024-08-19 16:31:52 +02:00
Constrat
8c7476915d fix: revert to simple if 2024-08-19 16:31:33 +02:00
Constrat
bcd69b5be8 fix: fetching depth 0 2024-08-19 16:29:14 +02:00
Constrat
2ef0ffef20 fix: impossiblity of fetch-depth modification. reverting + generic perfs 2024-08-19 16:26:49 +02:00
uye
9a2af68e50 chore: MuMu12EmulatorPath Placeholder 添加示例提示 2024-08-19 22:00:34 +08:00
github-actions[bot]
a58498cd7f chore: auto blame ignore 
[skip changelog]
 2024-08-19 13:45:24 +00:00
Constrat
ca297e9b5f debug: add workflow debugging 2024-08-19 15:44:57 +02:00
github-actions[bot]
021a51ca78 chore: auto blame ignore 
[skip changelog]
 2024-08-19 13:41:23 +00:00
Constrat
d7160523d5 style: prettier 2024-08-19 15:40:58 +02:00
Constrat
4f98de0fea test: remove last checked commit 2024-08-19 15:38:39 +02:00
github-actions[bot]
be98745118 chore: auto blame ignore 
[skip changelog]
 2024-08-19 13:29:25 +00:00
Constrat
d8cf3bdd79 perf: blame ignore (#10296) 
* fix: forgot branch

* chore: auto blame ignore

* chore: remove commits.txt, add only last check and blame ignore

* test: STYLE ONLY
[blame ignore]

* fix: checkout depth

* chore: auto blame ignore

[skip changelog]

* debug: remove debug artifacts

* perf: reduced steps number and optimized shell script

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
 2024-08-19 15:28:39 +02:00
Constrat
10d01ebc91 chore: remove unwanted workflow artifacts 
[skip changelog]
 2024-08-19 14:42:11 +02:00
github-actions[bot]
481a190e7f chore: auto blame ignore 2024-08-19 11:16:16 +00:00
Constrat
437dd5d3de feat(ci): automation for blame ignore (#10295) 
* feat(ci): automation for blame ignore

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-19 13:14:36 +02:00
Constrat
eca534bb99 chore: git blame added styling commits (#10283) 
chore: added styling commits
 2024-08-19 09:12:43 +01:00
SherkeyXD
12c88207b4 chore: smoking-test中肉鸽参数更新 2024-08-19 14:02:11 +08:00
SherkeyXD
dce897a69e chore: smoking-test添加领取奖励的测试 2024-08-19 14:02:11 +08:00
SherkeyXD
fd62b5818a chore: 移除tasks中的默认值 2024-08-19 14:02:11 +08:00
uye
b59d3e58a7 Release v5.6.0-beta.1 (#10271) 2024-08-19 12:52:33 +08:00
github-actions[bot]
5cf5c0c853 docs: Auto Update Changelogs of v5.6.0-beta.1 (#10278) 
* docs: Auto Generate Changelog of Release v5.6.0-beta.1

* docs: Update CHANGELOG.md

* docs: changelog

* docs: changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-19 12:51:25 +08:00
萨拉托加
4cf318bd44 chore: 添加交战荒野保全作业 (#10286) 
* feat:添加一份保全作业

* Rename MAACopilot_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json to SSS_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* Rename SSS_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json to SSS_交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-19 11:34:40 +10:00
status102
0b5704c02f Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员" (#10285) 
Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)"

This reverts commit 22817d4717.

不该是chore吧，要发版了等发版完再进
 2024-08-19 07:49:25 +08:00
晓丶梦丶仁
22817d4717 chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284) 
* feat: SSSstrategy之间同一位置需按json内写的顺序放置

* fix: 添加哈希函数

* fix: 修改错误参数

* refactor: 改用shared_ptr

* feat: 保全作业将不允许用核心干员作为工具人

* fix: 实现全局保core

* fix: 增加顺序tag减少bug

---------

Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
 2024-08-19 07:36:22 +08:00
Loong
f23d41d526 fix: 去除干员 OCR 识别结果中的前导下划线 (#10280) 
* fix: 去除干员 OCR 识别结果中的前导下划线

* fix: make sure at least one character following the underscore

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-08-18 22:52:37 +02:00
Constrat
ac299ea2a1 refactor: remove unneccesary Grid.Column fields 2024-08-18 22:51:37 +02:00
晓丶梦丶仁
ee48bd940a refactor: 生息演算2用户界面提醒 (#10281) 
docs: update zh-cn.xaml
 2024-08-19 04:38:11 +08:00
Constrat
17e4c04b03 i18n: english tweak 
[skip ci]
 2024-08-18 22:35:44 +02:00
Constrat
d0d4f6ae1d Revert "fix: multithread double free in Logger" 
This reverts commit 710fa1971c.
 2024-08-18 22:29:18 +02:00
Constrat
875f109666 chore(wpfgui): removed unnecessary fields + adb path centering 2024-08-18 22:17:58 +02:00
Constrat
dbd0d7a99b i18n: english tweak 
[skip changelog] [skip ci]
 2024-08-18 22:10:03 +02:00
Constrat
af9f02a28c style: tightened margins for GUI settings 2024-08-18 22:06:22 +02:00