Răsfoiți Sursa

Merge pull request #1690 from runhey/master

Merge branch 'master' into dev
huangrunheng 3 luni în urmă
părinte
comite
93ebdf5c44
1 a modificat fișierele cu 4 adăugiri și 3 ștergeri
  1. 4 3
      tasks/BondlingFairyland/script_task.py

+ 4 - 3
tasks/BondlingFairyland/script_task.py

@@ -101,14 +101,15 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                     self.screenshot()
                     self.screenshot()
                     if self.appear(self.I_GI_IN_ROOM):
                     if self.appear(self.I_GI_IN_ROOM):
                         return True
                         return True
+                    # 求援后可能出现式盘数量上限确认弹窗
+                    if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                        sleep(1)
+                        continue
                     if click_count >= 6:
                     if click_count >= 6:
                         logger.error('Click fire failed')
                         logger.error('Click fire failed')
                         logger.error(
                         logger.error(
                             'You might need to check your bondling number. It most possibly arrived to the max 500')
                             'You might need to check your bondling number. It most possibly arrived to the max 500')
                         raise BondlingNumberMax
                         raise BondlingNumberMax
-                    # 某些活动的时候出现 “选择共鸣的阴阳师”
-                    if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
-                        continue
                     if self.check_and_invite(True):
                     if self.check_and_invite(True):
                         continue
                         continue
                     if self.appear(self.I_CREATE_TEAM, interval=1):
                     if self.appear(self.I_CREATE_TEAM, interval=1):