Просмотр исходного кода

fix(SigRealms): Increase stability

ryland 2 лет назад
Родитель
Сommit
4c5c5152e9

+ 4 - 0
tasks/SixRealms/assets.py

@@ -130,6 +130,8 @@ class SixRealmsAssets:
 	I_SELECT_3 = RuleImage(roi_front=(1016,581,145,43), roi_back=(1000,550,173,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_select_3.png")
 	# 六道的金币 
 	I_COIN = RuleImage(roi_front=(612,345,66,53), roi_back=(405,229,561,270), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_coin.png")
+	# 六道的金币 
+	I_COIN2 = RuleImage(roi_front=(612,345,66,53), roi_back=(405,229,561,270), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_coin.png")
 
 
 	# Image Rule Assets
@@ -139,6 +141,8 @@ class SixRealmsAssets:
 	I_STORE_SKILL_101 = RuleImage(roi_front=(876,121,47,41), roi_back=(682,100,455,571), threshold=0.9, method="Template matching", file="./tasks/SixRealms/l101/l101_store_skill_101.png")
 	# description 
 	I_STORE_EXIT = RuleImage(roi_front=(1179,586,59,56), roi_back=(1161,561,100,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/l101/l101_store_exit.png")
+	# 稳定标志 
+	I_STORE_STABLE_FLAG = RuleImage(roi_front=(1028,251,28,27), roi_back=(1011,241,63,47), threshold=0.8, method="Template matching", file="./tasks/SixRealms/l101/l101_store_stable_flag.png")
 
 
 	# Ocr Rule Assets

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

@@ -88,5 +88,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "六道的金币"
+  },
+  {
+    "itemName": "coin2",
+    "imageName": "gate1_coin.png",
+    "roiFront": "612,345,66,53",
+    "roiBack": "405,229,561,270",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "六道的金币"
   }
 ]

+ 9 - 0
tasks/SixRealms/l101/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "store_stable_flag",
+    "imageName": "l101_store_stable_flag.png",
+    "roiFront": "1028,251,28,27",
+    "roiBack": "1011,241,63,47",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "稳定标志"
   }
 ]

BIN
tasks/SixRealms/l101/l101_store_stable_flag.png


+ 27 - 14
tasks/SixRealms/moon_sea/l101.py

@@ -1,6 +1,7 @@
 import re
 import time
 from module.logger import logger
+from module.base.timer import Timer
 from tasks.SixRealms.moon_sea.skills import MoonSeaSkills
 
 
@@ -9,6 +10,7 @@ class MoonSeaL101(MoonSeaSkills):
     def buy_skill_101(self) -> bool:
         logger.info('Buy skill 101')
         self.wait_animate_stable(self.C_STORE_ANIMATE_KEEP, timeout=2)
+        self.wait_until_appear(self.I_STORE_STABLE_FLAG)
         buy_try: int = 0
         while 1:
             self.screenshot()
@@ -31,8 +33,9 @@ class MoonSeaL101(MoonSeaSkills):
         logger.info('Buy skill 101 done')
         return True
 
-    def refresh_store(self):
+    def refresh_store(self) -> bool:
         # 刷新宁溪
+        # 只会点击一次
         logger.info('Refresh store')
         text = self.O_STORE_REFRESH_TIME.ocr(self.device.image)
         matches = re.search(f"剩\d+次", text)
@@ -43,17 +46,19 @@ class MoonSeaL101(MoonSeaSkills):
                 logger.warning('Refresh time is 0')
                 return False
         cnt_refresh = 0
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_UI_CONFIRM):
-                break
-            if self.appear_then_click(self.I_STORE_REFRESH, interval=1.5):
-                cnt_refresh += 1
-                continue
-            if cnt_refresh >= 1:
-                return False
-        self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=2)
-        self.wait_until_appear(self.I_STORE_EXIT)
+        # while 1:
+        #     self.screenshot()
+        #     if self.appear(self.I_UI_CONFIRM):
+        #         break
+        #     if self.appear_then_click(self.I_STORE_REFRESH, interval=1.5):
+        #         cnt_refresh += 1
+        #         continue
+        #     if cnt_refresh >= 1:
+        #         return False
+        # self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=2)
+        # self.wait_until_appear(self.I_STORE_EXIT)
+        self.appear_then_click(self.I_STORE_REFRESH, interval=1.5)
+        self.wait_until_stable(self.I_UI_CONFIRM, timeout=Timer(2, count=10))
         logger.info('Refresh store done')
         return True
 
@@ -62,17 +67,25 @@ class MoonSeaL101(MoonSeaSkills):
         logger.info('Keep buying skills until you run out of money')
         self.wait_until_appear(self.I_STORE_EXIT)
         self.wait_animate_stable(self.C_STORE_ANIMATE_KEEP, timeout=2)
+        if self.appear(self.I_UI_CANCEL):
+            # 有时候点击进入商店太快了,就进入会选随机的一个
+            self.ui_click_until_disappear(self.I_UI_CANCEL, interval=1)
         while 1:
             self.screenshot()
             coin = self.O_COIN_NUM.ocr(self.device.image)
             if coin < 300:
                 logger.info('Not enough coin')
                 break
+
+            if self.appear(self.I_UI_CONFIRM):
+                self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=1)
             if self.appear(self.I_STORE_SKILL_101):
-                if not self.buy_skill_101():
-                    self.refresh_store()
+                self.buy_skill_101()
+            elif coin < 400:
+                break
             elif not self.refresh_store():
                 break
+
         logger.info('Finish purchase skill 101')
         while 1:
             self.screenshot()

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

@@ -102,7 +102,7 @@ class MoonSeaMap(MoonSeaSkills):
             self.screenshot()
             if not self.in_main() and self.appear(self.I_BACK_EXIT):
                 break
-            if self.click(self.C_ISLAND_ENTER, interval=1):
+            if self.click(self.C_ISLAND_ENTER, interval=2.5):
                 continue
         logger.info('Entering island')
         return

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

@@ -53,14 +53,18 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
 
 
     def one(self):
+        self.cnt_skill101 = 1
         self._start()
         while 1:
             self.screenshot()
             if not self.in_main():
                 continue
             isl_type, isl_num, isl_roi = self.decide()
-            # 如果前一个,召唤一次宁息
             if isl_num == 1 and isl_type != MoonSeaType.island106:
+                # 如果前一个,召唤一次宁息
+                if self.cnt_skill101 >= 5:
+                    # 如果柔风满级就不召唤
+                    pass
                 self.activate_store()
                 self.wait_animate_stable(self.C_MAIN_ANIMATE_KEEP, timeout=3)
                 isl_type, isl_num, isl_roi = self.decide()

+ 4 - 1
tasks/SixRealms/moon_sea/skills.py

@@ -3,6 +3,7 @@ import time
 from cached_property import cached_property
 
 from module.logger import logger
+from module.base.timer import Timer
 from tasks.base_task import BaseTask
 from tasks.SixRealms.assets import SixRealmsAssets
 
@@ -53,6 +54,7 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
 
     def _select_skill(self) -> int:
         self.screenshot()
+        self.wait_until_stable(self.I_SELECT_3)
         select = 3  # 从0开始计数
         button = None
         # 只选柔风
@@ -88,9 +90,10 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
             if self.in_main():
                 break
 
-            if self.appear(self.I_SKILL_REFRESH) and self.appear(self.I_SELECT_3):
+            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()
                 if self.appear_then_click(self.selects_button[select]):
+                    self.wait_animate_stable(self.C_MAIN_ANIMATE_KEEP, timeout=1.4)
                     continue
             if self.appear_then_click(self.I_COIN, action=self.C_UI_REWARD, interval=1.5):
                 continue