fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,285 Commits 61 Branches 1,838 Tags
d6901ae905c015c8f7c8a554fe89a7696636ba1f
Commit Graph

1755 Commits

Author SHA1 Message Date
zzyyyl
d6901ae905 style: 按照 review 意见修改代码格式 
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-08-26 21:17:55 +08:00
zzyyyl
290cc30f15 style: 美化部分代码格式 2022-08-26 19:11:42 +08:00
zzyyyl
98f949346e style: clang format 2022-08-26 19:11:34 +08:00
zzyyyl
48273299b8 style: 小优化 2022-08-26 19:11:17 +08:00
zzyyyl
c62599c3fb style: 删除了一些弃置许久的代码 2022-08-26 01:49:37 +08:00
zzyyyl
84b849a0ba perf: 使在非 Windows 下调用 ansi_to_utf8 与 utf8_to_ansi 报错 
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-08-26 01:46:27 +08:00
zzyyyl
841b6070ad fix: fix some of the compilation errors #1666 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1666

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-08-26 01:46:19 +08:00
MistEO
2345b10d6a Revert "feat: 统一gui.json保存的内容，解决本地化不兼容问题" 2022-08-25 21:32:56 +08:00
MistEO
741f53eb95 Merge pull request #1648 from MaaAssistantArknights/feat/perf_ui 
feat: 优化图形化界面
 2022-08-25 20:42:59 +08:00
MistEO
baf897a6fa Merge pull request #1657 from horror-proton/test/drop_line 
perf: 在关卡掉落识别中使用边缘检测判断线条位置
 2022-08-25 20:40:34 +08:00
MistEO
5f13a2e093 Merge pull request #1643 from et2012/perf/roguelike 
perf: 改进肉鸽招募逻辑
 2022-08-25 20:35:44 +08:00
MistEO
e24dd8563a Merge pull request #1652 from MaaAssistantArknights/feat/gui_json 
feat: 统一gui.json保存的内容，解决本地化不兼容问题
 2022-08-25 20:35:08 +08:00
Tastror
3d5b01ce7e feat: 去除部分硬编码 2022-08-25 17:52:26 +08:00
zzyyyl
0dc9e5e324 feat: Logger 可输出 ranges 2022-08-25 00:34:55 +08:00
Horror Proton
0ba2315187 perf: use sobel derivatives in StageDropsImageAnalyzer::analyze_baseline 2022-08-24 21:13:28 +08:00
et
450a02e674 perf: 改进肉鸽招募滑动逻辑 2022-08-24 19:50:06 +08:00
Tastror
e9ec21adc2 feat: 将旧有配置保存后再删除（中文） 2022-08-24 19:49:21 +08:00
et
3d0135aaed perf: 删除肉鸽招募识别结果的默认排序 2022-08-24 15:55:00 +08:00
Tastror
89317859ff feat: 统一gui.json保存的内容，解决本地化不兼容问题 2022-08-24 14:52:01 +08:00
zzyyyl
311431653f perf: fix c# warnings & suggestions 2022-08-24 10:40:44 +08:00
zzyyyl
daebcc23b6 feat: 优化 UI，尤其是缩放后的显示 2022-08-24 02:37:15 +08:00
lhhxxxxx
1744a62327 feat. 彩蛋框架 2022-08-24 00:32:20 +08:00
lhhxxxxx
4d5f24e8e1 feat. 回车后自动加载神秘代码对应文本 2022-08-24 00:24:10 +08:00
MistEO
e705a783ec Merge pull request #1640 from lhhxxxxx/feat/copilot_focus 
feat. copilot输入神秘代码后点旁边即可加载相关文本
 2022-08-23 23:28:51 +08:00
MistEO
a17ad546a7 Merge pull request #1639 from lhhxxxxx/dev 
refactor. 重构fight界面几个字段自动保存的逻辑
 2022-08-23 23:28:26 +08:00
Horror Proton
88a8d505c7 fix. remove a misplaced return in pull/1628 2022-08-23 23:21:36 +08:00
zzyyyl
20935d2730 chore: 增加 “减少其他任务的执行次数” 的日志输出 2022-08-23 21:06:20 +08:00
lhhxxxxx
8596d39d89 feat. 输入神秘代码后点旁边即可加载相关文本 2022-08-23 05:19:27 +08:00
lhhxxxxx
6a3f702156 refactor. 重构fight界面几个字段自动保存的逻辑 2022-08-23 04:26:23 +08:00
lhhxxxxx
c91f2c3ad7 fix. re.修复重启后指定材料显示为空 
related to commit 483836f120 @ABA2396
@MistEO 修复了一个刚发的版里修复了但没修复的问题
 2022-08-23 03:57:03 +08:00
MistEO
18e36f7490 style: 修改GUI窗口标题 2022-08-22 23:55:37 +08:00
MistEO
5d79c34fb4 Merge pull request #1628 from horror-proton/test/recruitment_task 
feat: 公招相关调整
 2022-08-22 23:55:11 +08:00
MistEO
d36da51c43 Merge pull request #1625 from MaaAssistantArknights/feat/copilot-tool-vue 
feat: 添加新的自动战斗作业生成器
 2022-08-22 23:54:40 +08:00
MistEO
ebdf37fb28 feat: 新增 博朗台碎石模式 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1607
 2022-08-22 23:26:17 +08:00
zzyyyl
d0853d236c chore: 移动 html 和 py 作业制作器的位置，打包时不包含 vue 作业制作器 2022-08-22 01:08:04 +08:00
Horror Proton
1c99a0d8f9 feat: report recruitment tags accordingly to prevent duplicate report 2022-08-21 22:04:09 +08:00
Horror Proton
484b68c65b fix: update recruitment average level calculation 2022-08-21 22:01:30 +08:00
Horror Proton
aed227e3db fix: update recruitment task when using expedited plans 2022-08-21 22:01:30 +08:00
uye
e7c261395c style: 修改界面布局 2022-08-21 18:19:14 +08:00
Hydrogina
f8a08385a8 feat:宿舍中识别干员是否有异格在其他设施 (#1592) 
* feat:识别信赖值

* fix:检测空信赖

* feat:识别干员是否有异格在其他设施

* fix:清理调试用代码

* fix:清理调试用代码

* feat:添加在宿舍换班前进行未进驻筛选的选项

* feat:可在gui.json中设置是否启用蹭信赖与未进驻筛选

* feat:在gui中添加复选框选项"宿舍空余位置蹭信赖"与“不将已进驻的干员放入宿舍”

* fix: 移除 bool 的 move 操作，格式化代码

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-08-21 17:55:20 +08:00
uye
483836f120 fix: 修复重启后指定材料显示为空 2022-08-21 16:31:19 +08:00
uye
1ad3dc43a5 style: 修改描述 2022-08-21 15:13:51 +08:00
uye
a249edac71 style: 修改界面布局 
fix #1623
 2022-08-21 14:26:14 +08:00
Helloworld
c76cfc023a feat: 删除界面上的版本号 2022-08-20 19:45:06 +08:00
Helloworld
ae050fec89 fix: 版本号不应在构造函数中获取 2022-08-20 19:33:29 +08:00
Helloworld
a7239b3c60 feat: 在标题栏上添加版本号 2022-08-20 19:17:05 +08:00
Helloworld
981ec4cd1d feat: 在界面上添加版本号 2022-08-20 19:16:55 +08:00
zzyyyl
89b603ffbc perf: fix c# warnings & suggestions 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1611
 2022-08-20 17:37:53 +08:00
MistEO
e224aecf9f Merge pull request #1613 from AnnoyingFlowers/dev 
feat: 新增视频链接可以识别作业文件里BV号的功能
 2022-08-20 14:04:48 +08:00
Helloworld
9b7a51056d 格式化，消除警告 2022-08-20 13:52:39 +08:00