diff --git a/src/components/userCombat/tuc-fight.vue b/src/components/userCombat/tuc-fight.vue
index cda2a5d1..a789f8d6 100644
--- a/src/components/userCombat/tuc-fight.vue
+++ b/src/components/userCombat/tuc-fight.vue
@@ -3,13 +3,17 @@
     <div class="tucfi-label">
       <slot name="label">{{ props.label }}</slot>
     </div>
-    <div v-if="!Array.isArray(props.data)" class="tucfi-data">
+    <div v-if="props.data === null">
+      <span class="tucfi-data">暂无数据</span>
+    </div>
+    <div v-else-if="!Array.isArray(props.data)" class="tucfi-data">
       <TItembox :model-value="getBox()" />
     </div>
     <div class="tucfi-icons" v-else>
       <div v-for="(item, idx) in props.data" :key="idx" class="tucfi-icon">
         <TItembox :model-value="getBox2(item)" />
       </div>
+      <div v-if="props.data.length === 0" class="tucfi-data">暂无数据</div>
     </div>
   </div>
 </template>
@@ -18,7 +22,7 @@ import TItembox, { TItemBoxData } from "../app/t-item-box.vue";
 
 interface TucFightProps {
   label: string;
-  data: TGApp.Game.Combat.AvatarMini | TGApp.Game.Combat.AvatarMini[];
+  data: TGApp.Game.Combat.AvatarMini | TGApp.Game.Combat.AvatarMini[] | null;
 }
 
 const props = defineProps<TucFightProps>();
diff --git a/src/pages/User/Combat.vue b/src/pages/User/Combat.vue
index fb3b2784..0c611c87 100644
--- a/src/pages/User/Combat.vue
+++ b/src/pages/User/Combat.vue
@@ -76,7 +76,7 @@
           </div>
           <TSubLine>统计周期 {{ item.startTime }} ~ {{ item.endTime }}</TSubLine>
           <TucOverview :data="item.stat" :fights="item.detail.fight_statisic" />
-          <TSubLine>使用角色</TSubLine>
+          <TSubLine>使用角色({{ item.detail.backup_avatars.length }}名)</TSubLine>
           <TucAvatars :model-value="item.detail.backup_avatars" />
           <TSubLine>详情</TSubLine>
           <div class="ucw-rounds">
diff --git a/src/types/Game/Combat.d.ts b/src/types/Game/Combat.d.ts
index 052ce2ed..9e2e2b81 100644
--- a/src/types/Game/Combat.d.ts
+++ b/src/types/Game/Combat.d.ts
@@ -75,7 +75,7 @@ declare namespace TGApp.Game.Combat {
     avatar_id: number;
     avatar_icon: string;
     value: string;
-    rarity: number;
+    rarity?: number;
   }
 
   /**
@@ -276,7 +276,7 @@ declare namespace TGApp.Game.Combat {
   /**
    * @description 战斗数据
    * @interface FightStatisic
-   * @since Beta v0.6.3
+   * @since Beta v0.6.5
    * @property {AvatarMini} max_defeat_avatar 击败最多敌人
    * @property {AvatarMini} max_damage_avatar 最高伤害输出
    * @property {AvatarMini} max_take_damage_avatar 最高承受伤害
@@ -287,10 +287,10 @@ declare namespace TGApp.Game.Combat {
    * @return FightStatisic
    */
   interface FightStatisic {
-    max_defeat_avatar: AvatarMini;
-    max_damage_avatar: AvatarMini;
-    max_take_damage_avatar: AvatarMini;
-    total_coin_consumed: AvatarMini;
+    max_defeat_avatar: AvatarMini | null;
+    max_damage_avatar: AvatarMini | null;
+    max_take_damage_avatar: AvatarMini | null;
+    total_coin_consumed: AvatarMini | null;
     shortest_avatar_list: Array<AvatarMini>;
     total_use_time: number;
     is_show_battle_stats: boolean;