runhey 3 лет назад
Родитель
Сommit
a0dbeaee84

+ 1 - 1
module/config/config.py

@@ -244,7 +244,7 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
             return False
 
     def task_delay(self, task: str, start_time: datetime = None,
-                   success: bool=None, server: bool=True, target: timedelta=None) -> None:
+                   success: bool=None, server: bool=True, target: datetime=None) -> None:
         """
         设置下次运行时间  当然这个也是可以重写的
         :param target: 可以自定义的下次运行时间

+ 6 - 2
tasks/KekkaiUtilize/assets.py

@@ -48,6 +48,8 @@ class KekkaiUtilizeAssets:
 	I_AP_EXTRACT = RuleImage(roi_front=(592,501,100,75), roi_back=(592,501,100,75), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_ap_extract.png")
 	# 提取 
 	I_EXP_EXTRACT = RuleImage(roi_front=(592,448,100,73), roi_back=(592,448,100,73), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_exp_extract.png")
+	# 盒子经验满 
+	I_BOX_EXP_MAX = RuleImage(roi_front=(886,425,61,64), roi_back=(886,425,61,64), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp_max.png")
 
 
 	# Image Rule Assets
@@ -64,9 +66,9 @@ class KekkaiUtilizeAssets:
 	# description 
 	I_U_TAIKO_5 = RuleImage(roi_front=(544,201,59,52), roi_back=(538,179,79,426), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/utilize/utilize_u_taiko_5.png")
 	# description 
-	I_U_TAIKO_6 = RuleImage(roi_front=(544,265,60,45), roi_back=(533,156,87,450), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/utilize/utilize_u_taiko_6.png")
+	I_U_TAIKO_6 = RuleImage(roi_front=(545,313,60,45), roi_back=(533,156,87,450), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/utilize/utilize_u_taiko_6.png")
 	# description 
-	I_U_FISH_3 = RuleImage(roi_front=(551,325,41,33), roi_back=(543,178,69,412), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/utilize/utilize_u_fish_3.png")
+	I_U_FISH_3 = RuleImage(roi_front=(552,216,41,33), roi_back=(543,178,69,412), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/utilize/utilize_u_fish_3.png")
 	# description 
 	I_U_FISH_4 = RuleImage(roi_front=(549,310,51,50), roi_back=(542,177,73,401), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/utilize/utilize_u_fish_4.png")
 	# description 
@@ -107,6 +109,8 @@ class KekkaiUtilizeAssets:
 	# Ocr Rule Assets
 	# 这个寄养的剩余时间 
 	O_UTILIZE_RES_TIME = RuleOcr(roi=(1140,117,100,30), area=(1140,117,100,30), mode="Duration", method="Default", keyword="", name="utilize_res_time")
+	# 今日以领取经验 
+	O_BOX_EXP = RuleOcr(roi=(654,538,179,39), area=(654,538,179,39), mode="DigitCounter", method="Default", keyword="", name="box_exp")
 
 
 	# Swipe Rule Assets

+ 9 - 0
tasks/KekkaiUtilize/realm/image.json

@@ -88,5 +88,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "提取"
+  },
+  {
+    "itemName": "box_exp_max",
+    "imageName": "realm_box_exp_max.png",
+    "roiFront": "886,425,61,64",
+    "roiBack": "886,425,61,64",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "盒子经验满"
   }
 ]

BIN
tasks/KekkaiUtilize/realm/realm_box_exp_max.png


+ 18 - 8
tasks/KekkaiUtilize/script_task.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 import time
 from cached_property import cached_property
-from datetime import timedelta
+from datetime import timedelta, datetime
 
 from module.base.timer import Timer
 from module.atom.image_grid import ImageGrid
@@ -32,7 +32,7 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
         # 进入寮结界
         self.goto_realm()
         # 顺带收体力盒子或者是经验盒子
-        time.sleep(0.5)
+        time.sleep(1)
         self.check_box_ap_or_exp(con.box_ap_enable, con.box_exp_enable, con.box_exp_waste)
 
         # 收菜看看
@@ -43,12 +43,13 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
         if not self.appear(self.I_UTILIZE_ADD):
             remaining_time = self.O_UTILIZE_RES_TIME.ocr(self.device.image)
             if not isinstance(remaining_time, timedelta):
-                logger.warning('ocr remaining time error')
+                logger.warning('Ocr remaining time error')
             logger.info(f'Utilize remaining time: {remaining_time}')
             # 执行失败,推出下一次执行为失败的时间间隔
             logger.info('Utilize failed, exit')
             self.back_guild()
-            self.set_next_run(task='KekkaiUtilize', success=False, finish=True)
+            next_time = datetime.now() + remaining_time
+            self.set_next_run(task='KekkaiUtilize', success=False, finish=True, target=next_time)
             raise TaskEnd
         if not self.grown_goto_utilize():
             logger.info('Utilize failed, exit')
@@ -174,15 +175,16 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             while 1:
                 self.screenshot()
 
-                if self.appear_then_click(self.I_BOX_EXP, interval=1):
+                if self.appear_then_click(self.I_BOX_EXP, threshold=0.6, interval=1):
                     continue
                 if self.appear_then_click(self.I_EXP_EXTRACT, interval=1):
                     continue
 
                 # 如果出现结界皮肤, 表示收取好了
-                if self.appear(self.I_REALM_SHIN) and not self.appear(self.I_BOX_EXP):
+                if self.appear(self.I_REALM_SHIN) and not self.appear(self.I_BOX_EXP, threshold=0.6):
                     break
 
+
                 # 如果出现收取确认,表明进入到了有满级的
                 if self.appear(self.I_UI_CONFIRM):
                     self.screenshot()
@@ -201,6 +203,12 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
                             continue
                     break
 
+                # 如果达到今日领取的最大,就不领取了
+                cur, res, totol = self.O_BOX_EXP.ocr(self.device.image)
+                if cur == totol and cur + res == totol:
+                    logger.info('Exp box reach max do not collect')
+                    break
+
                 if time_exp.reached():
                     logger.warning('Extract exp box timeout')
                     break
@@ -208,7 +216,7 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
 
         self.screenshot()
         box_ap = self.appear(self.I_BOX_AP)
-        box_exp = self.appear(self.I_BOX_EXP, threshold=0.6)
+        box_exp = self.appear(self.I_BOX_EXP, threshold=0.6) or self.appear(self.I_BOX_EXP_MAX, threshold=0.6)
         if ap_enable:
             _check_ap_box(box_ap)
         if exp_enable:
@@ -450,6 +458,8 @@ if __name__ == "__main__":
     t = ScriptTask(c, d)
 
     t.run()
-
+    # t.screenshot()
+    # print(t.appear(t.I_BOX_EXP, threshold=0.6))
+    # print(t.appear(t.I_BOX_EXP_MAX, threshold=0.6))
 
 

+ 2 - 2
tasks/KekkaiUtilize/utilize/image.json

@@ -56,7 +56,7 @@
   {
     "itemName": "u_taiko_6",
     "imageName": "utilize_u_taiko_6.png",
-    "roiFront": "544,265,60,45",
+    "roiFront": "545,313,60,45",
     "roiBack": "533,156,87,450",
     "method": "Template matching",
     "threshold": 0.8,
@@ -65,7 +65,7 @@
   {
     "itemName": "u_fish_3",
     "imageName": "utilize_u_fish_3.png",
-    "roiFront": "551,325,41,33",
+    "roiFront": "552,216,41,33",
     "roiBack": "543,178,69,412",
     "method": "Template matching",
     "threshold": 0.8,

+ 9 - 0
tasks/KekkaiUtilize/utilize/ocr.json

@@ -7,5 +7,14 @@
     "method": "Default",
     "keyword": "",
     "description": "这个寄养的剩余时间"
+  },
+  {
+    "itemName": "box_exp",
+    "roiFront": "654,538,179,39",
+    "roiBack": "654,538,179,39",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "今日以领取经验"
   }
 ]

BIN
tasks/KekkaiUtilize/utilize/utilize_u_fish_3.png


BIN
tasks/KekkaiUtilize/utilize/utilize_u_moon_6.png


BIN
tasks/KekkaiUtilize/utilize/utilize_u_taiko_6.png


+ 1 - 1
tasks/base_task.py

@@ -413,7 +413,7 @@ class BaseTask(GlobalGameAssets):
                 sleep(1)  # 等待滑动完成, 还没想好如何优化
 
     def set_next_run(self, task: str, finish: bool = False,
-                     success: bool=None, server: bool=True, target: timedelta=None) -> None:
+                     success: bool=None, server: bool=True, target: datetime=None) -> None:
         """
         设置下次运行时间  当然这个也是可以重写的
         :param target: 可以自定义的下次运行时间