Ver Fonte

feat(SixRealmsGate): Add animate wait

ryland há 2 anos atrás
pai
commit
91678416f5

+ 82 - 0
module/atom/animate.py

@@ -0,0 +1,82 @@
+from pathlib import Path
+from module.logger import logger
+
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.ocr import RuleOcr
+
+
+class RuleAnimate(RuleImage):
+
+    def __init__(self,
+                 rule: RuleImage | RuleClick | RuleLongClick | RuleOcr,
+                 threshold: float = 0.75,
+                 name: str = None):
+        if isinstance(rule, RuleImage):
+            roi_front = rule.roi_front
+            roi_back = Path(rule.file).stem.upper()
+            self._name = rule.file
+            threshold = threshold
+        elif isinstance(rule, RuleClick) or isinstance(rule, RuleLongClick):
+            roi_front = rule.roi_front
+            roi_back = rule.roi_back
+            self._name = rule.name
+        elif isinstance(rule, RuleOcr):
+            roi_front = rule.roi
+            roi_back = rule.area
+            self._name = rule.name
+        else:
+            roi_front = None
+            roi_back = None
+            self._name = 'RuleAnimate'
+
+        super().__init__(
+            roi_front=list(roi_front),
+            roi_back=list(roi_back),
+            method='Template matching',
+            threshold=threshold,
+            file=''
+        )
+
+        if name is not None:
+            self._name = name
+        self._last_image = None
+
+    @property
+    def name(self) -> str:
+        return self._name.upper()
+
+    def stable(self, image) -> bool:
+        """
+        用于判断连续的两张截图,的目标区域是否一致
+        @param image:
+        @return:
+        """
+        if self._last_image is None:
+            self._last_image = image
+            return False
+
+        self._image = self._last_image
+        matched = self.match(image)
+        self._last_image = self.corp(image, self.roi_front)
+
+        if matched:
+            logger.info(f'Animation Stable @ {self.name}')
+            return True
+        return False
+
+
+if __name__ == '__main__':
+    from module.base.utils import load_image
+    from tasks.SixRealms.assets import SixRealmsAssets
+    ttt = RuleAnimate(SixRealmsAssets.C_MAIN_ANIMATE_KEEP, threshold=0.5)
+    imga = r'C:\Users\Ryland\Desktop\Desktop\37.png'
+    imgb = r'C:\Users\Ryland\Desktop\Desktop\38.png'
+    imga = load_image(imga)
+    imgb = load_image(imgb)
+
+    print(ttt.stable(imga))
+    print(ttt.stable(imgb))
+    print(ttt.stable(imgb))
+

+ 1 - 1
module/atom/click.py

@@ -8,7 +8,7 @@ from module.logger import logger
 
 class RuleClick:
 
-    def __init__(self, roi_front: tuple, roi_back: tuple, name: str=None) -> None:
+    def __init__(self, roi_front: tuple, roi_back: tuple, name: str = None) -> None:
         """
         初始化
         :param roi_front:

+ 6 - 2
module/atom/image.py

@@ -119,13 +119,17 @@ class RuleImage:
             self.load_kp_des()
         return self._des
 
-    def corp(self, image: np.array) -> np.array:
+    def corp(self, image: np.array, roi: list = None) -> np.array:
         """
         截取图片
         :param image:
+        :param roi
         :return:
         """
-        x, y, w, h = self.roi_back
+        if roi is None:
+            x, y, w, h = self.roi_back
+        else:
+            x, y, w, h = roi
         x, y, w, h = int(x), int(y), int(w), int(h)
         return image[y:y + h, x:x + w]
 

+ 8 - 1
tasks/SixRealms/assets.py

@@ -10,6 +10,13 @@ from module.atom.list import RuleList
 class SixRealmsAssets: 
 
 
+	# Click Rule Assets
+	# description 
+	C_MAIN_ANIMATE_KEEP = RuleClick(roi_front=(565,7,100,215), roi_back=(565,7,100,215), name="main_animate_keep")
+	# description 
+	C_STORE_ANIMATE_KEEP = RuleClick(roi_front=(825,87,317,466), roi_back=(825,87,317,466), name="store_animate_keep")
+
+
 	# Image Rule Assets
 	# 大boss挑战 
 	I_BOSS_FIRE = RuleImage(roi_front=(1128,576,100,100), roi_back=(1091,557,156,147), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_boss_fire.png")
@@ -125,7 +132,7 @@ class SixRealmsAssets:
 	# 宁息刷新 
 	I_STORE_REFRESH = RuleImage(roi_front=(545,596,46,47), roi_back=(519,568,100,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/l101/l101_store_refresh.png")
 	# 购买柔风 
-	I_STORE_SKILL_101 = RuleImage(roi_front=(876,121,47,41), roi_back=(682,100,455,571), threshold=0.8, method="Template matching", file="./tasks/SixRealms/l101/l101_store_skill_101.png")
+	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")
 

+ 14 - 0
tasks/SixRealms/gate1/animate.json

@@ -0,0 +1,14 @@
+[
+  {
+    "itemName": "main_animate_keep",
+    "roiFront": "565,7,100,215",
+    "roiBack": "565,7,100,215",
+    "description": "description"
+  },
+  {
+    "itemName": "store_animate_keep",
+    "roiFront": "825,87,317,466",
+    "roiBack": "825,87,317,466",
+    "description": "description"
+  }
+]

+ 1 - 1
tasks/SixRealms/l101/image.json

@@ -14,7 +14,7 @@
     "roiFront": "876,121,47,41",
     "roiBack": "682,100,455,571",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.9,
     "description": "购买柔风"
   },
   {

+ 8 - 5
tasks/SixRealms/moon_sea/l101.py

@@ -8,6 +8,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)
         buy_try: int = 0
         while 1:
             self.screenshot()
@@ -40,12 +41,17 @@ class MoonSeaL101(MoonSeaSkills):
             if refresh_time <= 0:
                 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 >= 4:
+                logger.warning('Refresh store failed')
+                break
         self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=2)
         self.wait_until_appear(self.I_STORE_EXIT)
         logger.info('Refresh store done')
@@ -54,8 +60,8 @@ class MoonSeaL101(MoonSeaSkills):
     def run_l101(self):
         logger.hr('Start l101')
         logger.info('Keep buying skills until you run out of money')
-        # 进商店动画 TODO
-        time.sleep(1)
+        self.wait_until_appear(self.I_STORE_EXIT)
+        self.wait_animate_stable(self.C_STORE_ANIMATE_KEEP, timeout=2)
         while 1:
             self.screenshot()
             coin = self.O_COIN_NUM.ocr(self.device.image)
@@ -78,9 +84,6 @@ class MoonSeaL101(MoonSeaSkills):
                 continue
 
 
-
-
-
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device

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

@@ -77,9 +77,7 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
                 case MoonSeaType.island103: self.run_103()
                 case MoonSeaType.island104: self.run_l104()
                 case MoonSeaType.island105: self.run_l105()
-            # 不知道怎么处理过场动画
-            # TODO
-            time.sleep(2)
+            self.wait_animate_stable(self.C_MAIN_ANIMATE_KEEP, timeout=3)
             continue
 
     def _continue(self):
@@ -181,6 +179,8 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
                 # 双倍奖励
                 logger.info('Double reward')
                 self.ui_get_reward(self.I_BOSS_USE_DOUBLE)
+            if self.ui_reward_appear_click():
+                continue
             if self.appear_then_click(self.I_BOSS_GET_EXP, interval=1):
                 logger.info('Get EXP')
                 continue

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

@@ -90,7 +90,7 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
             if self.appear(self.I_SKILL_REFRESH):
                 select = self._select_skill()
                 if self.appear_then_click(self.selects_button[select]):
-                    time.sleep(1)
+                    time.sleep(2)
                     # TODO 两次选的间隔太短就直接跳过了,或者说动画没有显示中间的就跳过了
                     continue
             if self.appear_then_click(self.I_COIN, action=self.C_UI_REWARD, interval=1.5):

+ 37 - 0
tasks/base_task.py

@@ -15,6 +15,7 @@ from module.atom.swipe import RuleSwipe
 from module.atom.ocr import RuleOcr
 from module.atom.list import RuleList
 from module.ocr.base_ocr import OcrMode, OcrMethod
+from module.atom.animate import RuleAnimate
 from module.logger import logger
 from module.base.timer import Timer
 from module.config.config import Config
@@ -48,6 +49,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         self.device = device
 
         self.interval_timer = {}  # 这个是用来记录每个匹配的运行间隔的,用于控制运行频率
+        self.animates = {}  # 保存缓存
         self.start_time = datetime.now()  # 启动的时间
         self.check_costume(self.config.global_game.costume_config)
         self.friend_timer = None  # 这个是用来记录勾协的时间的
@@ -284,6 +286,39 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 logger.warning(f'Wait_until_stable({target}) timeout')
                 break
 
+    def wait_animate_stable(self, rule: RuleAnimate, interval: float = None, timeout: float = None):
+        """
+        不同与上面的wait_until_stable,这个将会匹配连续的两帧图片的特定区域
+        @param rule:
+        @param interval:
+        @param timeout:
+        @return:
+        """
+        if not isinstance(rule, RuleAnimate):
+            rule = RuleAnimate(rule)
+        timeout_timer = Timer(timeout).start() if timeout is not None else None
+        while 1:
+            self.screenshot()
+
+            if interval:
+                if rule.name in self.interval_timer:
+                    if self.interval_timer[rule.name].limit != interval:
+                        self.interval_timer[rule.name] = Timer(interval)
+                else:
+                    self.interval_timer[rule.name] = Timer(interval)
+                if not self.interval_timer[rule.name].reached():
+                    return False
+
+            stable = rule.stable(self.device.image)
+            if stable:
+                if interval:
+                    self.interval_timer[rule.name].reset()
+                break
+
+            if timeout_timer and timeout_timer.reached():
+                logger.info(f'Wait_animate_stable({rule}) timeout')
+                break
+
     def swipe(self, swipe: RuleSwipe, interval: float = None) -> None:
         """
 
@@ -558,3 +593,5 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 break
             elif self.appear_then_click(click, interval=interval):
                 continue
+
+