AARONkjLee 9 месяцев назад
Родитель
Сommit
9699c0d467
30 измененных файлов с 75 добавлено и 387 удалено
  1. 0 7
      assets/i18n/zh-CN.json
  2. 4 74
      module/atom/image.py
  3. 1 1
      tasks/Component/Costume/config.py
  4. 2 0
      tasks/Component/Costume/costume_base.py
  5. 7 3
      tasks/Component/CostumeCarpBanner/assets.py
  6. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_card_exp_1.png
  7. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png
  8. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png
  9. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png
  10. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_utilize_exp_1.png
  11. 27 9
      tasks/Component/CostumeCarpBanner/cb1/image.json
  12. 3 3
      tasks/KekkaiActivation/script_task.py
  13. 9 9
      tasks/KekkaiUtilize/assets.py
  14. 12 12
      tasks/KekkaiUtilize/realm/image.json
  15. BIN
      tasks/KekkaiUtilize/realm/realm_shi_card.png
  16. BIN
      tasks/KekkaiUtilize/realm/realm_shi_defense.png
  17. 0 67
      tasks/KekkaiUtilize/realm_test.py
  18. 5 5
      tasks/KekkaiUtilize/script_task.py
  19. 0 19
      tasks/Restart/assets.py
  20. 1 3
      tasks/Restart/config.py
  21. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_complete_tasks.png
  22. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_confirm.png
  23. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_daily.png
  24. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_no_tasks.png
  25. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_note.png
  26. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_page.png
  27. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_skip.png
  28. BIN
      tasks/Restart/courtyard_affairs/courtyard_affairs_success_claimed.png
  29. 0 74
      tasks/Restart/courtyard_affairs/image.json
  30. 4 101
      tasks/base_task.py

+ 0 - 7
assets/i18n/zh-CN.json

@@ -7,13 +7,6 @@
   "skill_mode": "技能本模式",
   "skill_mode": "技能本模式",
   "costume_shikigami_6": "月下火舞",
   "costume_shikigami_6": "月下火舞",
   "costume_shikigami_7": "赤溟幽界",
   "costume_shikigami_7": "赤溟幽界",
-  "costume_carpbanner_type": "鲤鱼旗皮肤",
-  "costume_carpbanner_default": "吉鲤游风",
-  "costume_carpbanner_1": "无垢莲台",
-  "costume_carpbanner_type_help": "多数结界通用",
-  "costume_battle_10": "流焰蝶舞",
-  "costume_battle_11": "辰烁奇夜",
-  "enable_courtyard_affairs": "庭院事务",
   "AutoCheckinBigGod": "大神签到",
   "AutoCheckinBigGod": "大神签到",
   "auto_checkin_big_god": "大神签到",
   "auto_checkin_big_god": "大神签到",
   "checkin_config": "签到配置",
   "checkin_config": "签到配置",

+ 4 - 74
module/atom/image.py

@@ -154,8 +154,8 @@ class RuleImage(RuleImageMallResourceMixin):
         mat = self.image
         mat = self.image
 
 
         if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
         if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
-            logger.error(f"Template image is invalid: {mat.shape}")
-            return False  # 模板无效,匹配失败
+            logger.error(f"Template image is invalid: {mat.shape}") #检测模板尺寸,不合法则不进行匹配,避免两次截图画面完全相同造成模板不合法
+            return True  # 如果模板图像无效,直接返回 True
 
 
         res = cv2.matchTemplate(source, mat, cv2.TM_CCOEFF_NORMED)
         res = cv2.matchTemplate(source, mat, cv2.TM_CCOEFF_NORMED)
         min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)  # 最小匹配度,最大匹配度,最小匹配度的坐标,最大匹配度的坐标
         min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)  # 最小匹配度,最大匹配度,最小匹配度的坐标,最大匹配度的坐标
@@ -169,77 +169,6 @@ class RuleImage(RuleImageMallResourceMixin):
         else:
         else:
             return False
             return False
 
 
-    def match_multi_scale(self, image: np.array, threshold: float = None,
-                          scales: list = None, scale_range: tuple = None) -> bool:
-        """
-        多尺度模板匹配,自动尝试多个缩放比例以适应图片大小的变化
-        :param image: 原始截图
-        :param threshold: 匹配阈值
-        :param scales: 缩放比例列表
-        :param scale_range: 缩放范围 (start, end, step),例如 (0.8, 1.2, 0.1),step 默认为 0.1
-        :return: 匹配是否成功
-        """
-        if threshold is None:
-            threshold = self.threshold
-
-        # 如果指定了 scale_range,自动生成 scales 列表
-        if scale_range is not None:
-            start, end = scale_range[:2]
-            step = scale_range[2] if len(scale_range) > 2 else 0.1
-            scales = sorted(set(round(x, 1) for x in np.arange(start, end + step, step)))
-
-        if scales is None:
-            scales = [0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2]
-        else:
-            scales = sorted(set(round(x, 1) for x in scales))
-
-        source = self.corp(image)
-        mat = self.image
-
-        if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
-            logger.error(f"Template image is invalid: {mat.shape}")
-            return False
-
-        # 预计算模板尺寸
-        mat_h, mat_w = mat.shape[:2]
-        source_h, source_w = source.shape[:2]
-
-        best_score = 0
-        best_loc = None
-        best_scale = 1.0
-
-        for scale in scales:
-            scaled_w = int(mat_w * scale)
-            scaled_h = int(mat_h * scale)
-
-            # 跳过无效缩放
-            if scaled_w < 10 or scaled_h < 10:
-                continue
-
-            try:
-                scaled_mat = cv2.resize(mat, (scaled_w, scaled_h))
-                res = cv2.matchTemplate(source, scaled_mat, cv2.TM_CCOEFF_NORMED)
-                _, max_val, _, max_loc = cv2.minMaxLoc(res)
-
-                if max_val > best_score:
-                    best_score = max_val
-                    best_loc = max_loc
-                    best_scale = scale
-            except Exception as e:
-                continue
-
-        if self.debug_mode:
-            logger.attr(self.name, f'best scale: {best_scale:.2f}, best score: {best_score:.5f}')
-
-        if best_score > threshold and best_loc is not None:
-            self.roi_front[0] = best_loc[0] + self.roi_back[0]
-            self.roi_front[1] = best_loc[1] + self.roi_back[1]
-            self.roi_front[2] = scaled_w
-            self.roi_front[3] = scaled_h
-            return True
-        else:
-            return False
-
     def match_all(self, image: np.array, threshold: float = None, roi: list = None) -> list[tuple]:
     def match_all(self, image: np.array, threshold: float = None, roi: list = None) -> list[tuple]:
         """
         """
         区别于match,这个是返回所有的匹配结果
         区别于match,这个是返回所有的匹配结果
@@ -428,4 +357,5 @@ if __name__ == "__main__":
 
 
     detect_image(IMAGE_FILE, jade)
     detect_image(IMAGE_FILE, jade)
     detect_image(IMAGE_FILE, sign)
     detect_image(IMAGE_FILE, sign)
-    print(jade.roi_front)
+    print(jade.roi_front)
+

+ 1 - 1
tasks/Component/Costume/config.py

@@ -75,7 +75,7 @@ class CostumeConfig(BaseModel):
     # 皮肤配置
     # 皮肤配置
     costume_main_type: MainType = Field(default=MainType.COSTUME_MAIN, description='costume_main_type_help')
     costume_main_type: MainType = Field(default=MainType.COSTUME_MAIN, description='costume_main_type_help')
     costume_realm_type: RealmType = Field(default=RealmType.COSTUME_REALM_DEFAULT, description='costume_realm_type_help')
     costume_realm_type: RealmType = Field(default=RealmType.COSTUME_REALM_DEFAULT, description='costume_realm_type_help')
-    costume_carpbanner_type: CarpBannerType = Field(default=CarpBannerType.COSTUME_CARPBANNER_DEFAULT,description='costume_carpbanner_type_help')
+    costume_carpbanner_type: CarpBannerType = Field(default=CarpBannerType.COSTUME_CARPBANNER_DEFAULT,description='costume_realm_type_help')
     costume_theme_type: ThemeType = Field(default=ThemeType.COSTUME_THEME_DEFAULT, description='costume_theme_type_help')
     costume_theme_type: ThemeType = Field(default=ThemeType.COSTUME_THEME_DEFAULT, description='costume_theme_type_help')
     costume_shikigami_type: ShikigamiType = Field(default=ShikigamiType.COSTUME_SHIKIGAMI_DEFAULT, description='costume_shikigami_type_help')
     costume_shikigami_type: ShikigamiType = Field(default=ShikigamiType.COSTUME_SHIKIGAMI_DEFAULT, description='costume_shikigami_type_help')
     costume_sign_type: SignType = Field(default=SignType.COSTUME_SIGN_DEFAULT, description='costume_sign_type_help')
     costume_sign_type: SignType = Field(default=SignType.COSTUME_SIGN_DEFAULT, description='costume_sign_type_help')

+ 2 - 0
tasks/Component/Costume/costume_base.py

@@ -48,6 +48,8 @@ carpbanner_costume_model = {
         'I_SHI_CARD': f'I_SHI_CARD_{i}',
         'I_SHI_CARD': f'I_SHI_CARD_{i}',
         'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
         'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
         'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
         'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
+        'I_CARD_EXP': f'I_CARD_EXP_{i}',
+        'I_UTILIZE_EXP': f'I_UTILIZE_EXP_{i}',
     } for i in range(1, 2)
     } for i in range(1, 2)
 }
 }
 
 

+ 7 - 3
tasks/Component/CostumeCarpBanner/assets.py

@@ -12,10 +12,14 @@ class CostumeCarpBannerAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 育成 
 	# 育成 
-	I_SHI_GROWN_1 = RuleImage(roi_front=(572,272,21,33), roi_back=(530,220,202,267), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png")
+	I_SHI_GROWN_1 = RuleImage(roi_front=(602,339,26,37), roi_back=(524,269,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png")
 	# 结界卡 
 	# 结界卡 
-	I_SHI_CARD_1 = RuleImage(roi_front=(911,262,20,33), roi_back=(823,210,252,297), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png")
+	I_SHI_CARD_1 = RuleImage(roi_front=(887,335,15,35), roi_back=(854,306,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png")
 	# 防守 
 	# 防守 
-	I_SHI_DEFENSE_1 = RuleImage(roi_front=(216,258,22,33), roi_back=(178,209,261,274), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png")
+	I_SHI_DEFENSE_1 = RuleImage(roi_front=(269,335,24,46), roi_back=(200,277,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_1 = RuleImage(roi_front=(875,181,57,54), roi_back=(803,111,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_card_exp_1.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_1 = RuleImage(roi_front=(589,187,58,43), roi_back=(539,144,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_utilize_exp_1.png")
 
 
 
 

BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_card_exp_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_utilize_exp_1.png


+ 27 - 9
tasks/Component/CostumeCarpBanner/cb1/image.json

@@ -2,28 +2,46 @@
   {
   {
     "itemName": "shi_grown_1",
     "itemName": "shi_grown_1",
     "imageName": "cb1_shi_grown_1.png",
     "imageName": "cb1_shi_grown_1.png",
-    "roiFront": "572,272,21,33",
-    "roiBack": "530,220,202,267",
+    "roiFront": "602,339,26,37",
+    "roiBack": "524,269,181,198",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.5,
+    "threshold": 0.6,
     "description": "育成"
     "description": "育成"
   },
   },
   {
   {
     "itemName": "shi_card_1",
     "itemName": "shi_card_1",
     "imageName": "cb1_shi_card_1.png",
     "imageName": "cb1_shi_card_1.png",
-    "roiFront": "911,262,20,33",
-    "roiBack": "823,210,252,297",
+    "roiFront": "887,335,15,35",
+    "roiBack": "854,306,87,120",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.5,
+    "threshold": 0.6,
     "description": "结界卡"
     "description": "结界卡"
   },
   },
   {
   {
     "itemName": "shi_defense_1",
     "itemName": "shi_defense_1",
     "imageName": "cb1_shi_defense_1.png",
     "imageName": "cb1_shi_defense_1.png",
-    "roiFront": "216,258,22,33",
-    "roiBack": "178,209,261,274",
+    "roiFront": "269,335,24,46",
+    "roiBack": "200,277,154,166",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.6,
+    "threshold": 0.8,
     "description": "防守"
     "description": "防守"
+  },
+  {
+    "itemName": "card_exp_1",
+    "imageName": "cb1_card_exp_1.png",
+    "roiFront": "875,181,57,54",
+    "roiBack": "803,111,199,185",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "收取经验(没有满的图)"
+  },
+  {
+    "itemName": "utilize_exp_1",
+    "imageName": "cb1_utilize_exp_1.png",
+    "roiFront": "589,187,58,43",
+    "roiBack": "539,144,156,123",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寄养别人的经验"
   }
   }
 ]
 ]

+ 3 - 3
tasks/KekkaiActivation/script_task.py

@@ -162,7 +162,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
                 break
                 break
             if self.appear(self.I_A_AUTO_INVITE):
             if self.appear(self.I_A_AUTO_INVITE):
                 break
                 break
-            if self.appear_then_click_multi_scale(self.I_SHI_CARD, interval=1):
+            if self.appear_then_click(self.I_SHI_CARD, interval=1):
                 continue
                 continue
         logger.info('Enter card page')
         logger.info('Enter card page')
 
 
@@ -385,7 +385,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
 
 
-            if self.appear(self.I_REALM_SHIN) and self.appear_multi_scale(self.I_SHI_GROWN):
+            if self.appear(self.I_REALM_SHIN) and self.appear(self.I_SHI_GROWN):
                 self.screenshot()
                 self.screenshot()
                 if not self.appear(self.I_REALM_SHIN):
                 if not self.appear(self.I_REALM_SHIN):
                     continue
                     continue
@@ -418,4 +418,4 @@ if __name__ == "__main__":
 
 
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
     t.run()
     t.run()
-    # t.run_activation(t.config.kekkai_activation.activation_config)
+    # t.run_activation(t.config.kekkai_activation.activation_config)

+ 9 - 9
tasks/KekkaiUtilize/assets.py

@@ -38,27 +38,27 @@ class KekkaiUtilizeAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 育成 
 	# 育成 
-	I_SHI_GROWN = RuleImage(roi_front=(595,291,35,38), roi_back=(530,220,202,267), threshold=0.6, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_grown.png")
+	I_SHI_GROWN = RuleImage(roi_front=(595,291,35,38), roi_back=(530,254,181,198), threshold=0.6, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_grown.png")
 	# 结界卡 
 	# 结界卡 
-	I_SHI_CARD = RuleImage(roi_front=(891,300,31,55), roi_back=(823,210,252,297), threshold=0.6, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_card.png")
+	I_SHI_CARD = RuleImage(roi_front=(886,290,38,56), roi_back=(870,276,75,86), threshold=0.6, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_card.png")
 	# description 
 	# description 
-	I_SHI_DEFENSE = RuleImage(roi_front=(303,308,34,52), roi_back=(178,209,261,274), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_defense.png")
+	I_SHI_DEFENSE = RuleImage(roi_front=(294,298,49,56), roi_back=(215,207,208,221), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_defense.png")
 	# 收取经验(没有满的图) 
 	# 收取经验(没有满的图) 
-	I_CARD_EXP = RuleImage(roi_front=(889,151,57,54), roi_back=(829,33,231,257), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_card_exp.png")
+	I_CARD_EXP = RuleImage(roi_front=(889,151,57,54), roi_back=(829,107,199,185), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_card_exp.png")
 	# 收取体力(没有满) 
 	# 收取体力(没有满) 
-	I_BOX_AP = RuleImage(roi_front=(815,435,57,51), roi_back=(744,336,395,216), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_ap.png")
+	I_BOX_AP = RuleImage(roi_front=(815,435,57,51), roi_back=(744,336,202,204), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_ap.png")
 	# 收取盒子的经验(没有满) 
 	# 收取盒子的经验(没有满) 
-	I_BOX_EXP = RuleImage(roi_front=(893,440,42,45), roi_back=(792,334,359,232), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp.png")
+	I_BOX_EXP = RuleImage(roi_front=(893,440,42,45), roi_back=(862,396,147,127), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp.png")
 	# 结界皮肤 
 	# 结界皮肤 
-	I_REALM_SHIN = RuleImage(roi_front=(175,460,54,58), roi_back=(22,359,393,328), threshold=0.9, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_realm_shin.png")
+	I_REALM_SHIN = RuleImage(roi_front=(175,460,54,58), roi_back=(22,380,393,308), threshold=0.9, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_realm_shin.png")
 	# 寄养别人的经验 
 	# 寄养别人的经验 
-	I_UTILIZE_EXP = RuleImage(roi_front=(583,144,58,43), roi_back=(513,43,280,309), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_utilize_exp.png")
+	I_UTILIZE_EXP = RuleImage(roi_front=(583,144,58,43), roi_back=(531,112,156,123), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_utilize_exp.png")
 	# 取出 
 	# 取出 
 	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_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_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=(889,430,61,64), roi_back=(796,326,405,330), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp_max.png")
+	I_BOX_EXP_MAX = RuleImage(roi_front=(889,430,61,64), roi_back=(829,372,228,186), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp_max.png")
 	# 种树活动关闭标识 
 	# 种树活动关闭标识 
 	I_PLANT_TREE_CLOSE = RuleImage(roi_front=(777,91,36,34), roi_back=(711,52,169,125), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_plant_tree_close.png")
 	I_PLANT_TREE_CLOSE = RuleImage(roi_front=(777,91,36,34), roi_back=(711,52,169,125), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_plant_tree_close.png")
 
 

+ 12 - 12
tasks/KekkaiUtilize/realm/image.json

@@ -3,7 +3,7 @@
     "itemName": "shi_grown",
     "itemName": "shi_grown",
     "imageName": "realm_shi_grown.png",
     "imageName": "realm_shi_grown.png",
     "roiFront": "595,291,35,38",
     "roiFront": "595,291,35,38",
-    "roiBack": "530,220,202,267",
+    "roiBack": "530,254,181,198",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.6,
     "threshold": 0.6,
     "description": "育成"
     "description": "育成"
@@ -11,8 +11,8 @@
   {
   {
     "itemName": "shi_card",
     "itemName": "shi_card",
     "imageName": "realm_shi_card.png",
     "imageName": "realm_shi_card.png",
-    "roiFront": "891,300,31,55",
-    "roiBack": "823,210,252,297",
+    "roiFront": "886,290,38,56",
+    "roiBack": "870,276,75,86",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.6,
     "threshold": 0.6,
     "description": "结界卡"
     "description": "结界卡"
@@ -20,17 +20,17 @@
   {
   {
     "itemName": "shi_defense",
     "itemName": "shi_defense",
     "imageName": "realm_shi_defense.png",
     "imageName": "realm_shi_defense.png",
-    "roiFront": "303,308,34,52",
-    "roiBack": "178,209,261,274",
+    "roiFront": "294,298,49,56",
+    "roiBack": "215,207,208,221",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.7,
+    "threshold": 0.8,
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "card_exp",
     "itemName": "card_exp",
     "imageName": "realm_card_exp.png",
     "imageName": "realm_card_exp.png",
     "roiFront": "889,151,57,54",
     "roiFront": "889,151,57,54",
-    "roiBack": "829,33,231,257",
+    "roiBack": "829,107,199,185",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "收取经验(没有满的图)"
     "description": "收取经验(没有满的图)"
@@ -39,7 +39,7 @@
     "itemName": "box_ap",
     "itemName": "box_ap",
     "imageName": "realm_box_ap.png",
     "imageName": "realm_box_ap.png",
     "roiFront": "815,435,57,51",
     "roiFront": "815,435,57,51",
-    "roiBack": "744,336,395,216",
+    "roiBack": "744,336,202,204",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "收取体力(没有满)"
     "description": "收取体力(没有满)"
@@ -48,7 +48,7 @@
     "itemName": "box_exp",
     "itemName": "box_exp",
     "imageName": "realm_box_exp.png",
     "imageName": "realm_box_exp.png",
     "roiFront": "893,440,42,45",
     "roiFront": "893,440,42,45",
-    "roiBack": "792,334,359,232",
+    "roiBack": "862,396,147,127",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "收取盒子的经验(没有满)"
     "description": "收取盒子的经验(没有满)"
@@ -57,7 +57,7 @@
     "itemName": "realm_shin",
     "itemName": "realm_shin",
     "imageName": "realm_realm_shin.png",
     "imageName": "realm_realm_shin.png",
     "roiFront": "175,460,54,58",
     "roiFront": "175,460,54,58",
-    "roiBack": "22,359,393,328",
+    "roiBack": "22,380,393,308",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.9,
     "threshold": 0.9,
     "description": "结界皮肤"
     "description": "结界皮肤"
@@ -66,7 +66,7 @@
     "itemName": "utilize_exp",
     "itemName": "utilize_exp",
     "imageName": "realm_utilize_exp.png",
     "imageName": "realm_utilize_exp.png",
     "roiFront": "583,144,58,43",
     "roiFront": "583,144,58,43",
-    "roiBack": "513,43,280,309",
+    "roiBack": "531,112,156,123",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "寄养别人的经验"
     "description": "寄养别人的经验"
@@ -93,7 +93,7 @@
     "itemName": "box_exp_max",
     "itemName": "box_exp_max",
     "imageName": "realm_box_exp_max.png",
     "imageName": "realm_box_exp_max.png",
     "roiFront": "889,430,61,64",
     "roiFront": "889,430,61,64",
-    "roiBack": "796,326,405,330",
+    "roiBack": "829,372,228,186",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "盒子经验满"
     "description": "盒子经验满"

BIN
tasks/KekkaiUtilize/realm/realm_shi_card.png


BIN
tasks/KekkaiUtilize/realm/realm_shi_defense.png


+ 0 - 67
tasks/KekkaiUtilize/realm_test.py

@@ -1,67 +0,0 @@
-# This Python file uses the following encoding: utf-8
-# @author runhey
-# github https://github.com/runhey
-
-
-from module.logger import logger
-from module.base.timer import Timer
-
-from tasks.KekkaiActivation.script_task import ScriptTask as KekkaiActivationScriptTask
-
-class ScriptTask(KekkaiActivationScriptTask):
-
-    def run(self):
-        """
-        测试多尺度匹配在默认鲤鱼旗皮肤下的识别效果
-        验证同一张图片能否识别不同缩放大小的按钮
-        """
-        logger.hr('Multi-Scale Matching Test - Default Skin')
-        logger.info('Testing if one image can recognize scaled versions of 育成 button')
-
-        images_count = [[self.I_SHI_GROWN,     0, 0],  # 式神育成
-                        [self.I_SHI_CARD,      0, 0],  # 结界卡
-                        [self.I_SHI_DEFENSE,   0, 0],  # 结界防守
-                        [self.I_REALM_SHIN,    0, 0],  # 结界皮肤
-                        [self.I_CARD_EXP,      0, 0],  # 收取经验
-                        [self.I_BOX_AP,        0, 0],  # 收取体力
-                        [self.I_BOX_EXP,       0, 0],  # 收取盒子经验
-                        [self.I_BOX_EXP_MAX,   0, 0],  # 收取盒子经验(满)
-                        [self.I_UTILIZE_EXP,   0, 0],  # 收取寄养经验
-                        ]
-
-        timer = Timer(10)
-        timer.start()
-        logger.info('Testing for 10 seconds...')
-        while 1:
-            self.screenshot()
-
-            for i in images_count:
-                # 普通匹配
-                if self.appear(i[0]):
-                    i[1] += 1
-                # 多尺度匹配
-                if self.appear_multi_scale(i[0]):
-                    i[2] += 1
-
-            if timer.reached():
-                break
-
-        print('\n' + '=' * 70)
-        print('%-20s   %8s   %8s' % ('Image', 'Normal', 'Multi-Scale'))
-        print('=' * 70)
-        for i in images_count:
-            if i[1] > 0 or i[2] > 0:  # 只显示有匹配结果的
-                print('%-20s %8d   %8d' % (str(i[0]), i[1], i[2]))
-        print('=' * 70)
-
-        logger.info('Test completed')
-
-
-if __name__ == '__main__':
-    from module.config.config import Config
-    from module.device.device import Device
-
-    c = Config('oas1')
-    d = Device(c)
-    t = ScriptTask(c, d)
-    t.run()

+ 5 - 5
tasks/KekkaiUtilize/script_task.py

@@ -129,7 +129,7 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
 
 
-            if self.appear(self.I_REALM_SHIN) and self.appear_multi_scale(self.I_SHI_GROWN):
+            if self.appear(self.I_REALM_SHIN) and self.appear(self.I_SHI_GROWN):
                 self.screenshot()
                 self.screenshot()
                 if not self.appear(self.I_REALM_SHIN):
                 if not self.appear(self.I_REALM_SHIN):
                     continue
                     continue
@@ -196,7 +196,7 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_REALM_SHIN):
             if self.appear(self.I_REALM_SHIN):
                 break
                 break
-            if self.appear_multi_scale(self.I_SHI_DEFENSE):
+            if self.appear(self.I_SHI_DEFENSE):
                 break
                 break
             if self.appear_then_click(self.I_PLANT_TREE_CLOSE):
             if self.appear_then_click(self.I_PLANT_TREE_CLOSE):
                 continue
                 continue
@@ -334,7 +334,7 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             if self.in_shikigami_growth():
             if self.in_shikigami_growth():
                 break
                 break
 
 
-            if self.appear_then_click_multi_scale(self.I_SHI_GROWN, interval=1):
+            if self.appear_then_click(self.I_SHI_GROWN, interval=1):
                 continue
                 continue
         logger.info('Enter shikigami grown')
         logger.info('Enter shikigami grown')
 
 
@@ -735,7 +735,7 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_REALM_SHIN):
             if self.appear(self.I_REALM_SHIN):
                 break
                 break
-            if self.appear_multi_scale(self.I_SHI_DEFENSE):
+            if self.appear(self.I_SHI_DEFENSE):
                 break
                 break
             if self.appear_then_click(self.I_UI_BACK_RED, interval=1):
             if self.appear_then_click(self.I_UI_BACK_RED, interval=1):
                 continue
                 continue
@@ -757,4 +757,4 @@ if __name__ == "__main__":
     # t.check_card_num('勾玉', 67)
     # t.check_card_num('勾玉', 67)
     # t.screenshot()
     # t.screenshot()
     # print(t.appear(t.I_BOX_EXP, threshold=0.6))
     # print(t.appear(t.I_BOX_EXP, threshold=0.6))
-    # print(t.appear(t.I_BOX_EXP_MAX, threshold=0.6))
+    # print(t.appear(t.I_BOX_EXP_MAX, threshold=0.6))

+ 0 - 19
tasks/Restart/assets.py

@@ -10,25 +10,6 @@ from module.atom.list import RuleList
 class RestartAssets: 
 class RestartAssets: 
 
 
 
 
-	# Image Rule Assets
-	# 庭院事务按钮 
-	I_NOTE = RuleImage(roi_front=(782,415,27,31), roi_back=(134,363,968,189), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_note.png")
-	# 庭院事务主页 
-	I_PAGE = RuleImage(roi_front=(264,41,182,51), roi_back=(243,14,260,99), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_page.png")
-	# 一键完成 
-	I_COMPLETE_TASKS = RuleImage(roi_front=(1124,599,75,78), roi_back=(1116,588,93,98), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_complete_tasks.png")
-	# 领取成功 
-	I_SUCCESS_CLAIMED = RuleImage(roi_front=(302,27,184,51), roi_back=(257,10,272,84), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_success_claimed.png")
-	# 日常 
-	I_DAILY = RuleImage(roi_front=(1138,139,63,45), roi_back=(1126,90,125,249), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_daily.png")
-	# 暂无可完成的任务 
-	I_NO_TASKS = RuleImage(roi_front=(538,225,205,32), roi_back=(492,214,291,51), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_no_tasks.png")
-	# description 
-	I_CONFIRM = RuleImage(roi_front=(674,391,131,63), roi_back=(400,199,485,320), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_confirm.png")
-	# description 
-	I_SKIP = RuleImage(roi_front=(1170,36,56,28), roi_back=(1144,0,109,99), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_skip.png")
-
-
 	# Image Rule Assets
 	# Image Rule Assets
 	# 点击勾玉 
 	# 点击勾玉 
 	I_HARVEST_JADE = RuleImage(roi_front=(732,489,34,33), roi_back=(177,451,973,141), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_jade.png")
 	I_HARVEST_JADE = RuleImage(roi_front=(732,489,34,33), roi_back=(177,451,973,141), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_jade.png")

+ 1 - 3
tasks/Restart/config.py

@@ -12,8 +12,6 @@ from tasks.Component.config_base import ConfigBase, DateTime, MultiLine
 class HarvestConfig(BaseModel):
 class HarvestConfig(BaseModel):
     # 默认启用
     # 默认启用
     enable: bool = Field(default=True, description='harvest_enable_help')
     enable: bool = Field(default=True, description='harvest_enable_help')
-    # 庭院事务
-    enable_courtyard_affairs: bool = Field(default=True)
     # 永久勾玉卡
     # 永久勾玉卡
     enable_jade: bool = Field(default=True)
     enable_jade: bool = Field(default=True)
     # 签到
     # 签到
@@ -42,4 +40,4 @@ class Restart(ConfigBase):
     scheduler: RestartScheduler = Field(default_factory=RestartScheduler)
     scheduler: RestartScheduler = Field(default_factory=RestartScheduler)
     tasks_config_reset: TasksReset = Field(default_factory=TasksReset)
     tasks_config_reset: TasksReset = Field(default_factory=TasksReset)
     harvest_config: HarvestConfig = Field(default_factory=HarvestConfig)
     harvest_config: HarvestConfig = Field(default_factory=HarvestConfig)
-    login_character_config: LoginCharacterConfig = Field(default_factory=LoginCharacterConfig)
+    login_character_config: LoginCharacterConfig = Field(default_factory=LoginCharacterConfig)

BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_complete_tasks.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_confirm.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_daily.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_no_tasks.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_note.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_page.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_skip.png


BIN
tasks/Restart/courtyard_affairs/courtyard_affairs_success_claimed.png


+ 0 - 74
tasks/Restart/courtyard_affairs/image.json

@@ -1,74 +0,0 @@
-[
-  {
-    "itemName": "note",
-    "imageName": "courtyard_affairs_note.png",
-    "roiFront": "782,415,27,31",
-    "roiBack": "134,363,968,189",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "庭院事务按钮"
-  },
-  {
-    "itemName": "page",
-    "imageName": "courtyard_affairs_page.png",
-    "roiFront": "264,41,182,51",
-    "roiBack": "243,14,260,99",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "庭院事务主页"
-  },
-  {
-    "itemName": "complete_tasks",
-    "imageName": "courtyard_affairs_complete_tasks.png",
-    "roiFront": "1124,599,75,78",
-    "roiBack": "1116,588,93,98",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "一键完成"
-  },
-  {
-    "itemName": "success_claimed",
-    "imageName": "courtyard_affairs_success_claimed.png",
-    "roiFront": "302,27,184,51",
-    "roiBack": "257,10,272,84",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "领取成功"
-  },
-  {
-    "itemName": "daily",
-    "imageName": "courtyard_affairs_daily.png",
-    "roiFront": "1138,139,63,45",
-    "roiBack": "1126,90,125,249",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "日常"
-  },
-  {
-    "itemName": "no_tasks",
-    "imageName": "courtyard_affairs_no_tasks.png",
-    "roiFront": "538,225,205,32",
-    "roiBack": "492,214,291,51",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "暂无可完成的任务"
-  },
-  {
-    "itemName": "confirm",
-    "imageName": "courtyard_affairs_confirm.png",
-    "roiFront": "674,391,131,63",
-    "roiBack": "400,199,485,320",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "skip",
-    "imageName": "courtyard_affairs_skip.png",
-    "roiFront": "1170,36,56,28",
-    "roiBack": "1144,0,109,99",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  }
-]

+ 4 - 101
tasks/base_task.py

@@ -215,73 +215,6 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
 
         return appear
         return appear
 
 
-    def appear_multi_scale(self,
-                           target: RuleImage,
-                           interval: float = None,
-                           threshold: float = None,
-                           scales: list = None,
-                           scale_range: tuple = None):
-        """
-        多尺度图片识别,自动尝试多个缩放比例以适应图片大小的变化
-        :param target: RuleImage对象
-        :param interval: 匹配间隔时间
-        :param threshold: 匹配阈值
-        :param scales: 缩放比例列表
-        :param scale_range: 缩放范围 (start, end, step),例如 (0.8, 1.2, 0.1)
-        :return: interval时间到达且匹配成功则返回True, 否则False
-        """
-        if interval:
-            if target.name in self.interval_timer:
-                if self.interval_timer[target.name].limit != interval:
-                    self.interval_timer[target.name] = Timer(interval)
-            else:
-                self.interval_timer[target.name] = Timer(interval)
-            if not self.interval_timer[target.name].reached():
-                return False
-
-        appear = target.match_multi_scale(self.device.image, threshold=threshold, scales=scales, scale_range=scale_range)
-
-        if appear and interval:
-            self.interval_timer[target.name].reset()
-
-        return appear
-
-    def appear_then_click_multi_scale(self,
-                                      target: RuleImage,
-                                      action: Union[RuleClick, RuleLongClick] = None,
-                                      interval: float = None,
-                                      threshold: float = None,
-                                      scales: list = None,
-                                      scale_range: tuple = None,
-                                      duration: float = None):
-        """
-        多尺度图片识别并点击,自动尝试多个缩放比例以适应图片大小的变化
-        :param target: RuleImage对象
-        :param action: 点击位置,可以是RuleClick或RuleLongClick
-        :param interval: 匹配间隔时间
-        :param threshold: 匹配阈值
-        :param scales: 缩放比例列表
-        :param scale_range: 缩放范围 (start, end, step),例如 (0.8, 1.2, 0.1)
-        :param duration: 长按时间(毫秒)
-        :return: True or False
-        """
-        appear = self.appear_multi_scale(target, interval=interval, threshold=threshold, scales=scales, scale_range=scale_range)
-
-        if appear and not action:
-            x, y = target.coord()
-            self.device.click(x, y, control_name=target.name)
-        elif appear and action:
-            x, y = action.coord()
-            if isinstance(action, RuleLongClick):
-                if duration is None:
-                    self.device.long_click(x, y, duration=action.duration / 1000, control_name=target.name)
-                else:
-                    self.device.long_click(x, y, duration=duration / 1000, control_name=target.name)
-            elif isinstance(action, RuleClick):
-                self.device.click(x, y, control_name=target.name)
-
-        return appear
-
     def wait_until_appear(self,
     def wait_until_appear(self,
                           target: RuleImage | RuleOcr,
                           target: RuleImage | RuleOcr,
                           skip_first_screenshot=False,
                           skip_first_screenshot=False,
@@ -727,23 +660,18 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
 
         return True
         return True
 
 
-    def ui_click(self, click, stop, interval=1, timeout=None):
+    def ui_click(self, click, stop, interval=1):
         """
         """
         循环的一个操作,直到出现stop
         循环的一个操作,直到出现stop
         :param click:
         :param click:
         :param stop:
         :param stop:
-        :param interval: 点击间隔
-        :param timeout: 超时时间(秒),None表示不超时
+        :parm interval
         :return:
         :return:
         """
         """
-        timer = Timer(timeout).start() if timeout else None
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear(stop):
             if self.appear(stop):
-                return True
-            if timer and timer.reached():
-                logger.warning(f'ui_click timeout after {timeout}s')
-                return False
+                break
             if isinstance(click, RuleImage) and self.appear_then_click(click, interval=interval):
             if isinstance(click, RuleImage) and self.appear_then_click(click, interval=interval):
                 continue
                 continue
             if isinstance(click, RuleClick) and self.click(click, interval=interval):
             if isinstance(click, RuleClick) and self.click(click, interval=interval):
@@ -797,33 +725,8 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 self.click(click)
                 self.click(click)
                 continue
                 continue
 
 
-    def ui_click_multi_scale(self, click, stop, interval=1, scale_range=None, timeout=None):
-        """
-        循环的一个操作,直到出现stop(支持多尺度图片识别)
-        :param click:
-        :param stop:
-        :param interval:
-        :param scale_range: 多尺度缩放范围 (start, end, step)
-        :param timeout: 超时时间(秒),None表示不超时
-        :return: True-找到stop条件, False-超时
-        """
-        timer = Timer(timeout).start() if timeout else None
-        while 1:
-            self.screenshot()
-            if self.appear(stop):
-                return True
-            if timer and timer.reached():
-                logger.warning(f'ui_click_multi_scale timeout after {timeout}s')
-                return False
-            if isinstance(click, RuleImage) and self.appear_then_click_multi_scale(click, scale_range=scale_range, interval=interval):
-                continue
-            if isinstance(click, RuleClick) and self.click(click, interval=interval):
-                continue
-            elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
-                continue
-
     def push_notify(self, content='', title=None, level=3):
     def push_notify(self, content='', title=None, level=3):
         logger.info(f'Push notify: {content}')
         logger.info(f'Push notify: {content}')
 
 
     def save_image(self, task_name=None, content=None, wait_time=2, image_type=False, push_flag=False, level=3):
     def save_image(self, task_name=None, content=None, wait_time=2, image_type=False, push_flag=False, level=3):
-        logger.info(f'Save image: {task_name}')
+        logger.info(f'Save image: {task_name}')