fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,629 Commits 61 Branches 1,836 Tags
aa1b267278bd600d5abdcfc262ea3b09827637ab
Commit Graph

8005 Commits

Author SHA1 Message Date
uye
aa1b267278 perf: 优化悬浮窗布局 2025-12-26 03:06:45 +08:00
status102
017c6bdce5 fix: 基建自定义配置迁移加个try 2025-12-26 02:25:52 +08:00
github-actions[bot]
e20f02c5d2 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20508148724
[skip changelog]
 2025-12-25 16:53:07 +00:00
uye
25222f6e9a fix: 保全自动战斗日志悬浮窗 2025-12-25 22:47:19 +08:00
uye
b8b020e839 fix: 未设置自定义基建排班路径时第一次启动会报错 2025-12-25 21:37:23 +08:00
uye
45162e093e chore: 悬浮窗移动时不隐藏，避免某些窗口点击就会触发闪烁（说的就是 QQ） 2025-12-25 21:28:11 +08:00
Status102
61fbba4b12 fix: 自定义基建计划指定某个计划后会在1分钟后被重置为定时计划 (#14649) 
* fix: 选中计划转换

fix: 解析警告

rft: 重构完成

perf: 移除_customInfrastPlanHasPeriod

rft: 设置读取

perf: 加上数量检查

i18n: warning

fix: 基建自定义计划手动选择后依旧会被时间刷新

* i18n: placehold

* i18n: KR

* i18n: EN

* fix: 时间轮换UI刷新错误

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-12-25 19:41:21 +08:00
Manicsteiner
86376c9118 feat: YostarJP SecretFront edit (#15191) 2025-12-25 15:11:57 +08:00
Constrat
957f821976 fix: allow usage of CLI build instead of only VS (#15190) 
* fix: change solutiondir to msbuildproject

* chore: perhaps a better solution
 2025-12-24 14:08:20 +01:00
Constrat
49ad57dc2c i18n: EN typo 2025-12-24 13:47:35 +01:00
uye
8dbc73e0fe perf: RefreshCustomInfrastPlanIndexByPeriod 支持传入当前时间 2025-12-24 19:12:38 +08:00
uye
dc50e93075 chore: 资源更新忽略 .gitignore 文件 2025-12-24 17:15:48 +08:00
uye
a5e7477b90 feat: 支持点击标题栏左上角的检测到新版本提示触发更新 2025-12-24 16:51:16 +08:00
uye
093320a4c8 fix: 两个检测更新的按钮在更新时禁用 2025-12-24 16:46:07 +08:00
uye
db2dfbce78 fix: 未勾选自动下载更新包且无可用的 OTA 增量更新包时仍然提示“将下载完整包xxx” 2025-12-24 16:42:04 +08:00
uye
c1a0d38037 feat: 右键图标菜单栏中增加日志悬浮窗切换 2025-12-24 16:09:47 +08:00
uye
2380db976b feat: 悬浮窗支持自动战斗日志源 2025-12-24 15:38:49 +08:00
Constrat
4fd44e2315 feat: YostarEN SecretFront (Hidden Front) 2025-12-24 00:45:22 +01:00
uye
442474cce1 feat: 隐秘战线 (#15115) 
* feat: 隐秘战线

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

* fix: 抵达终点

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

* perf: 抑制一下低概率

* feat: ui 新增隐秘战线入口

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

* i18n: zh-tw

* i18n: KR

* chore: fix typo

* i18n: JP

* chore: txwy update

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

* i18n: placehold

* rft: roi to json

* i18n: 翻译

* chore: 插件只在传入对应任务时启用

* fix: 任务名错误

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-12-24 01:43:35 +08:00
uye
5880499330 feat: 日志悬浮窗 (#15185) 
* feat: 日志叠加层

* feat: 添加窗口选择和持久化保存

* rft: 调整部分后台代码至 vm 中

* feat: 选择列表添加 ProcessId 显示

* i18n: 翻译

* rft: 改用 CsWin32

* fix: MessageBoxResult ShowNative 报错

* chore: 移除多余的 PInvoke

* rft: OverlayViewModel 改用 PInvoke

* style: 编译警告

* rft: OverlayWindow.xaml.cs 改用 PInvoke

* perf: 优化显示效果，添加控制按钮

* chore: 改用 SetWindowLongPtr

* perf: 优化性能

* i18n: 翻译

* feat: 增加 TooltipBlock 提示

* fix: 中途开启不会滚动到日志最后一栏

* chore: 使用属性而不是字段

* chore: 注释

* fix: 窗口未显示的时候不会持久化保存目标窗口

* chore: 移除未使用变量
 2025-12-24 01:23:42 +08:00
yali-hzy
419d3a6711 feat: 在任务开始后的禁用组件内也能查看tooltip (#15186) 2025-12-24 01:02:26 +08:00
MistEO
55beea8593 refactor(core): 重构 ResourceLoader::load 资源加载逻辑 (#15132) 
* refactor(core): 重构 ResourceLoader::load 资源加载逻辑

- 将函数内宏定义替换为类型安全的泛型 lambda
- 修复 _custom.json 路径计算错误（仅对 .json 文件生效）
- 使用循环和数组消除 Roguelike 配置的重复加载代码
- 添加结构化注释分隔符提升可读性
- 移除未使用的 AsyncLoadConfig 宏和错误的 #undef

* fix: 修复行为不一致

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-12-23 21:42:30 +08:00
Status102
801d656329 feat: ProcessTask任务命中缓存结果 (#12651) 
* feat: ProcessTask任务命中缓存结果

* perf: 加个函数

* perf: 合并直接截图

* feat: 增加匹配模板及文字

* fix: win

* fix: ptr check

* fix: template func

* fix: type

* fix: import

* fix: empty

* perf: early retrun

* perf: shared image

* fix: import
 2025-12-23 21:40:56 +08:00
status102
e71037a1b0 fix: 单切换账号时，任务运行计时错误 2025-12-23 21:23:48 +08:00
yali-hzy
fef77f5780 fix: 招募助战后补充低信赖干员数量不足 (#15184) 
fix: 修正补充低信赖干员数量计算，考虑是否已经招募助战干员
 2025-12-23 18:41:57 +08:00
Status102
ca9807ce09 chore: Update C# EditorConfig for c# 13 & 14 (#15146) 
[blame ignore]
 2025-12-23 17:11:48 +08:00
HX3N
56f6ef419c i18n: KR improve client display names 2025-12-23 07:46:47 +09:00
github-actions[bot]
1c294925d2 feat: Update Submodules MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20444930763
[skip changelog]
 2025-12-22 21:52:47 +00:00
travellerse
9bdfc02de5 fix: 完善通宝识别失败时的分支处理 (#15180) 2025-12-22 17:17:45 +01:00
github-actions[bot]
d75c028852 feat: Update Submodules MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20436912089
[skip changelog]
 2025-12-22 15:52:36 +00:00
travellerse
f155bc4867 fix: 通宝识别失败时放弃通宝 (#15167) 
* fix: 通宝识别失败时放弃通宝

* fix: 初始化click_point_fallback

* fix: 通宝交换任务仅尝试2次

* fix: 不小心把调试用的传上去了

* fix: 所有通宝名称识别错误都发送反馈

* i18n: KR

* fix: Tongbao error info tweak

* perf: disable auto clean for Tongbao unknown debug image

* fix: Tongbao info case tweak

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
 2025-12-22 16:15:40 +01:00
Constrat
74256dc3d2 fix: missing Special Squad for EN 2025-12-21 21:34:26 +01:00
HX3N
78a27ebfa6 i18n: KR tweak InvestmentReach 2025-12-21 23:58:12 +09:00
HX3N
66b95cb1e7 i18n: KR tweak translation for IS nodes, achievements and general UI 2025-12-21 06:43:59 +09:00
Constrat
c641e35ee5 i18n: EN tweak 2025-12-20 21:32:32 +01:00
status102
389812279d feat: Wpf日志文件输出分级 2025-12-21 00:59:38 +08:00
Constrat
ebc980f154 i18n: various tweaks to IS nodes and stages 2025-12-20 16:12:54 +01:00
uye
e6862591e8 fix: 资源更新不应该复制 cache 文件夹 2025-12-20 22:25:26 +08:00
Hao Guan
1f7dcde3f9 fix(mac): 资源版本显示标题 2025-12-20 09:25:49 +08:00
HX3N
be08678390 fix: YostarKR StrategyChange_mode-FastPass 2025-12-20 02:59:40 +09:00
HX3N
724326b309 i18n: KR tweak EncounterOptions translation 
[skip ci]
 2025-12-20 00:23:32 +09:00
Manicsteiner
3e9992598a feat: YostarJP Roguelike JieGarden (#15116) 
* feat: YostarJP Roguelike JieGarden

* chore: templates and docs

* chore: OCR edits

* chore: templates and ocr

* chore: add templates

* chore: ocr edit

* chore: ocr edit

* chore: ocr edit

* chore: ocr edit

* chore: remove CoppersAnalyzer roi

* chore: Update docs/ja-jp/manual/introduction/integrated-strategy.md

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* chore: ocr edit

---------

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
 2025-12-19 15:16:55 +01:00
Constrat
fbb40d4a7e feat: YostarEN Roguelike Jie Garden (#15119) 
* feat: tasks for json

* feat: templates

* fix: remove spaces in encounter analyzer

* docs: update difficulty name

* feat: add skip1 template

* i18n: translations

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

* fix: typo

* i18n: typo

* feat: missing templates

* fix: missing optimized

* feat: add squads and starts

* fix: add ROI to StrategyChange detection

* chore: remove unnecessary field from sarkaz

* fix: add all basetasks and texts from JP

* fix: update DropsFlag for all IS

* fix: LeaveBosky custom for EN (different color shading)

* fix: custom Abandon for EN (slightly taller no idea)

* fix: just reduce score for abandon

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

* fix: added space remove

* feat: add coppers to trader list

* fix: revert regex changes to copper

Waiting to increase ROI

* i18n: AI Sourcery wow

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* chore: cleanup tasks

* fix: Encounter OCR remove dashes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
 2025-12-19 15:10:20 +01:00
HX3N
05fc329eb3 feat: YostarKR Roguelike JieGarden (#15113) 
* chore: placeholder

* chore: Squad and Roles

* chore: remove CoppersType

* chore: NextLevel and StrategyChange_mode

* chore: StageEncounterOcr and RoguelikeTraderShoppingOcr

* chore: templates

* chore: JieGarden@Roguelike@StartAction

Yostar... :(

* chore: BattleStageName

* chore: text and templates

* chore: CoppersNameOcrReplace and OptionHeaderBar

* chore: remove space

* chore: CharsNameOcrReplace and template

* docs: IS

* chore: template and encounter

* chore: TraderShoppingOcr add Copper

i18n: SpecialForceSquad

chore: revert 강제이동

Update ko-kr.xaml

* fix: StrategyChange_mode

* chore: GamePass
 2025-12-19 14:57:23 +01:00
travellerse
415fb7d8fc fix: change tongbao name OCR to fit oversea (#15129) 
* fix: 移除通宝已投出硬编码

* fix: 添加左侧列通宝名称识别OCR任务

* fix: 加长通宝名称识别的ROI

* fix: apply suggestion

* chore: increase pickupOCR ROI (from JP)

* fix: increase ExchangeNameOCR ROI to max

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-12-19 14:32:12 +01:00
MistEO
c80954862b perf: use boost::regex instead of std::regex (#15126) 2025-12-19 13:04:28 +08:00
status102
6d8bab3588 fix: 更新后连带清除过往未下载成功的OTA包 2025-12-19 10:08:32 +08:00
Weiyou Wang
90ecbb9a74 fix: 修复 MacOS asst.log 自动清空的问题 (#15122) 2025-12-19 10:02:35 +08:00
HX3N
0af9ee5e95 chore: enable Roguelike JieGarden for Yostar servers 2025-12-18 16:44:41 +09:00
mayuri0v0
e91efce7db fix: 去除路径左右的空格与控制字符 (#15082) 
* fix: 去除路径左右的空格与控制字符

* fix: 忘了调库了

* fix: 忘了调库了
 2025-12-18 13:20:00 +08:00