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

Merge branch 'runhey:dev' into dev

migsmiku 1 год назад
Родитель
Сommit
a12012cc36
52 измененных файлов с 747 добавлено и 115 удалено
  1. 1 0
      module/atom/image.py
  2. 2 1
      module/config/config_menu.py
  3. 2 1
      module/config/config_model.py
  4. BIN
      tasks/ActivityShikigami/as/as_ap.png
  5. BIN
      tasks/ActivityShikigami/as/as_battle.png
  6. BIN
      tasks/ActivityShikigami/as/as_battle_1.png
  7. BIN
      tasks/ActivityShikigami/as/as_fire.png
  8. BIN
      tasks/ActivityShikigami/as/as_lock.png
  9. BIN
      tasks/ActivityShikigami/as/as_unlock.png
  10. 20 11
      tasks/ActivityShikigami/as/image.json
  11. 2 2
      tasks/ActivityShikigami/as/ocr.json
  12. 9 7
      tasks/ActivityShikigami/assets.py
  13. 2 0
      tasks/ActivityShikigami/script_task.py
  14. 31 2
      tasks/Component/config_base.py
  15. 6 0
      tasks/DemonEncounter/assets.py
  16. BIN
      tasks/DemonEncounter/boss/boss_boss_done_check.png
  17. BIN
      tasks/DemonEncounter/boss/boss_boss_gather.png
  18. BIN
      tasks/DemonEncounter/boss/boss_boss_wait.png
  19. 18 0
      tasks/DemonEncounter/boss/image.json
  20. 9 0
      tasks/DemonEncounter/boss/ocr.json
  21. 136 62
      tasks/DemonEncounter/script_task.py
  22. 1 1
      tasks/Dokan/assets.py
  23. 2 2
      tasks/Dokan/res/image.json
  24. BIN
      tasks/Dokan/res/scene_shenshe.png
  25. 6 2
      tasks/ExperienceYoukai/assets.py
  26. 7 1
      tasks/ExperienceYoukai/config.py
  27. BIN
      tasks/ExperienceYoukai/ey/ey_exp_win.png
  28. 11 0
      tasks/ExperienceYoukai/ey/image.json
  29. 91 13
      tasks/ExperienceYoukai/script_task.py
  30. 1 0
      tasks/Exploration/base.py
  31. 1 1
      tasks/GameUi/assets.py
  32. BIN
      tasks/GameUi/page/page_check_collection.png
  33. 2 2
      tasks/GameUi/page/page_img_3.json
  34. 61 0
      tasks/MemoryScrolls/assets.py
  35. 27 0
      tasks/MemoryScrolls/config.py
  36. 44 0
      tasks/MemoryScrolls/ms/click.json
  37. 92 0
      tasks/MemoryScrolls/ms/image.json
  38. BIN
      tasks/MemoryScrolls/ms/ms_ms_back.png
  39. BIN
      tasks/MemoryScrolls/ms/ms_ms_close.png
  40. BIN
      tasks/MemoryScrolls/ms/ms_ms_complete.png
  41. BIN
      tasks/MemoryScrolls/ms/ms_ms_contribute.png
  42. BIN
      tasks/MemoryScrolls/ms/ms_ms_contributed.png
  43. BIN
      tasks/MemoryScrolls/ms/ms_ms_enter.png
  44. BIN
      tasks/MemoryScrolls/ms/ms_ms_main.png
  45. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_l.png
  46. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_m.png
  47. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_s.png
  48. 23 0
      tasks/MemoryScrolls/ms/swipe.json
  49. 133 0
      tasks/MemoryScrolls/script_task.py
  50. 1 1
      tasks/Secret/script_task.py
  51. 2 2
      tasks/WeeklyTrifles/assets.py
  52. 4 4
      tasks/WeeklyTrifles/collect/image.json

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

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_battle_1.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 20 - 11
tasks/ActivityShikigami/as/image.json

@@ -3,7 +3,7 @@
     "itemName": "shi",
     "imageName": "as_shi.png",
     "roiFront": "519,165,33,34",
-    "roiBack": "64,115,1110,427",
+    "roiBack": "507,150,66,67",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,12 +20,21 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "1081,301,35,135",
-    "roiBack": "1042,208,153,315",
+    "roiFront": "937,308,35,135",
+    "roiBack": "892,214,153,315",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入爬塔"
   },
+  {
+    "itemName": "battle_1",
+    "imageName": "as_battle_1.png",
+    "roiFront": "541,663,191,26",
+    "roiBack": "506,622,273,96",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "进入爬塔1"
+  },
   {
     "itemName": "drum",
     "imageName": "as_drum.png",
@@ -38,8 +47,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "827,655,25,32",
-    "roiBack": "749,592,139,116",
+    "roiFront": "732,613,25,28",
+    "roiBack": "707,592,76,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "上锁图标"
@@ -47,8 +56,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "823,654,28,28",
-    "roiBack": "776,610,112,87",
+    "roiFront": "730,613,28,28",
+    "roiBack": "704,595,78,74",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +65,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1140,583,84,78",
-    "roiBack": "1099,536,150,160",
+    "roiFront": "1052,562,84,46",
+    "roiBack": "1021,521,150,160",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "点击战斗"
@@ -65,8 +74,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1093,667,23,24",
-    "roiBack": "1088,638,103,71",
+    "roiFront": "1065,612,23,24",
+    "roiBack": "1044,589,103,71",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"

+ 2 - 2
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "98,583,42,25",
-    "roiBack": "98,583,42,25",
+    "roiFront": "1102,26,57,26",
+    "roiBack": "1102,26,57,26",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 9 - 7
tasks/ActivityShikigami/assets.py

@@ -45,21 +45,23 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(519,165,33,34), roi_back=(64,115,1110,427), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(519,165,33,34), roi_back=(507,150,66,67), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(1081,301,35,135), roi_back=(1042,208,153,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(937,308,35,135), roi_back=(892,214,153,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	# 进入爬塔1 
+	I_BATTLE_1 = RuleImage(roi_front=(541,663,191,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(827,655,25,32), roi_back=(749,592,139,116), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(732,613,25,28), roi_back=(707,592,76,80), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(776,610,112,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(730,613,28,28), roi_back=(704,595,78,74), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1140,583,84,78), roi_back=(1099,536,150,160), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1052,562,84,46), roi_back=(1021,521,150,160), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1093,667,23,24), roi_back=(1088,638,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1065,612,23,24), roi_back=(1044,589,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
 	I_AP_ACTIVITY = RuleImage(roi_front=(1147,667,21,27), roi_back=(1095,654,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
@@ -74,7 +76,7 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(98,583,42,25), area=(98,583,42,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1102,26,57,26), area=(1102,26,57,26), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(715,18,95,28), area=(715,18,95,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 

+ 2 - 0
tasks/ActivityShikigami/script_task.py

@@ -153,6 +153,8 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 continue
             if self.appear_then_click(self.I_BATTLE, interval=1):
                 continue
+            if self.appear_then_click(self.I_BATTLE_1, interval=1):
+                continue
 
     def main_home(self) -> bool:
         """

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

+ 6 - 0
tasks/DemonEncounter/assets.py

@@ -46,11 +46,17 @@ class DemonEncounterAssets:
 	I_BOSS_KILLED = RuleImage(roi_front=(654,596,35,68), roi_back=(614,537,123,176), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_killed.png")
 	# 极逢魔集结挑战 
 	I_BEST_BOSS_FIRE = RuleImage(roi_front=(1087,562,100,36), roi_back=(1087,562,100,36), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_best_boss_fire.png")
+	# 战斗失败-等待界面 
+	I_BOSS_WAIT = RuleImage(roi_front=(490,50,350,150), roi_back=(490,50,350,150), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_wait.png")
+	# 战斗结束标识,左下角有战绩按钮 
+	I_BOSS_DONE_CHECK = RuleImage(roi_front=(0,450,100,130), roi_back=(0,450,100,130), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_done_check.png")
 
 
 	# Ocr Rule Assets
 	# 人数 
 	O_DE_BOSS_PEOPLE = RuleOcr(roi=(880,591,100,35), area=(880,591,100,35), mode="DigitCounter", method="Default", keyword="", name="de_boss_people")
+	# Ocr-description 
+	O_DE_BEST_BOSS_PEOPLE = RuleOcr(roi=(902,564,100,31), area=(902,564,100,31), mode="DigitCounter", method="Default", keyword="", name="de_best_boss_people")
 
 
 	# Click Rule Assets

BIN
tasks/DemonEncounter/boss/boss_boss_done_check.png


BIN
tasks/DemonEncounter/boss/boss_boss_gather.png


BIN
tasks/DemonEncounter/boss/boss_boss_wait.png


+ 18 - 0
tasks/DemonEncounter/boss/image.json

@@ -133,5 +133,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "极逢魔集结挑战"
+  },
+  {
+    "itemName": "boss_wait",
+    "imageName": "boss_boss_wait.png",
+    "roiFront": "490,50,350,150",
+    "roiBack": "490,50,350,150",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗失败-等待界面"
+  },
+  {
+    "itemName": "boss_done_check",
+    "imageName": "boss_boss_done_check.png",
+    "roiFront": "0,450,100,130",
+    "roiBack": "0,450,100,130",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗结束标识,左下角有战绩按钮"
   }
 ]

+ 9 - 0
tasks/DemonEncounter/boss/ocr.json

@@ -7,5 +7,14 @@
     "method": "Default",
     "keyword": "",
     "description": "人数"
+  },
+  {
+    "itemName": "de_best_boss_people",
+    "roiFront": "902,564,100,31",
+    "roiBack": "902,564,100,31",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
   }
 ]

+ 136 - 62
tasks/DemonEncounter/script_task.py

@@ -2,12 +2,12 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+from time import sleep
 
 from enum import Enum
 from cached_property import cached_property
 from datetime import datetime, timedelta
 
-
 from module.logger import logger
 from module.exception import TaskEnd
 from module.base.timer import Timer
@@ -20,6 +20,7 @@ from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.DemonEncounter.data.answer import Answer
 
+
 class LanternClass(Enum):
     BATTLE = 0  # 打怪  --> 无法判断因为怪的图片不一样,用排除法
     BOX = 1  # 开宝箱
@@ -31,6 +32,7 @@ class LanternClass(Enum):
 
 
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
+    best_boss_enable = False
 
     def run(self):
         if not self.check_time():
@@ -50,6 +52,24 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         raise TaskEnd('DemonEncounter')
 
+    def init_best_boss_enable(self):
+        today = datetime.now().weekday()
+        if today == 0:
+            # 鬼灵歌姬
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_kiryou_select
+        elif today == 1:
+            # 蜃气楼
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_shinkirou_select
+        elif today == 2:
+            # 土蜘蛛
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_tsuchigumo_select
+        elif today == 3:
+            # 荒骷髅
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_gashadokuro_select
+        elif today == 4:
+            # 地震鲶
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_namazu_select
+
     def checkout_soul(self):
         """
         切换御魂
@@ -112,76 +132,133 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         :return:
         """
         logger.hr('Start boss battle', 1)
-        # 判断今天是周几
-        today = datetime.now().weekday()
+        self.init_best_boss_enable()
 
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
-                current, remain, total = self.O_DE_BOSS_PEOPLE.ocr(self.device.image)
-                if total == 300 and current >= 290:
-                    logger.info('Boss battle people is full')
-                    if not self.appear(self.I_UI_BACK_RED):
-                        logger.warning('Boss battle people is full but no red back')
-                        continue
-                    self.ui_click_until_disappear(self.I_UI_BACK_RED)
-                    # 退出重新选一个没人慢的boss
-                    logger.info('Exit and reselect')
+        def find_boss():
+            find_btn_clicked = False
+            timer_find_boss = Timer(10 * 60)
+            timer_find_boss.start()
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
+                    break
+                if timer_find_boss.reached():
+                    logger.warning('find boss timeout')
+                    self.set_next_run(task='DemonEncounter', success=False, finish=True, server=False)
+                    raise TaskEnd('DemonEncounter')
+                if self.appear(self.I_JADE_50):
+                    # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
+                    self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
+                    continue
+                # if self.appear_then_click(self.I_BOSS_NAMAZU, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_SHINKIRO, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_ODOKURO, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_OBOROGURUMA, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_TSUCHIGUMO, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
+                #     continue
+                if find_btn_clicked and self.click(self.C_DM_BOSS_CLICK, interval=5):
+                    find_btn_clicked = False
                     continue
+                if self.best_boss_enable:
+                    self.device.click_record_clear()
+                    if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
+                        self.device.click_record_remove(self.I_DE_BOSS_BEST)
+                        if self.click(self.I_DE_BOSS_BEST, interval=4):
+                            logger.info("Finding best boss...")
+                            find_btn_clicked = True
+                        continue
                 else:
-                    logger.info('Boss battle people is not full')
+                    if self.appear(self.I_DE_BOSS) and (not find_btn_clicked):
+                        self.device.click_record_remove(self.I_DE_BOSS)
+                        if self.click(self.I_DE_BOSS, interval=4):
+                            logger.info("Finding normal boss...")
+                            find_btn_clicked = True
+                        continue
+            return True
+
+        def enter_boss():
+            logger.info('trying to enter boss...')
+            # 点击集结挑战
+            boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
+            ocr_people_item = self.O_DE_BEST_BOSS_PEOPLE if self.best_boss_enable else self.O_DE_BOSS_PEOPLE
+            while 1:
+                self.screenshot()
+
+                if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
+                    current, remain, total = ocr_people_item.ocr(self.device.image)
+                    if total == 300 and current >= 290:
+                        logger.info('Boss battle people is full')
+                        if not self.appear(self.I_UI_BACK_RED):
+                            logger.warning('Boss battle people is full but no red back')
+                            continue
+                        self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                        # 退出重新选一个没人慢的boss
+                        logger.info('Exit and reselect')
+                        return False
+
+                logger.info('Boss battle people is not full')
+
+                if self.appear(self.I_BOSS_CONFIRM):
+                    self.ui_click(self.I_BOSS_NO_SELECT, self.I_BOSS_SELECTED)
+                    self.ui_click(self.I_BOSS_CONFIRM, self.I_BOSS_GATHER)
+                    break
+                if self.appear(self.I_BOSS_GATHER):
                     break
+                if boss_fire_count >= 5:
+                    logger.warning('Boss battle already done')
+                    self.set_next_run(task='DemonEncounter', success=False, finish=True, server=True)
+                    self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                    raise TaskEnd('DemonEncounter')
 
-            if self.appear_then_click(self.I_BOSS_NAMAZU, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_SHINKIRO, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_ODOKURO, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_OBOROGURUMA, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_TSUCHIGUMO, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
-                continue
-            if self.config.demon_encounter.best_demon_boss_config.enable and today < 5:
-                if self.appear_then_click(self.I_DE_BOSS_BEST, interval=4):
+                if (self.appear_then_click(self.I_BOSS_FIRE, interval=3)
+                        or self.appear_then_click(self.I_BEST_BOSS_FIRE, interval=3)):
+                    boss_fire_count += 1
                     continue
-            else:
-                if self.appear_then_click(self.I_DE_BOSS, interval=4):
-                    continue
-            if self.click(self.C_DM_BOSS_CLICK, interval=1.7):
-                continue
+            return True
 
-        logger.info('Boss battle start')
-        # 点击集结挑战
-        boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_BOSS_CONFIRM):
-                self.ui_click(self.I_BOSS_NO_SELECT, self.I_BOSS_SELECTED)
-                self.ui_click(self.I_BOSS_CONFIRM, self.I_BOSS_GATHER)
-                break
-            if self.appear(self.I_BOSS_GATHER):
-                break
-            if boss_fire_count >= 5:
-                logger.warning('Boss battle already done')
-                self.ui_click_until_disappear(self.I_UI_BACK_RED)
+        fail_count = 0
+        while True:
+            if fail_count >= 5:
                 return
-            if self.appear_then_click(self.I_BOSS_FIRE, interval=3) or self.appear_then_click(self.I_BEST_BOSS_FIRE, interval=3):
-                boss_fire_count += 1
+            if not find_boss():
                 continue
+            if enter_boss():
+                break
+            fail_count += 1
+
         logger.info('Boss battle confirm and enter')
         # 等待挑战, 5秒也是等
         time.sleep(5)
-        self.device.stuck_record_add('BATTLE_STATUS_S')
-        self.wait_until_disappear(self.I_BOSS_GATHER)
-        self.device.stuck_record_clear()
-        self.device.stuck_record_add('BATTLE_STATUS_S')
         # 延长时间并在战斗结束后改回来
         self.device.stuck_timer_long = Timer(480, count=480).start()
+        #
         config = self.con
-        self.run_general_battle(config)
+        while True:
+            self.screenshot()
+            if self.appear(self.I_BOSS_DONE_CHECK):
+                break
+            if self.appear(self.I_BOSS_GATHER):
+                self.device.stuck_record_clear()
+                self.device.stuck_record_add('BATTLE_STATUS_S')
+                logger.info('Boss Gathering...')
+                sleep(2)
+                continue
+            if self.appear(self.I_BOSS_WAIT):
+                logger.info('Boss battle failed, waiting for 2 seconds...')
+                sleep(2)
+                continue
+            if self.appear(self.I_PREPARE_HIGHLIGHT):
+                self.run_general_battle(config)
+                continue
+            logger.info('Unknown scene Or Boss fight failed.waiting for Prepare_Button appear...')
+            self.wait_until_appear(self.I_PREPARE_HIGHLIGHT, wait_time=2)
+
         self.device.stuck_timer_long = Timer(300, count=300).start()
 
         # 等待回到挑战boss主界面
@@ -256,7 +333,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
     def con(self) -> GeneralBattleConfig:
         return GeneralBattleConfig()
 
-    def check_lantern(self, index: int=1):
+    def check_lantern(self, index: int = 1):
         """
         检查灯笼的类型
         :param index: 四个灯笼,从1开始
@@ -363,7 +440,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             if self.click(target_click, interval=1):
                 continue
         logger.info('Question answering Start')
-        for i in range(1,4):
+        for i in range(1, 4):
             # 还未测试题库无法识别的情况
             logger.hr(f'Answer {i}', 3)
             answer_click = answer()
@@ -386,9 +463,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 if not self.appear(self.I_LETTER_CLOSE):
                     time.sleep(0.5)
                     self.screenshot()
-                    if self.appear(self.I_LETTER_CLOSE):
-                        continue
-                    else:
+                    if not self.appear(self.I_LETTER_CLOSE):
                         logger.warning('Answer finish')
                         return
 
@@ -454,7 +529,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             if self.click(target_click, interval=2.3):
                 continue
 
-
     def check_time(self):
         """
         检查时间是否正确,

+ 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


+ 6 - 2
tasks/ExperienceYoukai/assets.py

@@ -7,6 +7,10 @@ from module.atom.list import RuleList
 
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
-class ExperienceYoukaiAssets: 
-	pass
+class ExperienceYoukaiAssets:
 
+
+    # Image Rule Assets
+    # 经验妖怪的赢
+	I_EXP_WIN = RuleImage(roi_front=(380, 44, 100, 100), roi_back=(380, 44, 100, 100), threshold=0.8,
+					   method="Template matching", file="./tasks/ExperienceYoukai/ey/ey_exp_win.png")

+ 7 - 1
tasks/ExperienceYoukai/config.py

@@ -5,7 +5,13 @@ from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
+
+class ExperienceYoukaiConfig(ConfigBase):
+    buff_exp_50_click: bool = Field(default=False)
+    buff_exp_100_click: bool = Field(default=False)
 
 class ExperienceYoukai(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-
+    experience_youkai: ExperienceYoukaiConfig = Field(default_factory=ExperienceYoukaiConfig)
+    switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)

BIN
tasks/ExperienceYoukai/ey/ey_exp_win.png


+ 11 - 0
tasks/ExperienceYoukai/ey/image.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "exp_win",
+    "imageName": "ey_exp_win.png",
+    "roiFront": "380,44,100,100",
+    "roiBack": "380,44,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "经验妖怪的赢"
+  }
+]

+ 91 - 13
tasks/ExperienceYoukai/script_task.py

@@ -15,27 +15,104 @@ from tasks.Component.GeneralRoom.general_room import GeneralRoom
 from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.ExperienceYoukai.assets import ExperienceYoukaiAssets
+from tasks.ExperienceYoukai.config import ExperienceYoukaiConfig
+
 
 class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, ExperienceYoukaiAssets):
 
     def run(self):
-        con = self.config.experience_youkai
-        self.ui_get_current_page()
-        self.ui_goto(page_team)
-        self.check_zones('经验妖怪')
+        # 切换御魂
+        if self.config.experience_youkai.switch_soul.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(self.config.experience_youkai.switch_soul.switch_group_team)
+
+        if self.config.experience_youkai.switch_soul.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(self.config.experience_youkai.switch_soul.group_name,
+                                         self.config.experience_youkai.switch_soul.team_name)
+
+        # 开启加成
+        con = self.config.experience_youkai.experience_youkai
+        if con.buff_exp_50_click or con.buff_exp_100_click:
+            self.ui_get_current_page()
+            self.ui_goto(page_main)
+            self.open_buff()
+            if con.buff_exp_50_click:
+                self.exp_50()
+            if con.buff_exp_100_click:
+                self.exp_100()
+            self.close_buff()
+        count = 0
+        while count < 2:
+            self.ui_get_current_page()
+            self.ui_goto(page_team)
+            self.check_zones('经验妖怪')
+            # 开始
+            if not self.create_room():
+                self.experience_exit(con)
+            self.ensure_public()
+            self.create_ensure()
+            # 进入到了房间里面
+            wait_timer = Timer(50)
+            wait_timer.start()
+            while 1:
+                self.screenshot()
 
-        self.exp_exit()
+                if not self.is_in_room():
+                    continue
+                if wait_timer.reached():
+                    # 超过时间依然挑战
+                    logger.warning('Wait for too long and start the challenge')
+                    self.click_fire()
+                    count += 1
+                    self.run_general_battle()
+                    break
+                if not self.appear(self.I_ADD_5_1):
+                    # 有人进来了,可以进行挑战
+                    logger.info('There is someone in the room and start the challenge')
+                    self.click_fire()
+                    count += 1
+                    self.run_general_battle()
+                    break
+        # 退出 (要么是在组队界面要么是在庭院)
+        self.experience_exit(con)
 
-    def exp_exit(self, con=None):
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 重写
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        # 战斗过程 随机点击和滑动 防封
+        logger.info("Start battle process")
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_PREPARE_HIGHLIGHT,interval=1):
+                logger.info('click prepare')
+            if self.appear(self.I_DE_WIN):
+                logger.info('Win battle')
+                self.ui_click_until_disappear(self.I_DE_WIN)
+                return True
+            if self.appear(self.I_EXP_WIN):
+                logger.info('Win battle')
+                self.ui_click_until_disappear(self.I_EXP_WIN)
+                return True
+
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                self.ui_click_until_disappear(self.I_FALSE)
+                return False
+
+    def experience_exit(self, con):
         self.ui_get_current_page()
         self.ui_goto(page_main)
-        # if con.buff_gold_50_click or con.buff_gold_100_click:
-        #     self.open_buff()
-        #     if con.buff_gold_50_click:
-        #         self.gold_50(False)
-        #     if con.buff_gold_100_click:
-        #         self.gold_100(False)
-        #     self.close_buff()
+        if con.buff_exp_50_click or con.buff_exp_100_click:
+            self.open_buff()
+            if con.buff_exp_50_click:
+                self.exp_50(False)
+            if con.buff_exp_100_click:
+                self.exp_100(False)
+            self.close_buff()
 
         self.set_next_run(task='ExperienceYoukai', success=True, finish=False)
         raise TaskEnd('ExperienceYoukai')
@@ -43,6 +120,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul,
 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)

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

+ 1 - 1
tasks/GameUi/assets.py

@@ -159,7 +159,7 @@ class GameUiAssets:
 	# description 
 	I_CHECK_TEAM = RuleImage(roi_front=(32,585,82,90), roi_back=(32,585,82,90), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_team.png")
 	# description 
-	I_CHECK_COLLECTION = RuleImage(roi_front=(471,618,100,100), roi_back=(471,618,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_collection.png")
+	I_CHECK_COLLECTION = RuleImage(roi_front=(380,620,100,100), roi_back=(380,620,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_collection.png")
 	# description 
 	I_BACK_Y = RuleImage(roi_front=(15,4,57,52), roi_back=(1,2,100,91), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_y.png")
 	# description 

BIN
tasks/GameUi/page/page_check_collection.png


+ 2 - 2
tasks/GameUi/page/page_img_3.json

@@ -137,8 +137,8 @@
   {
     "itemName": "check_collection",
     "imageName": "page_check_collection.png",
-    "roiFront": "471,618,100,100",
-    "roiBack": "471,618,100,100",
+    "roiFront": "380,620,100,100",
+    "roiBack": "380,620,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

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

+ 1 - 1
tasks/Secret/script_task.py

@@ -84,7 +84,7 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
                     logger.warning('You have completed the weekly trifles, skip')
                     break
                 text = self.O_SE_TOTAL_TIME.ocr_single(self.device.image)
-                if '总耗时' in text:
+                if '尚未' not in text:
                     logger.warning('You have completed the weekly trifles, skip')
                     break
                 continue

+ 2 - 2
tasks/WeeklyTrifles/assets.py

@@ -51,7 +51,7 @@ class WeeklyTriflesAssets:
 
 	# Image Rule Assets
 	# 点击“式神” 
-	I_WT_SHIKIAGMI = RuleImage(roi_front=(494,650,56,49), roi_back=(494,650,56,49), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_shikiagmi.png")
+	I_WT_SHIKIAGMI = RuleImage(roi_front=(280,620,920,100), roi_back=(280,620,920,100), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_shikiagmi.png")
 	# 点击式神绘卷 
 	I_WT_SCROLL = RuleImage(roi_front=(1128,615,77,67), roi_back=(1128,615,77,67), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_scroll.png")
 	# 点击分享 
@@ -61,7 +61,7 @@ class WeeklyTriflesAssets:
 	# 百妖风物鉴 
 	I_WT_SCROLL_2 = RuleImage(roi_front=(1182,24,24,122), roi_back=(1163,12,63,155), threshold=0.7, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_scroll_2.png")
 	# 微信分享 
-	I_WT_COLLECT_WECHAT = RuleImage(roi_front=(386,619,70,63), roi_back=(386,619,70,63), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_collect_wechat.png")
+	I_WT_COLLECT_WECHAT = RuleImage(roi_front=(280,600,440,100), roi_back=(280,600,440,100), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_collect_wechat.png")
 	# 二维码 
 	I_WT_QR_CODE = RuleImage(roi_front=(473,161,336,96), roi_back=(404,112,483,168), threshold=0.65, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_qr_code.png")
 

+ 4 - 4
tasks/WeeklyTrifles/collect/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "wt_shikiagmi",
     "imageName": "collect_wt_shikiagmi.png",
-    "roiFront": "494,650,56,49",
-    "roiBack": "494,650,56,49",
+    "roiFront": "280,620,920,100",
+    "roiBack": "280,620,920,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击“式神”"
@@ -47,8 +47,8 @@
   {
     "itemName": "wt_collect_wechat",
     "imageName": "collect_wt_collect_wechat.png",
-    "roiFront": "386,619,70,63",
-    "roiBack": "386,619,70,63",
+    "roiFront": "280,600,440,100",
+    "roiBack": "280,600,440,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "微信分享"