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

dev

Browse Source
This commit is contained in:
西瓜°
2026-04-19 15:47:44 +08:00
parent 97da529e35
commit dbf33477d9
12 changed files with 182 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/core/basic/character/base.py
+6 -1
View File
@@ -1,4 +1,5 @@
from collections.abc import Mapping
import sys
from typing import Any, Literal
from core.abstract.character import CharacterProperty
@@ -91,7 +92,7 @@ class CharacterBase(CharacterProperty):
# 唤醒的情况下的基础数据
self.AtkP = 0 + 65
self.AtkM = 0 + 65
self.AtkI = 1116 + 65
self.AtkI = 0 + 65
self.PAtkP = 1.0
self.PAtkM = 1.0
self.PAtkI = 1.0
@@ -239,6 +240,10 @@ class CharacterBase(CharacterProperty):
],
) -> None:
"""设置角色属性"""
# if kwargs.get('SkillAttack', 0) != 0:
# frame = sys._getframe(1) # 1 表示上一级调用帧
# caller_name = frame.f_code.co_name
# print(caller_name, kwargs.get('SkillAttack', 0))
self.STR += 力量 + kwargs.get('STR', 0) + 四维 + 力智
self.INT += 智力 + kwargs.get('INT', 0) + 四维 + 力智
self.Spirit += 精神 + kwargs.get('Spirit', 0) + 四维 + 体精
backend/core/basic/character/calc_equip.py
+15 -8
View File
@@ -18,18 +18,25 @@ class CalcEquipMixin(CharacterBase):
self.charOathInfo = []
self.charEmblemInfo = []
self.bindAwake = info.get('bindAwake', 50)
if info.get('emblems', None) is None:
info['emblems'] = {}
if info.get('oaths', None) is None:
info['oaths'] = {}
for key in info['equips']:
self.charEquipInfo[key] = CharacterEquipInfo(info['equips'][key], self.equVersion, key)
for key in info['oaths']:
# 导入誓约打造信息、誓约信息
self.charOathInfo.append(CharacterOathInfo(info['oaths'][key], self.equVersion, key))
# 异常处理 彩色等级自动取最小值
minEmblemLv = min([info['emblems'][key]['lv'] for key in ['红色', '蓝色', '绿色', '黄色']], default=1)
info['emblems']['彩色']['lv'] = minEmblemLv
for key in info['emblems']:
# 导入徽章打造信息、徽章信息
info['emblems'][key]['part'] = key
self.charEmblemInfo.append(CharacterEmblemInfo(info['emblems'][key]))
try:
# 异常处理 彩色等级自动取最小值
minEmblemLv = min([info['emblems'][key]['lv'] for key in ['红色', '蓝色', '绿色', '黄色']], default=1)
info['emblems']['彩色']['lv'] = minEmblemLv
for key in info['emblems']:
# 导入徽章打造信息、徽章信息
info['emblems'][key]['part'] = key
self.charEmblemInfo.append(CharacterEmblemInfo(info['emblems'][key]))
pass
except Exception as e:
pass
self.charOathSkillId = info.get('oathSkill', 1)
@@ -94,7 +101,7 @@ 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)
zero_point_suits = [suit for suit in suitInfo if suitInfo[suit]['point'] == 0]
# 套装没有到太初的时候，优先把誓约套装的点数加到装备套装上，以达到更高的套装等级
if 0 < suitInfo[max_point_suit]['point'] < 2550:
if 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'])
oathSuitInfo[max_point_oath_suit]['point'] -= min(2550 - suitInfo[max_point_suit]['point'], oathSuitInfo[max_point_oath_suit]['point'])
pass
backend/core/basic/character/info.py
+8 -4
View File
@@ -51,18 +51,22 @@ class CharacterInfoMixin(CharacterBase):
equInfos = get_equipment(self.equVersion)
equs = []
suits = []
stones = []
oaths = []
# stones = []
for i in equInfos.equs:
if i.itemType == '武器' and i.itemDetailType not in self.武器选项:
continue
equs.append(i.__dict__)
for i in equInfos.suits:
suits.append(i.__dict__)
for i in equInfos.stones:
stones.append(i.__dict__)
for i in equInfos.oaths:
oaths.append(i.__dict__)
# for i in equInfos.stones:
# stones.append(i.__dict__)
info['oaths'] = oaths
info['equips'] = equs
info['suits'] = suits
info['stones'] = stones
# info['stones'] = stones
key = '辅助' if self.buffer else '输出'
info['enchants'] = list(filter(lambda x: key in x['categorize'], equInfos.enchants))
info['emblems'] = [i for i in equInfos.emblems]
backend/core/basic/equipment.py
+29 -27
View File
@@ -80,10 +80,10 @@ class Equipments:
self.equs: list[Equ] = []
self.oaths: list[Oath] = []
self.oath_dict: dict[str, Oath] = {}
self.stones: list[Equ] = []
# self.stones: list[Equ] = []
self.funs = self.init_func()
self.equ_dict: dict[str, Equ] = {}
self.stone_dict: dict[str, Equ] = {}
# self.stone_dict: dict[str, Equ] = {}
self.jades = []
self.enchants = []
self.emblems = []
@@ -94,7 +94,7 @@ class Equipments:
self.init_equs()
self.init_suits()
self.init_enchants()
self.init_stones()
# self.init_stones()
self.init_emblem()
self.init_jades()
self.init_oaths()
@@ -124,27 +124,27 @@ class Equipments:
self.equs.append(equ)
self.equ_dict[equ.id] = equ
def init_stones(self):
"""从数据库中获取所有装备信息"""
with Session(self.engine) as session:
db_list = session.query(StoneData).all()
keys = [key for key in StoneData.__dict__.keys() if key[0].isupper()] + ['suit']
for item in db_list:
max_adaptation = 0
item.id = str(item.id)
for attr in keys:
if attr == 'suit':
value = parse_to_number_list(getattr(item, attr), [])
value = [str(int(i)) for i in value]
else:
value = parse_to_number_list(getattr(item, attr))
max_adaptation = max(max_adaptation, len(value) - 1)
setattr(item, attr, value)
stone_dict = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
stone_dict['max_adaptation'] = max_adaptation
stone = Equ(**stone_dict)
self.stones.append(stone)
self.stone_dict[stone.id] = stone
# def init_stones(self):
# """从数据库中获取所有装备信息"""
# with Session(self.engine) as session:
# db_list = session.query(StoneData).all()
# keys = [key for key in StoneData.__dict__.keys() if key[0].isupper()] + ['suit']
# for item in db_list:
# max_adaptation = 0
# item.id = str(item.id)
# for attr in keys:
# if attr == 'suit':
# value = parse_to_number_list(getattr(item, attr), [])
# value = [str(int(i)) for i in value]
# else:
# value = parse_to_number_list(getattr(item, attr))
# max_adaptation = max(max_adaptation, len(value) - 1)
# setattr(item, attr, value)
# stone_dict = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
# stone_dict['max_adaptation'] = max_adaptation
# stone = Equ(**stone_dict)
# self.stones.append(stone)
# self.stone_dict[stone.id] = stone
def init_suits(self):
"""从数据库中获取所有套装信息"""
@@ -188,9 +188,9 @@ class Equipments:
db_list = session.query(EmblemData).all()
for item in db_list:
emblem = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
emblem['position'] = [] if emblem['itemType'] is None else emblem['itemType'].split(',')
emblem['categorize'] = [] if emblem['categorize'] is None else emblem['categorize'].split(',')
del emblem['itemType']
# emblem['position'] = [] if emblem['itemType'] is None else emblem['itemType'].split(',')
# emblem['categorize'] = [] if emblem['categorize'] is None else emblem['categorize'].split(',')
# del emblem['itemType']
self.emblems.append(emblem)
pass
pass
@@ -336,6 +336,8 @@ class Oath:
Buffer: list[float] | float
wearUrl: list[str]
max_adaptation: int
itemType: str
itemDetailType: str
def __init__(self, **kwargs):
self.__dict__.update(kwargs)
backend/dataFiles/dcalc_0.db
BIN
View File
Binary file not shown.
backend/database/models.py
+9 -4
View File
@@ -104,11 +104,12 @@ class EmblemData(Base):
__tablename__ = 'emblem'
id = Column(Integer, primary_key=True)
detail = Column(Text)
categorize = Column(Integer)
itemType = Column(Text)
fame = Column(Integer)
rarityId = Column(Integer)
rarity = Column(Text)
typeId = Column(Integer)
type = Column(Text)
value = Column(Text)
fame = Column(Integer)
class JadeData(Base):
@@ -135,6 +136,8 @@ class OathData(Base):
rarity = Column(Text)
position = Column(Text)
Point = Column(Integer)
itemType = Column(Text)
itemDetailType = Column(Text)
categorize = Column(Text)
imageUrl = Column(Text)
detail = Column(Text)
@@ -165,6 +168,8 @@ class PrimerData(Base):
name = Column(Text)
rarity = Column(Text)
position = Column(Text)
itemType = Column(Text)
itemDetailType = Column(Text)
Point = Column(Integer)
categorize = Column(Text)
imageUrl = Column(Text)
frontend/src/api/info/type.ts
+7 -1
View File
@@ -31,6 +31,7 @@ export interface ICharacterInfo {
stones: IEquipment[]
enchants: IEnchantingInfo[]
emblems: IEnchantingInfo[]
oaths: IEquipment[]
weapons: string[]
subweapons: string[]
skills: ISkill[]
@@ -73,6 +74,11 @@ export interface IEquipment {
bufferDetail: string
}
export interface IOathInfo extends IEquipment {
position: string[]
wearUrl: string[]
}
export interface ISkill {
icon: string
name: string
@@ -91,7 +97,7 @@ export interface ISkill {
desc: string
}[]
uuid: string
upType:'damage' |'heal'
upType: 'damage' | 'heal'
}
export interface ISuit {
frontend/src/components/dnf/Equipment/List/index.vue
+27 -27
View File
@@ -16,9 +16,9 @@
{{ partName(part) }}
</template>
</div>
<div v-if="detail?.[part]?.fusion" class="pos-absolute" :style="fusionStyle(part)">
<EquipmentIcon :equipment="stones(detail[part].fusion)" />
</div>
<!-- <div v-if="detail?.[part]?.fusion" class="pos-absolute" :style="fusionStyle(part)">
<EquipmentIcon :equipment="oaths(detail[part].fusion)" />
</div> -->
</template>
<div
v-if="props.withSubWeapon"
@@ -69,7 +69,7 @@ const props = defineProps({
avatar: {
type: String,
default: '',
}
},
})
const partModelValue = useVModel(props, 'part')
const infoStore = useInfoStore()
@@ -90,9 +90,9 @@ const equ = (id: string) => {
return infoStore.equips.find((e) => e.id == id)
}
const stones = (id: string) => {
return infoStore.stones.find((e) => e.id == id)
}
// const oaths = (id: string) => {
// return infoStore.oaths.find((e) => e.id == id)
// }
const infoStyle = (part: string) => {
let x = 10
@@ -117,30 +117,30 @@ const infoStyle = (part: string) => {
return style
}
const fusionStyle = (part: string) => {
let x = 0
let y = 15
let index = infoStore.parts.findIndex((p) => p == part)
// const fusionStyle = (part: string) => {
// let x = 0
// let y = 15
// let index = infoStore.parts.findIndex((p) => p == part)
if (index >= 5 && index <= 12) {
x += 179
index -= 5
}
// if (index >= 5 && index <= 12) {
// x += 179
// index -= 5
// }
if (index == 13) {
index = 5
}
// if (index == 13) {
// index = 5
// }
x += (index % 2) * 39
y += Math.floor(index / 2) * 34
// x += (index % 2) * 39
// y += Math.floor(index / 2) * 34
return {
left: `${x}px`,
top: `${y}px`,
zIndex: 7,
transform: 'scale(0.6)',
}
}
// return {
// left: `${x}px`,
// top: `${y}px`,
// zIndex: 7,
// transform: 'scale(0.6)',
// }
// }
const choosePart = (part: string) => {
partModelValue.value = part
}
frontend/src/pages/Character/Equipment/Index.vue
+1 -1
View File
@@ -18,7 +18,7 @@
<Suit v-show="equTab === 0"></Suit>
<Universal v-show="equTab === 1"></Universal>
</calc-collapse>
<calc-collapse title="融合石">
<calc-collapse title="誓约">
<calc-tabs v-model="stoneTab" class="!mb-2">
<calc-tab :value="0">套装</calc-tab>
<calc-tab :value="1">通宝</calc-tab>
frontend/src/pages/Character/EquipmentDictionary/Index.vue
+14 -11
View File
@@ -15,10 +15,10 @@
<div class="w-auto text-18px flex items-center justify-center !font-normal">|</div>
<div
class="flex-1 text-15px flex items-center justify-center"
@click="chooseCategory('stone')"
:class="{ active: type === 'stone' }"
@click="chooseCategory('oath')"
:class="{ active: type === 'oath' }"
>
融合石
誓约
</div>
</div>
<div
@@ -126,11 +126,11 @@ import PartSelect from '@/components/dnf/Equipment/PartSelect/index.vue'
import EquipmentRaritySelect from '@/components/dnf/Equipment/RaritySelect/index.vue'
import { getImageURL } from '@/utils/images'
import { rarityClass } from '@/utils'
import type { IEquipment } from '@/api/info/type'
import type { IEquipment, IOathInfo } from '@/api/info/type'
import EquipmentIcon from '@/components/dnf/Equipment/Icon/index.vue'
import Info from '@/components/dnf/Equipment/Info/index.vue'
import SuitInfo from '@/components/dnf/Equipment/SuitInfo/index.vue'
import { formatEqu, formatStone } from './formatData'
import { formatEqu, formatOath } from './formatData'
import options from './components/options.vue'
// const props = defineProps<{
@@ -197,7 +197,7 @@ const curEquInfo = computed(() => {
if (type.value == 'equ') {
return infoStore.equips.find((a) => a.id == curEquId.value)
} else {
return infoStore.stones.find((a) => a.id == curEquId.value)
return infoStore.oaths.find((a) => a.id == curEquId.value)
}
})
@@ -215,7 +215,7 @@ const curSuitInfo = computed(() => {
const chooseCategory = (cat: string) => {
type.value = cat
if (type.value == 'stone' && curSuit.value == -1) {
if (type.value == 'oath' && curSuit.value == -1) {
curSuit.value = 16203
}
}
@@ -240,14 +240,14 @@ const suitList = computed(() => {
const equs = computed(() => {
// 筛选出装备
const total = (type.value == 'equ' ? infoStore.equips : infoStore.stones).filter(
const total = (type.value == 'equ' ? infoStore.equips : infoStore.oaths).filter(
(a) =>
(!curRarity.value || a.rarity === curRarity.value) &&
(choose_part.value.length === 0 ||
choose_part.value.includes(a.itemDetailType || a.itemType)) &&
(a.suit.length == 0 ||
(curSuit.value == -1 && a.suit.length > 1 && type.value == 'equ') ||
(a.suit.length > 1 && type.value == 'stone') ||
(a.suit.length > 1 && type.value == 'oath') ||
(a.suit.includes(curSuit.value.toString()) && a.suit.length === 1)),
)
@@ -258,7 +258,10 @@ const equs = computed(() => {
suitList.value.find((a) => a.value == curSuit.value)?.name,
)
} else {
return formatStone(total, suitList.value.find((a) => a.value == curSuit.value)?.name)
return formatOath(
total as unknown as IOathInfo[],
suitList.value.find((a) => a.value == curSuit.value),
)
}
})
@@ -272,7 +275,7 @@ const isActive = computed(() => {
return configStore.config.equips[item.itemDetailType].id == item.id
}
} else {
return configStore.config.equips[item.itemDetailType].fusion == item.id
// return configStore.config.equips[item.itemDetailType].fusion == item.id
}
}
})
frontend/src/pages/Character/EquipmentDictionary/formatData.ts
+58 -21
View File
@@ -1,4 +1,4 @@
import type { IEquipment } from '@/api/info/type'
import type { IEquipment, IOathInfo } from '@/api/info/type'
export const rowCount = 10
@@ -7,23 +7,25 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
const item_weapon = total.filter((a) => a.itemType == '武器') ?? []
const weapons: (IEquipment | undefined)[] = []
if (item_weapon.length > 0) {
Array.from(new Set(item_weapon.map((item) => item.rarity))).filter(a=>!['稀有','神器'].includes(a)).forEach((rarity) => {
const weapon = item_weapon
.filter((item) => item.rarity === rarity)
.sort((a, b) => {
if (a.categorize == b.categorize) {
return a.itemDetailType.localeCompare(b.itemDetailType)
}
return b.categorize.localeCompare(a.categorize)
})
weapons.push(
...weapon.filter((a) => !['传世武器升级', '狄瑞吉传世武器'].includes(a.categorize)),
)
const remind = weapons.length % rowCount
if (remind > 0) {
weapons.push(...Array(rowCount - remind).fill(undefined))
}
})
Array.from(new Set(item_weapon.map((item) => item.rarity)))
.filter((a) => !['稀有', '神器'].includes(a))
.forEach((rarity) => {
const weapon = item_weapon
.filter((item) => item.rarity === rarity)
.sort((a, b) => {
if (a.categorize == b.categorize) {
return a.itemDetailType.localeCompare(b.itemDetailType)
}
return b.categorize.localeCompare(a.categorize)
})
weapons.push(
...weapon.filter((a) => !['传世武器升级', '狄瑞吉传世武器'].includes(a.categorize)),
)
const remind = weapons.length % rowCount
if (remind > 0) {
weapons.push(...Array(rowCount - remind).fill(undefined))
}
})
if (item_weapon.some((a) => a.categorize === '传世武器升级')) {
const length = item_weapon.filter((a) => a.categorize === '传世武器升级').length
weapons.push(...Array(length).fill(undefined))
@@ -88,9 +90,13 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
(equip) => equip.categorize.includes('套装') || equip.categorize.includes('通宝'),
)
const suits: (IEquipment | undefined)[] = []
const raritiyList = Array.from(new Set(item_suits.map((item) => item.rarity))).filter(a=>!['稀有','神器'].includes(a))
const raritiyList = Array.from(new Set(item_suits.map((item) => item.rarity))).filter(
(a) => !['稀有', '神器'].includes(a),
)
raritiyList.forEach((rarity) => {
const armor = item_suits.filter((item) => item.rarity === rarity && item.itemType === '防具' && !item.name.includes("侵蚀"))
const armor = item_suits.filter(
(item) => item.rarity === rarity && item.itemType === '防具' && !item.name.includes('侵蚀'),
)
if (armor.length > 0) {
suits.push(...armor, undefined)
}
@@ -119,7 +125,9 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
suits.push(...Array(rowCount - (suits.length % rowCount)).fill(undefined))
}
const armorUpgrade = item_suits.filter((item) => item.rarity === rarity && item.itemType === '防具' && item.name.includes("侵蚀"))
const armorUpgrade = item_suits.filter(
(item) => item.rarity === rarity && item.itemType === '防具' && item.name.includes('侵蚀'),
)
if (armorUpgrade.length > 0) {
suits.push(...armorUpgrade)
}
@@ -283,3 +291,32 @@ export const formatStone = (total: IEquipment[], curSuit?: string) => {
// },
]
}
export const formatOath = (
total: IOathInfo[],
curSuit?: { name: string; value: number; imageUrl: string },
) => {
// oath
const oath = total.filter((equip) => equip.itemDetailType == '誓约')
oath.push(...Array(rowCount - (oath.length % rowCount)).fill(undefined))
// primer
const primer = []
const primerItem = total.filter((equip) => equip.itemDetailType == '星蕴石')
for (let i = 0; i < 11; i++) {
const temp = primerItem.filter((a) => a.position.includes(i.toString()))
primer.push(
...temp,
...Array(temp.length == 0 ? rowCount : rowCount - (temp.length % rowCount)).fill(undefined),
)
}
return [
{
name: `${curSuit?.name} 誓约`,
equs: oath,
},
{
name: `${curSuit?.name} 星蕴石`,
equs: primer,
},
]
}
frontend/src/stores/info.ts
+8 -4
View File
@@ -18,7 +18,7 @@ export const useInfoStore = defineStore('infoStore', () => {
const emblems = computed(() => infos.value?.emblems ?? [])
const stones = computed(() => infos.value?.stones ?? [])
// const stones = computed(() => infos.value?.stones ?? [])
const avatars = computed(() => infos.value?.avatar ?? {})
@@ -28,6 +28,8 @@ export const useInfoStore = defineStore('infoStore', () => {
const options = computed(() => infos.value?.options ?? [])
const oaths = computed(() => infos.value?.oaths ?? [])
const standardUUID = ref<string>()
const setStandard = (
@@ -39,7 +41,9 @@ export const useInfoStore = defineStore('infoStore', () => {
}[],
) => {
if (!result) {
!!standardUUID.value && sessionStorage.removeItem(standardUUID.value)
if (!!standardUUID.value) {
sessionStorage.removeItem(standardUUID.value)
}
standardUUID.value = undefined
} else {
standardUUID.value = result.uuid
@@ -106,13 +110,13 @@ export const useInfoStore = defineStore('infoStore', () => {
enchants,
emblems,
parts,
stones,
oaths,
avatarParts,
avatars,
jades,
setStandard,
standard,
sundries,
options
options,
}
})