Parcourir la source

Merge pull request #258 from yEs1do/feat/11

更新组队界面判断
huangrunheng il y a 2 ans
Parent
commit
3ae0beb5a3

+ 0 - 2
tasks/Component/GeneralRoom/assets.py

@@ -37,8 +37,6 @@ class GeneralRoomAssets:
 	# description 
 	# description 
 	I_CREATE_ENSURE_2 = RuleImage(roi_front=(552,489,42,55), roi_back=(552,489,42,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_create_ensure_2.png")
 	I_CREATE_ENSURE_2 = RuleImage(roi_front=(552,489,42,55), roi_back=(552,489,42,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_create_ensure_2.png")
 	# description 
 	# description 
-	I_GR_MATCHING_NEW = RuleImage(roi_front=(62,571,42,121), roi_back=(62,571,42,121), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_matching_new.png")
-	# description 
 	I_GR_BACK_YELLOW = RuleImage(roi_front=(19,13,53,53), roi_back=(19,13,53,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_back_yellow.png")
 	I_GR_BACK_YELLOW = RuleImage(roi_front=(19,13,53,53), roi_back=(19,13,53,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_back_yellow.png")
 	# 自动匹配 
 	# 自动匹配 
 	I_GR_AUTO_MATCH = RuleImage(roi_front=(697,598,181,63), roi_back=(697,598,181,63), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_auto_match.png")
 	I_GR_AUTO_MATCH = RuleImage(roi_front=(697,598,181,63), roi_back=(697,598,181,63), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_auto_match.png")

+ 2 - 2
tasks/Component/GeneralRoom/general_room.py

@@ -105,11 +105,11 @@ class GeneralRoom(BaseTask, GeneralRoomAssets):
         在组队界面 退出组队的界面, 返回到庭院或者是你一开始进入的入口
         在组队界面 退出组队的界面, 返回到庭院或者是你一开始进入的入口
         :return:
         :return:
         """
         """
-        if self.appear(self.I_GR_MATCHING_NEW):
+        if self.appear(self.I_CHECK_TEAM):
             logger.info('Exit team ui')
             logger.info('Exit team ui')
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
-                if not self.appear(self.I_GR_MATCHING_NEW):
+                if not self.appear(self.I_CHECK_TEAM):
                     return True
                     return True
                 if self.appear_then_click(self.I_GR_BACK_YELLOW, interval=0.5):
                 if self.appear_then_click(self.I_GR_BACK_YELLOW, interval=0.5):
                     continue
                     continue

BIN
tasks/Component/GeneralRoom/gr/gr_gr_matching_new.png


+ 0 - 9
tasks/Component/GeneralRoom/gr/image.json

@@ -62,15 +62,6 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
   },
   },
-  {
-    "itemName": "gr_matching_new",
-    "imageName": "gr_gr_matching_new.png",
-    "roiFront": "62,571,42,121",
-    "roiBack": "62,571,42,121",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
   {
     "itemName": "gr_back_yellow",
     "itemName": "gr_back_yellow",
     "imageName": "gr_gr_back_yellow.png",
     "imageName": "gr_gr_back_yellow.png",

+ 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_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")
 	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=(62,568,44,114), roi_back=(62,568,44,114), 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")
 	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,
     "threshold": 0.8,
     "description": "式神录"
     "description": "式神录"
   },
   },
-  {
-    "itemName": "evozone_matching",
-    "imageName": "o_evozone_matching.png",
-    "roiFront": "62,568,44,114",
-    "roiBack": "62,568,44,114",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
   {
     "itemName": "pet_present",
     "itemName": "pet_present",
     "imageName": "o_pet_present.png",
     "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')
         logger.info('Create team')
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_EVOZONE_MATCHING):
+            if self.appear(self.I_CHECK_TEAM):
                 break
                 break
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 continue
                 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")
 	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 
 	# 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")
 	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=(62,568,44,114), roi_back=(62,568,44,114), 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")
 	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,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
   },
   },
-  {
-    "itemName": "fallen_sun_matching",
-    "imageName": "f_fallen_sun_matching.png",
-    "roiFront": "62,568,44,114",
-    "roiBack": "62,568,44,114",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
   {
     "itemName": "pet_present",
     "itemName": "pet_present",
     "imageName": "f_pet_present.png",
     "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')
         logger.info('Create team')
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_FALLEN_SUN_MATCHING):
+            if self.appear(self.I_CHECK_TEAM):
                 break
                 break
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 continue
                 continue

+ 1 - 1
tasks/GameUi/assets.py

@@ -155,7 +155,7 @@ class GameUiAssets:
 	# description 
 	# description 
 	I_CHECK_GUILD = RuleImage(roi_front=(1072,630,49,46), roi_back=(1072,630,49,46), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_guild.png")
 	I_CHECK_GUILD = RuleImage(roi_front=(1072,630,49,46), roi_back=(1072,630,49,46), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_guild.png")
 	# description 
 	# description 
-	I_CHECK_TEAM = RuleImage(roi_front=(53,570,41,119), roi_back=(53,570,41,119), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_team.png")
+	I_CHECK_TEAM = RuleImage(roi_front=(32,585,82,90), roi_back=(32,585,82,90), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_team.png")
 	# description 
 	# description 
 	I_CHECK_COLLECTION = RuleImage(roi_front=(471,618,100,100), roi_back=(471,618,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_collection.png")
 	I_CHECK_COLLECTION = RuleImage(roi_front=(471,618,100,100), roi_back=(471,618,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_collection.png")
 	# description 
 	# description 

BIN
tasks/GameUi/page/page_check_team.png


+ 2 - 2
tasks/GameUi/page/page_img_3.json

@@ -128,8 +128,8 @@
   {
   {
     "itemName": "check_team",
     "itemName": "check_team",
     "imageName": "page_check_team.png",
     "imageName": "page_check_team.png",
-    "roiFront": "53,570,41,119",
-    "roiBack": "53,570,41,119",
+    "roiFront": "32,585,82,90",
+    "roiBack": "32,585,82,90",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"

+ 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_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")
 	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=(62,568,44,114), roi_back=(62,568,44,114), 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")
 	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,
     "threshold": 0.8,
     "description": "式神录"
     "description": "式神录"
   },
   },
-  {
-    "itemName": "orochi_matching",
-    "imageName": "o_orochi_matching.png",
-    "roiFront": "62,568,44,114",
-    "roiBack": "62,568,44,114",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
   {
     "itemName": "pet_present",
     "itemName": "pet_present",
     "imageName": "o_pet_present.png",
     "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')
         logger.info('Create team')
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_OROCHI_MATCHING):
+            if self.appear(self.I_CHECK_TEAM):
                 break
                 break
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
             if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 continue
                 continue
@@ -332,7 +332,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
             logger.info('Create team')
             logger.info('Create team')
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
-                if self.appear(self.I_OROCHI_MATCHING):
+                if self.appear(self.I_CHECK_TEAM):
                     break
                     break
                 if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                 if self.appear_then_click(self.I_FORM_TEAM, interval=1):
                     continue
                     continue