Przeglądaj źródła

fix(RichMan): Set 10 seconds timeout to exit due to lack of gold purchases

ryland 2 lat temu
rodzic
commit
62f5385daa

+ 0 - 13
tasks/RichMan/assets.py

@@ -337,19 +337,6 @@ class RichManAssets:
 	I_CENTER2 = RuleImage(roi_front=(76,590,79,75), roi_back=(65,575,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/shrine/shrine_center2.png")
 
 
-	# Ocr Rule Assets
-	# Ocr-description 
-	O_S_TOTAL = RuleOcr(roi=(1134,11,112,36), area=(1134,11,112,36), mode="Digit", method="Default", keyword="", name="s_total")
-	# 已兑换 
-	O_S_BLACK = RuleOcr(roi=(582,179,84,48), area=(582,179,84,48), mode="Single", method="Default", keyword="", name="s_black")
-	# Ocr-description 
-	O_S_WHITE_FIVE = RuleOcr(roi=(774,174,69,44), area=(774,174,69,44), mode="Single", method="Default", keyword="", name="s_white_five")
-	# Ocr-description 
-	O_S_WHITE_FOUR = RuleOcr(roi=(952,168,74,60), area=(952,168,74,60), mode="Single", method="Default", keyword="", name="s_white_four")
-	# 买两个四星蛋 
-	O_S_FOUR_NUMBER = RuleOcr(roi=(581,414,46,45), area=(581,414,46,45), mode="Digit", method="Default", keyword="2", name="s_four_number")
-
-
 	# Image Rule Assets
 	# 千物宝库 
 	I_TT_ENTER = RuleImage(roi_front=(1140,585,73,76), roi_back=(1140,585,73,76), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_enter.png")

+ 0 - 1
tasks/RichMan/shrine.py

@@ -130,7 +130,6 @@ class Shrine(GameUi, RichManAssets):
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    from memory_profiler import profile
 
     c = Config('oas1')
     d = Device(c)

+ 2 - 12
tasks/RichMan/shrine/ocr.json

@@ -1,47 +1,37 @@
 [
   {
     "itemName": "s_total",
-    "roiFront": "1134,11,112,36",
-    "roiBack": "1134,11,112,36",
-    "mode": "Digit",
+    "roiFront": "1164,11,74,36",
+    "roiBack": "1164,11,74,36",
     "method": "Default",
-    "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_black",
     "roiFront": "582,179,84,48",
     "roiBack": "582,179,84,48",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "",
     "description": "已兑换"
   },
   {
     "itemName": "s_white_five",
     "roiFront": "774,174,69,44",
     "roiBack": "774,174,69,44",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_white_four",
     "roiFront": "952,168,74,60",
     "roiBack": "952,168,74,60",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "",
     "description": "Ocr-description"
   },
   {
     "itemName": "s_four_number",
     "roiFront": "581,414,46,45",
     "roiBack": "581,414,46,45",
-    "mode": "Digit",
     "method": "Default",
-    "keyword": "2",
     "description": "买两个四星蛋"
   }
 ]

+ 6 - 0
tasks/base_task.py

@@ -479,6 +479,8 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param click_image:
         :return:
         """
+        _timer = Timer(10)
+        _timer.start()
         while 1:
             self.screenshot()
 
@@ -495,6 +497,9 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                     if self.ui_reward_appear_click():
                         continue
                 break
+            if _timer.reached():
+                logger.warning('Get reward timeout')
+                break
 
             if isinstance(click_image, RuleImage):
                 if self.appear_then_click(click_image, interval=click_interval):
@@ -506,6 +511,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 if self.click(click_image, interval=click_interval):
                     continue
 
+
         return True
 
     def ui_click(self, click, stop, interval=1):