Sfoglia il codice sorgente

Merge pull request #1032 from runhey/dev

Automated PR 2025.09.11
huangrunheng 1 anno fa
parent
commit
aa943bf463

+ 2 - 2
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\萌萌哒\Desktop\465610922-c9f6f975-0159-4e24-a569-88aa3e862d70.png"
+IMAGE_FILE = r"C:\Users\Ryland\Desktop\wechat_2025-09-11_130558_801.png"
 if __name__ == '__main__':
     from tasks.Exploration.script_task import ScriptTask
-    targe = ScriptTask.I_CLOUD
+    targe = ScriptTask.I_ADD_2
     print(detect_image(IMAGE_FILE, targe))
 
     # ocr demo

+ 5 - 1
module/atom/image.py

@@ -11,7 +11,9 @@ from module.base.decorator import cached_property
 from module.logger import logger
 from module.base.utils import is_approx_rectangle
 
+
 class RuleImage:
+    debug_mode: bool = False
 
     def __init__(self, roi_front: tuple, roi_back: tuple, method: str, threshold: float, file: str) -> None:
         """
@@ -156,7 +158,8 @@ class RuleImage:
 
         res = cv2.matchTemplate(source, mat, cv2.TM_CCOEFF_NORMED)
         min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)  # 最小匹配度,最大匹配度,最小匹配度的坐标,最大匹配度的坐标
-        # logger.attr(self.name, max_val)
+        if self.debug_mode:
+            logger.attr(self.name, f'matching score {max_val:.5f}')
 
         if max_val > threshold:
             self.roi_front[0] = max_loc[0] + self.roi_back[0]
@@ -218,6 +221,7 @@ class RuleImage:
         return int(x + w//2), int(y + h//2)
 
     def test_match(self, image: np.array):
+        self.debug_mode = True
         if self.is_template_match:
             return self.match(image)
         if self.is_sift_flann:

+ 2 - 2
tasks/Component/GeneralInvite/assets.py

@@ -12,9 +12,9 @@ class GeneralInviteAssets:
 
 	# Image Rule Assets
 	# 中间的邀请图片 
-	I_ADD_1 = RuleImage(roi_front=(592,288,114,51), roi_back=(592,288,114,51), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
+	I_ADD_1 = RuleImage(roi_front=(596,241,114,51), roi_back=(569,196,186,161), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
 	# 最右边的邀请 
-	I_ADD_2 = RuleImage(roi_front=(1039,205,100,100), roi_back=(1039,205,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_2.png")
+	I_ADD_2 = RuleImage(roi_front=(1013,249,100,100), roi_back=(970,151,193,220), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_2.png")
 	# description 
 	I_FIRE_FAIL = RuleImage(roi_front=(1177,604,81,74), roi_back=(1177,604,81,74), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail.png")
 	# description 

+ 4 - 4
tasks/Component/GeneralInvite/gi/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "add_1",
     "imageName": "gi_add_1.png",
-    "roiFront": "592,288,114,51",
-    "roiBack": "592,288,114,51",
+    "roiFront": "596,241,114,51",
+    "roiBack": "569,196,186,161",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "中间的邀请图片"
@@ -11,8 +11,8 @@
   {
     "itemName": "add_2",
     "imageName": "gi_add_2.png",
-    "roiFront": "1039,205,100,100",
-    "roiBack": "1039,205,100,100",
+    "roiFront": "1013,249,100,100",
+    "roiBack": "970,151,193,220",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "最右边的邀请"

+ 2 - 0
tasks/Component/GeneralRoom/general_room.py

@@ -138,6 +138,8 @@ class GeneralRoom(BaseTask, GeneralRoomAssets):
             text_ocr = self.O_GR_ZONES_NAME.ocr(self.device.image)
             if name == '石距' and name in text_ocr:
                 break
+            if name == '金币妖怪' and "金币" in text_ocr:
+                break
             if click_timer.reached():
                 click_timer.reset()
                 self.device.click(x=pos[0] + randint(-5, 5), y=pos[1] + randint(-5, 5))

+ 4 - 0
tasks/MemoryScrolls/assets.py

@@ -25,6 +25,8 @@ class MemoryScrollsAssets:
 	C_MS_SCROLL_6 = RuleClick(roi_front=(835,389,303,204), roi_back=(835,389,303,204), name="ms_scroll_6")
 	# 贡献完成跳结算 
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
+	# 双绘卷之二 
+	C_MS_DOUBLE_SCROLLS_2 = RuleClick(roi_front=(714,128,464,397), roi_back=(714,128,464,397), name="ms_double_scrolls_2")
 
 
 	# Image Rule Assets
@@ -56,6 +58,8 @@ class MemoryScrollsAssets:
 	I_MS_FRAGMENT_S_50 = RuleImage(roi_front=(473,517,60,25), roi_back=(473,517,60,25), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_50.png")
 	# description 
 	I_MS_FRAGMENT_S_VERIFICATION = RuleImage(roi_front=(522,318,100,100), roi_back=(522,318,100,100), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png")
+	# 双绘卷进入按钮 
+	I_MS_DOUBLE_SCROLLS_ENTER = RuleImage(roi_front=(565,586,154,40), roi_back=(565,586,154,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_double_scrolls_enter.png")
 
 
 	# Swipe Rule Assets

+ 5 - 0
tasks/MemoryScrolls/config.py

@@ -9,6 +9,10 @@ from enum import Enum
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
 
+class DoubleScrolls(str, Enum):
+    ONE = "默认绘卷一"
+    TWO = "双绘卷之二"
+
 class ScrollNumber(str, Enum):
     ONE = "卷一"
     TWO = "卷二"
@@ -19,6 +23,7 @@ class ScrollNumber(str, Enum):
 
 class MemoryScrollsConfig(ConfigBase):
     auto_contribute_memoryscrolls: bool = Field(default=True, description='自动贡献绘卷碎片')
+    double_scrolls: DoubleScrolls = Field(default=DoubleScrolls.ONE, description='double_scrolls_help')
     scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
     auto_close_exploration: bool = Field(default=False, description='指定绘卷结束后,自动关闭探索任务,避免长时间无意义执行')
     notification_95: bool = Field(default=False, description='到达95%进度时发送通知')

+ 6 - 0
tasks/MemoryScrolls/ms/click.json

@@ -40,5 +40,11 @@
     "roiFront": "108,509,993,190",
     "roiBack": "108,509,993,190",
     "description": "贡献完成跳结算"
+  },
+  {
+    "itemName": "ms_double_scrolls_2",
+    "roiFront": "714,128,464,397",
+    "roiBack": "714,128,464,397",
+    "description": "双绘卷之二"
   }
 ]

+ 9 - 0
tasks/MemoryScrolls/ms/image.json

@@ -124,5 +124,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "ms_double_scrolls_enter",
+    "imageName": "ms_ms_double_scrolls_enter.png",
+    "roiFront": "565,586,154,40",
+    "roiBack": "565,586,154,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "双绘卷进入按钮"
   }
 ]

BIN
tasks/MemoryScrolls/ms/ms_ms_double_scrolls_enter.png


+ 12 - 1
tasks/MemoryScrolls/script_task.py

@@ -29,9 +29,20 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
         if self.wait_until_appear(self.I_MS_ENTER, wait_time=30):
             while 1:
                 self.screenshot()
-                if self.appear(self.I_MS_MAIN):
+                if self.appear(self.I_MS_FRAGMENT_S):
                     logger.info('Entered Memory Scrolls main page')
                     break
+                # 周年庆等时期会使用双绘卷
+                if self.appear(self.I_MS_DOUBLE_SCROLLS_ENTER):
+                    logger.info('Using Double Memory Scrolls')
+                    if con.double_scrolls == con.double_scrolls.ONE:
+                        logger.info('Choose Double Memory Scrolls One')
+                    else:
+                        logger.info('Choose Double Memory Scrolls Two')
+                        self.click(self.C_MS_DOUBLE_SCROLLS_2, interval=1)
+                    if self.appear_then_click(self.I_MS_DOUBLE_SCROLLS_ENTER, interval=1):
+                        continue
+                # 右上角绘卷铃铛
                 if self.appear_then_click(self.I_MS_ENTER, interval=1):
                     continue
         else: