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

Merge pull request #117 from runhey/dev

Dev
huangrunheng 3 лет назад
Родитель
Сommit
4501285185
47 измененных файлов с 179 добавлено и 126 удалено
  1. 2 2
      config/template.json
  2. 29 4
      module/gui/qml/Page/Home.qml
  3. 2 1
      tasks/Component/BaseActivity/config_activity.py
  4. 6 6
      tasks/Component/Buy/assets.py
  5. BIN
      tasks/Component/Buy/buy/buy_buy_add.png
  6. BIN
      tasks/Component/Buy/buy/buy_buy_plus.png
  7. BIN
      tasks/Component/Buy/buy/buy_buy_sub.png
  8. 4 4
      tasks/Component/Buy/buy/click.json
  9. 8 8
      tasks/Component/Buy/buy/image.json
  10. 1 1
      tasks/Component/GeneralBuff/assets.py
  11. BIN
      tasks/Component/GeneralBuff/gb/gb_buff_1.png
  12. 2 2
      tasks/Component/GeneralBuff/gb/image.json
  13. 1 1
      tasks/Component/SwitchSoul/assets.py
  14. 2 2
      tasks/Component/SwitchSoul/ss/swipe.json
  15. 25 18
      tasks/Component/SwitchSoul/switch_soul.py
  16. 2 0
      tasks/Hunt/assets.py
  17. 9 0
      tasks/Hunt/netherworld/image.json
  18. BIN
      tasks/Hunt/netherworld/netherworld_nw_done.png
  19. 6 1
      tasks/Hunt/script_task.py
  20. 7 3
      tasks/KekkaiUtilize/script_task.py
  21. 9 9
      tasks/MysteryShop/assets.py
  22. BIN
      tasks/MysteryShop/ms/ms_ms_black.png
  23. BIN
      tasks/MysteryShop/ms/ms_ms_blue.png
  24. BIN
      tasks/MysteryShop/ms/ms_ms_taiko_3.png
  25. 18 18
      tasks/MysteryShop/ms/things.json
  26. 1 1
      tasks/Restart/assets.py
  27. 1 1
      tasks/Restart/login/image.json
  28. 15 15
      tasks/RichMan/assets.py
  29. BIN
      tasks/RichMan/guild/guild_guild_check_scrap.png
  30. 2 2
      tasks/RichMan/guild/image.json
  31. 2 2
      tasks/RichMan/guild/ocr.json
  32. BIN
      tasks/RichMan/mall/charisma/charisma_ch_check_blue.png
  33. 4 4
      tasks/RichMan/mall/charisma/image.json
  34. BIN
      tasks/RichMan/mall/friendship_points/friendship_points_fs_broken.png
  35. BIN
      tasks/RichMan/mall/friendship_points/friendship_points_fs_red.png
  36. BIN
      tasks/RichMan/mall/friendship_points/friendship_points_fs_white_check.png
  37. BIN
      tasks/RichMan/mall/friendship_points/friendship_points_fs_white_click.png
  38. 8 8
      tasks/RichMan/mall/friendship_points/image.json
  39. 8 8
      tasks/RichMan/mall/medal/image.json
  40. BIN
      tasks/RichMan/mall/medal/medal_me_check_ap.png
  41. BIN
      tasks/RichMan/mall/medal/medal_me_check_black.png
  42. BIN
      tasks/RichMan/mall/medal/medal_me_check_blue.png
  43. BIN
      tasks/RichMan/mall/medal/medal_me_check_souls.png
  44. 1 1
      tasks/RichMan/mall/special.py
  45. 1 1
      tasks/RichMan/script_task.py
  46. 3 3
      tasks/RichMan/tt/image.json
  47. BIN
      tasks/RichMan/tt/tt_tt_buy_up.png

+ 2 - 2
config/template.json

@@ -548,7 +548,7 @@
     "general_climb": {
       "limit_time": "00:30:00",
       "limit_count": 50,
-      "ap_game_max": 300,
+      "ap_game_max": 999,
       "ap_mode": "ap_activity",
       "activity_toggle": false
     },
@@ -860,7 +860,7 @@
       "server_update": "09:00:00"
     },
     "missions_config": {
-      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂二 > 御魂一"
+      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一"
     }
   },
   "hunt": {

+ 29 - 4
module/gui/qml/Page/Home.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import FluentUI
 
 FluScrollablePage{
-    spacing: 6
+    spacing: 12
 
     Image {
         id: name
@@ -19,9 +19,34 @@ FluScrollablePage{
         Layout.alignment: Qt.AlignHCenter
     }
     FluText{
-        text: "https://github.com/runhey/OnmyojiAutoScript"
-        font: FluTextStyle.Body
-        Layout.alignment: Qt.AlignHCenter
+        text: "OAS 是一款免费开源软件,如果你在任何渠道付费购买了OAS,请退款。"
+        font: FluTextStyle.BodyStrong
+        Layout.alignment: Qt.AlignLeft
+    }
+    FluText{
+        text: "OAS 的项目地址 https://github.com/runhey/OnmyojiAutoScript"
+        font: FluTextStyle.BodyStrong
+        Layout.alignment: Qt.AlignLeft
+    }
+    FluText{
+        text: "OAS 是基于 Alas 的架构上开发,Alas 是碧蓝航线的自动化脚本"
+        font: FluTextStyle.BodyStrong
+        Layout.alignment: Qt.AlignLeft
+    }
+    FluText{
+        text: "Alas 的项目地址 https://github.com/LmeSzinc/AzurLaneAutoScript"
+        font: FluTextStyle.BodyStrong
+        Layout.alignment: Qt.AlignLeft
+    }
+    FluText{
+        text: "SRC: 星铁速溶茶,崩坏:星穹铁道脚本,基于下一代Alas框架"
+        font: FluTextStyle.BodyStrong
+        Layout.alignment: Qt.AlignLeft
+    }
+    FluText{
+        text: "SRC 的项目地址 https://github.com/LmeSzinc/StarRailCopilot"
+        font: FluTextStyle.BodyStrong
+        Layout.alignment: Qt.AlignLeft
     }
 
 }

+ 2 - 1
tasks/Component/BaseActivity/config_activity.py

@@ -50,7 +50,7 @@ class GeneralClimb(ConfigBase):
 
     @validator('ap_game_max', pre=True, always=True)
     def reset_game_max(cls, value):
-        def_value = 999
+        def_value = int(999)
         if isinstance(value, str):
             try:
                 return int(value)
@@ -59,5 +59,6 @@ class GeneralClimb(ConfigBase):
                 return def_value
         elif isinstance(value, int):
             return def_value
+        return def_value
 
 

+ 6 - 6
tasks/Component/Buy/assets.py

@@ -12,22 +12,22 @@ class BuyAssets:
 
 	# Click Rule Assets
 	# description 
-	C_BUY_ONE = RuleClick(roi_front=(553,435,174,61), roi_back=(553,435,174,61), name="buy_one")
+	C_BUY_ONE = RuleClick(roi_front=(551,506,174,36), roi_back=(551,506,174,36), name="buy_one")
 	# description 
-	C_BUY_MORE = RuleClick(roi_front=(551,510,174,60), roi_back=(551,510,174,60), name="buy_more")
+	C_BUY_MORE = RuleClick(roi_front=(551,540,174,40), roi_back=(551,540,174,40), name="buy_more")
 	# 取消购买 
 	C_BUY_CANCEL = RuleClick(roi_front=(121,2,100,22), roi_back=(121,2,100,22), name="buy_cancel")
 
 
 	# Image Rule Assets
 	# 拉满 
-	I_BUY_PLUS = RuleImage(roi_front=(762,410,50,58), roi_back=(762,410,50,58), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_plus.png")
+	I_BUY_PLUS = RuleImage(roi_front=(759,422,50,58), roi_back=(746,397,98,156), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_plus.png")
 	# 加一个 
-	I_BUY_ADD = RuleImage(roi_front=(686,411,51,54), roi_back=(686,411,51,54), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_add.png")
+	I_BUY_ADD = RuleImage(roi_front=(671,428,51,54), roi_back=(645,412,111,141), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_add.png")
 	# 减 
-	I_BUY_SUB = RuleImage(roi_front=(471,416,50,48), roi_back=(471,416,50,48), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_sub.png")
+	I_BUY_SUB = RuleImage(roi_front=(467,429,50,48), roi_back=(452,412,85,147), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_sub.png")
 	# 出现用魂玉购买 
-	I_BUY_RMB = RuleImage(roi_front=(615,452,35,32), roi_back=(552,432,178,72), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_rmb.png")
+	I_BUY_RMB = RuleImage(roi_front=(610,532,35,32), roi_back=(548,483,178,119), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_rmb.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/Component/Buy/buy/buy_buy_add.png


BIN
tasks/Component/Buy/buy/buy_buy_plus.png


BIN
tasks/Component/Buy/buy/buy_buy_sub.png


+ 4 - 4
tasks/Component/Buy/buy/click.json

@@ -1,14 +1,14 @@
 [
   {
     "itemName": "buy_one",
-    "roiFront": "553,435,174,61",
-    "roiBack": "553,435,174,61",
+    "roiFront": "551,506,174,36",
+    "roiBack": "551,506,174,36",
     "description": "description"
   },
   {
     "itemName": "buy_more",
-    "roiFront": "551,510,174,60",
-    "roiBack": "551,510,174,60",
+    "roiFront": "551,540,174,40",
+    "roiBack": "551,540,174,40",
     "description": "description"
   },
   {

+ 8 - 8
tasks/Component/Buy/buy/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "buy_plus",
     "imageName": "buy_buy_plus.png",
-    "roiFront": "762,410,50,58",
-    "roiBack": "762,410,50,58",
+    "roiFront": "759,422,50,58",
+    "roiBack": "746,397,98,156",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "拉满"
@@ -11,8 +11,8 @@
   {
     "itemName": "buy_add",
     "imageName": "buy_buy_add.png",
-    "roiFront": "686,411,51,54",
-    "roiBack": "686,411,51,54",
+    "roiFront": "671,428,51,54",
+    "roiBack": "645,412,111,141",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "加一个"
@@ -20,8 +20,8 @@
   {
     "itemName": "buy_sub",
     "imageName": "buy_buy_sub.png",
-    "roiFront": "471,416,50,48",
-    "roiBack": "471,416,50,48",
+    "roiFront": "467,429,50,48",
+    "roiBack": "452,412,85,147",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "减"
@@ -29,8 +29,8 @@
   {
     "itemName": "buy_rmb",
     "imageName": "buy_buy_rmb.png",
-    "roiFront": "615,452,35,32",
-    "roiBack": "552,432,178,72",
+    "roiFront": "610,532,35,32",
+    "roiBack": "548,483,178,119",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "出现用魂玉购买"

+ 1 - 1
tasks/Component/GeneralBuff/assets.py

@@ -12,7 +12,7 @@ class GeneralBuffAssets:
 
 	# Image Rule Assets
 	# 庭院左上角的加成 
-	I_BUFF_1 = RuleImage(roi_front=(357,42,45,50), roi_back=(357,42,45,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_buff_1.png")
+	I_BUFF_1 = RuleImage(roi_front=(363,32,32,46), roi_back=(344,14,128,76), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_buff_1.png")
 	# description 
 	I_AWAKE = RuleImage(roi_front=(381,130,35,45), roi_back=(360,107,80,447), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_awake.png")
 	# 御魂加成 

BIN
tasks/Component/GeneralBuff/gb/gb_buff_1.png


+ 2 - 2
tasks/Component/GeneralBuff/gb/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "buff_1",
     "imageName": "gb_buff_1.png",
-    "roiFront": "357,42,45,50",
-    "roiBack": "357,42,45,50",
+    "roiFront": "363,32,32,46",
+    "roiBack": "344,14,128,76",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "庭院左上角的加成"

+ 1 - 1
tasks/Component/SwitchSoul/assets.py

@@ -75,7 +75,7 @@ class SwitchSoulAssets:
 
 	# Swipe Rule Assets
 	# 列表的向上滑动 
-	S_SS_GROUP_SWIPE_UP = RuleSwipe(roi_front=(1154,180,23,21), roi_back=(1153,322,21,21), mode="default", name="ss_group_swipe_up")
+	S_SS_GROUP_SWIPE_UP = RuleSwipe(roi_front=(1154,180,90,21), roi_back=(1153,322,86,21), mode="default", name="ss_group_swipe_up")
 	# 列表的向下滑动 
 	S_SS_GROUP_SWIPE_DOWN = RuleSwipe(roi_front=(1155,388,21,22), roi_back=(1152,177,22,24), mode="default", name="ss_group_swipe_down")
 	# 阵容向上滑动 

+ 2 - 2
tasks/Component/SwitchSoul/ss/swipe.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "ss_group_swipe_up",
-    "roiFront": "1154,180,23,21",
-    "roiBack": "1153,322,21,21",
+    "roiFront": "1154,180,90,21",
+    "roiBack": "1153,322,86,21",
     "mode": "default",
     "description": "列表的向上滑动"
   },

+ 25 - 18
tasks/Component/SwitchSoul/switch_soul.py

@@ -168,19 +168,19 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
         保证在式神录的界面
         :return:
         """
+        logger.hr('Switch soul by name')
         # 滑动至分组最上层
+        last_group_text = ''
         while 1:
             self.screenshot()
             compare1 = self.O_SS_GROUP_NAME.detect_and_ocr(self.device.image)
-            text1 = str([result.ocr_text for result in compare1])
-            # 向上滑动
-            self.swipe(self.S_SS_GROUP_SWIPE_UP, 6)
-            self.screenshot()
-            compare2 = self.O_SS_GROUP_NAME.detect_and_ocr(self.device.image)
-            text2 = str([result.ocr_text for result in compare2])
-            # 相等时 滑动到最上层
-            if text1 == text2:
+            now_group_text = str([result.ocr_text for result in compare1])
+            if now_group_text == last_group_text:
                 break
+            self.swipe(self.S_SS_GROUP_SWIPE_UP, 2)
+            sleep(2.5)
+            last_group_text = now_group_text
+        logger.info('Swipe to top of group')
 
         # 判断有无目标分组
         while 1:
@@ -194,6 +194,8 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
             if result and len(result) > 0:
                 break
             self.swipe(self.S_SS_GROUP_SWIPE_DOWN)
+            sleep(1.5)
+        logger.info('Swipe down to find target group')
 
         # 选中分组
         while 1:
@@ -201,20 +203,22 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
             self.O_SS_GROUP_NAME.keyword = groupName
             if self.ocr_appear_click(self.O_SS_GROUP_NAME):
                 break
+        logger.info(f'Select group {groupName}')
 
         # 滑动至阵容最上层
+        last_team_text = ''
         while 1:
             self.screenshot()
             compare1 = self.O_SS_TEAM_NAME.detect_and_ocr(self.device.image)
-            text1 = str([result.ocr_text for result in compare1])
+            now_team_text = str([result.ocr_text for result in compare1])
             # 向上滑动
-            self.swipe(self.S_SS_TEAM_SWIPE_DOWN, 6)
-            self.screenshot()
-            compare2 = self.O_SS_TEAM_NAME.detect_and_ocr(self.device.image)
-            text2 = str([result.ocr_text for result in compare2])
-            # 相等时 说明滑动到最上层
-            if text1 == text2:
+            if now_team_text == last_team_text:
                 break
+            self.swipe(self.S_SS_TEAM_SWIPE_DOWN, 1.5)
+            sleep(2)
+            last_team_text = now_team_text
+        logger.info('Swipe to top of team')
+
         # 判断当前分组有无目标阵容
         while 1:
             self.screenshot()
@@ -227,6 +231,7 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
             if result and len(result) > 0:
                 break
             self.swipe(self.S_SS_TEAM_SWIPE_UP)
+        logger.info('Swipe up to find target team')
 
         # 选中分组
         while 1:
@@ -234,8 +239,9 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
             self.O_SS_TEAM_NAME.keyword = teamName
             if self.ocr_appear_click(self.O_SS_TEAM_NAME):
                 break
+        logger.info(f'Select team {teamName}')
         # 切换御魂
-        for i in range(6):
+        for i in range(5):
             sleep(0.8)
             self.screenshot()
             self.O_SS_TEAM_NAME.keyword = teamName
@@ -245,6 +251,7 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
                 break
         logger.info(f'Switch soul_one group {groupName} team {teamName}')
 
+
     def ocr_appear_click_by_rule(self,
                          target: RuleOcr,
                          action: Union[RuleClick, RuleLongClick] = None,
@@ -277,6 +284,6 @@ if __name__ == '__main__':
     s = SwitchSoul(c, d)
 
     s.click_preset()
-    s.switch_soul_one(4, 1)
+    # s.switch_soul_one(4, 1)
     # s.switch_soul_by_name('契灵', '茨球')
-    # s.switch_soul_by_name('默认分组', '结界突破2')
+    s.switch_soul_by_name('默认分组', '队伍5')

+ 2 - 0
tasks/Hunt/assets.py

@@ -36,5 +36,7 @@ class HuntAssets:
 	I_NW = RuleImage(roi_front=(1060,602,100,100), roi_back=(1060,602,100,100), threshold=0.8, method="Template matching", file="./tasks/Hunt/netherworld/netherworld_nw.png")
 	# 点击挑战 
 	I_NW_CHALLAGE = RuleImage(roi_front=(306,590,171,63), roi_back=(306,590,171,63), threshold=0.8, method="Template matching", file="./tasks/Hunt/netherworld/netherworld_nw_challage.png")
+	# 今日已挑战 
+	I_NW_DONE = RuleImage(roi_front=(308,600,156,41), roi_back=(308,600,156,41), threshold=0.9, method="Template matching", file="./tasks/Hunt/netherworld/netherworld_nw_done.png")
 
 

+ 9 - 0
tasks/Hunt/netherworld/image.json

@@ -16,5 +16,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击挑战"
+  },
+  {
+    "itemName": "nw_done",
+    "imageName": "netherworld_nw_done.png",
+    "roiFront": "308,600,156,41",
+    "roiBack": "308,600,156,41",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "今日已挑战"
   }
 ]

BIN
tasks/Hunt/netherworld/netherworld_nw_done.png


+ 6 - 1
tasks/Hunt/script_task.py

@@ -92,7 +92,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
         self.ui_click(self.I_KIRIN_CHALLAGE, self.I_KIRIN_GATHER)
         # 等待进入战斗
         # 等待挑战, 5秒也是等
-        time.sleep(5)
+        sleep(5)
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.wait_until_disappear(self.I_KIRIN_GATHER)
         self.device.stuck_record_clear()
@@ -117,6 +117,11 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 continue
             if self.appear_then_click(self.I_NW_CHALLAGE, interval=1.5):
                 continue
+            if self.appear(self.I_NW_DONE):
+                # 今日已挑战
+                logger.warning('Today have already challenged the Netherworld')
+                self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                return
         logger.info('Start battle')
         self.run_general_battle()
 

+ 7 - 3
tasks/KekkaiUtilize/script_task.py

@@ -143,17 +143,21 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             if not appear:
                 return False
             # 点击盒子
-            timer_ap = Timer(12)
+            timer_ap = Timer(6)
             timer_ap.start()
             while 1:
                 self.screenshot()
 
-                if self.ui_reward_appear_click():
+                if self.appear(self.I_UI_REWARD):
                     while 1:
-                        # 等待动画结束
+                        self.screenshot()
                         if not self.appear(self.I_UI_REWARD):
                             break
+                        if self.appear_then_click(self.I_UI_REWARD, self.C_UI_REWARD, interval=1, threshold=0.6):
+                            continue
+                    logger.info('Reward box')
                     break
+
                 if self.appear_then_click(self.I_BOX_AP, interval=1):
                     continue
                 if self.appear_then_click(self.I_AP_EXTRACT, interval=2):

+ 9 - 9
tasks/MysteryShop/assets.py

@@ -32,11 +32,11 @@ class MysteryShopAssets:
 
 	# Image Rule Assets
 	# 蓝票 
-	I_MS_BLUE = RuleImage(roi_front=(650,371,92,93), roi_back=(179,81,829,471), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_blue.png")
+	I_MS_BLUE = RuleImage(roi_front=(850,379,117,98), roi_back=(179,81,829,471), threshold=0.7, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_blue.png")
 	# 黑蛋 
-	I_MS_BLACK = RuleImage(roi_front=(877,369,91,91), roi_back=(170,64,850,448), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_black.png")
+	I_MS_BLACK = RuleImage(roi_front=(851,353,114,102), roi_back=(170,64,850,448), threshold=0.6, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_black.png")
 	# description 
-	I_MS_TAIKO_3 = RuleImage(roi_front=(431,371,85,91), roi_back=(171,50,839,494), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_taiko_3.png")
+	I_MS_TAIKO_3 = RuleImage(roi_front=(176,353,140,104), roi_back=(144,50,866,494), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_taiko_3.png")
 	# description 
 	I_MS_TAIKO_4 = RuleImage(roi_front=(204,372,90,88), roi_back=(156,81,874,473), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_taiko_4.png")
 	# description 
@@ -44,17 +44,17 @@ class MysteryShopAssets:
 	# description 
 	I_MS_EXP = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_exp.png")
 	# description 
-	I_MS_CHECK_BLUE = RuleImage(roi_front=(455,235,88,94), roi_back=(455,235,88,94), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_blue.png")
+	I_MS_CHECK_BLUE = RuleImage(roi_front=(592,241,88,94), roi_back=(455,235,261,146), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_blue.png")
 	# description 
-	I_MS_CHECK_BLACK = RuleImage(roi_front=(454,235,86,92), roi_back=(454,235,86,92), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_black.png")
+	I_MS_CHECK_BLACK = RuleImage(roi_front=(598,258,86,92), roi_back=(455,238,273,123), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_black.png")
 	# description 
-	I_MS_CHECK_TAIKO_3 = RuleImage(roi_front=(465,245,70,81), roi_back=(465,245,70,81), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_taiko_3.png")
+	I_MS_CHECK_TAIKO_3 = RuleImage(roi_front=(567,259,70,81), roi_back=(465,245,252,124), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_taiko_3.png")
 	# description 
-	I_MS_CHECK_TAIKO_4 = RuleImage(roi_front=(461,254,66,73), roi_back=(461,254,66,73), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_taiko_4.png")
+	I_MS_CHECK_TAIKO_4 = RuleImage(roi_front=(591,277,66,73), roi_back=(453,235,280,146), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_taiko_4.png")
 	# description 
-	I_MS_CHECK_TAIKO_6 = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_taiko_6.png")
+	I_MS_CHECK_TAIKO_6 = RuleImage(roi_front=(580,253,100,100), roi_back=(430,220,334,171), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_taiko_6.png")
 	# description 
-	I_MS_CHECK_EXP = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_exp.png")
+	I_MS_CHECK_EXP = RuleImage(roi_front=(589,255,100,100), roi_back=(472,225,243,149), threshold=0.8, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_check_exp.png")
 	# description 
 	I_MS_REWARD_3 = RuleImage(roi_front=(511,630,48,47), roi_back=(511,630,48,47), threshold=0.7, method="Template matching", file="./tasks/MysteryShop/ms/ms_ms_reward_3.png")
 	# description 

BIN
tasks/MysteryShop/ms/ms_ms_black.png


BIN
tasks/MysteryShop/ms/ms_ms_blue.png


BIN
tasks/MysteryShop/ms/ms_ms_taiko_3.png


+ 18 - 18
tasks/MysteryShop/ms/things.json

@@ -2,26 +2,26 @@
   {
     "itemName": "ms_blue",
     "imageName": "ms_ms_blue.png",
-    "roiFront": "650,371,92,93",
+    "roiFront": "850,379,117,98",
     "roiBack": "179,81,829,471",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "蓝票"
   },
   {
     "itemName": "ms_black",
     "imageName": "ms_ms_black.png",
-    "roiFront": "877,369,91,91",
+    "roiFront": "851,353,114,102",
     "roiBack": "170,64,850,448",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.6,
     "description": "黑蛋"
   },
   {
     "itemName": "ms_taiko_3",
     "imageName": "ms_ms_taiko_3.png",
-    "roiFront": "431,371,85,91",
-    "roiBack": "171,50,839,494",
+    "roiFront": "176,353,140,104",
+    "roiBack": "144,50,866,494",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "ms_check_blue",
     "imageName": "ms_ms_check_blue.png",
-    "roiFront": "455,235,88,94",
-    "roiBack": "455,235,88,94",
+    "roiFront": "592,241,88,94",
+    "roiBack": "455,235,261,146",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -65,8 +65,8 @@
   {
     "itemName": "ms_check_black",
     "imageName": "ms_ms_check_black.png",
-    "roiFront": "454,235,86,92",
-    "roiBack": "454,235,86,92",
+    "roiFront": "598,258,86,92",
+    "roiBack": "455,238,273,123",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -74,8 +74,8 @@
   {
     "itemName": "ms_check_taiko_3",
     "imageName": "ms_ms_check_taiko_3.png",
-    "roiFront": "465,245,70,81",
-    "roiBack": "465,245,70,81",
+    "roiFront": "567,259,70,81",
+    "roiBack": "465,245,252,124",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -83,8 +83,8 @@
   {
     "itemName": "ms_check_taiko_4",
     "imageName": "ms_ms_check_taiko_4.png",
-    "roiFront": "461,254,66,73",
-    "roiBack": "461,254,66,73",
+    "roiFront": "591,277,66,73",
+    "roiBack": "453,235,280,146",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -92,8 +92,8 @@
   {
     "itemName": "ms_check_taiko_6",
     "imageName": "ms_ms_check_taiko_6.png",
-    "roiFront": "0,0,100,100",
-    "roiBack": "0,0,100,100",
+    "roiFront": "580,253,100,100",
+    "roiBack": "430,220,334,171",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -101,8 +101,8 @@
   {
     "itemName": "ms_check_exp",
     "imageName": "ms_ms_check_exp.png",
-    "roiFront": "0,0,100,100",
-    "roiBack": "0,0,100,100",
+    "roiFront": "589,255,100,100",
+    "roiBack": "472,225,243,149",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 1 - 1
tasks/Restart/assets.py

@@ -51,7 +51,7 @@ class RestartAssets:
 	# description 
 	I_LOGIN_YELLOW_CLOSE = RuleImage(roi_front=(29,17,46,44), roi_back=(0,0,94,86), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_yellow_close.png")
 	# 用于判断是否出现登录选区的 
-	I_LOGIN_8 = RuleImage(roi_front=(178,572,53,60), roi_back=(19,547,223,105), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_8.png")
+	I_LOGIN_8 = RuleImage(roi_front=(178,572,53,60), roi_back=(1,547,241,105), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_8.png")
 	# 登录时候不观看CG视频 
 	I_WATCH_VIDEO_CANCEL = RuleImage(roi_front=(466,396,130,61), roi_back=(466,396,130,61), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_watch_video_cancel.png")
 	# 指定角色进入游戏,默认第一个 

+ 1 - 1
tasks/Restart/login/image.json

@@ -39,7 +39,7 @@
     "itemName": "login_8",
     "imageName": "login_login_8.png",
     "roiFront": "178,572,53,60",
-    "roiBack": "19,547,223,105",
+    "roiBack": "1,547,241,105",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "用于判断是否出现登录选区的"

+ 15 - 15
tasks/RichMan/assets.py

@@ -24,7 +24,7 @@ class RichManAssets:
 	# 皮肤券 
 	I_GUILD_SKIN = RuleImage(roi_front=(795,436,71,74), roi_back=(795,436,71,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
 	# 购买检查 
-	I_GUILD_CHECK_SCRAP = RuleImage(roi_front=(454,240,90,88), roi_back=(454,240,90,88), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_check_scrap.png")
+	I_GUILD_CHECK_SCRAP = RuleImage(roi_front=(590,246,90,88), roi_back=(590,246,90,88), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_check_scrap.png")
 
 
 	# Ocr Rule Assets
@@ -33,7 +33,7 @@ class RichManAssets:
 	# Ocr-description 
 	O_GUILD_NUMBER_BLUE = RuleOcr(roi=(888,269,25,33), area=(888,269,25,33), mode="Digit", method="Default", keyword="", name="guild_number_blue")
 	# Ocr-description 
-	O_GUILD_NUMBER_BLACK = RuleOcr(roi=(663,520,22,31), area=(663,520,22,31), mode="Digit", method="Default", keyword="", name="guild_number_black")
+	O_GUILD_NUMBER_BLACK = RuleOcr(roi=(663,523,21,27), area=(663,523,21,27), mode="Digit", method="Default", keyword="", name="guild_number_black")
 	# Ocr-description 
 	O_GUILD_NUMBER_SKIN = RuleOcr(roi=(889,519,21,35), area=(889,519,21,35), mode="Digit", method="Default", keyword="", name="guild_number_skin")
 
@@ -69,11 +69,11 @@ class RichManAssets:
 
 	# Image Rule Assets
 	# 蓝票 
-	I_CH_BLUE = RuleImage(roi_front=(623,142,145,111), roi_back=(161,112,844,462), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/charisma/charisma_ch_blue.png")
+	I_CH_BLUE = RuleImage(roi_front=(623,142,145,111), roi_back=(623,142,145,111), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/charisma/charisma_ch_blue.png")
 	# description 
-	I_CH_BLACK = RuleImage(roi_front=(848,393,141,110), roi_back=(137,94,895,486), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/charisma/charisma_ch_black.png")
+	I_CH_BLACK = RuleImage(roi_front=(848,393,141,110), roi_back=(848,393,141,110), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/charisma/charisma_ch_black.png")
 	# 蓝票购买确认 
-	I_CH_CHECK_BLUE = RuleImage(roi_front=(451,230,100,100), roi_back=(451,230,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/charisma/charisma_ch_check_blue.png")
+	I_CH_CHECK_BLUE = RuleImage(roi_front=(587,243,100,100), roi_back=(587,243,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/charisma/charisma_ch_check_blue.png")
 
 
 	# Image Rule Assets
@@ -92,13 +92,13 @@ class RichManAssets:
 
 	# Image Rule Assets
 	# 红蛋 
-	I_FS_RED = RuleImage(roi_front=(423,158,100,100), roi_back=(423,158,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_red.png")
+	I_FS_RED = RuleImage(roi_front=(400,138,141,135), roi_back=(400,138,141,135), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_red.png")
 	# 破碎的咒符 
-	I_FS_BROKEN = RuleImage(roi_front=(200,153,100,100), roi_back=(200,153,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_broken.png")
+	I_FS_BROKEN = RuleImage(roi_front=(173,142,149,129), roi_back=(173,142,149,129), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_broken.png")
 	# description 
-	I_FS_WHITE_CLICK = RuleImage(roi_front=(647,157,100,100), roi_back=(647,157,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_white_click.png")
+	I_FS_WHITE_CLICK = RuleImage(roi_front=(627,140,138,132), roi_back=(627,140,138,132), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_white_click.png")
 	# 白蛋确认 
-	I_FS_WHITE_CHECK = RuleImage(roi_front=(452,229,100,100), roi_back=(452,229,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_white_check.png")
+	I_FS_WHITE_CHECK = RuleImage(roi_front=(589,227,100,100), roi_back=(589,227,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/friendship_points/friendship_points_fs_white_check.png")
 
 
 	# Image Rule Assets
@@ -137,13 +137,13 @@ class RichManAssets:
 	# 破碎的咒符 
 	I_ME_BROKEN = RuleImage(roi_front=(398,144,143,116), roi_back=(146,116,866,475), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_broken.png")
 	# 购买检查 
-	I_ME_CHECK_BLACK = RuleImage(roi_front=(452,231,100,100), roi_back=(452,231,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_black.png")
+	I_ME_CHECK_BLACK = RuleImage(roi_front=(585,230,100,100), roi_back=(585,230,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_black.png")
 	# 购买检查 
-	I_ME_CHECK_BLUE = RuleImage(roi_front=(448,232,100,100), roi_back=(448,232,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_blue.png")
+	I_ME_CHECK_BLUE = RuleImage(roi_front=(587,238,100,100), roi_back=(587,238,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_blue.png")
 	# 购买检查 
-	I_ME_CHECK_AP = RuleImage(roi_front=(453,227,100,100), roi_back=(453,227,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_ap.png")
+	I_ME_CHECK_AP = RuleImage(roi_front=(588,242,100,100), roi_back=(588,242,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_ap.png")
 	# 购买检查 
-	I_ME_CHECK_SOULS = RuleImage(roi_front=(453,235,100,100), roi_back=(453,235,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_souls.png")
+	I_ME_CHECK_SOULS = RuleImage(roi_front=(590,257,100,100), roi_back=(590,257,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/medal/medal_me_check_souls.png")
 
 
 	# Image Rule Assets
@@ -356,9 +356,9 @@ class RichManAssets:
 	# description 
 	I_TT_AP = RuleImage(roi_front=(938,177,88,87), roi_back=(467,167,581,123), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_ap.png")
 	# 提高 
-	I_TT_BUY_UP = RuleImage(roi_front=(761,411,59,57), roi_back=(761,411,59,57), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_buy_up.png")
+	I_TT_BUY_UP = RuleImage(roi_front=(755,427,59,57), roi_back=(740,386,80,146), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_buy_up.png")
 	# description 
-	I_TT_BUY_CONFIRM = RuleImage(roi_front=(584,512,53,53), roi_back=(553,508,169,60), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_buy_confirm.png")
+	I_TT_BUY_CONFIRM = RuleImage(roi_front=(584,512,53,53), roi_back=(553,487,169,115), threshold=0.8, method="Template matching", file="./tasks/RichMan/tt/tt_tt_buy_confirm.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/RichMan/guild/guild_guild_check_scrap.png


+ 2 - 2
tasks/RichMan/guild/image.json

@@ -56,8 +56,8 @@
   {
     "itemName": "guild_check_scrap",
     "imageName": "guild_guild_check_scrap.png",
-    "roiFront": "454,240,90,88",
-    "roiBack": "454,240,90,88",
+    "roiFront": "590,246,90,88",
+    "roiBack": "590,246,90,88",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "购买检查"

+ 2 - 2
tasks/RichMan/guild/ocr.json

@@ -19,8 +19,8 @@
   },
   {
     "itemName": "guild_number_black",
-    "roiFront": "663,520,22,31",
-    "roiBack": "663,520,22,31",
+    "roiFront": "663,523,21,27",
+    "roiBack": "663,523,21,27",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

BIN
tasks/RichMan/mall/charisma/charisma_ch_check_blue.png


+ 4 - 4
tasks/RichMan/mall/charisma/image.json

@@ -3,7 +3,7 @@
     "itemName": "ch_blue",
     "imageName": "charisma_ch_blue.png",
     "roiFront": "623,142,145,111",
-    "roiBack": "161,112,844,462",
+    "roiBack": "623,142,145,111",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "蓝票"
@@ -12,7 +12,7 @@
     "itemName": "ch_black",
     "imageName": "charisma_ch_black.png",
     "roiFront": "848,393,141,110",
-    "roiBack": "137,94,895,486",
+    "roiBack": "848,393,141,110",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -20,8 +20,8 @@
   {
     "itemName": "ch_check_blue",
     "imageName": "charisma_ch_check_blue.png",
-    "roiFront": "451,230,100,100",
-    "roiBack": "451,230,100,100",
+    "roiFront": "587,243,100,100",
+    "roiBack": "587,243,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "蓝票购买确认"

BIN
tasks/RichMan/mall/friendship_points/friendship_points_fs_broken.png


BIN
tasks/RichMan/mall/friendship_points/friendship_points_fs_red.png


BIN
tasks/RichMan/mall/friendship_points/friendship_points_fs_white_check.png


BIN
tasks/RichMan/mall/friendship_points/friendship_points_fs_white_click.png


+ 8 - 8
tasks/RichMan/mall/friendship_points/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "fs_red",
     "imageName": "friendship_points_fs_red.png",
-    "roiFront": "423,158,100,100",
-    "roiBack": "423,158,100,100",
+    "roiFront": "400,138,141,135",
+    "roiBack": "400,138,141,135",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "红蛋"
@@ -11,8 +11,8 @@
   {
     "itemName": "fs_broken",
     "imageName": "friendship_points_fs_broken.png",
-    "roiFront": "200,153,100,100",
-    "roiBack": "200,153,100,100",
+    "roiFront": "173,142,149,129",
+    "roiBack": "173,142,149,129",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "破碎的咒符"
@@ -20,8 +20,8 @@
   {
     "itemName": "fs_white_click",
     "imageName": "friendship_points_fs_white_click.png",
-    "roiFront": "647,157,100,100",
-    "roiBack": "647,157,100,100",
+    "roiFront": "627,140,138,132",
+    "roiBack": "627,140,138,132",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "fs_white_check",
     "imageName": "friendship_points_fs_white_check.png",
-    "roiFront": "452,229,100,100",
-    "roiBack": "452,229,100,100",
+    "roiFront": "589,227,100,100",
+    "roiBack": "589,227,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "白蛋确认"

+ 8 - 8
tasks/RichMan/mall/medal/image.json

@@ -74,8 +74,8 @@
   {
     "itemName": "me_check_black",
     "imageName": "medal_me_check_black.png",
-    "roiFront": "452,231,100,100",
-    "roiBack": "452,231,100,100",
+    "roiFront": "585,230,100,100",
+    "roiBack": "585,230,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "购买检查"
@@ -83,8 +83,8 @@
   {
     "itemName": "me_check_blue",
     "imageName": "medal_me_check_blue.png",
-    "roiFront": "448,232,100,100",
-    "roiBack": "448,232,100,100",
+    "roiFront": "587,238,100,100",
+    "roiBack": "587,238,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "购买检查"
@@ -92,8 +92,8 @@
   {
     "itemName": "me_check_ap",
     "imageName": "medal_me_check_ap.png",
-    "roiFront": "453,227,100,100",
-    "roiBack": "453,227,100,100",
+    "roiFront": "588,242,100,100",
+    "roiBack": "588,242,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "购买检查"
@@ -101,8 +101,8 @@
   {
     "itemName": "me_check_souls",
     "imageName": "medal_me_check_souls.png",
-    "roiFront": "453,235,100,100",
-    "roiBack": "453,235,100,100",
+    "roiFront": "590,257,100,100",
+    "roiBack": "590,257,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "购买检查"

BIN
tasks/RichMan/mall/medal/medal_me_check_ap.png


BIN
tasks/RichMan/mall/medal/medal_me_check_black.png


BIN
tasks/RichMan/mall/medal/medal_me_check_blue.png


BIN
tasks/RichMan/mall/medal/medal_me_check_souls.png


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

@@ -167,7 +167,7 @@ class Special(Buy, MallNavbar):
                 result = re.findall(r'剩余购买次数:(\d+)', result)[0]
                 result = int(result)
             else:
-                result = re.findall(r'剩余购买次数(\d+)', result)[0]
+                result = re.findall(r'本周剩余数量(\d+)', result)[0]
                 result = int(result)
         except:
             result = 0

+ 1 - 1
tasks/RichMan/script_task.py

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

+ 3 - 3
tasks/RichMan/tt/image.json

@@ -47,8 +47,8 @@
   {
     "itemName": "tt_buy_up",
     "imageName": "tt_tt_buy_up.png",
-    "roiFront": "761,411,59,57",
-    "roiBack": "761,411,59,57",
+    "roiFront": "755,427,59,57",
+    "roiBack": "740,386,80,146",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "提高"
@@ -57,7 +57,7 @@
     "itemName": "tt_buy_confirm",
     "imageName": "tt_tt_buy_confirm.png",
     "roiFront": "584,512,53,53",
-    "roiBack": "553,508,169,60",
+    "roiBack": "553,487,169,115",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

BIN
tasks/RichMan/tt/tt_tt_buy_up.png