Skip to content

Commit

Permalink
🐛 使用米游社更新面板时, 技能等级错误
Browse files Browse the repository at this point in the history
  • Loading branch information
KimigaiiWuyi committed Aug 28, 2024
1 parent 5162e85 commit 8218c63
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 12 deletions.
16 changes: 16 additions & 0 deletions GenshinUID/genshinuid_enka/effect/skill_add.json
Original file line number Diff line number Diff line change
Expand Up @@ -326,5 +326,21 @@
"克洛琳德": [
"E",
"Q"
],
"艾梅莉埃": [
"E",
"Q"
],
"玛拉妮": [
"E",
"Q"
],
"基尼奇": [
"E",
"Q"
],
"卡齐娜": [
"E",
"Q"
]
}
23 changes: 23 additions & 0 deletions GenshinUID/genshinuid_enka/effect/value_attr.json
Original file line number Diff line number Diff line change
Expand Up @@ -451,5 +451,28 @@
"暴击率",
"暴击伤害",
"元素精通"
],
"艾梅莉埃": [
"元素精通",
"元素充能效率",
"攻击力",
"暴击率",
"暴击伤害"
],
"玛拉妮": [
"攻击力",
"暴击率",
"暴击伤害"
],
"基尼奇": [
"元素精通",
"攻击力",
"暴击率",
"暴击伤害"
],
"卡齐娜": [
"防御力",
"暴击率",
"暴击伤害"
]
}
54 changes: 42 additions & 12 deletions GenshinUID/genshinuid_enka/to_data_by_mys.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from .to_card import pic_500, draw_enka_card
from ..utils.image.convert import convert_img
from .etc.MAP_PATH import avatarName2SkillAdd
from ..utils.mys_api import mys_api, get_base_data
from ..utils.map.name_covert import avatarId_to_enName
from ..utils.resource.RESOURCE_PATH import PLAYER_PATH
Expand Down Expand Up @@ -77,30 +78,59 @@ async def mys_to_data(uid: str):
avatar_fight_prop = {}
weapon_info = {}

for talent in char['constellations']:
if talent['is_actived']:
talent_id = talent['id']
avatar_talent.append(
{
"talentId": talent_id,
"talentName": talent['name'],
"talentIcon": talent_icon_map[str(talent_id)],
}
)

if avatar_name in avatarName2SkillAdd:
skill_add = avatarName2SkillAdd[avatar_name]
else:
skill_add = ['E', 'Q']

a_skill_level, e_skill_level, q_skill_level = 0, 0, 0
for skillAdd_index in range(0, 2):
if len(avatar_talent) >= 3 + skillAdd_index * 2:
if skill_add[skillAdd_index] == 'E':
e_skill_level = 3
elif skill_add[skillAdd_index] == 'Q':
q_skill_level = 3
elif skill_add[skillAdd_index] == 'A':
a_skill_level = 3

n = 0
for skill in char['skills']:
skill_id = str(skill['skill_id'])
if len(skill_id) <= 4:
continue
skill_icon = skill_icon_map[skill_id]
if skill_id.endswith('3') and skill_icon.endswith('2'):
continue
n += 1
skill_level = skill['level']

if n == 1:
skill_level -= a_skill_level
elif n == 2:
skill_level -= e_skill_level
elif n == 3:
skill_level -= q_skill_level

avatar_skill.append(
{
"skillId": skill_id,
"skillName": skill['name'],
"skillLevel": skill['level'],
"skillLevel": skill_level,
"skillIcon": skill_icon_map[skill_id],
}
)

for talent in char['constellations']:
if talent['is_actived']:
talent_id = talent['id']
avatar_talent.append(
{
"talentId": talent_id,
"talentName": talent['name'],
"talentIcon": talent_icon_map[str(talent_id)],
}
)

weapon = char['weapon']
weapon_main = weapon['main_property']
main_prop_id = Id2PropId[str(weapon_main['property_type'])]
Expand Down
3 changes: 3 additions & 0 deletions GenshinUID/utils/map/data/char_alias.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"旅行者冰": [
"冰主"
],
"旅行者火": [
"火主"
],
"旅行者": [
"主角",
"卑鄙的外乡人",
Expand Down

0 comments on commit 8218c63

Please sign in to comment.