🐛 bug fix

This commit is contained in:
qwerdvd 2023-09-07 15:26:51 +08:00
parent 3969c10cf1
commit e5d898b8f5
6 changed files with 919 additions and 19 deletions

View File

@ -81,11 +81,11 @@ class DamageInstance:
rank=char.char_rank,
element=char.char_element,
promotion=char.char_promotion,
attribute_bonus=msgspec.from_builtins(
attribute_bonus=msgspec.convert(
char.attribute_bonus,
Union[List[DamageInstanceAvatarAttributeBouns], None],
),
extra_ability=msgspec.from_builtins(
extra_ability=msgspec.convert(
char.extra_ability, Union[List, None]
),
)
@ -98,10 +98,10 @@ class DamageInstance:
self.relic = []
for relic in char.char_relic:
self.relic.append(
msgspec.from_builtins(relic, DamageInstanceRelic)
msgspec.convert(relic, DamageInstanceRelic)
)
self.skill = []
for skill in char.char_skill:
self.skill.append(
msgspec.from_builtins(skill, DamageInstanceSkill)
msgspec.convert(skill, DamageInstanceSkill)
)

View File

@ -412,7 +412,7 @@ class RoleInstance:
attack_tz = (
attr_value_tz
+ attr_value_tz
* (1 + self.attribute_bonus['AttackAddedRatio'] + 2.144)
* (1 + self.attribute_bonus.get('AttackAddedRatio', 0) + 2.144)
+ self.attribute_bonus['AttackDelta']
)
if self.raw_data.avatar.id_ == 1205:

View File

@ -11,6 +11,7 @@ from ..sruid_utils.api.mihomo.requests import get_char_card_info
from ..utils.error_reply import UID_HINT
from ..utils.excel.read_excel import AvatarPromotion, EquipmentPromotion
from ..utils.map.SR_MAP_PATH import (
AvatarRankSkillUp,
EquipmentID2Name,
EquipmentID2Rarity,
ItemId2Name,
@ -232,23 +233,20 @@ async def get_data(char: Avatar, sr_data: MihomoData, sr_uid: str):
char_data['rankList'] = rank_temp
# 处理命座中的 level_up_skills
level_up_skills = []
if char_data.get('rankList'):
for rank_item in char_data['rankList']:
rank_id = rank_item['rankId']
# 121303 -> 1213003
behavior_id = str(rank_id)[0:5] + '0' + str(rank_id)[-1]
char_skill_tree_data = characterSkillTree[str(char['avatarId'])].get(behavior_id, [])
if char_skill_tree_data != [] and char_skill_tree_data['level_up_skills'] != []:
for skill in char_skill_tree_data['level_up_skills']:
skill_id = skill['id']
skill_up_num = skill['num']
level_up_skill = AvatarRankSkillUp[str(rank_id)]
if level_up_skill:
for item in level_up_skill:
skill_id = item['id']
skill_up_num = item['num']
# 查找skill_id在不在avatarSkill中
for skill_item in char_data['avatarSkill']:
if skill_id == skill_item['skillId']:
skill_item['skillLevel'] += skill_up_num
level_up_skills.append(skill_item)
char_data['avatarSkill']['skillLevel'] += skill_up_num
break
# 处理基础属性

View File

@ -1,12 +1,12 @@
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 ..utils.convert import get_uid
from ..utils.sr_prefix import PREFIX
from ..utils.error_reply import UID_HINT
from .get_gachalogs import save_gachalogs
from ..utils.sr_prefix import PREFIX
from .draw_gachalogs import draw_gachalogs_img
from .get_gachalogs import save_gachalogs
sv_gacha_log = SV('sr抽卡记录')
sv_get_gachalog_by_link = SV('sr导入抽卡链接', area='DIRECT')

View File

@ -1,5 +1,5 @@
from pathlib import Path
from typing import Dict, List, TypedDict
from typing import Dict, List, TypedDict, Union
from msgspec import json as msgjson
@ -34,12 +34,17 @@ RelicId2MainAffixGroup_fileName = (
f'RelicId2MainAffixGroup_mapping_{version}.json'
)
AvatarRelicScore_fileName = 'AvatarRelicScore.json'
avatarRankSkillUp_fileName = f'avatarRankSkillUp_mapping_{version}.json'
class TS(TypedDict):
Name: Dict[str, str]
Icon: Dict[str, str]
class LU(TypedDict):
id: str
num: int
with Path.open(MAP / avatarId2Name_fileName, encoding='UTF-8') as f:
avatarId2Name = msgjson.decode(f.read(), type=Dict[str, str])
@ -110,3 +115,6 @@ with Path.open(MAP / RelicId2MainAffixGroup_fileName, encoding='UTF-8') as f:
with Path.open(MAP / AvatarRelicScore_fileName, encoding='UTF-8') as f:
AvatarRelicScore = msgjson.decode(f.read(), type=List[Dict])
with Path.open(MAP / avatarRankSkillUp_fileName, encoding='UTF-8') as f:
AvatarRankSkillUp = msgjson.decode(f.read(), type=Dict[str, Union[List[LU], None]])

View File

@ -0,0 +1,894 @@
{
"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": []
}