Skip to content

Commit a211e24

Browse files
JarediKeyBluettDream
JarediKey
and
BluettDream
authored
fix(ReplaceShiki): change detect pos ,change no shiki logic and add ur type (#3)
Co-authored-by: Azure <bluetian1st@gmail.com>
1 parent 8d43794 commit a211e24

File tree

6 files changed

+50
-25
lines changed

6 files changed

+50
-25
lines changed

‎tasks/Component/ReplaceShikigami/assets.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ class ReplaceShikigamiAssets:
5252
# description
5353
I_RS_NO_ADD = RuleImage(roi_front=(276,222,100,212), roi_back=(28,181,1232,293), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_no_add.png")
5454
# 素材
55-
I_RS_MATERIAL = RuleImage(roi_front=(32,283,59,56), roi_back=(32,283,59,56), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material.png")
55+
I_RS_MATERIAL = RuleImage(roi_front=(822,620,59,56), roi_back=(129,597,774,98), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material.png")
5656
# description
57-
I_RS_N = RuleImage(roi_front=(138,299,57,59), roi_back=(138,299,57,59), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
57+
I_RS_N = RuleImage(roi_front=(709,621,57,59), roi_back=(132,595,767,105), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
5858
# description
59-
I_RS_R = RuleImage(roi_front=(230,344,64,61), roi_back=(230,344,64,61), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
59+
I_RS_R = RuleImage(roi_front=(594,619,64,61), roi_back=(126,599,776,101), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
6060
# description
61-
I_RS_SR = RuleImage(roi_front=(307,421,62,58), roi_back=(307,421,62,58), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
61+
I_RS_SR = RuleImage(roi_front=(483,619,62,58), roi_back=(131,599,767,101), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
6262
# description
63-
I_RS_SSR = RuleImage(roi_front=(354,517,63,58), roi_back=(354,517,63,58), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
63+
I_RS_SSR = RuleImage(roi_front=(370,621,63,58), roi_back=(130,600,771,101), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
6464
# description
65-
I_RS_SP = RuleImage(roi_front=(372,621,58,60), roi_back=(372,621,58,60), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
65+
I_RS_SP = RuleImage(roi_front=(260,621,58,60), roi_back=(133,600,763,96), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
6666
# description
6767
I_RS_MATERIAL_SELECTED = RuleImage(roi_front=(27,620,68,65), roi_back=(27,620,68,65), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material_selected.png")
6868
# description
@@ -81,6 +81,10 @@ class ReplaceShikigamiAssets:
8181
I_RS_LEVEL_MAX = RuleImage(roi_front=(487,248,23,21), roi_back=(52,238,1118,37), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_level_max.png")
8282
# 智能放入
8383
I_RS_SMART_EXCHANGE = RuleImage(roi_front=(1150,507,40,44), roi_back=(1128,488,86,162), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_smart_exchange.png")
84+
# description
85+
I_RS_UR = RuleImage(roi_front=(149,623,56,58), roi_back=(136,598,758,101), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png")
86+
# description
87+
I_RS_UR_SELECTED = RuleImage(roi_front=(36,620,54,58), roi_back=(14,601,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur_selected.png")
8488

8589

8690
# Image Rule Assets

‎tasks/Component/ReplaceShikigami/replace_shikigami.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ def switch_shikigami_class(self, shikigami_class: ShikigamiClass = ShikigamiClas
3434
ShikigamiClass.R: self.I_RS_R_SELECTED,
3535
ShikigamiClass.SR: self.I_RS_SR_SELECTED,
3636
ShikigamiClass.SSR: self.I_RS_SSR_SELECTED,
37-
ShikigamiClass.SP: self.I_RS_SP_SELECTED}
37+
ShikigamiClass.SP: self.I_RS_SP_SELECTED,
38+
ShikigamiClass.UR: self.I_RS_UR_SELECTED}
3839
match_click = {ShikigamiClass.MATERIAL: self.I_RS_MATERIAL,
3940
ShikigamiClass.N: self.I_RS_N,
4041
ShikigamiClass.R: self.I_RS_R,
4142
ShikigamiClass.SR: self.I_RS_SR,
4243
ShikigamiClass.SSR: self.I_RS_SSR,
43-
ShikigamiClass.SP: self.I_RS_SP}
44+
ShikigamiClass.SP: self.I_RS_SP,
45+
ShikigamiClass.UR: self.I_RS_UR}
4446
check_selected = match_selected[shikigami_class]
4547
check_click = match_click[shikigami_class]
4648
# 选择式神的种类
@@ -125,10 +127,10 @@ def set_shikigami(self, shikigami_order: int = 7, stop_image: RuleImage = None):
125127
def detect_no_shikigami(self) -> bool:
126128
self.screenshot()
127129
if self.appear(self.I_DETECT_EMPTY_1)\
128-
and self.appear(self.I_DETECT_EMPTY_2) \
129-
and self.appear(self.I_DETECT_EMPTY_3) \
130-
and self.appear(self.I_DETECT_EMPTY_4) \
131-
and self.appear(self.I_DETECT_EMPTY_5) \
132-
and self.appear(self.I_DETECT_EMPTY_6):
130+
or self.appear(self.I_DETECT_EMPTY_2) \
131+
or self.appear(self.I_DETECT_EMPTY_3) \
132+
or self.appear(self.I_DETECT_EMPTY_4) \
133+
or self.appear(self.I_DETECT_EMPTY_5) \
134+
or self.appear(self.I_DETECT_EMPTY_6):
133135
return True
134136
return False

‎tasks/Component/ReplaceShikigami/rs/image.json‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,53 @@
1111
{
1212
"itemName": "rs_material",
1313
"imageName": "rs_rs_material.png",
14-
"roiFront": "32,283,59,56",
15-
"roiBack": "32,283,59,56",
14+
"roiFront": "822,620,59,56",
15+
"roiBack": "129,597,774,98",
1616
"method": "Template matching",
1717
"threshold": 0.8,
1818
"description": "素材"
1919
},
2020
{
2121
"itemName": "rs_n",
2222
"imageName": "rs_rs_n.png",
23-
"roiFront": "138,299,57,59",
24-
"roiBack": "138,299,57,59",
23+
"roiFront": "709,621,57,59",
24+
"roiBack": "132,595,767,105",
2525
"method": "Template matching",
2626
"threshold": 0.8,
2727
"description": "description"
2828
},
2929
{
3030
"itemName": "rs_r",
3131
"imageName": "rs_rs_r.png",
32-
"roiFront": "230,344,64,61",
33-
"roiBack": "230,344,64,61",
32+
"roiFront": "594,619,64,61",
33+
"roiBack": "126,599,776,101",
3434
"method": "Template matching",
3535
"threshold": 0.8,
3636
"description": "description"
3737
},
3838
{
3939
"itemName": "rs_sr",
4040
"imageName": "rs_rs_sr.png",
41-
"roiFront": "307,421,62,58",
42-
"roiBack": "307,421,62,58",
41+
"roiFront": "483,619,62,58",
42+
"roiBack": "131,599,767,101",
4343
"method": "Template matching",
4444
"threshold": 0.8,
4545
"description": "description"
4646
},
4747
{
4848
"itemName": "rs_ssr",
4949
"imageName": "rs_rs_ssr.png",
50-
"roiFront": "354,517,63,58",
51-
"roiBack": "354,517,63,58",
50+
"roiFront": "370,621,63,58",
51+
"roiBack": "130,600,771,101",
5252
"method": "Template matching",
5353
"threshold": 0.8,
5454
"description": "description"
5555
},
5656
{
5757
"itemName": "rs_sp",
5858
"imageName": "rs_rs_sp.png",
59-
"roiFront": "372,621,58,60",
60-
"roiBack": "372,621,58,60",
59+
"roiFront": "260,621,58,60",
60+
"roiBack": "133,600,763,96",
6161
"method": "Template matching",
6262
"threshold": 0.8,
6363
"description": "description"
@@ -142,5 +142,23 @@
142142
"method": "Template matching",
143143
"threshold": 0.8,
144144
"description": "智能放入"
145+
},
146+
{
147+
"itemName": "rs_ur",
148+
"imageName": "rs_rs_ur.png",
149+
"roiFront": "149,623,56,58",
150+
"roiBack": "136,598,758,101",
151+
"method": "Template matching",
152+
"threshold": 0.8,
153+
"description": "description"
154+
},
155+
{
156+
"itemName": "rs_ur_selected",
157+
"imageName": "rs_rs_ur_selected.png",
158+
"roiFront": "36,620,54,58",
159+
"roiBack": "14,601,100,100",
160+
"method": "Template matching",
161+
"threshold": 0.8,
162+
"description": "description"
145163
}
146164
]

‎tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png‎

5.81 KB
Loading

‎tasks/Component/ReplaceShikigami/rs/rs_rs_ur_selected.png‎

6.15 KB
Loading

‎tasks/Utils/config_enum.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from enum import Enum
55

66
class ShikigamiClass(str, Enum):
7+
UR = 'UR'
78
SP = 'SP'
89
SSR = 'SSR'
910
SR = 'SR'

0 commit comments

Comments
 (0)