dev

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

@@ -1,7 +1,12 @@
 <template>
     <div class="flex flex-col mx-10px">
-      <calc-collapse title="武器/称号/宠物">
-        <Weapon></Weapon>
+      <calc-collapse title="武器/称号/宠物/秘宝">
+        <calc-tabs  v-model="anotherTab" class="!mb-2">
+          <calc-tab :value="0">武器</calc-tab>
+          <calc-tab :value="1">称号/宠物/秘宝</calc-tab>
+        </calc-tabs>
+        <Weapon v-show="anotherTab === 0"></Weapon>
+        <Else v-show="anotherTab === 1"></Else>
       </calc-collapse>
       <calc-collapse title="套装/通宝">
         <calc-tabs v-model="equTab" class="!mb-2">
@@ -25,19 +30,17 @@
 </template>
 
 <script lang="ts" setup name="Index">
-import { useInfoStore } from '@/stores/info'
-import { getImageURL } from '@/utils/images'
 import Suit from './components/Suit.vue'
 import Weapon from './components/Weapon.vue'
 import Stone from './components/Stone.vue'
 import Universal from './components/Universal.vue'
 import StoneUniversal from './components/StoneUniversal.vue'
 import StoneOld from './components/StoneOld.vue'
-import { useConfigStore } from '@/stores'
+import Else from './components/Else.vue'
 
 const equTab = ref(0)
 const stoneTab = ref(0)
-
+const anotherTab = ref(0)
 
 </script>
 

frontend/src/pages/Character/Equipment/components/Else.vue

@@ -0,0 +1,52 @@
+<!-- 每排总计6+4+4,共计14个排列 -->
+
+<template>
+  <div class="flex flex-wrap gap-4px content-start" :style="{ width: `${rowCount * 32}px` }">
+    <template v-for="(equ, _) in equs" :key="_">
+      <EquipmentIcon :equipment="equ" :inactive="configStore.config.equips[equ?.itemDetailType ?? '']?.id != equ?.id" @click="configStore.chooseEqu(equ)"/>
+    </template>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { IEquipment } from '@/api/info/type'
+import { useConfigStore, useInfoStore } from '@/stores'
+import { getImageURL } from '@/utils/images'
+import EquipmentIcon from '@/components/dnf/Equipment/Icon/index.vue'
+
+const props = defineProps<{
+  rowCount?: number
+}>()
+
+const rowCount = Math.max(props.rowCount ?? 0, 14)
+const infoStore = useInfoStore()
+const configStore = useConfigStore()
+
+const equs = computed(() => {
+  const items = infoStore.equips.filter(
+    (equip) => ['称号','宠物'].includes(equip.itemDetailType),
+  )
+  const res: (IEquipment | undefined)[] = []
+  Array.from(new Set(items.map((item) => item.itemDetailType))).forEach((type) => {
+    const equList = items.filter((item) => item.itemDetailType === type)
+    equList.sort((a, b) => {
+      if (a.itemType !== b.itemType) {
+      return b.itemType.localeCompare(a.itemType)
+      }
+      const rarityOrder = ['传说', '神器', '稀有']
+      return rarityOrder.indexOf(a.rarity) - rarityOrder.indexOf(b.rarity)
+    })
+    res.push(
+      ...equList
+    )
+    const remind = rowCount - (res.length % rowCount)
+    res.push(...Array(remind + rowCount).fill(undefined))
+  })
+  const treasure = infoStore.equips.filter(
+    (equip) => equip.categorize.includes('秘宝'),
+  )
+  res.push(...treasure,...Array(rowCount-treasure.length).fill(undefined))
+  return res
+})
+
+</script>

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

@@ -22,6 +22,10 @@ export default defineComponent({
     const has_emblem_1 = computed(
       () => has_socket.value && !['辅助装备', '魔法石'].includes(part.value as string),
     )
+    /** 是否可以设置秘宝精度 */
+    const can_set_secret = computed(() => {
+      return ['辅助装备', '魔法石','耳环'].includes(part.value as string)
+    })
     const basicInfoStore = useInfoStore()
 
     const enchant_list = computed<IEnchantingInfo[] | undefined>(() => {
@@ -116,6 +120,8 @@ export default defineComponent({
     // 调适
     const adaptation = currentInfo<string | number>('adaptation')
 
+    //精度
+    const precision = currentInfo<number>('precision',0)
     /**
      * 同步徽章1到徽章2
      * @param val
@@ -229,6 +235,22 @@ export default defineComponent({
           ) : (
             <div></div>
           )}
+          {
+            can_set_secret.value ? (<>
+            <div class="equ-profile-item">
+              <div class="row-name">秘宝</div>
+              <calc-slider
+                showPercent={true}
+                showValue={false}
+                v-model={precision.value}
+                min={0}
+                max={100}
+                step={1}
+                class="flex-1 !h-20px"
+              />
+            </div>
+            </>) : <div></div>
+          }
         </div>
         </>
       )

frontend/src/stores/config.ts

@@ -26,6 +26,7 @@ export interface IConfigEquip {
   refine: number
   adaptation: number
   fusion: string
+  precision: number
 }
 
 export interface IConfig {
@@ -61,6 +62,7 @@ const defaultEqusConfig = {
   refine: 0,
   adaptation: 0,
   fusion: '',
+  precision: 0,
 }
 
 const defaultAvatarConfig = {