Skip to content

Commit

Permalink
更正清日常的bug;将清日常添加到interface;移除install.py覆盖OCR模型代码
Browse files Browse the repository at this point in the history
- 清日常流程中有两处跳转目标写错了,导致执行顺序有误,部分代码可能执行不到,现已更正
- install.py会自动用中文OCR模型覆盖resource/base中的OCR模型,删除了这段代码
  • Loading branch information
chensk1999 committed Aug 7, 2024
1 parent 4a114c0 commit 9c4f19f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 4 additions & 0 deletions assets/interface.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
"option": [
"打几号位 | Which Target"
]
},
{
"name": "自动日常",
"entry": "Daily_Begin"
}
],
"recognizer": {},
Expand Down
8 changes: 4 additions & 4 deletions assets/resource/base/pipeline/daily.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@
"action": "Click"
},
"お仕事_Done_FLAG": {
"is_sub": true,
"recognition": "OCR",
"roi": [90, 1000, 540, 80 ],
"expected": "短縮",
Expand Down Expand Up @@ -479,7 +478,8 @@
"コインガシャ_Close": {
"recognition": "OCR",
"expected": "閉じる",
"action": "Click"
"action": "Click",
"next": "交換所_Open_Main_Menu"
},
"交換所_Open_Main_Menu": {
"recognition": "TemplateMatch",
Expand All @@ -503,9 +503,9 @@
"recognition": "OCR",
"expected": "おすすめ",
"action": "Click",
"next": "交換所_Confirm_Exchange"
"next": "交換所_Confirm_Purchase"
},
"交換所_Confirm_Exchange": {
"交換所_Confirm_Purchase": {
"recognition": "OCR",
"expected": "決定",
"action": "Click"
Expand Down
4 changes: 0 additions & 4 deletions install.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import sys
import json

from configure import configure_ocr_model


working_dir = Path(__file__).parent
install_path = working_dir / Path("install")
Expand Down Expand Up @@ -33,8 +31,6 @@ def install_deps():

def install_resource():

configure_ocr_model()

shutil.copytree(
working_dir / "assets" / "resource",
install_path / "resource",
Expand Down

0 comments on commit 9c4f19f

Please sign in to comment.