From 06a482188816dc0408a5d06199e46d573a599d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Sun, 9 Feb 2025 19:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=E4=BF=AE=E5=A4=8D=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E4=B8=BANone=E6=97=B6=E7=9A=84=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app/t-itemBox.vue          |  4 +++-
 src/components/userCombat/tuc-avatars.vue | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/app/t-itemBox.vue b/src/components/app/t-itemBox.vue
index db76fda1..dc75afb6 100644
--- a/src/components/app/t-itemBox.vue
+++ b/src/components/app/t-itemBox.vue
@@ -7,7 +7,9 @@
       <slot name="icon"><img :src="props.modelValue.icon" alt="icon" /></slot>
     </div>
     <div class="tib-cover">
-      <div class="tib-lt"><img :src="props.modelValue.lt" alt="lt" /></div>
+      <div class="tib-lt" v-show="props.modelValue.lt !== ''">
+        <img :src="props.modelValue.lt" alt="lt" />
+      </div>
       <div v-show="props.modelValue.rt" class="tib-rt">{{ props.modelValue.rt }}</div>
       <div class="tib-inner">
         <slot name="inner-icon">
diff --git a/src/components/userCombat/tuc-avatars.vue b/src/components/userCombat/tuc-avatars.vue
index ccbd1085..cba566ce 100644
--- a/src/components/userCombat/tuc-avatars.vue
+++ b/src/components/userCombat/tuc-avatars.vue
@@ -6,22 +6,34 @@
 <script lang="ts" setup>
 import TItemBox, { type TItemBoxData } from "@comp/app/t-itemBox.vue";
 
-import { getZhElement } from "@/utils/toolFunc.js";
+import { getWikiBrief, getZhElement } from "@/utils/toolFunc.js";
 
 type TucAvatarsProps = { modelValue: Array<TGApp.Game.Combat.Avatar>; detail: boolean };
 
 const props = defineProps<TucAvatarsProps>();
 
 function getItemBox(item: TGApp.Game.Combat.Avatar): TItemBoxData {
+  const findAvatar = getWikiBrief(item.avatar_id);
+  let innerText = item.avatar_type === 2 ? "试用角色" : item.avatar_type === 3 ? "助演角色" : "";
+  let findWeapon;
+  if (findAvatar) {
+    findWeapon = findAvatar.weapon;
+    if (innerText === "") innerText = findAvatar.name;
+  }
   return {
     bg: `/icon/bg/${item.rarity === 105 ? 5 : item.rarity}-BGC.webp`,
     clickable: false,
     display: "inner",
     height: "80px",
     icon: `/WIKI/character/${item.avatar_id}.webp`,
-    innerHeight: item.avatar_type !== 1 ? 20 : 0,
-    innerText: item.avatar_type === 2 ? "试用角色" : item.avatar_type === 3 ? "助演角色" : "",
-    lt: `/icon/element/${getZhElement(item.element)}元素.webp`,
+    innerHeight: innerText === "" ? 0 : 20,
+    innerText: innerText,
+    lt:
+      item.element === "None"
+        ? findWeapon
+          ? `/icon/weapon/${findWeapon}.webp`
+          : ""
+        : `/icon/element/${getZhElement(item.element)}元素.webp`,
     ltSize: "20px",
     innerBlur: "5px",
     rt: "",