fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,016 Commits 60 Branches 1,841 Tags
d8eec5b208c3185c0719b23e1d5b00fdff2db57e
Commit Graph

4016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
d8eec5b208 fix: 修复水月肉鸽一处招募界面卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2103
 2022-10-03 12:58:06 +08:00
MistEO
a81ba7db02 fix: 修复水月肉鸽“选择”按钮卡住的问题 2022-10-03 12:54:52 +08:00
Horror Proton
f19f55fe61 feat: update logging of file not exist error 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2085
 2022-10-03 11:31:53 +08:00
MistEO
e7c26fd347 Merge pull request #2097 from MaaAssistantArknights/dev 
Release v4.6.0-beta.2
v4.6.0-beta.2 		2022-10-03 03:10:33 +08:00
MistEO
05ddee8c50 fix: 修复肉鸽招募列表滑动没反应的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2081
 2022-10-03 03:09:34 +08:00
MistEO
23d4dfd3cb Merge pull request #2095 from MaaAssistantArknights/dev 
Release v4.6.0-beta.1
v4.6.0-beta.1 		2022-10-03 02:41:17 +08:00
MistEO
404ae31214 Merge pull request #2096 from MaaAssistantArknights/perf/fight 
rft: 重构当前/上次作战的逻辑
 2022-10-03 02:31:56 +08:00
zzyyyl
1366108eea rft: 重构当前/上次作战的逻辑 2022-10-03 02:25:23 +08:00
zzyyyl
d23c6efb3c style: format 2022-10-03 02:25:12 +08:00
MistEO
5542b6c458 docs: update changelog 2022-10-03 02:06:26 +08:00
MistEO
58f12882bd Merge pull request #2094 from MaaAssistantArknights/perf/fight 
perf: 优化刷理智任务逻辑
 2022-10-03 02:03:59 +08:00
Yizhen Wang
87085bc28d Create maa-infra.schema.json 2022-10-02 19:03:39 +01:00
MistEO
9fadcbca38 fix: 修复战斗中干员职业识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2049
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1965
 2022-10-03 01:43:58 +08:00
MistEO
06e6962867 Merge pull request #2093 from DavidWang19/fix/rgmodetext 
fix: update roguelike mode text for the change at 4.6.0.alpha.8
 2022-10-03 01:28:03 +08:00
MistEO
6fa071c21d fix: 简单修复一下肉鸽没位置时还一直放人的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2072
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1006
 2022-10-03 01:26:01 +08:00
zzyyyl
a9c8f09461 perf: 优化刷理智任务逻辑 
1. LastBattle 之前没有用上，干脆拿来当作 当前/上次作战 的启动任务
2. 把 StageBegin 的 next 抽出来（因为它是 JustReturn 的不会重试）
 2022-10-03 01:13:49 +08:00
DavidWang19
34e82dd08d fix: update roguelike mode text for the change at 4.6.0.alpha.8 2022-10-02 18:08:41 +01:00
MistEO
e40fc37648 fix: 修复水月肉鸽卡在数据回溯界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2080
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1997
 2022-10-03 01:06:51 +08:00
MistEO
95afc10b58 fix: 简单修复水月肉鸽点开宝箱的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2071
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2052
 2022-10-03 00:36:49 +08:00
zzyyyl
54803c23a1 Merge pull request #2090 from yilin2020/dev 
fix, docs: 更新readme&忽略文件增加指定不忽略
 2022-10-03 00:30:16 +08:00
zzyyyl
753a0650d4 Merge pull request #2074 from DavidWang19/MyDev 
fix: 修复在战斗中进入刷理智任务时任务崩溃的问题
 2022-10-03 00:27:59 +08:00
yilin2020
2ca58d2953 docs: update README_en-US ja-JP zh-TW 2022-10-03 00:26:34 +08:00
DavidWang19
acfe3395b2 fix: 修复在战斗中进入刷理智任务时任务崩溃的问题 2022-10-02 17:14:07 +01:00
zzyyyl
8ba056a643 Merge pull request #2084 from MaaAssistantArknights/fix/tasks 
fix: 修一些 tasks.json 的 bug，继续增加语法检查
 2022-10-02 23:56:50 +08:00
chenyilin
c3591787aa fix(golang) rename mma.go => maa.go 2022-10-02 23:50:29 +08:00
MistEO
d5024989e2 fix: 默认关闭信用溢出时仍购物选项 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2075
 2022-10-02 23:40:29 +08:00
MistEO
23369da077 fix: 修复水月肉鸽“风雨际会”、“紧急运输“关卡卡住的问题 2022-10-02 23:26:08 +08:00
yilin2020
2fc6fc2c94 docs: update readme.md 2022-10-02 21:24:58 +08:00
yilin2020
b84f129d8b fix[golang] .gitignore add specify file 2022-10-02 21:20:38 +08:00
MistEO
8c8b4885a6 Merge pull request #2089 from yilin2020/dev 
feat[golang] update go code for AsstHandle
 2022-10-02 20:40:40 +08:00
yilin2020
17e992e6a4 feat[golang] update go code for AsstHandle 2022-10-02 20:27:24 +08:00
zzyyyl
607bc8f544 style: format 2022-10-02 20:27:09 +08:00
zzyyyl
369c4fc35e fix: 修正格式以符合 syntax_check 2022-10-02 18:02:20 +08:00
zzyyyl
a9365a1fa6 fix: 修一些 tasks.json 的 bug 2022-10-02 17:39:03 +08:00
DavidWang19
097516fa5d Remove support for starting at StartButton2 2022-10-02 07:21:04 +01:00
MistEO
74306d6d4f Merge pull request #2079 from DavidWang19/feat/improveRogueRecruit 
Improve Roguelike Recruitment
 2022-10-02 14:11:25 +08:00
DavidWang19
21dfe881af Improve Roguelike Recruitment 2022-10-02 06:28:21 +01:00
MistEO
d8f794d9f7 fix: 修复水月肉鸽关闭事件后又弹出事件，卡住的问题 2022-10-02 12:21:14 +08:00
uye
14733b1430 fix: 修复活动结束后仍导航进入活动关卡问题 2022-10-02 10:46:15 +08:00
DavidWang19
7a13b937c9 Add support for entering fight from StartButton2, PRTS and EndOfAction. 2022-10-01 20:50:31 +01:00
zzyyyl
644e2f6f8f feat: GUI 抛异常时的日志加个换行 2022-10-01 23:39:10 +08:00
zzyyyl
02400176ec feat: 增加三个地块 
`tile_deepwater` -> DeepSea（我也不知道这玩意跟 `tile_deepsea` 有啥关系，看名字差不多）
`tile_flystart`  -> Airport（无人机出发点）
`tile_grass`     -> Grass  （草地）
 2022-10-01 23:36:24 +08:00
zzyyyl
883429ffb1 feat: debug 模式下，tasks.json 加载的时候做一个语法检查 
link to beddc7c828
 2022-10-01 23:35:35 +08:00
zzyyyl
beddc7c828 fix: 修复傀影肉鸽进不去的 bug 
templateThreshold -> templThreshold

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2067
 2022-10-01 22:52:15 +08:00
zzyyyl
5cdb64d96c perf: fix typo 2022-10-01 22:38:48 +08:00
zzyyyl
81c3c5640d feat: 更新水月和傀影肉鸽入口图片 2022-10-01 22:27:32 +08:00
zzyyyl
59bb50a26d feat: GUI 抛异常时打点日志 2022-10-01 18:38:30 +08:00
zzyyyl
6936700515 fix: 尝试修复日服肉鸽招募时等级识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1777
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2057
 2022-10-01 17:35:17 +08:00
MistEO
bab3668c22 Merge pull request #2059 from MaaAssistantArknights/dev 
Release v4.6.0-alpha.7
v4.6.0-alpha.8 		2022-10-01 14:26:46 +08:00
MistEO
fffbfc5d9d docs: update changelog 2022-10-01 14:26:33 +08:00