fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,157 Commits 61 Branches 1,839 Tags
cfaad2dfbcd8bbcedcc30cfc710b903499c0dbbf
Commit Graph

2043 Commits

Author SHA1 Message Date
晓丶梦丶仁
cfaad2dfbc Revert "chore: Auto Update Game Resources - 2025-02-18" 
This reverts commit 3f7dfcc76d.

Revert "revert c3d98ec8822fc41892c07f6b6caef5fd435fbc43"

This reverts commit 450d193932.

Revert "fix: EN服萨卡兹肉鸽负荷干员icon ROI"

This reverts commit 083b82b9ad.
 2025-02-18 11:05:55 +08:00
status102
450d193932 revert c3d98ec882 
PR #11921 相关，非预期的CN服资源修改
 2025-02-18 10:29:02 +08:00
Constrat
c4fb641873 feat: YoStarEN Sarkaz roguelike (#11921) 
---------
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-02-17 10:54:19 +01:00
HX3N
47588aae4c feat: YostarKR Sarkaz roguelike (#11920) 
* chore: add text and ocrReplace

* chore: Stage and Encounter

* chore: roguelike squad

* chore: img 1

* chore: remove space

* chore: img 2

* chore: tweak SelectTheme text

* chore: img 3

* chore: remove space

* chore: remove SpecialValRecognition

* chore: change template size

* chore: StageBoskyPassageEnter

* fix: incorrect template replacement

* i18n: 去伪存真

* i18n: tweak resource translation

* i18n: Roguelike seed and monthly

* i18n: tweak wrong translation

* fix: replace ChooseBurdenOperatorAtStart with a higher score image

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

* fix: StageRefresh roi

* fix: StageRefresh image

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

* fix: StageRefreshConfirm.png templ size

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

* fix: stagerefresh threshold

* fix: ChooseBurdenOperatorAtStart templThreshold

* fix: 纯烬艾雅法拉 ocrReplace

* i18n: 专业人士分队

I keep making mistakes because I'm drunk :P

* fix: remove $ from 相遇 ocrReplace

and replace , > .

* i18n: tweak Endpoint translation

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-16 22:05:12 +09:00
BxFS
54b2968c74 fix: 支持肉鸽特定模式下跳过选队直接选人 (#11915) 
fix: provision for certain roguelike mode without RolesDefault and go straight into RecruitMain, like sami.DE.8
 2025-02-14 23:55:23 +08:00
status102
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测" 
This reverts commit 5da64cf4da.
 2025-02-14 19:15:02 +08:00
BxFS
4d5afa5757 fix: 月度小队模式不再试图提前离开肉鸽 (#11872) 
fix: monthly squad mode no longer try to leave early
 2025-02-13 13:07:29 +08:00
萨拉托加
e4080e478f chore: 简化干员名正则 (#11876) 
国服也简化一下？照着改的
 2025-02-13 12:16:08 +08: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
BxFS
28b532a0c6 fix: Roguelike InitialDrop: SquadDefault -> Squad-EnterPoint (#11870) 
fix: Roguelike InitialDrop: Roguelike SquadDefault -> Roguelike Squad-EnterPoint
 2025-02-12 17:44:48 +08:00
github-actions[bot]
ebc9ec3f78 chore: Auto Update Game Resources - 2025-02-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13280763199

[skip changelog]
 2025-02-12 08:08:09 +00: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
5da64cf4da perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
status102
1d4f1ebb0b Revert "fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843)" 
This reverts commit 936a64a54d.
 2025-02-10 19:50:00 +08:00
status102
f3372f8500 fix: 移除账号切换中不必要的任务 (#11820) 
c4cdbd729b
 2025-02-10 15:32:39 +08:00
BxFS
936a64a54d fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843) 
* fix: SquadBackup for situations missing SquadDefault

* refactor: redundant SquadBackup
 2025-02-10 14:35:50 +08:00
BxFS
ca61de8c36 fix: CheckLevelMax OCR (#11764) 2025-02-06 22:51:37 +08:00
status102
db3bf32840 fix: 肉鸽开始探索反复重试后结束 
fix #11755
 2025-02-05 17:20:38 +08: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
晓丶梦丶仁
47cf92c084 fix: 狭路相逢事件识别失败 (#11752) 
* fix: 狭路相逢事件识别失败

* fix: 中文符号
 2025-02-05 15:39:11 +08:00
Tsukiyowu
a3aa2c36e1 perf: 开始任务自动关闭雷电模拟器 Google 套件窗口 (#11748) 
* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

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

* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-04 22:36:56 +08:00
status102
6c4a1b6ac7 fix: 自动战斗勾选使用理智药时自动编队卡住 2025-02-03 16:51:11 +08:00
status102
199fd8beb5 fix: 自动战斗开始战斗时使用理智药检测失效 
fix MaaAssistantArknights/MaaAssistantArknights#11701
 2025-02-02 10:09:40 +08:00
晓丶梦丶仁
c18d31506e perf: 将Sarkaz开局添加负荷干员的进入任务改为范围点击 (#11100) 
perf: 将开局添加负荷干员的进入任务改为范围点击
 2025-01-31 10:23:38 +08:00
status102
22b7f6ee3a rft: 调整肉鸽选择烧水奖励任务链，重新将Roguelike@LastRewardConfirm并入主任务链 2025-01-29 17:06:04 +08:00
github-actions[bot]
5616410a1e chore: Auto Update Game Resources - 2025-01-28 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13004384595

[skip changelog]
 2025-01-28 05:44:29 +00:00
uye
29ae93ff8b feat: 适配新 ui 未进驻选项 2025-01-28 13:38:39 +08:00
晓丶梦丶仁
0c0dbd6d1c fix: 肉鸽作战编队截图过快导致截图与实际不符 (#11527) 2025-01-26 20:16:24 +08:00
status102
d9ca8c6c02 fix: 幸运墙领取奖励界面识别过早 
fix MaaAssistantArknights/MaaAssistantArknights#11667
 2025-01-26 10:15:26 +08:00
uye
a53b255a72 chore: 调整基建办公室阈值 2025-01-25 02:04:06 +08:00
uye
6288a9ba52 chore: 调整 InfrastBottomLeftTab 的 specificRect 2025-01-25 02:04:05 +08:00
uye
7f5b71a75d chore: 调整基建发电站阈值 2025-01-24 13:56:20 +08:00
uye
fa73c6129a chore: 调整基建宿舍阈值 2025-01-24 13:46:59 +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
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
uye
dceca2a0a6 chore: 导航塞 SideStoryStage 下面 2025-01-23 03:24:48 +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
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]
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
萨拉托加
c14a3cb99d fix: tw 黍 百炼嘉维尔 OcrReplace (#11591) 
* fix: 黍 OcrReplace

* fix: tw 黍 百炼嘉维尔 OcrReplace

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

* fix: 多复制了一个
 2025-01-21 21:15:43 +08:00
status102
e45b5ed1f7 perf: 肉鸽战斗完成判定MissionCompletedFlag移除重复模板 2025-01-17 19:46:52 +08:00
Constrat
04bb40aad5 fix: add delay to Roguelike@QuickFormation 2025-01-16 16:59:06 +01:00
github-actions[bot]
3fc38700d4 chore: Auto Update Game Resources - 2025-01-16 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12801521024

[skip changelog]
 2025-01-16 03:28:46 +00:00
status102
79835c70de perf: 简化萨卡兹肉鸽种子入口 2025-01-16 11:26:13 +08:00
github-actions[bot]
ff5e96fd9e chore: Auto Update Game Resources - 2025-01-15 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12794721573

[skip changelog]
 2025-01-15 18:30:29 +00:00
不留
fdf8fe2104 fix: 修复肉鸽种子模式引起的异常卡死 (#11552) 
* fix: 优化种子存钱流程，避免卡死

* fix: Update tasks.json

* chore: 完善 task 注释

* fix: 加回不该乱删的字符（心虚

* perf: 命名、doc

* perf: Update tasks.json

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-01-16 02:10:13 +08:00