ghg11 пре 1 година
родитељ
комит
37cd5442bf

+ 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)

+ 71 - 0
tasks/MemoryScrolls/assets.py

@@ -0,0 +1,71 @@
+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_ENTER = RuleClick(roi_front=(1166,148,29,78), roi_back=(1166,148,29,78), name="ms_enter")
+	# 进入卷一 
+	C_MS_SCROLL_1 = RuleClick(roi_front=(141,134,308,215), roi_back=(141,134,308,215), 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_BACK = RuleClick(roi_front=(26,32,49,42), roi_back=(26,32,49,42), name="ms_back")
+	# 退出捐献界面 
+	C_MS_CLOSE = RuleClick(roi_front=(1142,48,45,36), roi_back=(1142,48,45,36), name="ms_close")
+	# 贡献碎片 
+	C_MS_CONTRIBUTE = RuleClick(roi_front=(991,572,168,53), roi_back=(991,572,168,53), name="ms_contribute")
+	# 贡献完成跳结算 
+	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_enter.png")
+	# 使用!来确定处于绘卷主界面 
+	I_MS_MAIN = RuleImage(roi_front=(1076,667,50,50), roi_back=(1076,667,50,50), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/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_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_close.png")
+	# 滑块(在捐献界面且未完成) 
+	I_MS_MATTER = RuleImage(roi_front=(834,338,47,53), roi_back=(834,338,47,53), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_matter.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_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_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_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_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_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_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")
+
+

+ 26 - 0
tasks/MemoryScrolls/config.py

@@ -0,0 +1,26 @@
+# 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):
+    SCROLL_1 = "卷一"
+    SCROLL_2 = "卷二"
+    SCROLL_3 = "卷三"
+    SCROLL_4 = "卷四"
+    SCROLL_5 = "卷五"
+    SCROLL_6 = "卷六"
+
+class MemoryScrollsConfig(ConfigBase):
+    scroll_number: ScrollNumber = Field(default=ScrollNumber.SCROLL_1, description='scroll_number_help')
+
+class MemoryScrolls(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    memory_scrolls_config: MemoryScrollsConfig = Field(default_factory=MemoryScrollsConfig)
+

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

@@ -0,0 +1,68 @@
+[
+  {
+    "itemName": "ms_enter",
+    "roiFront": "1166,148,29,78",
+    "roiBack": "1166,148,29,78",
+    "description": "进入绘卷主界面"
+  },
+  {
+    "itemName": "ms_scroll_1",
+    "roiFront": "141,134,308,215",
+    "roiBack": "141,134,308,215",
+    "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_back",
+    "roiFront": "26,32,49,42",
+    "roiBack": "26,32,49,42",
+    "description": "退出绘卷主界面"
+  },
+  {
+    "itemName": "ms_close",
+    "roiFront": "1142,48,45,36",
+    "roiBack": "1142,48,45,36",
+    "description": "退出捐献界面"
+  },
+  {
+    "itemName": "ms_contribute",
+    "roiFront": "991,572,168,53",
+    "roiBack": "991,572,168,53",
+    "description": "贡献碎片"
+  },
+  {
+    "itemName": "ms_contributed",
+    "roiFront": "108,509,993,190",
+    "roiBack": "108,509,993,190",
+    "description": "贡献完成跳结算"
+  }
+]

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

@@ -0,0 +1,101 @@
+[
+  {
+    "itemName": "ms_enter",
+    "imageName": "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_main.png",
+    "roiFront": "1076,667,50,50",
+    "roiBack": "1076,667,50,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "使用!来确定处于绘卷主界面"
+  },
+  {
+    "itemName": "ms_back",
+    "imageName": "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_close.png",
+    "roiFront": "1145,48,39,41",
+    "roiBack": "1145,48,39,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "关闭分卷捐献界面"
+  },
+  {
+    "itemName": "ms_matter",
+    "imageName": "ms_matter.png",
+    "roiFront": "834,338,47,53",
+    "roiBack": "834,338,47,53",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "滑块(在捐献界面且未完成)"
+  },
+  {
+    "itemName": "ms_contribute",
+    "imageName": "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_contributed.png",
+    "roiFront": "493,232,63,40",
+    "roiBack": "493,232,63,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "贡献碎片完成"
+  },
+  {
+    "itemName": "ms_complete",
+    "imageName": "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_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_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_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_back.png


BIN
tasks/MemoryScrolls/ms/ms_close.png


BIN
tasks/MemoryScrolls/ms/ms_complete.png


BIN
tasks/MemoryScrolls/ms/ms_contribute.png


BIN
tasks/MemoryScrolls/ms/ms_contributed.png


BIN
tasks/MemoryScrolls/ms/ms_enter.png


BIN
tasks/MemoryScrolls/ms/ms_main.png


BIN
tasks/MemoryScrolls/ms/ms_matter.png


BIN
tasks/MemoryScrolls/ms/ms_zero_l.png


BIN
tasks/MemoryScrolls/ms/ms_zero_m.png


BIN
tasks/MemoryScrolls/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": "大碎片拉满"
+  }
+]

+ 113 - 0
tasks/MemoryScrolls/script_task.py

@@ -0,0 +1,113 @@
+from module.base.base import ModuleBase
+from module.exception import TaskError
+from module.logger import logger
+from .assets import MemoryScrollsAssets as MS
+from .config import MemoryScrollsConfig, ScrollNumber
+
+
+class MemoryScrolls(ModuleBase):
+    def __init__(self, config: MemoryScrollsConfig):
+        super().__init__(config)
+        self.config = config
+        self.scroll_map = {
+            ScrollNumber.SCROLL_1: MS.C_MS_SCROLL_1,
+            ScrollNumber.SCROLL_2: MS.C_MS_SCROLL_2,
+            ScrollNumber.SCROLL_3: MS.C_MS_SCROLL_3,
+            ScrollNumber.SCROLL_4: MS.C_MS_SCROLL_4,
+            ScrollNumber.SCROLL_5: MS.C_MS_SCROLL_5,
+            ScrollNumber.SCROLL_6: MS.C_MS_SCROLL_6,
+        }
+
+    def run(self):
+        """主任务入口"""
+        logger.hr("开始绘卷任务", level=1)
+
+        try:
+            # 1. 进入绘卷界面
+            self._enter()
+
+            # 2. 选择指定分卷
+            self._select_scroll()
+
+            # 3. 处理贡献流程
+            self._process_contribution()
+
+            # 4. 退出界面
+            self._exit()
+
+            logger.info("绘卷任务完成")
+            return True
+        except Exception as e:
+            logger.error(f"任务执行失败: {e}")
+            return False
+
+    def _enter(self):
+        """进入绘卷主界面"""
+        logger.info("尝试进入绘卷界面")
+        for _ in range(3):
+            if self.appear(MS.I_MS_MAIN):
+                break
+            if self.appear(MS.I_MS_ENTER):
+                self.click(MS.C_MS_ENTER)
+                if self.wait_until(MS.I_MS_MAIN):
+                    break
+        else:
+            raise TaskError("无法进入绘卷界面")
+
+    def _select_scroll(self):
+        """选择配置的分卷"""
+        scroll_number = self.config.memory_scrolls_config.scroll_number
+        logger.info(f"选择分卷{scroll_number.value}")
+        self.click(self.scroll_map[scroll_number])
+
+    def _process_contribution(self):
+        """处理碎片贡献流程"""
+        logger.info("开始处理碎片贡献")
+
+        while True:
+            # 检查是否已完成
+            if self.appear(MS.I_MS_COMPLETE):
+                logger.info("当前分卷已完成")
+                break
+
+            # 检查是否在正确界面
+            if not self.appear(MS.I_MS_CONTRIBUTE):
+                logger.warning("不在贡献界面,重新开始")
+                return self.run()
+
+            # 处理小碎片
+            if not self.appear(MS.I_MS_ZERO_S):
+                logger.info("贡献小碎片")
+                self.swipe(MS.S_MS_SWIPE_S)
+                self.click(MS.C_MS_CONTRIBUTE)
+                if self.wait_until(MS.I_MS_CONTRIBUTED):
+                    self.click(MS.C_MS_CONTRIBUTED)
+                continue
+
+            # 处理中碎片
+            if not self.appear(MS.I_MS_ZERO_M):
+                logger.info("贡献中碎片")
+                self.swipe(MS.S_MS_SWIPE_M)
+                self.click(MS.C_MS_CONTRIBUTE)
+                if self.wait_until(MS.I_MS_CONTRIBUTED):
+                    self.click(MS.C_MS_CONTRIBUTED)
+                continue
+
+            # 处理大碎片
+            if not self.appear(MS.I_MS_ZERO_L):
+                logger.info("贡献大碎片")
+                self.swipe(MS.S_MS_SWIPE_L)
+                self.click(MS.C_MS_CONTRIBUTE)
+                if self.wait_until(MS.I_MS_CONTRIBUTED):
+                    self.click(MS.C_MS_CONTRIBUTED)
+                continue
+
+            # 所有碎片都已贡献
+            logger.info("当前分卷所有碎片已贡献完毕")
+            break
+
+    def _exit(self):
+        """退出绘卷界面"""
+        logger.info("退出绘卷界面")
+        self.click(MS.C_MS_CLOSE)
+        self.click(MS.C_MS_BACK)