fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,301 Commits 61 Branches 1,838 Tags
5fef5b818e88c2ad26a4e915a9221973dfd52521
Commit Graph

651 Commits

Author SHA1 Message Date
github-actions[bot]
27b7b59c4a chore: Auto Update Game Resources - 2025-02-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13431621324

[skip changelog]
 2025-02-20 09:09:01 +00:00
github-actions[bot]
8abd69a723 chore: Auto Templates Optimization 
Triggered by ff1281e386

[skip changelog]
 2025-02-14 08:44:27 +00:00
github-actions[bot]
ff1281e386 chore: Auto Update Game Resources - 2025-02-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13325573436

[skip changelog]
 2025-02-14 08:43:37 +00:00
status102
34124cc037 feat!: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队，改为自动检测 (#11868) 
* fix: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队，改为自动检测

* 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-02-13 09:49:44 +08:00
github-actions[bot]
ad793ba764 chore: Auto Templates Optimization 
Triggered by b1ba539945

[skip changelog]
 2025-02-05 09:03:52 +00:00
github-actions[bot]
b1ba539945 chore: Auto Update Game Resources - 2025-02-05 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13153693252

[skip changelog]
 2025-02-05 09:02:55 +00:00
Tsukiyowu
663d017a1f fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题 (#11756) 
* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

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

* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-05 15:39:59 +08:00
github-actions[bot]
d6a7e7fe5a chore: Auto Templates Optimization 
Triggered by 9ba7ead6c8

[skip changelog]
 2025-01-28 05:39:13 +00:00
uye
9ba7ead6c8 feat: 适配新 ui 未进驻选项 2025-01-28 13:38:39 +08:00
uye
0ec0cdbff1 fix: 基建修复4 (#11642) 
* fix: 基建修复4

* 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 10:32:31 +08:00
github-actions[bot]
cbf7a61260 chore: Auto Templates Optimization 
Triggered by 9b55aad993

[skip changelog]
 2025-01-23 21:31:58 +00:00
uye
38c8dd81e1 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
68357b95bf 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
AoXuan
380bf68cfc 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
Sherkey Asher
51a336ae83 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
DavidWang19
023ed5563f 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]
4ee96b8f10 chore: Auto Templates Optimization 
Triggered by 0350521a58

[skip changelog]
 2025-01-22 02:30:50 +00:00
github-actions[bot]
0350521a58 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
BxFS
65b87a5699 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
github-actions[bot]
302fd92754 chore: Auto Templates Optimization 
Triggered by 47535d2cdd

[skip changelog]
 2025-01-17 11:47:51 +00:00
status102
47535d2cdd perf: 肉鸽战斗完成判定MissionCompletedFlag移除重复模板 2025-01-17 19:46:52 +08:00
BxFS
794f1717a1 fix: Return-White.png 识别 (#11469) 
* fix: remove edge from Return-White.png, possible fix for #11461

* fix: templThreshold for Return-White.png 0.8 -> 0.7

* doc: Return-White.png
 2025-01-15 23:33:55 +08:00
github-actions[bot]
447fa76acb chore: Auto Templates Optimization 
Triggered by 6d143de11b

[skip changelog]
 2025-01-13 17:24:42 +00:00
晓丶梦丶仁
ae2aaa1e6d 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
github-actions[bot]
af613af810 chore: Auto Update Game Resources - 2025-01-09 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12686742405

[skip changelog]
 2025-01-09 09:08:40 +00:00
github-actions[bot]
e78f94d59f chore: Auto Templates Optimization 
Triggered by 512a199382

[skip changelog]
 2025-01-02 11:47:08 +00:00
Constrat
512a199382 fix: InitialDrop.png更新 
Co-authored-by: BxFS <15606086+BxFS@users.noreply.github.com>
 2025-01-02 12:46:44 +01:00
github-actions[bot]
c4317b556b chore: Auto Templates Optimization 
Triggered by 3efab62747

[skip changelog]
 2025-01-02 11:26:54 +00:00
Sherkey Asher
e1fab541e5 feat: 适配界面主题「大荒」与「视相」 (#11449) 2024-12-29 18:06:13 +08:00
github-actions[bot]
8d12d313f5 chore: Auto Update Game Resources - 2024-12-29 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12533972992

[skip changelog]
 2024-12-29 08:45:08 +00:00
github-actions[bot]
b7c763375e chore: Auto Update Game Resources - 2024-12-23 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12467337602

[skip changelog]
 2024-12-23 13:12:48 +00:00
Weiyou Wang
19fc7d3472 fix: crop ClueSelected template to make sure it works under long clue names (#11409) 
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-12-22 00:22:55 +01:00
uye
e4c03d2775 feat: 重新适配 DepotEnter 多界面主题 2024-12-17 13:26:20 +08:00
uye
42dfa2233c Revert "feat: DepotEnter适配界面主题 (#7145)" 
This reverts commit 113f3235b3.
 2024-12-17 13:21:36 +08:00
github-actions[bot]
e9e20e78c3 chore: Auto Update Game Resources - 2024-12-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12293072744

[skip changelog]
 2024-12-12 09:05:52 +00:00
github-actions[bot]
7081bb3a43 chore: Auto Templates Optimization 
Triggered by 07023b15a4

[skip changelog]
 2024-12-11 10:38:22 +00:00
Weiyou Wang
07023b15a4 feat: 为选择线索添加判定 (#11323) 
* 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>
 2024-12-11 21:38:01 +11:00
github-actions[bot]
0696fde360 chore: Auto Templates Optimization 
Triggered by d73d4e7e8c

[skip changelog]
 2024-12-10 11:30:05 +00:00
晓丶梦丶仁
d73d4e7e8c fix: 网络卡顿导致领邮件失败 (#11333) 2024-12-10 19:29:11 +08:00
github-actions[bot]
3977bdd69d chore: Auto Update Game Resources - 2024-12-05 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12172132319

[skip changelog]
 2024-12-05 02:37:51 +00:00
github-actions[bot]
343ceb40f5 chore: Auto Templates Optimization 
Triggered by b634aef1c4

[skip changelog]
 2024-11-15 14:29:17 +00:00
uye
b634aef1c4 fix: 无法进入通用图标的活动 2024-11-15 22:28:11 +08:00
github-actions[bot]
36feae8e16 chore: Auto Update Game Resources - 2024-11-15 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11853309361

[skip changelog]
 2024-11-15 09:06:01 +00:00
github-actions[bot]
20ab374337 chore: Auto Templates Optimization 
Triggered by 72119ac361

[skip changelog]
 2024-11-05 13:38:20 +00:00
Weiyou Wang
72119ac361 feat: 自动编队允许指定助战单位 (#11075) 
* feat: 自动编队自动借助战

Revert d78fc68

fix: 招募助战后继续（缺少点击快速招募）

i18n: 翻译

style: clang-format

fix: basetask template

fix: werror

perf: 注释、format

i18n: en

perf: 完成功能实现，复用task，进行gui输出

perf: 更改默认状态

feat: BattleFormationTask

Revert 385541a (Back to c2849d2)

* fix: 缺干员回到主界面的时候应该点确认而不是返回

* feat: 助战干员职业选择栏模版

* refactor: UseSupportUnitTaskPlugin

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

* perf: 默认值适配国服

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

* feat: try_find_and_apply_support_unit

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

* fix: 大概可以用了

* fix: 补充 struct 的构造函数

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

* fix: 添加默认构造函数

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

* fix: 改改类型

* fix: callback[what] 纠正

* perf: roi及初始化优化

* perf: 简化中英文查找

* perf: rename func

* perf: click roi

* fix: 在点击助战干员的行动后添加 LoadingText

* fix: 打点 Log

* fix: remove unused function

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2024-11-06 00:37:43 +11:00
status102
a17ac2ea69 Revert "feat: 自动编队允许指定助战单位 (#10820)" 
This reverts commit 3c97864f0a.
 2024-11-05 17:57:24 +08:00
status102
c5ce1f79c2 Revert "chore: Auto Templates Optimization" 
This reverts commit 46aa097801.
 2024-11-05 17:55:39 +08:00
github-actions[bot]
46aa097801 chore: Auto Templates Optimization 
Triggered by 3c97864f0a

[skip changelog]
 2024-11-05 06:09:54 +00:00
晓丶梦丶仁
3c97864f0a feat: 自动编队允许指定助战单位 (#10820) 
* feat: 自动编队自动借助战

Revert d78fc68

fix: 招募助战后继续（缺少点击快速招募）

i18n: 翻译

style: clang-format

fix: basetask template

fix: werror

perf: 注释、format

i18n: en

perf: 完成功能实现，复用task，进行gui输出

perf: 更改默认状态

feat: BattleFormationTask

Revert 385541a (Back to  c2849d2)

* fix: 缺干员回到主界面的时候应该点确认而不是返回

* feat: 助战干员职业选择栏模版

* refactor: UseSupportUnitTaskPlugin

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

* perf: 默认值适配国服

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

* feat: try_find_and_apply_support_unit

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

* fix: 大概可以用了

* fix: 补充 struct 的构造函数

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

* fix: 添加默认构造函数

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

* fix: 改改类型

* fix: callback[what] 纠正

* perf: roi及初始化优化

* perf: 简化中英文查找

* perf: rename func

* perf: click roi

* fix: 在点击助战干员的行动后添加 LoadingText

* fix: 打点 Log

* fix: remove unused function

---------

Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-11-05 17:09:25 +11:00
uye
616c12951b perf: 优化访问好友模板匹配 2024-11-04 16:49:21 +08:00