Explorar el Código

统一为 I_CHECK_TEAM

yEs1do hace 2 años
padre
commit
d07a757a27

+ 0 - 2
tasks/EvoZone/assets.py

@@ -23,8 +23,6 @@ class EvoZoneAssets:
 	I_EVOZONE_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
 	# 式神录 
 	I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
-	# description 
-	I_EVOZONE_MATCHING = RuleImage(roi_front=(32,585,82,90), roi_back=(32,585,82,90), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_matching.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_pet_present.png")
 	# 风麒麟进入 

+ 0 - 9
tasks/EvoZone/o/image.json

@@ -53,15 +53,6 @@
     "threshold": 0.8,
     "description": "式神录"
   },
-  {
-    "itemName": "evozone_matching",
-    "imageName": "o_evozone_matching.png",
-    "roiFront": "32,585,82,90",
-    "roiBack": "32,585,82,90",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
     "itemName": "pet_present",
     "imageName": "o_pet_present.png",

BIN
tasks/EvoZone/o/o_evozone_matching.png


+ 1 - 1
tasks/EvoZone/script_task.py

@@ -138,7 +138,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         logger.info('Create team')
         while 1:
             self.screenshot()
-            if self.appear(self.I_EVOZONE_MATCHING):
+            if self.appear(self.I_CHECK_TEAM):
                 break
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 continue

+ 0 - 2
tasks/FallenSun/assets.py

@@ -21,8 +21,6 @@ class FallenSunAssets:
 	I_FALLEN_SUN_UNLOCK = RuleImage(roi_front=(557,560,31,38), roi_back=(557,560,31,38), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_unlock.png")
 	# description 
 	I_FALLEN_SUN_LOCK = RuleImage(roi_front=(557,561,31,37), roi_back=(557,561,31,37), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_lock.png")
-	# description 
-	I_FALLEN_SUN_MATCHING = RuleImage(roi_front=(32,585,82,90), roi_back=(32,585,82,90), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_matching.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_pet_present.png")
 

BIN
tasks/FallenSun/f/f_fallen_sun_matching.png


+ 0 - 9
tasks/FallenSun/f/image.json

@@ -44,15 +44,6 @@
     "threshold": 0.8,
     "description": "description"
   },
-  {
-    "itemName": "fallen_sun_matching",
-    "imageName": "f_fallen_sun_matching.png",
-    "roiFront": "32,585,82,90",
-    "roiBack": "32,585,82,90",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
     "itemName": "pet_present",
     "imageName": "f_pet_present.png",

+ 1 - 1
tasks/FallenSun/script_task.py

@@ -114,7 +114,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         logger.info('Create team')
         while 1:
             self.screenshot()
-            if self.appear(self.I_FALLEN_SUN_MATCHING):
+            if self.appear(self.I_CHECK_TEAM):
                 break
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 continue

+ 0 - 2
tasks/Orochi/assets.py

@@ -23,8 +23,6 @@ class OrochiAssets:
 	I_OROCHI_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/Orochi/o/o_orochi_fire.png")
 	# 式神录 
 	I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_shi_records.png")
-	# description 
-	I_OROCHI_MATCHING = RuleImage(roi_front=(32,585,82,90), roi_back=(32,585,82,90), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_matching.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_pet_present.png")
 

+ 0 - 9
tasks/Orochi/o/image.json

@@ -53,15 +53,6 @@
     "threshold": 0.8,
     "description": "式神录"
   },
-  {
-    "itemName": "orochi_matching",
-    "imageName": "o_orochi_matching.png",
-    "roiFront": "32,585,82,90",
-    "roiBack": "32,585,82,90",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
     "itemName": "pet_present",
     "imageName": "o_pet_present.png",

BIN
tasks/Orochi/o/o_orochi_matching.png


+ 2 - 2
tasks/Orochi/script_task.py

@@ -134,7 +134,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         logger.info('Create team')
         while 1:
             self.screenshot()
-            if self.appear(self.I_OROCHI_MATCHING):
+            if self.appear(self.I_CHECK_TEAM):
                 break
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 continue
@@ -332,7 +332,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
             logger.info('Create team')
             while 1:
                 self.screenshot()
-                if self.appear(self.I_OROCHI_MATCHING):
+                if self.appear(self.I_CHECK_TEAM):
                     break
                 if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                     continue