Genshin-bots/StarRailUID
1
0
Fork 0
mirror of https://github.com/baiqwerdvd/StarRailUID.git synced 2025-05-06 19:53:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复快枪手2件套未计算问题

Browse Source
This commit is contained in:
a376148946 2023-10-01 10:23:02 +08:00 committed by qwerdvd
parent 375bbdce84
commit 3d427171c6
1 changed files with 104 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
StarRailUID/starrailuid_charinfo/mono/Character.py
View File

@ -53,10 +53,7 @@ class Character:
for equip_ability in equip_ability_property: for equip_ability in equip_ability_property:
property_type = equip_ability['PropertyType'] property_type = equip_ability['PropertyType']
value = equip_ability['Value']['Value'] value = equip_ability['Value']['Value']
if property_type in self.add_attr: self.add_attr[property_type] = value + self.add_attr.get(property_type, 0)
self.add_attr[property_type] += value
else:
self.add_attr[property_type] = value
async def get_char_attribute_bonus(self): async def get_char_attribute_bonus(self):
attribute_bonus = self.attribute_bonus attribute_bonus = self.attribute_bonus
@ -64,10 +61,7 @@ class Character:
status_add = bonus['statusAdd'] status_add = bonus['statusAdd']
bonus_property = status_add['property'] bonus_property = status_add['property']
value = status_add['value'] value = status_add['value']
if bonus_property in self.add_attr: self.add_attr[bonus_property] = value + self.add_attr.get(bonus_property, 0)
self.add_attr[bonus_property] += value
else:
self.add_attr[bonus_property] = value
async def get_relic_info(self): async def get_relic_info(self):
# 计算圣遗物效果 # 计算圣遗物效果
@ -77,24 +71,15 @@ class Character:
# 处理主属性 # 处理主属性
relic_property = relic['MainAffix']['Property'] relic_property = relic['MainAffix']['Property']
property_value = relic['MainAffix']['Value'] property_value = relic['MainAffix']['Value']
if relic_property in self.add_attr: self.add_attr[relic_property] = property_value + self.add_attr.get(relic_property, 0)
self.add_attr[relic_property] = (
self.add_attr[relic_property] + property_value
)
else:
self.add_attr[relic_property] = property_value
# 处理副词条 # 处理副词条
for sub in relic['SubAffixList']: for sub in relic['SubAffixList']:
sub_property = sub['Property'] sub_property = sub['Property']
sub_value = sub['Value'] sub_value = sub['Value']
if sub_property in self.add_attr: self.add_attr[sub_property] = sub_value + self.add_attr.get(sub_property, 0)
self.add_attr[sub_property] = (
self.add_attr[sub_property] + sub_value
)
else:
self.add_attr[sub_property] = sub_value
# 处理套装属性 # 处理套装属性
set_id_dict = Counter(set_id_list) set_id_dict = Counter(set_id_list)
# logger.info(set_id_dict.most_common())
for item in set_id_dict.most_common(): for item in set_id_dict.most_common():
set_property = '' set_property = ''
set_id = item[0] set_id = item[0]
@ -105,18 +90,15 @@ class Character:
if status_add: if status_add:
set_property = status_add.Property set_property = status_add.Property
set_value = status_add.Value set_value = status_add.Value
if set_property != '':
self.add_attr[set_property] = set_value + self.add_attr.get(set_property, 0)
if count == 4: if count == 4:
status_add = RelicSetSkill.RelicSet[str(set_id)]['4'] status_add = RelicSetSkill.RelicSet[str(set_id)]['4']
if status_add: if status_add:
set_property = status_add.Property set_property = status_add.Property
set_value = status_add.Value set_value = status_add.Value
if set_property != '': if set_property != '':
if set_property in self.add_attr: self.add_attr[set_property] = set_value + self.add_attr.get(set_property, 0)
self.add_attr[set_property] = (
self.add_attr[set_property] + set_value
)
else:
self.add_attr[set_property] = set_value
logger.info(json.dumps(self.base_attributes)) # logger.info(json.dumps(self.base_attributes))
logger.info(json.dumps(self.add_attr)) # logger.info(json.dumps(self.add_attr))