Przeglądaj źródła

feat: support Yuehai Youxing realm with shared template search regions

Ghostuel 2 tygodni temu
rodzic
commit
cfcdad39dc

+ 3 - 2
assets/i18n/zh-CN.json

@@ -162,5 +162,6 @@
   "green_mark_type": "绿标匹配方式",
   "green_mark_type_help": "按坐标点击指定绿标,或按式神名OCR 匹配后点击",
   "green_mark_name": "绿标式神名称",
-  "green_mark_name_help": "仅当绿标按式神名匹配时生效,填写目标式神名"
-}
+  "green_mark_name_help": "仅当绿标按式神名匹配时生效,填写目标式神名",
+  "costume_realm_yuehai_youxing": "月海游星"
+}

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

@@ -28,6 +28,7 @@ class MainType(str, Enum):
 # 结界皮肤
 class RealmType(str, Enum):
     COSTUME_REALM_DEFAULT = 'costume_realm_default'  # 妖扇结界
+    COSTUME_REALM_YUEHAI_YOUXING = 'costume_realm_yuehai_youxing'  # 月海游星
 
 # 鲤鱼旗皮肤
 class CarpBannerType(str, Enum):
@@ -99,6 +100,9 @@ class CostumeConfig(BaseModel):
     @field_validator('costume_realm_type', mode='before')
     @classmethod
     def validate_realm(cls, v):
+        # Preserve selections saved by the earlier local numbered adaptation.
+        if v == 'costume_realm_2':
+            return RealmType.COSTUME_REALM_YUEHAI_YOUXING
         if v and v not in RealmType._value2member_map_:
             return RealmType.COSTUME_REALM_DEFAULT
         return v

+ 7 - 0
tasks/Component/Costume/costume_base.py

@@ -16,6 +16,7 @@ from tasks.Component.Costume.assets import CostumeAssets
 from tasks.Component.CostumeBattle.assets import CostumeBattleAssets
 from tasks.Component.CostumeShikigami.assets import CostumeShikigamiAssets
 from tasks.Component.CostumeCarpBanner.assets import CostumeCarpBannerAssets
+from tasks.Component.CostumeRealm.realm import apply_realm
 from tasks.Component.CostumeBattleScene.assets import CostumeBattleSceneAssets
 
 # 庭院皮肤
@@ -107,6 +108,7 @@ class CostumeBase:
         current_task = self.get_task_name()
         logger.info(f'Current task: {current_task}')
         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_battle_scene(config.costume_battle_scene_type)
@@ -143,6 +145,11 @@ class CostumeBase:
                 assert_value: RuleImage = getattr(costume_assets, value)
                 self.replace_img(key, assert_value)
 
+    def check_costume_realm(self, realm_type: RealmType):
+        apply_realm(realm_type)
+        if realm_type != RealmType.COSTUME_REALM_DEFAULT:
+            logger.info(f'Switch realm skin {realm_type} ({I18n.trans_zh_cn(realm_type)})')
+
     def check_costume_carpbanner(self, carpbanner_type: CarpBannerType):
         if carpbanner_type == CarpBannerType.COSTUME_CARPBANNER_DEFAULT:
             return

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

@@ -1,12 +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: 
-	pass
-

+ 32 - 0
tasks/Component/CostumeRealm/realm.py

@@ -0,0 +1,32 @@
+"""结界皮肤只覆盖共用素材的搜索区域;在鲤鱼旗配置之前应用。"""
+from copy import deepcopy
+
+from tasks.Component.Costume.config import RealmType
+from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
+
+
+_REALM_NAMES = ('I_REALM_SHIN', 'I_CARD_EXP', 'I_BOX_AP', 'I_BOX_EXP')
+# Capture pristine shared rules before a task applies any realm/carp-banner skin.
+_DEFAULT_RULES = {name: deepcopy(getattr(KekkaiUtilizeAssets, name)) for name in _REALM_NAMES}
+# Only the search region varies. Template, method, threshold and template size
+# remain the shared defaults; matching updates the actual click position.
+_REALM_REGIONS = {
+    RealmType.COSTUME_REALM_DEFAULT: {},
+    RealmType.COSTUME_REALM_YUEHAI_YOUXING: {
+        'I_REALM_SHIN': (175, 390, 115, 110),
+        'I_CARD_EXP': (865, 205, 135, 105),
+        'I_BOX_AP': (975, 415, 90, 105),
+        'I_BOX_EXP': (1035, 420, 85, 110),
+    },
+}
+
+
+def apply_realm(realm_type: RealmType) -> None:
+    regions = _REALM_REGIONS[realm_type]  # Validate before mutating shared rules.
+    for name, source in _DEFAULT_RULES.items():
+        # Preserve references and reset stale images, features and match state.
+        target = getattr(KekkaiUtilizeAssets, name)
+        target.__dict__.clear()
+        target.__dict__.update(deepcopy(source.__dict__))
+        if name in regions:
+            target.roi_back = regions[name]

+ 105 - 0
tests/tasks/Component/CostumeRealm/test_realm.py

@@ -0,0 +1,105 @@
+"""Offline realm-skin regression tests (no device connection)."""
+import unittest
+from copy import deepcopy
+
+from tasks.Component.Costume.config import CostumeConfig, RealmType, CarpBannerType
+from tasks.Component.Costume.costume_base import CostumeBase
+from tasks.Component.CostumeRealm.realm import apply_realm, _REALM_NAMES, _REALM_REGIONS
+from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
+
+
+class RealmTests(unittest.TestCase):
+    def setUp(self):
+        apply_realm(RealmType.COSTUME_REALM_DEFAULT)
+
+    def tearDown(self):
+        apply_realm(RealmType.COSTUME_REALM_DEFAULT)
+
+    def test_schema_and_default(self):
+        self.assertEqual(CostumeConfig().costume_realm_type, RealmType.COSTUME_REALM_DEFAULT)
+        config = CostumeConfig(costume_realm_type='costume_realm_yuehai_youxing')
+        self.assertEqual(config.costume_realm_type, RealmType.COSTUME_REALM_YUEHAI_YOUXING)
+        self.assertIn('costume_realm_yuehai_youxing',
+                      CostumeConfig.model_json_schema()['$defs']['RealmType']['enum'])
+
+    def test_previous_local_selection_is_preserved(self):
+        config = CostumeConfig(costume_realm_type='costume_realm_2')
+        self.assertEqual(config.model_dump(mode='json')['costume_realm_type'],
+                         'costume_realm_yuehai_youxing')
+
+    def test_identity_cache_reset_and_default_restore(self):
+        refs = {name: getattr(KekkaiUtilizeAssets, name) for name in _REALM_NAMES}
+        defaults = {name: (rule.file, tuple(rule.roi_front), rule.roi_back) for name, rule in refs.items()}
+        methods = {name: (rule.method, rule.threshold) for name, rule in refs.items()}
+        for rule in refs.values():
+            _ = rule.image
+            _ = rule.name
+        CostumeBase().check_costume_realm(RealmType.COSTUME_REALM_YUEHAI_YOUXING)
+        for name, rule in refs.items():
+            self.assertIs(rule, getattr(KekkaiUtilizeAssets, name))
+            self.assertEqual(rule.file, defaults[name][0])
+            self.assertEqual(rule.method, methods[name][0])
+            self.assertEqual(rule.threshold, methods[name][1])
+            self.assertEqual(tuple(rule.roi_front), defaults[name][1])
+            self.assertEqual(rule.roi_back, _REALM_REGIONS[RealmType.COSTUME_REALM_YUEHAI_YOUXING][name])
+            self.assertIsNone(rule._image)
+            self.assertNotIn('name', rule.__dict__)
+            self.assertEqual(rule.image.shape[:2], (rule.roi_front[3], rule.roi_front[2]))
+        apply_realm(RealmType.COSTUME_REALM_DEFAULT)
+        for name, rule in refs.items():
+            self.assertEqual((rule.file, tuple(rule.roi_front), rule.roi_back), defaults[name])
+            self.assertIsNone(rule._image)
+
+    def test_only_search_region_changes(self):
+        defaults = {name: deepcopy(getattr(KekkaiUtilizeAssets, name).__dict__)
+                    for name in _REALM_NAMES}
+        apply_realm(RealmType.COSTUME_REALM_YUEHAI_YOUXING)
+        for name, before in defaults.items():
+            expected = deepcopy(before)
+            expected['roi_back'] = _REALM_REGIONS[RealmType.COSTUME_REALM_YUEHAI_YOUXING][name]
+            self.assertEqual(getattr(KekkaiUtilizeAssets, name).__dict__, expected)
+
+    def test_no_duplicate_operational_templates(self):
+        from pathlib import Path
+        folder = Path(__file__).resolve().parents[4] / 'tasks/Component/CostumeRealm'
+        self.assertFalse((folder / 'assets.py').exists())
+        self.assertFalse((folder / 'realm2').exists())
+
+    def test_uncollected_icons_dialogs_and_carp_flags_untouched(self):
+        names = ('I_UTILIZE_EXP', 'I_BOX_EXP_MAX', 'I_AP_EXTRACT', 'I_EXP_EXTRACT',
+                 'I_SHI_GROWN', 'I_SHI_CARD', 'I_SHI_DEFENSE')
+        states = {name: deepcopy(getattr(KekkaiUtilizeAssets, name).__dict__) for name in names}
+        apply_realm(RealmType.COSTUME_REALM_YUEHAI_YOUXING)
+        for name in names:
+            self.assertEqual(getattr(KekkaiUtilizeAssets, name).__dict__, states[name])
+
+    def test_reapply_and_invalid_selection(self):
+        apply_realm(RealmType.COSTUME_REALM_YUEHAI_YOUXING)
+        rule = KekkaiUtilizeAssets.I_CARD_EXP
+        original = tuple(rule.roi_front)
+        rule.roi_front[0] = 0
+        apply_realm(RealmType.COSTUME_REALM_YUEHAI_YOUXING)
+        self.assertEqual(tuple(rule.roi_front), original)
+        with self.assertRaises(KeyError):
+            apply_realm('invalid')
+        self.assertEqual(tuple(rule.roi_front), original)
+
+    def test_realm_applied_before_carpbanner(self):
+        calls = []
+        class Probe(CostumeBase):
+            def get_task_name(self): return 'OfflineRealmTest'
+            def check_costume_main(self, value): pass
+            def check_costume_realm(self, value): calls.append(('realm', value))
+            def check_costume_carpbanner(self, value): calls.append(('carp', value))
+            def check_costume_battle(self, value): pass
+            def check_costume_battle_scene(self, value): pass
+            def check_costume_shikigami(self, value): pass
+            def check_costume_theme(self, value): pass
+        Probe().check_costume(CostumeConfig(costume_realm_type=RealmType.COSTUME_REALM_YUEHAI_YOUXING,
+                                           costume_carpbanner_type=CarpBannerType.COSTUME_CARPBANNER_3))
+        self.assertEqual(calls, [('realm', RealmType.COSTUME_REALM_YUEHAI_YOUXING),
+                                 ('carp', CarpBannerType.COSTUME_CARPBANNER_3)])
+
+
+if __name__ == '__main__':
+    unittest.main()