Jelajahi Sumber

Merge pull request #162 from paofanxx/fix78

fix #78
huangrunheng 2 tahun lalu
induk
melakukan
d020c2d4d5

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

@@ -11,6 +11,8 @@ class GeneralInviteAssets:
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
+	# 三人御魂组队左上角的协站队伍
+	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")
 	# 中间的邀请图片 
 	# 中间的邀请图片 
 	I_ADD_1 = RuleImage(roi_front=(592,288,114,51), roi_back=(592,288,114,51), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
 	I_ADD_1 = RuleImage(roi_front=(592,288,114,51), roi_back=(592,288,114,51), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
 	# 最右边的邀请 
 	# 最右边的邀请 

+ 4 - 0
tasks/Component/GeneralInvite/general_invite.py

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

TEMPAT SAMPAH
tasks/Component/GeneralInvite/gi/gi_in_room.png