dnftools/dcalc
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

dev

Browse Source
This commit is contained in:
imelon
2026-04-22 03:10:18 +08:00
parent 7e63275649
commit 613c228bdf
19 changed files with 366 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/api/routes/info.py
-2
View File
@@ -123,7 +123,6 @@ async def get_info_by_dnfhelper(uid: str, state: AltersDep, redis: RedisDep):
except Exception as e: except Exception as e:
if isinstance(e, ResponseException): if isinstance(e, ResponseException):
return response(code=500, message=str(e), data=None) return response(code=500, message=str(e), data=None)
print(e)
return response(code=500, message='Failed to fetch DNFHelper info', data=None) return response(code=500, message='Failed to fetch DNFHelper info', data=None)
@@ -135,7 +134,6 @@ async def get_skill_by_code(state: AltersDep, code=Body(None)):
return response(code=500, message='技能加点代码职业与登录职业不匹配', data=None) return response(code=500, message='技能加点代码职业与登录职业不匹配', data=None)
return response(data=skills) return response(data=skills)
except Exception as e: except Exception as e:
print(f'Error fetching skill tree info: {e}')
if isinstance(e, ResponseException): if isinstance(e, ResponseException):
return response(code=500, message=str(e), data=None) return response(code=500, message=str(e), data=None)
return response(code=500, message='解析技能加点失败', data=None) return response(code=500, message='解析技能加点失败', data=None)
backend/core/basic/character/calc_equip.py
+41 -26
View File
@@ -75,6 +75,7 @@ class CalcEquipMixin(CharacterBase):
"""套装效果统计""" """套装效果统计"""
suitInfo = {} suitInfo = {}
oathSuitInfo = {} oathSuitInfo = {}
correction = 0
equs = get_equipment(self.equVersion) equs = get_equipment(self.equVersion)
for item in filter(lambda x: x.equInfo is not None, self.charEquipInfo.values()): for item in filter(lambda x: x.equInfo is not None, self.charEquipInfo.values()):
partEqu = item.equInfo partEqu = item.equInfo
@@ -101,14 +102,16 @@ class CalcEquipMixin(CharacterBase):
max_point_oath_suit = max((suit for suit in oathSuitInfo if oathSuitInfo[suit]['point'] > 0), key=lambda suit: oathSuitInfo[suit]['point'], default=None) max_point_oath_suit = max((suit for suit in oathSuitInfo if oathSuitInfo[suit]['point'] > 0), key=lambda suit: oathSuitInfo[suit]['point'], default=None)
zero_point_suits = [suit for suit in suitInfo if suitInfo[suit]['point'] == 0] zero_point_suits = [suit for suit in suitInfo if suitInfo[suit]['point'] == 0]
# 套装没有到太初的时候，优先把誓约套装的点数加到装备套装上，以达到更高的套装等级 # 套装没有到太初的时候，优先把誓约套装的点数加到装备套装上，以达到更高的套装等级
if suitInfo is not None and 0 < suitInfo[max_point_suit]['point'] < 2550 and oathSuitInfo.get('max_point_oath_suit', None) is not None: if suitInfo is not None and 0 < suitInfo[max_point_suit]['point'] < 2550 and oathSuitInfo.get(max_point_oath_suit, None) is not None:
suitInfo[max_point_suit]['point'] += min(2550 - suitInfo[max_point_suit]['point'], oathSuitInfo[max_point_oath_suit]['point']) correction = min(2550 - suitInfo[max_point_suit]['point'], oathSuitInfo[max_point_oath_suit]['point'])
oathSuitInfo[max_point_oath_suit]['point'] -= min(2550 - suitInfo[max_point_suit]['point'], oathSuitInfo[max_point_oath_suit]['point']) suitInfo[max_point_suit]['point'] += correction
oathSuitInfo[max_point_oath_suit]['point'] -= correction
pass pass
suits = zero_point_suits + ([max_point_suit] if max_point_suit is not None else []) suits = zero_point_suits + ([max_point_suit] if max_point_suit is not None else [])
suitList: list[Suit] = [] suitList: list[Suit] = []
oathSuitList: list[OathSuit] = [] oathSuitList: list[OathSuit] = []
res = [] res = {'suit': None, 'oath': None, 'correction': correction}
# print(max_point_suit, suitList)
for suit in suits: for suit in suits:
if suitInfo[suit]['point'] == 0: if suitInfo[suit]['point'] == 0:
suitList += equs.get_suit_info(suit, 0, suitInfo[suit]['count']) suitList += equs.get_suit_info(suit, 0, suitInfo[suit]['count'])
@@ -116,20 +119,20 @@ class CalcEquipMixin(CharacterBase):
suitList += equs.get_suit_info(suit, suitInfo[suit]['point'], 0) suitList += equs.get_suit_info(suit, suitInfo[suit]['point'], 0)
if len(suitList) == 0: if len(suitList) == 0:
continue continue
self.suitInfo = suitList if suit == max_point_suit:
temp = suitList[-1] self.suitInfo = suitList
res.append( temp = suitList[-1]
{ res['suit'] = {
'id': temp.id, 'id': temp.id,
'name': temp.name, 'name': temp.name,
'rarity': temp.rarity, 'rarity': temp.rarity,
'point': suitInfo[suit]['point'], 'point': suitInfo[suit]['point'],
'count': suitInfo[suit]['count'], 'count': suitInfo[suit]['count'],
'level': temp.level, 'level': temp.level,
'imageUrl': temp.imageUrl, 'suitId': suit,
'value': temp.value, 'imageUrl': temp.imageUrl,
} # 'value': temp.value,
) }
for suit in oathSuitInfo: for suit in oathSuitInfo:
if oathSuitInfo[suit]['point'] == 0: if oathSuitInfo[suit]['point'] == 0:
oathSuitList += equs.get_oath_suit_info(suit, 0, oathSuitInfo[suit]['count']) oathSuitList += equs.get_oath_suit_info(suit, 0, oathSuitInfo[suit]['count'])
@@ -149,19 +152,19 @@ class CalcEquipMixin(CharacterBase):
filtered_dict = {k: v for k, v in suit.__dict__.items() if k[0].isupper()} filtered_dict = {k: v for k, v in suit.__dict__.items() if k[0].isupper()}
self.SetStatus(**filtered_dict) self.SetStatus(**filtered_dict)
if func is not None and oathEffect is None: if func is not None and oathEffect is None:
print(f'套装 {suit.name} 生效') # print(f'套装 {suit.name} 生效')
func(self) func(self)
else: if max_point_suit != max_point_oath_suit:
# 当存在套装和誓约不匹配的时候，誓约技能只能是1号位 self.charOathSkillId = '1'
self.charOathSkillId = 1
oathSkillEffect = [] oathSkillEffect = []
self.max_point = max([i['point'] for i in res], default=0) self.max_point = 0 if res['suit'] is None else res.get('suit', {}).get('point', 0)
self.oathSuitInfo = [] self.oathSuitInfo = []
self.oathSkillInfo = [] self.oathSkillInfo = []
# 当套装点数达到太初时，誓约技能生效 # 当套装点数达到太初时，誓约技能生效
if self.max_point >= 2550: if self.max_point >= 2550:
for oathSuit in oathSuitList: for oathSuit in oathSuitList:
skill = next((x for x in oathSuit.skills if x.skillId == self.charOathSkillId), None) skills = list(filter(lambda x: x.suitId == oathSuit.suitId, oathSuit.skills))
skill = next((x for x in oathSuit.skills if str(x.skillId) == str(self.charOathSkillId)), None)
# 誓约套装效果生效 # 誓约套装效果生效
filtered_dict = {k: v for k, v in oathSuit.__dict__.items() if k[0].isupper()} filtered_dict = {k: v for k, v in oathSuit.__dict__.items() if k[0].isupper()}
self.SetStatus(**filtered_dict) self.SetStatus(**filtered_dict)
@@ -172,11 +175,23 @@ class CalcEquipMixin(CharacterBase):
self.SetStatus(**filtered_dict) self.SetStatus(**filtered_dict)
self.oathSkillInfo.append(skill) self.oathSkillInfo.append(skill)
self.oathSuitInfo.append(oathSuit) self.oathSuitInfo.append(oathSuit)
if oathSuit.suitId == max_point_oath_suit:
res['oath'] = {
'id': oathSuit.id,
'name': skill.name,
'rarity': oathSuit.rarity,
'point': oathSuitInfo[oathSuit.suitId]['point'],
'count': oathSuitInfo[oathSuit.suitId]['count'],
'level': oathSuit.level,
'imageUrl': oathSuit.imageUrl,
'suitId': oathSuit.suitId,
'skills': [{'id': skill.id, 'skillId': i.skillId, 'name': i.name, 'imageUrl': i.imageUrl, 'enable': i.skillId == '1' or max_point_oath_suit == max_point_suit} for i in skills],
# 'value': oathSuit.value,
}
for skill in oathSkillEffect: for skill in oathSkillEffect:
func = equs.funs.execture(f'oath_skill_{skill.id}') func = equs.funs.execture(f'oath_skill_{skill.id}')
if func is not None: if func is not None:
print(f'誓约技能 {skill.id} 生效') # print(f'誓约技能 {skill.id} 生效')
func(self) func(self)
if self.max_point >= 2550: if self.max_point >= 2550:
skillAttack = (self.max_point - 2550) // 70 * 0.01 skillAttack = (self.max_point - 2550) // 70 * 0.01
backend/core/basic/character/info.py
+1 -10
View File
@@ -98,16 +98,7 @@ class CharacterInfoMixin(CharacterBase):
info['options'] = equInfos.funs.options info['options'] = equInfos.funs.options
info['sundry'] = equInfos.funs.sundryList info['sundry'] = equInfos.funs.sundryList
for skill in platinum: for skill in platinum:
info['emblems'].append( info['emblems'].append({'id': skill, 'fame': 232, 'value': skill + ' Lv+1' + ' 四维 + 8', 'rarity': '白金', 'rarityId': '-1', 'type': '白金', 'typeId': '-1'})
{
'id': skill,
'fame': 232,
'position': ['辅助装备', '魔法石'],
'detail': skill + ' Lv+1' + ' 四维 + 8',
'categorize': ['技能'],
'rarity': '白金',
}
)
return info return info
def getBasicInos(self): def getBasicInos(self):
backend/core/basic/equipment.py
+17 -1
View File
@@ -234,6 +234,21 @@ class Equipments:
with Session(self.engine) as session: with Session(self.engine) as session:
db_list = session.query(OathSuitData).all() db_list = session.query(OathSuitData).all()
db_skills_list = session.query(OathSuitSkillData).all() db_skills_list = session.query(OathSuitSkillData).all()
skill_list = []
for item in db_skills_list:
lvs = len(item.SkillAttack.split(','))
skills = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
for i in range(1, lvs + 1):
skill = {k: v for k, v in skills.items()}
skillAttacks = parse_to_number_list(skill['SkillAttack'], [0])
skill['SkillAttack'] = 0 if i - 1 >= len(skillAttacks) else skillAttacks[i - 1]
attacks = parse_to_number_list(skill['Attack'], [0])
skill['Attack'] = 0 if i - 1 >= len(attacks) else attacks[i - 1]
buffers = parse_to_number_list(skill['Buffer'], [0])
skill['Buffer'] = 0 if i - 1 >= len(buffers) else buffers[i - 1]
skill['level'] = i
skill_obj = OathSuitSkill(**skill)
skill_list.append(skill_obj)
for item in db_list: for item in db_list:
lvs = len(item.point.split(',')) lvs = len(item.point.split(','))
suits = {k: v for k, v in item.__dict__.items() if not k.startswith('_')} suits = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
@@ -241,7 +256,7 @@ class Equipments:
suit = {k: v for k, v in suits.items()} suit = {k: v for k, v in suits.items()}
suit['points'] = suit['point'] suit['points'] = suit['point']
suit['point'] = int(suit['point'].split(',')[i - 1]) suit['point'] = int(suit['point'].split(',')[i - 1])
skills = [x for x in db_skills_list if x.suitId == suit['suitId'] and x.key == suit['key']] skills = [x for x in skill_list if x.suitId == suit['suitId'] and x.key == suit['key'] and x.level == i]
suit['level'] = i suit['level'] = i
skillAttaks = parse_to_number_list(suit['SkillAttack'], [0]) skillAttaks = parse_to_number_list(suit['SkillAttack'], [0])
suit['SkillAttack'] = (0 if len(skillAttaks) == 0 else skillAttaks[0]) if i - 1 >= len(skillAttaks) else skillAttaks[i - 1] suit['SkillAttack'] = (0 if len(skillAttaks) == 0 else skillAttaks[0]) if i - 1 >= len(skillAttaks) else skillAttaks[i - 1]
@@ -371,6 +386,7 @@ class OathSuitSkill:
Buffer: float Buffer: float
value: str value: str
bufferValue: str bufferValue: str
level: int
def __init__(self, **kwargs): def __init__(self, **kwargs):
for key in ['SkillAttack', 'Attack', 'Buffer']: for key in ['SkillAttack', 'Attack', 'Buffer']:
backend/core/basic/skill.py
+2 -2
View File
@@ -40,7 +40,7 @@ def get_data(prefix: str, key: int | str, func = lambda x: x):
data = next((item.get('custom', 1.0) for item in custom_cn data = next((item.get('custom', 1.0) for item in custom_cn
if item['job'] == job and item['jobGrow'] == jobGrow and item['skillId'] == skill), 1.0) if item['job'] == job and item['jobGrow'] == jobGrow and item['skillId'] == skill), 1.0)
except Exception as e: except Exception as e:
print(f"get skill {prefix}/{key} data error",e) # print(f"get skill {prefix}/{key} data error",e)
data = None data = None
return data return data
@@ -215,7 +215,7 @@ class Skill:
if skill is not None: if skill is not None:
self.update_skill_attribute(skill, type, old, new, data, ratio, weapon) self.update_skill_attribute(skill, type, old, new, data, ratio, weapon)
except Exception as e: except Exception as e:
print(f"Error applying association {type} for skill {self.name}: {e}") # print(f"Error applying association {type} for skill {self.name}: {e}")
raise e raise e
def update_skill_attribute(self, skill, type, old, new, data, ratio=100, weapon=[]): def update_skill_attribute(self, skill, type, old, new, data, ratio=100, weapon=[]):
backend/dataFiles/dcalc_0.db
BIN
View File
Binary file not shown.
frontend/src/api/calc/type.ts
+14 -2
View File
@@ -2,7 +2,11 @@ export interface IResult {
uuid: string uuid: string
skills: IResultSkill[] skills: IResultSkill[]
info: IResultUserInfo[] info: IResultUserInfo[]
suits: IResultSuit[] suits: {
suit?: IResultSuit
oath?: IResultSuit
correction?: number
}
buffer: boolean buffer: boolean
} }
@@ -27,7 +31,7 @@ export interface IResultUserInfo {
} }
export interface IResultSuit { export interface IResultSuit {
id: number id: string
count: number count: number
imageUrl: string imageUrl: string
level: number level: number
@@ -35,6 +39,14 @@ export interface IResultSuit {
point: number point: number
rarity: string rarity: string
value: string value: string
suitId: string
skills: {
id: string
skillId: string
name: string
imageUrl: string
enable: boolean
}[]
} }
export interface IResultSkillCount { export interface IResultSkillCount {
frontend/src/api/info/type.ts
+9 -1
View File
@@ -30,7 +30,7 @@ export interface ICharacterInfo {
properties: string[] properties: string[]
stones: IEquipment[] stones: IEquipment[]
enchants: IEnchantingInfo[] enchants: IEnchantingInfo[]
emblems: IEnchantingInfo[] emblems: IEmblemInfo[]
oaths: IEquipment[] oaths: IEquipment[]
weapons: string[] weapons: string[]
subweapons: string[] subweapons: string[]
@@ -137,6 +137,14 @@ export interface IEnchantingInfo {
type?: string type?: string
} }
export interface IEmblemInfo {
fame: number
id: string
rarity: string
type: string
value: string
}
export interface IAvatarInfo { export interface IAvatarInfo {
id: number id: number
options: string[] options: string[]
frontend/src/assets/img/oath/active.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

frontend/src/assets/img/oath/disabled.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

frontend/src/pages/Character/Forge/components/Emblems.vue
+11 -3
View File
@@ -25,8 +25,8 @@
:key="index" :key="index"
> >
<calc-select v-model="emblems[index]" class="min-w-0 flex-1 !h-20px"> <calc-select v-model="emblems[index]" class="min-w-0 flex-1 !h-20px">
<template v-for="(i, index) in lvs" :key="index"> <template v-for="(i, index) in emblemOptions" :key="index">
<calc-option :value="i">{{ i }}</calc-option> <calc-option :value="i.id">[{{ i.rarity }}]{{ i.value }}</calc-option>
</template> </template>
</calc-select> </calc-select>
</div> </div>
@@ -37,11 +37,12 @@
<script lang="ts" setup name="Emblems"> <script lang="ts" setup name="Emblems">
import EmblemList from '@/components/dnf/Emblem/List/index.vue' import EmblemList from '@/components/dnf/Emblem/List/index.vue'
import { useConfigStore } from '@/stores' import { useConfigStore, useInfoStore } from '@/stores'
const part = ref('彩色') const part = ref('彩色')
const configStore = useConfigStore() const configStore = useConfigStore()
const infoStore = useInfoStore()
const lvs = [ const lvs = [
'稀有Lv.1', '稀有Lv.1',
@@ -62,6 +63,13 @@ const lvs = [
'史诗Lv.1', '史诗Lv.1',
] ]
const emblemOptions = computed(() => {
if (part.value == '彩色') {
return infoStore.emblems.filter((a) => a.type != '白金').sort((a, b) => b.fame - a.fame)
}
return infoStore.emblems.filter((a) => a.type == part.value).sort((a, b) => b.fame - a.fame)
})
const emblemMaxCount = computed(() => { const emblemMaxCount = computed(() => {
if (part.value == '彩色') { if (part.value == '彩色') {
return 6 return 6
frontend/src/pages/Character/Forge/components/Sundry.vue
+1 -1
View File
@@ -7,7 +7,7 @@
:formatValue="(lv: number) => `${lv} 级`" :formatValue="(lv: number) => `${lv} 级`"
v-model="sundryData['fog']" v-model="sundryData['fog']"
:min="1" :min="1"
:max="30" :max="100"
:step="1" :step="1"
class="flex-1 !h-20px" class="flex-1 !h-20px"
/> />
frontend/src/pages/Character/Forge/index.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="w-420px overflow-auto"> <div class="w-480px pr-10px overflow-auto">
<calc-collapse class="w-100%" title="装备/时装/徽章打造(点击部位切换)"> <calc-collapse class="w-100%" title="装备/时装/徽章打造(点击部位切换)">
<calc-tabs v-model="partTab" class="!mb-2"> <calc-tabs v-model="partTab" class="!mb-2">
<calc-tab :value="0">装备</calc-tab> <calc-tab :value="0">装备</calc-tab>
frontend/src/pages/Character/Index.vue
+22 -7
View File
@@ -22,7 +22,12 @@
<calc-checkbox round v-model="configStore.config.DSB">系统奶</calc-checkbox> <calc-checkbox round v-model="configStore.config.DSB">系统奶</calc-checkbox>
<calc-checkbox round v-model="configStore.config.BUFF">组队</calc-checkbox> <calc-checkbox round v-model="configStore.config.BUFF">组队</calc-checkbox>
<calc-button title="打造导入" @click="showImport" class="ml-1" icon="import"></calc-button> <calc-button title="打造导入" @click="showImport" class="ml-1" icon="import"></calc-button>
<calc-button title="技能导入" @click="showImportSkill" class="ml-1" icon="exchange"></calc-button> <calc-button
title="技能导入"
@click="showImportSkill"
class="ml-1"
icon="exchange"
></calc-button>
</div> </div>
</div> </div>
@@ -30,7 +35,6 @@
<ImportVue></ImportVue> <ImportVue></ImportVue>
</calc-dialog> </calc-dialog>
<calc-dialog lazy header="技能导入" v-model:visible="importSkillVisible"> <calc-dialog lazy header="技能导入" v-model:visible="importSkillVisible">
<ImportSkillVue></ImportSkillVue> <ImportSkillVue></ImportSkillVue>
</calc-dialog> </calc-dialog>
@@ -39,8 +43,8 @@
<script lang="ts" setup name="Index"> <script lang="ts" setup name="Index">
import { useInfoStore } from '@/stores/info' import { useInfoStore } from '@/stores/info'
import { useConfigStore } from '@/stores' import { useConfigStore } from '@/stores'
import ImportVue from './Config/import.vue'; import ImportVue from './Config/import.vue'
import ImportSkillVue from './Config/importSkill.vue'; import ImportSkillVue from './Config/importSkill.vue'
import Result from './Result/Index.vue' import Result from './Result/Index.vue'
const props = defineProps<{ const props = defineProps<{
alter: string alter: string
@@ -50,13 +54,24 @@ const configStore = useConfigStore()
const importVisible = ref(false) const importVisible = ref(false)
const importSkillVisible = ref(false) const importSkillVisible = ref(false)
const shouldWatch = ref(true)
const isExecuting = ref(false)
const stopWatch = watch( const stopWatch = watch(
() => { () => {
return JSON.stringify(configStore.config) return JSON.stringify(configStore.config)
}, },
useDebounceFn(async () => { async () => {
;(await configStore.result).execute() if (isExecuting.value) return
}, 800),
isExecuting.value = true
try {
;(await configStore.result).execute()
} finally {
isExecuting.value = false
}
},
) )
const showImport = () => { const showImport = () => {
frontend/src/pages/Character/Result/Index.vue
+2 -1
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="flex gap-1" v-if="configStore.result.state"> <div class="flex gap-1 h-full" v-if="configStore.result.state">
<div class="flex flex-col justify-between"> <div class="flex flex-col justify-between">
<div class="flex gap-5 items-center"> <div class="flex gap-5 items-center">
<calc-button class="flex-1" @click="setStandard">设为基准</calc-button> <calc-button class="flex-1" @click="setStandard">设为基准</calc-button>
@@ -29,6 +29,7 @@
:avatar="configStore.config.avatarLink" :avatar="configStore.config.avatarLink"
:oaths="configStore.config.oaths" :oaths="configStore.config.oaths"
:display="type" :display="type"
v-model:active-skill-id="configStore.config.oathSkill"
></Info> ></Info>
</div> </div>
<Skill <Skill
frontend/src/pages/Character/Result/components/BufferSkill.vue
+25 -14
View File
@@ -1,6 +1,11 @@
<template> <template>
<div class="bg-hex-000000/60 p-2 border-solid border-#FFFF/15" v-if="data && data.length > 0"> <div
<div class="bg-hex-000000/40 text-white border-solid border-#FFFF/15 border-t-0"> class="bg-hex-000000/60 p-2 border-solid border-#FFFF/15 overflow-hidden flex"
v-if="data && data.length > 0"
>
<div
class="bg-hex-000000/40 text-white border-solid border-#FFFF/15 border-t-0 overflow-hidden flex-1 flex flex-col"
>
<div class="flex px-1px gap-1px"> <div class="flex px-1px gap-1px">
<div <div
v-for="(header, key) in [ v-for="(header, key) in [
@@ -22,21 +27,27 @@
</template> </template>
</div> </div>
</div> </div>
<div class="overflow-y-auto max-h-600px"> <div class="flex-1 overflow-hidden flex">
<div class="flex px-1px gap-1px h-8.5" v-for="(skill, _) in data" :key="_"> <div class="overflow-y-auto flex-1">
<div class="flex w-180px items-center gap-10px"> <div class="flex px-1px gap-1px h-8.5" v-for="(skill, _) in data" :key="_">
<div class="w-28px h-28px relative"> <div class="flex w-180px items-center gap-10px">
<img :src="getImageURL(skill.icon)" alt="" :class="['h-28px w-28px', skill.type === 'passive' ? 'passive' : '']" /> <div class="w-28px h-28px relative">
<div v-if="skill.lv" class="skill-lv-min" :data-text="`${skill.lv}`"> <img
{{ skill.lv }} :src="getImageURL(skill.icon)"
alt=""
:class="['h-28px w-28px', skill.type === 'passive' ? 'passive' : '']"
/>
<div v-if="skill.lv" class="skill-lv-min" :data-text="`${skill.lv}`">
{{ skill.lv }}
</div>
</div> </div>
<div>{{ skill.name }}</div>
</div> </div>
<div>{{ skill.name }}</div> <div class="w-50px flex items-center justify-center">
{{ typeof skill.cd === 'number' ? `${skill.cd.toFixed(1)}s` : '-' }}
</div>
<component :is="formatDamage(skill)"></component>
</div> </div>
<div class="w-50px flex items-center justify-center">
{{ typeof skill.cd === 'number' ? `${skill.cd.toFixed(1)}s` : '-' }}
</div>
<component :is="formatDamage(skill)"></component>
</div> </div>
</div> </div>
<!-- <div <!-- <div
frontend/src/pages/Character/Result/components/Info.vue
+185 -63
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="bg-#000000bf w-264px"> <div class="bg-#000000bf w-266px flex-1 overflow-hidden flex flex-col">
<div class="h-177px"> <div class="h-177px flex-shrink-0">
<EquList <EquList
:detail="props.equs" :detail="props.equs"
:with-sub-weapon="(infoStore.infos?.subweapons?.length ?? 0) > 0" :with-sub-weapon="(infoStore.infos?.subweapons?.length ?? 0) > 0"
@@ -21,92 +21,135 @@
</template> </template>
</div> </div>
<div class="border-y-1px border-y-solid my-1px border-#FFFF/10 bg-black"> <div class="border-y-1px border-y-solid my-1px border-#FFFF/10 bg-black">
<template v-for="suit in props.suits" :key="suit.id"> <div class="flex items-center px-5px" v-if="suit">
<div class="flex items-center px-5px"> <img
<img :src="getImageURL(`/equipment${suit.imageUrl}`)"
:src="getImageURL(`/equipment${suit.imageUrl}`)" alt=""
alt="" class="w-20px h-20px object-contain"
class="w-20px h-20px object-contain" />
/>
<div class="flex px-5px flex-1 justify-between" :class="rarityClass(suit.rarity)"> <div class="flex px-5px flex-1" :class="rarityClass(suit.rarity)">
<span>{{ suit.name }} 套装</span> <span class="flex-1 mr-auto block">{{ suit.name }} 套装</span>
<span>{{ suit.rarity }} {{ lvFormat(suit.level, suit.rarity) }}</span> <span class="w-50px text-right block">
<span>{{ suit.point }}点</span> {{ suit.rarity }} {{ lvFormat(suit.level, suit.rarity) }}
</div> </span>
<span class="w-50px text-right block">{{ suit.point }}点</span>
</div> </div>
</template> </div>
<!-- <div class="flex justify-end mr-10px text-#836832" v-if="correction > 0">
补正：{{ correction }}点
</div> -->
<div class="flex items-center px-5px" v-if="oathSuit">
<img
:src="getImageURL(`/equipment${oathSuit.imageUrl}`)"
alt=""
class="w-20px h-20px object-contain"
/>
<div class="flex px-5px flex-1" :class="rarityClass(oathSuit.rarity)">
<span class="flex-1 mr-auto block">{{ oathSuit.name }} 誓约</span>
<span class="w-50px text-right block">
{{ oathSuit.rarity }} {{ lvFormat(oathSuit.level, oathSuit.rarity) }}
</span>
<span class="w-50px text-right block">{{ oathSuit.point }}点</span>
</div>
</div>
<div v-if="oathSkills" class="flex justify-around my-5px oath-skill">
<!-- :class="['flex-1', skill.active ? 'bg-#3ea74e text-white' : 'bg-#000000bf text-#836832']" -->
<template v-for="skill in oathSkills" :key="skill.id">
<div
class="flex items-center px-5px flex-col skill"
:class="{ active: skill.active, disabled: !skill.enable }"
@click="changeSkillId(skill)"
>
<div
:style="{
backgroundImage: `url(${getImageURL(`${skill.imageUrl}`)})`,
backgroundSize: 'contain',
}"
class="w-28px h-28px skill-icon"
/>
<!-- <span class="pt-4px">{{ skill.name }}</span> -->
</div>
</template>
</div>
</div> </div>
<div class="border-y-1px border-y-solid my-1px border-#FFFF/10">
<div
class="border-y-1px border-y-solid my-1px border-#FFFF/10 flex-1 flex flex-col overflow-hidden"
>
<div class="flex"> <div class="flex">
<div class="flex-1 flex items-center justify-center bg-#221A08 text-#9A7E4A"> <div class="flex-1 flex items-center justify-center bg-#221A08 text-#9A7E4A">
穿戴{{ display == 'equ' ? '装备' : '誓约' }}信息 穿戴{{ display == 'equ' ? '装备' : '誓约' }}信息
</div> </div>
</div> </div>
<template v-if="display == 'equ'"> <div class="flex-1 overflow-y-auto">
<template v-for="part in partOrder" :key="part"> <template v-if="display == 'equ'">
<div class="flex p-2px partItem gap-5px"> <template v-for="part in partOrder" :key="part">
<img <div class="flex p-2px partItem gap-5px">
:src="getImageURL(`/equipment/part/${part}.png`)"
alt=""
class="w-20px h-20px object-contain"
/>
<div class="flex items-center justify-center" v-if="adaptation(part) > 0">
<img <img
:src="getImageURL(`/equipment/adaptation/${adaptation(part)}.png`)" :src="getImageURL(`/equipment/part/${part}.png`)"
alt="" alt=""
class="w-11px h-10px object-contain" class="w-20px h-20px object-contain"
/> />
<div class="flex items-center justify-center" v-if="adaptation(part) > 0">
<img
:src="getImageURL(`/equipment/adaptation/${adaptation(part)}.png`)"
alt=""
class="w-11px h-10px object-contain"
/>
</div>
<div
class="flex items-center"
v-if="props.equs[part]?.reinforce > 0"
:class="props.equs[part]?.reinforceType == 1 ? 'artifact' : 'advanced'"
>
+{{ props.equs[part]?.reinforce }}
</div>
<div class="rare" v-if="props.equs[part]?.refine > 0">
({{ props.equs[part]?.refine }})
</div>
<div :class="rarityClass(equ(props.equs?.[part]?.id)?.rarity ?? '')">
{{ equ(props.equs?.[part]?.id)?.name }}
</div>
</div> </div>
<div </template>
class="flex items-center"
v-if="props.equs[part]?.reinforce > 0"
:class="props.equs[part]?.reinforceType == 1 ? 'artifact' : 'advanced'"
>
+{{ props.equs[part]?.reinforce }}
</div>
<div class="rare" v-if="props.equs[part]?.refine > 0">
({{ props.equs[part]?.refine }})
</div>
<div :class="rarityClass(equ(props.equs?.[part]?.id)?.rarity ?? '')">
{{ equ(props.equs?.[part]?.id)?.name }}
</div>
</div>
</template> </template>
</template> <template v-else>
<template v-else> <template v-for="part in oathOrder" :key="part">
<template v-for="part in oathOrder" :key="part"> <div class="flex p-2px partItem gap-5px">
<div class="flex p-2px partItem gap-5px">
<img
:src="getImageURL(`/equipment/part/${part == '11' ? '誓约' : '星蕴石'}.png`)"
alt=""
class="w-20px h-20px object-contain"
/>
<div class="flex items-center justify-center" v-if="oathAdaptation(part) > 0">
<img <img
:src="getImageURL(`/equipment/adaptation/${oathAdaptation(part)}.png`)" :src="getImageURL(`/equipment/part/${part == '11' ? '誓约' : '星蕴石'}.png`)"
alt="" alt=""
class="w-11px h-10px object-contain" class="w-20px h-20px object-contain"
/> />
</div> <div class="flex items-center justify-center" v-if="oathAdaptation(part) > 0">
<!-- <div <img
:src="getImageURL(`/equipment/adaptation/${oathAdaptation(part)}.png`)"
alt=""
class="w-11px h-10px object-contain"
/>
</div>
<!-- <div
class="flex items-center" class="flex items-center"
v-if="props.equs[part]?.reinforce > 0" v-if="props.equs[part]?.reinforce > 0"
:class="props.equs[part]?.reinforceType == 1 ? 'artifact' : 'advanced'" :class="props.equs[part]?.reinforceType == 1 ? 'artifact' : 'advanced'"
> >
+{{ props.equs[part]?.reinforce }} +{{ props.equs[part]?.reinforce }}
</div> --> </div> -->
<!-- <div class="rare" v-if="props.equs[part]?.refine > 0"> <!-- <div class="rare" v-if="props.equs[part]?.refine > 0">
({{ props.equs[part]?.refine }}) ({{ props.equs[part]?.refine }})
</div> --> </div> -->
{{ equ(props.equs?.[part]?.id) }} {{ equ(props.equs?.[part]?.id) }}
<div :class="rarityClass(equ(props.oaths?.[part]?.id)?.rarity ?? '')"> <div :class="rarityClass(equ(props.oaths?.[part]?.id)?.rarity ?? '')">
{{ equ(props.oaths?.[part]?.id)?.name }} {{ equ(props.oaths?.[part]?.id)?.name }}
</div>
</div> </div>
</div> </template>
</template> </template>
</template> </div>
</div> </div>
<div class="h-40px w-full"></div> <!-- <div class="h-40px w-full"></div> -->
</div> </div>
</template> </template>
@@ -121,7 +164,11 @@ import { useInfoStore } from '@/stores'
const props = defineProps<{ const props = defineProps<{
info: IResultUserInfo[] info: IResultUserInfo[]
suits: IResultSuit[] suits: {
suit?: IResultSuit
oath?: IResultSuit
correction?: number
}
equs: Record<string, IConfigEquip> equs: Record<string, IConfigEquip>
oaths: Record<string, IConfigOath> oaths: Record<string, IConfigOath>
avatar: string avatar: string
@@ -146,6 +193,47 @@ const partOrder = [
const oathOrder = Array.from({ length: 12 }, (_, i) => (11 - i).toString()) const oathOrder = Array.from({ length: 12 }, (_, i) => (11 - i).toString())
const infoStore = useInfoStore() const infoStore = useInfoStore()
const activeSkillId = defineModel('activeSkillId', { default: '0' })
const suit = computed(() => {
return props.suits.suit
})
const oathSuit = computed(() => {
return props.suits.oath
})
const correction = computed(() => {
return props.suits.correction ?? 0
})
const changeSkillId = (skill: { skillId: string; enable: boolean }) => {
console.log(skill)
if (!skill.enable) return
if (activeSkillId.value !== skill.skillId) {
activeSkillId.value = skill.skillId
}
}
const oathSkills = computed(() => {
const skillOrder = ['2', '1', '3']
const res = props.suits.oath?.skills.sort((left, right) => {
const leftIndex = skillOrder.indexOf(left.skillId)
const rightIndex = skillOrder.indexOf(right.skillId)
const normalizedLeftIndex = leftIndex === -1 ? skillOrder.length : leftIndex
const normalizedRightIndex = rightIndex === -1 ? skillOrder.length : rightIndex
return normalizedLeftIndex - normalizedRightIndex
})
return res?.map((a) => ({
...a,
active:
(a.enable && a.id == props.suits.oath?.id) || (a.enable && a.skillId == activeSkillId.value),
}))
})
const equ = (id: string) => { const equ = (id: string) => {
if (props.display == 'oath') { if (props.display == 'oath') {
console.log(props.oaths, id) console.log(props.oaths, id)
@@ -200,4 +288,38 @@ const lvFormat = (lv: number, rarity: string) => {
.partItem:nth-child(2n) { .partItem:nth-child(2n) {
background-color: #000100; background-color: #000100;
} }
.oath-skill {
.skill {
&.active {
}
&:not(.active) {
filter: grayscale(100%);
}
.skill-icon {
border: 1px solid rgba(255, 255, 255, 0.3);
border-radius: 50%;
}
&.disabled .skill-icon {
position: relative;
filter: grayscale(100%);
&::after {
content: ' ';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 100%;
height: 100%;
background-image: url('@/assets/img/oath/disabled.png');
background-size: cover;
background-position: center;
}
}
}
}
</style> </style>
frontend/src/pages/Character/Result/components/Skill.vue
+27 -19
View File
@@ -1,6 +1,11 @@
<template> <template>
<div class="bg-hex-000000/60 p-2 border-solid border-#FFFF/15" v-if="data && data.length > 0"> <div
<div class="bg-hex-000000/40 text-white border-solid border-#FFFF/15 border-t-0"> class="bg-hex-000000/60 p-2 border-solid border-#FFFF/15 overflow-hidden flex"
v-if="data && data.length > 0"
>
<div
class="bg-hex-000000/40 text-white border-solid border-#FFFF/15 border-t-0 overflow-hidden flex-1 flex flex-col"
>
<div class="flex px-1px gap-1px"> <div class="flex px-1px gap-1px">
<div <div
v-for="(header, key) in [ v-for="(header, key) in [
@@ -22,28 +27,31 @@
</div> </div>
<div class="item-head w-60px">占比</div> <div class="item-head w-60px">占比</div>
</div> </div>
<div class="overflow-y-auto max-h-600px"> <div class="flex-1 overflow-hidden flex">
<div class="flex px-1px gap-1px h-8.5" v-for="(skill, _) in data" :key="_"> <div class="overflow-y-auto flex-1">
<div class="flex w-180px items-center gap-10px"> <div class="flex px-1px gap-1px h-8.5" v-for="(skill, _) in data" :key="_">
<div class="w-28px h-28px relative"> <div class="flex w-180px items-center gap-10px">
<img :src="getImageURL(skill.icon)" alt="" class="w-28px h-28px" /> <div class="w-28px h-28px relative">
<div v-if="skill.lv" class="skill-lv-min" :data-text="`Lv${skill.lv}`"> <img :src="getImageURL(skill.icon)" alt="" class="w-28px h-28px" />
Lv{{ skill.lv }} <div v-if="skill.lv" class="skill-lv-min" :data-text="`Lv${skill.lv}`">
Lv{{ skill.lv }}
</div>
</div> </div>
<div>{{ skill.name }} {{ !skill.mode ? '' : `[${skill.mode}]` }}</div>
</div> </div>
<div>{{ skill.name }} {{ !skill.mode ? '' : `[${skill.mode}]` }}</div> <div class="w-50px flex items-center justify-center">{{ skill.cd.toFixed(1) }}s</div>
<div class="w-50px flex items-center justify-center">
<calc-input
type="number"
class="!w-40px !min-w-40px !pl-0 flex items-center justify-center"
v-model="skillCount(skill).value"
></calc-input>
</div>
<component :is="formatDamage(skill)"></component>
</div> </div>
<div class="w-50px flex items-center justify-center">{{ skill.cd.toFixed(1) }}s</div>
<div class="w-50px flex items-center justify-center">
<calc-input
type="number"
class="!w-40px !min-w-40px !pl-0 flex items-center justify-center"
v-model="skillCount(skill).value"
></calc-input>
</div>
<component :is="formatDamage(skill)"></component>
</div> </div>
</div> </div>
<div <div
v-if="!totalStandard" v-if="!totalStandard"
class="h-40px flex items-center justify-center text-18px border-t-1px border-t-solid border-t-#FFFF/15" class="h-40px flex items-center justify-center text-18px border-t-1px border-t-solid border-t-#FFFF/15"
frontend/src/stores/config.ts
+8 -2
View File
@@ -45,6 +45,7 @@ export interface IConfig {
skills: Record<string, { lv: number; vp: number; up: number }> skills: Record<string, { lv: number; vp: number; up: number }>
equips: Record<string, IConfigEquip> equips: Record<string, IConfigEquip>
oaths: Record<string, IConfigOath> oaths: Record<string, IConfigOath>
oathSkill: string
jades: Record< jades: Record<
string, string,
{ {
@@ -111,6 +112,7 @@ export const useConfigStore = defineStore('configStore', () => {
skills: {}, skills: {},
equips: {}, equips: {},
oaths: {}, oaths: {},
oathSkill: '1',
jades: {}, jades: {},
avatar: {}, avatar: {},
sundry: {}, sundry: {},
@@ -143,6 +145,7 @@ export const useConfigStore = defineStore('configStore', () => {
skills: {}, skills: {},
equips: {}, equips: {},
oaths: {}, oaths: {},
oathSkill: '1',
jades: {}, jades: {},
avatar: {}, avatar: {},
sundry: {}, sundry: {},
@@ -230,7 +233,10 @@ export const useConfigStore = defineStore('configStore', () => {
const calc = async () => { const calc = async () => {
if (!useInfoStore().infos?.alter) return undefined if (!useInfoStore().infos?.alter) return undefined
return await api.calc(config.value) const res = await api.calc(config.value)
// const skillId = res.suits.oath?.suitId
// config.value.oathSkill = skillId || '1'
return res
} }
const chooseEqu = ( const chooseEqu = (
@@ -258,7 +264,7 @@ export const useConfigStore = defineStore('configStore', () => {
uuid: '', uuid: '',
skills: [], skills: [],
info: [], info: [],
suits: [], suits: {},
buffer: false, buffer: false,
}, },
{ resetOnExecute: false }, { resetOnExecute: false },