Procházet zdrojové kódy

Merge pull request #251 from yEs1do/feature6

结界寄养优化
huangrunheng před 2 roky
rodič
revize
e0f7cc5ef7

+ 2 - 0
tasks/KekkaiUtilize/assets.py

@@ -122,5 +122,7 @@ class KekkaiUtilizeAssets:
 	# Swipe Rule Assets
 	# Swipe Rule Assets
 	# 向下滑动 
 	# 向下滑动 
 	S_U_UP = RuleSwipe(roi_front=(235,419,50,21), roi_back=(225,177,72,21), mode="default", name="u_up")
 	S_U_UP = RuleSwipe(roi_front=(235,419,50,21), roi_back=(225,177,72,21), mode="default", name="u_up")
+	# 滑动到底部 
+	S_U_END = RuleSwipe(roi_front=(175,179,26,26), roi_back=(164,518,49,102), mode="default", name="u_end")
 
 
 
 

+ 11 - 2
tasks/KekkaiUtilize/script_task.py

@@ -26,8 +26,8 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_guild)
         self.ui_goto(page_guild)
         # 收体力或者资金
         # 收体力或者资金
-        # 进入寮主页会有一个动画,等一等
-        time.sleep(1)
+        # 进入寮主页会有一个动画,等一等,让小纸人跑一会儿
+        time.sleep(3)
         self.check_guild_ap_or_assets(ap_enable=con.guild_ap_enable, assets_enable=con.guild_assets_enable)
         self.check_guild_ap_or_assets(ap_enable=con.guild_ap_enable, assets_enable=con.guild_assets_enable)
         # 进入寮结界
         # 进入寮结界
         self.goto_realm()
         self.goto_realm()
@@ -297,6 +297,8 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
                 timer_click.reset()
                 timer_click.reset()
                 x, y = check_image.coord()
                 x, y = check_image.coord()
                 self.device.click(x=x, y=y, control_name=check_image.name)
                 self.device.click(x=x, y=y, control_name=check_image.name)
+        if friend == SelectFriendList.DIFFERENT_SERVER:
+            time.sleep(1)
         time.sleep(0.5)
         time.sleep(0.5)
 
 
     @cached_property
     @cached_property
@@ -374,6 +376,13 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
 
 
         logger.hr('Start utilize')
         logger.hr('Start utilize')
         self.switch_friend_list(friend)
         self.switch_friend_list(friend)
+        self.swipe(self.S_U_END, interval=3)
+        if friend == SelectFriendList.SAME_SERVER:
+            self.switch_friend_list(SelectFriendList.DIFFERENT_SERVER)
+            self.switch_friend_list(SelectFriendList.SAME_SERVER)
+        else:
+            self.switch_friend_list(SelectFriendList.SAME_SERVER)
+            self.switch_friend_list(SelectFriendList.DIFFERENT_SERVER)
         card_best = None
         card_best = None
         swipe_count = 0
         swipe_count = 0
         while 1:
         while 1:

+ 8 - 1
tasks/KekkaiUtilize/utilize/swipe.json

@@ -5,5 +5,12 @@
     "roiBack": "225,177,72,21",
     "roiBack": "225,177,72,21",
     "mode": "default",
     "mode": "default",
     "description": "向下滑动"
     "description": "向下滑动"
+  },
+  {
+    "itemName": "u_end",
+    "roiFront": "175,179,26,26",
+    "roiBack": "164,518,49,102",
+    "mode": "default",
+    "description": "滑动到底部"
   }
   }
-]
+]