fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,396 Commits 61 Branches 1,837 Tags
c162a1912a0fbb0a67bca1b00a7aeaa010797746
Commit Graph

4396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
c162a1912a Update 1.1-详细介绍.md 2022-10-26 10:16:17 +08:00
MistEO
759ac7859b chore: 优化内置243作业无人机的使用 2022-10-26 00:37:50 +08:00
MistEO
89439e4b6e chore: 更新台服gamedata数据 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-26 00:21:11 +08:00
MistEO
11968e806f feat: 新增肉鸽关卡识别错误时自动保存图片功能，修复台服一个肉鸽关卡识别错误 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
 2022-10-25 23:56:43 +08:00
MistEO
5e8ee91b33 fix: 肉鸽不招募”砾“了 
识别错误，解决不了.jpg
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2333
 2022-10-25 23:44:27 +08:00
MistEO
a085c0d868 docs: 更新CI产物包内容 2022-10-25 23:30:09 +08:00
MistEO
a1b4f3a2f6 Merge pull request #2435 from MaaAssistantArknights/perf/multi_ocr 
perf: optimize OCR for numbers and letters
 2022-10-25 23:08:03 +08:00
zzyyyl
2776f5b640 fix: 修复肉鸽闪退的问题 
`at(0)`
 2022-10-25 23:06:52 +08:00
MistEO
ed02fe647e docs: update FAQ and emulator supports 2022-10-25 22:59:43 +08:00
MistEO
2663324bce merge: dev to perf/multi_ocr 2022-10-25 22:44:33 +08:00
MistEO
d183bc94bc fix: 修复繁中服部分肉鸽识别错误 2022-10-25 22:39:02 +08:00
MistEO
b23ecb2bad perf: 优化飞桨接口调用 2022-10-25 22:38:52 +08:00
KiyuM1n
2fefabb0ba chore: 更新台服肉鸽json 
台服ocr內容
 2022-10-25 22:38:36 +08:00
MistEO
be3cf8abb7 fix: fix rebase error 2022-10-25 22:33:04 +08:00
Horror Proton
7c8d0fbfaf feat: add drop quantity roi and intensity range for JP 
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-25 22:33:04 +08:00
MistEO
7236c6bc91 perf: 删除一些已经用不上了的数字replace 2022-10-25 22:33:04 +08:00
MistEO
0bdf9d279b perf: 对部分数字/字母识别场景更新到使用EN OCR模型 2022-10-25 22:33:04 +08:00
MistEO
2b80f65fd6 feat: 集成飞桨EN模型 2022-10-25 22:33:04 +08:00
MistEO
59ae8d1a1b fix: 修复curl上传数据时的报错 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2427
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1747
 2022-10-25 22:25:42 +08:00
MistEO
ca7e60ac79 fix: 修复肉鸽”高规格分队“无法识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2430
 2022-10-25 22:25:09 +08:00
zzyyyl
14e2038abe feat: 更新战斗结束的模板图片 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2422
 2022-10-25 02:09:09 +08:00
MistEO
8b9fde045c Merge pull request #2419 from KiyuM1n/dev 
台服肉鴿識別文字轉換
 2022-10-25 00:32:27 +08:00
MistEO
4811af9925 chore: remove note from json 2022-10-25 00:32:17 +08:00
KiyuM1n
dfdcf99ed1 Merge branch 'MaaAssistantArknights:dev' into dev 2022-10-25 00:20:16 +08:00
KiyuM1n
a0572fd624 Update tasks.json 
台服ocr內容
 2022-10-25 00:17:52 +08:00
MistEO
b771b0c9f5 fix: fix rebase error 2022-10-24 23:38:01 +08:00
Horror Proton
64a08e2c61 feat: add drop quantity roi and intensity range for JP 
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-24 23:22:31 +08:00
MistEO
668928c4a3 Merge pull request #2412 from MaaAssistantArknights/feat/enum_to_string 
feat: 为部分枚举类型增加与字符串类型的互转函数
 2022-10-24 22:00:51 +08:00
MistEO
1a6a73768e Merge pull request #2381 from MaaAssistantArknights/feat/sharp_task 
feat: 增加 `#` 型任务 和 `baseTask` 字段
 2022-10-24 21:58:17 +08:00
MistEO
d165843c22 Merge pull request #2400 from gdlcf88/main-window-manager 
fix: 引入 `IMainWindowManager` 并修正 #2379 唤起MAA热键失效问题
 2022-10-24 21:57:24 +08:00
zzyyyl
0f6d2ac6f5 fix: 修复没有信赖提升标志时跳过掉落识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2360
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2348
 2022-10-24 21:25:35 +08:00
zzyyyl
ce6f6d29bc fix: 修复笔误 2022-10-24 20:15:09 +08:00
zzyyyl
9801f25f59 feat: 增加加载界面图片 
不知道有没有修了，暂时不打 fix

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2414
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2374
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2378
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2294
 2022-10-24 19:55:14 +08:00
lhhxxxxx
3dc46740f0 fix. 修复官方153作业红云组,泡泡组断暖机的问题，优化了换班前后各组顺序 2022-10-24 19:51:39 +08:00
zzyyyl
0c3bd796cc perf: 修改 GUI 更新相关逻辑 2022-10-24 17:20:15 +08:00
zzyyyl
1c302acd45 feat: 退而求其次，改用 enum_to_string() 2022-10-24 16:24:31 +08:00
zzyyyl
a6c556df58 feat: 重载枚举类型 AlgorithmType, ProcessTaskAction 的 std::to_string(), 并在回调与日志输出时使用 std::to_string() 2022-10-24 15:42:05 +08:00
zzyyyl
80495c453e style: fix c# build warnings 2022-10-24 15:32:23 +08:00
zzyyyl
03df17518b feat: 用 baseTask 字段简化 tasks.json 2022-10-23 22:19:22 +08:00
zzyyyl
d187b6a511 style: 肉鸽相关 Task 按照字典序排序 2022-10-23 22:19:14 +08:00
zzyyyl
57fdf31a56 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
zzyyyl
b67f8520f6 feat: 新增字段 baseTask 用来直接继承（模板任务的变体） 
refactor: 重构模板任务相关的生成逻辑
 2022-10-23 22:18:58 +08:00
zzyyyl
39292ddb2e feat: 用 "#" 型任务简化 tasks.json 2022-10-23 22:18:01 +08:00
zzyyyl
2fa5e9b991 feat: 拓扑排序检查 "#" 型任务是否循环依赖 2022-10-23 22:18:01 +08:00
zzyyyl
6a7fb0ab55 feat: 增加 "#" 型任务 
```json
{
    "A": {
        "next": ["B"]
    },
    "C": {
        "next": ["A#next"]
    }
}
```
可以得到 "C" 的 next 是 "B"
 2022-10-23 22:17:53 +08:00
zzyyyl
b1aba865ca fix: 修复下载新版本失败导致闪退的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2394
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2397
 2022-10-23 21:01:46 +08:00
uye
089e16aa17 style: 修改热键界面布局 2022-10-23 16:39:19 +08:00
uye
d89589ef92 style: 修改符号 2022-10-23 16:26:17 +08:00
uye
49ba1a760d feat: 修改今日关卡小提示 2022-10-23 16:23:01 +08:00
uye
831d545e4e feat: 更新自定义导航提示信息的日语翻译 2022-10-23 15:27:08 +08:00