From 28732dacbc50dee5cfbcb33f100b0d1fb07aad03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Sun, 6 Apr 2025 15:18:16 +0800 Subject: [PATCH] dev --- README.md | 2 +- backend/core/basic/character.py | 11 ++++++++--- backend/core/basic/property.py | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9770117b..e2c3fb01 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ pnpm run dev:backend - [x] 徽章/附魔/调适 - [x] 时装/皮肤/光环 - [x] 宠物装备 - - [ ] 辟邪玉 + - [x] 辟邪玉 - [ ] 勋章/杂项 - 结果计算 diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index ea9ce91d..61acb6f8 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -791,7 +791,7 @@ class Character: 'data': i.data, 'ratio': 10.0, 'cd': i.cd, - 'damage': ratuio_equ_skill * i.data * 10, + 'damage': ratuio_equ_skill * i.data * 10 * self.EquEffectRatio, } ) attrs = [] @@ -804,17 +804,22 @@ class Character: if self.输出类型 == '魔法固伤': attrs.extend(['INT', 'AtkI']) info = [] - attrs.extend(['Attack', 'AttackP', 'SkillAttack', 'ElementDB']) + attrs.extend(['Attack', 'AttackP', 'SkillAttack','EquEffectRatio', 'ElementDB']) for attr in attrs: temp = getattr(CharacterInfo, attr) if attr.startswith('Atk'): info.append({'name': temp.name, 'value': temp.value(getattr(self, attr) * getattr(self, f'P{attr}'))}) pass else: + value = getattr(self, attr) + if attr == 'SkillAttack': + value *= (self.jade_effect.SkillAttack + 1) + if attr == 'AttackP': + value += self.jade_effect.AttackP info.append( { 'name': temp.name, - 'value': temp.value(getattr(self, attr)), + 'value': temp.value(value), } ) pass diff --git a/backend/core/basic/property.py b/backend/core/basic/property.py index 3e1c20d1..a90b531d 100644 --- a/backend/core/basic/property.py +++ b/backend/core/basic/property.py @@ -51,9 +51,11 @@ class CharacterInfo(enum.Enum): Attack = '攻击强化', '/ui/UI_ProfileIcon_015.png', lambda x: f'{format(x, ".1f")}%' """攻击强化""" - AttackP = '攻击强化%', '/ui/UI_ProfileIcon_015.png', lambda x: f'{format(x * 100 - 100, ".2f")}%' + AttackP = '攻击强化%', '/ui/UI_ProfileIcon_015.png', lambda x: f'{format(x * 100 - 100, ".1f")}%' """攻击强化%""" + EquEffectRatio = '特效伤害', '/ui/UI_ProfileIcon_016.png', lambda x: f'{format(x * 100 - 100, ".1f")}%' + # HitP : float # """命中率"""