Przeglądaj źródła

perf(SixRealms): Auto refresh skills

huangrunheng 2 lat temu
rodzic
commit
d12f63992e

+ 2 - 0
tasks/SixRealms/assets.py

@@ -107,6 +107,8 @@ class SixRealmsAssets:
 	O_ISLAND_NAME = RuleOcr(roi=(88,17,148,49), area=(88,17,148,49), mode="Single", method="Default", keyword="", name="island_name")
 	O_ISLAND_NAME = RuleOcr(roi=(88,17,148,49), area=(88,17,148,49), mode="Single", method="Default", keyword="", name="island_name")
 	# 有多少钱 
 	# 有多少钱 
 	O_COIN_NUM = RuleOcr(roi=(1171,23,59,31), area=(1171,23,59,31), mode="Digit", method="Default", keyword="", name="coin_num")
 	O_COIN_NUM = RuleOcr(roi=(1171,23,59,31), area=(1171,23,59,31), mode="Digit", method="Default", keyword="", name="coin_num")
+	# Ocr-description 
+	O_SKILL_REFRESH = RuleOcr(roi=(1172,684,100,31), area=(1172,684,100,31), mode="Single", method="Default", keyword="", name="skill_refresh")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 9 - 0
tasks/SixRealms/gate1/ocr.json

@@ -25,5 +25,14 @@
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "有多少钱"
     "description": "有多少钱"
+  },
+  {
+    "itemName": "skill_refresh",
+    "roiFront": "1172,684,100,31",
+    "roiBack": "1172,684,100,31",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
   }
   }
 ]
 ]

+ 3 - 0
tasks/SixRealms/moon_sea/l101.py

@@ -76,6 +76,9 @@ class MoonSeaL101(MoonSeaSkills):
             if coin < 300:
             if coin < 300:
                 logger.info('Not enough coin')
                 logger.info('Not enough coin')
                 break
                 break
+            if self.cnt_skill101 >= 5:
+                logger.info('Skill 101 level is max')
+                break
 
 
             if self.appear(self.I_UI_CONFIRM):
             if self.appear(self.I_UI_CONFIRM):
                 self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=1)
                 self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=1)

+ 1 - 1
tasks/SixRealms/moon_sea/l103.py

@@ -37,7 +37,7 @@ class MoonSeaL103(MoonSeaSkills):
         self.battle_lock_team()
         self.battle_lock_team()
         self.island_battle()
         self.island_battle()
         logger.info('Island battle finished')
         logger.info('Island battle finished')
-        self.select_skill()
+        self.select_skill(refresh=True)
 
 
 
 
 
 

+ 2 - 0
tasks/SixRealms/moon_sea/map.py

@@ -85,6 +85,8 @@ class MoonSeaMap(MoonSeaSkills):
                 self.screenshot()
                 self.screenshot()
                 if not self.in_main() and self.appear(self.I_BACK_EXIT):
                 if not self.in_main() and self.appear(self.I_BACK_EXIT):
                     break
                     break
+                if self.appear_then_click(self.I_UI_CANCEL, interval=1):
+                    continue
                 if self.click(self.C_ISLAND_ENTER_1, interval=2):
                 if self.click(self.C_ISLAND_ENTER_1, interval=2):
                     continue
                     continue
                 if self.click(self.C_ISLAND_ENTER_2, interval=2):
                 if self.click(self.C_ISLAND_ENTER_2, interval=2):

+ 31 - 2
tasks/SixRealms/moon_sea/skills.py

@@ -1,4 +1,5 @@
 import time
 import time
+import re
 
 
 from cached_property import cached_property
 from cached_property import cached_property
 
 
@@ -83,7 +84,24 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
         logger.info(f'Select {select}')
         logger.info(f'Select {select}')
         return select
         return select
 
 
-    def select_skill(self):
+    def select_skill(self, refresh: bool = False):
+        def check_coin_skill() -> bool:
+            coin = self.O_COIN_NUM.ocr(self.device.image)
+            return False if coin < 50 else True
+
+        def check_refresh() -> bool:
+            # 检测是否有钱刷新技能
+            text = self.O_SKILL_REFRESH.ocr(self.device.image)
+            matches = re.search(f"剩\d+次", text)
+            if matches:
+                refresh_time = int(matches.group()[1])
+                logger.info(f'Refresh time: {refresh_time}')
+                if refresh_time <= 0:
+                    logger.warning('Refresh time is 0')
+                    return False
+                else:
+                    return True
+            return False
         # 战斗结束后选技能
         # 战斗结束后选技能
         logger.info('Start select skill')
         logger.info('Start select skill')
 
 
@@ -92,10 +110,21 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
             if self.in_main():
             if self.in_main():
                 break
                 break
 
 
+            if self.appear(self.I_UI_CONFIRM):
+                self.ui_click_until_disappear(self.I_UI_CONFIRM)
+
             if self.appear(self.I_SKILL_REFRESH) and self.appear(self.I_SELECT_3) and not self.appear(self.I_COIN2):
             if self.appear(self.I_SKILL_REFRESH) and self.appear(self.I_SELECT_3) and not self.appear(self.I_COIN2):
                 select = self._select_skill()
                 select = self._select_skill()
+                # 如果没有柔风并且钱够并且还有刷新次数
+                if refresh and select == 3 and check_coin_skill() and check_refresh() and self.cnt_skill101 < 5:
+                    logger.info('Refresh skill')
+                    self.appear_then_click(self.I_SKILL_REFRESH)
+                    self.wait_until_stable(self.I_UI_CONFIRM, timeout=Timer(2))
+                    self.appear_then_click(self.I_UI_CONFIRM)
+                    self.wait_animate_stable(self.C_MAIN_ANIMATE_KEEP, timeout=1)
+                    continue
                 if self.appear_then_click(self.selects_button[select]):
                 if self.appear_then_click(self.selects_button[select]):
-                    self.wait_animate_stable(self.C_MAIN_ANIMATE_KEEP, timeout=1.4)
+                    self.wait_animate_stable(self.C_MAIN_ANIMATE_KEEP, timeout=2)
                     continue
                     continue
             if self.appear_then_click(self.I_COIN, action=self.C_UI_REWARD, interval=1.5):
             if self.appear_then_click(self.I_COIN, action=self.C_UI_REWARD, interval=1.5):
                 continue
                 continue