dev

frontend/src/api/calc/type.ts

@@ -17,6 +17,7 @@ export interface IResultSkill {
   damage: number
   mode: string
   buff:number[]
+  learnLv: number
 }
 
 export interface IResultUserInfo {

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

@@ -83,6 +83,9 @@ const choose_part = ref<string[]>([])
 
 const chooseCategory = (cat: string) => {
   type.value = cat
+  if(type.value == 'stone' && curSuit.value == -1){
+    curSuit.value = 16203
+  }
 }
 
 const configStore = useConfigStore()
@@ -101,7 +104,7 @@ const suitList = computed(() => {
     }
   })
   const res = Array.from(uniqueSuits.values())
-  res.push({ name: '通宝', value: -1, imageUrl: '/suit/little/-1.png' })
+  if(type.value == 'equ') res.push({ name: '通宝', value: -1, imageUrl: '/suit/little/-1.png' })
   return res
 })
 
@@ -113,7 +116,8 @@ const equs = computed(() => {
       (choose_part.value.length === 0 ||
         choose_part.value.includes(a.itemDetailType || a.itemType)) &&
       (a.suit.length == 0 ||
-        (curSuit.value == -1 && a.suit.length > 1) ||
+        (curSuit.value == -1 && a.suit.length > 1 && type.value == 'equ') ||
+        (a.suit.length > 1 && type.value == 'stone') ||
         (a.suit.includes(curSuit.value.toString()) && a.suit.length === 1)),
   )
 

frontend/src/pages/Character/Result/components/Skill.vue

@@ -4,7 +4,7 @@
       <div class="flex px-1px gap-1px">
         <div
           v-for="(header, key) in [
-            { label: '技能', width: 180, sortKey: 'name' },
+            { label: '技能', width: 180, sortKey: 'learnLv' },
             { label: 'CD', width: 50, sortKey: 'cd' },
             { label: '次数', width: 50 },
             { label: '秒伤', width: 100, sortKey: 'dps' },
@@ -69,7 +69,7 @@ const props = defineProps<{
   }
 }>()
 
-const sort = ref<string>('total')
+const sort = ref<string>('learnLv')
 const order = ref<'asc' | 'desc'>('desc')
 
 const config = useConfigStore()
@@ -78,7 +78,7 @@ const data = computed(() => {
   return props.data.sort((a, b) => {
     let aValue = 0
     let bValue = 0
-    if (['damage', 'cd', 'name'].includes(sort.value)) {
+    if (['damage', 'cd', 'learnLv'].includes(sort.value)) {
       // @ts-ignore
       aValue = a[sort.value]
       // @ts-ignore