fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,137 Commits 61 Branches 1,837 Tags
a1ead2bef343f3fc63b6f82f6f1a4385ca92ef71
Commit Graph

45 Commits

Author SHA1 Message Date
Weiyou Wang
a1ead2bef3 fix: 修复集成战略萨米主题下凹密闻板相关功能 (#14755) 2025-11-19 18:50:32 +08:00
uye
cf362a4106 fix: 刷开局奖励只选票券时行为异常 
fix #14079
 2025-09-13 21:12:09 +08:00
Weiyou Wang
69f3ab2a97 fix: 修复放弃招募任务链；避战识别不到得偿所愿 (#13395) 
* fix: 修复放弃招募任务链

* fix: 怎么还有大小写问题啊

* fix: 划不到点刺

* fix: 肉鸽地图识别加入对界园得偿所愿节点的支持

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-07-29 11:35:18 +08:00
Constrat
0842c3572d fix: clang style 2025-07-28 21:57:56 +02:00
uye
f07d3eb845 fix: 无法选中 坚不可摧 与 随心所欲 分队 2025-07-29 01:33:29 +08:00
status102
f825a8e295 perf: 肉鸽指定干员开局招募进入干员选择页状态监测追加首次进入的指导的监测 2025-07-27 00:08:36 +08:00
status102
dd814a124f refactor: 肉鸽局内外招募流程拆分 (#13342) 
* rft: 界园主题初始实现

* perf: 优化core_char, 移除反复擦写

* perf: 简化任务链, 移除RecruitMain的StartExplore前缀

* rft: 其余肉鸽适配

* fix: 修改不稳定生效的任务计数联动

* fix: 开局干员招募未点进
 2025-07-26 10:29:40 +08:00
SherkeyXD
313be155e2 feat: 界园肉鸽烧水支持票券 2025-07-17 00:02:31 +08:00
Constrat
ce07e061e9 style: precommit clang? 2025-04-20 11:26:52 +02:00
Aliothmoon
76e41e30e2 feat: 调整按钮阴影 (#12398) 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-04-19 00:14:23 +08:00
Constrat
f33fcc4ce5 style: clang mass formatting 2025-04-17 09:32:58 +02:00
status102
868e8e24f1 fix: 肉鸽职业组 
fix #11901
 2025-02-14 18:37:06 +08:00
status102
7ef60642c7 revert: 4481710605 2025-02-14 09:49:41 +08:00
status102
f89fe2a317 fix: 肉鸽开局无法选择指挥分队时放弃探索 (#11847) 
* fix: 肉鸽开局无法选择指挥分队时放弃探索

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

* fix: 无法选择指挥分队时，随机选一个

* chore: YoStarEN `Squad-EnterPoint`

* chore: 增大EN服roi

* chore: txwy

* chore: jp

* chore: kr

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-12 15:58:02 +08:00
status102
dc69337d22 fix: 肉鸽开局烧水奖励领取失败 2025-02-08 20:09:52 +08:00
status102
03e54aecd5 fix: 肉鸽非投资模式禁用种子刷钱 2025-02-07 17:16:53 +08:00
status102
aeea33aff4 fix: 肉鸽烧水分队兼容 
fix#11739
 2025-02-07 17:14:23 +08:00
status102
a93bd61f07 rft: 移除RoguelikeLastRewardSelectTaskPlugin，合并烧水奖励选择 2025-02-07 13:25:48 +08:00
status102
b88d81e0ab rft: 简化肉鸽局中数据存储 (#11581) 
* rft: 简化肉鸽局中数据存储

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

* perf: 设定容器容量

* perf: 优化调用

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-05 18:07:49 +08:00
status102
5628ad3693 Revert "style: clang formatting" 
This reverts commit 1656a80b54.
 2025-02-02 23:59:46 +08:00
status102
4417c7c713 chore: include 2025-02-02 23:54:46 +08:00
Constrat
1656a80b54 style: clang formatting 
[skip changelog]
 2025-02-02 14:24:12 +01:00
status102
896032a477 fix: 移除二次检查 
[skip changelog]
 2025-02-02 15:44:55 +08:00
status102
e41f160037 fix: 肉鸽烧水使用分队失效 2025-02-02 15:25:03 +08:00
status102
9ba758aa7c perf: 简化肉鸽任务使用助战参数内部存储流程 2025-02-01 20:01:32 +08:00
DavidWang19
d2982bd9b4 feat: 优化肉鸽刷开局模式的流程和逻辑 (#11559) 
* feat: 新增刷开局模式下是否购物的选项

* chore: 修改傀影开局模板图文件名

* chore: 添加注释

* fix: 修复刷开局模式下不能进入商店的问题

* feat: 添加各肉鸽主题可刷开局 通用：热水壶 盾(血) 源石锭 希望  随机；水月：钥匙 骰子；萨卡兹：构想

* refactor: CheckComboBox 改为 key 在前

* feat: 界面添加开局奖励选择

* fix: ubuntu build

* feat: proxy 添加对应参数

* rft: 拆分烧水奖励领取

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

* fix: 刷完后直接退出，精二时继续检查

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

* perf: 优化肉鸽刷开局模式RoguelikeShoppingTaskPlugin verify

* perf: 简化肉鸽烧水期望传参

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

* fix: Wpf传值错误

* perf: 衔接旧流程

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

* feat: 支持选择不同的烧水分队和目标分队

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

* fix: 移除遗漏调用

* fix: 变量名一致化

* chore: 烧水期望奖励翻译预留

* fix: 移除无用的set_task_base

* i18n: 添加开局奖励翻译

* i18n: JP translate

* i18n: KR translate

* i18n: zh-tw translate

* i18n: EN tweak

* chore: 移除不再使用的task

* docs: 加点文档

* docs: 烧水使用分队

* perf: UI

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

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-01-22 12:57:25 +08:00
晓丶梦丶仁
3d5e05414f feat: 点刺、后勤种子存钱 & ProcessTask 添加 Input 方法 (#11521) 
* feat: 为 ProcessTask 添加文本输入功能

* feat: 点刺、后勤种子存钱

* docs: 为 Input 方法添加文档

* perf: 添加循环刷钱cd检查

* perf: werror

* perf: 改变 Input 的 int 值

* perf: 减少 AsstProxy 传参，改用 c:Binding

* chore: 界面显示和获取分离

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-01-12 20:03:09 +08:00
Weiyou Wang
3305e608ba feat: 点刺成锭分队，刷钱 (#10901) 
* feat: fastInvestment

* feat: wpf 适配

* refactor: 点刺成锭分队快速编队

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

* feat: 投资模式下点刺成锭分队直接放弃招募

* refactor: 投资模式下点刺成锭分队不再考虑思维负荷

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

* fix: 修复放弃招募机会时卡顿的问题，模版和 roi 错了

* refactor: 进一步优化

* fix: 取消投资模式下快速定位点刺成锭分队的功能，照顾非全解锁玩家

* fix: 尝试修复跳过 StrategyChange 的问题

* fix: set_squad 提前

* feat: 根据需要启用/禁用 <思维负荷干员编队功能>

* refactor: 加点注释

* fix: 减少需要匹配的模版

* chore: 移除不相关内容

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-10-27 09:04:25 +08:00
status102
aa547f6db9 perf: 简化RoguelikeTask set_params 
[skip changelog]
 2024-07-25 09:59:20 +08:00
Lancarus
c123c0e03d fix: 增加肉鸽分队存储及判断，避免蓝图队影响其他肉鸽存钱 2024-07-23 12:13:51 +08:00
status102
154c42860a perf: 优化肉鸽主题校验 2023-11-26 10:25:06 +08:00
status102
70871fdf53 perf: 迁移肉鸽UseNonfriendSupport 2023-11-17 21:08:26 +08:00
status102
ff97096440 perf: 迁移肉鸽UseSupport 2023-11-17 21:08:20 +08:00
status102
e5b89ed559 perf: 迁移肉鸽核心干员 2023-11-09 22:32:19 +08:00
status102
3a3532f3e7 perf: m_roguelike_config -> m_config 2023-11-03 21:09:17 +08:00
status102
d52eb1f136 refactor: 不再继承RoguelikeConfig，使用AbstractRoguelikeTaskPlugin统一共享RoguelikeConfig 2023-10-31 21:55:44 +08:00
status102
00a9e1e9a8 perf: 肉鸽主题从Status分离 2023-10-02 16:55:14 +08:00
MistEO
88a021cb2c refactor: 视觉相关重命名 2023-04-29 16:20:12 +08:00
MistEO
d64e829ac3 styles: format all cpp 2023-03-27 18:19:48 +08:00
dantmnf
447b9d86e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64 2023-03-04 16:51:33 +08:00
zzyyyl
4d61950d7e style: format 
请各位开发者统一代码风格！
```
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\MaaCore
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\resource
```
参考 https://maa.plus/docs/2.2-%E5%BC%80%E5%8F%91%E7%9B%B8%E5%85%B3.html#%E5%9C%A8-visual-studio-%E4%B8%AD%E5%90%AF%E7%94%A8-clang-format
 2023-02-23 10:00:51 +08:00
dantmnf
7f8e84d3de chore: move controller to subdirectory 2023-02-17 19:40:15 +08:00
MistEO
2171c9dde8 refactor: 重构战斗，抽出BattleHelper基类（还没写完，睡觉要紧） 
1>D:\Code\MeoAssistantArknights\src\MaaCore\Task\AbstractTask.cpp(25,1): error C2220: 以下警告被视为错误
1>D:\Code\MeoAssistantArknights\src\MaaCore\Task\AbstractTask.cpp(24,17): warning C4589: 抽象类“asst::AbstractTask”的构造函数忽略虚拟基类“asst::InstHelper”的初始化设定值
1>D:\Code\MeoAssistantArknights\src\MaaCore\Task\AbstractTask.cpp(24,17): message : 虚拟基类仅由最底层派生类型进行初始化
 2022-12-26 02:26:11 +08:00
wangli
659a6a892e feat: MaaCore添加肉鸽助战支持 2022-12-19 20:45:59 +08:00
MistEO
d9dcbb6289 chore: breaking rename 2022-12-02 00:22:47 +08:00