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
14,368 Commits 61 Branches 1,838 Tags
afe4a2e6dbc8ade504e84b8eb52ec98c7bdfd780
Commit Graph

668 Commits

Author SHA1 Message Date
github-actions[bot]
58f28c57bf chore: Auto Templates Optimization 
Triggered by 9887a8e98c

[skip changelog]
 2025-03-10 07:04:36 +00:00
BxFS
9887a8e98c fix: 尝试修复肉鸽不期而遇退出后仍在尝试点击事件 
chore: update tools ignore

feat: check if already left encounter for RoguelikeStageEncounterTaskPlugin

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
 2025-03-10 15:03:36 +08:00
BxFS
f4541042e3 feat: 萨卡兹肉鸽深入调查实装 (#12098) 
* feat: Sarkaz Deep Investigation

* refactor: remove duplicate sarkaz confirm pngs
 2025-03-07 11:22:07 +01:00
XuQingTW
94d5577aa9 docs : 枯朽祭坛 维什戴尔 逻各斯 OCR辨識 (#12096) 
* Update 枯朽祭坛 维什戴尔 逻各斯

* 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-03-07 15:31:27 +08:00
github-actions[bot]
a6d463aba6 chore: Auto Templates Optimization 
Triggered by c02e107a23

[skip changelog]
 2025-03-07 02:34:34 +00:00
github-actions[bot]
c02e107a23 chore: Auto Update Game Resources - 2025-03-07 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13712491072

[skip changelog]
 2025-03-07 02:33:57 +00:00
pre-commit-ci[bot]
87c78ffb2d chore: Auto update by pre-commit hooks [skip changelog] 2025-02-27 22:12:46 +00:00
Weiyou Wang
9ac1cce1c5 fix: 「滋味」主题在有多个 badge 时无法识别基建入口 2025-02-28 09:06:35 +11:00
github-actions[bot]
19af7d38ef chore: Auto Templates Optimization 
Triggered by 6f2fe1e02b

[skip changelog]
 2025-02-26 10:50:23 +00:00
status102
6f2fe1e02b perf: 基建会客室信息板无新访客时，不再进入领取页 2025-02-26 18:48:52 +08:00
github-actions[bot]
726a4b16e2 chore: Auto Templates Optimization 
Triggered by aba7d9ece1

[skip changelog]
 2025-02-25 15:03:15 +00:00
BxFS
cb4ba252c0 fix: 萨米第二次调查装备获取+萨米暂时撤退适配 (#12030) 
fix: choose any device and MissionFailedFlag3 for sami DE/DI
 2025-02-25 22:32:34 +08:00
github-actions[bot]
51a196a4b3 chore: Auto Templates Optimization 
Triggered by f682166c6c

[skip changelog]
 2025-02-25 14:31:48 +00:00
status102
bad45b428c feat: 基建收取会客室周限300信用 (#12014) 
* feat: 基建收取会客室周限300信用

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

* chore(tools): add templates to ignore list

* fix: stack overflow

* fix: pipeline

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

* fix: 动画延迟+roi

* fix: 动画加加retry

---------

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-24 21:21:47 +08:00
github-actions[bot]
7ae7041dc9 chore: Auto Templates Optimization 
Triggered by 5684ff8dab

[skip changelog]
 2025-02-23 03:52:02 +00:00
uye
5684ff8dab fix: 「滋味」主题概率无法识别 2025-02-23 11:51:40 +08:00
BxFS
0028af16ca fix: Monthly Squad for Global (#11993) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-21 11:57:15 +01:00
github-actions[bot]
e755093e83 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]
dc12e298f5 chore: Auto Templates Optimization 
Triggered by 2bea8b209a

[skip changelog]
 2025-02-14 08:44:27 +00:00
github-actions[bot]
2bea8b209a 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
34fa74e8f3 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]
596ec3497a chore: Auto Templates Optimization 
Triggered by 2d5a5a4362

[skip changelog]
 2025-02-05 09:03:52 +00:00
github-actions[bot]
2d5a5a4362 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
5dc343e057 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]
0a33a96016 chore: Auto Templates Optimization 
Triggered by 29ae93ff8b

[skip changelog]
 2025-01-28 05:39:13 +00:00
uye
29ae93ff8b feat: 适配新 ui 未进驻选项 2025-01-28 13:38:39 +08:00
uye
0522dc9779 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]
6fba30a7df chore: Auto Templates Optimization 
Triggered by ead8ffb884

[skip changelog]
 2025-01-23 21:31:58 +00: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
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
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
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
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]
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
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
github-actions[bot]
19b307fc94 chore: Auto Templates Optimization 
Triggered by e45b5ed1f7

[skip changelog]
 2025-01-17 11:47:51 +00:00
status102
e45b5ed1f7 perf: 肉鸽战斗完成判定MissionCompletedFlag移除重复模板 2025-01-17 19:46:52 +08:00
BxFS
0e230af952 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]
e9bd798754 chore: Auto Templates Optimization 
Triggered by 657f6e5a7c

[skip changelog]
 2025-01-13 17:24:42 +00: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
github-actions[bot]
e23ae4c38a 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]
7fbfd2607b chore: Auto Templates Optimization 
Triggered by b258aa6480

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

[skip changelog]
 2025-01-02 11:26:54 +00:00
Sherkey Asher
7633b6d47c feat: 适配界面主题「大荒」与「视相」 (#11449) 2024-12-29 18:06:13 +08:00
github-actions[bot]
37c7d8e3a6 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]
6ac0407102 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
6190f2f147 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
9cc4600255 feat: 重新适配 DepotEnter 多界面主题 2024-12-17 13:26:20 +08:00