Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* feat. base scheduler

* fix: a code redundancy

* fix: improve fia-recover performance

* feat: 插拔逻辑

* feat: 优化选择逻辑

* fix: 尝试修复因为干员名字识别问题的报错

* feat: 插拔配适2级贸易站

* feat: 任务queue邮箱

* feat : 菲亚梅塔

* fix: 利用特征点识别干员名

* fix: BUG 和流程优化

* update: 干员列表

* fix: 重构一下逻辑

* fix: 修复因为双站插拔导致时间先后错位

* feat: 断线重连

* feat: 排班计划方程

* feat: 排班自动纠错功能+修复一些BUG

* feat: 重写安排Free干员

* feature: 房间心情扫描单独记录

* feature: 完善房间扫描时间逻辑+Add PlanB

* enhance: 移动插拔至读取心情之后以解决宿舍安排空人

* feat: 全自动换班 beta

* feat: 全自动换班 稳定性优化

* feat: 全自动换班 更新分组规则

* feat: 修复产业合作洽谈会卡死

* feat: 修复产业合作洽谈会卡死

* feat. 全自动换班

* feat: 提高心情读取准确率

* feat: 自动无人机

* fix: 一些BUG

* fix: 由于Free type 错误导致干员无法选择

* fix: 新增干员配置

* fix:空位自动安排Free干员

* feat: 新增检测滑动到底

* feat: 许多改动

* fix: 尝试解决移除未进驻无效

* bugfix: comment out 不需要

* bugfix: 逻辑修复

* fix: 纠错的一个逻辑错误。

* update: diy readme

* fix: 插拔逻辑

* fix: 修复adb连接问题

* draft: MAA integration

* feat:新增逻辑防止死循环

* 连续读取两次时间来提高准确率

* 连续读取两次时间来提高准确率

* fix: multiplelogging

* draft: v2

* improve: handel disconnect

* draft: v2

* improve: 配置移到 diy

* fix: 提高识别准确度

* fix:识图

* fix: fia 换班修复

* fix: fia 24 心情逻辑修复

* fix: fia 24 心情逻辑修复

* fix:识图

* fix: 0心情读取

* fix:error msg

* fix:死循环

* fix: 防止休息负数

* fix: fia换班时间滞后

* fix:死循环

* fix: 防止读取心情滑动失败

* bugfix

* feat: MAA 4.8

* feat: code clean up

* fix: code clean up 不干净

* feat: code clean up

* fix : 空房间判定错误

* fix : 暖机组不进宿舍

* remove: task_type

* bug fix

* improve: 代码优化

* remove:弃用点击double check

* fix: key error

* feat: 出错不重新扫描心情

* fix: 修复logo 变化导致登录不成功

* fix: 跳过任务忘记返回

* feat: 新干员

* feat: improve accuracy

* feat: code clean up

* improvement: 部分细节优化

* feat: 2023新年活动

* bugfix: 无人机读取错忽略

* feat: 新增  年 加工站支持

* remove: 年的错误配置

* feat:新增词条 rest in full 用于对齐心情

* update: 153基建配置

* feat: 集成maa生息演算

* feat: 防止maa bug

* feat: 优化maa连接逻辑

* feat: 周计划+MAA执行间隔

* improve: comment out 自动连接活跃端口

* feat: 持续出错重启游戏

* feat: 利用飞桨识别

* feat: 宿舍安排流程优化

* fix: 修复填充不执行问题

* fix: 修复部分识别问题

* 编写gui

---------

Co-authored-by: Shawnsdaddy <[email protected]>
Co-authored-by: LingweiMeng <[email protected]>
Co-authored-by: Shawnsdaddy <[email protected]>
  • Loading branch information
4 people authored Mar 10, 2023
1 parent 9a4657b commit 6415b80
Show file tree
Hide file tree
Showing 22 changed files with 2,964 additions and 303 deletions.
3 changes: 3 additions & 0 deletions arknights_mower/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
agent_list = json.loads(
Path(f'{__rootdir__}/data/agent.json').read_text('utf-8'))

# # agents base skills
# agent_base_config = json.loads(
# Path(f'{__rootdir__}/data/agent-base.json').read_text('utf-8'))

# name of each room in the basement
base_room_list = json.loads(
Expand Down
26 changes: 24 additions & 2 deletions arknights_mower/data/agent.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"芙兰卡",
"炎客",
"因陀罗",
"石英",
"燧石",
"拉普兰德",
"断崖",
Expand Down Expand Up @@ -247,5 +248,26 @@
"杰克",
"夜魔",
"格拉尼",
"斯卡蒂"
]
"斯卡蒂",
"罗小黑",
"海沫",
"铅踝",
"达格达",
"明椒",
"白铁",
"雪绒",
"子月",
"伺夜",
"斥罪",
"缄默德克萨斯",
"焰影苇草",
"和弦",
"谜图",
"重岳",
"",
"火哨",
"截云",
"麒麟X夜刀",
"火龙S黑角",
"泰拉大陆调查团"
]
4 changes: 4 additions & 0 deletions arknights_mower/data/scene.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
"label": "LOGIN_CADPA_DETAIL",
"comment": "游戏适龄提示"
},
"112": {
"label": "CLOSE_MINE",
"comment": "产业合作洽谈会"
},
"201": {
"label": "INFRA_MAIN",
"comment": "基建全局视角"
Expand Down
Binary file added arknights_mower/resources/close_mine.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified arknights_mower/resources/hypergryph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added arknights_mower/resources/not_in_dorm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added arknights_mower/resources/room_detail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6415b80

Please sign in to comment.