This commit is contained in:
2025-04-24 21:55:25 +08:00
parent 302ba9a095
commit 41f704b348
2 changed files with 2 additions and 6 deletions
+1 -1
View File
@@ -638,7 +638,7 @@ class Character(CharacterProperty):
effects = get_equipment(self.equVersion).funs effects = get_equipment(self.equVersion).funs
for detail in [(item.equInfo, item.fusionInfo, item.enchant, item.emblem_0, item.emblem_1) for item in filter(lambda x: x.equInfo is not None, self.charEquipInfo.values())]: for detail in [(item.equInfo, item.fusionInfo, item.enchant, item.emblem_0, item.emblem_1) for item in filter(lambda x: x.equInfo is not None, self.charEquipInfo.values())]:
equ = detail[0] equ = detail[0]
if equ is None: if equ is None and equ.detailType == '副武器':
return return
fusion = detail[1] fusion = detail[1]
enchat = detail[2] enchat = detail[2]
@@ -460,15 +460,11 @@ class classChange(Character):
if cur.equInfo is None: if cur.equInfo is None:
return return
if cur.equInfo.itemType == "副武器": if cur.equInfo.itemType == "副武器":
cur.equInfo.AtkP = cur.equInfo.AtkP * 0.1
cur.equInfo.STR = 0
cur.equInfo.AtkI = cur.equInfo.AtkI * 0.1
cur.equInfo.INT = 0
if cur.equInfo.categorize == '传世武器': if cur.equInfo.categorize == '传世武器':
ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12) ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12)
else: else:
# 强化计算 # 强化计算
ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理') ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理')
self.SetStatus(AtkP = ATKP * 0.1) self.SetStatus(AtkP = (cur.equInfo.AtkP + ATKP) * 0.1)
else: else:
super().calc_weapon(cur) super().calc_weapon(cur)