Commit Graph

5978 Commits

Author SHA1 Message Date
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
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
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 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
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
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
uye
6c2ed8a0b7 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 17:59:21 +08:00
Loong
e64140408c chore: bump maa-cli to 0.4.11 (#10274) 2024-08-18 10:44:04 +01:00
uye
4c3a65c407 chore: 修改 版本更新 界面 2024-08-18 15:55:25 +08:00
Linisdjxm
0bf6beac84 feat: 增加SOCKS5支持 (#10061) 2024-08-18 15:08:47 +08:00
uye
8c68d90a3d refactor(config) : reorganize settings loading (#10133)
重新组织配置读取的函数。虽然还是没找到 #2535 的根因。

ConfigHelper 使用.bak前应该先检查一下.bak是否可以被有效解析,可能会出现两者同时解析失败的情况 

AsstConnect 勾选自动检测的逻辑处理感觉有些乱,也一并重写了一下。
2024-08-18 15:03:08 +08:00
Hao Guan
1d06e808f8 feat: Mac GUI自动编队添加信赖干员 2024-08-18 15:02:03 +08:00
uye
7464b1b06b test: ci "(]"\"" 2024-08-17 20:24:41 +08:00
uye
bd52348126 chore: 移除不必要的引用 "()" 2024-08-17 19:32:25 +08:00
uye
ca4458f20d Revert "test: ci(123)"
This reverts commit 105054138b6ee7da48650d878506a4bbcdc9582b.
2024-08-17 18:02:01 +08:00
uye
884edc604b test: ci 2024-08-17 18:02:01 +08:00
uye
1905d5923b Revert "test: test ci(123)"
This reverts commit 184bc53a11620b18e932041d898ea3d73d87070f.
2024-08-17 17:38:23 +08:00
uye
48df7ee075 test: test ci 2024-08-17 17:38:23 +08:00
uye
c0e3756a96 Revert "test: test ci"
This reverts commit 3cc5aa554a3a8bab759a4238b409c28734485983.
2024-08-17 17:14:23 +08:00
uye
bade06bee1 test: test ci 2024-08-17 17:14:22 +08:00
zzyyyl
21e19ccdcb perf: 使用 views::join 2024-08-17 16:18:14 +08:00
uye
2190016c06 feat: winapi 关机/睡眠/休眠 2024-08-17 15:49:19 +08:00
zzyyyl
84af1ee70e fix: 修复数色闭运算导致的 StageRefresh FP 2024-08-17 01:22:26 +08:00
zzyyyl
92f24ec988 feat!: 拆分 maskRange 与 colorScales;增加 colorWithClose 开关数色时闭运算 2024-08-17 01:22:17 +08:00
Constrat
5ef663af0d chore: subtask iteration output tweak 2024-08-13 16:25:28 +02:00
uye
7d02255b46 docs: 修改 mumu 截图增强模式支持版本 2024-08-13 22:17:05 +08:00
Weiyou Wang
bf10bcdaa6 refactor: polish code for collapsal paradigm plugin (#10198)
* refactor: 复用 LoadingText

* refactor: 删除国际服 tasks.json 中冗余内容

* refactor: 改用 task 实现点击与滑动操作,并为精简后的相关 config task 添加注释
2024-08-12 21:03:45 +10:00
zzyyyl
de8ba8af63 fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低
fix #10160
2024-08-12 12:56:16 +08:00
zzyyyl
d719a81d1c feat: 数色前先通过闭运算填充小空洞,避免数色的得分过低 2024-08-12 12:54:56 +08:00
uye
736f836232 chore: 减少debug下截图数量最大值 2024-08-11 23:51:38 +08:00
status102
80c34a07e1 chore: ui perf
[skip changelog]
2024-08-11 16:56:42 +08:00
uye
6f431852e3 fix: 缺失 return
[skip changelog]
我脑子一定是烧坏了
2024-08-11 10:57:17 +08:00
uye
11605b7982 fix: 错误的判断条件
fix #10185
2024-08-11 10:42:50 +08:00
status102
f47020ce7f chore: task name
[skip changelog]
2024-08-11 09:17:23 +08:00
Rbqwow
d120a04206 refactor: StopGame (#9658)
* perf: StopGame

* style: rename Intent to packageName

* chore: 不准不选择区服

* fix: 移除其他配置中的抽象 stop 匹配

* style: 统一驼峰

* style: 按照执行顺序重新排序

* feat: 添加回调和文档

* fix: 修复参数传入

* docs: 更新文档

* fix: merge

* chore: 把WSA的配置也改了

* chore: update submodule

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
2024-08-11 01:50:30 +08:00
uye
c96f2e66b2 feat: 完成后勾选界面添加清空按钮
fix #10190
2024-08-11 00:07:44 +08:00
Constrat
3b6404b7e6 i18n: MAA webplate manual changes
ref: #10178
2024-08-10 11:54:30 +02:00
uye
0879dc2788 chore: Replace Poptip with ToolTip and Add InitialShowDelay for PostActionSetting.Once 2024-08-10 15:55:36 +08:00