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
10,614 Commits 61 Branches 1,839 Tags
c20cd33fb91c74a3d3b8f888dd513ed60cce8b4e
Commit Graph

10614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Constrat
c20cd33fb9 chore: removed YostarJP recruit data skip 2024-01-16 23:18:45 +01:00
Constrat
7bbb5f3122 fix: Replacing strange space characters in ResourceUpdater for JP Recruit 
fix #8027
 2024-01-16 23:16:18 +01:00
Constrat
5ec4a6f71e style: reformatted CharsNameOcr for YostarEN (removed duplicate + moved) 
[skip changelo]
 2024-01-16 22:16:33 +01:00
Constrat
e61a8eebaf fix: Eyjafjalla Alter regex 
[skip ci]
 2024-01-16 22:03:41 +01:00
Constrat
90a6c36b17 chore: Manual run Resource Update (skipping JP recruitment) 
[skip changelog]
alpha/v5.0.0-beta.1.d021.g90a6c36b1 		2024-01-16 18:42:56 +00:00
David
68d20b0efc fix(temp): skipping recruit YostarJP, until further fix (#8028) 2024-01-16 19:39:46 +01:00
Constrat
0edfc3a347 fix: So Long Adele navigation 2024-01-16 18:40:00 +01:00
HX3N
b82bcfa10c chore: YoStarKR ocr text update for SO LONG ADELE (#8024) 
* chore: YoStarKR improve ocr text

replaced some duplicate items using regular expressions and removed space.
"ocrReplace" transforms words after removing spaces. Therefore, if there are spaces after that, it will not be recognized.

* chore: fixed the skin recognition

* chore: YoStarKR response SO LONG ADELE

add SL STAGE navigation
add new character

* chore: add 水汽汽水瓶 for copilot

* chore: sort tasks

* chore: LE Stage revert
 2024-01-16 17:10:53 +01:00
Horror Proton
a83cc24db0 docs: update build tutorial 2024-01-16 20:19:52 +08:00
Constrat
327a7ce4bb fix: So Long Adele ROI change (pre Trials for Navigator) 
check #8023
 2024-01-16 11:25:07 +01:00
Constrat
f47abe6a91 chore: Auto Update Game Resources - 2024-01-15 
[skip changelog]
 2024-01-15 20:07:11 +00:00
Constrat
46871e98c1 chore: Auto Update Game Resources - 2024-01-15 
[skip changelog]
 2024-01-15 15:45:47 +00:00
HX3N
391ed39211 chore: YoStarKR modifiy tasks.json (#8014) 
* chore: YoStarKR modifiy ocr text for Mizuki Roguelike

remove StageEncounterOptionFree as it is no longer used
Added Mizuki@Roguelike@DataTraceback to fix screen stuck issue on DataTraceback screen.

* chore: Compliance with grammar rules and additional explanations
 2024-01-15 16:33:04 +01:00
Constrat
027ae716a4 chore: Auto Update Game Resources - 2024-01-15 
[skip changelog]
 2024-01-15 12:33:52 +00:00
Constrat
39bc9878d6 chore: YostarEN So Long Adele event navigation 2024-01-15 13:17:20 +01:00
Manicsteiner
cf7e9e1c8e chore: YoStarJP 火山と雲と夢色の旅路 navigation (#8015) 2024-01-15 13:17:05 +01:00
Constrat
624ed939c8 chore: Auto Update Game Resources - 2024-01-15 
[skip changelog]
 2024-01-15 11:07:25 +00:00
Loong
f8e6b0e982 chore: bump maa-cli to v0.4.0 (#7996) 
* chore: bump `maa-cli` to `v0.4.0`

* docs: 更新 CLI 使用指南

* ci: build cli for appimage only with git2 feature

* ci: build CLI with vendored openssl on aarch64
 2024-01-15 10:31:16 +00:00
HX3N
f083059e0b chore: YoStarKR add ReceiveMail.png (#8009) 2024-01-13 19:42:49 +01:00
HX3N
3d7b0d2a69 docs: add korean operator name for so long adele (#8008) 
docs: add korean operator for so long adele
[skip changelog]
 2024-01-13 18:16:11 +01:00
Manicsteiner
4658f05532 chore: YoStarJP ReceiveMail.png (#8004) alpha/v5.0.0-beta.1.d005.g4658f0553 2024-01-13 12:27:26 +01:00
status102
70104e7e82 perf: 限制理智识别重试次数 
fix #7998
 2024-01-13 12:04:37 +08:00
Constrat
dc97305494 fix: Executor the Ex Foedere regex OCR 
fix #7995
 2024-01-12 18:53:25 +01:00
uye
d8b0121938 fix: 测试版显示错误的ui版本号 alpha/v5.0.0-beta.1.d002.gd8b012193 2024-01-11 22:40:19 +08:00
status102
db73e2f56e perf: Logger析构时不滚动日志 (#7975) 2024-01-11 21:36:25 +08:00
uye
1e36e9ba48 Release v5.0.0-beta.1 (#7951) v5.0.0-beta.1 2024-01-11 17:14:54 +08:00
uye
b723b83b0e docs: Update CHANGELOG.md 2024-01-10 18:12:31 +08:00
uye
6afb0526e8 fix: 自动战斗群组中多名干员在编组中时不会选择 
fix #7977
 2024-01-10 18:05:27 +08:00
status102
c4e44c784f perf: 优化连续战斗次数列表展开图片 2024-01-10 15:05:24 +08:00
status102
feea4f1ac8 fix: 修复#7733文件路径错误 (#7980) alpha/v4.28.9-alpha.1.d155.gfeea4f1ac 2024-01-10 13:16:34 +08:00
github-actions[bot]
03e6615423 docs: Auto Update Changelogs of v5.0.0-beta.1 (#7953) 
* docs: Auto Generate Changelog of Release v5.0.0-beta.1

* chore: 调整changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-01-10 10:02:44 +08:00
HX3N
b1f74fcd6d chore: YoStarKR added template image (#7974) 
chore: YoStarKR add template image

add missing template image

AnnihilationReturnFlag.png
InfrastProcessing.png
InfrastProcessingMini.png
 2024-01-09 18:50:25 +01:00
status102
dfc95b40b3 chore: 移除Sample本地运行时重复加载外服资源，避免产生潜在的错误 (#7930) 
chore: 移除Sample本地运行时重复加载外服资源，避免产生潜在的错误
 2024-01-09 20:47:55 +08:00
Constrat
ab4fa44f5c chore: Auto Update Game Resources - 2024-01-09 
[skip changelog]
 2024-01-09 08:29:08 +00:00
Loong
fcd5dfb861 chore: 修复基建排班的 JSON schema (#7788) 
docs: fix infrastructure schema
 2024-01-09 13:31:12 +08:00
status102
c1bdea35e8 feat: 允许插件停用ProcessTask (#7954) 2024-01-09 13:30:43 +08:00
zzyyyl
d36acc417c fix: 修复肉鸽烧水选择难度可能不对的问题 (#7946) 2024-01-09 13:29:07 +08:00
zzyyyl
81c1958992 feat: 减少重复截图 (#7945) 
* feat: 减少重复截图

* feat: 截图间隔阈值改为 2min

* style: 更新注释
 2024-01-09 13:28:03 +08:00
status102
8c6db4c514 style: 简化部分初始化 2024-01-09 09:27:01 +08:00
Alisa
ae9b55e493 i18n: Translations update from MAA Weblate (#7949) 
fix: 解决冲突 (#7948)

* feat: 萨米肉鸽新板子

fix #7865

* fix: typo
[skip ci] [skip changelog]

* fix: ClickedCorrectStage more ocrReplace regex

* chore: YostarEN I.S. trader store ocrreplace
[skip ci] [skip changelog]

* fix: 修复部分情况下，关卡掉落识别关卡名出错

* chore: YoStarKR ocr text replacement (#7845)

* chore: YoStarKR translation replacement

ko-kr translation replacement
add line break for readability

* fix: YoStarKR ocr text

fix ocr text for infrast
add Mizuki@Rouguelike@StageEncounterOptionUnknown

* chore: Auto Update Game Resources - 2023-12-31

[skip changelog]

* chore: Auto Update Game Resources - 2023-12-31

[skip changelog]

* feat: ui 和 core 版本不一致时开始任务添加 waring 提示

* fix: typo in task
[skip ci] [skip changelog]

* fix: subprocess handle leak

* chore: fix SyncRes build error

* docs: 修改readme中最大分辨率为2k

* chore: net8后不进行MAA_win7.exe备份

* fix: 版本兼容

* fix: 提供打不开MAA_win7.exe的处理方法

* fix: EN服 无法自动吃大理智药

fix #7793

* chore: 博朗台模式识别理智回复时间大于6分钟则返回失败

* chore: YostarEN I.S. Trader regex
[skip changelog]

(cherry picked from commit 2bc2763f3f)

* chore: more YostarEN I.S. collectibles regex
[skip changelog]

(cherry picked from commit 311fc34378)

* fix: 修复SSS_自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷脚本没有文件名后缀的错误 (#7879)

* chore: YoStarJP roguelike nextlevel ocr (#7859)

* chore: YoStarJP roguelike nextlevel ocr

* chore: using text instead of ocrreplace like other clients

---------


(cherry picked from commit 54fa1af24b)

* perf: 删除没有用到的 task

(cherry picked from commit c997bbea4c)

* fix: 修复肉鸽刷源石锭模式卡住的问题 (#7882)

fix #7858

(cherry picked from commit ad32918fc3)

* fix: changed template YostarEN I.S. enter

fix #7766 fix #7886

Revert 7b4d175678 & fix

(cherry picked from commit 182a0fd182)

* fix: 移除 StageEncounterClickToLeave 任务 (#7887)

作为 JustReturn 任务还有自己作为 next 也太危险了（
看了一下，应该所有任务都会通过 CloseEvent 退出，剩下的就是直接进下一层了，接上 NextLevel

fix #7884

(cherry picked from commit 6e4e6cee4e)

* docs: update instruction for waydroid

fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7701
(cherry picked from commit 08b6469aad)

* chore: YoStarJP 塵影に交わる残響 復刻 navigation (#7888)

(cherry picked from commit beed3fdc43)

* chore: YosrarEN Lingering Echoes stage navigation

(cherry picked from commit b2dbaab771)

* chore: Auto Update Game Resources - 2024-01-03

[skip changelog]

(cherry picked from commit 4f817e93fa)

* chore: YoStarKR template image replacement (#7895)

(cherry picked from commit ee9d576401)

* chore: YoStarKR LE stage navigation (#7896)

* chore: YoStarKR LE Stage navigation

* chore: YoStarKR LE stage navigation

revised regex

* chore: YoStarKR LE Stage navigation

remove duplicate regex

(cherry picked from commit 11c099da2f)

* chore: Auto Update Game Resources - 2024-01-03

[skip changelog]

(cherry picked from commit 1ebdecaa10)

* chore: YoStarKR ocrReplace text replacement (#7897)

fix some unrecognized ocrReplace text

* doc: 修复README的一处链接错误 (#7905)

doc: 修复了一个链接错误

* chore: Auto Update Game Resources - 2024-01-04

[skip changelog]

* chore: YoStarKR ocrReplace regex fix (#7901)

YoStarKR ocrReplace regex fix

* chore: 更新繁中服生息演算最後一天的日期 (#7903)

* fix: 清剩余理智时卡在选择次数

fix #7909

(cherry picked from commit 5e4002b058)
(cherry picked from commit d4bceb1c16)



* chore: gitignore FodyWeavers.xsd

* chore: 修改公招多选tag选项描述

* fix: 使用启动旧版.cmd启动后下次更新报错

* fix: 下调检测阈值以尝试修复刷理智卡在次数选择
fix #7919

* perf: 初步适配萨米肉鸽dlc关卡等 (#7924)

* perf: 优化萨米肉鸽部分关卡逻辑 (#7925)

* perf：初步适配萨米dlc内容

* perf:优化萨米肉鸽部分关卡逻辑

* fix: 勾选启动后直接最小化时无法使用右键强制显示

* fix: 兼容旧版本语言特性

* chore: 修改 前行的林地 默认选择

* fix: 修复刷理智调整战斗次数时可能错误点击关卡报酬

fix: 调整模板图

Revert "fix: 下调检测阈值以尝试修复刷理智卡在次数选择"

This reverts commit 6a8d38d8a6.

* docs: Auto Update Changelogs of v4.28.8 (#7932)

* docs: Auto Generate Changelog of Release v4.28.8

* chore: 调整changelog

---------




* fix: reduced Mizuki@Roguelike@MissionFailedFlag threshold for iOS
fix #7864 temporary fix as #7872 exists

* feat: 捕获启动模拟器时产生的权限不足异常 (#7908)

* feat: 捕获启动模拟器时产生的权限不足异常

* chore: 优化代码

* feat: 捕获所有启动模拟器时可能出现的异常并输出异常到日志

* docs: changelog.md

* perf: 优化萨米锏精二优先度 (#7939)

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: Constrat <Constrat@users.noreply.github.com>
Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
Co-authored-by: DL_君逸寒 <84064064+junyihan233@users.noreply.github.com>
Co-authored-by: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
Co-authored-by: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Co-authored-by: Chiichen <2531693734@qq.com>
Co-authored-by: HY <45387477+momomochi987@users.noreply.github.com>
Co-authored-by: youqii <youqii0522@gmail.com>
Co-authored-by: Lancarus <34369130+Lancarus@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: Chiichen <chiichen@qq.com>
 2024-01-09 00:01:23 +08:00
uye
9c0eff49f0 style: 添加词典 
[skip ci]
 2024-01-08 23:59:55 +08:00
uye
d0043a65e5 style: 简化集合 
[skip ci]
 2024-01-08 23:59:55 +08:00
Manicsteiner
41aa25a4b2 chore: YoStarJP AnnihilationReturnFlag.png (#7964) 2024-01-08 16:56:07 +01:00
Constrat
ec0e42d9db chore: added AnnihilationReturnFlag.png for YostarEN 
[skip changelog]
 2024-01-08 16:37:47 +01:00
status102
54e723b541 typo: 修改插件名以符合项目格式 alpha/v4.28.9-alpha.1.d139.g54e723b54 2024-01-08 22:18:45 +08:00
status102
eacd15bee8 typo: 修改插件名以符合项目格式 2024-01-08 21:20:48 +08:00
status102
e5ffec18a2 docs: 调整剩余理智关卡的说明 2024-01-08 21:04:03 +08:00
HX3N
4acb69d02f chore: YoStarKR modified ocr text (#7960) 
modified and improved some ocr texts that were not recognized on copilot
 2024-01-08 13:33:47 +01:00
David
e969c61d0a i18n: translated some infrast log lines (#7889) 
* i18n: translated some infrast log lines
---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-01-08 12:31:51 +00:00
status102
4707807c93 style: 优化RoguelikeSetting格式 2024-01-08 20:01:38 +08:00