Skip to content

Commit 5d546f0

Browse files
committed
fix(GlobalGame): Preserve current and historical confirm/cancel button assets
1 parent fda09fd commit 5d546f0

6 files changed

Lines changed: 28 additions & 6 deletions

File tree

‎tasks/GlobalGame/assets.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,14 @@ class GlobalGameAssets:
3939

4040

4141
# Image Rule Assets
42+
# 长一点的确认(旧)
43+
I_UI_CONFIRM_OLD = RuleImage(roi_front=(685,376,179,66), roi_back=(663,334,232,193), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm_old.png")
4244
# 长一点的确认
43-
I_UI_CONFIRM = RuleImage(roi_front=(667,398,179,66), roi_back=(667,398,179,66), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm.png")
45+
I_UI_CONFIRM = RuleImage(roi_front=(664,407,179,66), roi_back=(643,389,214,95), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm.png")
46+
# 长一点的取消(旧)
47+
I_UI_CANCEL_OLD = RuleImage(roi_front=(417,368,177,62), roi_back=(366,349,261,173), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel_old.png")
4448
# 长一点的取消
45-
I_UI_CANCEL = RuleImage(roi_front=(432,403,177,62), roi_back=(432,403,177,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel.png")
49+
I_UI_CANCEL = RuleImage(roi_front=(438,407,177,62), roi_back=(356,384,276,125), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel.png")
4650
# '获得奖励' 四个大字
4751
I_UI_REWARD = RuleImage(roi_front=(530,126,211,66), roi_back=(464,69,352,303), threshold=0.73, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_reward.png")
4852
# description

‎tasks/GlobalGame/ui/image.json‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
11
[
2+
{
3+
"itemName": "ui_confirm_old",
4+
"imageName": "ui_ui_confirm_old.png",
5+
"roiFront": "685,376,179,66",
6+
"roiBack": "663,334,232,193",
7+
"method": "Template matching",
8+
"threshold": 0.8,
9+
"description": "长一点的确认(旧)"
10+
},
211
{
312
"itemName": "ui_confirm",
413
"imageName": "ui_ui_confirm.png",
5-
"roiFront": "667,398,179,66",
6-
"roiBack": "667,398,179,66",
14+
"roiFront": "664,407,179,66",
15+
"roiBack": "643,389,214,95",
716
"method": "Template matching",
817
"threshold": 0.8,
918
"description": "长一点的确认"
1019
},
20+
{
21+
"itemName": "ui_cancel_old",
22+
"imageName": "ui_ui_cancel_old.png",
23+
"roiFront": "417,368,177,62",
24+
"roiBack": "366,349,261,173",
25+
"method": "Template matching",
26+
"threshold": 0.8,
27+
"description": "长一点的取消(旧)"
28+
},
1129
{
1230
"itemName": "ui_cancel",
1331
"imageName": "ui_ui_cancel.png",
14-
"roiFront": "432,403,177,62",
15-
"roiBack": "432,403,177,62",
32+
"roiFront": "438,407,177,62",
33+
"roiBack": "356,384,276,125",
1634
"method": "Template matching",
1735
"threshold": 0.8,
1836
"description": "长一点的取消"
2.95 KB
Loading
4.9 KB
Loading
1.42 KB
Loading
5.59 KB
Loading

0 commit comments

Comments
 (0)