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

4692 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
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
晓丶梦丶仁
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
Constrat
c4fb641873 feat: YoStarEN Sarkaz roguelike (#11921) 
---------
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-02-17 10:54:19 +01: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
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
晓丶梦丶仁
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
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
晓丶梦丶仁
f5fe958516 fix: JP 事件译名重复 (#11910) 2025-02-14 19:44:08 +08:00
status102
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测" 
This reverts commit 5da64cf4da.
 2025-02-14 19:15:02 +08:00
github-actions[bot]
428f552b54 chore: Auto Update Game Resources - 2025-02-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13327901721

[skip changelog]
 2025-02-14 11:05:51 +00:00
github-actions[bot]
b297dfb3a2 chore: Auto Update Game Resources - 2025-02-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13327319832

[skip changelog]
 2025-02-14 10:29:16 +00:00
晓丶梦丶仁
439e77d68d perf: 水月肉鸽开端事件选择 3-3 2025-02-14 17:40:21 +08: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
Manicsteiner
aee0be04a8 fix: YostarJP OCR (#11884) 2025-02-13 11:16:43 +01:00
Weiyou Wang
fec1bfe2f4 fix: YostarJP OCR mismatched parenthesis (#11877) 
* fix: mismatched parenthesis

* fix: 换个和之前更接近的版本
 2025-02-13 14:10:30 +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
github-actions[bot]
5213405dc8 chore: Auto Update Game Resources - 2025-02-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13290844408

[skip changelog]
 2025-02-12 17:06:11 +00:00
uye
49ef217911 chore: 简化干员名正则 2025-02-13 00:53:06 +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
github-actions[bot]
3de8ed8875 chore: Auto Update Game Resources - 2025-02-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13271545330

[skip changelog]
 2025-02-11 20:06:48 +00:00
github-actions[bot]
1fb70e746c chore: Auto Update Game Resources - 2025-02-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13266778500

[skip changelog]
 2025-02-11 15:44:29 +00:00
HY
fa13413841 chore: 繁中服「巴別塔」活動導航 (#11863) 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-11 16:36:20 +01:00
status102
5da64cf4da perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
github-actions[bot]
2c357a3a58 chore: Auto Update Game Resources - 2025-02-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13256885880

[skip changelog]
 2025-02-11 06:08:22 +00:00
github-actions[bot]
b8cb685136 chore: Auto Update Game Resources - 2025-02-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13256477009

[skip changelog]
 2025-02-11 05:28:38 +00:00
Manicsteiner
99b06e768e feat: YostarJP Sarkaz roguelike preload (#11850) 2025-02-11 12:03:47 +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
Hao Guan
42cddce5c6 feat(mac): 开始唤醒支持账号切换 (#11803) 2025-02-08 18:52:42 +08:00
github-actions[bot]
053f4e7a64 chore: Auto Update Game Resources - 2025-02-08 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13211117921

[skip changelog]
 2025-02-08 01:52:10 +00:00
Constrat
e98f2f519d chore: remove duplicates in tasks for global 2025-02-07 20:52:57 +01:00
github-actions[bot]
02b52ae63a chore: Auto Update Game Resources - 2025-02-07 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13206816100

[skip changelog]
 2025-02-07 19:38:57 +00:00
HX3N
d45dcf2dd1 chore: add missing text for YostarKR (#11798) 2025-02-08 02:22:42 +08:00