Jelajahi Sumber

fix(GeneralBuff):打开关闭buff时 由于邀请框遮挡导致的开启关闭BUFF失败

ChengRanORZ 2 tahun lalu
induk
melakukan
b309d0d8ce

+ 11 - 2
tasks/Component/GeneralBuff/general_buff.py

@@ -223,6 +223,7 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         """
         """
         self.reject_invite()
         self.reject_invite()
         self.screenshot()
         self.screenshot()
+
         if not target.match(self.device.image):
         if not target.match(self.device.image):
             logger.warning(f'No {target.name} buff')
             logger.warning(f'No {target.name} buff')
             return None
             return None
@@ -294,9 +295,17 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         from tasks.Component.GeneralInvite.assets import GeneralInviteAssets as gia
         from tasks.Component.GeneralInvite.assets import GeneralInviteAssets as gia
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if not self.appear(gia.I_I_REJECT):
+            if not (self.appear(gia.I_I_REJECT_1) or self.appear(gia.I_I_REJECT_2) or self.appear(gia.I_I_REJECT_3)):
                 break
                 break
-            self.click(gia.I_I_REJECT, interval=1)
+            if self.appear(gia.I_I_REJECT_3):
+                self.click(gia.I_I_REJECT_3, 6)
+                continue
+            if self.appear(gia.I_I_REJECT_2):
+                self.click(gia.I_I_REJECT_2, 6)
+                continue
+            if self.appear(gia.I_I_REJECT_1):
+                self.click(gia.I_I_REJECT_1, 6)
+                continue
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

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

@@ -69,6 +69,12 @@ class GeneralInviteAssets:
 	I_ADD_SEA = RuleImage(roi_front=(836,231,100,100), roi_back=(836,231,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_sea.png")
 	I_ADD_SEA = RuleImage(roi_front=(836,231,100,100), roi_back=(836,231,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_sea.png")
 	# 队员不接受邀请 
 	# 队员不接受邀请 
 	I_I_REJECT = RuleImage(roi_front=(12,226,64,61), roi_back=(12,226,64,275), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_reject.png")
 	I_I_REJECT = RuleImage(roi_front=(12,226,64,61), roi_back=(12,226,64,275), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_reject.png")
+	# 队员不接受邀请 
+	I_I_REJECT_1 = RuleImage(roi_front=(5,210,110,95), roi_back=(5,210,110,95), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_reject.png")
+	# 队员不接受邀请 
+	I_I_REJECT_2 = RuleImage(roi_front=(5,320,110,95), roi_back=(5,320,110,95), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_reject.png")
+	# 队员不接受邀请 
+	I_I_REJECT_3 = RuleImage(roi_front=(5,430,110,95), roi_back=(5,430,110,95), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_reject.png")
 	# 队员接受邀请 
 	# 队员接受邀请 
 	I_I_ACCEPT = RuleImage(roi_front=(113,225,63,72), roi_back=(113,225,63,280), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept.png")
 	I_I_ACCEPT = RuleImage(roi_front=(113,225,63,72), roi_back=(113,225,63,280), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept.png")
 	# 队员默认接受邀请 
 	# 队员默认接受邀请