dev

frontend/src/api/info/type.ts

@@ -40,6 +40,19 @@ export interface ICharacterInfo {
   jades: IJade[]
   sundry: Record<string, ISundry>
   options: { id: number; name: string; options: string[] }[]
+  oaths_skills: Record<
+    string,
+    {
+      suitInfo: {
+        name: string
+        rarity: string
+        SkillAttack: number
+        Buffer: number
+        Attack: number
+      }[]
+      skills: { skillId: string; name: string; icon: string }[]
+    }
+  >
 }
 
 export interface ISundry {
@@ -78,7 +91,6 @@ export interface IEquipment {
   displayUrl?: string
 }
 
-
 export interface ISkill {
   icon: string
   name: string

frontend/src/components/dnf/Avatar/List/index.vue

@@ -13,9 +13,8 @@
 </template>
 
 <script lang="ts" setup name="EquList">
-import { getImageURL } from '@/utils/images'
 import { useVModel } from '@vueuse/core'
-import { useInfoStore, useConfigStore } from '@/stores'
+import { useInfoStore } from '@/stores'
 
 const props = defineProps({
   part: {
@@ -29,7 +28,7 @@ const infoStore = useInfoStore()
 const infoStyle = (part: string) => {
   let x = 15
   let y = 5
-  let index = infoStore.avatarParts.findIndex((p) => p == part)
+  const index = infoStore.avatarParts.findIndex((p) => p == part)
   // if (index == 13) {
   //   index -= 7
   // } else if (index >= 5 && index <= 12) {

frontend/src/components/dnf/Emblem/List/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <div class="pos-relative w-248px h-full" :class="props.withBg ? 'emblem-bg' : ''"></div>
+</template>
+
+<script lang="ts" setup name="EmblemList">
+const props = defineProps({
+  withBg: {
+    type: Boolean,
+    default: true,
+  },
+  detail: {
+    type: Object as PropType<Record<string, any>>,
+  },
+})
+</script>
+
+<style lang="scss" scoped>
+.emblem-bg {
+  background-image: url(../Images/head.png);
+}
+</style>

frontend/src/pages/Character/EquipmentDictionary/Index.vue

@@ -71,14 +71,75 @@
     </div>
   </div>
   <div class="px-5px flex flex-col">
-    <div class="flex flex-col overflow-hidden bg-black" v-if="curEquInfo">
-      <div class="item-head">基础信息</div>
-      <div class="flex-1 overflow-y-auto overflow-x-hidden bg-black w-240px">
+    <!-- 基础信息 -->
+    <div
+      class="flex flex-col overflow-hidden bg-black"
+      :class="!hideBase ? '' : 'mb-4px'"
+      v-if="curEquInfo"
+    >
+      <div class="item-head" @click="hideBase = !hideBase">
+        基础信息{{ hideBase ? ' (点击显示)' : '（点击隐藏）' }}
+      </div>
+      <div v-show="!hideBase" class="overflow-y-auto overflow-x-hidden bg-black w-240px">
         <Info v-if="curEquInfo" :equipment="curEquInfo" />
       </div>
     </div>
-    <div class="flex flex-col flex-1 overflow-hidden bg-black" v-if="curSuitInfo">
-      <div class="item-head">套装信息</div>
+    <!-- 套装信息 -->
+    <div
+      class="flex flex-col overflow-hidden bg-black"
+      :class="!hideSuit ? 'flex-1' : 'mb-4px'"
+      v-if="curSuitInfo"
+    >
+      <div class="item-head" @click="hideSuit = !hideSuit">
+        套装信息{{ hideSuit ? ' (点击显示)' : '（点击隐藏）' }}
+      </div>
+      <div v-show="!hideSuit">
+        <div class="flex bg-#191918 items-center justify-center gap-2px p-5px">
+          <calc-button
+            :disabled="raritiyList.findIndex((rarity) => rarity === curSuitLv.rarity) <= 0"
+            icon="min-little"
+            @click="changeSuitLv('preRarity')"
+          ></calc-button>
+          <calc-button
+            icon="reduce-little"
+            :disabled="
+              raritiyList.findIndex((rarity) => rarity === curSuitLv.rarity) <= 0 &&
+              curSuitLv.lv <= 1
+            "
+            @click="changeSuitLv('preLv')"
+          ></calc-button>
+          <div class="flex px-20px gap-x-10px" :class="rarityClass(curSuitLv.rarity)">
+            <span>{{ curSuitLv.rarity }}</span>
+            <span>{{ formatLv(curSuitLv.lv, curSuitLv.rarity) }}</span>
+          </div>
+          <calc-button
+            :disabled="
+              raritiyList.findIndex((rarity) => rarity === curSuitLv.rarity) >=
+              raritiyList.length - 1
+            "
+            @click="changeSuitLv('nextLv')"
+            icon="increase-little"
+          ></calc-button>
+          <calc-button
+            :disabled="
+              raritiyList.findIndex((rarity) => rarity === curSuitLv.rarity) >=
+              raritiyList.length - 1
+            "
+            @click="changeSuitLv('nextRarity')"
+            icon="max-little"
+          ></calc-button>
+        </div>
+        <div
+          class="w-80% m-auto h-1px bg-gradient-to-r from-[rgba(52,43,27,0.05)] via-[rgba(52,43,27,1)] to-[rgba(52,43,27,0.05)]"
+        ></div>
+        <div class="flex-1 overflow-y-auto overflow-x-hidden bg-black w-240px">
+          <SuitInfo v-if="curSuitInfo" :suit="curSuitInfo" />
+        </div>
+      </div>
+    </div>
+    <div class="flex flex-col flex-1 overflow-hidden bg-black" v-if="curOathInfo">
+      <div class="item-head">誓约信息</div>
+
       <div class="flex bg-#191918 items-center justify-center gap-2px p-5px">
         <calc-button
           :disabled="raritiyList.findIndex((rarity) => rarity === curSuitLv.rarity) <= 0"
@@ -111,6 +172,20 @@
           icon="max-little"
         ></calc-button>
       </div>
+
+      <!-- 技能信息 -->
+      <div class="flex items-center justify-center py-5px">
+        <template v-for="skill in curOathInfo.skills" :key="skill.name">
+          <div
+            class="flex-1 flex flex-col items-center justify-center"
+            :class="{ unActive: skill.skillId != oathSkillId }"
+            @click="oathSkillId = skill.skillId"
+          >
+            <img class="w-40px h-40px" :src="getImageURL(skill.icon)" :alt="skill.name" />
+            <div class="text-#DED29A">{{ skill.name }}</div>
+          </div>
+        </template>
+      </div>
       <div
         class="w-80% m-auto h-1px bg-gradient-to-r from-[rgba(52,43,27,0.05)] via-[rgba(52,43,27,1)] to-[rgba(52,43,27,0.05)]"
       ></div>
@@ -148,6 +223,10 @@ const curSuitLv = ref({
 })
 const triggerVisible = ref(false)
 
+const hideBase = ref(false)
+const hideSuit = ref(false)
+const oathSkillId = ref('1')
+
 const raritiyList = ['稀有', '神器', '传说', '史诗', '太初']
 
 const formatLv = (number: number, raritiy?: string) => {
@@ -213,6 +292,13 @@ const curSuitInfo = computed(() => {
   )
 })
 
+const curOathInfo = computed(() => {
+  if (curEquInfo.value?.suit.length != 1 || curEquInfo.value?.oathPos == undefined) {
+    return undefined
+  }
+  return infoStore.oathSkills?.[curEquInfo.value?.suit[0]]
+})
+
 const chooseCategory = (cat: string) => {
   type.value = cat
   if (type.value == 'oath' && curSuit.value == -1) {
@@ -326,4 +412,8 @@ const chooseEqu = (item?: IEquipment) => {
   border-bottom: 1px solid #211d15;
   text-align: center;
 }
+
+.unActive {
+  filter: grayscale(100%);
+}
 </style>

frontend/src/pages/Character/Forge/components/Emblems.vue

@@ -1,5 +1,9 @@
 <template>
-  <div></div>
+  <div class="h-180px flex justify-center items-center">
+    <EmblemList :withBg="true" />
+  </div>
 </template>
 
-<script lang="ts" setup name="Emblems"></script>
+<script lang="ts" setup name="Emblems">
+import EmblemList from '@/components/dnf/Emblem/List/index.vue'
+</script>

frontend/src/pages/Character/Forge/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="w-420px overflow-auto">
-    <calc-collapse class="w-100%" title="装备/时装打造(点击部位切换)">
+    <calc-collapse class="w-100%" title="装备/时装/徽章打造(点击部位切换)">
       <calc-tabs v-model="partTab" class="!mb-2">
         <calc-tab :value="0">装备</calc-tab>
         <calc-tab :value="2">誓约</calc-tab>

frontend/src/stores/info.ts

@@ -45,6 +45,29 @@ export const useInfoStore = defineStore('infoStore', () => {
     return result
   })
 
+  const oathSkills = computed(() => {
+    const origin = infos.value?.oaths_skills
+    if (!origin) return origin
+
+    const skillOrder = ['2', '1', '3']
+
+    return Object.fromEntries(
+      Object.entries(origin).map(([key, value]) => [
+        key,
+        {
+          ...value,
+          skills: [...value.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
+          }),
+        },
+      ]),
+    )
+  })
   const standardUUID = ref<string>()
 
   const setStandard = (
@@ -139,5 +162,6 @@ export const useInfoStore = defineStore('infoStore', () => {
     standard,
     sundries,
     options,
+    oathSkills,
   }
 })