Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024.11.1 #710

Merged
merged 55 commits into from
Dec 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
7a046f5
9/1 游戏内容更新
Sep 2, 2024
d017ab5
补充提交基建buff
fuyn101 Sep 2, 2024
88140d5
Merge pull request #674 from fuyn101/dev_shawn
Shawnsdaddy Sep 5, 2024
b3ea669
server 缓存开关
Sep 6, 2024
1ea4cb5
fix formatting
Sep 6, 2024
ca368a4
Merge pull request #673 from ArkMowers/dev_shawn
Ks-luow Sep 6, 2024
c590293
fix:截图异常导致在公招界面卡住的情况
Sep 6, 2024
2e79adc
bug fix
Sep 6, 2024
fef2baf
修bug+增加自定义菲亚阈值功能 (#676)
Anyk00 Sep 8, 2024
78a1c6a
update 基建pos防止点到吃源石 (#679)
Shawnsdaddy Sep 9, 2024
e4e8bb6
移除log任务+版本号
Sep 10, 2024
7ee164d
修复Planning 前逻辑不触发
Sep 10, 2024
6b0ad8f
修复自动启动失效
Sep 10, 2024
9b45662
减少 info log
Sep 10, 2024
2556362
移除时间hard code
Sep 10, 2024
4cae08c
update func in report.py
Sep 10, 2024
2ce656a
Add logging & update readme
Sep 11, 2024
997a6c5
优化
Sep 12, 2024
113cebc
新增非高优判定
Sep 17, 2024
139f61e
歌蕾蒂娅主班 刷新心情频率提升
Sep 17, 2024
347f564
Merge pull request #682 from ArkMowers/dev_shawn
Shawnsdaddy Sep 17, 2024
4353f99
2024.9.3 (#692)
Shawnsdaddy Sep 21, 2024
dfe5a30
不养闲人任务合并+优化ui路径+自定义副表名称+仅回满提前上班 (#693)
Anyk00 Sep 27, 2024
41f43bb
工具人数据加入缓存
Sep 27, 2024
0881f6c
修复取消名称传入后端中改错的部分 (#694)
Anyk00 Sep 27, 2024
76dac16
修复should_keep报错+改进状态转移异常处理 (#695)
Anyk00 Oct 2, 2024
de7a60d
#696 不养闲人优化
Oct 6, 2024
0bc2bee
支持输入房间
Oct 6, 2024
60df4ff
改为debug
Oct 6, 2024
29ae979
修复森空岛登录 (#698)
Anyk00 Oct 8, 2024
91b03c7
#696 优化同步拖拽
Oct 8, 2024
a3e851d
10/9 更新
Oct 9, 2024
171e10e
保存跑单截图
Oct 9, 2024
78cb477
UI BUG修复
Oct 9, 2024
74c1913
维娜·维多利亚 识别修复
Oct 9, 2024
a24e3d1
维娜·维多利亚 识别修复 v2
Oct 10, 2024
8c401f3
bug fix
Oct 17, 2024
3c970a8
702 防止重复截图
Oct 17, 2024
6e77155
fix:公招卡住 (#705)
EightyDollars Oct 28, 2024
67b29b2
log 优化,公招限时,maa导航新增timout
Oct 28, 2024
4eee2c5
游戏资源更新
Nov 1, 2024
8a5c345
适配更新
Nov 1, 2024
3ab5b49
模型更新
Nov 1, 2024
8c923fd
资源更新
Nov 1, 2024
84416d1
资源个更新+添加职介筛选
Nov 3, 2024
3ea6d23
修复仓库扫描 (#707)
Anyk00 Nov 6, 2024
54a0e81
干员名扫描范围缩小+基建TODO 只点击一次
Nov 11, 2024
12028db
arrange_confirm 手动添加阈值
Nov 12, 2024
1eb8c1e
修复 fia 任务卡死
Nov 12, 2024
eae6114
非 None 判定
Nov 12, 2024
41bb994
新增用户邮件反馈自动上传log
Nov 20, 2024
6d77ee4
移除测试代码
Nov 21, 2024
40746e0
逻辑修复
Nov 21, 2024
3f81cc2
无人机跑单截图
Nov 22, 2024
1cc3f3d
Merge branch 'main' of https://github.com/ArkMowers/arknights-mower i…
Dec 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
arrange_confirm 手动添加阈值
Shawnsdaddy committed Nov 12, 2024
commit 12028db729f5fe2f4fa80ab50be2b14c35a03b72
48 changes: 26 additions & 22 deletions arknights_mower/utils/recognize.py
Original file line number Diff line number Diff line change
@@ -720,6 +720,28 @@ def find(
"terminal_pre2": (1459, 797),
}

template_matching_score = {
"connecting": 0.7,
"navigation/ope_hard": 0.7,
"navigation/ope_hard_small": 0.7,
"navigation/ope_normal": 0.7,
"navigation/ope_normal_small": 0.7,
"recruit/agent_token": 0.8,
"recruit/agent_token_first": 0.8,
"recruit/lmb": 0.7,
"recruit/riic_res/CASTER": 0.7,
"recruit/riic_res/MEDIC": 0.7,
"recruit/riic_res/PIONEER": 0.7,
"recruit/riic_res/SPECIAL": 0.7,
"recruit/riic_res/SNIPER": 0.7,
"recruit/riic_res/SUPPORT": 0.7,
"recruit/riic_res/TANK": 0.7,
"recruit/riic_res/WARRIOR": 0.7,
"recruit/time": 0.8,
"recruit/stone": 0.7,
"arrange_confirm": 0.85,
}

if res in color:
res_img = loadres(res)
h, w, _ = res_img.shape
@@ -735,7 +757,10 @@ def find(
res_img = cv2.cvtColor(res_img, cv2.COLOR_RGB2GRAY)
ssim = structural_similarity(gray, res_img)
logger.debug(f"{ssim=}")
if ssim >= 0.9:
threshold = 0.9
if res in template_matching_score:
threshold = template_matching_score[res]
if ssim >= threshold:
return scope

return None
@@ -812,27 +837,6 @@ def find(
"upgrade": (997, 501),
}

template_matching_score = {
"connecting": 0.7,
"navigation/ope_hard": 0.7,
"navigation/ope_hard_small": 0.7,
"navigation/ope_normal": 0.7,
"navigation/ope_normal_small": 0.7,
"recruit/agent_token": 0.8,
"recruit/agent_token_first": 0.8,
"recruit/lmb": 0.7,
"recruit/riic_res/CASTER": 0.7,
"recruit/riic_res/MEDIC": 0.7,
"recruit/riic_res/PIONEER": 0.7,
"recruit/riic_res/SPECIAL": 0.7,
"recruit/riic_res/SNIPER": 0.7,
"recruit/riic_res/SUPPORT": 0.7,
"recruit/riic_res/TANK": 0.7,
"recruit/riic_res/WARRIOR": 0.7,
"recruit/time": 0.8,
"recruit/stone": 0.7,
}

if res in template_matching:
threshold = 0.9
if res in template_matching_score: