Просмотр исходного кода

Merge pull request #866 from runhey/dev

Automated PR 2025.05.29
huangrunheng 1 год назад
Родитель
Сommit
6055c9bc6a

+ 1 - 0
module/atom/image.py

@@ -157,6 +157,7 @@ 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 max_val > threshold:
             self.roi_front[0] = max_loc[0] + self.roi_back[0]
             self.roi_front[1] = max_loc[1] + self.roi_back[1]

+ 2 - 1
module/config/config_menu.py

@@ -32,7 +32,8 @@ class ConfigMenu:
             "Exploration",
             "Hyakkiyakou",
             "HeroTest",
-            "FindJade"
+            "FindJade",
+            "MemoryScrolls"
         ]
         # 阴阳寮
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'Dokan', 'CollectiveMissions',

+ 2 - 1
module/config/config_model.py

@@ -65,8 +65,8 @@ from tasks.EvoZone.config import EvoZone
 from tasks.GoryouRealm.config import GoryouRealm
 from tasks.Hyakkiyakou.config import Hyakkiyakou
 from tasks.HeroTest.config import HeroTest
-
 from tasks.FindJade.config import FindJade
+from tasks.MemoryScrolls.config import MemoryScrolls
 # ----------------------------------------------------------------------------------------------------------------------
 
 # 每周任务---------------------------------------------------------------------------------------------------------------
@@ -127,6 +127,7 @@ class ConfigModel(ConfigBase):
     hyakkiyakou: Hyakkiyakou = Field(default_factory=Hyakkiyakou)
     hero_test: HeroTest = Field(default_factory=HeroTest)
     find_jade: FindJade = Field(default_factory=FindJade)
+    memory_scrolls: MemoryScrolls = Field(default_factory=MemoryScrolls)
 
     # 这些是每周任务
     true_orochi: TrueOrochi = Field(default_factory=TrueOrochi)

+ 31 - 2
tasks/Component/config_base.py

@@ -5,7 +5,7 @@ import re
 from datetime import timedelta, time, datetime
 from typing import Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 from pydantic import (BeforeValidator,
                       PlainSerializer,
                       WithJsonSchema,
@@ -80,4 +80,33 @@ def dynamic_hide(*fields: str,):
 
 
 class ConfigBase(BaseModel):
-    pass
+    def __init__(self, *args, **kwargs):
+        try:
+            super().__init__(*args, **kwargs)
+        except ValidationError as exc:
+            """
+            During the initialization of the ConfigBase class, 
+            if a ValidationError occurs, the default value of the field is used to initialize the field, 
+            and the exception is re-raised after the initialization is complete.
+            """
+            exc_info = exc.errors()[0]
+            val_error_type = exc_info.get('type', None)
+            val_error_key = exc_info.get('loc', None)[0]
+            if val_error_type not in ['greater_than_equal',
+                                      'greater_than',
+                                      'less_than',
+                                      'less_than_equal',]:
+                raise exc
+            from module.logger import logger
+
+            try:
+                default_value = self.model_fields[val_error_key].default
+                kwargs[val_error_key] = self.model_fields[val_error_key].default
+                logger.warning(f'Field {val_error_key} is out of range, using default value {default_value}')
+                logger.warning(repr(exc))
+                logger.warning(str(kwargs))
+                super().__init__(*args, **kwargs)
+            except Exception as e:
+                raise
+
+

+ 1 - 1
tasks/Dokan/assets.py

@@ -115,7 +115,7 @@ class DokanAssets:
 	# 场景检测:阴阳竂 
 	I_SCENE_RYOU = RuleImage(roi_front=(1161,674,75,31), roi_back=(1161,674,75,31), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/scene_ryou.png")
 	# 场景检测:神社 
-	I_SCENE_SHENSHE = RuleImage(roi_front=(0,100,600,600), roi_back=(0,100,600,600), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/scene_shenshe.png")
+	I_SCENE_SHENSHE = RuleImage(roi_front=(477,165,63,65), roi_back=(477,165,63,65), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/scene_shenshe.png")
 	# 道馆 地图界面 建立道馆按钮 
 	I_RYOU_DOKAN_CREATE_DOKAN = RuleImage(roi_front=(230,580,130,120), roi_back=(230,580,130,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_create_dokan.png")
 	# 道馆 地图界面 点击建立道馆按钮后弹窗中的 确认按钮 

+ 2 - 2
tasks/Dokan/res/image.json

@@ -362,8 +362,8 @@
   {
     "itemName": "scene_shenshe",
     "imageName": "scene_shenshe.png",
-    "roiFront": "0,100,600,600",
-    "roiBack": "0,100,600,600",
+    "roiFront": "477,165,63,65",
+    "roiBack": "477,165,63,65",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "场景检测:神社"

BIN
tasks/Dokan/res/scene_shenshe.png


+ 1 - 0
tasks/Exploration/base.py

@@ -323,6 +323,7 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         next_run = datetime.now() + con_scrolls.scrolls_cd
         self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
         self.set_next_run(task='RealmRaid', success=False, finish=False, target=datetime.now())
+        self.set_next_run(task='MemoryScrolls', success=False, finish=False, target=datetime.now())
         raise TaskEnd
 
     #

+ 61 - 0
tasks/MemoryScrolls/assets.py

@@ -0,0 +1,61 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class MemoryScrollsAssets: 
+
+
+	# Click Rule Assets
+	# 进入卷一 
+	C_MS_SCROLL_1 = RuleClick(roi_front=(170,157,279,192), roi_back=(170,157,279,192), name="ms_scroll_1")
+	# 进入卷二 
+	C_MS_SCROLL_2 = RuleClick(roi_front=(490,135,297,210), roi_back=(490,135,297,210), name="ms_scroll_2")
+	# 进入卷三 
+	C_MS_SCROLL_3 = RuleClick(roi_front=(836,135,304,210), roi_back=(836,135,304,210), name="ms_scroll_3")
+	# 进入卷四 
+	C_MS_SCROLL_4 = RuleClick(roi_front=(137,389,305,206), roi_back=(137,389,305,206), name="ms_scroll_4")
+	# 进入卷五 
+	C_MS_SCROLL_5 = RuleClick(roi_front=(491,390,303,207), roi_back=(491,390,303,207), name="ms_scroll_5")
+	# 进入卷六 
+	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")
+
+
+	# Image Rule Assets
+	# 进入绘卷主界面 
+	I_MS_ENTER = RuleImage(roi_front=(1169,155,24,55), roi_back=(1169,155,24,55), threshold=0.5, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_enter.png")
+	# 判断是否处于绘卷主界面 
+	I_MS_MAIN = RuleImage(roi_front=(689,3,40,50), roi_back=(689,3,40,50), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_main.png")
+	# 退出到召唤界面 
+	I_MS_BACK = RuleImage(roi_front=(32,31,43,45), roi_back=(32,31,43,45), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_back.png")
+	# 关闭分卷捐献界面 
+	I_MS_CLOSE = RuleImage(roi_front=(1145,48,39,41), roi_back=(1145,48,39,41), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_close.png")
+	# 贡献碎片 
+	I_MS_CONTRIBUTE = RuleImage(roi_front=(1013,583,125,35), roi_back=(1013,583,125,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contribute.png")
+	# 贡献碎片完成 
+	I_MS_CONTRIBUTED = RuleImage(roi_front=(493,232,63,40), roi_back=(493,232,63,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contributed.png")
+	# 绘卷100% 
+	I_MS_COMPLETE = RuleImage(roi_front=(397,593,100,21), roi_back=(397,593,100,21), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete.png")
+	# 小绘卷不足 
+	I_MS_ZERO_S = RuleImage(roi_front=(968,160,51,27), roi_back=(968,160,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_s.png")
+	# 中绘卷不足 
+	I_MS_ZERO_M = RuleImage(roi_front=(967,312,54,26), roi_back=(967,312,54,26), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_m.png")
+	# 大绘卷不足 
+	I_MS_ZERO_L = RuleImage(roi_front=(968,464,51,27), roi_back=(968,464,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_l.png")
+
+
+	# Swipe Rule Assets
+	# 小碎片拉满 
+	S_MS_SWIPE_S = RuleSwipe(roi_front=(838,199,37,27), roi_back=(1131,188,66,52), mode="default", name="ms_swipe_s")
+	# 中碎片拉满 
+	S_MS_SWIPE_M = RuleSwipe(roi_front=(838,352,37,23), roi_back=(1133,339,56,53), mode="default", name="ms_swipe_m")
+	# 大碎片拉满 
+	S_MS_SWIPE_L = RuleSwipe(roi_front=(839,503,34,25), roi_back=(1130,492,51,48), mode="default", name="ms_swipe_l")
+
+

+ 27 - 0
tasks/MemoryScrolls/config.py

@@ -0,0 +1,27 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from pydantic import BaseModel, Field
+from enum import Enum
+from datetime import timedelta
+from pydantic import BaseModel, Field
+from enum import Enum
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase, Time
+
+class ScrollNumber(str, Enum):
+    ONE = "卷一"
+    TWO = "卷二"
+    THREE = "卷三"
+    FOUR = "卷四"
+    FIVE = "卷五"
+    SIX = "卷六"
+
+class MemoryScrollsConfig(ConfigBase):
+    scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
+    auto_delay_exploration: bool = Field(default=True, description='指定绘卷结束后,自动延迟探索任务,避免长时间无意义执行')
+
+class MemoryScrolls(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    memory_scrolls_config: MemoryScrollsConfig = Field(default_factory=MemoryScrollsConfig)
+

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

@@ -0,0 +1,44 @@
+[
+  {
+    "itemName": "ms_scroll_1",
+    "roiFront": "170,157,279,192",
+    "roiBack": "170,157,279,192",
+    "description": "进入卷一"
+  },
+  {
+    "itemName": "ms_scroll_2",
+    "roiFront": "490,135,297,210",
+    "roiBack": "490,135,297,210",
+    "description": "进入卷二"
+  },
+  {
+    "itemName": "ms_scroll_3",
+    "roiFront": "836,135,304,210",
+    "roiBack": "836,135,304,210",
+    "description": "进入卷三"
+  },
+  {
+    "itemName": "ms_scroll_4",
+    "roiFront": "137,389,305,206",
+    "roiBack": "137,389,305,206",
+    "description": "进入卷四"
+  },
+  {
+    "itemName": "ms_scroll_5",
+    "roiFront": "491,390,303,207",
+    "roiBack": "491,390,303,207",
+    "description": "进入卷五"
+  },
+  {
+    "itemName": "ms_scroll_6",
+    "roiFront": "835,389,303,204",
+    "roiBack": "835,389,303,204",
+    "description": "进入卷六"
+  },
+  {
+    "itemName": "ms_contributed",
+    "roiFront": "108,509,993,190",
+    "roiBack": "108,509,993,190",
+    "description": "贡献完成跳结算"
+  }
+]

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

@@ -0,0 +1,92 @@
+[
+  {
+    "itemName": "ms_enter",
+    "imageName": "ms_ms_enter.png",
+    "roiFront": "1169,155,24,55",
+    "roiBack": "1169,155,24,55",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "进入绘卷主界面"
+  },
+  {
+    "itemName": "ms_main",
+    "imageName": "ms_ms_main.png",
+    "roiFront": "689,3,40,50",
+    "roiBack": "689,3,40,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "判断是否处于绘卷主界面"
+  },
+  {
+    "itemName": "ms_back",
+    "imageName": "ms_ms_back.png",
+    "roiFront": "32,31,43,45",
+    "roiBack": "32,31,43,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "退出到召唤界面"
+  },
+  {
+    "itemName": "ms_close",
+    "imageName": "ms_ms_close.png",
+    "roiFront": "1145,48,39,41",
+    "roiBack": "1145,48,39,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "关闭分卷捐献界面"
+  },
+  {
+    "itemName": "ms_contribute",
+    "imageName": "ms_ms_contribute.png",
+    "roiFront": "1013,583,125,35",
+    "roiBack": "1013,583,125,35",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "贡献碎片"
+  },
+  {
+    "itemName": "ms_contributed",
+    "imageName": "ms_ms_contributed.png",
+    "roiFront": "493,232,63,40",
+    "roiBack": "493,232,63,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "贡献碎片完成"
+  },
+  {
+    "itemName": "ms_complete",
+    "imageName": "ms_ms_complete.png",
+    "roiFront": "397,593,100,21",
+    "roiBack": "397,593,100,21",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "绘卷100%"
+  },
+  {
+    "itemName": "ms_zero_s",
+    "imageName": "ms_ms_zero_s.png",
+    "roiFront": "968,160,51,27",
+    "roiBack": "968,160,51,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "小绘卷不足"
+  },
+  {
+    "itemName": "ms_zero_m",
+    "imageName": "ms_ms_zero_m.png",
+    "roiFront": "967,312,54,26",
+    "roiBack": "967,312,54,26",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "中绘卷不足"
+  },
+  {
+    "itemName": "ms_zero_l",
+    "imageName": "ms_ms_zero_l.png",
+    "roiFront": "968,464,51,27",
+    "roiBack": "968,464,51,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "大绘卷不足"
+  }
+]

BIN
tasks/MemoryScrolls/ms/ms_ms_back.png


BIN
tasks/MemoryScrolls/ms/ms_ms_close.png


BIN
tasks/MemoryScrolls/ms/ms_ms_complete.png


BIN
tasks/MemoryScrolls/ms/ms_ms_contribute.png


BIN
tasks/MemoryScrolls/ms/ms_ms_contributed.png


BIN
tasks/MemoryScrolls/ms/ms_ms_enter.png


BIN
tasks/MemoryScrolls/ms/ms_ms_main.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_l.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_m.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_s.png


+ 23 - 0
tasks/MemoryScrolls/ms/swipe.json

@@ -0,0 +1,23 @@
+[
+  {
+    "itemName": "ms_swipe_s",
+    "roiFront": "838,199,37,27",
+    "roiBack": "1131,188,66,52",
+    "mode": "default",
+    "description": "小碎片拉满"
+  },
+  {
+    "itemName": "ms_swipe_m",
+    "roiFront": "838,352,37,23",
+    "roiBack": "1133,339,56,53",
+    "mode": "default",
+    "description": "中碎片拉满"
+  },
+  {
+    "itemName": "ms_swipe_l",
+    "roiFront": "839,503,34,25",
+    "roiBack": "1130,492,51,48",
+    "mode": "default",
+    "description": "大碎片拉满"
+  }
+]

+ 133 - 0
tasks/MemoryScrolls/script_task.py

@@ -0,0 +1,133 @@
+# This Python file uses the following encoding: utf-8
+# @author ghg11
+# github https://github.com/ghg11
+from time import sleep
+from enum import Enum
+from module.logger import logger
+from module.exception import TaskEnd
+from module.base.timer import Timer
+from datetime import timedelta, datetime
+
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_summon
+from tasks.MemoryScrolls.assets import MemoryScrollsAssets
+from tasks.MemoryScrolls.config import ScrollNumber
+
+
+class ScriptTask(GameUi, MemoryScrollsAssets):
+
+    def run(self):        
+        self.ui_get_current_page()
+        self.ui_goto(page_summon)
+        con = self.config.memory_scrolls.memory_scrolls_config
+        # 进入绘卷主界面
+        self.goto_memoryscrolls_main(con) 
+        raise TaskEnd
+    
+    def goto_memoryscrolls_main(self, con):
+        # 循环寻找&点击绘卷入口
+        if self.wait_until_appear(self.I_MS_ENTER, wait_time=30):
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_MS_MAIN):
+                    logger.info('Entered Memory Scrolls main page')
+                    break
+                if self.appear_then_click(self.I_MS_ENTER, interval=1):
+                    continue
+        else:
+            logger.error('Failed to enter Memory Scrolls main page')
+            self.set_next_run(task='MemoryScrolls', success=False)
+            raise TaskEnd
+        # 进入指定分卷
+        self.goto_scroll(con)
+        # 返回召唤界面,目前只发现此种返回按键
+        self.ui_click_until_disappear(self.I_MS_BACK, interval=1)
+        logger.info('Return to Summon page')
+    
+    def goto_scroll(self, con):
+        """
+        进入指定分卷
+        :param scroll_number: 分卷编号
+        """
+        while 1:
+            self.screenshot()
+            # 暂时用手动截取叉号,后续替换为通用图片
+            if self.appear(self.I_MS_CLOSE):
+                logger.info('Entered Memory Scrolls contribution page')
+                break
+            match con.scroll_number:
+                case ScrollNumber.ONE:
+                    self.click(self.C_MS_SCROLL_1, interval=1)
+                case ScrollNumber.TWO:
+                    self.click(self.C_MS_SCROLL_2, interval=1)
+                case ScrollNumber.THREE:
+                    self.click(self.C_MS_SCROLL_3, interval=1)
+                case ScrollNumber.FOUR:
+                    self.click(self.C_MS_SCROLL_4, interval=1)
+                case ScrollNumber.FIVE:
+                    self.click(self.C_MS_SCROLL_5, interval=1)
+                case ScrollNumber.SIX:
+                    self.click(self.C_MS_SCROLL_6, interval=1)
+                case _:
+                    logger.error(f'Unknown scroll number: {con.scroll_number.name}')
+                    self.set_next_run(task='MemoryScrolls', success=False)
+                    raise TaskEnd
+        
+        # 判断是否需要捐献碎片
+        if self.appear(self.I_MS_CONTRIBUTE) or not self.appear(self.I_MS_COMPLETE):
+            logger.info(f'Contributing Memory Scrolls for scroll {con.scroll_number.name}')
+            self.contribute_memoryscrolls()
+            # 设置下一次运行时间
+            self.set_next_run(task='MemoryScrolls', success=True)
+        else:
+            logger.info(f'Scroll {con.scroll_number.name} is already completed')
+            self.set_next_run(task='MemoryScrolls', success=False)
+            if con.auto_delay_exploration:
+                # 自动延迟探索任务
+                logger.info('Auto delay exploration task after Memory Scrolls completion')
+                next_run=datetime.now() + timedelta(days=1)
+                self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
+        # 返回绘卷主界面
+        self.ui_click_until_disappear(self.I_MS_CLOSE, interval=1)
+        logger.info('Closed Memory Scrolls contribution page')
+    
+    def contribute_memoryscrolls(self):
+        """
+        捐献碎片
+        :return: None
+        """
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_MS_ZERO_S) and self.appear(self.I_MS_ZERO_M) and self.appear(self.I_MS_ZERO_L):
+                logger.info('Memory Scrolls contribution is already completed')
+                return
+            self.swipe(self.S_MS_SWIPE_S, interval=1)
+            self.swipe(self.S_MS_SWIPE_M, interval=1)
+            self.swipe(self.S_MS_SWIPE_L, interval=1)
+            if self.appear_then_click(self.I_MS_CONTRIBUTE, interval=3):
+                logger.info('Contributed Memory Scrolls')
+                # 等待捐献动画结束
+                while 1:
+                    self.screenshot()
+                    if self.wait_until_appear(self.I_MS_CONTRIBUTED, wait_time=5):
+                        self.click(self.C_MS_CONTRIBUTED, interval=1)
+                    else:
+                        break
+    
+
+
+
+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.screenshot()
+
+    t.run()
+
+
+
+
+