fix:修复职业报错的情况
This commit is contained in:
@@ -1,8 +1,23 @@
|
||||
import inspect
|
||||
|
||||
from ..formula import 获取基础属性
|
||||
from core.basic.property import CharacterInfo
|
||||
from .base import CharacterBase
|
||||
|
||||
|
||||
def _skill_error_context(char: CharacterBase, skill, mode: str) -> str:
|
||||
skill_class = skill.__class__
|
||||
skill_file = inspect.getsourcefile(skill_class) or inspect.getfile(skill_class)
|
||||
return (
|
||||
f'角色={getattr(char, "角色", "")}, '
|
||||
f'职业={getattr(char, "职业", "")}, '
|
||||
f'技能={getattr(skill, "name", "")}, '
|
||||
f'技能类={skill_class.__name__}, '
|
||||
f'mode={mode}, '
|
||||
f'文件={skill_file}'
|
||||
)
|
||||
|
||||
|
||||
class CalcCarryMixin(CharacterBase):
|
||||
"""输出角色技能伤害计算相关方法"""
|
||||
|
||||
@@ -51,7 +66,10 @@ class CalcCarryMixin(CharacterBase):
|
||||
for i in self.skills:
|
||||
if i.damage and i.lv > 0:
|
||||
for mode in i.mode:
|
||||
temp = i.skillInfo(mode)
|
||||
try:
|
||||
temp = i.skillInfo(mode)
|
||||
except Exception as ex:
|
||||
raise RuntimeError(f'职业技能计算失败: {_skill_error_context(self, i, mode)}') from ex
|
||||
if temp[0] > 0:
|
||||
skillInfos.append(
|
||||
{
|
||||
|
||||
@@ -200,8 +200,8 @@ class Skill11(ActiveSkill):
|
||||
self._ratio = value
|
||||
|
||||
# 技能等级变化的时候,系数对应的数值变化
|
||||
def update_skill_attribute(self,skill, type, old, new, data,ratio = 100,weapon = []):
|
||||
super().update_skill_attribute(skill, type, old, new, data, ratio / self.ratio, weapon)
|
||||
def update_skill_attribute(self, skill, type, old, new, data, ratio=100, weapon=(), weapon_type=None, weapon_options=()):
|
||||
super().update_skill_attribute(skill, type, old, new, data, ratio / self.ratio, weapon, weapon_type, weapon_options)
|
||||
|
||||
|
||||
# 虚无之球 보이드
|
||||
@@ -300,8 +300,8 @@ class Skill16(PassiveSkill):
|
||||
self._ratio = value
|
||||
|
||||
# 技能等级变化的时候,系数对应的数值变化
|
||||
def update_skill_attribute(self,skill, type, old, new, data,ratio = 100,weapon = []):
|
||||
super().update_skill_attribute(skill, type, old, new, data, ratio / self.ratio, weapon)
|
||||
def update_skill_attribute(self, skill, type, old, new, data, ratio=100, weapon=(), weapon_type=None, weapon_options=()):
|
||||
super().update_skill_attribute(skill, type, old, new, data, ratio / self.ratio, weapon, weapon_type, weapon_options)
|
||||
|
||||
# 天雷 썬더 콜링
|
||||
# https://api.neople.co.kr/df/skills/3909d0b188e9c95311399f776e331da5/d2c6df5105577fb59fb92529a36165a0?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
|
||||
|
||||
@@ -1677,7 +1677,7 @@ class Skill45(ActiveSkill):
|
||||
# 3层信仰效果时神圣之力持续时间 : {value6}秒
|
||||
data6 = get_data(f'{prefix}/{uuid}', 6)
|
||||
|
||||
def skillInfo(self):
|
||||
def skillInfo(self,mode=""):
|
||||
prep = self.char.BuffSkill.skillInfo()
|
||||
ratio = self.data2[self.lv] * 5 / 100
|
||||
return prep[0] * ratio, [prep[1][0] * ratio, prep[1][1], prep[1][2] * ratio], [prep[2][0] * ratio, prep[2][1], prep[2][2] * ratio], 0, self.getSkillCD()
|
||||
@@ -1843,7 +1843,7 @@ class Skill49(ActiveSkill):
|
||||
# 力量、 智力增加 : [天启之光]数值的{value6}%
|
||||
data6 = get_data(f'{prefix}/{uuid}', 6)
|
||||
|
||||
def skillInfo(self):
|
||||
def skillInfo(self,mode=""):
|
||||
"""技能信息"""
|
||||
prep = self.char.AwakeSkill.skillInfo()
|
||||
ratio = 0
|
||||
|
||||
@@ -345,11 +345,11 @@ class Skill19(ActiveSkill):
|
||||
skill.endpower *= raito
|
||||
self._maxLayer = value
|
||||
|
||||
def update_skill_attribute(self, skill, type, old, new, data, ratio, weapon=[]):
|
||||
def update_skill_attribute(self, skill, type, old, new, data, ratio=100, weapon=(), weapon_type=None, weapon_options=()):
|
||||
if len(data) == 0:
|
||||
data = getattr(self, f'data{int(self.maxLayer)}')
|
||||
data = [i - 100 if i > 100 else 0 for i in data]
|
||||
super().update_skill_attribute(skill, type, old, new, data, ratio, weapon)
|
||||
super().update_skill_attribute(skill, type, old, new, data, ratio, weapon, weapon_type, weapon_options)
|
||||
|
||||
|
||||
# 弧光连闪
|
||||
|
||||
Reference in New Issue
Block a user