Pārlūkot izejas kodu

Merge pull request #1207 from BluettDream/dev_fix_replaceshiki

fix(ReplaceShiki)
huangrunheng 1 gadu atpakaļ
vecāks
revīzija
baa66df1e8

+ 10 - 6
tasks/Component/ReplaceShikigami/assets.py

@@ -52,17 +52,17 @@ class ReplaceShikigamiAssets:
 	# description 
 	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")
 	# 素材 
-	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")
+	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")
 	# description 
-	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")
+	I_RS_N = RuleImage(roi_front=(709,621,57,59), roi_back=(694,606,89,90), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
 	# description 
-	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")
+	I_RS_R = RuleImage(roi_front=(594,619,64,61), roi_back=(582,601,91,98), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
 	# description 
-	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")
+	I_RS_SR = RuleImage(roi_front=(483,619,62,58), roi_back=(470,603,90,96), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
 	# description 
-	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")
+	I_RS_SSR = RuleImage(roi_front=(370,621,63,58), roi_back=(353,600,98,100), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
 	# description 
-	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")
+	I_RS_SP = RuleImage(roi_front=(260,621,58,60), roi_back=(246,605,92,90), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
 	# description 
 	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")
 	# description 
@@ -81,6 +81,10 @@ class ReplaceShikigamiAssets:
 	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")
 	# 智能放入 
 	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")
+	# description 
+	I_RS_UR = RuleImage(roi_front=(149,623,56,58), roi_back=(136,603,88,95), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png")
+	# description 
+	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")
 
 
 	# Image Rule Assets

+ 9 - 7
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -34,13 +34,15 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
                           ShikigamiClass.R: self.I_RS_R_SELECTED,
                           ShikigamiClass.SR: self.I_RS_SR_SELECTED,
                           ShikigamiClass.SSR: self.I_RS_SSR_SELECTED,
-                          ShikigamiClass.SP: self.I_RS_SP_SELECTED}
+                          ShikigamiClass.SP: self.I_RS_SP_SELECTED,
+                          ShikigamiClass.UR: self.I_RS_UR_SELECTED}
         match_click = {ShikigamiClass.MATERIAL: self.I_RS_MATERIAL,
                        ShikigamiClass.N: self.I_RS_N,
                        ShikigamiClass.R: self.I_RS_R,
                        ShikigamiClass.SR: self.I_RS_SR,
                        ShikigamiClass.SSR: self.I_RS_SSR,
-                       ShikigamiClass.SP: self.I_RS_SP}
+                       ShikigamiClass.SP: self.I_RS_SP,
+                       ShikigamiClass.UR: self.I_RS_UR}
         check_selected = match_selected[shikigami_class]
         check_click = match_click[shikigami_class]
         # 选择式神的种类
@@ -125,10 +127,10 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
     def detect_no_shikigami(self) -> bool:
         self.screenshot()
         if self.appear(self.I_DETECT_EMPTY_1)\
-            and self.appear(self.I_DETECT_EMPTY_2) \
-                and self.appear(self.I_DETECT_EMPTY_3) \
-                and self.appear(self.I_DETECT_EMPTY_4) \
-                and self.appear(self.I_DETECT_EMPTY_5) \
-                and self.appear(self.I_DETECT_EMPTY_6):
+            or self.appear(self.I_DETECT_EMPTY_2) \
+                or self.appear(self.I_DETECT_EMPTY_3) \
+                or self.appear(self.I_DETECT_EMPTY_4) \
+                or self.appear(self.I_DETECT_EMPTY_5) \
+                or self.appear(self.I_DETECT_EMPTY_6):
             return True
         return False

+ 30 - 12
tasks/Component/ReplaceShikigami/rs/image.json

@@ -11,8 +11,8 @@
   {
     "itemName": "rs_material",
     "imageName": "rs_rs_material.png",
-    "roiFront": "32,283,59,56",
-    "roiBack": "32,283,59,56",
+    "roiFront": "822,620,59,56",
+    "roiBack": "129,597,774,98",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "素材"
@@ -20,8 +20,8 @@
   {
     "itemName": "rs_n",
     "imageName": "rs_rs_n.png",
-    "roiFront": "138,299,57,59",
-    "roiBack": "138,299,57,59",
+    "roiFront": "709,621,57,59",
+    "roiBack": "694,606,89,90",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "rs_r",
     "imageName": "rs_rs_r.png",
-    "roiFront": "230,344,64,61",
-    "roiBack": "230,344,64,61",
+    "roiFront": "594,619,64,61",
+    "roiBack": "582,601,91,98",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "rs_sr",
     "imageName": "rs_rs_sr.png",
-    "roiFront": "307,421,62,58",
-    "roiBack": "307,421,62,58",
+    "roiFront": "483,619,62,58",
+    "roiBack": "470,603,90,96",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -47,8 +47,8 @@
   {
     "itemName": "rs_ssr",
     "imageName": "rs_rs_ssr.png",
-    "roiFront": "354,517,63,58",
-    "roiBack": "354,517,63,58",
+    "roiFront": "370,621,63,58",
+    "roiBack": "353,600,98,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "rs_sp",
     "imageName": "rs_rs_sp.png",
-    "roiFront": "372,621,58,60",
-    "roiBack": "372,621,58,60",
+    "roiFront": "260,621,58,60",
+    "roiBack": "246,605,92,90",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -142,5 +142,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "智能放入"
+  },
+  {
+    "itemName": "rs_ur",
+    "imageName": "rs_rs_ur.png",
+    "roiFront": "149,623,56,58",
+    "roiBack": "136,603,88,95",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "rs_ur_selected",
+    "imageName": "rs_rs_ur_selected.png",
+    "roiFront": "36,620,54,58",
+    "roiBack": "14,601,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

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


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


+ 1 - 0
tasks/Utils/config_enum.py

@@ -4,6 +4,7 @@
 from enum import Enum
 
 class ShikigamiClass(str, Enum):
+    UR = 'UR'
     SP = 'SP'
     SSR = 'SSR'
     SR = 'SR'