Commit Graph

14157 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
github-actions[bot]
3f7dfcc76d chore: Auto Update Game Resources - 2025-02-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13382298189

[skip changelog]
2025-02-18 02:55:16 +00:00
status102
083b82b9ad fix: EN服萨卡兹肉鸽负荷干员icon ROI
c4fb641873

PR #11921
2025-02-18 10:36:42 +08:00
status102
450d193932 revert c3d98ec882
PR #11921 相关,非预期的CN服资源修改
2025-02-18 10:29:02 +08:00
github-actions[bot]
ac3ed152da docs: Auto Update Changelogs of v5.13.2 (#11963)
* docs: Auto Generate Changelog of Release v5.13.2

* chore: Sarkaz IS for global

* fix: reordering

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-17 23:40:33 +01:00
HX3N
e49fceb2d7 fix: YostarKR updated the StartUpConnectingFlag template (#11960) 2025-02-17 22:26:50 +01:00
Constrat
709334e650 fix: Fix hidden floor Sarkaz EN
I have no idea where I even pulled off "Hermitage of Sv whatever"
2025-02-17 16:46:48 +01:00
Constrat
7ed89827dd typo: EN tasks
[skip changelo] [skip ci]
2025-02-17 16:42:21 +01:00
Constrat
af89dfbd04 feat: YostarEN I.S. modes (#11956) 2025-02-17 15:36:19 +01:00
github-actions[bot]
c2790c17cb chore: Auto Update Game Resources - 2025-02-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13372516459

[skip changelog]
2025-02-17 14:29:00 +00:00
晓丶梦丶仁
3e67e0a6e5 fix: EN 服 IS2 导航失效 (#11955) 2025-02-17 22:05:51 +08:00
晓丶梦丶仁
0c505edea5 fix: 傀影肉鸽可以选择在第五层 BOSS 前暂停
Fix #11953
2025-02-17 21:51:14 +08:00
晓丶梦丶仁
d8f05f8611 docs: 调整肉鸽文档 skill_usage 描述,尝试 json5 2025-02-17 21:27:17 +08:00
晓丶梦丶仁
8c55eb85d0 perf: 调整IS4作战、招募 2025-02-17 21:27:17 +08:00
Manicsteiner
5abfbee4af feat: YostarJP Sarkaz roguelike (#11914)
* feat: YostarJP Sarkaz roguelike adaptation

* chore: add more template

* chore: StageBoskyPassageEnter

* chore: edits

* fix: unknown events

* fix: 戴冠式 ocr

weird
squash into 'fix: unknown event' if you want

* feat: IS 1~3 mode6&7

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-17 21:22:33 +08:00
晓丶梦丶仁
66dd7c49e7 perf: 肉鸽为识别错误的事件也添加 callback (#11946)
* perf: 为识别错误的事件也添加 callback

* perf: log.error、修改what内容

* i18n: KR translation

* i18n: JP translation

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
2025-02-17 21:20:38 +08:00
status102
5b5ba74a2d rft: Wpf重构自动公招任务序列化 (#11951) 2025-02-17 21:02:51 +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
uye
6de883ce11 fix: StartupUpdateCheck 不生效 2025-02-17 16:36:03 +08:00
晓丶梦丶仁
5d08fafb72 style: _updateCheck 位置
[skip changelog]
2025-02-17 16:09:27 +08:00
uye
bd74b82fd6 feat: SimpleEncryptionHelper 支持默认字符串 2025-02-17 12:57:10 +08:00
uye
190f187ca3 chore: 加解密失败时通知 2025-02-17 11:17:24 +08:00
status102
a3c68c74e9 chore: TaskData增加OcrTask的ocrReplace合法性检查 (#11878)
* chore: TaskData增加OcrTask的ocrReplace合法性检查

* docs: 加点注释
2025-02-17 09:25:44 +08:00
status102
2703fb3fcb rft: Wpf重构生息演算任务参数序列化 (#11916) 2025-02-17 09:23:06 +08:00
status102
7f8ba1719f rft: Wpf重构生息演算任务参数序列化
perf: 移除不必要的分隔符
2025-02-17 09:22:19 +08:00
status102
76bb116e5d rft: 使用RecruitData代替ocrReplace的外服适配 (#11879)
* rft: use RecruitData instead of ocrReplace

* chore: tasks.json

* docs: 注释

* i18n: txwy tweak

* perf: 加载资源时缓存客户端对应语言的招募tag集

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
2025-02-17 09:14:27 +08:00
uye
6ead3db018 fix: 外服重复检查资源 (#11927)
fix #11925
2025-02-16 23:05:07 +08:00
github-actions[bot]
470f57b0e8 chore: Auto Update Game Resources - 2025-02-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13355308934

[skip changelog]
2025-02-16 13:07:58 +00:00
晓丶梦丶仁
3500790718 perf: 肉鸽难度选项降到18个 (#11934) 2025-02-16 21:06:50 +08:00
晓丶梦丶仁
1a9b53df74 perf: IS4 调整公害ew部署 (#11935)
perf: 撒卡字肉鸽调整公害ew部署
2025-02-16 21:06:32 +08: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
晓丶梦丶仁
4f49745be6 feat: Sarkaz extend II 专业人士分队 (#11938)
feat: 萨卡兹内容拓展II 专业人士分队
2025-02-16 12:11:00 +08:00
晓丶梦丶仁
68fa9b1871 ci: issue-checker roguelike label
[skip changelog]
2025-02-16 11:46:50 +08:00
Constrat
5e5b78fe80 feat: remove spaces for all ocrReplaces for KR + various optimizations (#11926)
* feat: remove spaces for all ocrReplaces for KR + various optimizations

* fix: kr path
2025-02-15 19:58:31 +01:00
Constrat
81155bcd5f tools: ImageCoordinate cursor tweak 2025-02-15 15:18:44 +01:00
uye
658d6e222c chore: 优化日志输出 2025-02-15 19:49:53 +08:00
uye
3388a97f76 perf: 热键支持 Windows 键
fix #11922
2025-02-15 11:56:27 +08:00
Constrat
9411213a70 tools: allow sarkaz in OverseasClient missing
[skip changelog]
2025-02-14 21:47:53 +01: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
Constrat
26d88fb2f8 ci: try to fix pre commit using an updated fork (#11917)
---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-14 15:07:18 +01:00
晓丶梦丶仁
882787ee91 ci: disable prettier 2025-02-14 22:00:04 +08:00
status102
a11535d574 fix: Log Rotate 临时性检查措施 (#11835)
* fix: Log Rotate 增加任务开始时主动检查

* feat: Log Rotate 增加肉鸽每轮探索开始时主动检查

* perf: 移除TaskChain单任务结束后检查
2025-02-14 21:35:14 +08:00
status102
fb1b3859a2 rft: 重构任务id保存,支持保存多个同类型任务 2025-02-14 21:22:56 +08:00
Roland125
b52ef75c99 fix: 3星招募逻辑修复 (#11913)
* fix: 3星招募逻辑修复
2025-02-14 20:04:31 +08:00
MistEO
8552ac204a Release v5.13.1 (#11911) 2025-02-14 19:58:01 +08:00
晓丶梦丶仁
f5fe958516 fix: JP 事件译名重复 (#11910) 2025-02-14 19:44:08 +08:00
status102
7331769452 chore: typo 2025-02-14 19:37:38 +08:00
github-actions[bot]
af1d85a028 docs: Auto Update Changelogs of v5.13.1 (#11912)
* docs: Auto Generate Changelog of Release v5.13.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-02-14 19:35:07 +08:00
Constrat
c28ed09da9 ci: missing style output in res-update logging 2025-02-14 12:26:05 +01:00
status102
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测"
This reverts commit 5da64cf4da.
2025-02-14 19:15:02 +08:00