ljxun 1 год назад
Родитель
Сommit
23782e3028
2 измененных файлов с 8 добавлено и 8 удалено
  1. 7 7
      tasks/BondlingFairyland/general_invite.py
  2. 1 1
      tasks/BondlingFairyland/script_task.py

+ 7 - 7
tasks/BondlingFairyland/general_invite.py

@@ -36,7 +36,7 @@ class RoomType(str, Enum):
     NORMAL_5 = 'normal_5'
     NORMAL_5 = 'normal_5'
 
 
 
 
-class GeneralInvite(BaseTask, GeneralInviteAssets):
+class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
     timer_invite = None
     timer_invite = None
     timer_wait = None
     timer_wait = None
     timer_emoji = None  # 等待期间如果没有操作的话,可能会导致长时间无响应报错
     timer_emoji = None  # 等待期间如果没有操作的话,可能会导致长时间无响应报错
@@ -319,7 +319,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
 
 
         while appear_1 or appear_2:
         while appear_1 or appear_2:
             self.screenshot()
             self.screenshot()
-            if self.appear(BondlingFairylandAssets.I_SELECTED):
+            if self.appear(self.I_SELECTED):
                 break
                 break
             appear_1 = self.ocr_appear_click(self.O_FRIEND_NAME_1, interval=2)
             appear_1 = self.ocr_appear_click(self.O_FRIEND_NAME_1, interval=2)
             appear_2 = self.ocr_appear_click(self.O_FRIEND_NAME_2, interval=2)
             appear_2 = self.ocr_appear_click(self.O_FRIEND_NAME_2, interval=2)
@@ -339,7 +339,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_LOAD_FRIEND):
             if self.appear(self.I_LOAD_FRIEND):
                 break
                 break
-            if self.appear(BondlingFairylandAssets.I_INVITE_ENSURE):
+            if self.appear(self.I_INVITE_ENSURE):
                 break
                 break
             if self.appear_then_click(self.I_ADD_2, interval=1):
             if self.appear_then_click(self.I_ADD_2, interval=1):
                 continue
                 continue
@@ -412,7 +412,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             # 首先切换到不同的好友列表
             # 首先切换到不同的好友列表
             while index == 0:
             while index == 0:
                 self.screenshot()
                 self.screenshot()
-                if self.appear(BondlingFairylandAssets.I_FLAG_1_ON):
+                if self.appear(self.I_FLAG_1_ON):
                     break
                     break
                 if self.appear_then_click(self.I_FLAG_1_OFF, interval=1):
                 if self.appear_then_click(self.I_FLAG_1_OFF, interval=1):
                     continue
                     continue
@@ -449,13 +449,13 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
 
 
         # 点击确定
         # 点击确定
         logger.info('Click invite ensure')
         logger.info('Click invite ensure')
-        if not self.appear(BondlingFairylandAssets.I_INVITE_ENSURE):
+        if not self.appear(self.I_INVITE_ENSURE):
             logger.warning('No appear invite ensure while invite friend')
             logger.warning('No appear invite ensure while invite friend')
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if not self.appear(BondlingFairylandAssets.I_INVITE_ENSURE):
+            if not self.appear(self.I_INVITE_ENSURE):
                 break
                 break
-            if self.appear_then_click(BondlingFairylandAssets.I_INVITE_ENSURE):
+            if self.appear_then_click(self.I_INVITE_ENSURE):
                 continue
                 continue
         # 哪怕没有找到好友也有点击 确认 以退出好友列表
         # 哪怕没有找到好友也有点击 确认 以退出好友列表
         if not is_select:
         if not is_select:

+ 1 - 1
tasks/BondlingFairyland/script_task.py

@@ -896,7 +896,7 @@ if __name__ == '__main__':
     from module.device.device import Device
     from module.device.device import Device
     import cv2
     import cv2
 
 
-    config = Config('du')
+    config = Config('oas1')
     device = Device(config)
     device = Device(config)
     task = ScriptTask(config, device)
     task = ScriptTask(config, device)
     image = task.screenshot()
     image = task.screenshot()