支持1.4

.gitignore

@@ -664,3 +664,4 @@ FodyWeavers.xsd
 
 ### CI ###
 result.txt
+upload_file.py

StarRailUID/sruid_utils/api/hakush/requests.py

@@ -12,25 +12,29 @@ from .model import (
 )
 
 
-async def get_character_data(uid: str) -> Union[HakushHsrCharacter, None]:
+async def get_character_data(
+    avatar_id: str,
+) -> Union[HakushHsrCharacter, None]:
     async with AsyncClient(
         base_url='https://api.hakush.in/hsr/data',
         headers=_HEADER,
         timeout=30,
     ) as client:
-        req = await client.get(f'/cn/character/{uid}.json')
+        req = await client.get(f'/cn/character/{avatar_id}.json')
         if req.status_code == 200:
             return convert(req.json(), type=HakushHsrCharacter)
         return None
 
 
-async def get_lightcone_data(uid: str) -> Union[HakushHsrLightcone, None]:
+async def get_lightcone_data(
+    lightcone_id: str,
+) -> Union[HakushHsrLightcone, None]:
     async with AsyncClient(
         base_url='https://api.hakush.in/hsr/data',
         headers=_HEADER,
         timeout=30,
     ) as client:
-        req = await client.get(f'/cn/lightcone/{uid}.json')
+        req = await client.get(f'/cn/lightcone/{lightcone_id}.json')
         if req.status_code == 200:
             return convert(req.json(), type=HakushHsrLightcone)
         return None

StarRailUID/starrailuid_charinfo/to_data.py

@@ -1,35 +1,35 @@
 import json
 from pathlib import Path
-from typing import Dict, List, Union, Optional
+from typing import Dict, List, Optional, Union
 
 from httpx import ReadTimeout
 from msgspec import json as msgjson
 
-from ..utils.error_reply import UID_HINT
 from ..sruid_utils.api.mihomo import MihomoData
 from ..sruid_utils.api.mihomo.models import Avatar
-from ..utils.resource.RESOURCE_PATH import PLAYER_PATH
 from ..sruid_utils.api.mihomo.requests import get_char_card_info
-from .cal_value import cal_relic_sub_affix, cal_relic_main_affix
+from ..utils.error_reply import UID_HINT
 from ..utils.excel.model import AvatarPromotionConfig, EquipmentPromotionConfig
 from ..utils.map.SR_MAP_PATH import (
-    SetId2Name,
+    AvatarRankSkillUp,
+    EquipmentID2Name,
+    EquipmentID2Rarity,
     ItemId2Name,
     Property2Name,
     RelicId2SetId,
-    EquipmentID2Name,
+    SetId2Name,
-    AvatarRankSkillUp,
+    avatarId2DamageType,
-    EquipmentID2Rarity,
-    rankId2Name,
-    skillId2Name,
-    avatarId2Name,
-    skillId2Effect,
     avatarId2EnName,
+    avatarId2Name,
     avatarId2Rarity,
     characterSkillTree,
+    rankId2Name,
     skillId2AttackType,
-    avatarId2DamageType,
+    skillId2Effect,
+    skillId2Name,
 )
+from ..utils.resource.RESOURCE_PATH import PLAYER_PATH
+from .cal_value import cal_relic_main_affix, cal_relic_sub_affix
 
 
 async def api_to_dict(
@@ -298,23 +298,23 @@ async def get_data(char: Avatar, sr_data: MihomoData, sr_uid: str):
             str(char.equipment.tid)
         ][str(equipment_info['equipmentPromotion'])]
 
+        equipment_level = char.equipment.level if char.equipment.level else 1
         # 生命值
         equipment_base_attributes['hp'] = (
             equipment_promotion_base.BaseHP.Value
-            + equipment_promotion_base.BaseHPAdd.Value
+            + equipment_promotion_base.BaseHPAdd.Value * (equipment_level - 1)
-            * (char.equipment.level - 1)
         )
         # 攻击力
         equipment_base_attributes['attack'] = (
             equipment_promotion_base.BaseAttack.Value
             + equipment_promotion_base.BaseAttackAdd.Value
-            * (char.equipment.level - 1)
+            * (equipment_level - 1)
         )
         # 防御力
         equipment_base_attributes['defence'] = (
             equipment_promotion_base.BaseDefence.Value
             + equipment_promotion_base.BaseDefenceAdd.Value
-            * (char.equipment.level - 1)
+            * (equipment_level - 1)
         )
         equipment_info['baseAttributes'] = equipment_base_attributes
 

StarRailUID/starrailuid_wiki/__init__.py

@@ -1,22 +1,23 @@
 import re
 
-from gsuid_core.sv import SV
 from gsuid_core.bot import Bot
 from gsuid_core.models import Event
+from gsuid_core.sv import SV
 from gsuid_core.utils.image.convert import convert_img
 
 from ..utils.map.name_covert import (
-    name_to_avatar_id,
-    name_to_weapon_id,
     alias_to_char_name,
+    name_to_avatar_id,
+    name_to_relic_set_id,
+    name_to_weapon_id,
 )
 from ..utils.resource.RESOURCE_PATH import (
-    WIKI_ROLE_PATH,
-    WIKI_RELIC_PATH,
     GUIDE_CHARACTER_PATH,
-    WIKI_LIGHT_CONE_PATH,
     GUIDE_LIGHT_CONE_PATH,
+    WIKI_LIGHT_CONE_PATH,
     WIKI_MATERIAL_FOR_ROLE,
+    WIKI_RELIC_PATH,
+    WIKI_ROLE_PATH,
 )
 
 sv_sr_wiki = SV('星铁WIKI')
@@ -25,16 +26,21 @@ sv_sr_guide = SV('星铁攻略')
 
 @sv_sr_wiki.on_prefix('sr角色图鉴')
 async def send_role_wiki_pic(bot: Bot, ev: Event):
-    msg = ' '.join(re.findall('[\u4e00-\u9fa5]+', ev.text))
+    char_name = ' '.join(re.findall('[\u4e00-\u9fa5]+', ev.text))
-    await bot.logger.info(f'开始获取{msg}图鉴')
+    await bot.logger.info(f'开始获取{char_name}图鉴')
-    name = await alias_to_char_name(msg)
+    if '开拓者' in str(char_name):
-    img = WIKI_ROLE_PATH / f'{name}.png'
+        char_name = '开拓者'
+    char_id = await name_to_avatar_id(char_name)
+    if char_id == '':
+        char_name = await alias_to_char_name(char_name)
+        char_id = await name_to_avatar_id(char_name)
+    img = WIKI_ROLE_PATH / f'{char_id}.png'
     if img.exists():
         img = await convert_img(img)
-        await bot.logger.info(f'获得{name}图鉴图片成功!')
+        await bot.logger.info(f'获得{char_name}图鉴图片成功!')
         await bot.send(img)
     else:
-        await bot.logger.warning(f'未找到{name}图鉴图片')
+        await bot.logger.warning(f'未找到{char_name}图鉴图片')
 
 
 @sv_sr_guide.on_prefix('sr角色攻略')
@@ -74,7 +80,8 @@ async def send_weapon_guide_pic(bot: Bot, ev: Event):
 async def send_relic_wiki_pic(bot: Bot, ev: Event):
     msg = ' '.join(re.findall('[\u4e00-\u9fa5]+', ev.text))
     await bot.logger.info(f'开始获取{msg}遗器')
-    img = WIKI_RELIC_PATH / f'{msg}.png'
+    set_id = await name_to_relic_set_id(msg)
+    img = WIKI_RELIC_PATH / f'{set_id}.png'
     if img.exists():
         img = await convert_img(img)
         await bot.logger.info(f'获得{msg}遗器图片成功!')
@@ -85,22 +92,29 @@ async def send_relic_wiki_pic(bot: Bot, ev: Event):
 
 @sv_sr_wiki.on_prefix('sr突破材料')
 async def send_material_for_role_wiki_pic(bot: Bot, ev: Event):
-    msg = ' '.join(re.findall('[\u4e00-\u9fa5]+', ev.text))
+    char_name = ' '.join(re.findall('[\u4e00-\u9fa5]+', ev.text))
-    await bot.logger.info(f'开始获取{msg}突破材料')
+    await bot.logger.info(f'开始获取{char_name}突破材料')
-    img = WIKI_MATERIAL_FOR_ROLE / f'{msg}.png'
+    if '开拓者' in str(char_name):
+        char_name = '开拓者'
+    char_id = await name_to_avatar_id(char_name)
+    if char_id == '':
+        char_name = await alias_to_char_name(char_name)
+        char_id = await name_to_avatar_id(char_name)
+    img = WIKI_MATERIAL_FOR_ROLE / f'{char_id}.png'
     if img.exists():
         img = await convert_img(img)
-        await bot.logger.info(f'获得{msg}突破材料图片成功!')
+        await bot.logger.info(f'获得{char_name}突破材料图片成功!')
         await bot.send(img)
     else:
-        await bot.logger.warning(f'未找到{msg}突破材料图片')
+        await bot.logger.warning(f'未找到{char_name}突破材料图片')
 
 
 @sv_sr_wiki.on_prefix('sr武器')
 async def send_light_cone_wiki_pic(bot: Bot, ev: Event):
     msg = ' '.join(re.findall('[\u4e00-\u9fa5]+', ev.text))
     await bot.logger.info(f'开始获取{msg}武器')
-    img = WIKI_LIGHT_CONE_PATH / f'{msg}.png'
+    light_cone_id = await name_to_weapon_id(msg)
+    img = WIKI_LIGHT_CONE_PATH / f'{light_cone_id}.png'
     if img.exists():
         img = await convert_img(img)
         await bot.logger.info(f'获得{msg}武器图片成功!')

StarRailUID/utils/excel/EquipmentPromotionConfig.json

@@ -17569,6 +17569,257 @@
       }
     }
   },
+  "23014": {
+    "0": {
+      "EquipmentID": 23014,
+      "Promotion": 0,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 5000
+        },
+        {
+          "ItemID": 113001,
+          "ItemNum": 8
+        }
+      ],
+      "PlayerLevelRequire": 15,
+      "MaxLevel": 20,
+      "BaseHP": {
+        "Value": 52.80000000074506
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 26.40000000037253
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 18
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    },
+    "1": {
+      "EquipmentID": 23014,
+      "Promotion": 1,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 10000
+        },
+        {
+          "ItemID": 110111,
+          "ItemNum": 4
+        },
+        {
+          "ItemID": 113001,
+          "ItemNum": 12
+        }
+      ],
+      "WorldLevelRequire": 1,
+      "MaxLevel": 30,
+      "BaseHP": {
+        "Value": 116.16000000014901
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 58.080000000074506
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 39.60000000055879
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    },
+    "2": {
+      "EquipmentID": 23014,
+      "Promotion": 2,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 20000
+        },
+        {
+          "ItemID": 110112,
+          "ItemNum": 4
+        },
+        {
+          "ItemID": 113002,
+          "ItemNum": 8
+        }
+      ],
+      "WorldLevelRequire": 2,
+      "MaxLevel": 40,
+      "BaseHP": {
+        "Value": 200.64000000059605
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 100.32000000029802
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 68.40000000037253
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    },
+    "3": {
+      "EquipmentID": 23014,
+      "Promotion": 3,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 50000
+        },
+        {
+          "ItemID": 110112,
+          "ItemNum": 8
+        },
+        {
+          "ItemID": 113002,
+          "ItemNum": 12
+        }
+      ],
+      "WorldLevelRequire": 3,
+      "MaxLevel": 50,
+      "BaseHP": {
+        "Value": 285.12000000011176
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 142.56000000052154
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 97.20000000018626
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    },
+    "4": {
+      "EquipmentID": 23014,
+      "Promotion": 4,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 100000
+        },
+        {
+          "ItemID": 110113,
+          "ItemNum": 5
+        },
+        {
+          "ItemID": 113003,
+          "ItemNum": 6
+        }
+      ],
+      "WorldLevelRequire": 4,
+      "MaxLevel": 60,
+      "BaseHP": {
+        "Value": 369.6000000005588
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 184.80000000074506
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 126
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    },
+    "5": {
+      "EquipmentID": 23014,
+      "Promotion": 5,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 200000
+        },
+        {
+          "ItemID": 110113,
+          "ItemNum": 10
+        },
+        {
+          "ItemID": 113003,
+          "ItemNum": 8
+        }
+      ],
+      "WorldLevelRequire": 5,
+      "MaxLevel": 70,
+      "BaseHP": {
+        "Value": 454.0800000000745
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 227.04000000003725
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 154.80000000074506
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    },
+    "6": {
+      "EquipmentID": 23014,
+      "Promotion": 6,
+      "PromotionCostList": [],
+      "WorldLevelRequire": 5,
+      "MaxLevel": 80,
+      "BaseHP": {
+        "Value": 538.5600000005215
+      },
+      "BaseHPAdd": {
+        "Value": 7.920000000856817
+      },
+      "BaseAttack": {
+        "Value": 269.28000000026077
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 183.6000000005588
+      },
+      "BaseDefenceAdd": {
+        "Value": 2.700000000651926
+      }
+    }
+  },
   "23015": {
     "0": {
       "EquipmentID": 23015,
@@ -17820,6 +18071,257 @@
       }
     }
   },
+  "23016": {
+    "0": {
+      "EquipmentID": 23016,
+      "Promotion": 0,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 5000
+        },
+        {
+          "ItemID": 112001,
+          "ItemNum": 8
+        }
+      ],
+      "PlayerLevelRequire": 15,
+      "MaxLevel": 20,
+      "BaseHP": {
+        "Value": 48
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 26.40000000037253
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 21
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    },
+    "1": {
+      "EquipmentID": 23016,
+      "Promotion": 1,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 10000
+        },
+        {
+          "ItemID": 110121,
+          "ItemNum": 4
+        },
+        {
+          "ItemID": 112001,
+          "ItemNum": 12
+        }
+      ],
+      "WorldLevelRequire": 1,
+      "MaxLevel": 30,
+      "BaseHP": {
+        "Value": 105.6000000005588
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 58.080000000074506
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 46.200000000186265
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    },
+    "2": {
+      "EquipmentID": 23016,
+      "Promotion": 2,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 20000
+        },
+        {
+          "ItemID": 110122,
+          "ItemNum": 4
+        },
+        {
+          "ItemID": 112002,
+          "ItemNum": 8
+        }
+      ],
+      "WorldLevelRequire": 2,
+      "MaxLevel": 40,
+      "BaseHP": {
+        "Value": 182.40000000037253
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 100.32000000029802
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 79.80000000074506
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    },
+    "3": {
+      "EquipmentID": 23016,
+      "Promotion": 3,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 50000
+        },
+        {
+          "ItemID": 110122,
+          "ItemNum": 8
+        },
+        {
+          "ItemID": 112002,
+          "ItemNum": 12
+        }
+      ],
+      "WorldLevelRequire": 3,
+      "MaxLevel": 50,
+      "BaseHP": {
+        "Value": 259.20000000018626
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 142.56000000052154
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 113.40000000037253
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    },
+    "4": {
+      "EquipmentID": 23016,
+      "Promotion": 4,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 100000
+        },
+        {
+          "ItemID": 110123,
+          "ItemNum": 5
+        },
+        {
+          "ItemID": 112003,
+          "ItemNum": 6
+        }
+      ],
+      "WorldLevelRequire": 4,
+      "MaxLevel": 60,
+      "BaseHP": {
+        "Value": 336
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 184.80000000074506
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 147
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    },
+    "5": {
+      "EquipmentID": 23016,
+      "Promotion": 5,
+      "PromotionCostList": [
+        {
+          "ItemID": 2,
+          "ItemNum": 200000
+        },
+        {
+          "ItemID": 110123,
+          "ItemNum": 10
+        },
+        {
+          "ItemID": 112003,
+          "ItemNum": 8
+        }
+      ],
+      "WorldLevelRequire": 5,
+      "MaxLevel": 70,
+      "BaseHP": {
+        "Value": 412.80000000074506
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 227.04000000003725
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 180.6000000005588
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    },
+    "6": {
+      "EquipmentID": 23016,
+      "Promotion": 6,
+      "PromotionCostList": [],
+      "WorldLevelRequire": 5,
+      "MaxLevel": 80,
+      "BaseHP": {
+        "Value": 489.6000000005588
+      },
+      "BaseHPAdd": {
+        "Value": 7.2000000001862645
+      },
+      "BaseAttack": {
+        "Value": 269.28000000026077
+      },
+      "BaseAttackAdd": {
+        "Value": 3.9600000008940697
+      },
+      "BaseDefence": {
+        "Value": 214.20000000018626
+      },
+      "BaseDefenceAdd": {
+        "Value": 3.1500000001396984
+      }
+    }
+  },
   "24000": {
     "0": {
       "EquipmentID": 24000,

StarRailUID/utils/excel/light_cone_ranks.json

@@ -3388,6 +3388,75 @@
             ]
         ]
     },
+    "23014": {
+        "id": "23014",
+        "skill": "执此宵玉",
+        "desc": "使装备者的暴击伤害提高#1[i]%。当队友受到攻击或消耗生命值后，装备者获得1层【月蚀】，最多叠加#2[i]层。每层【月蚀】使装备者下一次攻击造成的伤害提高#3[f1]%。叠满#2[i]层时，额外使该次攻击无视目标#4[i]%的防御力。该效果在装备者施放攻击后解除。",
+        "params": [
+            [
+                0.2,
+                3,
+                0.14,
+                0.12
+            ],
+            [
+                0.23,
+                3,
+                0.165,
+                0.14
+            ],
+            [
+                0.26,
+                3,
+                0.19,
+                0.16
+            ],
+            [
+                0.29,
+                3,
+                0.215,
+                0.18
+            ],
+            [
+                0.32,
+                3,
+                0.24,
+                0.2
+            ]
+        ],
+        "properties": [
+            [
+                {
+                    "type": "CriticalDamageBase",
+                    "value": 0.2
+                }
+            ],
+            [
+                {
+                    "type": "CriticalDamageBase",
+                    "value": 0.23
+                }
+            ],
+            [
+                {
+                    "type": "CriticalDamageBase",
+                    "value": 0.26
+                }
+            ],
+            [
+                {
+                    "type": "CriticalDamageBase",
+                    "value": 0.29
+                }
+            ],
+            [
+                {
+                    "type": "CriticalDamageBase",
+                    "value": 0.32
+                }
+            ]
+        ]
+    },
     "23015": {
         "id": "23015",
         "skill": "抵死",
@@ -3462,6 +3531,75 @@
             ]
         ]
     },
+    "23016": {
+        "id": "23016",
+        "skill": "一个一个来",
+        "desc": "使装备者暴击率提高#1[i]%，追加攻击造成的伤害提高#2[i]%。装备者施放追加攻击后，使目标陷入【温驯】状态，该效果最多叠加#4[i]层。我方目标击中【温驯】状态下的敌方目标时，每层【温驯】使造成的暴击伤害提高#3[i]%。",
+        "params": [
+            [
+                0.18,
+                0.3,
+                0.12,
+                2
+            ],
+            [
+                0.21,
+                0.35,
+                0.14,
+                2
+            ],
+            [
+                0.24,
+                0.4,
+                0.16,
+                2
+            ],
+            [
+                0.27,
+                0.45,
+                0.18,
+                2
+            ],
+            [
+                0.3,
+                0.5,
+                0.2,
+                2
+            ]
+        ],
+        "properties": [
+            [
+                {
+                    "type": "CriticalChanceBase",
+                    "value": 0.18
+                }
+            ],
+            [
+                {
+                    "type": "CriticalChanceBase",
+                    "value": 0.21
+                }
+            ],
+            [
+                {
+                    "type": "CriticalChanceBase",
+                    "value": 0.24
+                }
+            ],
+            [
+                {
+                    "type": "CriticalChanceBase",
+                    "value": 0.27
+                }
+            ],
+            [
+                {
+                    "type": "CriticalChanceBase",
+                    "value": 0.3
+                }
+            ]
+        ]
+    },
     "24000": {
         "id": "24000",
         "skill": "扑火",
@@ -3657,7 +3795,7 @@
     "24003": {
         "id": "24003",
         "skill": "混沌灵药",
-        "desc": "使装备者的击破特攻提高#1[i]%。当装备者施放终结技时，使装备者造成的持续伤害提高#2[i]%，持续#3[i]回合。陷入装备者施加的持续伤害效果的敌方目标被消灭时，装备者恢复#4[i]点能量。",
+        "desc": "使装备者的击破特攻提高#1[i]%。当装备者施放终结技时，使装备者造成的持续伤害提高#2[i]%，持续#3[i]回合。陷入装备者施加的持续伤害效果的敌方目标被消灭时，装备者恢复#4[f1]点能量。",
         "params": [
             [
                 0.2,

StarRailUID/utils/map/data/EquipmentID2AbilityProperty_mapping_1.4.0.json

@@ -1729,6 +1729,48 @@
             }
         ]
     },
+    "23014": {
+        "1": [
+            {
+                "PropertyType": "CriticalDamageBase",
+                "Value": {
+                    "Value": 0.20000000018626451
+                }
+            }
+        ],
+        "2": [
+            {
+                "PropertyType": "CriticalDamageBase",
+                "Value": {
+                    "Value": 0.2300000002142042
+                }
+            }
+        ],
+        "3": [
+            {
+                "PropertyType": "CriticalDamageBase",
+                "Value": {
+                    "Value": 0.26000000024214387
+                }
+            }
+        ],
+        "4": [
+            {
+                "PropertyType": "CriticalDamageBase",
+                "Value": {
+                    "Value": 0.29000000027008355
+                }
+            }
+        ],
+        "5": [
+            {
+                "PropertyType": "CriticalDamageBase",
+                "Value": {
+                    "Value": 0.3200000002980232
+                }
+            }
+        ]
+    },
     "23015": {
         "1": [
             {
@@ -1771,6 +1813,48 @@
             }
         ]
     },
+    "23016": {
+        "1": [
+            {
+                "PropertyType": "CriticalChanceBase",
+                "Value": {
+                    "Value": 0.18000000016763806
+                }
+            }
+        ],
+        "2": [
+            {
+                "PropertyType": "CriticalChanceBase",
+                "Value": {
+                    "Value": 0.21000000019557774
+                }
+            }
+        ],
+        "3": [
+            {
+                "PropertyType": "CriticalChanceBase",
+                "Value": {
+                    "Value": 0.24000000022351742
+                }
+            }
+        ],
+        "4": [
+            {
+                "PropertyType": "CriticalChanceBase",
+                "Value": {
+                    "Value": 0.2700000002514571
+                }
+            }
+        ],
+        "5": [
+            {
+                "PropertyType": "CriticalChanceBase",
+                "Value": {
+                    "Value": 0.3000000002793968
+                }
+            }
+        ]
+    },
     "24000": {
         "1": [],
         "2": [],

StarRailUID/utils/map/data/EquipmentID2EnName_mapping_1.4.0.json

@@ -69,7 +69,9 @@
     "23011": "SheAlreadyShutHerEyes",
     "23012": "SleepLiketheDead",
     "23013": "TimeWaitsforNoOne",
+    "23014": "IShallBeMyOwnSword",
     "23015": "BrighterThantheSun",
+    "23016": "Worrisome,Blissful",
     "24000": "OntheFallofanAeon",
     "24001": "CruisingintheStellarSea",
     "24002": "TextureofMemories",

StarRailUID/utils/map/data/EquipmentID2Name_mapping_1.4.0.json

@@ -69,7 +69,9 @@
     "23011": "她已闭上双眼",
     "23012": "如泥酣眠",
     "23013": "时节不居",
+    "23014": "此身为剑",
     "23015": "比阳光更明亮的",
+    "23016": "烦恼着，幸福着",
     "24000": "记一位星神的陨落",
     "24001": "星海巡航",
     "24002": "记忆的质料",

StarRailUID/utils/map/data/EquipmentID2Rarity_mapping_1.4.0.json

@@ -70,7 +70,9 @@
     "23011": 5,
     "23012": 5,
     "23013": 5,
+    "23014": 5,
     "23015": 5,
+    "23016": 5,
     "24000": 5,
     "24001": 5,
     "24002": 5,

StarRailUID/utils/map/data/avatarId2DamageType_mapping_1.4.0.json

@@ -19,6 +19,7 @@
     "1109": "Fire",
     "1110": "Quantum",
     "1111": "Physical",
+    "1112": "Fire",
     "1201": "Quantum",
     "1202": "Thunder",
     "1203": "Imaginary",
@@ -28,7 +29,9 @@
     "1207": "Imaginary",
     "1208": "Quantum",
     "1209": "Ice",
+    "1210": "Fire",
     "1211": "Thunder",
+    "1212": "Ice",
     "1213": "Imaginary",
     "8001": "Physical",
     "8002": "Physical",

StarRailUID/utils/map/data/avatarId2EnName_mapping_1.4.0.json

@@ -19,6 +19,7 @@
     "1109": "Hook",
     "1110": "Lynx",
     "1111": "Luka",
+    "1112": "TopazandNumby",
     "1201": "Qingque",
     "1202": "Tingyun",
     "1203": "Luocha",
@@ -28,7 +29,9 @@
     "1207": "Yukong",
     "1208": "FuXuan",
     "1209": "Yanqing",
+    "1210": "Guinaifen",
     "1211": "Bailu",
+    "1212": "Jingliu",
     "1213": "DanHeng•ImbibitorLunae",
     "8001": "{NICKNAME}",
     "8002": "{NICKNAME}",

StarRailUID/utils/map/data/avatarId2Name_mapping_1.4.0.json

@@ -19,6 +19,7 @@
     "1109": "虎克",
     "1110": "玲可",
     "1111": "卢卡",
+    "1112": "托帕&账账",
     "1201": "青雀",
     "1202": "停云",
     "1203": "罗刹",
@@ -28,7 +29,9 @@
     "1207": "驭空",
     "1208": "符玄",
     "1209": "彦卿",
+    "1210": "桂乃芬",
     "1211": "白露",
+    "1212": "镜流",
     "1213": "丹恒•饮月",
     "8001": "开拓者",
     "8002": "开拓者",

StarRailUID/utils/map/data/avatarId2Rarity_mapping_1.4.0.json

@@ -19,6 +19,7 @@
     "1109": "4",
     "1110": "4",
     "1111": "4",
+    "1112": "5",
     "1201": "4",
     "1202": "4",
     "1203": "5",
@@ -28,7 +29,9 @@
     "1207": "4",
     "1208": "5",
     "1209": "5",
+    "1210": "4",
     "1211": "5",
+    "1212": "5",
     "1213": "5",
     "8001": "5",
     "8002": "5",

StarRailUID/utils/map/data/avatarId2Star_mapping_1.4.0.json

@@ -19,6 +19,7 @@
     "1109": "4",
     "1110": "4",
     "1111": "4",
+    "1112": "5",
     "1201": "4",
     "1202": "4",
     "1203": "5",
@@ -28,7 +29,9 @@
     "1207": "4",
     "1208": "5",
     "1209": "5",
+    "1210": "4",
     "1211": "5",
+    "1212": "5",
     "1213": "5",
     "8001": "5",
     "8002": "5",

StarRailUID/utils/map/data/avatarRankSkillUp_mapping_1.3.0.json

@@ -1,894 +0,0 @@
-{
-    "100101": [],
-    "100102": [],
-    "100103": [
-        {
-            "id": "100103",
-            "num": 2
-        },
-        {
-            "id": "100101",
-            "num": 1
-        }
-    ],
-    "100104": [],
-    "100105": [
-        {
-            "id": "100102",
-            "num": 2
-        },
-        {
-            "id": "100104",
-            "num": 2
-        }
-    ],
-    "100106": [],
-    "100201": [],
-    "100202": [],
-    "100203": [
-        {
-            "id": "100202",
-            "num": 2
-        },
-        {
-            "id": "100201",
-            "num": 1
-        }
-    ],
-    "100204": [],
-    "100205": [
-        {
-            "id": "100203",
-            "num": 2
-        },
-        {
-            "id": "100204",
-            "num": 2
-        }
-    ],
-    "100206": [],
-    "100301": [],
-    "100302": [],
-    "100303": [
-        {
-            "id": "100302",
-            "num": 2
-        },
-        {
-            "id": "100301",
-            "num": 1
-        }
-    ],
-    "100304": [],
-    "100305": [
-        {
-            "id": "100303",
-            "num": 2
-        },
-        {
-            "id": "100304",
-            "num": 2
-        }
-    ],
-    "100306": [],
-    "100401": [],
-    "100402": [],
-    "100403": [
-        {
-            "id": "100402",
-            "num": 2
-        },
-        {
-            "id": "100401",
-            "num": 1
-        }
-    ],
-    "100404": [],
-    "100405": [
-        {
-            "id": "100403",
-            "num": 2
-        },
-        {
-            "id": "100404",
-            "num": 2
-        }
-    ],
-    "100406": [],
-    "100501": [],
-    "100502": [],
-    "100503": [
-        {
-            "id": "100502",
-            "num": 2
-        },
-        {
-            "id": "100501",
-            "num": 1
-        }
-    ],
-    "100504": [],
-    "100505": [
-        {
-            "id": "100503",
-            "num": 2
-        },
-        {
-            "id": "100504",
-            "num": 2
-        }
-    ],
-    "100506": [],
-    "100601": [],
-    "100602": [],
-    "100603": [
-        {
-            "id": "100602",
-            "num": 2
-        },
-        {
-            "id": "100604",
-            "num": 2
-        }
-    ],
-    "100604": [],
-    "100605": [
-        {
-            "id": "100603",
-            "num": 2
-        },
-        {
-            "id": "100601",
-            "num": 1
-        }
-    ],
-    "100606": [],
-    "100801": [],
-    "100802": [],
-    "100803": [
-        {
-            "id": "100802",
-            "num": 2
-        },
-        {
-            "id": "100801",
-            "num": 1
-        }
-    ],
-    "100804": [],
-    "100805": [
-        {
-            "id": "100803",
-            "num": 2
-        },
-        {
-            "id": "100804",
-            "num": 2
-        }
-    ],
-    "100806": [],
-    "100901": [],
-    "100902": [],
-    "100903": [
-        {
-            "id": "100902",
-            "num": 2
-        },
-        {
-            "id": "100904",
-            "num": 2
-        }
-    ],
-    "100904": [],
-    "100905": [
-        {
-            "id": "100903",
-            "num": 2
-        },
-        {
-            "id": "100901",
-            "num": 1
-        }
-    ],
-    "100906": [],
-    "101301": [],
-    "101302": [],
-    "101303": [
-        {
-            "id": "101302",
-            "num": 2
-        },
-        {
-            "id": "101301",
-            "num": 1
-        }
-    ],
-    "101304": [],
-    "101305": [
-        {
-            "id": "101303",
-            "num": 2
-        },
-        {
-            "id": "101304",
-            "num": 2
-        }
-    ],
-    "101306": [],
-    "110101": [],
-    "110102": [],
-    "110103": [
-        {
-            "id": "110103",
-            "num": 2
-        },
-        {
-            "id": "110104",
-            "num": 2
-        }
-    ],
-    "110104": [],
-    "110105": [
-        {
-            "id": "110102",
-            "num": 2
-        },
-        {
-            "id": "110101",
-            "num": 1
-        }
-    ],
-    "110106": [],
-    "110201": [],
-    "110202": [],
-    "110203": [
-        {
-            "id": "110202",
-            "num": 2
-        },
-        {
-            "id": "110204",
-            "num": 2
-        }
-    ],
-    "110204": [],
-    "110205": [
-        {
-            "id": "110203",
-            "num": 2
-        },
-        {
-            "id": "110201",
-            "num": 1
-        }
-    ],
-    "110206": [],
-    "110301": [],
-    "110302": [],
-    "110303": [
-        {
-            "id": "110302",
-            "num": 2
-        },
-        {
-            "id": "110301",
-            "num": 1
-        }
-    ],
-    "110304": [],
-    "110305": [
-        {
-            "id": "110303",
-            "num": 2
-        },
-        {
-            "id": "110304",
-            "num": 2
-        }
-    ],
-    "110306": [],
-    "110401": [],
-    "110402": [],
-    "110403": [
-        {
-            "id": "110403",
-            "num": 2
-        },
-        {
-            "id": "110404",
-            "num": 2
-        }
-    ],
-    "110404": [],
-    "110405": [
-        {
-            "id": "110402",
-            "num": 2
-        },
-        {
-            "id": "110401",
-            "num": 1
-        }
-    ],
-    "110406": [],
-    "110501": [],
-    "110502": [],
-    "110503": [
-        {
-            "id": "110502",
-            "num": 2
-        },
-        {
-            "id": "110501",
-            "num": 1
-        }
-    ],
-    "110504": [],
-    "110505": [
-        {
-            "id": "110503",
-            "num": 2
-        },
-        {
-            "id": "110504",
-            "num": 2
-        }
-    ],
-    "110506": [],
-    "110601": [],
-    "110602": [],
-    "110603": [
-        {
-            "id": "110602",
-            "num": 2
-        },
-        {
-            "id": "110601",
-            "num": 1
-        }
-    ],
-    "110604": [],
-    "110605": [
-        {
-            "id": "110603",
-            "num": 2
-        },
-        {
-            "id": "110604",
-            "num": 2
-        }
-    ],
-    "110606": [],
-    "110701": [],
-    "110702": [],
-    "110703": [
-        {
-            "id": "110702",
-            "num": 2
-        },
-        {
-            "id": "110701",
-            "num": 1
-        }
-    ],
-    "110704": [],
-    "110705": [
-        {
-            "id": "110703",
-            "num": 2
-        },
-        {
-            "id": "110704",
-            "num": 2
-        }
-    ],
-    "110706": [],
-    "110801": [],
-    "110802": [],
-    "110803": [
-        {
-            "id": "110802",
-            "num": 2
-        },
-        {
-            "id": "110801",
-            "num": 1
-        }
-    ],
-    "110804": [],
-    "110805": [
-        {
-            "id": "110803",
-            "num": 2
-        },
-        {
-            "id": "110804",
-            "num": 2
-        }
-    ],
-    "110806": [],
-    "110901": [],
-    "110902": [],
-    "110903": [
-        {
-            "id": "110902",
-            "num": 2
-        },
-        {
-            "id": "110901",
-            "num": 1
-        },
-        {
-            "id": "110909",
-            "num": 2
-        }
-    ],
-    "110904": [],
-    "110905": [
-        {
-            "id": "110903",
-            "num": 2
-        },
-        {
-            "id": "110904",
-            "num": 2
-        }
-    ],
-    "110906": [],
-    "111001": [],
-    "111002": [],
-    "111003": [
-        {
-            "id": "111002",
-            "num": 2
-        },
-        {
-            "id": "111001",
-            "num": 1
-        }
-    ],
-    "111004": [],
-    "111005": [
-        {
-            "id": "111003",
-            "num": 2
-        },
-        {
-            "id": "111004",
-            "num": 2
-        }
-    ],
-    "111006": [],
-    "111101": [],
-    "111102": [],
-    "111103": [
-        {
-            "id": "111102",
-            "num": 2
-        },
-        {
-            "id": "111104",
-            "num": 2
-        }
-    ],
-    "111104": [],
-    "111105": [
-        {
-            "id": "111103",
-            "num": 2
-        },
-        {
-            "id": "111101",
-            "num": 1
-        },
-        {
-            "id": "111108",
-            "num": 1
-        }
-    ],
-    "111106": [],
-    "120101": [],
-    "120102": [],
-    "120103": [
-        {
-            "id": "120103",
-            "num": 2
-        },
-        {
-            "id": "120104",
-            "num": 2
-        }
-    ],
-    "120104": [],
-    "120105": [
-        {
-            "id": "120102",
-            "num": 2
-        },
-        {
-            "id": "120101",
-            "num": 1
-        },
-        {
-            "id": "120108",
-            "num": 1
-        }
-    ],
-    "120106": [],
-    "120201": [],
-    "120202": [],
-    "120203": [
-        {
-            "id": "120203",
-            "num": 2
-        },
-        {
-            "id": "120201",
-            "num": 1
-        }
-    ],
-    "120204": [],
-    "120205": [
-        {
-            "id": "120202",
-            "num": 2
-        },
-        {
-            "id": "120204",
-            "num": 2
-        }
-    ],
-    "120206": [],
-    "120301": [],
-    "120302": [],
-    "120303": [
-        {
-            "id": "120302",
-            "num": 2
-        },
-        {
-            "id": "120301",
-            "num": 1
-        }
-    ],
-    "120304": [],
-    "120305": [
-        {
-            "id": "120303",
-            "num": 2
-        },
-        {
-            "id": "120304",
-            "num": 2
-        }
-    ],
-    "120306": [],
-    "120401": [],
-    "120402": [],
-    "120403": [
-        {
-            "id": "120403",
-            "num": 2
-        },
-        {
-            "id": "120401",
-            "num": 1
-        }
-    ],
-    "120404": [],
-    "120405": [
-        {
-            "id": "120402",
-            "num": 2
-        },
-        {
-            "id": "120404",
-            "num": 2
-        }
-    ],
-    "120406": [],
-    "120501": [],
-    "120502": [],
-    "120503": [
-        {
-            "id": "120503",
-            "num": 2
-        },
-        {
-            "id": "120504",
-            "num": 2
-        }
-    ],
-    "120504": [],
-    "120505": [
-        {
-            "id": "120502",
-            "num": 2
-        },
-        {
-            "id": "120501",
-            "num": 1
-        },
-        {
-            "id": "120508",
-            "num": 1
-        }
-    ],
-    "120506": [],
-    "120601": [],
-    "120602": [],
-    "120603": [
-        {
-            "id": "120603",
-            "num": 2
-        },
-        {
-            "id": "120604",
-            "num": 2
-        }
-    ],
-    "120604": [],
-    "120605": [
-        {
-            "id": "120602",
-            "num": 2
-        },
-        {
-            "id": "120601",
-            "num": 1
-        }
-    ],
-    "120606": [],
-    "120701": [],
-    "120702": [],
-    "120703": [
-        {
-            "id": "120702",
-            "num": 2
-        },
-        {
-            "id": "120701",
-            "num": 1
-        }
-    ],
-    "120704": [],
-    "120705": [
-        {
-            "id": "120703",
-            "num": 2
-        },
-        {
-            "id": "120704",
-            "num": 2
-        }
-    ],
-    "120706": [],
-    "120801": [],
-    "120802": [],
-    "120803": [
-        {
-            "id": "120802",
-            "num": 2
-        },
-        {
-            "id": "120804",
-            "num": 2
-        }
-    ],
-    "120804": [],
-    "120805": [
-        {
-            "id": "120803",
-            "num": 2
-        },
-        {
-            "id": "120801",
-            "num": 1
-        }
-    ],
-    "120806": [],
-    "120901": [],
-    "120902": [],
-    "120903": [
-        {
-            "id": "120902",
-            "num": 2
-        },
-        {
-            "id": "120901",
-            "num": 1
-        }
-    ],
-    "120904": [],
-    "120905": [
-        {
-            "id": "120903",
-            "num": 2
-        },
-        {
-            "id": "120904",
-            "num": 2
-        }
-    ],
-    "120906": [],
-    "121101": [],
-    "121102": [],
-    "121103": [
-        {
-            "id": "121102",
-            "num": 2
-        },
-        {
-            "id": "121104",
-            "num": 2
-        }
-    ],
-    "121104": [],
-    "121105": [
-        {
-            "id": "121103",
-            "num": 2
-        },
-        {
-            "id": "121101",
-            "num": 1
-        }
-    ],
-    "121106": [],
-    "121301": [],
-    "121302": [],
-    "121303": [
-        {
-            "id": "121302",
-            "num": 2
-        },
-        {
-            "id": "121301",
-            "num": 1
-        },
-        {
-            "id": "121308",
-            "num": 1
-        },
-        {
-            "id": "121310",
-            "num": 1
-        },
-        {
-            "id": "121312",
-            "num": 1
-        }
-    ],
-    "121304": [],
-    "121305": [
-        {
-            "id": "121303",
-            "num": 2
-        },
-        {
-            "id": "121304",
-            "num": 2
-        }
-    ],
-    "121306": [],
-    "800101": [],
-    "800102": [],
-    "800103": [
-        {
-            "id": "800102",
-            "num": 2
-        },
-        {
-            "id": "800104",
-            "num": 2
-        }
-    ],
-    "800104": [],
-    "800105": [
-        {
-            "id": "800103",
-            "num": 2
-        },
-        {
-            "id": "800101",
-            "num": 1
-        },
-        {
-            "id": "800108",
-            "num": 2
-        },
-        {
-            "id": "800109",
-            "num": 2
-        }
-    ],
-    "800106": [],
-    "800201": [],
-    "800202": [],
-    "800203": [
-        {
-            "id": "800202",
-            "num": 2
-        },
-        {
-            "id": "800204",
-            "num": 2
-        }
-    ],
-    "800204": [],
-    "800205": [
-        {
-            "id": "800203",
-            "num": 2
-        },
-        {
-            "id": "800201",
-            "num": 1
-        },
-        {
-            "id": "800208",
-            "num": 2
-        },
-        {
-            "id": "800209",
-            "num": 2
-        }
-    ],
-    "800206": [],
-    "800301": [],
-    "800302": [],
-    "800303": [
-        {
-            "id": "800302",
-            "num": 2
-        },
-        {
-            "id": "800304",
-            "num": 2
-        }
-    ],
-    "800304": [],
-    "800305": [
-        {
-            "id": "800303",
-            "num": 2
-        },
-        {
-            "id": "800301",
-            "num": 1
-        },
-        {
-            "id": "800308",
-            "num": 1
-        }
-    ],
-    "800306": [],
-    "800401": [],
-    "800402": [],
-    "800403": [
-        {
-            "id": "800402",
-            "num": 2
-        },
-        {
-            "id": "800404",
-            "num": 2
-        }
-    ],
-    "800404": [],
-    "800405": [
-        {
-            "id": "800403",
-            "num": 2
-        },
-        {
-            "id": "800401",
-            "num": 1
-        },
-        {
-            "id": "800408",
-            "num": 1
-        }
-    ],
-    "800406": []
-}

StarRailUID/utils/map/data/rankId2Name_mapping_1.4.0.json

@@ -119,6 +119,12 @@
     "111104": "百折不回",
     "111105": "地火之魂",
     "111106": "冠军应得的喝彩",
+    "111201": "未来市场",
+    "111202": "善意收购",
+    "111203": "抓大放小",
+    "111204": "敏捷处理",
+    "111205": "需求膨胀",
+    "111206": "激励机制",
     "120101": "散勇化骁摸幺鱼",
     "120102": "棋枰作枕好入眠",
     "120103": "观琼视茕门前清",
@@ -173,12 +179,24 @@
     "120904": "霜厉",
     "120905": "武骨",
     "120906": "自在",
+    "121001": "倒立吃面条",
+    "121002": "刷牙吹口哨",
+    "121003": "胸口碎大石",
+    "121004": "金枪锁咽喉",
+    "121005": "吞剑通脊背",
+    "121006": "徒手接子弹",
     "121101": "百脉甘津宁神久",
     "121102": "壶中洞天云螭眠",
     "121103": "掌间乾坤便通玄",
     "121104": "肘后备急除外障",
     "121105": "方定一倾浣俗尘",
     "121106": "龙漦吐哺胜金丹",
+    "121201": "月犯天关",
+    "121202": "朔晕七星",
+    "121203": "半璧迫望",
+    "121204": "持秉玄烛",
+    "121205": "晦入三台",
+    "121206": "蚀变于娄",
     "121301": "萦天",
     "121302": "九斿",
     "121303": "云旂",

StarRailUID/utils/map/data/skillId2AttackType_mapping_1.4.0.json

@@ -76,18 +76,18 @@
     "110504": "",
     "110506": "MazeNormal",
     "110601": "Normal",
+    "110602": "BPSkill",
     "110604": "",
     "110606": "MazeNormal",
     "110607": "Maze",
     "110701": "Normal",
+    "110702": "BPSkill",
     "110703": "Ultra",
     "110704": "",
     "110706": "MazeNormal",
     "110707": "Maze",
     "110801": "Normal",
     "110802": "BPSkill",
-    "110803": "Ultra",
-    "110804": "",
     "110806": "MazeNormal",
     "110807": "Maze",
     "110901": "Normal",
@@ -98,29 +98,22 @@
     "110907": "Maze",
     "110909": "BPSkill",
     "111001": "Normal",
+    "111002": "BPSkill",
     "111003": "Ultra",
     "111004": "",
     "111006": "MazeNormal",
     "111007": "Maze",
     "111101": "Normal",
     "111108": "Normal",
-    "111102": "BPSkill",
     "111103": "Ultra",
-    "111104": "",
     "111106": "MazeNormal",
-    "111107": "Maze",
     "120101": "Normal",
     "120108": "Normal",
-    "120102": "BPSkill",
     "120103": "Ultra",
-    "120104": "",
     "120106": "MazeNormal",
     "120107": "Maze",
     "120201": "Normal",
-    "120203": "Ultra",
-    "120204": "",
     "120206": "MazeNormal",
-    "120207": "Maze",
     "120301": "Normal",
     "120306": "MazeNormal",
     "120307": "Maze",
@@ -132,8 +125,6 @@
     "120506": "MazeNormal",
     "120507": "Maze",
     "120601": "Normal",
-    "120602": "BPSkill",
-    "120603": "Ultra",
     "120604": "",
     "120606": "MazeNormal",
     "120607": "Maze",
@@ -143,15 +134,24 @@
     "120704": "",
     "120706": "MazeNormal",
     "120707": "Maze",
+    "120801": "Normal",
+    "120802": "BPSkill",
     "120803": "Ultra",
     "120804": "",
     "120806": "MazeNormal",
+    "120807": "Maze",
     "120901": "Normal",
     "120902": "BPSkill",
     "120903": "Ultra",
     "120904": "",
     "120906": "MazeNormal",
     "120907": "Maze",
+    "121001": "Normal",
+    "121002": "BPSkill",
+    "121003": "Ultra",
+    "121004": "",
+    "121006": "MazeNormal",
+    "121007": "Maze",
     "121101": "Normal",
     "121102": "BPSkill",
     "121103": "Ultra",
@@ -162,6 +162,8 @@
     "121308": "Normal",
     "121310": "Normal",
     "121312": "Normal",
+    "121302": "BPSkill",
+    "121303": "Ultra",
     "121304": "",
     "121306": "MazeNormal",
     "121307": "Maze",
@@ -208,20 +210,37 @@
     "120406": "MazeNormal",
     "120407": "Maze",
     "909807": "Maze",
-    "120202": "BPSkill",
+    "110603": "Ultra",
     "110507": "Maze",
     "120302": "BPSkill",
+    "111201": "Normal",
+    "111206": "MazeNormal",
+    "111207": "Maze",
     "120303": "Ultra",
+    "120304": "",
     "100102": "BPSkill",
     "121309": "BPSkill",
-    "110702": "BPSkill",
+    "110803": "Ultra",
-    "110602": "BPSkill",
+    "110804": "",
-    "110603": "Ultra",
+    "111102": "BPSkill",
-    "121303": "Ultra",
+    "111104": "",
-    "120801": "Normal",
+    "111107": "Maze",
-    "121302": "BPSkill",
+    "120202": "BPSkill",
-    "120807": "Maze",
+    "120203": "Ultra",
-    "111002": "BPSkill",
+    "120204": "",
-    "120304": "",
+    "120207": "Maze",
-    "120802": "BPSkill"
+    "120102": "BPSkill",
+    "120104": "",
+    "120602": "BPSkill",
+    "120603": "Ultra",
+    "111202": "BPSkill",
+    "111203": "Ultra",
+    "111204": "",
+    "121203": "Ultra",
+    "121204": "",
+    "121202": "BPSkill",
+    "121201": "Normal",
+    "121209": "BPSkill",
+    "121206": "MazeNormal",
+    "121207": "Maze"
 }

StarRailUID/utils/map/data/skillId2Name_mapping_1.4.0.json

@@ -76,18 +76,18 @@
     "110504": "生机焕发",
     "110506": "攻击",
     "110601": "冰点射击",
+    "110602": "低温妨害",
     "110604": "数据采集",
     "110606": "攻击",
     "110607": "先发制人",
     "110701": "我也想帮上忙",
+    "110702": "史瓦罗在看着你",
     "110703": "是约定不是命令",
     "110704": "因为我们是家人",
     "110706": "攻击",
     "110707": "胜利的小小代价",
     "110801": "酷炫的刀花",
     "110802": "反复横跳的爱",
-    "110803": "惊喜礼盒",
-    "110804": "撕风的匕首",
     "110806": "攻击",
     "110807": "你最闪亮",
     "110901": "喂！小心火烛",
@@ -98,29 +98,22 @@
     "110907": "哎！瞧这一团糟",
     "110909": "嘿！记得虎克吗",
     "111001": "冰攀前齿技术",
+    "111002": "盐渍野营罐头",
     "111003": "雪原急救方案",
     "111004": "户外生存经验",
     "111006": "攻击",
     "111007": "巧克力能量棒",
     "111101": "直冲拳",
     "111108": "直冲碎天拳",
-    "111102": "裂伤拳",
     "111103": "制胜一击",
-    "111104": "火花四溅",
     "111106": "攻击",
-    "111107": "抢先者",
     "120101": "门前清",
     "120108": "杠上开花！",
-    "120102": "海底捞月",
     "120103": "四幺暗刻？和！",
-    "120104": "帝垣琼玉",
     "120106": "攻击",
     "120107": "独弈之乐",
     "120201": "逐客令",
-    "120203": "庆云光覆仪祷",
-    "120204": "紫电扶摇",
     "120206": "攻击",
-    "120207": "惠风和畅",
     "120301": "黑渊的棘刺",
     "120306": "攻击",
     "120307": "愚者的悲悯",
@@ -132,8 +125,6 @@
     "120506": "攻击",
     "120507": "业途风",
     "120601": "云骑剑经 • 素霓",
-    "120602": "云骑剑经 • 山倾",
-    "120603": "太虚形蕴 • 烛夜",
     "120604": "游刃若水",
     "120606": "攻击",
     "120607": "云骑剑经 • 叩阵",
@@ -143,15 +134,24 @@
     "120704": "箭彻七札",
     "120706": "攻击",
     "120707": "云鸢逐风",
+    "120801": "始击岁星",
+    "120802": "太微行棋，灵台示影",
     "120803": "天律大衍，历劫归一",
     "120804": "乾清坤夷，否极泰来",
     "120806": "攻击",
+    "120807": "岁记否泰，固守四郭",
     "120901": "霜锋点寒芒",
     "120902": "遥击三尺水",
     "120903": "快雨燕相逐",
     "120904": "呼剑如影",
     "120906": "攻击",
     "120907": "御剑真诀",
+    "121001": "劈头满堂彩",
+    "121002": "迎面开门红",
+    "121003": "给您来段看家戏",
+    "121004": "古来君子养艺人",
+    "121006": "攻击",
+    "121007": "耍耍把式卖卖艺",
     "121101": "望 、闻、问…蹴！",
     "121102": "云吟乍涌坠珠露",
     "121103": "匏蛟跃渊先雷音",
@@ -162,6 +162,8 @@
     "121308": "瞬华",
     "121310": "天矢阴",
     "121312": "盘拏耀跃",
+    "121302": "龙力自在",
+    "121303": "苍龙傲睨，劫水濯世",
     "121304": "亢心",
     "121306": "攻击",
     "121307": "掣空如虹",
@@ -208,20 +210,37 @@
     "120406": "攻击",
     "120407": "摄召威灵",
     "909807": "dev_秘技",
-    "120202": "祥音和韵",
+    "110603": "领域压制",
     "110507": "催眠研习",
     "120302": "白花的祈望",
+    "111201": "赤字…",
+    "111206": "攻击",
+    "111207": "明补",
     "120303": "归葬的遂愿",
+    "120304": "生息的轮转",
     "100102": "可爱即是正义",
     "121309": "取消",
-    "110702": "史瓦罗在看着你",
+    "110803": "惊喜礼盒",
-    "110602": "低温妨害",
+    "110804": "撕风的匕首",
-    "110603": "领域压制",
+    "111102": "裂伤拳",
-    "121303": "苍龙傲睨，劫水濯世",
+    "111104": "火花四溅",
-    "120801": "始击岁星",
+    "111107": "抢先者",
-    "121302": "龙力自在",
+    "120202": "祥音和韵",
-    "120807": "岁记否泰，固守四郭",
+    "120203": "庆云光覆仪祷",
-    "111002": "盐渍野营罐头",
+    "120204": "紫电扶摇",
-    "120304": "生息的轮转",
+    "120207": "惠风和畅",
-    "120802": "太微行棋，灵台示影"
+    "120102": "海底捞月",
+    "120104": "帝垣琼玉",
+    "120602": "云骑剑经 • 山倾",
+    "120603": "太虚形蕴 • 烛夜",
+    "111202": "支付困难？",
+    "111203": "扭亏为盈！",
+    "111204": "猪市？！",
+    "121203": "昙华生灭，天河泻梦",
+    "121204": "澹月转魄",
+    "121202": "无罅飞光",
+    "121201": "流影方晖",
+    "121209": "寒川映月",
+    "121206": "攻击",
+    "121207": "古镜照神"
 }

StarRailUID/utils/map/data/skillId2Type_mapping_1.4.0.json

@@ -76,18 +76,18 @@
     "110504": "强化",
     "110506": "",
     "110601": "单攻",
+    "110602": "妨害",
     "110604": "辅助",
     "110606": "",
     "110607": "",
     "110701": "单攻",
+    "110702": "群攻",
     "110703": "强化",
     "110704": "单攻",
     "110706": "",
     "110707": "",
     "110801": "单攻",
     "110802": "弹射",
-    "110803": "妨害",
-    "110804": "强化",
     "110806": "",
     "110807": "妨害",
     "110901": "单攻",
@@ -98,29 +98,22 @@
     "110907": "",
     "110909": "扩散",
     "111001": "单攻",
+    "111002": "回复",
     "111003": "回复",
     "111004": "回复",
     "111006": "单攻",
     "111007": "回复",
     "111101": "单攻",
     "111108": "单攻",
-    "111102": "单攻",
     "111103": "单攻",
-    "111104": "强化",
     "111106": "",
-    "111107": "",
     "120101": "单攻",
     "120108": "扩散",
-    "120102": "强化",
     "120103": "群攻",
-    "120104": "强化",
     "120106": "",
     "120107": "强化",
     "120201": "单攻",
-    "120203": "辅助",
-    "120204": "强化",
     "120206": "",
-    "120207": "辅助",
     "120301": "单攻",
     "120306": "",
     "120307": "回复",
@@ -132,8 +125,6 @@
     "120506": "",
     "120507": "",
     "120601": "单攻",
-    "120602": "单攻",
-    "120603": "单攻",
     "120604": "强化",
     "120606": "",
     "120607": "",
@@ -143,15 +134,24 @@
     "120704": "强化",
     "120706": "",
     "120707": "强化",
+    "120801": "单攻",
+    "120802": "防御",
     "120803": "群攻",
     "120804": "回复",
     "120806": "",
+    "120807": "防御",
     "120901": "单攻",
     "120902": "单攻",
     "120903": "单攻",
     "120904": "单攻",
     "120906": "",
     "120907": "强化",
+    "121001": "单攻",
+    "121002": "扩散",
+    "121003": "群攻",
+    "121004": "妨害",
+    "121006": "",
+    "121007": "",
     "121101": "单攻",
     "121102": "回复",
     "121103": "回复",
@@ -162,6 +162,8 @@
     "121308": "单攻",
     "121310": "扩散",
     "121312": "扩散",
+    "121302": "强化",
+    "121303": "扩散",
     "121304": "强化",
     "121306": "",
     "121307": "强化",
@@ -208,20 +210,37 @@
     "120406": "",
     "120407": "强化",
     "909807": "回复",
-    "120202": "辅助",
+    "110603": "妨害",
     "110507": "",
     "120302": "回复",
+    "111201": "单攻",
+    "111206": "",
+    "111207": "强化",
     "120303": "群攻",
+    "120304": "回复",
     "100102": "防御",
     "121309": "取消",
-    "110702": "群攻",
+    "110803": "妨害",
-    "110602": "妨害",
+    "110804": "强化",
-    "110603": "妨害",
+    "111102": "单攻",
-    "121303": "扩散",
+    "111104": "强化",
-    "120801": "单攻",
+    "111107": "",
-    "121302": "强化",
+    "120202": "辅助",
-    "120807": "防御",
+    "120203": "辅助",
-    "111002": "回复",
+    "120204": "强化",
-    "120304": "回复",
+    "120207": "辅助",
-    "120802": "防御"
+    "120102": "强化",
+    "120104": "强化",
+    "120602": "单攻",
+    "120603": "单攻",
+    "111202": "单攻",
+    "111203": "强化",
+    "111204": "单攻",
+    "121203": "扩散",
+    "121204": "强化",
+    "121202": "单攻",
+    "121201": "单攻",
+    "121209": "扩散",
+    "121206": "",
+    "121207": "妨害"
 }

StarRailUID/utils/map/name_covert.py

@@ -1,12 +1,20 @@
 from .SR_MAP_PATH import (
-    EquipmentID2Name,
     EquipmentID2EnName,
+    EquipmentID2Name,
+    SetId2Name,
     alias_data,
     avatarId2Name,
     avatarId2Rarity,
 )
 
 
+async def name_to_relic_set_id(name: str):
+    for set_name in SetId2Name:
+        if set_name == name:
+            return SetId2Name[set_name]
+    return None
+
+
 async def avatar_id_to_name(avatar_id: str) -> str:
     return avatarId2Name[avatar_id]
 

StarRailUID/utils/resource/RESOURCE_PATH.py

@@ -23,13 +23,13 @@ SKILL_PATH = RESOURCE_PATH / 'skill'
 TEMP_PATH = RESOURCE_PATH / 'temp'
 CHAR_PREVIEW_PATH = RESOURCE_PATH / 'character_preview'
 
-WIKI_LIGHT_CONE_PATH = WIKI_PATH / 'lightcone'
+WIKI_LIGHT_CONE_PATH = WIKI_PATH / 'light_cone'
-WIKI_MATERIAL_FOR_ROLE = WIKI_PATH / 'material for role'
+WIKI_MATERIAL_FOR_ROLE = WIKI_PATH / 'character_material'
-WIKI_RELIC_PATH = WIKI_PATH / 'relic'
+WIKI_RELIC_PATH = WIKI_PATH / 'relic_set'
-WIKI_ROLE_PATH = WIKI_PATH / 'role'
+WIKI_ROLE_PATH = WIKI_PATH / 'character_overview'
 
-GUIDE_LIGHT_CONE_PATH = GUIDE_PATH / 'lightcone'
+GUIDE_LIGHT_CONE_PATH = GUIDE_PATH / 'light_cone'
-GUIDE_CHARACTER_PATH = GUIDE_PATH / 'character'
+GUIDE_CHARACTER_PATH = GUIDE_PATH / 'character_overview'
 
 TEXT2D_PATH = Path(__file__).parent / 'texture2d'
 

StarRailUID/version.py

@@ -1,2 +1,2 @@
 StarRailUID_version = '0.1.0'
-StarRail_version = '1.3.0'
+StarRail_version = '1.4.0'