Jelajahi Sumber

fix(RichMan): Improve shrine shop purchase detection and retry handling

neptine 1 bulan lalu
induk
melakukan
c426b982c0

+ 3 - 3
tasks/RichMan/assets.py

@@ -343,11 +343,11 @@ class RichManAssets:
 	# 下期预览 
 	I_S_NEXT_PERIOD = RuleImage(roi_front=(1083,574,90,86), roi_back=(1083,574,90,86), threshold=0.8, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_next_period.png")
 	# description 
-	I_S_WHITE_FIVE = RuleImage(roi_front=(769,143,77,85), roi_back=(769,143,77,85), threshold=0.85, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_white_five.png")
+	I_S_WHITE_FIVE = RuleImage(roi_front=(770,147,77,85), roi_back=(756,121,321,169), threshold=0.9, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_white_five.png")
 	# description 
-	I_S_WHITE_FOUR = RuleImage(roi_front=(951,144,73,82), roi_back=(951,144,73,82), threshold=0.85, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_white_four.png")
+	I_S_WHITE_FOUR = RuleImage(roi_front=(953,149,73,82), roi_back=(209,109,847,422), threshold=0.9, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_white_four.png")
 	# 黑蛋 
-	I_S_BLACK = RuleImage(roi_front=(588,143,78,83), roi_back=(588,143,78,83), threshold=0.9, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_black.png")
+	I_S_BLACK = RuleImage(roi_front=(772,144,78,83), roi_back=(565,109,310,182), threshold=0.9, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_black.png")
 	# description 
 	I_S_BUY_BLACK = RuleImage(roi_front=(777,508,173,60), roi_back=(777,508,173,60), threshold=0.8, method="Template matching", file="./tasks/RichMan/shrine/shrine_s_buy_black.png")
 	# description 

+ 2 - 2
tasks/RichMan/script_task.py

@@ -41,8 +41,8 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    # t.run()
-    t.execute_mall()
+    t.run()
+    # t.execute_mall()
 
 
 

+ 56 - 27
tasks/RichMan/shrine.py

@@ -4,6 +4,7 @@
 import time
 
 from module.logger import logger
+from module.base.timer import Timer
 
 from tasks.GameUi.page import page_main, page_summon
 from tasks.GameUi.game_ui import GameUi
@@ -72,15 +73,31 @@ class Shrine(GameUi, RichManAssets):
         if not self.appear(self.I_S_BLACK):
             logger.info('Already bought black daruma')
             return
-        self.ui_click(self.I_S_BLACK, self.I_S_CHECK_BLACK)
-        self.screenshot()
-        if not self.appear(self.I_S_BUY_BLACK, threshold=0.6):
-            logger.info('Already bought black daruma')
-            self.ui_click_until_disappear(self.I_UI_BACK_RED)
-            time.sleep(0.5)
-            return
-        self.ui_click(self.I_S_BUY_BLACK, self.I_S_CONFIRM_BLACK)
-        self.ui_get_reward(self.I_S_CONFIRM_BLACK)
+        # self.ui_click(self.I_S_BLACK, self.I_S_BUY_BLACK, interval=2, timeout=5)
+        # self.screenshot()
+        # if not self.appear(self.I_S_BUY_BLACK, threshold=0.6):
+        #     logger.info('Already bought black daruma')
+        #     self.ui_click_until_disappear(self.I_UI_BACK_RED)
+        #     time.sleep(0.5)
+        #     return
+        # self.ui_click(self.I_S_BUY_BLACK, self.I_S_CONFIRM_BLACK)
+        # self.ui_get_reward(self.I_S_CONFIRM_BLACK)
+
+        timer = Timer(10).start()
+        while 1:
+            self.screenshot()
+            if timer.reached():
+                logger.warning('Reached time')
+                break
+            if self.ui_reward_appear_click():
+                logger.info('Reward appear')
+                break
+            if self.appear_then_click(self.I_S_CONFIRM_BLACK, interval=1):
+                continue
+            if self.appear_then_click(self.I_S_BUY_BLACK, interval=1):
+                continue
+            if self.appear_then_click(self.I_S_BLACK, interval=2.5):
+                continue
         self.ui_click_until_disappear(self.I_UI_BACK_RED)
         time.sleep(1)
 
@@ -92,15 +109,21 @@ class Shrine(GameUi, RichManAssets):
             return
         if not self.shrine_check_money(1200):
             return
-        self.ui_click(self.I_S_WHITE_FIVE, self.I_S_CHECK_WHITE_FIVE)
-        self.screenshot()
-        if not self.appear(self.I_S_BUY_WHITE_FIVE, threshold=0.9):
-            logger.info('Already bought white five')
-            self.ui_click_until_disappear(self.I_UI_BACK_RED)
-            time.sleep(1)
-            return
-        self.ui_click(self.I_S_BUY_WHITE_FIVE, self.I_S_CONFIRM_WHITE_FIVE)
-        self.ui_get_reward(self.I_S_CONFIRM_WHITE_FIVE)
+        timer = Timer(10).start()
+        while 1:
+            self.screenshot()
+            if timer.reached():
+                logger.warning('Reached time')
+                break
+            if self.ui_reward_appear_click():
+                logger.info('Reward appear')
+                break
+            if self.appear_then_click(self.I_S_CONFIRM_WHITE_FIVE, interval=1):
+                continue
+            if self.appear_then_click(self.I_S_BUY_WHITE_FIVE, interval=1):
+                continue
+            if self.appear_then_click(self.I_S_WHITE_FIVE, interval=2.5):
+                continue
         self.ui_click_until_disappear(self.I_UI_BACK_RED)
         time.sleep(1)
 
@@ -112,15 +135,21 @@ class Shrine(GameUi, RichManAssets):
             return
         if not self.shrine_check_money(400):
             return
-        self.ui_click(self.I_S_WHITE_FOUR, self.I_S_CHECK_WHITE_FOUR)
-        self.screenshot()
-        if not self.appear(self.I_S_BUY_WHITE_FOUR, threshold=0.9):
-            logger.info('Already bought white four')
-            self.ui_click_until_disappear(self.I_UI_BACK_RED)
-            time.sleep(1)
-            return
-        self.ui_click(self.I_S_BUY_WHITE_FOUR, self.I_S_CONFIRM_WHITE_FOUR)
-        self.ui_get_reward(self.I_S_CONFIRM_WHITE_FOUR)
+        timer = Timer(10).start()
+        while 1:
+            self.screenshot()
+            if timer.reached():
+                logger.warning('Reached time')
+                break
+            if self.ui_reward_appear_click():
+                logger.info('Reward appear')
+                break
+            if self.appear_then_click(self.I_S_CONFIRM_WHITE_FOUR, interval=1):
+                continue
+            if self.appear_then_click(self.I_S_BUY_WHITE_FOUR, interval=1):
+                continue
+            if self.appear_then_click(self.I_S_WHITE_FOUR, interval=2.5):
+                continue
         self.ui_click_until_disappear(self.I_UI_BACK_RED)
         time.sleep(1)
 

+ 8 - 8
tasks/RichMan/shrine/image.json

@@ -11,26 +11,26 @@
   {
     "itemName": "s_white_five",
     "imageName": "shrine_s_white_five.png",
-    "roiFront": "769,143,77,85",
-    "roiBack": "769,143,77,85",
+    "roiFront": "770,147,77,85",
+    "roiBack": "756,121,321,169",
     "method": "Template matching",
-    "threshold": 0.85,
+    "threshold": 0.9,
     "description": "description"
   },
   {
     "itemName": "s_white_four",
     "imageName": "shrine_s_white_four.png",
-    "roiFront": "951,144,73,82",
-    "roiBack": "951,144,73,82",
+    "roiFront": "953,149,73,82",
+    "roiBack": "209,109,847,422",
     "method": "Template matching",
-    "threshold": 0.85,
+    "threshold": 0.9,
     "description": "description"
   },
   {
     "itemName": "s_black",
     "imageName": "shrine_s_black.png",
-    "roiFront": "588,143,78,83",
-    "roiBack": "588,143,78,83",
+    "roiFront": "772,144,78,83",
+    "roiBack": "565,109,310,182",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "黑蛋"