fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,055 Commits 60 Branches 1,841 Tags
3412d57f2c98b285f08bc2adbecf35f0b5ce5b8a
Commit Graph

253 Commits

Author SHA1 Message Date
David
3412d57f2c feat: Visit Friends can be toggled off (#8488) 2024-03-07 16:58:42 +08:00
status102
2e1d34e43c perf: null check 
[skip changelog]
 2024-03-06 12:36:01 +08:00
Constrat
3bbd61aedf Revert "feat: VisitFriends can be toggled off" 
This reverts commit 37d92becca.
 2024-03-05 18:03:41 +01:00
Constrat
37d92becca feat: VisitFriends can be toggled off 2024-03-05 18:02:28 +01:00
status102
6c65842a9c refactor: 调整init 
[skip changelog]
 2024-03-03 14:02:15 +08:00
uye
12d1cf2ea6 perf: 抽卡风险提示默认选择取消 2024-03-03 03:05:35 +08:00
Constrat
e8b1a4a65a style: tweaked comment description 
[skip ci] [skip changelog]
 2024-03-02 12:00:37 +01:00
Manicsteiner
531c65ed7c perf: 肉鸽开局干员 隐藏未实装干员 (#8436) 2024-02-29 20:42:50 +01:00
Lancarus
999f9087b5 feat: 刷开局模式增加萨米肉鸽生活队凹密文板 (#8408) 
* feat: 增加萨米肉鸽凹密文板UI，优化肉鸽部分UI的显示

* feat: 凹开局板子相关逻辑

* perf: 优化相关逻辑

* perf: 传参使用array代替string

* style: format

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-02-28 13:01:15 +08:00
youqii
41b5d81f37 perf: 优化基建领取专精 (#8207) 
* fix: 将输出训练进度改为剩余时间

* fix: 删除重复代码

* fix: 修改任务roi
 2024-02-12 20:22:01 +08:00
枫雨
d6f7a0ecea feat: 强制定时启动添加提示对话框并可选是否显示窗口 (#8062) 
* feat: 强制定时启动添加提示对话框

* feat: 强制定时启动前显示窗口
 2024-02-08 11:44:26 +08:00
Rbqwow
1746417a78 chore: 移除mumu6 (#8284) 2024-02-08 03:17:06 +08:00
SherkeyXD
f8e7a755a4 feat: wpf 添加对幸运墙任务的支持 2024-02-06 20:51:45 +08:00
uye
c25c29d7dd chore: 部分需重启生效的选项添加重启确认弹窗 
fix #8259
 2024-02-06 10:48:19 +08:00
uye
7cf9c32013 chore: 抽卡风险提示 2024-02-05 23:33:18 +08:00
uye
5fc90291d9 feat: 开放每日免费单抽功能 (#8185) 2024-02-03 23:08:23 +08:00
uye
413e3ee860 feat: 新增只购买折扣信用商品（白名单商品除外）的选项和少于300信用点停止购物的选项 (#7659) 
* close #7466
 2024-02-03 23:01:28 +08:00
uye
82c7028c74 feat: 基建领取专精功能 (#7754) 
close #503
link to #7164 

@status102
 2024-02-03 23:00:51 +08:00
SherkeyXD
de865ef60e feat: 添加每日单抽功能警告 2024-02-03 22:32:02 +08:00
SherkeyXD
b81bb50ad9 feat: 添加RecruitingActivities的ui适配 2024-02-03 22:32:02 +08:00
uye
d945c21d71 fix: custom base plan selection. 
fix #8125
 2024-02-02 18:48:41 +08:00
uye
b56eaa9481 fix: 修复更新重启后热键失效 
fix #8006
 2024-02-01 13:02:14 +08:00
uye
af15c56ed5 style: 优化代码 2024-01-21 16:16:33 +08:00
uye
a57d644c0e chore: 增加输入提示，修改显示内容 2024-01-21 16:05:44 +08:00
uye
64c9c41349 feat: 肉鸽开局干员支持输入任意客户端对应名称 2024-01-21 16:00:31 +08:00
uye
d8b0121938 fix: 测试版显示错误的ui版本号 2024-01-11 22:40:19 +08:00
violetc
a9535f6f80 fix: 增加遗漏的判定 2024-01-07 23:39:04 +08:00
violetc
ab947189a2 feat: 将只凹直升改为一个选项 2024-01-07 23:39:04 +08:00
violetc
5073104f1d feat: 增加肉鸽单独凹精二模式 2024-01-07 23:39:04 +08:00
youqii
5aba3664bc fix: 修复自动基建时跳过训练室的问题 2024-01-07 12:02:27 +08:00
youqii
d725bc6326 feat: 新增选项 2024-01-07 12:02:27 +08:00
youqii
59e08285d0 feat: GUI新增选项 2024-01-07 12:02:23 +08:00
uye
072472a143 fix: 未在字典中的连接配置在使用自动检测时报错 
fix #7915
 2024-01-05 15:35:23 +08:00
Chiichen
13d4bb7c7f feat: 捕获启动模拟器时产生的权限不足异常 (#7908) 
* feat: 捕获启动模拟器时产生的权限不足异常

* chore: 优化代码

* feat: 捕获所有启动模拟器时可能出现的异常并输出异常到日志
 2024-01-05 09:44:10 +08:00
alisa
98935e4a59 chore: able to publish as single file and NUKE Fody 2024-01-01 18:10:47 +08:00
uye
240cd9069a fix: 开始前后脚本添加UseShellExecute = true, 2024-01-01 18:10:47 +08:00
uye
d270d0a032 chore: 添加勾选尝试启动模拟器的提示 2023-12-25 14:15:51 +08:00
uye
324feac0f7 chore: 修改选错adb程序后的弹窗提示 2023-12-24 13:37:20 +08:00
liupei
e40d26b83e feat: 新增只购买折扣信用商品的选项与少于300信用点停止购物的选项 2023-12-17 01:50:53 +08:00
status102
5deac04d38 Revert 基建新增领取专精功能 (#7624) 
* Revert "fix: 基建换班-继续专精 参数字段名格式不一致"

This reverts commit 6ce6b2d10a.

* Revert "chore: 部分客户端未支持的功能添加注释"

This reverts commit d2cede4a21.

* Revert "fix: 修复基建训练室-继续训练字符串键值冲突"

This reverts commit e0d5d1bf1d.

* Revert "feat: 基建新增领取专精功能 (#7164)"

This reverts commit 8b72ff9941.
 2023-12-15 16:23:11 +08:00
uye
4e50f9e402 style: qodana 2023-12-15 00:11:52 +08:00
youqii
8b72ff9941 feat: 基建新增领取专精功能 (#7164) 
close #503

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Sherkey <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-12-14 10:29:41 +08:00
status102
813763865b feat: wpf设置-连接设置新增近期截图耗时 2023-12-13 22:41:18 +08:00
lpowo
677bc8dabf feat: 增加公招多选策略 (#7463) 
* fix #7452   

按照 #7452 的想法，在 #6900  的基础上增加了只选尽可能多选且只选高星tag的功能选项，并将选项策略合并
默认策略：只选一个高星tag组合
#6900 策略：选满三个tag为止

新增策略：尽可能多选高星tag，且额外的tag组合要么完整选入，要么舍弃；且若当前出现更高星tag组合，则不会考虑较低星，只会尽可能选高星tag组合（例如出现五星tag时，将尽力多选五星tag，不会考虑四星tag）
(result_vec的排序规则暂时未更改)
在GUI中增加了选择公招策略的功能，如图：

<details>


![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/113409320/4b0d4f7d-5156-4144-b411-b96b604e49c7)

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/113409320/18167d72-741a-4bcd-95c8-6f916dec008d)

</details>

最后用模拟器在自己账号上进行了一些自动公招测试。

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2023-12-13 16:22:59 +08:00
uye
b4fc7adcb5 rft: 重构 SettingsViewModel Init 2023-12-08 14:16:47 +08:00
status102
6e5f333bd8 fix: 修复使用临期理智药设置无法在任务中修改的错误 (#7383) 2023-11-24 16:48:21 +08:00
uye
ee4b509413 chore: 新增一些开机自启设置的日志 2023-11-15 23:57:17 +08:00
uye
aee0d9a17c Merge branch 'dev' into upload_to_yituliu 2023-11-14 16:40:41 +08:00
uye
38c0e82b50 style: 调整变量位置，修改注释 2023-11-14 01:14:28 +08:00
uye
2ed9555c9e feat: core支持修改是否开启一图流上报，ui支持修改是否开启一图流和企鹅物流上报 2023-11-14 01:10:12 +08:00