Kaynağa Gözat

加入勾协判断

yEs1do 2 yıl önce
ebeveyn
işleme
59c71da4ab
2 değiştirilmiş dosya ile 6 ekleme ve 3 silme
  1. 0 0
      tasks/GlobalGame/gg/gg_g_jade.png
  2. 6 3
      tasks/base_task.py

+ 0 - 0
tasks/GlobalGame/gg/gg_jade.png → tasks/GlobalGame/gg/gg_g_jade.png


+ 6 - 3
tasks/base_task.py

@@ -89,16 +89,19 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                         continue
                         continue
                     if not self.appear(self.I_G_REJECT):
                     if not self.appear(self.I_G_REJECT):
                         break
                         break
-            # 最后一个是仅仅接受勾协
+            # 如果是仅接受勾协
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ONLY_JADE:
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ONLY_JADE:
                 logger.info(f"Accept jade invitation")
                 logger.info(f"Accept jade invitation")
                 while 1:
                 while 1:
                     self.device.screenshot()
                     self.device.screenshot()
-                    if self.appear_then_click(self.I_G_ACCEPT, interval=1):
+                    if self.appear(self.I_G_JADE):
+                        if self.appear_then_click(self.I_G_ACCEPT, interval=1):
+                            continue
+                    elif self.appear_then_click(self.I_G_IGNORE, interval=1):
                         continue
                         continue
                     if not self.appear(self.I_G_ACCEPT):
                     if not self.appear(self.I_G_ACCEPT):
                         break
                         break
-            # 全部忽略
+            # 如果是全部忽略
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.IGNORE:
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.IGNORE:
                 logger.info(f"Ignore friend invitation")
                 logger.info(f"Ignore friend invitation")
                 while 1:
                 while 1: