diff --git a/pyproject.toml b/pyproject.toml index 469f6bc..fa6e260 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "starrail_damage_cal" -version = "1.8.2" +version = "1.9.0" description = "For StarRail Role Damage Cal" authors = [ {name = "qwerdvd", email = "105906879+qwerdvd@users.noreply.github.com"}, diff --git a/starrail_damage_cal/cal_damage.py b/starrail_damage_cal/cal_damage.py index 6eb8c8b..f7a4a7e 100644 --- a/starrail_damage_cal/cal_damage.py +++ b/starrail_damage_cal/cal_damage.py @@ -28,6 +28,29 @@ async def cal_info(char_data: Dict): return await avatar.get_damage_info() +async def get_char_data(uid: str, avatar_name: str): + char_name = alias_to_char_name(avatar_name) + char_id = name_to_avatar_id(char_name) + + if char_id == "": + raise CharNameError(char_name) + + char_id_list, char_data_dict = await api_to_dict(uid) + + if isinstance(char_id_list, str): + msg = "char_id_list is str" + raise MihomoRequestError(msg) + + if char_data_dict is None: + msg = "char_data_dict is None" + raise MihomoRequestError(msg) + + if char_id not in char_id_list: + raise NotInCharacterShowcaseError + + return char_data_dict[char_id] + + class DamageCal: @classmethod async def cal_info(cls, char_data: Dict): @@ -40,26 +63,7 @@ class DamageCal: @classmethod async def get_damage_data_by_uid(cls, uid: str, avatar_name: str): - char_name = alias_to_char_name(avatar_name) - char_id = name_to_avatar_id(char_name) - - if char_id == "": - raise CharNameError(char_name) - - char_id_list, char_data_dict = await api_to_dict(uid) - - if isinstance(char_id_list, str): - msg = "char_id_list is str" - raise MihomoRequestError(msg) - - if char_data_dict is None: - msg = "char_data_dict is None" - raise MihomoRequestError(msg) - - if char_id not in char_id_list: - raise NotInCharacterShowcaseError - - char_data = char_data_dict[char_id] + char_data = await get_char_data(uid, avatar_name) return await cls.cal_info(char_data) @classmethod diff --git a/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py b/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py index a3540c2..b1e435d 100644 --- a/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py +++ b/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py @@ -4842,5 +4842,4 @@ class AvatarDamage: return Welt(char, skills) if char.id_ == 1213: return Danhengil(char, skills) - msg = f"{char.id_} 不支持的角色" - raise ValueError(msg) + return None diff --git a/starrail_damage_cal/excel/AvatarPromotionConfig.json b/starrail_damage_cal/excel/AvatarPromotionConfig.json index d906865..895d7bb 100644 --- a/starrail_damage_cal/excel/AvatarPromotionConfig.json +++ b/starrail_damage_cal/excel/AvatarPromotionConfig.json @@ -19350,5 +19350,989 @@ "BaseAggro": { "Value": 125 } + }, + { + "AvatarID": 1220, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 4000 + }, + { + "ItemID": 113011, + "ItemNum": 5 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "AttackBase": { + "Value": 81.84 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 52.8 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 142.56 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1220, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 8000 + }, + { + "ItemID": 113011, + "ItemNum": 10 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "AttackBase": { + "Value": 114.576 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 73.92 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 199.584 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1220, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 16000 + }, + { + "ItemID": 113012, + "ItemNum": 6 + }, + { + "ItemID": 110425, + "ItemNum": 3 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "AttackBase": { + "Value": 147.312 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 95.04 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 256.608 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1220, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 40000 + }, + { + "ItemID": 113012, + "ItemNum": 9 + }, + { + "ItemID": 110425, + "ItemNum": 7 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "AttackBase": { + "Value": 180.048 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 116.16 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 313.632 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1220, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 80000 + }, + { + "ItemID": 113013, + "ItemNum": 6 + }, + { + "ItemID": 110425, + "ItemNum": 20 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "AttackBase": { + "Value": 212.784 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 137.28 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 370.656 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1220, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 160000 + }, + { + "ItemID": 113013, + "ItemNum": 9 + }, + { + "ItemID": 110425, + "ItemNum": 35 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 245.52 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 158.4 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 427.68 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1220, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 278.256 + }, + "AttackAdd": { + "Value": 4.092 + }, + "DefenceBase": { + "Value": 179.52 + }, + "DefenceAdd": { + "Value": 2.64 + }, + "HPBase": { + "Value": 484.704 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 112 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 3200 + }, + { + "ItemID": 113011, + "ItemNum": 4 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "AttackBase": { + "Value": 81.6 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 48 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 110.4 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 6400 + }, + { + "ItemID": 113011, + "ItemNum": 8 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "AttackBase": { + "Value": 114.24 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 67.2 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 154.56 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 12800 + }, + { + "ItemID": 113012, + "ItemNum": 5 + }, + { + "ItemID": 110424, + "ItemNum": 2 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "AttackBase": { + "Value": 146.88 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 86.4 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 198.72 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 32000 + }, + { + "ItemID": 113012, + "ItemNum": 8 + }, + { + "ItemID": 110424, + "ItemNum": 5 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "AttackBase": { + "Value": 179.52 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 105.6 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 242.88 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 64000 + }, + { + "ItemID": 113013, + "ItemNum": 5 + }, + { + "ItemID": 110424, + "ItemNum": 15 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "AttackBase": { + "Value": 212.16 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 124.8 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 287.04 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 128000 + }, + { + "ItemID": 113013, + "ItemNum": 7 + }, + { + "ItemID": 110424, + "ItemNum": 28 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 244.8 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 144 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 331.2 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1223, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 277.44 + }, + "AttackAdd": { + "Value": 4.08 + }, + "DefenceBase": { + "Value": 163.2 + }, + "DefenceAdd": { + "Value": 2.4 + }, + "HPBase": { + "Value": 375.36 + }, + "HPAdd": { + "Value": 5.52 + }, + "SpeedBase": { + "Value": 111 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + { + "AvatarID": 1222, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 4000 + }, + { + "ItemID": 113001, + "ItemNum": 5 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "AttackBase": { + "Value": 92.4 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 59.4 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 184.8 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + { + "AvatarID": 1222, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 8000 + }, + { + "ItemID": 113001, + "ItemNum": 10 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "AttackBase": { + "Value": 129.36 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 83.16 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 258.72 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + { + "AvatarID": 1222, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 16000 + }, + { + "ItemID": 113002, + "ItemNum": 6 + }, + { + "ItemID": 110422, + "ItemNum": 3 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "AttackBase": { + "Value": 166.32 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 106.92 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 332.64 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + { + "AvatarID": 1222, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 40000 + }, + { + "ItemID": 113002, + "ItemNum": 9 + }, + { + "ItemID": 110422, + "ItemNum": 7 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "AttackBase": { + "Value": 203.28 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 130.68 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 406.56 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + { + "AvatarID": 1222, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 80000 + }, + { + "ItemID": 113003, + "ItemNum": 6 + }, + { + "ItemID": 110422, + "ItemNum": 20 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "AttackBase": { + "Value": 240.24 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 154.44 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 480.48 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + { + "AvatarID": 1222, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 160000 + }, + { + "ItemID": 113003, + "ItemNum": 9 + }, + { + "ItemID": 110422, + "ItemNum": 35 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 277.2 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 178.2 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 554.4 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + { + "AvatarID": 1222, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 314.16 + }, + "AttackAdd": { + "Value": 4.62 + }, + "DefenceBase": { + "Value": 201.96 + }, + "DefenceAdd": { + "Value": 2.97 + }, + "HPBase": { + "Value": 628.32 + }, + "HPAdd": { + "Value": 9.24 + }, + "SpeedBase": { + "Value": 98 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } } ] \ No newline at end of file diff --git a/starrail_damage_cal/excel/EquipmentPromotionConfig.json b/starrail_damage_cal/excel/EquipmentPromotionConfig.json index f6c9a48..96ec04c 100644 --- a/starrail_damage_cal/excel/EquipmentPromotionConfig.json +++ b/starrail_damage_cal/excel/EquipmentPromotionConfig.json @@ -25543,6 +25543,254 @@ "Value": 2.7 } }, + { + "EquipmentID": 21047, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 4000 + }, + { + "ItemID": 113011, + "ItemNum": 5 + } + ], + "PlayerLevelRequire": 15, + "MaxLevel": 20, + "BaseHP": { + "Value": 38.4 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 21.6 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 18 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, + { + "EquipmentID": 21047, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 8000 + }, + { + "ItemID": 110191, + "ItemNum": 3 + }, + { + "ItemID": 113011, + "ItemNum": 10 + } + ], + "WorldLevelRequire": 1, + "MaxLevel": 30, + "BaseHP": { + "Value": 84.48 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 47.52 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 39.6 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, + { + "EquipmentID": 21047, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 16000 + }, + { + "ItemID": 110192, + "ItemNum": 3 + }, + { + "ItemID": 113012, + "ItemNum": 6 + } + ], + "WorldLevelRequire": 2, + "MaxLevel": 40, + "BaseHP": { + "Value": 145.92 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 82.08 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 68.4 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, + { + "EquipmentID": 21047, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 40000 + }, + { + "ItemID": 110192, + "ItemNum": 6 + }, + { + "ItemID": 113012, + "ItemNum": 9 + } + ], + "WorldLevelRequire": 3, + "MaxLevel": 50, + "BaseHP": { + "Value": 207.36 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 116.64 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 97.2 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, + { + "EquipmentID": 21047, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 80000 + }, + { + "ItemID": 110193, + "ItemNum": 4 + }, + { + "ItemID": 113013, + "ItemNum": 5 + } + ], + "WorldLevelRequire": 4, + "MaxLevel": 60, + "BaseHP": { + "Value": 268.8 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 151.2 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 126 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, + { + "EquipmentID": 21047, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 160000 + }, + { + "ItemID": 110193, + "ItemNum": 8 + }, + { + "ItemID": 113013, + "ItemNum": 7 + } + ], + "WorldLevelRequire": 5, + "MaxLevel": 70, + "BaseHP": { + "Value": 330.24 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 185.76 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 154.8 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, + { + "EquipmentID": 21047, + "Promotion": 6, + "PromotionCostList": [], + "WorldLevelRequire": 5, + "MaxLevel": 80, + "BaseHP": { + "Value": 391.68 + }, + "BaseHPAdd": { + "Value": 5.76 + }, + "BaseAttack": { + "Value": 220.32 + }, + "BaseAttackAdd": { + "Value": 3.24 + }, + "BaseDefence": { + "Value": 183.6 + }, + "BaseDefenceAdd": { + "Value": 2.7 + } + }, { "EquipmentID": 22002, "PromotionCostList": [ @@ -26534,5 +26782,501 @@ "BaseDefenceAdd": { "Value": 3.6 } + }, + { + "EquipmentID": 23031, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 5000 + }, + { + "ItemID": 113011, + "ItemNum": 8 + } + ], + "PlayerLevelRequire": 15, + "MaxLevel": 20, + "BaseHP": { + "Value": 43.2 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 28.8 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 21 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23031, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 10000 + }, + { + "ItemID": 110191, + "ItemNum": 4 + }, + { + "ItemID": 113011, + "ItemNum": 12 + } + ], + "WorldLevelRequire": 1, + "MaxLevel": 30, + "BaseHP": { + "Value": 95.04 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 63.36 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 46.2 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23031, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 20000 + }, + { + "ItemID": 110192, + "ItemNum": 4 + }, + { + "ItemID": 113012, + "ItemNum": 8 + } + ], + "WorldLevelRequire": 2, + "MaxLevel": 40, + "BaseHP": { + "Value": 164.16 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 109.44 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 79.8 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23031, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 50000 + }, + { + "ItemID": 110192, + "ItemNum": 8 + }, + { + "ItemID": 113012, + "ItemNum": 12 + } + ], + "WorldLevelRequire": 3, + "MaxLevel": 50, + "BaseHP": { + "Value": 233.28 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 155.52 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 113.4 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23031, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 100000 + }, + { + "ItemID": 110193, + "ItemNum": 5 + }, + { + "ItemID": 113013, + "ItemNum": 6 + } + ], + "WorldLevelRequire": 4, + "MaxLevel": 60, + "BaseHP": { + "Value": 302.4 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 201.6 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 147 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23031, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 200000 + }, + { + "ItemID": 110193, + "ItemNum": 10 + }, + { + "ItemID": 113013, + "ItemNum": 8 + } + ], + "WorldLevelRequire": 5, + "MaxLevel": 70, + "BaseHP": { + "Value": 371.52 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 247.68 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 180.6 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23031, + "Promotion": 6, + "PromotionCostList": [], + "WorldLevelRequire": 5, + "MaxLevel": 80, + "BaseHP": { + "Value": 440.64 + }, + "BaseHPAdd": { + "Value": 6.48 + }, + "BaseAttack": { + "Value": 293.76 + }, + "BaseAttackAdd": { + "Value": 4.32 + }, + "BaseDefence": { + "Value": 214.2 + }, + "BaseDefenceAdd": { + "Value": 3.15 + } + }, + { + "EquipmentID": 23032, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 5000 + }, + { + "ItemID": 113001, + "ItemNum": 8 + } + ], + "PlayerLevelRequire": 15, + "MaxLevel": 20, + "BaseHP": { + "Value": 48 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 24 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 24 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } + }, + { + "EquipmentID": 23032, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 10000 + }, + { + "ItemID": 110241, + "ItemNum": 4 + }, + { + "ItemID": 113001, + "ItemNum": 12 + } + ], + "WorldLevelRequire": 1, + "MaxLevel": 30, + "BaseHP": { + "Value": 105.6 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 52.8 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 52.8 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } + }, + { + "EquipmentID": 23032, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 20000 + }, + { + "ItemID": 110242, + "ItemNum": 4 + }, + { + "ItemID": 113002, + "ItemNum": 8 + } + ], + "WorldLevelRequire": 2, + "MaxLevel": 40, + "BaseHP": { + "Value": 182.4 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 91.2 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 91.2 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } + }, + { + "EquipmentID": 23032, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 50000 + }, + { + "ItemID": 110242, + "ItemNum": 8 + }, + { + "ItemID": 113002, + "ItemNum": 12 + } + ], + "WorldLevelRequire": 3, + "MaxLevel": 50, + "BaseHP": { + "Value": 259.2 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 129.6 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 129.6 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } + }, + { + "EquipmentID": 23032, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 100000 + }, + { + "ItemID": 110243, + "ItemNum": 5 + }, + { + "ItemID": 113003, + "ItemNum": 6 + } + ], + "WorldLevelRequire": 4, + "MaxLevel": 60, + "BaseHP": { + "Value": 336 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 168 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 168 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } + }, + { + "EquipmentID": 23032, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 200000 + }, + { + "ItemID": 110243, + "ItemNum": 10 + }, + { + "ItemID": 113003, + "ItemNum": 8 + } + ], + "WorldLevelRequire": 5, + "MaxLevel": 70, + "BaseHP": { + "Value": 412.8 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 206.4 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 206.4 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } + }, + { + "EquipmentID": 23032, + "Promotion": 6, + "PromotionCostList": [], + "WorldLevelRequire": 5, + "MaxLevel": 80, + "BaseHP": { + "Value": 489.6 + }, + "BaseHPAdd": { + "Value": 7.2 + }, + "BaseAttack": { + "Value": 244.8 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 244.8 + }, + "BaseDefenceAdd": { + "Value": 3.6 + } } ] \ No newline at end of file diff --git a/starrail_damage_cal/excel/light_cone_ranks.json b/starrail_damage_cal/excel/light_cone_ranks.json index 796a1e6..adbdccb 100644 --- a/starrail_damage_cal/excel/light_cone_ranks.json +++ b/starrail_damage_cal/excel/light_cone_ranks.json @@ -3046,6 +3046,70 @@ ] ] }, + "21047": { + "id": "21047", + "skill": "隐匿", + "desc": "使装备者的击破特攻提高#1[i]%。进入战斗时或造成击破伤害后，速度提高#2[i]%，持续#3[i]回合，该效果每回合只可触发1次。", + "params": [ + [ + 0.28, + 0.08, + 2 + ], + [ + 0.35, + 0.09, + 2 + ], + [ + 0.42, + 0.1, + 2 + ], + [ + 0.49, + 0.11, + 2 + ], + [ + 0.56, + 0.12, + 2 + ] + ], + "properties": [ + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.28 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.35 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.42 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.49 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.56 + } + ] + ] + }, "22000": { "id": "22000", "skill": "眼疾手快", @@ -5422,6 +5486,144 @@ ] ] }, + "23031": { + "id": "23031", + "skill": "震慑", + "desc": "使装备者的暴击率提高#1[f1]%。装备者施放追加攻击时，获得1层【流光】，最多叠加#3[i]层。每层【流光】使装备者造成的终结技伤害无视目标#2[i]%的防御力。装备者回合结束时，移除1层【流光】。", + "params": [ + [ + 0.15, + 0.27, + 2 + ], + [ + 0.175, + 0.3, + 2 + ], + [ + 0.2, + 0.33, + 2 + ], + [ + 0.225, + 0.36, + 2 + ], + [ + 0.25, + 0.39, + 2 + ] + ], + "properties": [ + [ + { + "type": "CriticalChanceBase", + "value": 0.15 + } + ], + [ + { + "type": "CriticalChanceBase", + "value": 0.175 + } + ], + [ + { + "type": "CriticalChanceBase", + "value": 0.2 + } + ], + [ + { + "type": "CriticalChanceBase", + "value": 0.225 + } + ], + [ + { + "type": "CriticalChanceBase", + "value": 0.25 + } + ] + ] + }, + "23032": { + "id": "23032", + "skill": "安心", + "desc": "使装备者击破特攻提高#1[i]%。装备者施放终结技攻击敌方目标后，使其陷入【忘忧】状态，持续#5[i]回合，【忘忧】状态下的敌方目标受到的伤害提高#2[i]%，若装备者当前击破特攻大于等于#3[i]%，受到的伤害提高效果额外提高#4[i]%。", + "params": [ + [ + 0.6, + 0.1, + 1.5, + 0.08, + 2 + ], + [ + 0.7, + 0.12, + 1.5, + 0.1, + 2 + ], + [ + 0.8, + 0.14, + 1.5, + 0.12, + 2 + ], + [ + 0.9, + 0.16, + 1.5, + 0.14, + 2 + ], + [ + 1, + 0.18, + 1.5, + 0.16, + 2 + ] + ], + "properties": [ + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.6 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.7 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.8 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.9 + } + ], + [ + { + "type": "BreakDamageAddedRatioBase", + "value": 1 + } + ] + ] + }, "24000": { "id": "24000", "skill": "扑火", diff --git a/starrail_damage_cal/excel/version.py b/starrail_damage_cal/excel/version.py new file mode 100644 index 0000000..8f8777a --- /dev/null +++ b/starrail_damage_cal/excel/version.py @@ -0,0 +1,2 @@ +StarRailUID_version = "0.1.0" +StarRail_version = "2.5.0" diff --git a/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_2.4.0.json b/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_2.4.0.json rename to starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_2.5.0.json index f1f6e29..e2966cb 100644 --- a/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_2.5.0.json @@ -2940,6 +2940,48 @@ } ] }, + "21047": { + "1": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.28 + } + } + ], + "2": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.35 + } + } + ], + "3": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.42 + } + } + ], + "4": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.49 + } + } + ], + "5": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.56 + } + } + ] + }, "22002": { "1": [ { @@ -3072,5 +3114,89 @@ } } ] + }, + "23031": { + "1": [ + { + "PropertyType": "CriticalChanceBase", + "Value": { + "Value": 0.15 + } + } + ], + "2": [ + { + "PropertyType": "CriticalChanceBase", + "Value": { + "Value": 0.175 + } + } + ], + "3": [ + { + "PropertyType": "CriticalChanceBase", + "Value": { + "Value": 0.2 + } + } + ], + "4": [ + { + "PropertyType": "CriticalChanceBase", + "Value": { + "Value": 0.225 + } + } + ], + "5": [ + { + "PropertyType": "CriticalChanceBase", + "Value": { + "Value": 0.25 + } + } + ] + }, + "23032": { + "1": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.6 + } + } + ], + "2": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.7 + } + } + ], + "3": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.8 + } + } + ], + "4": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 0.9 + } + } + ], + "5": [ + { + "PropertyType": "BreakDamageAddedRatioBase", + "Value": { + "Value": 1 + } + } + ] } } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.4.0.json b/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.5.0.json similarity index 96% rename from starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.4.0.json rename to starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.5.0.json index 3e6abbf..064f345 100644 --- a/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.5.0.json @@ -102,8 +102,11 @@ "21044": "BoundlessChoreo", "21045": "AftertheCharmonyFall", "21046": "PoisedtoBloom", + "21047": "ShadowedbyNight", "22002": "ForTomorrow'sJourney", "23026": "FlowingNightglow", "23030": "DanceatSunset", - "23029": "ThoseManySprings" + "23029": "ThoseManySprings", + "23031": "IVentureForthtoHunt", + "23032": "ScentAloneStaysTrue" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.5.0.json index b0d84cd..d89f257 100644 --- a/starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.5.0.json @@ -102,8 +102,11 @@ "21044": "无边曼舞", "21045": "谐乐静默之后", "21046": "芳华待灼", + "21047": "黑夜如影随行", "22002": "为了明日的旅途", "23026": "夜色流光溢彩", "23030": "落日时起舞", - "23029": "那无数个春天" + "23029": "那无数个春天", + "23031": "我将，巡征追猎", + "23032": "唯有香如故" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.4.0.json b/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.5.0.json similarity index 97% rename from starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.4.0.json rename to starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.5.0.json index 2fb1638..b6c19a9 100644 --- a/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.5.0.json @@ -67,6 +67,7 @@ "21044": 4, "21045": 4, "21046": 4, + "21047": 4, "22000": 4, "22001": 4, "22002": 4, @@ -101,6 +102,8 @@ "23028": 5, "23029": 5, "23030": 5, + "23031": 5, + "23032": 5, "24000": 5, "24001": 5, "24002": 5, diff --git a/starrail_damage_cal/map/data/ItemId2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/ItemId2Name_mapping_2.5.0.json similarity index 96% rename from starrail_damage_cal/map/data/ItemId2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/ItemId2Name_mapping_2.5.0.json index 704155c..2b64f16 100644 --- a/starrail_damage_cal/map/data/ItemId2Name_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/ItemId2Name_mapping_2.5.0.json @@ -111,6 +111,10 @@ "33156": "都蓝的器兽缰辔", "33165": "铸炼宫的莲华灯芯", "33166": "铸炼宫的焰轮天绸", + "33175": "露莎卡的水朽苍都", + "33176": "露莎卡的双生航道", + "33185": "蕉乐园的蕉芯广场", + "33186": "蕉乐园的模因线缆", "41011": "过客的逢春木簪", "41012": "过客的游龙臂鞲", "41013": "过客的残绣风衣", @@ -223,6 +227,10 @@ "43156": "都蓝的器兽缰辔", "43165": "铸炼宫的莲华灯芯", "43166": "铸炼宫的焰轮天绸", + "43175": "露莎卡的水朽苍都", + "43176": "露莎卡的双生航道", + "43185": "蕉乐园的蕉芯广场", + "43186": "蕉乐园的模因线缆", "51011": "过客的逢春木簪", "51012": "过客的游龙臂鞲", "51013": "过客的残绣风衣", @@ -335,6 +343,10 @@ "53156": "都蓝的器兽缰辔", "53165": "铸炼宫的莲华灯芯", "53166": "铸炼宫的焰轮天绸", + "53175": "露莎卡的水朽苍都", + "53176": "露莎卡的双生航道", + "53185": "蕉乐园的蕉芯广场", + "53186": "蕉乐园的模因线缆", "55001": "过客的残绣风衣", "55002": "过客的冥途游履", "55003": "快枪手的猎风披肩", @@ -452,5 +464,9 @@ "63155": "都蓝的穹窿金帐", "63156": "都蓝的器兽缰辔", "63165": "铸炼宫的莲华灯芯", - "63166": "铸炼宫的焰轮天绸" + "63166": "铸炼宫的焰轮天绸", + "63175": "露莎卡的水朽苍都", + "63176": "露莎卡的双生航道", + "63185": "蕉乐园的蕉芯广场", + "63186": "蕉乐园的模因线缆" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/Property2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/Property2Name_mapping_2.5.0.json similarity index 100% rename from starrail_damage_cal/map/data/Property2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/Property2Name_mapping_2.5.0.json diff --git a/starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.4.0.json b/starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.5.0.json similarity index 96% rename from starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.4.0.json rename to starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.5.0.json index 7dc3f39..b04f6ba 100644 --- a/starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.5.0.json @@ -452,5 +452,21 @@ "33166": 26, "43166": 36, "53166": 46, - "63166": 56 + "63166": 56, + "33175": 25, + "43175": 35, + "53175": 45, + "63175": 55, + "33176": 26, + "43176": 36, + "53176": 46, + "63176": 56, + "33185": 25, + "43185": 35, + "53185": 45, + "63185": 55, + "33186": 26, + "43186": 36, + "53186": 46, + "63186": 56 } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.4.0.json b/starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.5.0.json similarity index 96% rename from starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.4.0.json rename to starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.5.0.json index 4247598..30227d2 100644 --- a/starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.5.0.json @@ -111,6 +111,10 @@ "33156": 2, "33165": 2, "33166": 2, + "33175": 2, + "33176": 2, + "33185": 2, + "33186": 2, "41011": 3, "41012": 3, "41013": 3, @@ -223,6 +227,10 @@ "43156": 3, "43165": 3, "43166": 3, + "43175": 3, + "43176": 3, + "43185": 3, + "43186": 3, "51011": 4, "51012": 4, "51013": 4, @@ -335,6 +343,10 @@ "53156": 4, "53165": 4, "53166": 4, + "53175": 4, + "53176": 4, + "53185": 4, + "53186": 4, "55001": 4, "55002": 4, "55003": 4, @@ -452,5 +464,9 @@ "63155": 5, "63156": 5, "63165": 5, - "63166": 5 + "63166": 5, + "63175": 5, + "63176": 5, + "63185": 5, + "63186": 5 } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/RelicId2SetId_mapping_2.4.0.json b/starrail_damage_cal/map/data/RelicId2SetId_mapping_2.5.0.json similarity index 96% rename from starrail_damage_cal/map/data/RelicId2SetId_mapping_2.4.0.json rename to starrail_damage_cal/map/data/RelicId2SetId_mapping_2.5.0.json index 926caa9..00fc793 100644 --- a/starrail_damage_cal/map/data/RelicId2SetId_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/RelicId2SetId_mapping_2.5.0.json @@ -452,5 +452,21 @@ "33166": 316, "43166": 316, "53166": 316, - "63166": 316 + "63166": 316, + "33175": 317, + "43175": 317, + "53175": 317, + "63175": 317, + "33176": 317, + "43176": 317, + "53176": 317, + "63176": 317, + "33185": 318, + "43185": 318, + "53185": 318, + "63185": 318, + "33186": 318, + "43186": 318, + "53186": 318, + "63186": 318 } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/RelicSetSkill_mapping_2.4.0.json b/starrail_damage_cal/map/data/RelicSetSkill_mapping_2.4.0.json deleted file mode 100644 index 1548eff..0000000 --- a/starrail_damage_cal/map/data/RelicSetSkill_mapping_2.4.0.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "101": { - "2": { - "Property": "HealRatioBase", - "Value": 0.1 - }, - "4": {} - }, - "102": { - "2": { - "Property": "AttackAddedRatio", - "Value": 0.12 - }, - "4": { - "Property": "SpeedAddedRatio", - "Value": 0.06 - } - }, - "103": { - "2": { - "Property": "DefenceAddedRatio", - "Value": 0.15 - }, - "4": {} - }, - "104": { - "2": { - "Property": "IceAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "105": { - "2": { - "Property": "PhysicalAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "106": { - "2": {}, - "4": {} - }, - "107": { - "2": { - "Property": "FireAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "108": { - "2": { - "Property": "QuantumAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "109": { - "2": { - "Property": "ThunderAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "110": { - "2": { - "Property": "WindAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "111": { - "2": { - "Property": "BreakDamageAddedRatioBase", - "Value": 0.16 - }, - "4": { - "Property": "BreakDamageAddedRatioBase", - "Value": 0.16 - } - }, - "112": { - "2": { - "Property": "ImaginaryAddedRatio", - "Value": 0.1 - }, - "4": {} - }, - "301": { - "2": { - "Property": "AttackAddedRatio", - "Value": 0.12 - } - }, - "302": { - "2": { - "Property": "HPAddedRatio", - "Value": 0.12 - } - }, - "303": { - "2": { - "Property": "StatusProbabilityBase", - "Value": 0.1 - } - }, - "304": { - "2": { - "Property": "DefenceAddedRatio", - "Value": 0.15 - } - }, - "305": { - "2": { - "Property": "CriticalDamageBase", - "Value": 0.16 - } - }, - "306": { - "2": { - "Property": "CriticalChanceBase", - "Value": 0.08 - } - }, - "307": { - "2": { - "Property": "BreakDamageAddedRatioBase", - "Value": 0.16 - } - }, - "308": { - "2": { - "Property": "SPRatioBase", - "Value": 0.05 - } - }, - "309": { - "2": { - "Property": "CriticalChanceBase", - "Value": 0.08 - } - }, - "310": { - "2": { - "Property": "StatusResistanceBase", - "Value": 0.1 - } - }, - "113": { - "2": { - "Property": "HPAddedRatio", - "Value": 0.12 - }, - "4": {} - }, - "114": { - "2": { - "Property": "SpeedAddedRatio", - "Value": 0.06 - }, - "4": {} - }, - "115": { - "2": {}, - "4": {} - }, - "116": { - "2": { - "Property": "AttackAddedRatio", - "Value": 0.12 - }, - "4": {} - }, - "311": { - "2": { - "Property": "AttackAddedRatio", - "Value": 0.12 - } - }, - "312": { - "2": { - "Property": "SPRatioBase", - "Value": 0.05 - } - }, - "117": { - "2": {}, - "4": { - "Property": "CriticalChanceBase", - "Value": 0.04 - } - }, - "118": { - "2": { - "Property": "BreakDamageAddedRatioBase", - "Value": 0.16 - }, - "4": {} - }, - "313": { - "2": { - "Property": "CriticalChanceBase", - "Value": 0.04 - } - }, - "314": { - "2": { - "Property": "AttackAddedRatio", - "Value": 0.12 - } - }, - "119": { - "2": { - "Property": "BreakDamageAddedRatioBase", - "Value": 0.16 - }, - "4": {} - }, - "120": { - "2": { - "Property": "AttackAddedRatio", - "Value": 0.12 - }, - "4": { - "Property": "CriticalChanceBase", - "Value": 0.06 - } - }, - "315": { - "2": {} - }, - "316": { - "2": { - "Property": "SpeedAddedRatio", - "Value": 0.06 - } - } -} diff --git a/starrail_damage_cal/map/data/RelicSetSkill_mapping_2.5.0.json b/starrail_damage_cal/map/data/RelicSetSkill_mapping_2.5.0.json new file mode 100644 index 0000000..99feed5 --- /dev/null +++ b/starrail_damage_cal/map/data/RelicSetSkill_mapping_2.5.0.json @@ -0,0 +1,250 @@ +{ + "101": { + "2": { + "Property": "HealRatioBase", + "Value": 0.1 + }, + "4": {} + }, + "102": { + "2": { + "Property": "AttackAddedRatio", + "Value": 0.12 + }, + "4": { + "Property": "SpeedAddedRatio", + "Value": 0.06 + } + }, + "103": { + "2": { + "Property": "DefenceAddedRatio", + "Value": 0.15 + }, + "4": {} + }, + "104": { + "2": { + "Property": "IceAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "105": { + "2": { + "Property": "PhysicalAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "106": { + "2": {}, + "4": {} + }, + "107": { + "2": { + "Property": "FireAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "108": { + "2": { + "Property": "QuantumAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "109": { + "2": { + "Property": "ThunderAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "110": { + "2": { + "Property": "WindAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "111": { + "2": { + "Property": "BreakDamageAddedRatioBase", + "Value": 0.16 + }, + "4": { + "Property": "BreakDamageAddedRatioBase", + "Value": 0.16 + } + }, + "112": { + "2": { + "Property": "ImaginaryAddedRatio", + "Value": 0.1 + }, + "4": {} + }, + "301": { + "2": { + "Property": "AttackAddedRatio", + "Value": 0.12 + } + }, + "302": { + "2": { + "Property": "HPAddedRatio", + "Value": 0.12 + } + }, + "303": { + "2": { + "Property": "StatusProbabilityBase", + "Value": 0.1 + } + }, + "304": { + "2": { + "Property": "DefenceAddedRatio", + "Value": 0.15 + } + }, + "305": { + "2": { + "Property": "CriticalDamageBase", + "Value": 0.16 + } + }, + "306": { + "2": { + "Property": "CriticalChanceBase", + "Value": 0.08 + } + }, + "307": { + "2": { + "Property": "BreakDamageAddedRatioBase", + "Value": 0.16 + } + }, + "308": { + "2": { + "Property": "SPRatioBase", + "Value": 0.05 + } + }, + "309": { + "2": { + "Property": "CriticalChanceBase", + "Value": 0.08 + } + }, + "310": { + "2": { + "Property": "StatusResistanceBase", + "Value": 0.1 + } + }, + "113": { + "2": { + "Property": "HPAddedRatio", + "Value": 0.12 + }, + "4": {} + }, + "114": { + "2": { + "Property": "SpeedAddedRatio", + "Value": 0.06 + }, + "4": {} + }, + "115": { + "2": {}, + "4": {} + }, + "116": { + "2": { + "Property": "AttackAddedRatio", + "Value": 0.12 + }, + "4": {} + }, + "311": { + "2": { + "Property": "AttackAddedRatio", + "Value": 0.12 + } + }, + "312": { + "2": { + "Property": "SPRatioBase", + "Value": 0.05 + } + }, + "117": { + "2": {}, + "4": { + "Property": "CriticalChanceBase", + "Value": 0.04 + } + }, + "118": { + "2": { + "Property": "BreakDamageAddedRatioBase", + "Value": 0.16 + }, + "4": {} + }, + "313": { + "2": { + "Property": "CriticalChanceBase", + "Value": 0.04 + } + }, + "314": { + "2": { + "Property": "AttackAddedRatio", + "Value": 0.12 + } + }, + "119": { + "2": { + "Property": "BreakDamageAddedRatioBase", + "Value": 0.16 + }, + "4": {} + }, + "120": { + "2": { + "Property": "AttackAddedRatio", + "Value": 0.12 + }, + "4": { + "Property": "CriticalChanceBase", + "Value": 0.06 + } + }, + "315": { + "2": {} + }, + "316": { + "2": { + "Property": "SpeedAddedRatio", + "Value": 0.06 + } + }, + "317": { + "2": { + "Property": "SPRatioBase", + "Value": 0.05 + } + }, + "318": { + "2": { + "Property": "CriticalDamageBase", + "Value": 0.16 + } + } +} \ No newline at end of file diff --git a/starrail_damage_cal/map/data/SetId2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/SetId2Name_mapping_2.5.0.json similarity index 92% rename from starrail_damage_cal/map/data/SetId2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/SetId2Name_mapping_2.5.0.json index a86b520..58912a4 100644 --- a/starrail_damage_cal/map/data/SetId2Name_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/SetId2Name_mapping_2.5.0.json @@ -34,5 +34,7 @@ "313": "无主荒星茨冈尼亚", "314": "出云显世与高天神国", "315": "奔狼的都蓝王朝", - "316": "劫火莲灯铸炼宫" + "316": "劫火莲灯铸炼宫", + "317": "沉陆海域露莎卡", + "318": "奇想蕉乐园" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.4.0.json b/starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.4.0.json rename to starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.5.0.json index 3971ea4..eade38c 100644 --- a/starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.5.0.json @@ -37,7 +37,10 @@ "1215": "Physical", "1217": "Wind", "1218": "Fire", + "1220": "Wind", "1221": "Physical", + "1222": "Fire", + "1223": "Thunder", "1224": "Imaginary", "1301": "Fire", "1302": "Physical", diff --git a/starrail_damage_cal/map/data/avatarId2EnName_mapping_2.4.0.json b/starrail_damage_cal/map/data/avatarId2EnName_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/avatarId2EnName_mapping_2.4.0.json rename to starrail_damage_cal/map/data/avatarId2EnName_mapping_2.5.0.json index 1cb5202..bd9b7e5 100644 --- a/starrail_damage_cal/map/data/avatarId2EnName_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2EnName_mapping_2.5.0.json @@ -37,7 +37,10 @@ "1215": "Hanya", "1217": "Huohuo", "1218": "Jiaoqiu", + "1220": "Feixiao", "1221": "Yunli", + "1222": "Lingsha", + "1223": "Moze", "1224": "March7th", "1301": "Gallagher", "1302": "Argenti", diff --git a/starrail_damage_cal/map/data/avatarId2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/avatarId2Name_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/avatarId2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/avatarId2Name_mapping_2.5.0.json index f26f14f..f970f74 100644 --- a/starrail_damage_cal/map/data/avatarId2Name_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2Name_mapping_2.5.0.json @@ -37,7 +37,10 @@ "1215": "寒鸦", "1217": "藿藿", "1218": "椒丘", + "1220": "飞霄", "1221": "云璃", + "1222": "灵砂", + "1223": "貊泽", "1224": "三月七", "1301": "加拉赫", "1302": "银枝", diff --git a/starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.4.0.json b/starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.4.0.json rename to starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.5.0.json index 3ea1177..83f6af5 100644 --- a/starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.5.0.json @@ -37,7 +37,10 @@ "1215": "4", "1217": "5", "1218": "5", + "1220": "5", "1221": "5", + "1222": "5", + "1223": "4", "1224": "4", "1301": "4", "1302": "5", diff --git a/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.4.0.json b/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.5.0.json similarity index 94% rename from starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.4.0.json rename to starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.5.0.json index 3dcf05f..1838ed3 100644 --- a/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.5.0.json @@ -943,6 +943,42 @@ } ], "121806": [], + "122001": [], + "122002": [], + "122003": [ + { + "id": "122003", + "num": 2 + }, + { + "id": "122001", + "num": 1 + }, + { + "id": "122008", + "num": 2 + }, + { + "id": "122009", + "num": 2 + }, + { + "id": "122014", + "num": 2 + } + ], + "122004": [], + "122005": [ + { + "id": "122002", + "num": 2 + }, + { + "id": "122004", + "num": 2 + } + ], + "122006": [], "122101": [], "122102": [], "122103": [ @@ -967,6 +1003,54 @@ } ], "122106": [], + "122201": [], + "122202": [], + "122203": [ + { + "id": "122203", + "num": 2 + }, + { + "id": "122204", + "num": 2 + } + ], + "122204": [], + "122205": [ + { + "id": "122202", + "num": 2 + }, + { + "id": "122201", + "num": 1 + } + ], + "122206": [], + "122301": [], + "122302": [], + "122303": [ + { + "id": "122303", + "num": 2 + }, + { + "id": "122304", + "num": 2 + } + ], + "122304": [], + "122305": [ + { + "id": "122302", + "num": 2 + }, + { + "id": "122301", + "num": 1 + } + ], + "122306": [], "122401": [], "122402": [], "122403": [ diff --git a/starrail_damage_cal/map/data/characterSkillTree_mapping_2.4.0.json b/starrail_damage_cal/map/data/characterSkillTree_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/characterSkillTree_mapping_2.4.0.json rename to starrail_damage_cal/map/data/characterSkillTree_mapping_2.5.0.json index 313ca73..e4a11cb 100644 --- a/starrail_damage_cal/map/data/characterSkillTree_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/characterSkillTree_mapping_2.5.0.json @@ -47420,6 +47420,1269 @@ "icon": "icon/property/IconStatusProbability.png" } }, + "1220": { + "1220001": { + "id": "1220001", + "name": "", + "max_level": 6, + "desc": "", + "params": [], + "anchor": "Point01", + "pre_points": [], + "level_up_skills": [ + { + "id": "122001", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110191", + "num": 3 + }, + { + "id": "113011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110192", + "num": 3 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110192", + "num": 5 + }, + { + "id": "113012", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110193", + "num": 3 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "113013", + "num": 4 + } + ] + } + ], + "icon": "icon/skill/1220_basic_atk.png" + }, + "1220002": { + "id": "1220002", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point02", + "pre_points": [], + "level_up_skills": [ + { + "id": "122002", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113011", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110191", + "num": 3 + }, + { + "id": "113011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110192", + "num": 3 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110192", + "num": 5 + }, + { + "id": "113012", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110192", + "num": 7 + }, + { + "id": "113012", + "num": 6 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110193", + "num": 3 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110193", + "num": 5 + }, + { + "id": "110503", + "num": 1 + }, + { + "id": "113013", + "num": 4 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "110193", + "num": 14 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1220_skill.png" + }, + "1220003": { + "id": "1220003", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point03", + "pre_points": [], + "level_up_skills": [ + { + "id": "122003", + "num": 1 + }, + { + "id": "122008", + "num": 1 + }, + { + "id": "122009", + "num": 1 + }, + { + "id": "122014", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113011", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110191", + "num": 3 + }, + { + "id": "113011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110192", + "num": 3 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110192", + "num": 5 + }, + { + "id": "113012", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110192", + "num": 7 + }, + { + "id": "113012", + "num": 6 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110193", + "num": 3 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110193", + "num": 5 + }, + { + "id": "110503", + "num": 1 + }, + { + "id": "113013", + "num": 4 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "110193", + "num": 14 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1220_ultimate.png" + }, + "1220004": { + "id": "1220004", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point04", + "pre_points": [], + "level_up_skills": [ + { + "id": "122004", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113011", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110191", + "num": 3 + }, + { + "id": "113011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110192", + "num": 3 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110192", + "num": 5 + }, + { + "id": "113012", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110192", + "num": 7 + }, + { + "id": "113012", + "num": 6 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110193", + "num": 3 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110193", + "num": 5 + }, + { + "id": "110503", + "num": 1 + }, + { + "id": "113013", + "num": 4 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "110193", + "num": 14 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1220_talent.png" + }, + "1220007": { + "id": "1220007", + "name": "", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point05", + "pre_points": [], + "level_up_skills": [ + { + "id": "122007", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + } + ], + "icon": "icon/skill/1220_technique.png" + }, + "1220101": { + "id": "1220101", + "name": "天通", + "max_level": 1, + "desc": "战斗开始时，获得#1[i]点【飞黄】。\n回合开始时，若上回合未通过天赋发动追加攻击，计入1次获得【飞黄】所需的攻击次数。", + "params": [ + [ + 3 + ] + ], + "anchor": "Point06", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110191", + "num": 3 + }, + { + "id": "110503", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1220_skilltree1.png" + }, + "1220102": { + "id": "1220102", + "name": "解形", + "max_level": 1, + "desc": "施放终结技对敌方目标造成伤害时，被视为发动了追加攻击。追加攻击的暴击伤害提高#1[i]%。", + "params": [ + [ + 0.36 + ] + ], + "anchor": "Point07", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110192", + "num": 5 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1220_skilltree2.png" + }, + "1220103": { + "id": "1220103", + "name": "电举", + "max_level": 1, + "desc": "施放战技时，攻击力提高#1[i]%，持续#2[i]回合。", + "params": [ + [ + 0.48, + 3 + ] + ], + "anchor": "Point08", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110503", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1220_skilltree3.png" + }, + "1220201": { + "id": "1220201", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point09", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 1, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113011", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1220202": { + "id": "1220202", + "name": "暴击率强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point10", + "pre_points": [ + "1220101" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [ + { + "type": "CriticalChanceBase", + "value": 0.027 + } + ], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110191", + "num": 3 + }, + { + "id": "113011", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconCriticalChance.png" + }, + "1220203": { + "id": "1220203", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point11", + "pre_points": [ + "1220202" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110192", + "num": 3 + }, + { + "id": "113012", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1220204": { + "id": "1220204", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point12", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.05 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110192", + "num": 3 + }, + { + "id": "113012", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1220205": { + "id": "1220205", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point13", + "pre_points": [ + "1220102" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110192", + "num": 5 + }, + { + "id": "113012", + "num": 4 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1220206": { + "id": "1220206", + "name": "暴击率强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point14", + "pre_points": [ + "1220205" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "CriticalChanceBase", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110193", + "num": 3 + }, + { + "id": "113013", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconCriticalChance.png" + }, + "1220207": { + "id": "1220207", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point15", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110193", + "num": 3 + }, + { + "id": "113013", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1220208": { + "id": "1220208", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point16", + "pre_points": [ + "1220103" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.075 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "113013", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1220209": { + "id": "1220209", + "name": "暴击率强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point17", + "pre_points": [ + "1220208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 75, + "properties": [ + { + "type": "CriticalChanceBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "113013", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconCriticalChance.png" + }, + "1220210": { + "id": "1220210", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point18", + "pre_points": [ + "1220208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 80, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110193", + "num": 8 + }, + { + "id": "113013", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + } + }, "1221": { "1221001": { "id": "1221001", @@ -48670,6 +49933,2502 @@ "icon": "icon/property/IconAttack.png" } }, + "1222": { + "1222001": { + "id": "1222001", + "name": "", + "max_level": 6, + "desc": "", + "params": [], + "anchor": "Point01", + "pre_points": [], + "level_up_skills": [ + { + "id": "122201", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110241", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110242", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110242", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110243", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "113003", + "num": 4 + } + ] + } + ], + "icon": "icon/skill/1222_basic_atk.png" + }, + "1222002": { + "id": "1222002", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point02", + "pre_points": [], + "level_up_skills": [ + { + "id": "122202", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110241", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110242", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110242", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110242", + "num": 7 + }, + { + "id": "113002", + "num": 6 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110243", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110243", + "num": 5 + }, + { + "id": "110506", + "num": 1 + }, + { + "id": "113003", + "num": 4 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "110243", + "num": 14 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1222_skill.png" + }, + "1222003": { + "id": "1222003", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point03", + "pre_points": [], + "level_up_skills": [ + { + "id": "122203", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110241", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110242", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110242", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110242", + "num": 7 + }, + { + "id": "113002", + "num": 6 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110243", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110243", + "num": 5 + }, + { + "id": "110506", + "num": 1 + }, + { + "id": "113003", + "num": 4 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "110243", + "num": 14 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1222_ultimate.png" + }, + "1222004": { + "id": "1222004", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point04", + "pre_points": [], + "level_up_skills": [ + { + "id": "122204", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110241", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110242", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110242", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110242", + "num": 7 + }, + { + "id": "113002", + "num": 6 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110243", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110243", + "num": 5 + }, + { + "id": "110506", + "num": 1 + }, + { + "id": "113003", + "num": 4 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "110243", + "num": 14 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1222_talent.png" + }, + "1222007": { + "id": "1222007", + "name": "", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point05", + "pre_points": [], + "level_up_skills": [ + { + "id": "122207", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + } + ], + "icon": "icon/skill/1222_technique.png" + }, + "1222101": { + "id": "1222101", + "name": "朱燎", + "max_level": 1, + "desc": "使自身攻击力/治疗量提高，提高数值等同于击破特攻的#1[i]%/#2[i]%，最多使攻击力/治疗量提高#3[i]%/#4[i]%。", + "params": [ + [ + 0.25, + 0.1, + 0.5, + 0.2 + ] + ], + "anchor": "Point06", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110241", + "num": 3 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1222_skilltree1.png" + }, + "1222102": { + "id": "1222102", + "name": "兰烟", + "max_level": 1, + "desc": "施放普攻时额外恢复#1[i]点能量。", + "params": [ + [ + 10 + ] + ], + "anchor": "Point07", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110242", + "num": 5 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1222_skilltree2.png" + }, + "1222103": { + "id": "1222103", + "name": "遗爇", + "max_level": 1, + "desc": "【浮元】在场时，我方任意角色受到伤害或消耗生命值时，若队伍中有存在当前生命值百分比小于等于#1[i]%的角色，【浮元】会立即对敌人发动天赋的追加攻击，此次触发不消耗【浮元】行动次数，该效果在#2[i]回合后可再次触发。", + "params": [ + [ + 0.6, + 2 + ] + ], + "anchor": "Point08", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1222_skilltree3.png" + }, + "1222201": { + "id": "1222201", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point09", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 1, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1222202": { + "id": "1222202", + "name": "生命强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point10", + "pre_points": [ + "1222101" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [ + { + "type": "HPAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110241", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconMaxHP.png" + }, + "1222203": { + "id": "1222203", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point11", + "pre_points": [ + "1222202" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110242", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1222204": { + "id": "1222204", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point12", + "pre_points": [ + "1222203" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110242", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1222205": { + "id": "1222205", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point13", + "pre_points": [ + "1222102" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110242", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1222206": { + "id": "1222206", + "name": "生命强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point14", + "pre_points": [ + "1222205" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "HPAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110243", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconMaxHP.png" + }, + "1222207": { + "id": "1222207", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point15", + "pre_points": [ + "1222206" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110243", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1222208": { + "id": "1222208", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point16", + "pre_points": [ + "1222103" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "113003", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1222209": { + "id": "1222209", + "name": "生命强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point17", + "pre_points": [ + "1222103" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 75, + "properties": [ + { + "type": "HPAddedRatio", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "113003", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconMaxHP.png" + }, + "1222210": { + "id": "1222210", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point18", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 80, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.107 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110243", + "num": 8 + }, + { + "id": "113003", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + } + }, + "1223": { + "1223001": { + "id": "1223001", + "name": "", + "max_level": 6, + "desc": "", + "params": [], + "anchor": "Point01", + "pre_points": [], + "level_up_skills": [ + { + "id": "122301", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 4000 + }, + { + "id": "110191", + "num": 2 + }, + { + "id": "113011", + "num": 4 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 8000 + }, + { + "id": "110192", + "num": 2 + }, + { + "id": "113012", + "num": 2 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 16000 + }, + { + "id": "110192", + "num": 4 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 36000 + }, + { + "id": "110193", + "num": 2 + }, + { + "id": "113013", + "num": 2 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "113013", + "num": 3 + } + ] + } + ], + "icon": "icon/skill/1223_basic_atk.png" + }, + "1223002": { + "id": "1223002", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point02", + "pre_points": [], + "level_up_skills": [ + { + "id": "122302", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2000 + }, + { + "id": "113011", + "num": 2 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 4000 + }, + { + "id": "110191", + "num": 2 + }, + { + "id": "113011", + "num": 4 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 8000 + }, + { + "id": "110192", + "num": 2 + }, + { + "id": "113012", + "num": 2 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 16000 + }, + { + "id": "110192", + "num": 4 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 24000 + }, + { + "id": "110192", + "num": 6 + }, + { + "id": "113012", + "num": 5 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 36000 + }, + { + "id": "110193", + "num": 2 + }, + { + "id": "113013", + "num": 2 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 64000 + }, + { + "id": "110193", + "num": 4 + }, + { + "id": "110506", + "num": 1 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "110506", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 240000 + }, + { + "id": "110193", + "num": 11 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1223_skill.png" + }, + "1223003": { + "id": "1223003", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point03", + "pre_points": [], + "level_up_skills": [ + { + "id": "122303", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2000 + }, + { + "id": "113011", + "num": 2 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 4000 + }, + { + "id": "110191", + "num": 2 + }, + { + "id": "113011", + "num": 4 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 8000 + }, + { + "id": "110192", + "num": 2 + }, + { + "id": "113012", + "num": 2 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 16000 + }, + { + "id": "110192", + "num": 4 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 24000 + }, + { + "id": "110192", + "num": 6 + }, + { + "id": "113012", + "num": 5 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 36000 + }, + { + "id": "110193", + "num": 2 + }, + { + "id": "113013", + "num": 2 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 64000 + }, + { + "id": "110193", + "num": 4 + }, + { + "id": "110506", + "num": 1 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "110506", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 240000 + }, + { + "id": "110193", + "num": 11 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1223_ultimate.png" + }, + "1223004": { + "id": "1223004", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point04", + "pre_points": [], + "level_up_skills": [ + { + "id": "122304", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2000 + }, + { + "id": "113011", + "num": 2 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 4000 + }, + { + "id": "110191", + "num": 2 + }, + { + "id": "113011", + "num": 4 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 8000 + }, + { + "id": "110192", + "num": 2 + }, + { + "id": "113012", + "num": 2 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 16000 + }, + { + "id": "110192", + "num": 4 + }, + { + "id": "113012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 24000 + }, + { + "id": "110192", + "num": 6 + }, + { + "id": "113012", + "num": 5 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 36000 + }, + { + "id": "110193", + "num": 2 + }, + { + "id": "113013", + "num": 2 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 64000 + }, + { + "id": "110193", + "num": 4 + }, + { + "id": "110506", + "num": 1 + }, + { + "id": "113013", + "num": 3 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "110506", + "num": 1 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 240000 + }, + { + "id": "110193", + "num": 11 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1223_talent.png" + }, + "1223007": { + "id": "1223007", + "name": "", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point05", + "pre_points": [], + "level_up_skills": [ + { + "id": "122307", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + } + ], + "icon": "icon/skill/1223_technique.png" + }, + "1223101": { + "id": "1223101", + "name": "墨毫绣衣", + "max_level": 1, + "desc": "施放天赋的追加攻击后，恢复#1[i]个战技点，该效果在#2[i]回合后可再次触发。", + "params": [ + [ + 1, + 1 + ] + ], + "anchor": "Point06", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 4000 + }, + { + "id": "110191", + "num": 2 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1223_skilltree1.png" + }, + "1223102": { + "id": "1223102", + "name": "手奋匕尺", + "max_level": 1, + "desc": "貊泽解除离场状态时，行动提前#1[i]%。每个波次开始时，貊泽行动提前#2[i]%。", + "params": [ + [ + 0.2, + 0.3 + ] + ], + "anchor": "Point07", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 16000 + }, + { + "id": "110192", + "num": 4 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1223_skilltree2.png" + }, + "1223103": { + "id": "1223103", + "name": "不折镆干", + "max_level": 1, + "desc": "施放终结技造成伤害时，被视为发动了追加攻击。【猎物】受到的追加攻击伤害提高#1[i]%。", + "params": [ + [ + 0.25 + ] + ], + "anchor": "Point08", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110506", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1223_skilltree3.png" + }, + "1223201": { + "id": "1223201", + "name": "暴击伤害强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point09", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 1, + "properties": [ + { + "type": "CriticalDamageBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 2000 + }, + { + "id": "113011", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconCriticalDamage.png" + }, + "1223202": { + "id": "1223202", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point10", + "pre_points": [ + "1223101" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 4000 + }, + { + "id": "110191", + "num": 2 + }, + { + "id": "113011", + "num": 4 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1223203": { + "id": "1223203", + "name": "暴击伤害强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point11", + "pre_points": [ + "1223202" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "CriticalDamageBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 8000 + }, + { + "id": "110192", + "num": 2 + }, + { + "id": "113012", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconCriticalDamage.png" + }, + "1223204": { + "id": "1223204", + "name": "生命强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point12", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "HPAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 8000 + }, + { + "id": "110192", + "num": 2 + }, + { + "id": "113012", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconMaxHP.png" + }, + "1223205": { + "id": "1223205", + "name": "暴击伤害强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point13", + "pre_points": [ + "1223102" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [ + { + "type": "CriticalDamageBase", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 16000 + }, + { + "id": "110192", + "num": 4 + }, + { + "id": "113012", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconCriticalDamage.png" + }, + "1223206": { + "id": "1223206", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point14", + "pre_points": [ + "1223205" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 36000 + }, + { + "id": "110193", + "num": 2 + }, + { + "id": "113013", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1223207": { + "id": "1223207", + "name": "暴击伤害强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point15", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "CriticalDamageBase", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 36000 + }, + { + "id": "110193", + "num": 2 + }, + { + "id": "113013", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconCriticalDamage.png" + }, + "1223208": { + "id": "1223208", + "name": "生命强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point16", + "pre_points": [ + "1223103" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [ + { + "type": "HPAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "113013", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconMaxHP.png" + }, + "1223209": { + "id": "1223209", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point17", + "pre_points": [ + "1223208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 75, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "113013", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1223210": { + "id": "1223210", + "name": "暴击伤害强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point18", + "pre_points": [ + "1223208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 80, + "properties": [ + { + "type": "CriticalDamageBase", + "value": 0.107 + } + ], + "materials": [ + { + "id": "2", + "num": 128000 + }, + { + "id": "110193", + "num": 6 + }, + { + "id": "113013", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconCriticalDamage.png" + } + }, "1224": { "1224001": { "id": "1224001", diff --git a/starrail_damage_cal/map/data/rankId2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/rankId2Name_mapping_2.5.0.json similarity index 95% rename from starrail_damage_cal/map/data/rankId2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/rankId2Name_mapping_2.5.0.json index 0b854ae..1b7b0ac 100644 --- a/starrail_damage_cal/map/data/rankId2Name_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/rankId2Name_mapping_2.5.0.json @@ -227,12 +227,30 @@ "121804": "藏腑和平，血气资荣", "121805": "明争天地，暗斗变击", "121806": "九沸九变，火为之纪", + "122001": "镇绥天钧", + "122002": "礼辰祷月", + "122003": "景星出宿", + "122004": "驱飓听冰", + "122005": "擢登霄汉", + "122006": "惟首正丘", "122101": "沉锋离垢", "122102": "初芒破生", "122103": "九尺运斤", "122104": "大匠击橐", "122105": "恒兵匪石", "122106": "剑胆琴心", + "122201": "馨气当盛，除邪避讳", + "122202": "欹枕垂云，烟奁红雪", + "122203": "含芽细炷，浪蕊浓焚", + "122204": "横垂宝幄，半拂琼筵", + "122205": "纵横圆转，内常不倾", + "122206": "晓兰深藏，宿香暗贮", + "122301": "矢志", + "122302": "惩膺", + "122303": "追奔", + "122304": "逐薮", + "122305": "闪诳", + "122306": "丹心", "122401": "初花学剑动星芒", "122402": "白刃耀雪舞骇浪", "122403": "头脑机灵本领强", diff --git a/starrail_damage_cal/map/data/skillId2AttackType_mapping_2.4.0.json b/starrail_damage_cal/map/data/skillId2AttackType_mapping_2.5.0.json similarity index 94% rename from starrail_damage_cal/map/data/skillId2AttackType_mapping_2.4.0.json rename to starrail_damage_cal/map/data/skillId2AttackType_mapping_2.5.0.json index 5ef5faa..f4dd42e 100644 --- a/starrail_damage_cal/map/data/skillId2AttackType_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/skillId2AttackType_mapping_2.5.0.json @@ -1,7 +1,4 @@ { - "100101": "Normal", - "100103": "Ultra", - "100104": "", "100106": "MazeNormal", "100107": "Maze", "100201": "Normal", @@ -377,5 +374,29 @@ "122103": "Ultra", "122104": "", "122106": "MazeNormal", - "122107": "Maze" -} + "122107": "Maze", + "122001": "Normal", + "122002": "BPSkill", + "122003": "Ultra", + "122004": "", + "122006": "MazeNormal", + "122007": "Maze", + "122008": "Ultra", + "122009": "Ultra", + "122301": "Normal", + "122302": "BPSkill", + "122303": "Ultra", + "122304": "", + "122306": "MazeNormal", + "122307": "Maze", + "122201": "Normal", + "122202": "BPSkill", + "122203": "Ultra", + "122204": "", + "122206": "MazeNormal", + "122207": "Maze", + "122014": "Ultra", + "100101": "Normal", + "100103": "Ultra", + "100104": "" +} \ No newline at end of file diff --git a/starrail_damage_cal/map/data/skillId2Name_mapping_2.4.0.json b/starrail_damage_cal/map/data/skillId2Name_mapping_2.5.0.json similarity index 94% rename from starrail_damage_cal/map/data/skillId2Name_mapping_2.4.0.json rename to starrail_damage_cal/map/data/skillId2Name_mapping_2.5.0.json index 72f5cb4..6e76033 100644 --- a/starrail_damage_cal/map/data/skillId2Name_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/skillId2Name_mapping_2.5.0.json @@ -1,7 +1,4 @@ { - "100101": "极寒的弓矢", - "100103": "冰刻箭雨之时", - "100104": "少女的特权", "100106": "攻击", "100107": "冻人的瞬间", "100201": "云骑枪术•朔风", @@ -377,5 +374,29 @@ "122103": "剑为地纪，刃惊天宗", "122104": "闪铄", "122106": "攻击", - "122107": "后发先至" + "122107": "后发先至", + "122001": "闪裂", + "122002": "钺贯", + "122003": "凿破大荒", + "122004": "雷狩", + "122006": "攻击", + "122007": "岚身", + "122008": "闪裂刃舞", + "122009": "钺贯天冲", + "122301": "飞铙", + "122302": "迅羽掠袭", + "122303": "锋入幽渺，影出凌厉", + "122304": "伸天卑飞，折翅为芒", + "122306": "攻击", + "122307": "胁翼匿迹", + "122201": "肃香", + "122202": "识烟飞彩", + "122203": "幔亭缭霞", + "122204": "烟斜雾横，氛氲化生", + "122206": "攻击", + "122207": "流翠散云", + "122014": "凿破大荒", + "100101": "极寒的弓矢", + "100103": "冰刻箭雨之时", + "100104": "少女的特权" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/skillId2Type_mapping_2.4.0.json b/starrail_damage_cal/map/data/skillId2Type_mapping_2.5.0.json similarity index 94% rename from starrail_damage_cal/map/data/skillId2Type_mapping_2.4.0.json rename to starrail_damage_cal/map/data/skillId2Type_mapping_2.5.0.json index 652e883..12edb09 100644 --- a/starrail_damage_cal/map/data/skillId2Type_mapping_2.4.0.json +++ b/starrail_damage_cal/map/data/skillId2Type_mapping_2.5.0.json @@ -1,7 +1,4 @@ { - "100101": "单攻", - "100103": "群攻", - "100104": "单攻", "100106": "", "100107": "", "100201": "单攻", @@ -377,5 +374,29 @@ "122103": "强化", "122104": "扩散", "122106": "", - "122107": "强化" + "122107": "强化", + "122001": "单攻", + "122002": "单攻", + "122003": "单攻", + "122004": "单攻", + "122006": "", + "122007": "强化", + "122008": "单攻", + "122009": "单攻", + "122301": "单攻", + "122302": "单攻", + "122303": "单攻", + "122304": "单攻", + "122306": "", + "122307": "强化", + "122201": "单攻", + "122202": "群攻", + "122203": "群攻", + "122204": "群攻", + "122206": "单攻", + "122207": "辅助", + "122014": "单攻", + "100101": "单攻", + "100103": "群攻", + "100104": "单攻" } \ No newline at end of file diff --git a/starrail_damage_cal/version.py b/starrail_damage_cal/version.py index a3d331d..583d47a 100644 --- a/starrail_damage_cal/version.py +++ b/starrail_damage_cal/version.py @@ -1 +1 @@ -StarRail_version = "2.4.0" +StarRail_version = "2.5.0" diff --git a/test.py b/test.py index 9fad63f..a37698b 100644 --- a/test.py +++ b/test.py @@ -1,15 +1,21 @@ import json from typing import List, Union -from starrail_damage_cal.cal_damage import DamageCal +from starrail_damage_cal.cal_damage import DamageCal, cal_char_info, get_char_data +from starrail_damage_cal.damage.Avatar import AvatarInstance from starrail_damage_cal.to_data import api_to_dict async def test_get_damage_data_by_uid() -> None: # print(await api_to_dict("108069476")) - data = await DamageCal.get_damage_data_by_uid(uid="108069476", avatar_name="流萤") - if isinstance(data, Union[List, dict]): - print(json.dumps(data, ensure_ascii=False, indent=4)) + char_data = await get_char_data(uid="108069476", avatar_name="流萤") + if isinstance(char_data, Union[List, dict]): + print(json.dumps(char_data, ensure_ascii=False, indent=4)) + + char = await cal_char_info(char_data) + avatar = AvatarInstance(char) + print(avatar.base_attr) + print(avatar.attribute_bonus) if __name__ == "__main__":