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

Merge pull request #1384 from runhey/dev

Dev
huangrunheng 9 месяцев назад
Родитель
Сommit
e941d26d81
34 измененных файлов с 416 добавлено и 124 удалено
  1. 91 0
      module/atom/RuleImageMallResourceMixin.py
  2. 2 2
      module/atom/image.py
  3. 28 16
      module/atom/ocr.py
  4. 5 0
      module/device/handle.py
  5. 34 1
      tasks/DemonEncounter/data/data.csv
  6. 78 47
      tasks/Exploration/base.py
  7. 1 1
      tasks/GameUi/assets.py
  8. 45 1
      tasks/RealmRaid/script_task.py
  9. 24 11
      tasks/RichMan/assets.py
  10. 2 2
      tasks/RichMan/mall/charisma.py
  11. 4 4
      tasks/RichMan/mall/friendship_points.py
  12. 4 4
      tasks/RichMan/mall/medal.py
  13. 47 0
      tasks/RichMan/mall/navbar/image_mall_resource.json
  14. 9 9
      tasks/RichMan/mall/navbar/image_side.json
  15. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_ap.png
  16. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_charisma.png
  17. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_friends.png
  18. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_honor.png
  19. BIN
      tasks/RichMan/mall/navbar/navbar_mall_resource_medal.png
  20. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_charisma.png
  21. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_friends.png
  22. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_honor.png
  23. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_medal.png
  24. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_special.png
  25. BIN
      tasks/RichMan/mall/navbar/navbar_side_suer_honor.png
  26. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png
  27. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_friends.png
  28. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_medal.png
  29. BIN
      tasks/RichMan/mall/navbar/navbar_side_sure_special.png
  30. 10 10
      tasks/RichMan/mall/navbar/ocr.json
  31. 3 1
      tasks/SoulsTidy/assets.py
  32. 19 14
      tasks/SoulsTidy/script_task.py
  33. 10 1
      tasks/SoulsTidy/simple/image.json
  34. BIN
      tasks/SoulsTidy/simple/simple_st_soul_stack.png

+ 91 - 0
module/atom/RuleImageMallResourceMixin.py

@@ -0,0 +1,91 @@
+# module/atom/image/image_mall_resource.py
+
+from module.logger import logger
+from module.atom.ocr import RuleOcr
+
+
+class RuleImageMallResourceMixin:
+    """
+    RuleImage 的 mall_resource 能力扩展
+    """
+
+    # mall_resource 专用偏移参数
+    MALL_RESOURCE_X_OFFSET = 40
+    MALL_RESOURCE_RIGHT_EXTEND = 70
+
+    def match_and_get_roi(self, image, threshold=None):
+        """
+        - match 成功 → 返回 (x, y, w, h)
+        - match 失败 / 异常 → 返回 None
+        """
+        try:
+            ok = self.match(image, threshold)
+        except Exception as e:
+            logger.error(f"match exception: {e}")
+            return None
+
+        if not ok:
+            return None
+
+        try:
+            mat = self.image
+            if mat is None or mat.shape[0] == 0 or mat.shape[1] == 0:
+                return None
+
+            h, w = mat.shape[:2]
+            x = int(self.roi_front[0])
+            y = int(self.roi_front[1])
+
+            return (x, y, int(w), int(h))
+        except Exception:
+            return None
+
+    def get_mall_resource_text_roi(self, image, threshold=None):
+        """
+        mall_resource 专用:
+        - 定位 icon
+        - 推导文本 OCR ROI
+
+        return: roi or None
+        """
+        try:
+            icon_roi = self.match_and_get_roi(image, threshold)
+            if icon_roi is None:
+                # 回退 roi_front
+                ix, iy, iw, ih = self.roi_front
+            else:
+                ix, iy, iw, ih = icon_roi
+
+            x = int(ix) + self.MALL_RESOURCE_X_OFFSET
+            y = int(iy)
+            w = int(iw) + self.MALL_RESOURCE_RIGHT_EXTEND
+            h = int(ih)
+
+            return (x, y, w, h)
+        except Exception:
+            return None
+
+    def build_mall_resource_ocr(self, image, threshold=None, name="mall_resource"):
+        """
+        mall_resource 专用快捷方法:
+        - 定位 icon
+        - 推导 OCR ROI
+        - 构造 RuleOcr
+
+        return: RuleOcr | None
+        """
+        try:
+            roi = self.get_mall_resource_text_roi(image, threshold)
+            if roi is None:
+                return None
+
+            return RuleOcr(
+                roi=roi,
+                area=roi,
+                mode="Quantity",
+                method="Default",
+                keyword="",
+                name=name
+            )
+        except Exception:
+            return None

+ 2 - 2
module/atom/image.py

@@ -7,12 +7,13 @@ import numpy as np
 from numpy import float32, int32, uint8, fromfile
 from pathlib import Path
 
+from module.atom.RuleImageMallResourceMixin import RuleImageMallResourceMixin
 from module.base.decorator import cached_property
 from module.logger import logger
 from module.base.utils import is_approx_rectangle
 
 
-class RuleImage:
+class RuleImage(RuleImageMallResourceMixin):
     debug_mode: bool = False
 
     def __init__(self, roi_front: tuple, roi_back: tuple, method: str, threshold: float, file: str) -> None:
@@ -343,7 +344,6 @@ class RuleImage:
                 return False
         return True
 
-
 if __name__ == "__main__":
     from dev_tools.assets_test import detect_image
 

+ 28 - 16
module/atom/ocr.py

@@ -54,21 +54,33 @@ class RuleOcr(Digit, DigitCounter, Duration, Single, Full, Quantity):
         y = np.random.randint(y, y + h)
         return x, y
 
-
-
 if __name__ == "__main__":
-    O_MALL_RESOURCE_1 = RuleOcr(roi=(144, 7, 100, 43), area=(144, 7, 100, 43), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_1")
-    O_MALL_RESOURCE_2 = RuleOcr(roi=(326, 8, 124, 39), area=(326, 8, 124, 39), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_2")
-    O_MALL_RESOURCE_3 = RuleOcr(roi=(533, 9, 107, 38), area=(533, 9, 107, 38), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_3")
-    O_MALL_RESOURCE_4 = RuleOcr(roi=(739, 8, 100, 39), area=(739, 8, 100, 39), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_4")
-    O_MALL_RESOURCE_5 = RuleOcr(roi=(935, 11, 100, 37), area=(935, 11, 100, 37), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_5")
-    O_MALL_RESOURCE_6 = RuleOcr(roi=(1129, 6, 100, 41), area=(1129, 6, 100, 41), mode="Quantity", method="Default",
-                                keyword="", name="mall_resource_6")
-    image = cv2.imread(r"E:\2025-01-16225353.png")
-    print(O_MALL_RESOURCE_5.ocr_quantity(image))
+    # O_MALL_RESOURCE_1 = RuleOcr(roi=(144, 7, 100, 43), area=(144, 7, 100, 43), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_1")
+    # O_MALL_RESOURCE_2 = RuleOcr(roi=(326, 8, 124, 39), area=(326, 8, 124, 39), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_2")
+    # O_MALL_RESOURCE_3 = RuleOcr(roi=(533, 9, 107, 38), area=(533, 9, 107, 38), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_3")
+    # O_MALL_RESOURCE_4 = RuleOcr(roi=(739, 8, 100, 39), area=(739, 8, 100, 39), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_4")
+    # O_MALL_RESOURCE_5 = RuleOcr(roi=(935, 11, 100, 37), area=(935, 11, 100, 37), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_5")
+    # O_MALL_RESOURCE_6 = RuleOcr(roi=(1129, 6, 100, 41), area=(1129, 6, 100, 41), mode="Quantity", method="Default",
+    #                             keyword="", name="mall_resource_6")
+    # image = cv2.imread(r"E:\2025-01-16225353.png")
+    # print(O_MALL_RESOURCE_5.ocr_quantity(image))
+    from module.atom.image import RuleImage
+    image = cv2.imread(r"E:\Debug\MuMu-20260119-114931-173.png")
+
+    I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(155,8,42,42), roi_back=(155,7,1115,90), threshold=0.7, method="Template matching", file="E:\Debug\\navbar_mall_sccales_check.png")
+
+    #roi = I_SIDE_CHECK_SPECIAL.get_mall_resource_text_roi(image, threshold=0.7)
+
+    rule = I_SIDE_CHECK_SPECIAL.build_mall_resource_ocr(
+        image,
+        threshold=0.7,
+        name="mall_resource_1"
+    )
+
+    print(rule.ocr_quantity(image))
 

+ 5 - 0
module/device/handle.py

@@ -306,6 +306,8 @@ class Handle:
             name = self.root_node.children[0].name
             if name == 'MuMuPlayer':
                 return EmulatorFamily.FAMILY_MUMU
+            elif name == 'MuMuNxDevice':
+                return EmulatorFamily.FAMILY_MUMU
             elif name == 'NemuPlayer':
                 return EmulatorFamily.FAMILY_MUMU
             elif name == 'TheRender':
@@ -348,6 +350,9 @@ class Handle:
             elif name == 'NemuPlayer':
                 logger.info('The emulator is MuMu模拟器')
                 return num
+            elif name == 'MuMuNxDevice':
+                logger.info('The emulator is MuMu模拟器5.0')
+                return num
         # 夜神
         elif self.emulator_family == EmulatorFamily.FAMILY_NOX:
             try:

+ 34 - 1
tasks/DemonEncounter/data/data.csv

@@ -1576,4 +1576,37 @@ SSR式神可以通过多少个对应的式神碎片召唤获得,50
 头像框一百鬼之主的获得方式是,为崽而战捌段前十
 以下式神中哪一位是可爱的女孩子,纸舞
 想要回顾已经解锁的绘卷剧情入口是,点击庭院大树一追忆绘卷
-御魂珍珠的四件套可能触发的效果是,使被治疗目标获得护
+御魂珍珠的四件套可能触发的效果是,使被治疗目标获得护
+冥界中谁拥阁魔之目一双审善度恶,阁魔
+以下式神中想要和哥哥永远在一起的是,愧师
+以下式神中来自高天原的是,御津
+御魂挣的四件套可能触发的效果是,反击
+以下式神中哪一位是可爱的女孩子,纸舞
+头像框一百鬼之主的获得方式是,为崽而战捌段前十
+式神的觉醒需要什么材料,觉醒材料
+想要回顾已经解锁的绘卷剧情入口是,点击庭院大树一追忆绘卷
+剧情中阁魔要求晴明镇压的妖怪是谁,俺师
+初翎山风的被动技能拥有以下哪种能力,增加行动条
+SSR阶式神可以通过多少个对应的式神碎片召喚获得,50
+每日可从阴阳寮领取的寮资金上限是,30万
+摄影玩法的入口位置在哪里,式神录皮肤界面
+解锁山兔传记三需要用山兔与携带哪个式神的其他玩家取得10次组队胜,孟婆
+荒的技能星辰之境所触发的幻境附帶以下哪一个效果,荒的协战
+以下哪位式神的稀有度与其他选项的式神不同,雨女
+被椒图的技能涓流链接的式神每次行动后恢复椒图百分之多少的生,5
+SR阶式神可以通过多少个对应的式神碎片召喚获得,40
+阴阳寮的狩猎战中挑战的鬼王是,麒麟
+阴阳师空间中可以展示多少个徽章,6
+荒川中最強大的妖怪是,荒川之主
+每天的1214点2022点小纸人会将什么送到庭院中来,寿司体力
+铃鹿御前的麓魂极获得的护盾与自身的哪个属性有关,攻击
+化鲸的体甲的携帶者在行动前治疗生命与化鲸的哪个属性有关,生命上限
+根据剧情及传记座敷童子会给家庭带来,幸运
+阿修罗攻击目标并造成击杀时会对目标附加以下哪种印记,诛灭
+每周最多可以使用八岐大蛇鳞片兌換多少个朴素的御魂礼盒,40
+不攜帶任何御魂的凤凰火能附加哪种控制效果,眩晕
+地震所说的冒牌货是指谁,追月神
+提升御灵等级不能做到的是,获得御灵皮肤
+不攜帶任何御魂的辉夜姬普攻会概率触发什么效果,削減敌方目标鬼火
+主线探索时小纸人会在地图中做什么,扫地
+不攜帶任何御魂的食梦貘能附加哪种控制效果,沉睡

+ 78 - 47
tasks/Exploration/base.py

@@ -211,14 +211,11 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
             if not self.appear(self.I_E_OPEN_SETTINGS):
                 logger.warning('Opening settings failed due to now in battle')
                 return
-
-        # 先点候补式神区域,再切换稀有度,避免点击失败
-        self.click(self.C_CLICK_STANDBY_TEAM)
-
         choose_rarity = self._config.exploration_config.choose_rarity
         rarity = ShikigamiClass.N if choose_rarity == ChooseRarity.N else ShikigamiClass.MATERIAL
         self.switch_shikigami_class(rarity)
 
+        self.click(self.C_CLICK_STANDBY_TEAM)
         # 移动至未候补的狗粮
         while 1:
             # 慢一点
@@ -231,11 +228,7 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
                 self.swipe(self.S_SWIPE_SHIKI_TO_LEFT)
             else:
                 break
-        operation_timeout = Timer(60)
-        operation_timeout.start()
         while 1:
-            if operation_timeout.reached():
-                raise GameStuckError('Adding shikigami timeout')
             # 候补出战数量识别
             self.screenshot()
             if not self.appear(self.I_E_OPEN_SETTINGS):
@@ -257,6 +250,8 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
     def search_up_fight(self, up_type: UpType = None):
         if up_type is None:
             up_type = self._config.exploration_config.up_type
+        
+        # 1. 如果选择了特定的 UP 类型 (比如达摩)
         if up_type != UpType.ALL:
             match up_type:
                 case UpType.EXP:
@@ -267,40 +262,63 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
                     find_flag = self.I_UP_DARUMA
                 case _:
                     find_flag = self.I_UP_EXP
-            appear = self.appear(find_flag)
-            if not appear:
-                return None
-            logger.info(f'Found up type: {up_type} at  {find_flag.roi_front}')
-            x, y, _, _ = find_flag.roi_front
-            x_center, y_center = find_flag.front_center()
-            roi_back_y = max(0, y - 300)
-            roi_back_h = y - 20 - roi_back_y
-            roi_back_x = max(0, x - 160)
-            roi_back_w = min(1280, x + 200) - roi_back_x
-            # self.I_NORMAL_BATTLE_BUTTON.roi_back = [roi_back_x, roi_back_y, roi_back_w, roi_back_h]
-            logger.info(f'It will search normal battle button at {roi_back_x, roi_back_y, roi_back_w, roi_back_h}')
-            matches = self.I_NORMAL_BATTLE_BUTTON.match_all(
-                image=self.device.image,
-                threshold=0.9,
-                roi=[roi_back_x, roi_back_y, roi_back_w, roi_back_h]
-            )
-            if not matches:
-                return None
-            distances = []
-            for match in matches:
-                x_match, y_match = match[1], match[2]
-                distance = np.linalg.norm(
-                    np.array([x_center, y_center]) - np.array([x_match, y_match])
+            
+            # 尝试寻找 UP 图标
+            if self.appear(find_flag):
+                # 获取 UP 图标的坐标和中心点
+                x, y, w, h = find_flag.roi_front
+                x_center, y_center = find_flag.front_center()
+                
+                logger.info(f'Found up type: {up_type} at {find_flag.roi_front}')
+
+                # 缩小搜索范围 (ROI)
+                # 原来左右各扩 160-200,太宽了容易甚至把隔壁怪算进来
+                # 现在改为左右各扩 50-80,强制只找垂直线附近的战斗图标
+                roi_back_y = max(0, y - 300)      # 向上找300像素
+                roi_back_h = y - 20 - roi_back_y  #直到UP图标上方20像素截止
+                
+                # 左右范围缩窄:防止误触旁边的怪
+                roi_back_x = max(0, x - 60)       
+                roi_back_w = min(1280, x + w + 60) - roi_back_x
+                
+                logger.info(f'Searching sword icon in narrowed area: {roi_back_x, roi_back_y, roi_back_w, roi_back_h}')
+                
+                matches = self.I_NORMAL_BATTLE_BUTTON.match_all(
+                    image=self.device.image,
+                    threshold=0.9,
+                    roi=[roi_back_x, roi_back_y, roi_back_w, roi_back_h]
                 )
-                distances.append((distance, match))
-            distances.sort(key=lambda x: x[0], reverse=False)
-            match = distances[0][1]
-            roi_front = list(match[1:])  # x,y,w,h
-            self.I_NORMAL_BATTLE_BUTTON.roi_front = roi_front
-            logger.info(f"Found normal battle button at {roi_front}")
-            return self.I_NORMAL_BATTLE_BUTTON
+                
+                if matches:
+                    distances = []
+                    for match in matches:
+                        # 这里假设 match[1], match[2] 是 x, y
+                        x_match = match[1] + match[3] / 2  # 战斗图标中心 X
+                        y_match = match[2] + match[4] / 2  # 战斗图标中心 Y
+                        
+                        # 这样能完美避开“距离很近但属于隔壁怪”的情况
+                        x_diff = abs(x_center - x_match)
+                        y_diff = abs(y_center - y_match)
+                        weighted_distance = (x_diff * 3) + y_diff
+                        
+                        distances.append((weighted_distance, match))
+                    
+                    # 按加权距离排序,取最正对着的一个
+                    distances.sort(key=lambda x: x[0], reverse=False)
+                    match = distances[0][1]
+                    
+                    roi_front = list(match[1:])  # x,y,w,h
+                    self.I_NORMAL_BATTLE_BUTTON.roi_front = roi_front
+                    logger.info(f"Target locked: sword at {roi_front} (aligned with UP icon)")
+                    return self.I_NORMAL_BATTLE_BUTTON
+            else:
+                # 没找到 UP 图标,返回 None 让外层逻辑去处理(滑动或退出)
+                return None
+
+        # 2. 如果是默认情况 (UpType.ALL),则只要有怪就打
         if self.appear(self.I_NORMAL_BATTLE_BUTTON):
             return self.I_NORMAL_BATTLE_BUTTON
+            
         return None
 
     def activate_realm_raid(self, con_scrolls, con) -> None:
@@ -334,9 +352,9 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         # 设置下次执行行时间
         logger.info("RealmRaid and Exploration  set_next_run !")
         next_run = datetime.now() + con_scrolls.scrolls_cd
-        self.set_next_run(task='Exploration', success=None, finish=False, target=next_run)
-        self.set_next_run(task='RealmRaid', success=None, finish=False, target=datetime.now())
-        self.set_next_run(task='MemoryScrolls', success=None, finish=False, target=datetime.now())
+        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
 
     #
@@ -355,19 +373,32 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         logger.info('Quit explore')
         boss_timer = Timer(15)
         boss_timer.start()
+        
         while 1:
             self.screenshot()
+            
             if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_E_EXPLORATION_CLICK):
                 break
+  
+            # 防止BOSS打完箱子刚落地,脚本就手快点退出了
+            if self.appear_then_click(self.I_BATTLE_REWARD, interval=1.5):
+                logger.info("Found battle reward during exit, picking it up.")
+                boss_timer.reset()
+                continue
+
             if boss_timer.reached():
-                # https://github.com/runhey/OnmyojiAutoScript/issues/548
-                logger.warning('Exit immediately after the boss battle')
-                break
+                logger.warning('Exit timeout, force clicking back button')
+                boss_timer.reset()
+                self.click(self.I_UI_BACK_BLUE)
+                continue
+
             if self.appear_then_click(self.I_E_EXIT_CONFIRM, interval=0.8):
                 continue
-            if self.appear(self.I_EXPLORATION_TITLE) or self.appear(self.I_CHECK_EXPLORATION):
+            
+            if self.appear_then_click(self.I_BACK_YOLLOW, interval=3.5):
                 continue
-            if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=3.5):
+            
+            if self.appear(self.I_EXPLORATION_TITLE) or self.appear(self.I_CHECK_EXPLORATION):
                 continue
 
     def fire(self, button) -> bool:

+ 1 - 1
tasks/GameUi/assets.py

@@ -113,7 +113,7 @@ class GameUiAssets:
 	# 百鬼奕 
 	I_TOWN_GOTO_HYAKKISEN = RuleImage(roi_front=(192,145,48,67), roi_back=(86,130,447,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_town_goto_hyakkisen.png")
 	# description 
-	I_CHECK_DUEL = RuleImage(roi_front=(110,10,64,38), roi_back=(79,1,110,74), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_duel.png")
+	I_CHECK_DUEL = RuleImage(roi_front=(155,20,64,38), roi_back=(140,10,110,74), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_duel.png")
 	# description 
 	I_CHECK_DEMON_ENCOUNTER = RuleImage(roi_front=(26,658,42,43), roi_back=(2,619,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter.png")
 	# 检查狩猎战界面 

+ 45 - 1
tasks/RealmRaid/script_task.py

@@ -155,6 +155,11 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
         # 更改循环顺序
         while 1:
             self.screenshot()
+            #看到弹窗点掉,不然会卡死
+            if self.appear(self.I_FRESH_ENSURE):
+                logger.info("Pop-up detected: Refresh Confirmation. Clicking Confirm.")
+                self.appear_then_click(self.I_FRESH_ENSURE, interval=1.5)
+                continue
             # 检查票数
             if not self.check_ticket(con.raid_config.number_base):
                 break
@@ -175,6 +180,11 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
                         break
                 else:
                     logger.info('No one can attack, break')
+                    # 检查是否有“刷新确认”弹窗挡路
+                    if self.appear(self.I_FRESH_ENSURE):
+                        logger.info("Closing obstructing refresh dialog (Click Ensure)...")
+                        # 点击“确定”来完成刷新(或者你可以改成点取消)
+                        self.appear_then_click(self.I_FRESH_ENSURE, interval=2)
                     success = False
                     break
             # 判断是不是左上角第一个
@@ -469,16 +479,50 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
         :param order:  第几个
         :return:
         """
+        retry_clean = 0
+        while not self.appear(self.I_RR_PERSON):
+            if retry_clean > 20:
+                logger.warning("Stuck too long, try force quit or random click")
+            
+            logger.info("Title not found! Checking for popups or rewards...")
+            
+            # 如果看到了“刷新确认”弹窗 (I_FRESH_ENSURE 是右边的确定)
+            if self.appear(self.I_FRESH_ENSURE):
+                logger.info("Refresh popup detected! Clicking CANCEL (Red Button).")
+                # 点击“取消”按钮的坐标 (基于1280x720分辨率)
+                self.device.click(x=530, y=460) 
+                time.sleep(1.5)
+                self.screenshot()
+                continue
+
+            # 点击屏幕正上方 (640, 50),而不是右下角,避免误触"刷新"按钮
+            logger.info("Clicking safe area to clear rewards...")
+            self.device.click(x=640, y=50)  
+            time.sleep(1.5)
+            self.screenshot()
+            retry_clean += 1
+        
         click = self.partition[order - 1]
-        self.wait_until_appear(self.I_RR_PERSON)
+        
+        # 进攻循环
         while 1:
             self.screenshot()
+            
+            # 双重保险:如果在进攻阶段又弹出了窗口,也把它关掉
+            if self.appear(self.I_FRESH_ENSURE):
+                logger.info("Refresh popup blocking attack! Clicking CANCEL.")
+                self.device.click(x=530, y=460) # 点取消
+                time.sleep(1.0)
+                continue
+
             if not self.appear(self.I_RR_PERSON, threshold=0.8):
                 break
+                
             if self.appear_then_click(self.I_FIRE, interval=1):
                 continue
             if self.click(click, interval=1.8):
                 continue
+                
         logger.info(f'Click fire {order} success')
 
     @cached_property

+ 24 - 11
tasks/RichMan/assets.py

@@ -173,40 +173,53 @@ class RichManAssets:
 	I_MALL_SUNDRY_CHECK = RuleImage(roi_front=(1093,10,31,44), roi_back=(1093,10,31,44), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png")
 
 
+	# Image Rule Assets
+	# 体力 
+	I_MALL_RESOURCE_AP = RuleImage(roi_front=(155,7,45,43), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_ap.png")
+	# 荣誉 
+	I_MALL_RESOURCE_HONOR = RuleImage(roi_front=(722,11,41,42), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_honor.png")
+	# 友情点 
+	I_MALL_RESOURCE_FRIENDS = RuleImage(roi_front=(908,8,39,43), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_friends.png")
+	# 勋章 
+	I_MALL_RESOURCE_MEDAL = RuleImage(roi_front=(535,9,40,44), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_medal.png")
+	# 魅力值 
+	I_MALL_RESOURCE_CHARISMA = RuleImage(roi_front=(906,5,48,46), roi_back=(155,7,1115,90), threshold=0.7, method="Default", file="./tasks/RichMan/mall/navbar/navbar_mall_resource_charisma.png")
+
+
 	# Image Rule Assets
 	# 特殊 
 	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
 	# 特殊 
-	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(215,7,42,42), roi_back=(215,7,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
+	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(155,8,42,42), roi_back=(155,8,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
 	# 荣誉 
 	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.6, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
 	# 荣誉 
-	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(752,11,41,42), roi_back=(752,11,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
+	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(722,11,41,42), roi_back=(722,11,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
 	# 友情点 
 	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), roi_back=(1163,258,93,126), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
 	# 友情点 
-	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(925,8,39,43), roi_back=(9,8,1266,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
+	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(908,8,39,43), roi_back=(9,8,1266,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
 	# 勋章 
 	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1190,404,39,62), roi_back=(1156,352,112,128), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
 	# 勋章 
-	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(665,6,40,44), roi_back=(453,1,476,58), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
+	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(535,9,40,44), roi_back=(453,1,476,58), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
 	# 魅力值 
-	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1181,467,59,58), roi_back=(1158,445,101,142), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
+	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1181,502,59,58), roi_back=(1158,475,101,112), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
 	# 魅力值 
-	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(917,9,48,46), roi_back=(886,1,114,80), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
+	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(906,5,48,46), roi_back=(886,1,114,80), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
 
 
 	# Ocr Rule Assets
 	# 左数第一个 
-	O_MALL_RESOURCE_1 = RuleOcr(roi=(261,8,100,43), area=(261,8,100,43), mode="Quantity", method="Default", keyword="", name="mall_resource_1")
+	O_MALL_RESOURCE_1 = RuleOcr(roi=(208,7,100,43), area=(208,7,100,43), mode="Quantity", method="Default", keyword="", name="mall_resource_1")
 	# 左数第二个 
-	O_MALL_RESOURCE_2 = RuleOcr(roi=(415,8,124,39), area=(415,8,124,39), mode="Quantity", method="Default", keyword="", name="mall_resource_2")
+	O_MALL_RESOURCE_2 = RuleOcr(roi=(382,8,124,39), area=(382,8,124,39), mode="Quantity", method="Default", keyword="", name="mall_resource_2")
 	# 左数第三个 
-	O_MALL_RESOURCE_3 = RuleOcr(roi=(596,10,107,38), area=(596,10,107,38), mode="Quantity", method="Default", keyword="", name="mall_resource_3")
+	O_MALL_RESOURCE_3 = RuleOcr(roi=(574,9,127,38), area=(574,9,127,38), mode="Quantity", method="Default", keyword="", name="mall_resource_3")
 	# 左数第四个 
-	O_MALL_RESOURCE_4 = RuleOcr(roi=(783,9,100,39), area=(783,9,100,39), mode="Quantity", method="Default", keyword="", name="mall_resource_4")
+	O_MALL_RESOURCE_4 = RuleOcr(roi=(755,9,128,39), area=(755,9,128,39), mode="Quantity", method="Default", keyword="", name="mall_resource_4")
 	# 左数第五个 
-	O_MALL_RESOURCE_5 = RuleOcr(roi=(958,9,100,37), area=(958,9,100,37), mode="Quantity", method="Default", keyword="", name="mall_resource_5")
+	O_MALL_RESOURCE_5 = RuleOcr(roi=(943,9,116,37), area=(943,9,116,37), mode="Quantity", method="Default", keyword="", name="mall_resource_5")
 	# 左数第六个 
 	O_MALL_RESOURCE_6 = RuleOcr(roi=(1129,6,100,41), area=(1129,6,100,41), mode="Quantity", method="Default", keyword="", name="mall_resource_6")
 	# 左数第二排第一个 

+ 2 - 2
tasks/RichMan/mall/charisma.py

@@ -25,12 +25,12 @@ class Charisma(FriendshipPoints):
         # 黑色碎片
         if con.black_daruma_scrap:
             self.buy_mall_more(buy_button=self.I_CH_BLACK, remain_number=True,
-                               money_ocr=self.O_MALL_RESOURCE_5,
+                               money_ocr=self.I_MALL_RESOURCE_CHARISMA.build_mall_resource_ocr(self.device.image),
                                buy_number=2, buy_max=2, buy_money=320)
         # 蓝票
         if con.mystery_amulet:
             self.buy_mall_one(buy_button=self.I_CH_BLUE, buy_check=self.I_CH_CHECK_BLUE,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=400)
+                              money_ocr=self.I_MALL_RESOURCE_CHARISMA.build_mall_resource_ocr(self.device.image), buy_money=400)
 
 
 

+ 4 - 4
tasks/RichMan/mall/friendship_points.py

@@ -24,12 +24,12 @@ class FriendshipPoints(Special):
         # 购买
         if con.white_daruma:
             self.buy_mall_one(buy_button=self.I_FS_WHITE_CLICK, buy_check=self.I_FS_WHITE_CHECK,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=1000)
+                              money_ocr=self.I_MALL_RESOURCE_FRIENDS.build_mall_resource_ocr(self.device.image), buy_money=1000)
         if con.red_daruma != 0:
-            self.buy_mall_more(buy_button=self.I_FS_RED, remain_number=False, money_ocr=self.O_MALL_RESOURCE_5,
+            self.buy_mall_more(buy_button=self.I_FS_RED, remain_number=False, money_ocr=self.I_MALL_RESOURCE_FRIENDS.build_mall_resource_ocr(self.device.image),
                                buy_number=con.red_daruma, buy_max=99, buy_money=150)
         if con.broken_amulet != 0:
-            self.buy_mall_more(buy_button=self.I_FS_BROKEN, remain_number=False, money_ocr=self.O_MALL_RESOURCE_5,
+            self.buy_mall_more(buy_button=self.I_FS_BROKEN, remain_number=False, money_ocr=self.I_MALL_RESOURCE_FRIENDS.build_mall_resource_ocr(self.device.image),
                                buy_number=con.broken_amulet, buy_max=99, buy_money=100)
 
     def buy_mall_one(self, buy_button: RuleImage, buy_check: RuleImage, money_ocr: RuleOcr, buy_money: int):
@@ -129,7 +129,7 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas1')
+    c = Config('debug')
     d = Device(c)
     t = FriendshipPoints(c, d)
 

+ 4 - 4
tasks/RichMan/mall/medal.py

@@ -41,21 +41,21 @@ class Medal(FriendshipPoints):
                               money_ocr=self.O_MALL_RESOURCE_3, buy_money=320)
         # 两颗白蛋
         if con.white_daruma:
-            self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
+            self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=2, buy_max=2, buy_money=100)
         # 十张挑战券
         if con.challenge_pass:
-            self.buy_mall_more(buy_button=self.I_ME_CHALLENGE_PASS, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
+            self.buy_mall_more(buy_button=self.I_ME_CHALLENGE_PASS, remain_number=True, money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=con.challenge_pass, buy_max=10, buy_money=30)
         # 红蛋
         if con.red_daruma:
             self.buy_mall_more(buy_button=self.I_ME_RED, remain_number=False,
-                               money_ocr=self.O_MALL_RESOURCE_3,
+                               money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=con.red_daruma, buy_max=99, buy_money=30)
         # 破碎的咒符
         if con.broken_amulet:
             self.buy_mall_more(buy_button=self.I_ME_BROKEN, remain_number=False,
-                               money_ocr=self.O_MALL_RESOURCE_3,
+                               money_ocr=self.I_MALL_RESOURCE_MEDAL.build_mall_resource_ocr(self.device.image),
                                buy_number=con.broken_amulet, buy_max=99, buy_money=20)
 
         time.sleep(1)

+ 47 - 0
tasks/RichMan/mall/navbar/image_mall_resource.json

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "mall_resource_ap",
+    "imageName": "navbar_mall_resource_ap.png",
+    "roiFront": "155,7,45,43",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "体力"
+  },
+  {
+    "itemName": "mall_resource_honor",
+    "imageName": "navbar_mall_resource_honor.png",
+    "roiFront": "722,11,41,42",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "荣誉"
+  },
+  {
+    "itemName": "mall_resource_friends",
+    "imageName": "navbar_mall_resource_friends.png",
+    "roiFront": "908,8,39,43",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "友情点"
+  },
+  {
+    "itemName": "mall_resource_medal",
+    "imageName": "navbar_mall_resource_medal.png",
+    "roiFront": "535,9,40,44",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "勋章"
+  },
+  {
+    "itemName": "mall_resource_charisma",
+    "imageName": "navbar_mall_resource_charisma.png",
+    "roiFront": "906,5,48,46",
+    "roiBack": "155,7,1115,90",
+    "method": "Default",
+    "threshold": 0.7,
+    "description": "魅力值"
+  }
+]

+ 9 - 9
tasks/RichMan/mall/navbar/image_side.json

@@ -11,8 +11,8 @@
   {
     "itemName": "side_check_special",
     "imageName": "navbar_side_check_special.png",
-    "roiFront": "215,7,42,42",
-    "roiBack": "215,7,42,42",
+    "roiFront": "155,8,42,42",
+    "roiBack": "155,8,42,42",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "特殊"
@@ -29,8 +29,8 @@
   {
     "itemName": "side_check_honor",
     "imageName": "navbar_side_check_honor.png",
-    "roiFront": "752,11,41,42",
-    "roiBack": "752,11,41,42",
+    "roiFront": "722,11,41,42",
+    "roiBack": "722,11,41,42",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "荣誉"
@@ -47,7 +47,7 @@
   {
     "itemName": "side_check_friends",
     "imageName": "navbar_side_check_friends.png",
-    "roiFront": "925,8,39,43",
+    "roiFront": "908,8,39,43",
     "roiBack": "9,8,1266,43",
     "method": "Template matching",
     "threshold": 0.7,
@@ -65,7 +65,7 @@
   {
     "itemName": "side_check_medal",
     "imageName": "navbar_side_check_medal.png",
-    "roiFront": "665,6,40,44",
+    "roiFront": "535,9,40,44",
     "roiBack": "453,1,476,58",
     "method": "Template matching",
     "threshold": 0.7,
@@ -74,8 +74,8 @@
   {
     "itemName": "side_sure_charisma",
     "imageName": "navbar_side_sure_charisma.png",
-    "roiFront": "1181,467,59,58",
-    "roiBack": "1158,445,101,142",
+    "roiFront": "1181,502,59,58",
+    "roiBack": "1158,475,101,112",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "魅力值"
@@ -83,7 +83,7 @@
   {
     "itemName": "side_check_charisma",
     "imageName": "navbar_side_check_charisma.png",
-    "roiFront": "917,9,48,46",
+    "roiFront": "906,5,48,46",
     "roiBack": "886,1,114,80",
     "method": "Template matching",
     "threshold": 0.7,

BIN
tasks/RichMan/mall/navbar/navbar_mall_resource_ap.png


BIN
tasks/RichMan/mall/navbar/navbar_mall_resource_charisma.png


BIN
tasks/RichMan/mall/navbar/navbar_mall_resource_friends.png


BIN
tasks/RichMan/mall/navbar/navbar_mall_resource_honor.png


BIN
tasks/RichMan/mall/navbar/navbar_mall_resource_medal.png


BIN
tasks/RichMan/mall/navbar/navbar_side_check_charisma.png


BIN
tasks/RichMan/mall/navbar/navbar_side_check_friends.png


BIN
tasks/RichMan/mall/navbar/navbar_side_check_honor.png


BIN
tasks/RichMan/mall/navbar/navbar_side_check_medal.png


BIN
tasks/RichMan/mall/navbar/navbar_side_check_special.png


BIN
tasks/RichMan/mall/navbar/navbar_side_suer_honor.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_friends.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_medal.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_special.png


+ 10 - 10
tasks/RichMan/mall/navbar/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "mall_resource_1",
-    "roiFront": "261,8,100,43",
-    "roiBack": "261,8,100,43",
+    "roiFront": "208,7,100,43",
+    "roiBack": "208,7,100,43",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "mall_resource_2",
-    "roiFront": "415,8,124,39",
-    "roiBack": "415,8,124,39",
+    "roiFront": "382,8,124,39",
+    "roiBack": "382,8,124,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "mall_resource_3",
-    "roiFront": "596,10,107,38",
-    "roiBack": "596,10,107,38",
+    "roiFront": "574,9,127,38",
+    "roiBack": "574,9,127,38",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   {
     "itemName": "mall_resource_4",
-    "roiFront": "783,9,100,39",
-    "roiBack": "783,9,100,39",
+    "roiFront": "755,9,128,39",
+    "roiBack": "755,9,128,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -37,8 +37,8 @@
   },
   {
     "itemName": "mall_resource_5",
-    "roiFront": "958,9,100,37",
-    "roiBack": "958,9,100,37",
+    "roiFront": "943,9,116,37",
+    "roiBack": "943,9,116,37",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",

+ 3 - 1
tasks/SoulsTidy/assets.py

@@ -49,7 +49,9 @@ class SoulsTidyAssets:
 	# 御魂奉纳后获得的金币 
 	I_ST_GOLD = RuleImage(roi_front=(170,100,950,500), roi_back=(170,100,950,500), threshold=0.9, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_gold.png")
 	# 御魂溢出 
-	I_ST_SOUL_OVERFLOW = RuleImage(roi_front=(447,260,384,42), roi_back=(430,232,417,100), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_soul_overflow.png")
+	I_ST_SOUL_OVERFLOW = RuleImage(roi_front=(447,260,384,42), roi_back=(447,260,384,42), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_soul_overflow.png")
+	# 狗粮御魂的堆叠标识 
+	I_ST_SOUL_STACK = RuleImage(roi_front=(142,234,20,16), roi_back=(142,234,20,16), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_soul_stack.png")
 
 
 	# Long Click Rule Assets

+ 19 - 14
tasks/SoulsTidy/script_task.py

@@ -124,20 +124,25 @@ class ScriptTask(GameUi, SoulsTidyAssets):
             logger.info('Sort by level')
             # 开始奉纳
             while 1:
-                self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
-                self.screenshot()
-                # 非+0的不弃置 双保险
-                if not self.appear(self.I_ST_LEVEL_0):
-                    logger.info("First Orichi isn't Level 0,quit")
-                    break
-                firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
-                if firvel is None or firvel == '':
-                    logger.info('ocr result is Null')
-                    continue
-                if firvel != '古':
-                    # 问就是 把 +0 识别成了 古
-                    logger.info('No zero level, bongna done')
-                    break
+                if self.wait_until_appear(self.I_ST_SOUL_STACK, wait_time=2):
+                    # 方式1. 御魂堆叠奉纳
+                    logger.info('Soul stack')
+                else:
+                    # 方式2. 强化+0奉纳
+                    self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
+                    self.screenshot()
+                    # 非+0的不弃置 双保险
+                    if not self.appear(self.I_ST_LEVEL_0):
+                        logger.info("First Orichi isn't Level 0,quit")
+                        break
+                    firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
+                    if firvel is None or firvel == '':
+                        logger.info('ocr result is Null')
+                        continue
+                    if firvel != '古':
+                        # 问就是 把 +0 识别成了 古
+                        logger.info('No zero level, bongna done')
+                        break
 
                 # !!!!!!  这里没有检查金币是否足够
                 # 长按

+ 10 - 1
tasks/SoulsTidy/simple/image.json

@@ -138,9 +138,18 @@
     "itemName": "st_soul_overflow",
     "imageName": "simple_st_soul_overflow.png",
     "roiFront": "447,260,384,42",
-    "roiBack": "430,232,417,100",
+    "roiBack": "447,260,384,42",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "御魂溢出"
+  },
+  {
+    "itemName": "st_soul_stack",
+    "imageName": "simple_st_soul_stack.png",
+    "roiFront": "142,234,20,16",
+    "roiBack": "142,234,20,16",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狗粮御魂的堆叠标识"
   }
 ]

BIN
tasks/SoulsTidy/simple/simple_st_soul_stack.png