Procházet zdrojové kódy

Merge remote-tracking branch 'origin/dev' into dev

huangrunheng před 2 roky
rodič
revize
22eb7599b2

+ 4 - 0
tasks/BondlingFairyland/script_task.py

@@ -543,6 +543,10 @@ class ScriptTask(GameUi, BondlingBattle, SwitchSoul, BondlingFairylandAssets):
                 return False
             if not self.appear(self.I_BF_SEARSH):
                 return True
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                continue
             if self.appear_then_click(self.I_BF_SEARSH, interval=2):
                 count += 1
                 continue

+ 3 - 3
tasks/RichMan/mall/bondlings.py

@@ -24,12 +24,12 @@ class Bondlings(Buy, MallNavbar):
             return
         self._enter_bondlings()
 
-        # 购买御魂
-        self._bondlings_base(buy_button=self.I_BL_BUY_SOULS, remain_number=self.O_BL_RES_SOULS, check_class=1,
-                             buy_number=con.random_soul, buy_max=25, buy_money=20)
         # 购买石头
         self._bondlings_base(buy_button=self.I_BL_BUY_STONE, remain_number=self.O_BL_RES_STONE, check_class=2,
                              buy_number=con.bondling_stone, buy_max=10, buy_money=30)
+        # 购买御魂
+        self._bondlings_base(buy_button=self.I_BL_BUY_SOULS, remain_number=self.O_BL_RES_SOULS, check_class=1,
+                             buy_number=con.random_soul, buy_max=25, buy_money=20)
         # 购买高级盘
         self._bondlings_base(buy_button=self.I_BL_BUY_HIGH, remain_number=self.O_BL_RES_HIGH, check_class=3,
                              buy_number=con.high_bondling_discs, buy_max=10, buy_money=50)