fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,183 Commits 60 Branches 1,840 Tags
a7658ab9fc931da3a192042d2eb659c8dfe40e47
Commit Graph

8183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
a7658ab9fc chore: Add explicit 'return' or 'continue' before local functions 2023-08-07 01:07:55 +08:00
uye
6c37108819 chore: Put local function after 'return' or 'continue' 2023-08-07 00:58:42 +08:00
uye
6d4fcd0522 fix: problems were found by Qodana 2023-08-07 00:30:49 +08:00
uye
29ff0e2b69 fix: problems were found by Qodana 2023-08-07 00:12:25 +08:00
MistEO
cd01f17705 Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-06 20:08:19 +08:00
MistEO
9f9000157c refactor: 拆分所有肉鸽资源文件 (#5856) 2023-08-06 20:07:41 +08:00
Large-Japchae
83d67adf4e fix(YoStarKR): Goldenglow(澄闪) & Surtr(史尔特尔) ocrReplace (#5852) 2023-08-06 18:49:44 +08:00
David
36dda12e3b chore: modified text for EX stages (WB event) 2023-08-06 08:00:02 +02:00
MistEO
7946c24465 feat: 肉鸽开局助战or自选干员后不再要求选用start属性干员 (#5824) 2023-08-05 22:18:04 +08:00
MistEO
654ab020e2 feat(docs): 为文档添加docsearch和sitemap支持 (#5785) 2023-08-05 22:17:11 +08:00
MistEO
2d9d4123ed feat: 增加强制替换adb的信息提示，增加异常处理 (#5838) 2023-08-05 22:16:32 +08:00
MistEO
2a4e2c7210 CI-在静态分析中增加基线 (#5757) 2023-08-05 22:15:30 +08:00
uye
3299c408a3 feat: 增加强制替换adb的信息提示，增加异常处理 2023-08-05 12:17:45 +08:00
David
64a1d76dc7 typo: 2.2-DEVELOPMENT.md 2023-08-04 21:36:23 +02:00
MistEO
8f89e9d5a6 Revert "feat:自动检测特定目录下的bluestacks.conf" (#5794) 2023-08-04 23:02:29 +08:00
DuKong
3dbf9c47db feat: 肉鸽开局助战or自选干员后不再要求选用start属性干员 2023-08-04 20:01:55 +08:00
uye
dd3f7289db fix: 强制替换adb报错 
之后再加个吐司通知弹一下
 2023-08-04 16:49:51 +08:00
cenfusheng
9f1e6ab1f3 feat: 傀影肉鸽适配更多干员 (#5817) 
e佬主谋（指），我对部分干员进行了优先度微调。
 2023-08-04 14:39:37 +08:00
cenfusheng
fb75e2017c feat: 增加傀影肉鸽干员适配 
感谢e佬，此处锂微调。
 2023-08-04 14:23:36 +08:00
cenfusheng
b83fe20fcf feat: 增加傀影肉鸽对不同干员的适配 
e佬的奉献
 2023-08-04 14:03:57 +08:00
Sherkey
30d25ba6a3 fix: 恢复本地构建时删除的tsconfig内容 2023-08-03 21:09:07 +08:00
MistEO
6f214f2c55 docs: typo of 1.3-模拟器支持.md (#5802) 2023-08-03 17:17:36 +08:00
BlueandwhiteXD
0070ade11f Update 1.3-模拟器支持.md 2023-08-03 17:12:37 +08:00
cenfusheng
960cadf789 feat：适配萨米肉鸽关卡“豪华车队” (#5798) 
增加对该关卡的适配
 2023-08-03 13:12:59 +08:00
cenfusheng
b048b1f952 feat：适配萨米肉鸽关卡“豪华车队” 
增加对该关卡的适配
 2023-08-03 12:47:33 +08:00
MistEO
f9490912e5 Revert "feat:自动检测特定目录下的bluestacks.conf" 2023-08-03 10:38:52 +08:00
MistEO
0496db8046 feat:自动检测特定目录下的bluestacks.conf (#5751) 
好吧就是我懒得编辑json了（
 2023-08-03 09:41:00 +08:00
筱竹聽雨
9e483a2f69 fix: 修复纯烬艾雅法拉识别 (#5791) 
修复纯烬艾雅法拉识别
 2023-08-03 09:39:50 +08:00
MistEO
b02ff29b16 fix: 修正繁中服水月肉鴿會卡在 "緊急運輸" 的問題 (#5790) 
終於能解決這個問題了 🎉🎉🎉

爬 log 發現 "緊急調遣" 都會被識別到敘述裡的 "安全屋"，其他不期而遇則是有 "Unknown Event" 的問題。
試了一下才發現，原來是不期而遇關卡名一直沒有加上 ocrReplace  _ (´ཀ`」 ∠) _

本來可以再早一點發 PR 的，結果改完後一直遇不到緊急運輸沒辦法測 :(

相關 issue 與討論：
#5690 #5700 #5746 #5789
 2023-08-03 09:39:35 +08:00
momomochi
d96052daf8 新增水月肉鴿不期而遇關卡名稱的 ocrReplace 2023-08-03 09:14:06 +08:00
David
89a0909abd chore: same as 206cac7 2023-08-02 18:57:06 +02:00
David
206cac78ac chore: SSS Identification issue with NON-1080 emulators 2023-08-02 18:49:45 +02:00
Sherkey
148529badc Merge branch 'MaaAssistantArknights:dev' into feat/DocSearch 2023-08-02 22:12:25 +08:00
MistEO
0ebb8bb3fb Release v4.21.0 (#5780) 2023-08-02 21:46:19 +08:00
MistEO
9a32d2eba4 docs: Update CHANGELOG.md 2023-08-02 21:45:57 +08:00
SherkeyXD
de26225a3e docs: 添加sitemap支持 2023-08-02 21:38:35 +08:00
SherkeyXD
04bdaabdfe chore: 优化文档的gitignore 2023-08-02 20:57:58 +08:00
MistEO
30b4b069f9 chore: revert "version" of YostarEN 2023-08-02 20:53:27 +08:00
SherkeyXD
81c5fdd61a docs: 使用docsearch作为文档搜索插件 
需要跟进日语/繁体/韩语翻译
 2023-08-02 20:36:14 +08:00
Sherkey
156013f551 docs: 添加对于mumu12后台保活功能的设置的说明 (#5781) 
#5767

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
 2023-08-02 19:51:58 +08:00
MistEO
49cb124516 chore: Auto Update Game Resources - 2023-08-02 2023-08-02 09:47:38 +00:00
David
b67d21b842 refactor: from 9bdece8 Manual Stage navigation EN 
The reason I had to do the first commit is because the "baseTask"
wasn't working properly, so I copied the inheritor,
and now it's working as intended.
 2023-08-02 11:26:34 +02:00
uye
d69c408058 修复干员青枳识别 (#5775) 2023-08-02 14:58:09 +08:00
筱竹聽雨
e494fe3d73 Update tasks.json 
修复干员识别
 2023-08-02 13:44:09 +08:00
MistEO
4fa8b3fedd 繁中服水月肉鴿「委託完成」卡住 (#5766) 
報錯卡住
換一張
 2023-08-02 11:16:44 +08:00
David
6df7b577be fix: Wrong event in display 
@MistEO Please change the auto update resources as it's the third time it changes the event name because it has a wrong event schedule. There is no Ling event rerun right now.
It's Chongyue and Lin event time.
 2023-08-01 23:20:59 +02:00
MistEO
0629925e34 chore: Auto Update Game Resources - 2023-08-01 2023-08-01 18:47:29 +00:00
vonnoq
5e9aa8b332 水月肉鴿圖檔 
報錯卡住
換一張
 2023-08-02 02:24:06 +08:00
Infko
d81ca37a0e move qodana baseline to .github directory 2023-08-01 16:18:32 +00:00
MistEO
d3ff2c3cb8 Release v4.21.0-beta.1 (#5755) 2023-08-01 20:20:02 +08:00