6192 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
dantmnf	7b39355fc8	chore: set LIBRARY DESTINATION	2023-03-04 18:06:01 +08:00
dantmnf	6492565ced	chore: update MaaDeps ref	2023-03-04 16:51:49 +08:00
dantmnf	8a18ba93bf	Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64	2023-03-04 16:51:33 +08:00
Horror Proton	645f89693b	fix: avoid overlapping sprintf output	2023-03-04 14:01:35 +08:00
Yifan Liu	e3a96497d5	chore: update coordinate tool windows bat file	2023-03-03 19:40:08 -06:00
MistEO	c2938bebdd	Merge pull request #3862 from DaysGone233/patch-1 ... feat: 自动公招时增加掉线识别	2023-03-04 03:35:53 +08:00
LambdaLe	6f4fc8fa91	fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题	2023-03-03 13:39:10 +08:00
DaysGone233	f705069ddb	Merge branch 'dev' into patch-1	2023-03-03 01:14:24 +08:00
uye	2947e47f3e	feat: 添加帮帮	2023-03-02 16:28:17 +08:00
Yifan Liu	22b4581287	fix: JP IS(rogue) friend support oper ... refresh support list is yet to be fixed	2023-03-01 22:43:34 -06:00
Yifan Liu	0850043642	feat: JP Rogue friend support update (template & code) and various ignorelist update	2023-03-01 21:50:52 -06:00
Yifan Liu	6246287c0d	feat: JP DH-9 Navigation多索雷斯导航	2023-03-01 21:23:20 -06:00
DaysGone233	dbe2f88c1a	Add offline confirm in recruting	2023-03-02 10:16:03 +08:00
Yifan Liu	a673fd9cfb	fix: infrast oper name ocr issue on JP ... enlarge the roi so it exactly covers the area of the name	2023-03-01 19:33:26 -06:00
Yifan Liu	cda4836be4	chore: update coordinate tool	2023-03-01 19:06:37 -06:00
Yifan Liu	6a2b0a7e70	chore: add gitignore of coordinate tool	2023-03-01 17:52:22 -06:00
Yifan Liu	981dadf640	chore: add a coordinate tool	2023-03-01 17:02:30 -06:00
uye	359a03e408	chore: 删除多余操作	2023-03-01 14:55:09 +08:00
uye	4e0a0ebd0c	fix: 修复Application.Current.Shutdown方法关闭时不保存窗口位置	2023-03-01 14:49:27 +08:00
uye	f85a09175e	fix: 修复重启不保存窗口位置 ... ~糊屎~	2023-03-01 14:38:30 +08:00
uye	b39600bc06	fix: 修复窗口最小化时不能通过托盘修改语言的问题	2023-03-01 14:38:30 +08:00
Yifan Liu	618bebe7f7	fix: JP IS specific stage stuck ... enlarge roi of dps enter should fix #3842 #3714	2023-02-28 23:43:45 -06:00
MistEO	e0a7061c9c	Merge pull request #3781 from MaaAssistantArknights/feat/ocr_replace_all ... feat: task中的ocrReplace可选为replaceFull替换整个str，用于外服干员名称	2023-03-01 13:17:34 +08:00
Yifan Liu	4b5dc1aa95	Merge branch 'dev' into feat/ocr_replace_all	2023-02-28 22:47:40 -06:00
Yifan Liu	e0548229a0	fix: minor update of JP json	2023-02-28 20:45:05 -06:00
MistEO	bed6b5d56a	Merge pull request #3844 from fearlessxjdx/dev ... fix: #3816	2023-03-01 10:31:58 +08:00
MistEO	8634025410	Merge pull request #3852 from cenfusheng/dev ... 修复重岳的识别错误	2023-03-01 10:27:39 +08:00
Yifan Liu	cfa5f65509	fix: fix build error	2023-02-28 12:25:15 -06:00
Yifan Liu	11d1060cad	fix: fix replace_full not acting correctly on chars_name	2023-02-28 12:05:44 -06:00
uye	cb47a1bf31	chore: 修改资源文件中换行的写法	2023-02-28 21:35:24 +08:00
cenfusheng	807a5c9922	修复重岳的识别错误 ... 修复重岳识别为重岳-的错误，按照令的经验，应还有可能识别为重岳——，一并修复。 皮肤怎么那么多疑似白色横线的地方啊【指指点点】	2023-02-28 14:29:59 +08:00
xjdx	f400656af7	fix: #3816	2023-02-28 04:52:39 +00:00
Yifan Liu	353ad8fadf	feat: update JP ocr equivalence class and operator ocrreplace json	2023-02-27 15:49:16 -06:00
MistEO	df77f22606	Merge pull request #3809 from yd278/dev ... feat: 更新至公孙长乐最新基建排班	2023-02-27 17:28:21 +08:00
Yifan Liu	ca306666ae	fix: ocr equivalence class will not replace dst string	2023-02-26 21:57:53 -06:00
Yifan Liu	2d51be4a48	feat: set JP ocr_replace to full_replace	2023-02-26 17:25:02 -06:00
MistEO	bbcd454938	docs: 修改关于外服功能支持的描述	2023-02-26 23:48:28 +08:00
MistEO	15508cb9ca	Merge pull request #3822 from MaaAssistantArknights/wallsman-patch-1 ... doc : Blue-ray items	2023-02-26 19:50:18 +08:00
MistEO	7825c468de	chore: 更新抄作业界面小提示	2023-02-26 19:45:35 +08:00
Yifan Liu	28bb886766	Merge branch 'dev' into feat/ocr_replace_all	2023-02-25 21:46:54 -06:00
Yifan Liu	8160deb790	feat: support of auto using 48h- potion for EN server & reorder json	2023-02-25 18:04:36 -06:00
Yifan Liu	eec6611d7e	feat: support of auto using 48h- potion for JP server	2023-02-25 18:04:17 -06:00
uye	068ef06d5d	Merge pull request #3820 from MaaAssistantArknights/feat/i18n ... feat: localization of VersionUpdateView	2023-02-25 23:03:59 +08:00
Wallsman	9f00faeb7b	doc : Blue-ray items ... Upadate text	2023-02-25 22:07:59 +09:00
uye	5f678d8e95	docs: 更新常见问题链接	2023-02-25 18:20:31 +08:00
zzyyyl	2dd3563697	docs: 修复 README 瑕疵	2023-02-25 17:31:32 +08:00
Y. Ding	618a79c15b	新增一图流生成243极限效率基建作业	2023-02-25 00:17:27 -08:00
Y. Ding	45e64e9ce8	Revert "将内置243作业更新为一图流生成器版" ... This reverts commit 5e7b9047d9.	2023-02-25 00:13:19 -08:00
MistEO	f4118a62b6	Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit ... feat: 加速肉鸽招募时滑动	2023-02-25 15:53:25 +08:00
MistEO	a2e673fdff	Merge pull request #3795 from MaaAssistantArknights/feat/ocr_eq_class ... feat: OCR字符等价类支持	2023-02-25 15:53:07 +08:00