Pārlūkot izejas kodu

perf(KittyShop): Add feature

huangrunheng 1 gadu atpakaļ
vecāks
revīzija
07840f528c

+ 2 - 0
tasks/KittyShop/assets.py

@@ -62,6 +62,8 @@ class KittyShopAssets:
 	I_MAIN_BUSY_4 = RuleImage(roi_front=(781,634,64,24), roi_back=(731,572,170,142), threshold=0.8, method="Template matching", file="./tasks/KittyShop/ks/ks_main_busy_4.png")
 	# description 
 	I_MAIN_BUSY_5 = RuleImage(roi_front=(961,626,64,24), roi_back=(900,571,165,136), threshold=0.8, method="Template matching", file="./tasks/KittyShop/ks/ks_main_busy_5.png")
+	# 结算 
+	I_MAIN_FINSH = RuleImage(roi_front=(764,16,52,42), roi_back=(740,1,100,100), threshold=0.8, method="Template matching", file="./tasks/KittyShop/ks/ks_main_finsh.png")
 
 
 	# Swipe Rule Assets

+ 1 - 0
tasks/KittyShop/config.py

@@ -8,6 +8,7 @@ from tasks.Component.config_base import ConfigBase
 
 class KittyShopConfig(BaseModel):
     kitty_attempts: int = Field(default=1, description='kitty_attempts_help')
+    kitty_quit_when_finished: bool = Field(default=False, description='kitty_quit_when_finished_help')
 
 
 class KittyShop(ConfigBase):

+ 9 - 0
tasks/KittyShop/ks/image.json

@@ -133,5 +133,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "main_finsh",
+    "imageName": "ks_main_finsh.png",
+    "roiFront": "764,16,52,42",
+    "roiBack": "740,1,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "结算"
   }
 ]

BIN
tasks/KittyShop/ks/ks_main_finsh.png


+ 46 - 25
tasks/KittyShop/script_task.py

@@ -13,6 +13,9 @@ from tasks.GameUi.page import page_main
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.KittyShop.assets import KittyShopAssets
 
+class SelectFailed(Exception):
+    pass
+
 class ScriptTask(GameUi, ActivityShikigamiAssets, KittyShopAssets):
 
     MAIN_BUSY: list = [KittyShopAssets.I_MAIN_BUSY_1,
@@ -37,37 +40,20 @@ class ScriptTask(GameUi, ActivityShikigamiAssets, KittyShopAssets):
         for _ in range(max(attempts, 0)):
             self._run()
 
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_CHECK_MAIN, interval=2.4)
         self.set_next_run(task="KittyShop", success=True)
         raise TaskEnd
 
     def _run(self):
         logger.hr('Kitty Shop', level=1)
-        self.ui_click(self.I_START_FARMING, stop=self.I_START_ENSURE)
-
-        index_timer = Timer(1).start()
-        index_cnt = 0
-        while 1:
-            self.screenshot()
-            if index_timer.reached():
-                index_cnt += 1
-                index_timer.reset()
-
-            if not self.appear(self.I_UNSELECTED):
+        for trial in range(3):
+            try:
+                self._select_kitty()
                 break
-            match index_cnt:
-                case 0:
-                    self.click(self.C_SELECT_1, interval=1)
-                case 1:
-                    self.click(self.C_SELECT_2, interval=1)
-                case 2:
-                    self.click(self.C_SELECT_3, interval=1)
-                case 3 | 7 | 9 | 11 | 13 | 15 | 17:
-                    self.click(self.C_SELECT_4, interval=1)
-                case 5 | 10 | 14:
-                    self.swipe(self.S_SELECTION, interval=1.5)
-        logger.info('Select all kitties done')
-        import time
-        time.sleep(5)
+            except SelectFailed:
+                self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_START_FARMING, interval=2.2)
+                logger.error('Select kitty failed')
+
         self.ui_click(self.I_START_ENSURE, stop=self.I_MAIN_FLAG)
         logger.info('Start farming')
         while 1:
@@ -75,6 +61,13 @@ class ScriptTask(GameUi, ActivityShikigamiAssets, KittyShopAssets):
             self.screenshot()
             if self.appear(self.I_MAIN_SHARE):
                 break
+            if self.config.model.kitty_shop.kitty_shop_config.kitty_quit_when_finished:
+                if self.appear_then_click(self.I_UI_CONFIRM, interval=0.7):
+                    continue
+                if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=0.7):
+                    continue
+                if self.appear_then_click(self.I_MAIN_FINSH, interval=1):
+                    continue
 
             if not self.appear(self.I_MAIN_FLAG):
                 continue
@@ -93,6 +86,34 @@ class ScriptTask(GameUi, ActivityShikigamiAssets, KittyShopAssets):
                 break
             self.click(self.I_MAIN_FLAG1, interval=2)
 
+    def _select_kitty(self):
+        self.ui_click(self.I_START_FARMING, stop=self.I_START_ENSURE)
+
+        index_timer = Timer(1.2).start()
+        index_cnt = 0
+        while 1:
+            self.screenshot()
+            if index_timer.reached():
+                index_cnt += 1
+                index_timer.reset()
+
+            if not self.appear(self.I_UNSELECTED):
+                break
+            match index_cnt:
+                case 0:
+                    self.click(self.C_SELECT_1, interval=1.2)
+                case 1:
+                    self.click(self.C_SELECT_2, interval=1.2)
+                case 2:
+                    self.click(self.C_SELECT_3, interval=1.2)
+                case 3 | 7 | 11:
+                    self.click(self.C_SELECT_4, interval=1.2)
+                case 5 | 10:
+                    self.swipe(self.S_SELECTION, interval=1.5)
+                case 12:
+                    raise SelectFailed('Select failed')
+        logger.info('Select all kitties done')
+
     def _main_select_kitty(self):
         for busy in self.MAIN_BUSY:
             if self.appear(busy):