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

Merge pull request #1446 from runhey/dev

Automated PR 2026.02.26
huangrunheng 8 месяцев назад
Родитель
Сommit
da9a54554c
66 измененных файлов с 57 добавлено и 627 удалено
  1. 1 0
      assets/i18n/zh-CN.json
  2. 11 7
      tasks/Component/Costume/config.py
  3. 1 32
      tasks/Component/Costume/costume_base.py
  4. 9 0
      tasks/Component/CostumeCarpBanner/assets.py
  5. BIN
      tasks/Component/CostumeCarpBanner/cb2/cb2_shi_card_2.png
  6. BIN
      tasks/Component/CostumeCarpBanner/cb2/cb2_shi_defense_2.png
  7. BIN
      tasks/Component/CostumeCarpBanner/cb2/cb2_shi_grown_2.png
  8. 29 0
      tasks/Component/CostumeCarpBanner/cb2/image.json
  9. 0 30
      tasks/Component/CostumeRealm/README.md
  10. 0 117
      tasks/Component/CostumeRealm/assets.py
  11. 0 83
      tasks/Component/CostumeRealm/realm1/image.json
  12. BIN
      tasks/Component/CostumeRealm/realm1/realm1_box_ap_1.png
  13. BIN
      tasks/Component/CostumeRealm/realm1/realm1_box_exp_1.png
  14. BIN
      tasks/Component/CostumeRealm/realm1/realm1_box_exp_max_1.png
  15. BIN
      tasks/Component/CostumeRealm/realm1/realm1_card_exp_1.png
  16. BIN
      tasks/Component/CostumeRealm/realm1/realm1_realm_shin_1.png
  17. BIN
      tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png
  18. BIN
      tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png
  19. BIN
      tasks/Component/CostumeRealm/realm1/realm1_shi_grown_1.png
  20. BIN
      tasks/Component/CostumeRealm/realm1/realm1_utilize_exp_1.png
  21. 0 83
      tasks/Component/CostumeRealm/realm2/image.json
  22. BIN
      tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png
  23. BIN
      tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png
  24. BIN
      tasks/Component/CostumeRealm/realm2/realm2_box_exp_max_2.png
  25. BIN
      tasks/Component/CostumeRealm/realm2/realm2_card_exp_2.png
  26. BIN
      tasks/Component/CostumeRealm/realm2/realm2_realm_shin_2.png
  27. BIN
      tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png
  28. BIN
      tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png
  29. BIN
      tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png
  30. BIN
      tasks/Component/CostumeRealm/realm2/realm2_utilize_exp_2.png
  31. 0 83
      tasks/Component/CostumeRealm/realm3/image.json
  32. BIN
      tasks/Component/CostumeRealm/realm3/realm3_box_ap_3.png
  33. BIN
      tasks/Component/CostumeRealm/realm3/realm3_box_exp_3.png
  34. BIN
      tasks/Component/CostumeRealm/realm3/realm3_box_exp_max_3.png
  35. BIN
      tasks/Component/CostumeRealm/realm3/realm3_card_exp_3.png
  36. BIN
      tasks/Component/CostumeRealm/realm3/realm3_realm_shin_3.png
  37. BIN
      tasks/Component/CostumeRealm/realm3/realm3_shi_card_3.png
  38. BIN
      tasks/Component/CostumeRealm/realm3/realm3_shi_defense_3.png
  39. BIN
      tasks/Component/CostumeRealm/realm3/realm3_shi_grown_3.png
  40. BIN
      tasks/Component/CostumeRealm/realm3/realm3_utilize_exp_3.png
  41. 0 83
      tasks/Component/CostumeRealm/realm4/image.json
  42. BIN
      tasks/Component/CostumeRealm/realm4/realm4_box_ap_4.png
  43. BIN
      tasks/Component/CostumeRealm/realm4/realm4_box_exp_4.png
  44. BIN
      tasks/Component/CostumeRealm/realm4/realm4_box_exp_max_4.png
  45. BIN
      tasks/Component/CostumeRealm/realm4/realm4_card_exp_4.png
  46. BIN
      tasks/Component/CostumeRealm/realm4/realm4_realm_shin_4.png
  47. BIN
      tasks/Component/CostumeRealm/realm4/realm4_shi_card_4.png
  48. BIN
      tasks/Component/CostumeRealm/realm4/realm4_shi_defense_4.png
  49. BIN
      tasks/Component/CostumeRealm/realm4/realm4_shi_grown_4.png
  50. BIN
      tasks/Component/CostumeRealm/realm4/realm4_utilize_exp_4.png
  51. 0 83
      tasks/Component/CostumeRealm/realm5/image.json
  52. BIN
      tasks/Component/CostumeRealm/realm5/realm5_box_ap_5.png
  53. BIN
      tasks/Component/CostumeRealm/realm5/realm5_box_exp_5.png
  54. BIN
      tasks/Component/CostumeRealm/realm5/realm5_box_exp_max_5.png
  55. BIN
      tasks/Component/CostumeRealm/realm5/realm5_card_exp_5.png
  56. BIN
      tasks/Component/CostumeRealm/realm5/realm5_realm_shin_5.png
  57. BIN
      tasks/Component/CostumeRealm/realm5/realm5_shi_card_5.png
  58. BIN
      tasks/Component/CostumeRealm/realm5/realm5_shi_defense_5.png
  59. BIN
      tasks/Component/CostumeRealm/realm5/realm5_shi_grown_5.png
  60. BIN
      tasks/Component/CostumeRealm/realm5/realm5_utilize_exp_5.png
  61. 1 3
      tasks/Component/GeneralInvite/assets.py
  62. 2 2
      tasks/Component/GeneralInvite/gi/image.json
  63. 0 2
      tasks/TalismanPass/assets.py
  64. 3 10
      tasks/TalismanPass/script_task.py
  65. 0 9
      tasks/TalismanPass/tp/image.json
  66. BIN
      tasks/TalismanPass/tp/tp_tp_soul_1b.png

+ 1 - 0
assets/i18n/zh-CN.json

@@ -10,6 +10,7 @@
   "costume_carpbanner_type": "鲤鱼旗皮肤",
   "costume_carpbanner_type": "鲤鱼旗皮肤",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_1": "无垢莲台",
   "costume_carpbanner_1": "无垢莲台",
+  "costume_carpbanner_2": "萤灯月夜",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_11": "辰烁奇夜",
   "costume_battle_11": "辰烁奇夜",

+ 11 - 7
tasks/Component/Costume/config.py

@@ -1,7 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from enum import Enum
 from enum import Enum
 
 
 # 庭院皮肤
 # 庭院皮肤
@@ -24,16 +24,12 @@ class MainType(str, Enum):
 # 结界皮肤
 # 结界皮肤
 class RealmType(str, Enum):
 class RealmType(str, Enum):
     COSTUME_REALM_DEFAULT = 'costume_realm_default'  # 妖扇结界
     COSTUME_REALM_DEFAULT = 'costume_realm_default'  # 妖扇结界
-    COSTUME_REALM_1 = 'costume_realm_1'  # 鬼灵咒符
-    COSTUME_REALM_2 = 'costume_realm_2'  # 狐梦之乡
-    COSTUME_REALM_3 = 'costume_realm_3'  # 编心织忆
-    COSTUME_REALM_4 = 'costume_realm_4'  # 花海繁生
-    COSTUME_REALM_5 = 'costume_realm_5'  # 莲心梦乡
 
 
 # 鲤鱼旗皮肤
 # 鲤鱼旗皮肤
 class CarpBannerType(str, Enum):
 class CarpBannerType(str, Enum):
     COSTUME_CARPBANNER_DEFAULT = 'costume_carpbanner_default'  # 吉鲤游风
     COSTUME_CARPBANNER_DEFAULT = 'costume_carpbanner_default'  # 吉鲤游风
-    COSTUME_CARPBANNER_1 = 'costume_carpbanner_1'  # 无垢莲台(仅适配莲心梦乡)
+    COSTUME_CARPBANNER_1 = 'costume_carpbanner_1'  # 无垢莲台
+    COSTUME_CARPBANNER_2 = 'costume_carpbanner_2'  # 萤灯月夜
 
 
 # 主题,就是庭院最右下角的展开按钮
 # 主题,就是庭院最右下角的展开按钮
 class ThemeType(str, Enum):
 class ThemeType(str, Enum):
@@ -81,6 +77,14 @@ class CostumeConfig(BaseModel):
     costume_sign_type: SignType = Field(default=SignType.COSTUME_SIGN_DEFAULT, description='costume_sign_type_help')
     costume_sign_type: SignType = Field(default=SignType.COSTUME_SIGN_DEFAULT, description='costume_sign_type_help')
     costume_battle_type: BattleType = Field(default=BattleType.COSTUME_BATTLE_DEFAULT, description='costume_battle_type_help')
     costume_battle_type: BattleType = Field(default=BattleType.COSTUME_BATTLE_DEFAULT, description='costume_battle_type_help')
 
 
+    @field_validator('costume_realm_type', mode='after')
+    @classmethod
+    def validator_realm(cls, v: RealmType) -> RealmType:
+        return RealmType.COSTUME_REALM_DEFAULT
+
+
+
+
 
 
 
 
 
 

+ 1 - 32
tasks/Component/Costume/costume_base.py

@@ -8,7 +8,6 @@ from module.logger import logger
 from tasks.Component.Costume.config import (MainType, CostumeConfig, RealmType,
 from tasks.Component.Costume.config import (MainType, CostumeConfig, RealmType,
                                             ThemeType, ShikigamiType, SignType, BattleType, CarpBannerType)
                                             ThemeType, ShikigamiType, SignType, BattleType, CarpBannerType)
 from tasks.Component.Costume.assets import CostumeAssets
 from tasks.Component.Costume.assets import CostumeAssets
-from tasks.Component.CostumeRealm.assets import CostumeRealmAssets
 from tasks.Component.CostumeBattle.assets import CostumeBattleAssets
 from tasks.Component.CostumeBattle.assets import CostumeBattleAssets
 from tasks.Component.CostumeShikigami.assets import CostumeShikigamiAssets
 from tasks.Component.CostumeShikigami.assets import CostumeShikigamiAssets
 from tasks.Component.CostumeCarpBanner.assets import CostumeCarpBannerAssets
 from tasks.Component.CostumeCarpBanner.assets import CostumeCarpBannerAssets
@@ -26,29 +25,13 @@ main_costume_model = {
 }
 }
 
 
 
 
-# 结界皮肤
-realm_costume_model = {
-    getattr(RealmType, f"COSTUME_REALM_{i}"): {
-        'I_SHI_CARD': f'I_SHI_CARD_{i}',
-        'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
-        'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
-        'I_CARD_EXP': f'I_CARD_EXP_{i}',
-        'I_BOX_AP': f'I_BOX_AP_{i}',
-        'I_BOX_EXP': f'I_BOX_EXP_{i}',
-        'I_REALM_SHIN': f'I_REALM_SHIN_{i}',
-        'I_UTILIZE_EXP': f'I_UTILIZE_EXP_{i}',
-        'I_BOX_EXP_MAX': f'I_BOX_EXP_MAX_{i}',
-    } for i in range(1, 6)
-}
-
-
 # 鲤鱼旗皮肤
 # 鲤鱼旗皮肤
 carpbanner_costume_model = {
 carpbanner_costume_model = {
     getattr(CarpBannerType, f"COSTUME_CARPBANNER_{i}"): {
     getattr(CarpBannerType, f"COSTUME_CARPBANNER_{i}"): {
         'I_SHI_CARD': f'I_SHI_CARD_{i}',
         'I_SHI_CARD': f'I_SHI_CARD_{i}',
         'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
         'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
         'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
         'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
-    } for i in range(1, 2)
+    } for i in range(1, 3)
 }
 }
 
 
 
 
@@ -96,7 +79,6 @@ class CostumeBase:
         if config is None:
         if config is None:
             config: CostumeConfig = self.config.model.global_game.costume_config
             config: CostumeConfig = self.config.model.global_game.costume_config
         self.check_costume_main(config.costume_main_type)
         self.check_costume_main(config.costume_main_type)
-        self.check_costume_realm(config.costume_realm_type)
         self.check_costume_carpbanner(config.costume_carpbanner_type)
         self.check_costume_carpbanner(config.costume_carpbanner_type)
         self.check_costume_battle(config.costume_battle_type)
         self.check_costume_battle(config.costume_battle_type)
         self.check_costume_shikigami(config.costume_shikigami_type)
         self.check_costume_shikigami(config.costume_shikigami_type)
@@ -138,19 +120,6 @@ class CostumeBase:
             # 执行替换(覆盖结界皮肤的同名key)
             # 执行替换(覆盖结界皮肤的同名key)
             self.replace_img(key, assert_value)
             self.replace_img(key, assert_value)
 
 
-    def check_costume_realm(self, realm_type: RealmType):
-        if realm_type == RealmType.COSTUME_REALM_DEFAULT:
-            return
-        logger.info(f'Switch realm theme {realm_type}')
-        costume_realm_assets = CostumeRealmAssets()
-        model = realm_costume_model.get(realm_type, {})
-        for key, value in model.items():
-            if not hasattr(costume_realm_assets, value):
-                logger.warning(f'Realm asset {value} not found, skip')
-                continue
-            assert_value: RuleImage = getattr(costume_realm_assets, value)
-            self.replace_img(key, assert_value)
-
     def check_costume_battle(self, battle_type: BattleType):
     def check_costume_battle(self, battle_type: BattleType):
         if battle_type == BattleType.COSTUME_BATTLE_DEFAULT:
         if battle_type == BattleType.COSTUME_BATTLE_DEFAULT:
             return
             return

+ 9 - 0
tasks/Component/CostumeCarpBanner/assets.py

@@ -19,3 +19,12 @@ class CostumeCarpBannerAssets:
 	I_SHI_DEFENSE_1 = RuleImage(roi_front=(216,258,22,33), roi_back=(178,209,261,274), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png")
 	I_SHI_DEFENSE_1 = RuleImage(roi_front=(216,258,22,33), roi_back=(178,209,261,274), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png")
 
 
 
 
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_2 = RuleImage(roi_front=(585,336,21,38), roi_back=(519,212,220,281), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb2/cb2_shi_grown_2.png")
+	# 结界卡 
+	I_SHI_CARD_2 = RuleImage(roi_front=(871,341,20,36), roi_back=(823,210,252,297), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb2/cb2_shi_card_2.png")
+	# 防守 
+	I_SHI_DEFENSE_2 = RuleImage(roi_front=(287,343,19,38), roi_back=(178,209,261,274), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb2/cb2_shi_defense_2.png")
+
+

BIN
tasks/Component/CostumeCarpBanner/cb2/cb2_shi_card_2.png


BIN
tasks/Component/CostumeCarpBanner/cb2/cb2_shi_defense_2.png


BIN
tasks/Component/CostumeCarpBanner/cb2/cb2_shi_grown_2.png


+ 29 - 0
tasks/Component/CostumeCarpBanner/cb2/image.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "shi_grown_2",
+    "imageName": "cb2_shi_grown_2.png",
+    "roiFront": "585,336,21,38",
+    "roiBack": "519,212,220,281",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_2",
+    "imageName": "cb2_shi_card_2.png",
+    "roiFront": "871,341,20,36",
+    "roiBack": "823,210,252,297",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_2",
+    "imageName": "cb2_shi_defense_2.png",
+    "roiFront": "287,343,19,38",
+    "roiBack": "178,209,261,274",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "防守"
+  }
+]

+ 0 - 30
tasks/Component/CostumeRealm/README.md

@@ -1,30 +0,0 @@
-
-用于存放测试结果,但是这样也不是办法
-### 1
-```
-Image                  Count
-REALM_SHI_GROWN        4 times
-REALM1_SHI_CARD_1      5 times
-REALM1_SHI_DEFENSE_1   5 times
-REALM_REALM_SHIN       5 times
-REALM_CARD_EXP         5 times
-REALM_BOX_AP           5 times
-REALM_BOX_EXP          5 times
-REALM_BOX_EXP_MAX      0 times
-REALM_UTILIZE_EXP      0 times
-```
-
-### 2
-```
-Image                  Count
-REALM2_SHI_GROWN_2     4 times
-REALM2_SHI_CARD_2      5 times
-REALM2_SHI_DEFENSE_2   5 times
-REALM_REALM_SHIN       5 times
-REALM_CARD_EXP         5 times
-REALM2_BOX_AP_2        5 times
-REALM2_BOX_EXP_2       5 times
-REALM_BOX_EXP_MAX      0 times
-REALM_UTILIZE_EXP      0 times
-```
-

+ 0 - 117
tasks/Component/CostumeRealm/assets.py

@@ -1,117 +0,0 @@
-from module.atom.image import RuleImage
-from module.atom.click import RuleClick
-from module.atom.long_click import RuleLongClick
-from module.atom.swipe import RuleSwipe
-from module.atom.ocr import RuleOcr
-from module.atom.list import RuleList
-
-# This file was automatically generated by ./dev_tools/assets_extract.py.
-# Don't modify it manually.
-class CostumeRealmAssets: 
-
-
-	# Image Rule Assets
-	# 育成 
-	I_SHI_GROWN_1 = RuleImage(roi_front=(621,300,35,38), roi_back=(553,253,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_grown_1.png")
-	# 结界卡 
-	I_SHI_CARD_1 = RuleImage(roi_front=(923,302,38,56), roi_back=(902,288,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png")
-	# 防守 
-	I_SHI_DEFENSE_1 = RuleImage(roi_front=(309,299,31,62), roi_back=(252,266,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png")
-	# 收取经验(没有满的图) 
-	I_CARD_EXP_1 = RuleImage(roi_front=(918,142,57,54), roi_back=(849,86,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_card_exp_1.png")
-	# 收取体力(没有满) 
-	I_BOX_AP_1 = RuleImage(roi_front=(813,384,51,46), roi_back=(735,305,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_box_ap_1.png")
-	# 收取盒子的经验(没有满) 
-	I_BOX_EXP_1 = RuleImage(roi_front=(899,390,42,45), roi_back=(854,348,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_box_exp_1.png")
-	# 结界皮肤 
-	I_REALM_SHIN_1 = RuleImage(roi_front=(161,389,54,58), roi_back=(0,273,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_realm_shin_1.png")
-	# 寄养别人的经验 
-	I_UTILIZE_EXP_1 = RuleImage(roi_front=(616,143,58,43), roi_back=(566,101,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_utilize_exp_1.png")
-	# 盒子经验满 
-	I_BOX_EXP_MAX_1 = RuleImage(roi_front=(893,376,56,61), roi_back=(803,317,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_box_exp_max_1.png")
-
-
-	# Image Rule Assets
-	# 育成 
-	I_SHI_GROWN_2 = RuleImage(roi_front=(665,354,35,38), roi_back=(588,299,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png")
-	# 结界卡 
-	I_SHI_CARD_2 = RuleImage(roi_front=(935,354,32,56), roi_back=(913,329,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png")
-	# 防守 
-	I_SHI_DEFENSE_2 = RuleImage(roi_front=(371,368,31,62), roi_back=(300,321,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png")
-	# 收取经验(没有满的图) 
-	I_CARD_EXP_2 = RuleImage(roi_front=(935,223,57,54), roi_back=(873,151,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_card_exp_2.png")
-	# 收取体力(没有满) 
-	I_BOX_AP_2 = RuleImage(roi_front=(927,448,51,46), roi_back=(863,367,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png")
-	# 收取盒子的经验(没有满) 
-	I_BOX_EXP_2 = RuleImage(roi_front=(990,457,42,45), roi_back=(953,414,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png")
-	# 结界皮肤 
-	I_REALM_SHIN_2 = RuleImage(roi_front=(157,503,54,58), roi_back=(7,386,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_realm_shin_2.png")
-	# 寄养别人的经验 
-	I_UTILIZE_EXP_2 = RuleImage(roi_front=(659,218,58,43), roi_back=(609,174,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_utilize_exp_2.png")
-	# 盒子经验满 
-	I_BOX_EXP_MAX_2 = RuleImage(roi_front=(991,443,48,51), roi_back=(893,378,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_exp_max_2.png")
-
-
-	# Image Rule Assets
-	# 育成 
-	I_SHI_GROWN_3 = RuleImage(roi_front=(605,304,35,38), roi_back=(530,247,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_shi_grown_3.png")
-	# 结界卡 
-	I_SHI_CARD_3 = RuleImage(roi_front=(935,295,38,56), roi_back=(910,282,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_shi_card_3.png")
-	# 防守 
-	I_SHI_DEFENSE_3 = RuleImage(roi_front=(253,309,31,62), roi_back=(200,269,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_shi_defense_3.png")
-	# 收取经验(没有满的图) 
-	I_CARD_EXP_3 = RuleImage(roi_front=(939,147,50,54), roi_back=(864,86,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_card_exp_3.png")
-	# 收取体力(没有满) 
-	I_BOX_AP_3 = RuleImage(roi_front=(949,376,51,46), roi_back=(872,298,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_box_ap_3.png")
-	# 收取盒子的经验(没有满) 
-	I_BOX_EXP_3 = RuleImage(roi_front=(1012,390,42,45), roi_back=(962,347,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_box_exp_3.png")
-	# 结界皮肤 
-	I_REALM_SHIN_3 = RuleImage(roi_front=(160,401,54,58), roi_back=(0,290,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_realm_shin_3.png")
-	# 寄养别人的经验 
-	I_UTILIZE_EXP_3 = RuleImage(roi_front=(595,151,58,43), roi_back=(543,113,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_utilize_exp_3.png")
-	# 盒子经验满 
-	I_BOX_EXP_MAX_3 = RuleImage(roi_front=(1012,374,49,50), roi_back=(919,317,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_box_exp_max_3.png")
-
-
-	# Image Rule Assets
-	# 育成 
-	I_SHI_GROWN_4 = RuleImage(roi_front=(609,323,27,38), roi_back=(532,250,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_shi_grown_4.png")
-	# 结界卡 
-	I_SHI_CARD_4 = RuleImage(roi_front=(929,315,38,56), roi_back=(904,299,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_shi_card_4.png")
-	# 防守 
-	I_SHI_DEFENSE_4 = RuleImage(roi_front=(242,320,31,62), roi_back=(184,276,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_shi_defense_4.png")
-	# 收取经验(没有满的图) 
-	I_CARD_EXP_4 = RuleImage(roi_front=(930,181,57,54), roi_back=(855,111,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_card_exp_4.png")
-	# 收取体力(没有满) 
-	I_BOX_AP_4 = RuleImage(roi_front=(958,386,51,46), roi_back=(889,313,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_box_ap_4.png")
-	# 收取盒子的经验(没有满) 
-	I_BOX_EXP_4 = RuleImage(roi_front=(1022,394,32,45), roi_back=(968,353,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_box_exp_4.png")
-	# 结界皮肤 
-	I_REALM_SHIN_4 = RuleImage(roi_front=(228,406,54,58), roi_back=(60,293,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_realm_shin_4.png")
-	# 寄养别人的经验 
-	I_UTILIZE_EXP_4 = RuleImage(roi_front=(596,181,58,43), roi_back=(545,144,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_utilize_exp_4.png")
-	# 盒子经验满 
-	I_BOX_EXP_MAX_4 = RuleImage(roi_front=(1026,381,41,51), roi_back=(934,323,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_box_exp_max_4.png")
-
-
-	# Image Rule Assets
-	# 育成 
-	I_SHI_GROWN_5 = RuleImage(roi_front=(642,356,35,38), roi_back=(568,295,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_shi_grown_5.png")
-	# 结界卡 
-	I_SHI_CARD_5 = RuleImage(roi_front=(925,358,38,56), roi_back=(901,333,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_shi_card_5.png")
-	# 防守 
-	I_SHI_DEFENSE_5 = RuleImage(roi_front=(312,356,31,62), roi_back=(257,310,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_shi_defense_5.png")
-	# 收取经验(没有满的图) 
-	I_CARD_EXP_5 = RuleImage(roi_front=(922,216,57,54), roi_back=(850,145,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_card_exp_5.png")
-	# 收取体力(没有满) 
-	I_BOX_AP_5 = RuleImage(roi_front=(981,420,51,46), roi_back=(925,345,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_box_ap_5.png")
-	# 收取盒子的经验(没有满) 
-	I_BOX_EXP_5 = RuleImage(roi_front=(1050,430,42,45), roi_back=(996,382,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_box_exp_5.png")
-	# 结界皮肤 
-	I_REALM_SHIN_5 = RuleImage(roi_front=(237,411,54,58), roi_back=(95,303,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_realm_shin_5.png")
-	# 寄养别人的经验 
-	I_UTILIZE_EXP_5 = RuleImage(roi_front=(632,216,58,43), roi_back=(582,172,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_utilize_exp_5.png")
-	# 盒子经验满 
-	I_BOX_EXP_MAX_5 = RuleImage(roi_front=(1048,420,48,56), roi_back=(958,353,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_box_exp_max_5.png")
-
-

+ 0 - 83
tasks/Component/CostumeRealm/realm1/image.json

@@ -1,83 +0,0 @@
-[
-  {
-    "itemName": "shi_grown_1",
-    "imageName": "realm1_shi_grown_1.png",
-    "roiFront": "621,300,35,38",
-    "roiBack": "553,253,181,198",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "育成"
-  },
-  {
-    "itemName": "shi_card_1",
-    "imageName": "realm1_shi_card_1.png",
-    "roiFront": "923,302,38,56",
-    "roiBack": "902,288,87,120",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "结界卡"
-  },
-  {
-    "itemName": "shi_defense_1",
-    "imageName": "realm1_shi_defense_1.png",
-    "roiFront": "309,299,31,62",
-    "roiBack": "252,266,154,166",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "防守"
-  },
-  {
-    "itemName": "card_exp_1",
-    "imageName": "realm1_card_exp_1.png",
-    "roiFront": "918,142,57,54",
-    "roiBack": "849,86,199,185",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "收取经验(没有满的图)"
-  },
-  {
-    "itemName": "box_ap_1",
-    "imageName": "realm1_box_ap_1.png",
-    "roiFront": "813,384,51,46",
-    "roiBack": "735,305,202,204",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取体力(没有满)"
-  },
-  {
-    "itemName": "box_exp_1",
-    "imageName": "realm1_box_exp_1.png",
-    "roiFront": "899,390,42,45",
-    "roiBack": "854,348,147,127",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取盒子的经验(没有满)"
-  },
-  {
-    "itemName": "realm_shin_1",
-    "imageName": "realm1_realm_shin_1.png",
-    "roiFront": "161,389,54,58",
-    "roiBack": "0,273,360,276",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "结界皮肤"
-  },
-  {
-    "itemName": "utilize_exp_1",
-    "imageName": "realm1_utilize_exp_1.png",
-    "roiFront": "616,143,58,43",
-    "roiBack": "566,101,156,123",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "寄养别人的经验"
-  },
-  {
-    "itemName": "box_exp_max_1",
-    "imageName": "realm1_box_exp_max_1.png",
-    "roiFront": "893,376,56,61",
-    "roiBack": "803,317,228,186",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "盒子经验满"
-  }
-]

BIN
tasks/Component/CostumeRealm/realm1/realm1_box_ap_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_box_exp_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_box_exp_max_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_card_exp_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_realm_shin_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_shi_grown_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_utilize_exp_1.png


+ 0 - 83
tasks/Component/CostumeRealm/realm2/image.json

@@ -1,83 +0,0 @@
-[
-  {
-    "itemName": "shi_grown_2",
-    "imageName": "realm2_shi_grown_2.png",
-    "roiFront": "665,354,35,38",
-    "roiBack": "588,299,181,198",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "育成"
-  },
-  {
-    "itemName": "shi_card_2",
-    "imageName": "realm2_shi_card_2.png",
-    "roiFront": "935,354,32,56",
-    "roiBack": "913,329,87,120",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "结界卡"
-  },
-  {
-    "itemName": "shi_defense_2",
-    "imageName": "realm2_shi_defense_2.png",
-    "roiFront": "371,368,31,62",
-    "roiBack": "300,321,154,166",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "防守"
-  },
-  {
-    "itemName": "card_exp_2",
-    "imageName": "realm2_card_exp_2.png",
-    "roiFront": "935,223,57,54",
-    "roiBack": "873,151,199,185",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "收取经验(没有满的图)"
-  },
-  {
-    "itemName": "box_ap_2",
-    "imageName": "realm2_box_ap_2.png",
-    "roiFront": "927,448,51,46",
-    "roiBack": "863,367,202,204",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取体力(没有满)"
-  },
-  {
-    "itemName": "box_exp_2",
-    "imageName": "realm2_box_exp_2.png",
-    "roiFront": "990,457,42,45",
-    "roiBack": "953,414,147,127",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取盒子的经验(没有满)"
-  },
-  {
-    "itemName": "realm_shin_2",
-    "imageName": "realm2_realm_shin_2.png",
-    "roiFront": "157,503,54,58",
-    "roiBack": "7,386,360,276",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "结界皮肤"
-  },
-  {
-    "itemName": "utilize_exp_2",
-    "imageName": "realm2_utilize_exp_2.png",
-    "roiFront": "659,218,58,43",
-    "roiBack": "609,174,156,123",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "寄养别人的经验"
-  },
-  {
-    "itemName": "box_exp_max_2",
-    "imageName": "realm2_box_exp_max_2.png",
-    "roiFront": "991,443,48,51",
-    "roiBack": "893,378,228,186",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "盒子经验满"
-  }
-]

BIN
tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_box_exp_max_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_card_exp_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_realm_shin_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_utilize_exp_2.png


+ 0 - 83
tasks/Component/CostumeRealm/realm3/image.json

@@ -1,83 +0,0 @@
-[
-  {
-    "itemName": "shi_grown_3",
-    "imageName": "realm3_shi_grown_3.png",
-    "roiFront": "605,304,35,38",
-    "roiBack": "530,247,181,198",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "育成"
-  },
-  {
-    "itemName": "shi_card_3",
-    "imageName": "realm3_shi_card_3.png",
-    "roiFront": "935,295,38,56",
-    "roiBack": "910,282,87,120",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "结界卡"
-  },
-  {
-    "itemName": "shi_defense_3",
-    "imageName": "realm3_shi_defense_3.png",
-    "roiFront": "253,309,31,62",
-    "roiBack": "200,269,154,166",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "防守"
-  },
-  {
-    "itemName": "card_exp_3",
-    "imageName": "realm3_card_exp_3.png",
-    "roiFront": "939,147,50,54",
-    "roiBack": "864,86,199,185",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "收取经验(没有满的图)"
-  },
-  {
-    "itemName": "box_ap_3",
-    "imageName": "realm3_box_ap_3.png",
-    "roiFront": "949,376,51,46",
-    "roiBack": "872,298,202,204",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取体力(没有满)"
-  },
-  {
-    "itemName": "box_exp_3",
-    "imageName": "realm3_box_exp_3.png",
-    "roiFront": "1012,390,42,45",
-    "roiBack": "962,347,147,127",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取盒子的经验(没有满)"
-  },
-  {
-    "itemName": "realm_shin_3",
-    "imageName": "realm3_realm_shin_3.png",
-    "roiFront": "160,401,54,58",
-    "roiBack": "0,290,360,276",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "结界皮肤"
-  },
-  {
-    "itemName": "utilize_exp_3",
-    "imageName": "realm3_utilize_exp_3.png",
-    "roiFront": "595,151,58,43",
-    "roiBack": "543,113,156,123",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "寄养别人的经验"
-  },
-  {
-    "itemName": "box_exp_max_3",
-    "imageName": "realm3_box_exp_max_3.png",
-    "roiFront": "1012,374,49,50",
-    "roiBack": "919,317,228,186",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "盒子经验满"
-  }
-]

BIN
tasks/Component/CostumeRealm/realm3/realm3_box_ap_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_box_exp_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_box_exp_max_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_card_exp_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_realm_shin_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_shi_card_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_shi_defense_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_shi_grown_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_utilize_exp_3.png


+ 0 - 83
tasks/Component/CostumeRealm/realm4/image.json

@@ -1,83 +0,0 @@
-[
-  {
-    "itemName": "shi_grown_4",
-    "imageName": "realm4_shi_grown_4.png",
-    "roiFront": "609,323,27,38",
-    "roiBack": "532,250,181,198",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "育成"
-  },
-  {
-    "itemName": "shi_card_4",
-    "imageName": "realm4_shi_card_4.png",
-    "roiFront": "929,315,38,56",
-    "roiBack": "904,299,87,120",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "结界卡"
-  },
-  {
-    "itemName": "shi_defense_4",
-    "imageName": "realm4_shi_defense_4.png",
-    "roiFront": "242,320,31,62",
-    "roiBack": "184,276,154,166",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "防守"
-  },
-  {
-    "itemName": "card_exp_4",
-    "imageName": "realm4_card_exp_4.png",
-    "roiFront": "930,181,57,54",
-    "roiBack": "855,111,199,185",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "收取经验(没有满的图)"
-  },
-  {
-    "itemName": "box_ap_4",
-    "imageName": "realm4_box_ap_4.png",
-    "roiFront": "958,386,51,46",
-    "roiBack": "889,313,202,204",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取体力(没有满)"
-  },
-  {
-    "itemName": "box_exp_4",
-    "imageName": "realm4_box_exp_4.png",
-    "roiFront": "1022,394,32,45",
-    "roiBack": "968,353,147,127",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取盒子的经验(没有满)"
-  },
-  {
-    "itemName": "realm_shin_4",
-    "imageName": "realm4_realm_shin_4.png",
-    "roiFront": "228,406,54,58",
-    "roiBack": "60,293,360,276",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "结界皮肤"
-  },
-  {
-    "itemName": "utilize_exp_4",
-    "imageName": "realm4_utilize_exp_4.png",
-    "roiFront": "596,181,58,43",
-    "roiBack": "545,144,156,123",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "寄养别人的经验"
-  },
-  {
-    "itemName": "box_exp_max_4",
-    "imageName": "realm4_box_exp_max_4.png",
-    "roiFront": "1026,381,41,51",
-    "roiBack": "934,323,228,186",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "盒子经验满"
-  }
-]

BIN
tasks/Component/CostumeRealm/realm4/realm4_box_ap_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_box_exp_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_box_exp_max_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_card_exp_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_realm_shin_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_shi_card_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_shi_defense_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_shi_grown_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_utilize_exp_4.png


+ 0 - 83
tasks/Component/CostumeRealm/realm5/image.json

@@ -1,83 +0,0 @@
-[
-  {
-    "itemName": "shi_grown_5",
-    "imageName": "realm5_shi_grown_5.png",
-    "roiFront": "642,356,35,38",
-    "roiBack": "568,295,181,198",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "育成"
-  },
-  {
-    "itemName": "shi_card_5",
-    "imageName": "realm5_shi_card_5.png",
-    "roiFront": "925,358,38,56",
-    "roiBack": "901,333,87,120",
-    "method": "Template matching",
-    "threshold": 0.6,
-    "description": "结界卡"
-  },
-  {
-    "itemName": "shi_defense_5",
-    "imageName": "realm5_shi_defense_5.png",
-    "roiFront": "312,356,31,62",
-    "roiBack": "257,310,154,166",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "防守"
-  },
-  {
-    "itemName": "card_exp_5",
-    "imageName": "realm5_card_exp_5.png",
-    "roiFront": "922,216,57,54",
-    "roiBack": "850,145,199,185",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "收取经验(没有满的图)"
-  },
-  {
-    "itemName": "box_ap_5",
-    "imageName": "realm5_box_ap_5.png",
-    "roiFront": "981,420,51,46",
-    "roiBack": "925,345,202,204",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取体力(没有满)"
-  },
-  {
-    "itemName": "box_exp_5",
-    "imageName": "realm5_box_exp_5.png",
-    "roiFront": "1050,430,42,45",
-    "roiBack": "996,382,147,127",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "收取盒子的经验(没有满)"
-  },
-  {
-    "itemName": "realm_shin_5",
-    "imageName": "realm5_realm_shin_5.png",
-    "roiFront": "237,411,54,58",
-    "roiBack": "95,303,360,276",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "结界皮肤"
-  },
-  {
-    "itemName": "utilize_exp_5",
-    "imageName": "realm5_utilize_exp_5.png",
-    "roiFront": "632,216,58,43",
-    "roiBack": "582,172,156,123",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "寄养别人的经验"
-  },
-  {
-    "itemName": "box_exp_max_5",
-    "imageName": "realm5_box_exp_max_5.png",
-    "roiFront": "1048,420,48,56",
-    "roiBack": "958,353,228,186",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "盒子经验满"
-  }
-]

BIN
tasks/Component/CostumeRealm/realm5/realm5_box_ap_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_box_exp_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_box_exp_max_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_card_exp_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_realm_shin_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_shi_card_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_shi_defense_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_shi_grown_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_utilize_exp_5.png


+ 1 - 3
tasks/Component/GeneralInvite/assets.py

@@ -14,7 +14,7 @@ class GeneralInviteAssets:
 	# 中间的邀请图片 
 	# 中间的邀请图片 
 	I_ADD_1 = RuleImage(roi_front=(596,241,114,51), roi_back=(569,196,186,161), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
 	I_ADD_1 = RuleImage(roi_front=(596,241,114,51), roi_back=(569,196,186,161), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
 	# 最右边的邀请 
 	# 最右边的邀请 
-	I_ADD_2 = RuleImage(roi_front=(1013,249,100,100), roi_back=(970,151,193,220), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_2.png")
+	I_ADD_2 = RuleImage(roi_front=(1013,203,100,100), roi_back=(970,151,193,220), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_2.png")
 	# description 
 	# description 
 	I_FIRE_FAIL = RuleImage(roi_front=(1177,604,81,74), roi_back=(1177,604,81,74), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail.png")
 	I_FIRE_FAIL = RuleImage(roi_front=(1177,604,81,74), roi_back=(1177,604,81,74), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail.png")
 	# description 
 	# description 
@@ -127,5 +127,3 @@ class GeneralInviteAssets:
 	O_FRIEND_NAME_2 = RuleOcr(roi=(729,184,196,346), area=(729,184,196,346), mode="Full", method="Default", keyword="", name="friend_name_2")
 	O_FRIEND_NAME_2 = RuleOcr(roi=(729,184,196,346), area=(729,184,196,346), mode="Full", method="Default", keyword="", name="friend_name_2")
 	# Ocr-description 
 	# Ocr-description 
 	O_ONLINE = RuleOcr(roi=(790,102,124,42), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="online")
 	O_ONLINE = RuleOcr(roi=(790,102,124,42), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="online")
-
-

+ 2 - 2
tasks/Component/GeneralInvite/gi/image.json

@@ -11,7 +11,7 @@
   {
   {
     "itemName": "add_2",
     "itemName": "add_2",
     "imageName": "gi_add_2.png",
     "imageName": "gi_add_2.png",
-    "roiFront": "1013,249,100,100",
+    "roiFront": "1013,203,100,100",
     "roiBack": "970,151,193,220",
     "roiBack": "970,151,193,220",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -377,4 +377,4 @@
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "识别到寄养邀请"
     "description": "识别到寄养邀请"
   }
   }
-]
+]

+ 0 - 2
tasks/TalismanPass/assets.py

@@ -39,7 +39,5 @@ class TalismanPassAssets:
 	I_TP_SOUL_2 = RuleImage(roi_front=(582,438,115,48), roi_back=(570,427,139,71), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_tp_soul_2.png")
 	I_TP_SOUL_2 = RuleImage(roi_front=(582,438,115,48), roi_back=(570,427,139,71), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_tp_soul_2.png")
 	# 六星御魂标志 
 	# 六星御魂标志 
 	I_TP_SOUL_3 = RuleImage(roi_front=(313,489,188,33), roi_back=(302,472,216,60), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_tp_soul_3.png")
 	I_TP_SOUL_3 = RuleImage(roi_front=(313,489,188,33), roi_back=(302,472,216,60), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_tp_soul_3.png")
-	# description 
-	I_TP_SOUL_1B = RuleImage(roi_front=(248,501,34,37), roi_back=(160,392,936,180), threshold=0.7, method="Template matching", file="./tasks/TalismanPass/tp/tp_tp_soul_1b.png")
 
 
 
 

+ 3 - 10
tasks/TalismanPass/script_task.py

@@ -103,16 +103,9 @@ class ScriptTask(GameUi, TalismanPassAssets):
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             # 自选御魂
             # 自选御魂
-            if self.appear(self.I_TP_SOUL_1):
-                current = self.I_TP_SOUL_1
-                logger.info('Select soul (type 1)')
-            elif self.appear(self.I_TP_SOUL_1B):
-                current = self.I_TP_SOUL_1B
-                logger.info('Select soul (type 2)')
-            else:
-                current = None
-            if current:
-                self.ui_click(current, stop=self.I_TP_SOUL_2)
+            if self.appear_multi_scale(self.I_TP_SOUL_1,scale_range=(0.8,1.1)):
+                logger.info('Select soul 2')
+                self.ui_click_multi_scale(self.I_TP_SOUL_1, stop=self.I_TP_SOUL_2,scale_range=(0.8,1.1))
                 self.ui_click(self.I_TP_SOUL_2, stop=self.I_TP_SOUL_3, interval=3)
                 self.ui_click(self.I_TP_SOUL_2, stop=self.I_TP_SOUL_3, interval=3)
                 self.ui_click_until_disappear(click=self.I_TP_SOUL_3)
                 self.ui_click_until_disappear(click=self.I_TP_SOUL_3)
                 timer_harvest.reset()
                 timer_harvest.reset()

+ 0 - 9
tasks/TalismanPass/tp/image.json

@@ -124,14 +124,5 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "六星御魂标志"
     "description": "六星御魂标志"
-  },
-  {
-    "itemName": "tp_soul_1b",
-    "imageName": "tp_tp_soul_1b.png",
-    "roiFront": "248,501,34,37",
-    "roiBack": "160,392,936,180",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "description"
   }
   }
 ]
 ]

BIN
tasks/TalismanPass/tp/tp_tp_soul_1b.png