Commit Graph

12685 Commits

Author SHA1 Message Date
Rbqwow
dc153b34c7 docs: 修改下载地址
[skip changelog]
alpha/v5.6.0-beta.1.d028.gdc153b34c
2024-08-20 06:23:24 +08:00
晓丶梦丶仁
d57e74a2e6 feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core 2024-08-20 00:47:59 +08:00
晓丶梦丶仁
0af22cd776 feat: 保全作战相同location以json写的策略顺序执行 2024-08-20 00:47:59 +08:00
uye
7ec665dd91 fix: ProxyType 重启不生效 2024-08-19 23:44:23 +08:00
uye
fa0786d627 chore: 优化界面显示 2024-08-19 23:40:40 +08:00
Constrat
d201dea34f style: git blame ignore revs 2024-08-19 16:41:51 +02:00
github-actions[bot]
637f67d4a1 chore: auto blame ignore
[skip changelog]
2024-08-19 14:38:01 +00:00
Constrat
7521b526ee fix: rev-list instead of rev-parse 2024-08-19 16:37:13 +02:00
Constrat
6c4582faa6 docs: git blame ignore 2024-08-19 16:34:37 +02:00
Constrat
0171d9c025 chore: clearout git blame 2024-08-19 16:31:52 +02:00
Constrat
8b34d53358 fix: revert to simple if 2024-08-19 16:31:33 +02:00
Constrat
008d06b7b5 fix: fetching depth 0 2024-08-19 16:29:14 +02:00
Constrat
5e8241fc7c fix: impossiblity of fetch-depth modification. reverting + generic perfs 2024-08-19 16:26:49 +02:00
uye
cb1b627e20 chore: MuMu12EmulatorPath Placeholder 添加示例提示 2024-08-19 22:00:34 +08:00
github-actions[bot]
a4463100c1 chore: auto blame ignore
[skip changelog]
2024-08-19 13:45:24 +00:00
Constrat
c89362ab82 debug: add workflow debugging 2024-08-19 15:44:57 +02:00
github-actions[bot]
eb11ed16ef chore: auto blame ignore
[skip changelog]
2024-08-19 13:41:23 +00:00
Constrat
b0d54c8a3f style: prettier 2024-08-19 15:40:58 +02:00
Constrat
498ea5f6a4 test: remove last checked commit 2024-08-19 15:38:39 +02:00
github-actions[bot]
39fe945e30 chore: auto blame ignore
[skip changelog]
2024-08-19 13:29:25 +00:00
Constrat
9994819e13 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
969493a031 chore: remove unwanted workflow artifacts
[skip changelog]
2024-08-19 14:42:11 +02:00
github-actions[bot]
5bdc822b7a chore: auto blame ignore 2024-08-19 11:16:16 +00:00
Constrat
90fac774ce 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
5fdea2ada4 chore: git blame added styling commits (#10283)
chore: added styling commits
alpha/v5.6.0-beta.1.d004.g5fdea2ada
2024-08-19 09:12:43 +01:00
SherkeyXD
6188a2ba3f chore: smoking-test中肉鸽参数更新 2024-08-19 14:02:11 +08:00
SherkeyXD
facbff3ef2 chore: smoking-test添加领取奖励的测试 2024-08-19 14:02:11 +08:00
SherkeyXD
c3f867624c chore: 移除tasks中的默认值 2024-08-19 14:02:11 +08:00
uye
48e2f72008 Release v5.6.0-beta.1 (#10271) v5.6.0-beta.1 2024-08-19 12:52:33 +08:00
github-actions[bot]
d79690a269 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
萨拉托加
17ef91e259 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
f70f4500e1 Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员" (#10285)
Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)"

This reverts commit 575a0fce81.

不该是chore吧,要发版了等发版完再进
2024-08-19 07:49:25 +08:00
晓丶梦丶仁
575a0fce81 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
ba35b711d2 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
56f1bf6b66 refactor: remove unneccesary Grid.Column fields 2024-08-18 22:51:37 +02:00
晓丶梦丶仁
d41e436f4f refactor: 生息演算2用户界面提醒 (#10281)
docs: update zh-cn.xaml
2024-08-19 04:38:11 +08:00
Constrat
a0dd8e60df i18n: english tweak
[skip ci]
2024-08-18 22:35:44 +02:00
Constrat
6b89a87a02 Revert "fix: multithread double free in Logger"
This reverts commit 7631e9a5d2.
2024-08-18 22:29:18 +02:00
Constrat
d3b09741c7 chore(wpfgui): removed unnecessary fields + adb path centering 2024-08-18 22:17:58 +02:00
Constrat
56654a4ddf i18n: english tweak
[skip changelog] [skip ci]
2024-08-18 22:10:03 +02:00
Constrat
a4a2b8456b style: tightened margins for GUI settings 2024-08-18 22:06:22 +02:00
Horror Proton
7631e9a5d2 fix: multithread double free in Logger alpha/v5.5.11453-alpha.1.d242.g7631e9a5d 2024-08-19 00:18:14 +08:00
uye
bc4694a1a0 feat: 允许选择WPFGUI中的干员名称显示语言 (#10079)
允许选择“干员名称显示语言”为“跟随MAA”或“跟随游戏客户端”。
这个应该不会需要更多选项吧()
先糊一坨,睡了()

已知问题:
 - 所有相关内容都需要重启客户端才能生效

TODO:
 - 将“切换语言后重启MAA”引入此处选项修改后任务
 - Other languages
 - 更多显示干员名称的区域,如 #10067 提到的招募小工具界面
 - 拆分重置 #9457 

待讨论:
 - 更多的专有名词


![图片](https://github.com/user-attachments/assets/cf384f22-0549-40cd-a698-07b6d4316818)
2024-08-18 23:11:29 +08:00
ManicSteiner
cab776350a chore: revert ui perf (commit 80c34a0) 2024-08-18 23:09:13 +08:00
Hao Guan
ffe8bfcf09 chore: update maadeps to 2024-08-17 (#10268)
* chore: update maadeps

* chore: FIXME: temporarily hold maadeps version for windows package

---------

Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
2024-08-18 23:01:26 +08:00
uye
5f3f93473f chore: 减少保全截图间隔 2024-08-18 22:31:36 +08:00
Manicsteiner
66a9b4ebfa Merge branch 'dev' into feat_opername 2024-08-18 22:26:30 +08:00
status102
435a374915 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 20:33:51 +08:00
status102
d04f2f64b4 Revert "fix: 截图速度过快时可能卡在公招放弃界面"
This reverts commit 6c2ed8a0b7.
2024-08-18 20:33:50 +08:00
uye
ed489bab8f fix: 获得导能元件时可能错误判断是否在战斗中 2024-08-18 20:33:27 +08:00