fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,004 Commits 61 Branches 1,840 Tags
f9c2441bfb463681d4f60bb2db3ed1810218ee63
Commit Graph

162 Commits

Author SHA1 Message Date
zzyyyl
f9c2441bfb perf: use std::string_view 2023-09-29 00:33:28 +08:00
zzyyyl
4146fae8b3 feat: 每次 parse 都先清空已生成的任务信息 2023-09-29 00:33:28 +08:00
zzyyyl
a1faca9b82 fix: 修复 "baseTask": "#none"，以及相关文档 2023-09-29 00:33:28 +08:00
zzyyyl
b30ba2a85b feat: 多文件任务从 json 层面合并后再重新解析 
现在如果有 CN 任务
```
"base": { "text": [ "CN" ], "next": [ "yyy" ] },
"A": { "baseTask": "base", "next": [ "xxx" ] }
```
只需要在 EN 文件中重新定义 base:
```
"base": { "text": [ "EN" ] }
```
就等价于
```
"base": { "text": [ "EN" ], "next": [ "yyy" ] },
"A": { "text": [ "EN" ], "next": [ "xxx" ] }
```

外服适配不再是难题！
Multi-language adaptation is no longer a problem!
 2023-09-29 00:33:20 +08:00
zzyyyl
59c1b9dd8e fix: 修复超出生成任务上限时访问越界的问题，增加生成任务上限至 10000 
是半年前的憨憨 zzyyyl 写的！
link to aa79432f4a
 2023-09-28 21:14:54 +08:00
zzyyyl
141ed1329e debug: debug 模式下增加一项可省略模板任务名的检查 2023-09-24 12:05:02 +08:00
zzyyyl
0715236914 debug: 增加一项多余空任务的检查 2023-09-22 20:48:26 +08:00
MistEO
059d83b1c7 feat: 肉鸽烧开水模式增加凹开局直升 (#6443) 
fix #4791 fix #4833 fix #5539 fix #6203
 2023-09-20 12:52:38 +08:00
Lancarus
6ebb034bff feat: 适配其他服，格式化代码 2023-09-19 20:34:41 +08:00
zzyyyl
8fac991781 fix: 修复 debug 模式下 tasks.json 检查未通过时的访问越界问题 2023-09-19 20:34:38 +08:00
zzyyyl
c44eb73b59 feat: 增加未通过企鹅检查的掉落截图，增加 UnknownStage 时的难度回调 2023-09-11 12:05:05 +08:00
MistEO
19b6b8cce6 fix: 简单修复一下异步Load导致的错误 
fix #6250
 2023-09-10 12:43:32 +08:00
Annoying Flower
ecc003611b feat: 新增肉鸽干员自动撤退字段 (#6241) 2023-09-07 17:16:38 +08:00
MistEO
dfb0f50c60 fix: 规避crt死锁问题 
fix #6188
 2023-09-02 13:40:30 +08:00
MistEO
355eee3e23 fix: 尝试修复LoadResource卡死的问题 2023-09-02 01:16:40 +08:00
MistEO
8bcf30a0c3 fix: build error on ubuntu 2023-08-28 23:37:00 +08:00
MistEO
05e4301691 fix: 不再对资源进行并行加载 2023-08-28 23:00:00 +08:00
MistEO
5931229e46 fix: try to fix #6006 2023-08-28 20:05:44 +08:00
Lancarus
a4ca7c5315 feat: 增加烧开水功能，优化萨米肉鸽策略 (#6053) 2023-08-25 14:00:44 +08:00
MiaoYan JY
abe648344b fix: 修复肉鸽中干员 山 2 技能反复释放的问题 2023-08-21 23:40:40 +08:00
MistEO
a510ab6f75 fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) (#6009) 2023-08-20 21:48:51 +08:00
Annoying Flower
5a7659c1b3 feat: 添加对 "skill_times" 字段的支持，再也不会狂点重岳辣 (#6007) 2023-08-20 21:38:40 +08:00
Fryze
334c8602b7 fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) 2023-08-20 20:34:46 +09:00
lassnuttun
c64ed151d1 chore: 修改了刷源石锭的不期而遇逻辑的变量名、文件名 2023-08-19 15:22:03 +08:00
lassnuttun
491c7e97c6 feat: 优化刷源石锭模式的逻辑，保留原先不期而遇选择方案的同时增加了针对刷钱的不期而遇选择方案，根据肉鸽模式使用不同方案 2023-08-19 12:13:24 +08:00
Lancarus
ac4a09e5db fix:肉鸽在招募逻辑内可以将同一干员纳入多个群组,修复由于拆分文件造成的bug (#5946) 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-08-15 17:44:11 +08:00
MistEO
5df801ecfa chore: 删除目前用不上了的肉鸽代码 2023-08-12 15:06:48 +08:00
MistEO
9f9000157c refactor: 拆分所有肉鸽资源文件 (#5856) 2023-08-06 20:07:41 +08:00
uye
e167d5188c feat: debug版本/release版本加DEBUG.txt load时重新加载tasks.json 2023-07-31 18:47:54 +08:00
uye
35a757bb2e feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json 2023-07-31 11:32:30 +08:00
DavidWang19
50b8bcd758 feat: 适配萨米肉鸽 2023-07-14 09:29:17 +01:00
BladeHiker
73b88f6e43 fix: 去掉异步执行，添加可配置项 2023-07-07 22:31:17 +08:00
MistEO
67da458bc2 fix: 将 OCR replace 改为有序 2023-06-29 10:11:26 +08:00
Horror Proton
0d78f38edc fix: workaround for destruction order issue 
which creates empty files with random name on Linux

fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/5255
 2023-06-26 23:49:32 +08:00
MistEO
5230b6bad7 fix: 修复切换日服后再切回后OCR配置不清空的问题 
fix #4955
 2023-05-28 15:44:22 +08:00
MistEO
029d93d703 feat: update meojson to v3.0.0-beta.1 (#4789) 
https://github.com/MistEO/meojson/releases/tag/v3.0.0-beta.1
 2023-05-24 15:58:29 +08:00
MistEO
6878bbbb17 chore: 添加一些adbSwipeXDistanceMultiplier的注释 2023-05-21 09:48:18 +08:00
MistEO
4253c87db7 fix: 全局减小adb滑动距离 
糊屎！
 2023-05-21 01:19:15 +08:00
MistEO
679c66dd0a feat: 提前为更新json库做好准备（） 2023-05-17 00:46:44 +08:00
MistEO
7259a58037 fix: 为Resource loader 添加重入锁 2023-05-16 00:54:35 +08:00
Shawn Sun
9a87930970 fix(avatarcachemanager): avatar saved at wrong path in set_avatar() 
m_save_path is empty & ::load() never called when cache folder does not exist.
 2023-05-11 03:05:59 +08:00
MistEO
daffa98f90 fix: 修复单例错误引发的资源加载错误 2023-05-02 16:55:30 +08:00
MistEO
7dc0fd348d perf: 修改异步加载资源的方式 2023-05-02 15:16:07 +08:00
MistEO
85b964020b fix: build error 2023-05-02 14:33:06 +08:00
MistEO
e12d4bccb9 chore: ResourceLoader 添加一些日志 2023-05-02 14:22:49 +08:00
MistEO
70a95bda74 fix: 修复中文目录的crash问题 
fix #4585
fix #4574
 2023-05-02 00:17:55 +08:00
MistEO
6bbf2f0bf9 fix: build error 2023-04-29 02:06:56 +08:00
MistEO
b16a14a262 fix: 修复资源加载失败 2023-04-29 02:01:48 +08:00
MistEO
b0844c85a5 fix: 修复资源读取错误，改一点日志 2023-04-29 01:19:33 +08:00
MistEO
5266d5ffa0 fix: build error 2023-04-29 00:27:55 +08:00