Explorar el Código

fix:Don't modify assets.py files

huangrunheng hace 2 años
padre
commit
c054086869

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

@@ -83,6 +83,8 @@ class GeneralInviteAssets:
 	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
 	# 所有的组队界面都有加成 
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
+	# 三人御魂组队左上角的协站队伍 
+	I_GI_IN_ROOM = RuleImage(roi_front=(92,17,213,64), roi_back=(92,17,213,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_in_room.png")
 
 
 	# Image Rule Assets

+ 1 - 1
tasks/Component/GeneralInvite/general_invite.py

@@ -147,7 +147,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 return True
             # 修复三人组队卡住bug,#78
             # 增加左上角协战房间判断,存在就说明在组队界面
-            if self.appear(self.GI_IN_ROOM):
+            if self.appear(self.I_GI_IN_ROOM):
                 return True
             if self.appear(self.I_MATCHING):
                 return False

+ 9 - 0
tasks/Component/GeneralInvite/gi/image.json

@@ -322,5 +322,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "所有的组队界面都有加成"
+  },
+  {
+    "itemName": "gi_in_room",
+    "imageName": "gi_in_room.png",
+    "roiFront": "92,17,213,64",
+    "roiBack": "92,17,213,64",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "三人御魂组队左上角的协站队伍"
   }
 ]