fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,841 Commits 61 Branches 1,838 Tags
6fba30a7dfdae5e7d14aa812133a2f59c2f05ed5
Commit Graph

13841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
6fba30a7df chore: Auto Templates Optimization 
Triggered by ead8ffb884

[skip changelog]
 2025-01-23 21:31:58 +00:00
Constrat
ead8ffb884 fix: fa4f038 modified Base Infrast Siege for all clients. Reverting for global and co. 2025-01-23 22:31:11 +01:00
uye
747ec3213c Release v5.12.2 (#11631) 2025-01-24 00:46:16 +08:00
uye
394a869c9a docs: Update CHANGELOG.md 2025-01-24 00:44:42 +08:00
uye
62ca08724d Release 5.12.2 (#11630) 2025-01-24 00:43:15 +08:00
uye
f7ae260939 docs: Update CHANGELOG.md 2025-01-24 00:43:02 +08:00
uye
b22c431fea fix: 基建修复3 (#11629) 
* fix: 反复进出训练室

* fix: 宿舍识别错误

* chore: 更新基建模板

* 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>
 2025-01-24 00:32:58 +08:00
uye
9eb4288d1e fix: 基建确认按钮 2025-01-23 23:06:36 +08:00
uye
a196ce476f Release v5.12.1 (#11624) 2025-01-23 22:06:55 +08:00
uye
38b48744b5 docs: Update CHANGELOG.md 2025-01-23 21:53:37 +08:00
uye
b65b815854 fix: 基建修复2 (#11618) 
* fix: 偶现无法进入训练室

* chore: 更新截图

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

* fix: 有时候点不到设施的确认按钮，沟槽的侧边栏遮挡点击的范围怎么还能变大的

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-01-23 21:48:38 +08:00
HY
875f5b6fe1 feat: 繁中服 生息演算【沙洲遺聞】 (#11620) 
* feat: 繁中服 生息演算【沙洲遺聞】

* 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>
 2025-01-23 12:55:12 +01:00
AoXuan
fa4f0385b2 fix: “围攻”主题 基建无法打开 (#11615) 
* fix: “围攻”主题 基建无法打开

* 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>
 2025-01-23 16:19:16 +08:00
Alisa
2b43a50dc4 i18n: Translations update from MAA Weblate (#11607) 
* i18n: Translated using Weblate (English (United States))

Currently translated at 97.4% (798 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/en_US/

* i18n: Translated using Weblate (Japanese)

Currently translated at 97.6% (800 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ja/

* i18n: Translated using Weblate (Korean)

Currently translated at 97.5% (799 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ko/

* i18n: Translated using Weblate (Chinese (Traditional))

Currently translated at 98.0% (803 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/zh_Hant/

---------

Co-authored-by: Anonymous <noreply@weblate.org>
 2025-01-22 20:39:41 +01:00
github-actions[bot]
3658214667 chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12915554449

[skip changelog]
 2025-01-22 19:24:55 +00:00
uye
dceca2a0a6 chore: 导航塞 SideStoryStage 下面 2025-01-23 03:24:48 +08:00
uye
fb1fef2b84 Release v5.12.0 (#11606) 2025-01-23 03:14:03 +08:00
github-actions[bot]
012e5e9cab docs: Auto Update Changelogs of v5.12.0 (#11608) 
* docs: Auto Generate Changelog of Release v5.12.0

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-01-23 03:13:37 +08:00
uye
ba5bda2536 chore: 我知道稳定版不稳定，所以就叫正式版吧 2025-01-23 03:09:46 +08:00
Sherkey Asher
9c530e81f2 fix: 修复基建 (#11598) 
* fix: 修复线索被选中标志

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

* fix: 默认主题和黑暗主题的基建图标

* fix: 修复萨米主题基建图标

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

* fix: 修复基建会客室图标识别

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

* fix: 修复主题 大荒城 的基建图标

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

* fix: 基建点击右上角进入的缩小状态模板错误

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

* fix: mini roi

* 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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-01-23 03:05:34 +08:00
uye
d46f397d6f chore: 隐藏公告关闭窗口，底部添加关闭按钮 2025-01-23 01:42:21 +08:00
uye
d4fca78fdd refactor：提取 HandlePreviewMouseWheel 2025-01-23 01:42:21 +08:00
HY
9859358ee4 feat: 繁中服 抽幸運牆的功能 (#11602) 
feat: 繁中服 抽取龍門幸運牆
 2025-01-22 14:36:40 +00:00
github-actions[bot]
40fe0a4d10 chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12910341481

[skip changelog]
 2025-01-22 14:28:44 +00:00
Constrat
52ba42df14 feat(style): Colored logs for I.S. (#11593) 
* feat: Colored logging for I.S. - Dark

* feat: Colored logging for I.S. - Light

* feat: Colored logging for I.S. - AsstProxy logic
 2025-01-22 20:51:11 +08:00
github-actions[bot]
870f95da82 chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12905798158

[skip changelog]
 2025-01-22 10:05:38 +00:00
Sherkey Asher
04899864a6 feat: SideStory「相见欢」导航 (#11597) 2025-01-22 16:58:55 +08:00
github-actions[bot]
989770e209 chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12901577375

[skip changelog]
 2025-01-22 05:06:19 +00: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
github-actions[bot]
94aeb7c135 chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12900967839

[skip changelog]
 2025-01-22 04:07:19 +00:00
status102
eda61cc3bd fix: 修复基建排班错误和加工站卡住 (#11590) 
- close #11499, close #7081
 2025-01-22 11:00:00 +08:00
github-actions[bot]
1cfb4a3218 chore: Auto Templates Optimization 
Triggered by 7f71aefc62

[skip changelog]
 2025-01-22 02:30:50 +00:00
github-actions[bot]
7f71aefc62 chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12899930282

[skip changelog]
 2025-01-22 02:30:17 +00:00
github-actions[bot]
dc72808e4e chore: Auto Update Game Resources - 2025-01-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12899566943

[skip changelog]
 2025-01-22 01:54:52 +00:00
BxFS
a3df45acd4 feat: 肉鸽月度小队/深入调查基础策略+自动切换 (#11566) 
* feat: 肉鸽月度小队奖励/访谈记录策略 #7058

* i18n: Translation for 809d0db

* fix: place Roguelike@DialogSkip under various Roguelike@Stages, and Roguelike@DialogSkip / Roguelike@DialogSkipConfirm reordering

* feat: tickboxes for AutoIterate on wpf

* style: typo

* feat: Iterate Monthly Squad

* fix: proper insertion point for monthly squad plugin, and task for collecting rewards

* feat: Iterate Deep Exploration

* feat: autoiterate for mizuki, sami and sarkaz

* fix: proper InitialDrop.png for three roguelikes and proper compeletion behaviour for iterate plugins

* fix: use different MonthlySquadRewardMiss.png for each roguelike

* feat: Iterate Monthly Squad Comms Option

* refactor: RoguelikeIterateDeepExplorationPlugin and RoguelikeIterateMonthlySquadPlugin, provision for per theme deep exploration adaptation, and basic adaptation to get it running

* fix: keep Sarkaz@Roguelike@DeepExplorationEnd from intruding other tasks with empty.png, and attempted fix of Phantom@Roguelike@CommsMiss

* fix: predelay 500ms for StartExplore

* fix: reduce retry_times for tasks that expect fail

* refactor: move DifficultySelectionTaskPlugin skip condition from verify to load_params

* style: remove RoguelikeDeepExplorationSpecialParameters::load_params and remove linebreakers for long ProcessTasks

* fix: post rebase fixes

* fix: ChooseMonthlySquad -> MonthlySquad, Template -> OcrDetect for resilience against changed backgrounds, and mac/arm64 compiler compliance

* fix: drop load_params from RoguelikeDeepExplorationSpecialParameters

* fix: added delay for MonthlySquadCommsBackTwice/Once, and some style fixes

* revert: cfc1951a already merged

* refactor: duplicate template removal and replacement with ocr

* refactor: more duplicate template removal

* fix: phantom monthly squad dialog timout, again

* fix: ocr -> template without words, and duct tape for Phantom@Roguelike@StrategyChange so it does not lock up in case stage name wasn't captured

* chore: remove words from noop

* fix: Roguelike@DeepExplorationDark.png -> Phantom@Roguelike@DeepExploration.png

* fix: MonthlySquadCompleted/DeepExplorationCompleted task to callback, and basic machine translation for it

* fix: masking for Roguelike@DeepExploration.png and Roguelike@MonthlySquad.png, removing Roguelike@NormalOperation.png as unused

* chore: slight tweak to maskrange templates

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

* refactor: variable names and DeepExplorationNotUnlocked.png masking

* fix: drop the nonexistent Sarkaz@Roguelike@DeepExplorationEnd.png and use default instead

* fix: delay moved from startExplore

* refactor: readability and duplicate removal

* refactor: filename, readability, and task chain adjustment

* perf: RoguelikeMode校验

* fix: retry 1->3, style fix and typo fix

* fix: move set_retry_times to RoguelikeTask

* docs: RoguelikeIterateMonthlySquadPlugin and RoguelikeIterateDeepExplorationPlugin

* fix: make MonthlySquadCommsBackTwice stuck proof

* chore: pick DeepExplorationSpecialParameters out of branch

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

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
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>
 2025-01-22 09:04:48 +08:00
Constrat
039e34ebaa perf: give priority to higher value choices in I.S. encounter.json (#11580) 
chore: give priority to higher value choices in I.S. encounter.json
 2025-01-21 21:31:17 +01:00
Constrat
e9504b7f68 style: fix clang format 2025-01-21 20:34:20 +01:00
status102
9d9ae9b20a style: include 
[skip changelog]
 2025-01-21 22:53:09 +08:00
status102
842f1edfe3 fix: 萨卡兹肉鸽种子存钱分队选择失败 2025-01-21 22:46:10 +08:00
萨拉托加
c14a3cb99d fix: tw 黍 百炼嘉维尔 OcrReplace (#11591) 
* fix: 黍 OcrReplace

* fix: tw 黍 百炼嘉维尔 OcrReplace

翻阅log发现百炼嘉维尔也错了

* fix: 多复制了一个
 2025-01-21 21:15:43 +08:00
HauKuen
f90a1c910d fix: 修复加工站重复执行问题 
返回 false 会导致重复执行 on_run_fails 四次，#11415
 2025-01-21 16:48:40 +08:00
HauKuen
ec4c2a23aa fix: 修复巫恋组错误应用到源石订单贸易站 2025-01-21 16:34:00 +08:00
Constrat
dc18d63660 chore: remove duplicates in txwy tasks 
[skip changelog]
 2025-01-20 11:48:37 +01:00
AoXuan
ec89063b36 feat: 萨卡兹肉鸽卫士不语功战斗策略调整 (#11582) 
* feat: 萨卡兹肉鸽卫士不语功战斗策略调整

* 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>
 2025-01-20 18:40:22 +08:00
HX3N
e475e80cf5 chore: YostarKR Mizuki DataTraceBack (#11584) 
* chore: YostarKR Mizuki DataTraceBack

* 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>
 2025-01-20 11:36:24 +01:00
github-actions[bot]
87345ee5ae chore: Auto Update Game Resources - 2025-01-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12863579196

[skip changelog]
 2025-01-20 08:08:28 +00:00
Constrat
c5ef69a461 fix: reduce ROI to detect special value in Sami I.S. for EN 2025-01-19 17:37:30 +01:00
github-actions[bot]
db25b9ab51 chore: Auto Templates Optimization 
Triggered by f0071a2fa0

[skip changelog]
 2025-01-19 16:28:53 +00:00
Constrat
f0071a2fa0 fix: EN Sami GamePassSkip2 2025-01-19 17:28:34 +01:00
Manicsteiner
e9b5aabc5c chore: YostarJP Mizuki DataTraceBack (#11579) 2025-01-19 16:54:16 +01:00