fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,827 Commits 61 Branches 1,836 Tags
33e69aaeb820ce2705be1b95fe7f588bb2000a83
Commit Graph

12827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
33e69aaeb8 Release v5.6.0-beta.2 (#10417) v5.6.0-beta.2 2024-09-02 14:13:26 +08:00
github-actions[bot]
ac6944dbae chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 05:02:10 +00:00
uye
a04a4b837f docs: Update CHANGELOG.md 2024-09-02 12:59:17 +08:00
uye
42b773f219 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
github-actions[bot]
4dfc4dc3c6 chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 04:02:01 +00:00
github-actions[bot]
ba93f8c8e9 chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 03:28:16 +00:00
uye
b6b15f498f feat: UI 支持 生息演算 num_craft_batches 参数 2024-09-02 11:27:42 +08:00
Weiyou Wang
4528b2213e fix: sln 2024-09-02 13:04:51 +10:00
Weiyou Wang
5c645e7564 fix: sln 2024-09-02 12:58:52 +10:00
Weiyou Wang
d8f321564c fix: need_exit 2024-09-02 12:51:28 +10:00
uye
c479834d38 chore: 调整资源版本显示 2024-09-02 10:41:58 +08:00
status102
f3fa4ff001 fix: sln 2024-09-02 10:12:48 +08:00
uye
35f3bb193f chore: UI 支持选择增加支援道具的方式 2024-09-02 10:01:20 +08:00
uye
45a5e14dde chore: 编队时不在干员数据内的显示输入的名称 2024-09-02 09:33:44 +08:00
uye
f2b96645c8 chore: 化动编队日志输出 2024-09-02 09:25:29 +08:00
uye
5349fe0635 fix: sarkaz 仓库识别错误 2024-09-01 23:52:18 +08:00
github-actions[bot]
cfef166602 docs: Auto Update Changelogs of v5.6.0-beta.2 (#10418) 
* docs: Auto Generate Changelog of Release v5.6.0-beta.2

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: status102 <status102@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-09-01 23:40:21 +08:00
github-actions[bot]
0ecaaa5400 chore: Auto Templates Optimization 
[skip changelog]
 2024-09-01 15:39:21 +00:00
Sherkey
022fcc2b13 feat: 适配「词祭」界面主题 (#10331) 
* feat: 适配萨卡兹界面主题

* chore: 更新 GetImageFromROI 工具组

* perf: Mall 从 OCR 切换为模板匹配

* fix: smoke testing missing algorithm

* fix: template name consistency

* feat: EN templates

* fix: remove Mall task from global
!!! NEED TEMPLATES !!!
smoke testing

* chore: YostarJP mall template

* chore: YostarKR mall template

* chore: txwy mall template
---------

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>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2024-09-01 23:38:49 +08:00
Weiyou Wang
f3ede6858a refactor: 统一 namespace 用法 2024-09-01 20:23:11 +10:00
Weiyou Wang
d862a2fec5 fix: Tales@RA@PIS-ResourceGained 2024-09-01 20:16:12 +10:00
Weiyou Wang
4d824d08af feat: 加入hold模式 2024-09-01 20:11:47 +10:00
晓丶梦丶仁
69e7b399b6 perf: 全肉鸽招募适配娜仁图亚、艾拉 (#10385) 
* perf: 全肉鸽招募适配娜仁图亚、艾拉

fix #10382

* changes to skill

* Update recruitment.json

* Update recruitment.json

* feat:rebase

* feat:rebase

* fix:error

* feat:rebase

---------

Co-authored-by: 梁星逢 <qswl5959@gmail.com>
 2024-09-01 16:50:19 +08:00
Sherkey
117e074a84 fix: OTA打包时对跳过的版本做删除处理 (#10020) 2024-09-01 16:46:36 +08:00
uye
4a07315e19 feat: 外部通知支持多选 (#10395) 
* feat: 外部通知支持多选

* chore: 不必要的 using
 2024-09-01 16:43:25 +08:00
uye
1610e3b81a refactor: 重构 FightSettingsUserControl (#10407) 
* feat: 添加允许吃源石保存状态翻译

* refactor: 重构 FightSettingsUserControl

* fix: 绑定错误

* chore: 吃源石后的*根据AllowUseStoneSave改变
 2024-09-01 16:43:06 +08:00
uye
ee360c3ddf style: 调整 ResourceDictionary 格式化规则 2024-09-01 16:35:28 +08:00
Manicsteiner
9273cf6abe fix: Reclamation for YostarJP (#10414) 2024-09-01 14:45:12 +08:00
uye
e60d708548 chore: 调用PowerManagement.Shutdown();后再次调用Bootstrapper.Shutdown(); 2024-09-01 13:22:59 +08:00
uye
784b94a440 chore: 关机前尝试保存配置 
fix #10405
 2024-09-01 13:08:49 +08:00
uye
bd926c64f6 chore: 调整令牌关闭强度 2024-09-01 12:59:21 +08:00
github-actions[bot]
f65210ed93 chore: Auto Update Game Resources - 2024-08-31 
[skip changelog]
 2024-08-31 20:25:23 +00:00
Weiyou Wang
6569089abb feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
950961a089 feat: AbstractReclamationTaskPlugin 2024-08-31 21:58:50 +10:00
Weiyou Wang
5a10df22d3 feat: 生息演算新参数: num_craft_batches 2024-08-31 21:58:50 +10:00
github-actions[bot]
881e46f499 chore: Auto Update Game Resources - 2024-08-31 
[skip changelog]
 2024-08-31 11:23:36 +00:00
Weiyou Wang
8aa9b63306 refactor: 顺带补上缺失的 Roguelike\Sami filter 并修正注释 2024-08-31 19:30:53 +10:00
Weiyou Wang
872b400bec refactor: 把 Fire@Reclamation 的插件移入 Deprecated 文件夹 2024-08-31 19:30:52 +10:00
Weiyou Wang
1608136bea refactor: 合成 -> 组装 2024-08-31 19:14:13 +10:00
Weiyou Wang
fdb9f7e295 refactor: Within The Sand -> Within the Sand 2024-08-31 19:14:13 +10:00
uye
d869103497 ci: Update issue-checker.yml 
[skip changelog]
 2024-08-31 14:36:19 +08:00
uye
f40ba2e58f chore: 生息演算添加沙中之火选择项 alpha/v5.6.0-beta.1.d129.gf40ba2e58 2024-08-31 10:07:21 +08:00
uye
17cb0ae3e4 fix: 生息演算主题读取配置错误 2024-08-31 09:45:18 +08:00
uye
af9dd71b30 fix: 萨卡兹肉鸽多选招募券模板错误 
fix #10401
 2024-08-31 00:19:10 +08:00
status102
4c6deb571a perf: Mumu截图增强路径清空时不再检查路径是否存在 alpha/v5.6.0-beta.1.d126.g4c6deb571 2024-08-29 20:20:36 +08:00
zzyyyl
e13f4611d1 feat!: 更新保全 strategies 逻辑 (#10314) 
* feat: 保全策略更新

* docs: 修改保全文档对 strategies 的描述

* style: format

[skip changelog]

* feat: 无可用工具人且无 core 时允许检查同一格的后续策略

* style: format

[skip changelog]

* feat: 不再检查干员是否暴毙

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

* fix: 修复m_all_cores可能插入空core名字导致保全战斗主要部署逻辑结束后仍然识别待部署区

* fix: var reset

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-29 19:53:52 +08:00
status102
6dcb77f168 refactor: 迁移公告相关配置 (#10399) 
* refactor: 迁移公告相关配置

* style: format

* fix: config save

* chore: remove using
 2024-08-29 19:53:32 +08:00
uye
5872d6606e ci: pre-commit-ci 不开心 
[skip changelog]
 2024-08-29 15:31:30 +08:00
uye
5875de69aa chore: 第一次启动时默认不勾选肉鸽和生息演算 2024-08-29 14:17:04 +08:00
uye
9a1f59206d style: 格式化 
[skip changelog]
 2024-08-29 14:15:47 +08:00