refactor: centralize calc config defaults
This commit is contained in:
@@ -6,6 +6,7 @@ from core.basic.equipment import OathSuit, Suit, get_equipment
|
||||
from ..formula import 增幅计算, 强化技攻, 武器强化计算, 精通计算, 耳环计算, 左右计算, 锻造计算
|
||||
from ..roleinfo import CharacterEmblemInfo, CharacterEquipInfo, CharacterOathInfo, get_key_by_value
|
||||
from .base import CharacterBase
|
||||
from .config_view import CalcConfigView
|
||||
|
||||
|
||||
@cache
|
||||
@@ -403,12 +404,13 @@ class CalcEquipMixin(CharacterBase):
|
||||
# region 主计算入口
|
||||
|
||||
def calc(self, setInfo: dict[str, dict]):
|
||||
self.calc_init(setInfo)
|
||||
config = CalcConfigView(setInfo).as_legacy_dict()
|
||||
self.calc_init(config)
|
||||
self.SetBaseStatus()
|
||||
self.calc_jade(setInfo.get('jades', []))
|
||||
self.calc_avatar(setInfo.get('avatar', {}))
|
||||
self.calc_jade(config.get('jades', []))
|
||||
self.calc_avatar(config.get('avatar', {}))
|
||||
self.calc_basic()
|
||||
self.calc_sundry(setInfo.get('sundry', {}))
|
||||
self.calc_sundry(config.get('sundry', {}))
|
||||
self.calc_emblems()
|
||||
suit = self.calc_suits()
|
||||
self.calc_equs()
|
||||
@@ -430,7 +432,7 @@ class CalcEquipMixin(CharacterBase):
|
||||
self.输出类型 = '魔法百分比'
|
||||
else:
|
||||
self.输出类型 = '物理百分比'
|
||||
skillInfos = self.calc_carry_skills(setInfo.get('DSB', False), setInfo.get('BUFF', False))
|
||||
skillInfos = self.calc_carry_skills(config.get('DSB', False), config.get('BUFF', False))
|
||||
info = self.get_carry_info()
|
||||
return {'uuid': uuid1().hex, 'skills': skillInfos, 'info': info, 'suits': suit, 'buffer': self.buffer}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user