This commit is contained in:
2026-08-30 22:31:51 +08:00
parent 496f3c1e76
commit 7277ea32e7
2 changed files with 21 additions and 12 deletions
+16 -11
View File
@@ -282,18 +282,9 @@ class CalcEquipMixin(CharacterBase):
pass pass
pass pass
def calc_oaths(self): def calc_oath_upgrade(self):
"""计算装备基础效果""" """计算装备基础效果"""
effects = get_equipment(self.equVersion).funs
for item in self.charOathInfo: for item in self.charOathInfo:
oath = item.oathInfo
if oath is None:
continue
fun = effects.execture(f'oath_{oath.id}')
if fun is None:
continue
apply_uppercase_attrs(self, oath)
fun(self)
# 誓约升级效果 # 誓约升级效果
if item.oathInfo and item.oathInfo.itemDetailType == '誓约': if item.oathInfo and item.oathInfo.itemDetailType == '誓约':
for upgrade in item.upgrade: for upgrade in item.upgrade:
@@ -313,6 +304,19 @@ class CalcEquipMixin(CharacterBase):
pass pass
pass pass
def calc_oaths(self):
"""计算装备基础效果"""
effects = get_equipment(self.equVersion).funs
for item in self.charOathInfo:
oath = item.oathInfo
if oath is None:
continue
fun = effects.execture(f'oath_{oath.id}')
if fun is None:
continue
apply_uppercase_attrs(self, oath)
fun(self)
def calc_avatar(self, avatar: dict): def calc_avatar(self, avatar: dict):
"""计算时装效果""" """计算时装效果"""
equ = get_equipment(self.equVersion) equ = get_equipment(self.equVersion)
@@ -433,9 +437,10 @@ class CalcEquipMixin(CharacterBase):
self.calc_basic() self.calc_basic()
self.calc_sundry(config.get('sundry', {})) self.calc_sundry(config.get('sundry', {}))
self.calc_emblems() self.calc_emblems()
self.calc_oath_upgrade()
suit = self.calc_suits()
self.calc_equs() self.calc_equs()
self.calc_oaths() self.calc_oaths()
suit = self.calc_suits()
skillInfos = [] skillInfos = []
if self.buffer: if self.buffer:
skillInfos = self.calc_buffer_skills() skillInfos = self.calc_buffer_skills()
+5 -1
View File
@@ -15785,10 +15785,11 @@ def equ_2003(char: CharacterProperty,effectDamage: list[float] = []):
- 解锁默示之真谛第九阶段 - 解锁默示之真谛第九阶段
- 穿戴5个部位圣遗物防具 - 穿戴5个部位圣遗物防具
""" """
print(char.max_point)
if 2100 <= char.max_point < 2550: if 2100 <= char.max_point < 2550:
char.SetStatus(SkillAttack=0.50, Buffer=11220) char.SetStatus(SkillAttack=0.50, Buffer=11220)
pass pass
elif char.max_point >= 2550: if char.max_point >= 2550:
char.SetStatus(SkillAttack=0.546, Buffer=13030) char.SetStatus(SkillAttack=0.546, Buffer=13030)
pass pass
point = char.charEquipInfo['戒指'].precision point = char.charEquipInfo['戒指'].precision
@@ -15802,6 +15803,9 @@ def equ_2003(char: CharacterProperty,effectDamage: list[float] = []):
char.AddElementDB('冰', 40, 1) char.AddElementDB('冰', 40, 1)
char.AddElementDB('光', 40, 1) char.AddElementDB('光', 40, 1)
char.AddElementDB('暗', 40, 1) char.AddElementDB('暗', 40, 1)
if char.buffer:
char.BuffSkill.lv += 1
char.AwakeSkill.lv += 1
pass pass