Skip to content

Commit d822df6

Browse files
Merge pull request #3 from yanshil/main
add level threshold while saving
2 parents 8f74070 + 017e322 commit d822df6

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

main.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ def to_stop():
299299
input(f'自动判断圣遗物背包有{art_rows}{art_cols}列,请务必确认是否正确!!错误请退出并更改分辨率后尝试')
300300
input('运行期间请保持原神在前台,请勿遮挡窗口或操作鼠标,按鼠标中键停止。按回车继续')
301301
input('开始后将尝试自动对齐第一行以方便识别,若对齐结果有误,请立刻按中键停止。按回车开始执行')
302+
level_threshold = input('请输入圣遗物等级阈值(0-20)(比如:16,则仅将保存16级及以上的圣遗物信息)。直接按回车则默认保存所有圣遗物信息。')
302303
print('程序将于5秒后自动开始运行,若此条提示显示时未自动切换到原神窗口,请手动点击原神窗口切到前台')
303304

304305
keyboard.press('alt')
@@ -332,11 +333,22 @@ def to_stop():
332333
except Exception as e:
333334
print()
334335
print(f"因为\"{e}\"而意外停止扫描,将保存已扫描的圣遗物信息")
336+
337+
try:
338+
level_threshold = int(level_threshold)
339+
except ValueError:
340+
level_threshold = 0
341+
num_count = 0
342+
if level_threshold > 0:
343+
for key in result.keys():
344+
if key != 'version':
345+
result[key] = [x for x in result[key] if x['level'] >= level_threshold]
346+
num_count += len(result[key])
335347
if saved:
336348
with open('artifacts.genshinart.json', "wb") as f:
337349
s = json.dumps(result, ensure_ascii=False)
338350
f.write(s.encode('utf-8'))
339-
print('总计扫描了{}个圣遗物,保存了{}个到artifacts.genshinart.json,未保存的则为识别结果无法理解,请到artifacts路径中查看'.format(art_id, saved))
351+
print('总计扫描了{}/{}个圣遗物(无效识别结果请到artifacts路径中查看),保存了{}个到artifacts.genshinart.json'.format(art_id, saved, num_count))
340352
else:
341353
print('总计扫描了{}个圣遗物,未保存任何圣遗物,未保存的则为识别结果无法理解,请到artifacts路径中查看'.format(art_id))
342354
input('已完成,按回车退出')

0 commit comments

Comments
 (0)