Merge pull request #1446 from runhey/dev

Automated PR 2026.02.26

Author: runhey

assets/i18n/zh-CN.json

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

tasks/Component/Costume/config.py

@@ -1,7 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from enum import Enum
 
 # 庭院皮肤
@@ -24,16 +24,12 @@ class MainType(str, Enum):
 # 结界皮肤
 class RealmType(str, Enum):
     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):
     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):
@@ -81,6 +77,14 @@ class CostumeConfig(BaseModel):
     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')
 
+    @field_validator('costume_realm_type', mode='after')
+    @classmethod
+    def validator_realm(cls, v: RealmType) -> RealmType:
+        return RealmType.COSTUME_REALM_DEFAULT
+
+
+
+
 
 
 

tasks/Component/Costume/costume_base.py

@@ -8,7 +8,6 @@
 from tasks.Component.Costume.config import (MainType, CostumeConfig, RealmType,
                                             ThemeType, ShikigamiType, SignType, BattleType, CarpBannerType)
 from tasks.Component.Costume.assets import CostumeAssets
-from tasks.Component.CostumeRealm.assets import CostumeRealmAssets
 from tasks.Component.CostumeBattle.assets import CostumeBattleAssets
 from tasks.Component.CostumeShikigami.assets import CostumeShikigamiAssets
 from tasks.Component.CostumeCarpBanner.assets import CostumeCarpBannerAssets
@@ -26,29 +25,13 @@
 }
 
 
-# 结界皮肤
-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 = {
     getattr(CarpBannerType, f"COSTUME_CARPBANNER_{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}',
-    } for i in range(1, 2)
+    } for i in range(1, 3)
 }
 
 
@@ -96,7 +79,6 @@ def check_costume(self, config: CostumeConfig=None):
         if config is None:
             config: CostumeConfig = self.config.model.global_game.costume_config
         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_battle(config.costume_battle_type)
         self.check_costume_shikigami(config.costume_shikigami_type)
@@ -138,19 +120,6 @@ def check_costume_carpbanner(self, carpbanner_type: CarpBannerType):
             # 执行替换（覆盖结界皮肤的同名key）
             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):
         if battle_type == BattleType.COSTUME_BATTLE_DEFAULT:
             return

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")
 
 
+	# 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")
+
+

tasks/Component/CostumeCarpBanner/cb2/cb2_shi_card_2.png

@@ -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": "防守"
+  }
+]