From fbf075721bf8dd7ef210b2be0cb39cad20fd2339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Sun, 14 Dec 2025 15:53:16 +0800 Subject: [PATCH] fix --- backend/core/character/GF/swordman_female/vegabond.py | 9 +++++++-- backend/openapi | 2 +- .../src/pages/Character/Forge/components/Equipments.vue | 8 ++++++-- frontend/src/stores/config.ts | 7 +++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/backend/core/character/GF/swordman_female/vegabond.py b/backend/core/character/GF/swordman_female/vegabond.py index afb28eca..cc1b8fea 100644 --- a/backend/core/character/GF/swordman_female/vegabond.py +++ b/backend/core/character/GF/swordman_female/vegabond.py @@ -2,7 +2,7 @@ from core.basic.skill import PassiveSkill, ActiveSkill, get_data from core.basic.character import Character from core.basic.roleinfo import CharacterEquipInfo -from core.basic.formula import 武器强化计算 +from core.basic.formula import 武器强化计算, 增幅计算 prefix = "swordman_female/vegabond/cn/skillDetail" @@ -1229,6 +1229,11 @@ class classChange(Character): else: # 强化计算 ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理') - self.SetStatus(AtkP = (cur.equInfo.AtkP + ATKP) * 0.1) + # 武器基础 + STR = cur.equInfo.STR + if cur.reinforceType == 1: + # 增幅四维 + STR += 增幅计算(115, '史诗', cur.reinforce) + self.SetStatus(AtkP = (cur.equInfo.AtkP + ATKP) * 0.1,STR = STR*0.1) else: super().calc_weapon(cur) \ No newline at end of file diff --git a/backend/openapi b/backend/openapi index 30af01ac..a281a2fa 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit 30af01ac9e429bb10fb718c9eafe6b4c35a72be0 +Subproject commit a281a2fa604c4021db858bb71c6cf334c5725def diff --git a/frontend/src/pages/Character/Forge/components/Equipments.vue b/frontend/src/pages/Character/Forge/components/Equipments.vue index 0cd7d336..8b75a363 100644 --- a/frontend/src/pages/Character/Forge/components/Equipments.vue +++ b/frontend/src/pages/Character/Forge/components/Equipments.vue @@ -25,7 +25,7 @@ export default defineComponent({ ) /** 是否可以设置秘宝精度 */ const can_set_secret = computed(() => { - return ['武器','辅助装备', '魔法石', '耳环'].includes(part.value as string) + return ['武器', '辅助装备', '魔法石', '耳环'].includes(part.value as string) }) const basicInfoStore = useInfoStore() @@ -190,7 +190,11 @@ export default defineComponent({ {part.value == '副武器' ? ( <>
-
强化
+
增幅
+ + 强化 + 增幅 + {renderList(31, (i) => ( {i - 1} diff --git a/frontend/src/stores/config.ts b/frontend/src/stores/config.ts index cd76774c..cfdd5a11 100644 --- a/frontend/src/stores/config.ts +++ b/frontend/src/stores/config.ts @@ -51,7 +51,7 @@ export interface IConfig { option: string } > - sundry: Record + sundry: Record bindAwake: number /** 系统奶 */ DSB: boolean @@ -144,10 +144,12 @@ export const useConfigStore = defineStore('configStore', () => { .filter((a) => !config.value?.skills.hasOwnProperty(a)) part.forEach((p) => { + // eslint-disable-next-line @typescript-eslint/no-unused-expressions config.value && (config.value.equips[p] = { ...defaultEqusConfig }) }) avatarPart.forEach((p) => { + // eslint-disable-next-line @typescript-eslint/no-unused-expressions config.value && (config.value.avatar[p] = { ...defaultAvatarConfig }) }) @@ -157,6 +159,7 @@ export const useConfigStore = defineStore('configStore', () => { }) skillIDs.forEach((id) => { + // eslint-disable-next-line @typescript-eslint/no-unused-expressions config.value && (config.value.skills[id] = { lv: infoStore.skills.find((skill) => skill.id.toString() === id)?.maxLearnLv ?? 0, @@ -191,7 +194,7 @@ export const useConfigStore = defineStore('configStore', () => { return await api.calc(config.value) } - const chooseEqu = async ( + const chooseEqu = ( equip: IEquipment | undefined, isFusion: boolean = false, isSubWeapon: boolean = false,