From b2efc5b194011134be6ee56f02e2043d1644db1c Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Tue, 5 Sep 2023 20:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20msgspec=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StarRailUID/starrailuid_charinfo/effect/Base/model.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/StarRailUID/starrailuid_charinfo/effect/Base/model.py b/StarRailUID/starrailuid_charinfo/effect/Base/model.py index d7a123c..1d8ed46 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Base/model.py +++ b/StarRailUID/starrailuid_charinfo/effect/Base/model.py @@ -1,5 +1,6 @@ from typing import List +import msgspec from msgspec import Struct, field @@ -48,7 +49,7 @@ class DamageInstanceWeapon(Struct): class AttributeBounsStatusAdd(Struct): property: str name: str - value: int + value: float class DamageInstanceAvatarAttributeBouns(Struct): @@ -80,8 +81,8 @@ class DamageInstance: rank=char.char_rank, element=char.char_element, promotion=char.char_promotion, - attribute_bonus=char.attribute_bonus, - extra_ability=char.extra_ability, + attribute_bonus=msgspec.from_builtins(char.attribute_bonus, List[DamageInstanceAvatarAttributeBouns] | None), + extra_ability=msgspec.from_builtins(char.extra_ability, List | None), ) self.weapon = DamageInstanceWeapon( id_=char.equipment['equipmentID'], @@ -92,10 +93,10 @@ class DamageInstance: self.relic = [] for relic in char.char_relic: self.relic.append( - DamageInstanceRelic(**relic) + msgspec.from_builtins(relic, DamageInstanceRelic) ) self.skill = [] for skill in char.char_skill: self.skill.append( - DamageInstanceSkill(**skill) + msgspec.from_builtins(skill, DamageInstanceSkill) )