#73 角色配队选择增加银枝寒鸦

DoctorReid · Dec 11, 2023 · 2a9247e · 2a9247e
1 parent f5f8da4
commit 2a9247e
Show file tree

Hide file tree

Showing 7 changed files with 1,647 additions and 15 deletions.
diff --git a/images/template/character_avatar/argenti/features.xml b/images/template/character_avatar/argenti/features.xml
diff --git a/images/template/character_avatar/argenti/origin.png b/images/template/character_avatar/argenti/origin.png
diff --git a/images/template/character_avatar/hanya/features.xml b/images/template/character_avatar/hanya/features.xml
diff --git a/images/template/character_avatar/hanya/origin.png b/images/template/character_avatar/hanya/origin.png
diff --git a/src/sr/const/character_const.py b/src/sr/const/character_const.py
@@ -154,6 +154,8 @@ def __gt__(self, other):
 WELT = Character(id='welt', cn='瓦尔特', path=CHARACTER_PATH_NIHILITY, combat_type=IMAGINARY, level=5, technique_type=TECHNIQUE_BUFF)
 YANQING = Character(id='yanqing', cn='彦卿', path=CHARACTER_PATH_HUNT, combat_type=ICE, level=5, technique_type=TECHNIQUE_BUFF)
 YUKONG = Character(id='yukong', cn='驭空', path=CHARACTER_PATH_HARMONY, combat_type=IMAGINARY, level=4, technique_type=TECHNIQUE_BUFF_ATTACK)
+ARGENTI = Character(id='argenti', cn='银枝', path=CHARACTER_PATH_ERUDITION, combat_type=PHYSICAL, level=5, technique_type=TECHNIQUE_BUFF_ATTACK)
+HANYA = Character(id='hanya', cn='寒鸦', path=CHARACTER_PATH_HARMONY, combat_type=PHYSICAL, level=4, technique_type=TECHNIQUE_ATTACK)
 
 CHARACTER_LIST: List[Character] = [
     ARLAN,
@@ -195,6 +197,8 @@ def __gt__(self, other):
     WELT,
     YANQING,
     YUKONG,
+    ARGENTI,
+    HANYA,
 ]
 
 
@@ -207,7 +211,7 @@ def filter_character_list(destiny_id: Optional[str] = None,
     for c in CHARACTER_LIST:
         if destiny_id is not None and c.path.id != destiny_id:
             continue
-        if combat_type_id is not None and c.combatType.id != combat_type_id:
+        if combat_type_id is not None and c.combat_type.id != combat_type_id:
             continue
         if level is not None and c.level != level:
             continue

diff --git a/test/src/test/sr/image/screenshot/template_dev_tools.py b/test/src/test/sr/image/screenshot/template_dev_tools.py
@@ -419,22 +419,15 @@ def init_character_avatar_from_alas():
     dir_path = os_utils.get_path_under_work_dir('images', 'template', 'character_avatar')
     for file in os.listdir(dir_path):
         if file.endswith('.png'):
-            name = file.split('.')[0].lower()
-            sub_dir = os.path.join(dir_path, name)
+            character = file.split('.')[0].lower()
+            sub_dir = os.path.join(dir_path, character)
             if not os.path.exists(sub_dir):
                 os.mkdir(sub_dir)
             old_file_path = os.path.join(dir_path, file)
             new_file_path = os.path.join(sub_dir, 'origin.png')
             shutil.move(old_file_path, new_file_path)
-            # print('%s = Character(id=\'%s\', cn=\'\')' % (name.upper(), name.lower()))
 
-
-def init_character_avatar_feature():
-    dir_path = os_utils.get_path_under_work_dir('images', 'template', 'character_avatar')
-    for character in os.listdir(dir_path):
-        if character.find('.') != -1:
-            continue
-        init_template_feature(character, sub_dir='character_avatar')
+            init_template_feature(character, sub_dir='character_avatar')
 
 
 def init_character_combat_type(template_id):
@@ -474,7 +467,6 @@ def init_inventory_category(template_id, ):
     # init_store_buy_num_ctrl('store_buy_max')
     # init_battle_times_control('battle_times_plus')
     # init_mission_star_active()
-    # init_character_avatar_from_alas()
-    # init_character_avatar_feature()
+    init_character_avatar_from_alas()
     # init_character_combat_type('lightning')
-    init_inventory_category('valuables')
+    # init_inventory_category('valuables')
diff --git a/version.yml b/version.yml
@@ -1 +1 @@
-version: "v0.8.1"
+version: "v0.8.2"