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,229 Commits 61 Branches 1,839 Tags
bad45b428c9a44358b6750404e1dda376d5a4e8a
Commit Graph

6624 Commits

Author SHA1 Message Date
status102
bad45b428c feat: 基建收取会客室周限300信用 (#12014) 
* feat: 基建收取会客室周限300信用

* chore: Auto update by pre-commit hooks [skip changelog]

* chore(tools): add templates to ignore list

* fix: stack overflow

* fix: pipeline

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 动画延迟+roi

* fix: 动画加加retry

---------

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-24 21:21:47 +08:00
status102
9c5d19abbd perf: 自动战斗任务类型校验补充 
[skip changelog]
 2025-02-24 19:54:07 +08:00
status102
5006d760be rft: Wpf自动战斗重构 (#11977) 
* chore: 自动战斗一般作业model

* chore: 自动战斗保全作业model

* chore: 作业model增加输出提示

* rft: 拆分IO

* rft: 重构作业解析、作业集添加

perf: 简化CouldLikeWebJson

rft: 单个作业添加到作业集

perf: 优化作业添加，启动时校验地图是否存在

perf: 优化作业集加载时输出

rft: 移除废弃参数

fix: 作业集作业缓存写入加锁

chore: 简单挪个位置

rft: 整理一下函数

rft: 战斗列表序列化重构优化

chore: 修改log输出位置

chore: func rename & const declare

fix: 批量导入未标注难度的作业时，将按照普通难度追加

fix: 浏览列表中作业时重复添加

chore: 移除未使用变量

fix: 移除重复显示作业详情

fix: 自动战斗作业保存重复导致覆盖

fix: 修复加载作业时解析返回值错误

* rft: 更改战斗列表中任务的缓存路径
 2025-02-24 19:29:33 +08:00
status102
8b74df1d57 fix: Wpf信用任务-OF-1战斗 修复未勾选刷理智时，仍判断刷理智关卡是否为当前/上次 
link to #11996
 2025-02-21 20:33:40 +08:00
uye
5ac4988ea4 chore: 拆分 OF-1 与 访问好友回调显示 2025-02-21 19:08:23 +08:00
BxFS
0028af16ca fix: Monthly Squad for Global (#11993) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-21 11:57:15 +01:00
status102
e3aab0e7d1 perf: wpf自动战斗战斗列表序列化 2025-02-21 18:38:02 +08:00
status102
0304a6d9fd fix: Wpf选中战斗列表作业时，作业内容重复显示 2025-02-21 18:32:34 +08:00
status102
b4309ab9f6 chore(wpf): 简单整理一下CopilotViewModel函数 
[skip changelog]
 2025-02-21 18:28:46 +08:00
status102
02eb89e8b6 feat: Wpf地图查询 2025-02-21 18:28:45 +08:00
status102
4e1168c67c fix: Wpf地图信息MapInfo字段名更正 2025-02-21 18:28:45 +08:00
dragonheart107
114d0d5cab chore: clarify different originium types and unify deep investigation in EN (#11995) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-21 11:03:03 +01:00
uye
2f0a92a8b0 fix: 会客室进入失败 (#11950) 
* chore: 基建滑动后等待动画结束

* fix: office 进入失败后重试

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: lower case sleep

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-02-21 16:14:30 +08:00
BxFS
de9375ccd7 fix: add an missing @ for MonthlySquadCommsBackTwice (#11991) 2025-02-21 10:12:40 +08:00
status102
94d8c88777 fix: 生息演算Mode序列化类型 
[skip changelog]
 2025-02-20 20:26:23 +08:00
status102
04bd091729 fix: 生息演算Mode序列化类型 
[skip changelog]
 2025-02-20 19:53:23 +08:00
status102
e412c1e572 fix: 生息演算Mode序列化类型 2025-02-20 19:52:28 +08:00
Constrat
59f184fdf8 fix: typo in xaml themes for Idea Filter + i18n EN 2025-02-19 22:51:17 +01:00
晓丶梦丶仁
edb59786e5 fix: 狭路相逢遇到构想卡死 (#11970) 
* fix: 狭路相逢遇到构想卡死

* perf: 更改头文件位置

* fix: empty image

* Revert "fix: empty image"

This reverts commit ae11bbf138.

* fix: asst::VisionHelper::correct_rect image is empty

* perf: 识别到构想后输出 trace log

* perf: Matcher, ProcessTask
 2025-02-19 21:20:17 +08:00
status102
0cc08a1caf rft: rename func name 
[skip changelog]
 2025-02-19 16:33:59 +08:00
status102
55a952b6df feat: 读取地图数据 (#11973) 2025-02-19 14:46:55 +08:00
status102
301c641cf8 perf: 避免不必要拷贝 
[skip changelog]
 2025-02-19 13:07:10 +08:00
status102
ca06a0bc54 fix: 移除肉鸽结算插件中的Matcher复用 2025-02-19 13:06:19 +08:00
status102
8b4e768cb4 fix: 修复BattleHelper中的意外报错 2025-02-19 13:06:19 +08:00
晓丶梦丶仁
0c505edea5 fix: 傀影肉鸽可以选择在第五层 BOSS 前暂停 
Fix #11953
 2025-02-17 21:51:14 +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
晓丶梦丶仁
66dd7c49e7 perf: 肉鸽为识别错误的事件也添加 callback (#11946) 
* perf: 为识别错误的事件也添加 callback

* perf: log.error、修改what内容

* i18n: KR translation

* i18n: JP translation

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
 2025-02-17 21:20:38 +08:00
status102
5b5ba74a2d rft: Wpf重构自动公招任务序列化 (#11951) 2025-02-17 21:02:51 +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
uye
6de883ce11 fix: StartupUpdateCheck 不生效 2025-02-17 16:36:03 +08:00
晓丶梦丶仁
5d08fafb72 style: _updateCheck 位置 
[skip changelog]
 2025-02-17 16:09:27 +08:00
uye
bd74b82fd6 feat: SimpleEncryptionHelper 支持默认字符串 2025-02-17 12:57:10 +08:00
uye
190f187ca3 chore: 加解密失败时通知 2025-02-17 11:17:24 +08:00
status102
a3c68c74e9 chore: TaskData增加OcrTask的ocrReplace合法性检查 (#11878) 
* chore: TaskData增加OcrTask的ocrReplace合法性检查

* docs: 加点注释
 2025-02-17 09:25:44 +08:00
status102
2703fb3fcb rft: Wpf重构生息演算任务参数序列化 (#11916) 2025-02-17 09:23:06 +08:00
status102
7f8ba1719f rft: Wpf重构生息演算任务参数序列化 
perf: 移除不必要的分隔符
 2025-02-17 09:22:19 +08: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
uye
6ead3db018 fix: 外服重复检查资源 (#11927) 
fix #11925
 2025-02-16 23:05:07 +08:00
晓丶梦丶仁
3500790718 perf: 肉鸽难度选项降到18个 (#11934) 2025-02-16 21:06:50 +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
晓丶梦丶仁
4f49745be6 feat: Sarkaz extend II 专业人士分队 (#11938) 
feat: 萨卡兹内容拓展II 专业人士分队
 2025-02-16 12:11:00 +08:00
uye
658d6e222c chore: 优化日志输出 2025-02-15 19:49:53 +08:00
uye
3388a97f76 perf: 热键支持 Windows 键 
fix #11922
 2025-02-15 11:56:27 +08:00
status102
a11535d574 fix: Log Rotate 临时性检查措施 (#11835) 
* fix: Log Rotate 增加任务开始时主动检查

* feat: Log Rotate 增加肉鸽每轮探索开始时主动检查

* perf: 移除TaskChain单任务结束后检查
 2025-02-14 21:35:14 +08:00
status102
fb1b3859a2 rft: 重构任务id保存，支持保存多个同类型任务 2025-02-14 21:22:56 +08:00
Roland125
b52ef75c99 fix: 3星招募逻辑修复 (#11913) 
* fix: 3星招募逻辑修复
 2025-02-14 20:04:31 +08:00
status102
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测" 
This reverts commit 5da64cf4da.
 2025-02-14 19:15:02 +08:00
uye
b923e50d2d chore: 删除多余 Update 
[skip changelog]
 2025-02-14 19:01:01 +08:00
uye
4ff636f53c fix: 标题栏不会随资源重载更新 2025-02-14 18:56:52 +08:00
status102
868e8e24f1 fix: 肉鸽职业组 
fix #11901
 2025-02-14 18:37:06 +08:00