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

feat(CostumeCarpBanner): 添加鲤鱼旗鸢戏游鲤

yuyuyuyuyu 8 месяцев назад
Родитель
Сommit
04b03a09d3

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

@@ -11,6 +11,7 @@
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_1": "无垢莲台",
   "costume_carpbanner_1": "无垢莲台",
   "costume_carpbanner_2": "萤灯月夜",
   "costume_carpbanner_2": "萤灯月夜",
+  "costume_carpbanner_3": "鸢戏游鲤",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_11": "辰烁奇夜",
   "costume_battle_11": "辰烁奇夜",

+ 1 - 0
tasks/Component/Costume/config.py

@@ -31,6 +31,7 @@ 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'  # 萤灯月夜
     COSTUME_CARPBANNER_2 = 'costume_carpbanner_2'  # 萤灯月夜
+    COSTUME_CARPBANNER_3 = 'costume_carpbanner_3'  # 鸢戏游鲤
 
 
 # 主题,就是庭院最右下角的展开按钮
 # 主题,就是庭院最右下角的展开按钮
 class ThemeType(str, Enum):
 class ThemeType(str, Enum):

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

@@ -31,7 +31,7 @@ carpbanner_costume_model = {
         '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, 3)
+    } for i in range(1, 4)
 }
 }
 
 
 
 

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

@@ -28,3 +28,12 @@ class CostumeCarpBannerAssets:
 	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")
 	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")
 
 
 
 
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_3 = RuleImage(roi_front=(600,277,19,34), roi_back=(519,212,220,281), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb3/cb3_shi_grown_3.png")
+	# 结界卡 
+	I_SHI_CARD_3 = RuleImage(roi_front=(899,281,21,40), roi_back=(823,210,252,297), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb3/cb3_shi_card_3.png")
+	# 防守 
+	I_SHI_DEFENSE_3 = RuleImage(roi_front=(298,279,19,38), roi_back=(178,209,261,274), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb3/cb3_shi_defense_3.png")
+
+

BIN
tasks/Component/CostumeCarpBanner/cb3/cb3_shi_card_3.png


BIN
tasks/Component/CostumeCarpBanner/cb3/cb3_shi_defense_3.png


BIN
tasks/Component/CostumeCarpBanner/cb3/cb3_shi_grown_3.png


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

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "shi_grown_3",
+    "imageName": "cb3_shi_grown_3.png",
+    "roiFront": "600,277,19,34",
+    "roiBack": "519,212,220,281",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_3",
+    "imageName": "cb3_shi_card_3.png",
+    "roiFront": "899,281,21,40",
+    "roiBack": "823,210,252,297",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_3",
+    "imageName": "cb3_shi_defense_3.png",
+    "roiFront": "298,279,19,38",
+    "roiBack": "178,209,261,274",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "防守"
+  }
+]