Эх сурвалжийг харах

Merge pull request #1348 from runhey/dev

Automated PR 2026.01.08
huangrunheng 10 сар өмнө
parent
commit
711cc462c2
30 өөрчлөгдсөн 179 нэмэгдсэн , 81 устгасан
  1. 3 3
      dev_tools/assets_test.py
  2. 0 9
      tasks/AreaBoss/res/image.json
  3. 8 1
      tasks/Exploration/base.py
  4. 1 1
      tasks/GameUi/assets.py
  5. BIN
      tasks/GameUi/page/page_exploration_goto_soul_zone.png
  6. 2 2
      tasks/GameUi/page/page_img.json
  7. 34 21
      tasks/RichMan/assets.py
  8. 2 2
      tasks/RichMan/mall/bondlings/ocr.json
  9. 5 2
      tasks/RichMan/mall/consignment.py
  10. 1 1
      tasks/RichMan/mall/medal.py
  11. 30 0
      tasks/RichMan/mall/navbar.py
  12. 2 2
      tasks/RichMan/mall/navbar/image_bottom.json
  13. 9 9
      tasks/RichMan/mall/navbar/image_side.json
  14. BIN
      tasks/RichMan/mall/navbar/navbar_mall_sccales.png
  15. BIN
      tasks/RichMan/mall/navbar/navbar_mall_sundry.png
  16. BIN
      tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png
  17. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_friends.png
  18. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_honor.png
  19. BIN
      tasks/RichMan/mall/navbar/navbar_side_check_special.png
  20. 23 14
      tasks/RichMan/mall/navbar/ocr.json
  21. 38 0
      tasks/RichMan/mall/navbar/ocr_legacy.json
  22. 1 1
      tasks/RichMan/mall/scales.py
  23. 8 8
      tasks/RichMan/mall/scales/ocr.json
  24. BIN
      tasks/RichMan/mall/scales/scales_sca_demon_souls.png
  25. BIN
      tasks/RichMan/mall/scales/scales_sca_orochi_scales.png
  26. 2 2
      tasks/RichMan/script_task.py
  27. 3 0
      tasks/Secret/script_task.py
  28. 1 1
      tasks/Sougenbi/script_task.py
  29. 2 0
      tasks/WantedQuests/script_task.py
  30. 4 2
      tasks/WeeklyTrifles/script_task.py

+ 3 - 3
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\Ryland\Desktop\ScreenShot_2025-11-20_210804_069.png"
+IMAGE_FILE = r"C:\Users\Ryland\Desktop\ScreenShot_2026-01-04_222421_055.png"
 if __name__ == '__main__':
-    from tasks.MetaDemon.script_task import ScriptTask
-    targe = ScriptTask.I_BOSS_EMPTY_2
+    from tasks.RichMan.script_task import ScriptTask
+    targe = ScriptTask.I_MALL_BONDLINGS_SURE
     print(detect_image(IMAGE_FILE, targe))
 
     # ocr demo

+ 0 - 9
tasks/AreaBoss/res/image.json

@@ -17,15 +17,6 @@
     "threshold": 0.8,
     "description": "地狱鬼王图标"
   },
-  {
-    "itemName": "back_blue",
-    "imageName": "res_back_blue.png",
-    "roiFront": "51,30,51,52",
-    "roiBack": "4,1,128,110",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "蓝色的返回"
-  },
   {
     "itemName": "filter",
     "imageName": "res_filter.png",

+ 8 - 1
tasks/Exploration/base.py

@@ -211,11 +211,14 @@ 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:
             # 慢一点
@@ -228,7 +231,11 @@ 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):

+ 1 - 1
tasks/GameUi/assets.py

@@ -48,7 +48,7 @@ class GameUiAssets:
 	# 探索前往觉醒 
 	I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(57,628,57,42), roi_back=(33,619,113,79), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
 	# 探索前往御魂 
-	I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(159,633,55,55), roi_back=(138,620,89,75), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
+	I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(163,642,44,36), roi_back=(134,623,93,70), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
 	# 探索前往结界突破 
 	I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,203,87), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
 	# 探索前往御灵 

BIN
tasks/GameUi/page/page_exploration_goto_soul_zone.png


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

@@ -47,8 +47,8 @@
   {
     "itemName": "exploration_goto_soul_zone",
     "imageName": "page_exploration_goto_soul_zone.png",
-    "roiFront": "159,633,55,55",
-    "roiBack": "138,620,89,75",
+    "roiFront": "163,642,44,36",
+    "roiBack": "134,623,93,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "探索前往御魂"

+ 34 - 21
tasks/RichMan/assets.py

@@ -68,7 +68,7 @@ class RichManAssets:
 	# 中级盘剩余 
 	O_BL_RES_MEDIUM = RuleOcr(roi=(918,285,28,27), area=(918,285,28,27), mode="Digit", method="Default", keyword="", name="bl_res_medium")
 	# 检查契灵的钱是否够 
-	O_BL_CHECK_MONEY = RuleOcr(roi=(1123,12,127,33), area=(1123,12,127,33), mode="DigitCounter", method="Default", keyword="", name="bl_check_money")
+	O_BL_CHECK_MONEY = RuleOcr(roi=(1137,12,125,33), area=(1137,12,125,33), mode="DigitCounter", method="Default", keyword="", name="bl_check_money")
 
 
 	# Image Rule Assets
@@ -162,13 +162,13 @@ class RichManAssets:
 	# description 
 	I_MALL_SCALES_SURE = RuleImage(roi_front=(1195,100,62,85), roi_back=(1195,100,62,85), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_scales_sure.png")
 	# 契灵商店 
-	I_MALL_BONDLINGS_SURE = RuleImage(roi_front=(1194,421,69,74), roi_back=(1194,421,69,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_sure.png")
+	I_MALL_BONDLINGS_SURE = RuleImage(roi_front=(1194,421,69,74), roi_back=(1194,421,69,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_sure.png")
 	# 已选中契灵商店 
 	I_MALL_BONDLINGS_ON = RuleImage(roi_front=(99,417,1021,37), roi_back=(99,417,1021,37), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_on.png")
 	# 契灵商店 
 	I_MALL_BONDLINGS_CHECK = RuleImage(roi_front=(355,186,34,104), roi_back=(355,186,34,104), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_check.png")
 	# 杂货铺 
-	I_MALL_SUNDRY = RuleImage(roi_front=(880,646,53,54), roi_back=(834,621,116,90), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
+	I_MALL_SUNDRY = RuleImage(roi_front=(880,646,53,54), roi_back=(834,621,116,90), threshold=0.65, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
 	# 杂货铺 
 	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")
 
@@ -177,15 +177,15 @@ class RichManAssets:
 	# 特殊 
 	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=(102,7,42,42), roi_back=(102,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=(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_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.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=(694,12,41,42), roi_back=(694,12,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=(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_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=(890,8,39,43), roi_back=(890,8,39,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_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_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")
 	# 勋章 
@@ -193,22 +193,35 @@ class RichManAssets:
 	# 魅力值 
 	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_CHECK_CHARISMA = RuleImage(roi_front=(886,4,48,46), roi_back=(886,4,48,46), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_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")
 
 
 	# Ocr Rule Assets
 	# 左数第一个 
-	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_1 = RuleOcr(roi=(261,8,100,43), area=(261,8,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_3 = RuleOcr(roi=(596,10,107,38), area=(596,10,107,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_5 = RuleOcr(roi=(958,9,100,37), area=(958,9,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")
+	# 左数第二排第一个 
+	O_MALL_RESOURCE_7 = RuleOcr(roi=(1100,54,150,38), area=(1100,54,150,38), mode="Quantity", method="Default", keyword="", name="mall_resource_7")
+
+
+	# Ocr Rule Assets
+	# 左数第一个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_1 = RuleOcr(roi=(533,9,107,38), area=(533,9,107,38), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_1")
+	# 左数第二个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_2 = RuleOcr(roi=(739,8,100,39), area=(739,8,100,39), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_2")
+	# 左数第三个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_3 = RuleOcr(roi=(935,11,100,37), area=(935,11,100,37), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_3")
+	# 左数第四个(插画屋/寄售屋) 
+	O_LEGACY_MALL_RESOURCE_4 = RuleOcr(roi=(1129,6,100,41), area=(1129,6,100,41), mode="Quantity", method="Default", keyword="", name="legacy_mall_resource_4")
 
 
 	# Click Rule Assets
@@ -267,7 +280,7 @@ class RichManAssets:
 
 	# Ocr Rule Assets
 	# 蛇皮剩余可买的 
-	O_SCA_NUMBER_OROCHI = RuleOcr(roi=(46,318,30,25), area=(46,318,30,25), mode="Quantity", method="Default", keyword="", name="sca_number_orochi")
+	O_SCA_NUMBER_OROCHI = RuleOcr(roi=(41,318,34,25), area=(41,318,34,25), mode="Quantity", method="Default", keyword="", name="sca_number_orochi")
 	# 首领御魂剩余可买的 
 	O_SCA_NUMBER_DEMON = RuleOcr(roi=(627,319,30,25), area=(627,319,30,25), mode="Quantity", method="Default", keyword="", name="sca_number_demon")
 	# 永生之海 
@@ -275,11 +288,11 @@ class RichManAssets:
 	# 多少号位 
 	O_SCA_DEMON_POSTION = RuleOcr(roi=(960,244,88,41), area=(960,244,88,41), mode="Single", method="Default", keyword="", name="sca_demon_postion")
 	# 朴素的御魂 
-	O_SCA_RES_OROCHI = RuleOcr(roi=(531,9,127,37), area=(531,9,127,37), mode="DigitCounter", method="Default", keyword="", name="sca_res_orochi")
+	O_SCA_RES_OROCHI = RuleOcr(roi=(610,9,127,37), area=(610,9,127,37), mode="DigitCounter", method="Default", keyword="", name="sca_res_orochi")
 	# 首领御魂数量 
-	O_SCA_RES_DEMON = RuleOcr(roi=(949,10,86,35), area=(949,10,86,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
+	O_SCA_RES_DEMON = RuleOcr(roi=(949,10,134,35), area=(949,10,134,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
 	# 永生之海 
-	O_SCA_RES_SEA = RuleOcr(roi=(1152,11,80,38), area=(1152,11,80,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
+	O_SCA_RES_SEA = RuleOcr(roi=(1134,11,117,38), area=(1134,11,117,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
 
 
 	# Image Rule Assets

+ 2 - 2
tasks/RichMan/mall/bondlings/ocr.json

@@ -37,8 +37,8 @@
   },
   {
     "itemName": "bl_check_money",
-    "roiFront": "1123,12,127,33",
-    "roiBack": "1123,12,127,33",
+    "roiFront": "1137,12,125,33",
+    "roiBack": "1137,12,125,33",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 5 - 2
tasks/RichMan/mall/consignment.py

@@ -28,10 +28,13 @@ class Consignment(Buy, MallNavbar):
             logger.info('Consignment buy_sale_ticket is not enable')
             return
         self._enter_consignment()
-        self.ui_click(self.I_CON_ENTER, self.I_CON_ENTER_CHECK)
+        # 等待页面加载
         time.sleep(0.5)
         self.screenshot()
-        if not self.mall_check_money(3, 100):
+        # 进入寄售屋兑换页面
+        self.ui_click(self.I_CON_ENTER, self.I_CON_ENTER_CHECK)
+        #检查勾玉是否足够
+        if not self.mall_check_money_legacy(1, 100):
             logger.warning('Consignment money is not enough')
             return
         remain_number = self.O_CON_NUMBER.ocr(self.device.image)

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

@@ -38,7 +38,7 @@ class Medal(FriendshipPoints):
         # 随机御魂
         if con.random_soul:
             self.buy_mall_one(buy_button=self.I_ME_SOULS, buy_check=self.I_ME_CHECK_SOULS,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=320)
+                              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,

+ 30 - 0
tasks/RichMan/mall/navbar.py

@@ -104,6 +104,7 @@ class MallNavbar(GameUi, RichManAssets):
             4: self.O_MALL_RESOURCE_4,
             5: self.O_MALL_RESOURCE_5,
             6: self.O_MALL_RESOURCE_6,
+            7: self.O_MALL_RESOURCE_7,
         }
         self.screenshot()
         result = match[index].ocr(self.device.image)
@@ -117,6 +118,35 @@ class MallNavbar(GameUi, RichManAssets):
 
     def mall_check_money(self, index: int, least: int) -> bool:
         return self.mall_resource(index) >= least
+    
+    #add legacy check money method for compatibility, for consignment task
+    def mall_check_money_legacy(self, index: int, least: int) -> bool:
+        """
+        Legacy implementation.
+        旧版商城资源判断逻辑(包含资源获取 + 校验)用于插画屋和寄售屋任务
+        :param index: 从左开始数 1-4 对应第1-4个资源 least 最少多少
+        :return: bool
+        """
+
+        match = {
+            1: self.O_LEGACY_MALL_RESOURCE_1,
+            2: self.O_LEGACY_MALL_RESOURCE_2,
+            3: self.O_LEGACY_MALL_RESOURCE_3,
+            4: self.O_LEGACY_MALL_RESOURCE_4,
+        }
+
+        self.screenshot()
+        result = match[index].ocr(self.device.image)
+
+        if not isinstance(result, int):
+            logger.warning(f'Get mall resource {index} error, result: {result}')
+            return False
+
+        if result == 0:
+            logger.warning(f'Get mall resource {index} error, result: {result}')
+            return False
+
+        return result >= least
 
 if __name__ == '__main__':
     from module.config.config import Config

+ 2 - 2
tasks/RichMan/mall/navbar/image_bottom.json

@@ -50,7 +50,7 @@
     "roiFront": "1194,421,69,74",
     "roiBack": "1194,421,69,74",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "契灵商店"
   },
   {
@@ -77,7 +77,7 @@
     "roiFront": "880,646,53,54",
     "roiBack": "834,621,116,90",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.65,
     "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": "102,7,42,42",
-    "roiBack": "102,7,42,42",
+    "roiFront": "215,7,42,42",
+    "roiBack": "215,7,42,42",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "特殊"
@@ -23,14 +23,14 @@
     "roiFront": "1180,191,59,60",
     "roiBack": "1150,159,103,132",
     "method": "Template matching",
-    "threshold": 0.7,
+    "threshold": 0.6,
     "description": "荣誉"
   },
   {
     "itemName": "side_check_honor",
     "imageName": "navbar_side_check_honor.png",
-    "roiFront": "694,12,41,42",
-    "roiBack": "694,12,41,42",
+    "roiFront": "752,11,41,42",
+    "roiBack": "752,11,41,42",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "荣誉"
@@ -47,8 +47,8 @@
   {
     "itemName": "side_check_friends",
     "imageName": "navbar_side_check_friends.png",
-    "roiFront": "890,8,39,43",
-    "roiBack": "890,8,39,43",
+    "roiFront": "925,8,39,43",
+    "roiBack": "9,8,1266,43",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "友情点"
@@ -83,8 +83,8 @@
   {
     "itemName": "side_check_charisma",
     "imageName": "navbar_side_check_charisma.png",
-    "roiFront": "886,4,48,46",
-    "roiBack": "886,4,48,46",
+    "roiFront": "917,9,48,46",
+    "roiBack": "886,1,114,80",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "魅力值"

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


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


BIN
tasks/RichMan/mall/navbar/navbar_mall_sundry_check.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_special.png


+ 23 - 14
tasks/RichMan/mall/navbar/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "mall_resource_1",
-    "roiFront": "144,7,100,43",
-    "roiBack": "144,7,100,43",
+    "roiFront": "261,8,100,43",
+    "roiBack": "261,8,100,43",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "mall_resource_2",
-    "roiFront": "326,8,124,39",
-    "roiBack": "326,8,124,39",
+    "roiFront": "415,8,124,39",
+    "roiBack": "415,8,124,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -19,30 +19,30 @@
   },
   {
     "itemName": "mall_resource_3",
-    "roiFront": "533,9,107,38",
-    "roiBack": "533,9,107,38",
+    "roiFront": "596,10,107,38",
+    "roiBack": "596,10,107,38",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第三个"
   },
   {
     "itemName": "mall_resource_4",
-    "roiFront": "739,8,100,39",
-    "roiBack": "739,8,100,39",
+    "roiFront": "783,9,100,39",
+    "roiBack": "783,9,100,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第四个"
   },
   {
     "itemName": "mall_resource_5",
-    "roiFront": "935,11,100,37",
-    "roiBack": "935,11,100,37",
+    "roiFront": "958,9,100,37",
+    "roiBack": "958,9,100,37",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第五个"
   },
   {
     "itemName": "mall_resource_6",
@@ -51,6 +51,15 @@
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第六个"
+  },
+  {
+    "itemName": "mall_resource_7",
+    "roiFront": "1100,54,150,38",
+    "roiBack": "1100,54,150,38",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第二排第一个"
   }
 ]

+ 38 - 0
tasks/RichMan/mall/navbar/ocr_legacy.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "legacy_mall_resource_1",
+    "roiFront": "533,9,107,38",
+    "roiBack": "533,9,107,38",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第一个(插画屋/寄售屋)"
+  },
+  {
+    "itemName": "legacy_mall_resource_2",
+    "roiFront": "739,8,100,39",
+    "roiBack": "739,8,100,39",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第二个(插画屋/寄售屋)"
+  },
+  {
+    "itemName": "legacy_mall_resource_3",
+    "roiFront": "935,11,100,37",
+    "roiBack": "935,11,100,37",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第三个(插画屋/寄售屋)"
+  },
+  {
+    "itemName": "legacy_mall_resource_4",
+    "roiFront": "1129,6,100,41",
+    "roiBack": "1129,6,100,41",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第四个(插画屋/寄售屋)"
+  }
+]

+ 1 - 1
tasks/RichMan/mall/scales.py

@@ -76,7 +76,7 @@ class Scales(Buy, MallNavbar):
                     self.screenshot()
                     if not self.appear(self.I_SCA_SIX_STAR):
                         break
-                    if self.click(self.C_SCA_SOULS_GET, interval=1):
+                    if self.click(self.C_SCA_SOULS_BACK, interval=1):
                         continue
                 # 收获购买的东西
                 logger.info('Scales get success')

+ 8 - 8
tasks/RichMan/mall/scales/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "sca_number_orochi",
-    "roiFront": "46,318,30,25",
-    "roiBack": "46,318,30,25",
+    "roiFront": "41,318,34,25",
+    "roiBack": "41,318,34,25",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -37,8 +37,8 @@
   },
   {
     "itemName": "sca_res_orochi",
-    "roiFront": "531,9,127,37",
-    "roiBack": "531,9,127,37",
+    "roiFront": "610,9,127,37",
+    "roiBack": "610,9,127,37",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -46,8 +46,8 @@
   },
   {
     "itemName": "sca_res_demon",
-    "roiFront": "949,10,86,35",
-    "roiBack": "949,10,86,35",
+    "roiFront": "949,10,134,35",
+    "roiBack": "949,10,134,35",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -55,8 +55,8 @@
   },
   {
     "itemName": "sca_res_sea",
-    "roiFront": "1152,11,80,38",
-    "roiBack": "1152,11,80,38",
+    "roiFront": "1134,11,117,38",
+    "roiBack": "1134,11,117,38",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

BIN
tasks/RichMan/mall/scales/scales_sca_demon_souls.png


BIN
tasks/RichMan/mall/scales/scales_sca_orochi_scales.png


+ 2 - 2
tasks/RichMan/script_task.py

@@ -41,8 +41,8 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    t.run()
-    # t.execute_mall()
+    # t.run()
+    t.execute_mall()
 
 
 

+ 3 - 0
tasks/Secret/script_task.py

@@ -82,10 +82,12 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
             if not layer:
                 if self.appear(WeeklyTriflesAssets.I_WT_SE_SHARE):
                     logger.warning('You have completed the weekly trifles, skip')
+                    self.ui_click(self.I_UI_BACK_BLUE, stop=self.I_UI_BACK_YELLOW)
                     break
                 text = self.O_SE_TOTAL_TIME.ocr_single(self.device.image)
                 if '尚未' not in text:
                     logger.warning('You have completed the weekly trifles, skip')
+                    self.ui_click(self.I_UI_BACK_BLUE, stop=self.I_UI_BACK_YELLOW)
                     break
                 continue
             if layer >= 6:
@@ -128,6 +130,7 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
                 success = self.run_general_battle(self.battle_config)
                 continue
 
+        self.ui_click(self.I_UI_BACK_BLUE, self.I_UI_BACK_YELLOW)
         self.ui_click(self.I_UI_BACK_YELLOW, self.I_CHECK_MAIN)
         self.ui_get_current_page()
         self.ui_goto(page_main)

+ 1 - 1
tasks/Sougenbi/script_task.py

@@ -110,7 +110,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, SougenbiAssets):
             self.screenshot()
             if self.appear(self.I_CHECK_EXPLORATION):
                 break
-            if self.appear_then_click(self.I_UI_BACK_BLUE, interval=1):
+            if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=1):
                 continue
         logger.info('Back to exploration')
 

+ 2 - 0
tasks/WantedQuests/script_task.py

@@ -438,6 +438,8 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
                 break
             if self.appear_then_click(self.I_UI_BACK_RED, interval=1):
                 continue
+            if self.appear_then_click(self.I_UI_BACK_BLUE, interval=1.5):
+                continue
             if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=1.5):
                 continue
         logger.info('Secret mission finished')

+ 4 - 2
tasks/WeeklyTrifles/script_task.py

@@ -189,7 +189,8 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
                 if self.appear(self.I_WT_SE_SHARE):
                     continue
                 logger.warning('This week has not been obtained')
-                self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
+                self.ui_click(self.I_UI_BACK_BLUE, self.I_UI_BACK_YELLOW)
+                self.ui_click(self.I_UI_BACK_YELLOW, self.I_CHECK_MAIN)
                 return
         logger.info('Enter secret')
         # 判断是否已经领取
@@ -202,7 +203,8 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         if not obtained:
             self.click_share(self.I_WT_SE_WECHAT)
         # 返回
-        self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
+        self.ui_click(self.I_UI_BACK_BLUE, self.I_UI_BACK_YELLOW)
+        self.ui_click(self.I_UI_BACK_YELLOW, self.I_CHECK_MAIN)
 
     def _broken_amulet(self, dest_num: int):
         """