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
5,888 Commits 61 Branches 1,836 Tags
3ddeee1d0f1aee2cf7ce846b2fd0118e6aede2f1
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
3ddeee1d0f chore: 重命名客户端对应时间变量名 2023-02-06 15:03:51 +08:00
uye
11f4212cb8 feat: 界面更新时间根据所选客户端类型决定（外服时区还要改） 2023-02-06 14:47:23 +08:00
MistEO
b716c1c877 Merge pull request #3616 from MaaAssistantArknights/dev 
Release v4.10.6-rc.1
v4.10.6-rc.1 		2023-02-06 14:29:01 +08:00
MistEO
a1f8d7dbfd docs: update changelog 2023-02-06 14:28:53 +08:00
FSPaul
b0ec427dd8 docs: 更新模拟器支持中蓝叠Hyper-V教程的部分描述 (#3605) 
* Update 1.3-模拟器支持.md

跟进修正新版本MAA的gui.json储存位置描述（已从MAA根目录迁移至config目录），并补充蓝叠Hyper-V版本可能遇到的权限问题解决方案。

* Update 1.3-模拟器支持.md

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-02-06 14:27:49 +08:00
MistEO
58af20f477 docs: update changelog 2023-02-06 14:26:33 +08:00
Yifan Liu
a4bc12270e fix: overseas servers infrast dorm/power issue 
修改了roi避免识别到上面的同样的“入驻”
 2023-02-05 14:42:36 -06:00
uye
d4374e0a13 feat: 切换客户端类型时实时更新应用标题 2023-02-06 01:34:01 +08:00
uye
021f383e34 style: 删除多余空行 2023-02-06 00:32:43 +08:00
uye
04c27d4db3 chore: 调整 始终检测 选框位置 2023-02-06 00:32:43 +08:00
uye
2a3077092c chore: 重命名战斗设置相关文件名 2023-02-06 00:32:43 +08:00
uye
cd55db0cf5 feat: 调整部分选项所在位置 2023-02-06 00:32:43 +08:00
MistEO
b34bb248f6 Merge pull request #3611 from vonnoq/dev 
基建圖檔/愚人號圖檔
 2023-02-05 22:20:11 +08:00
MistEO
85d6750db2 Merge pull request #3585 from bigqiao/dev 
仓库识别任务前先返回到首页再开始，增强任务启动时的可靠性
 2023-02-05 22:19:52 +08:00
Qiao
f57273ecdb 调整为只在匹配不到时才退到首页尝试进入仓库 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-02-05 21:31:03 +08:00
vonnoq
9a5a3526e4 基建圖檔/愚人號圖檔 2023-02-05 18:43:40 +08:00
MistEO
e6cd06bf3f Merge pull request #3608 from Chr0nixz/dev 
fix:包路径问题修复
 2023-02-05 17:20:43 +08:00
陈泽煊
a8eae1a163 fix:包路径问题修复 2023-02-05 17:18:08 +08:00
MistEO
09b882dae9 Merge pull request #3606 from 178619/dev 
KR localization update
 2023-02-05 17:15:06 +08:00
Clock
2207f29cd7 KR localization update 2023-02-05 16:38:58 +09:00
uye
b146034389 docs: upate changelog 2023-02-05 13:35:04 +08:00
MistEO
ce39b5186d Merge pull request #3593 from MaaAssistantArknights/dev 
Release v4.10.6-beta.5
v4.10.6-beta.5 		2023-02-05 02:11:01 +08:00
MistEO
e6c6653f02 docs: upate changelog 2023-02-05 02:10:15 +08:00
MistEO
212aab9902 Merge pull request #3595 from vonnoq/dev 
繁中服 識別任務失敗
 2023-02-04 20:43:32 +08:00
MistEO
f115ff2ece Merge pull request #3591 from liuyifan-eric/JP_json_template 
chore: 日服json及template更新
 2023-02-04 20:43:16 +08:00
MistEO
6e1b24de50 Merge pull request #3584 from Chr0nixz/dev 
重构了Python接口结构
 2023-02-04 20:42:46 +08:00
MistEO
642e308f45 Merge pull request #3583 from RiichiTsumo/master 
国际服添加一堆截图
 2023-02-04 20:40:39 +08:00
RiichiTsumo
d369b5fbc7 添加一堆截图 2023-02-04 19:19:48 +08:00
vonnoq
b62df15e5c 繁中服 識別任務失敗 2023-02-04 19:17:38 +08:00
RiichiTsumo
8a323b233e Add files via upload 2023-02-04 19:15:49 +08:00
RiichiTsumo
de531c9e06 Add files via upload 2023-02-04 18:37:25 +08:00
uye
d5fc4ffe0a chore: 取消无人机功能与自定义排班的绑定关系 2023-02-04 16:21:45 +08:00
uye
9c82e6cdd5 style: 格式化 task.json 2023-02-04 15:34:37 +08:00
uye
405934279e Merge pull request #3587 from WLLEGit/ReclamationAlgorithm 
feat: 生息演算 添加回调Log
 2023-02-04 15:33:19 +08:00
uye
df5b6c42af Merge pull request #3579 from liuyifan-eric/dev 
feat: 统一资源本和芯片本进入方式为ocr以支持外服
 2023-02-04 15:20:28 +08:00
uye
52fa5cf52e Merge pull request #3592 from 178619/dev 
KR resources
 2023-02-04 15:19:40 +08:00
Clock
1ca64dbfc0 KR resources update 2023-02-04 15:55:38 +09:00
Clock
1685af5cfa Fix Auto RIIC (for Yostar KR) 2023-02-04 15:03:16 +09:00
Yifan Liu
3e9996bbd8 chore: 添加日服template 2023-02-03 23:57:37 -06:00
Yifan Liu
2429809966 chore: 优化JP json及删除了部分重复字段 
日服肉鸽新更新的关卡出现了两遍
 2023-02-03 23:46:51 -06:00
wangli
0a4f0a77a0 fix: 生息演算 去除任务结算多余的延迟 2023-02-04 13:43:10 +08:00
wangli
af7477ca5e feat: 生息演算 添加回调log 2023-02-04 13:27:07 +08:00
Qiao
c33ef0e805 仓库识别任务前先返回到首页再开始，增强任务启动时的可靠性 2023-02-04 11:58:07 +08:00
陈泽煊
3a0375291b 重构了Python接口结构 2023-02-04 11:51:35 +08:00
RiichiTsumo
f0b269f271 Add files via upload 2023-02-04 11:39:05 +08:00
RiichiTsumo
1c0a5b199f 修复国际服基建出现确认换班页面时卡住不动 
顺便加了一些其他截图
 2023-02-04 11:22:20 +08:00
Yifan Liu
da3b019ef2 feat: 统一资源本和芯片本进入方式为ocr以支持外服 
之前资源本是用的template，外服字号不同识别不出来
 2023-02-03 17:23:13 -06:00
Fryze
1897f8c92b Update README_ko-KR.md 2023-02-04 02:20:21 +09:00
Clock
97bff1e95f Fix being unable to enter IS (KR Client) 2023-02-04 01:41:36 +09:00
MistEO
7ae242498c Merge pull request #3556 from 178619/dev 
Fix Yostar KR
 2023-02-03 23:39:09 +08:00