💄 适配资源

src/components/userGacha/gbr-data-line.vue

@@ -1,4 +1,4 @@
-<!-- 千星奇域概览单项组件 -->
+<!-- 颂愿数据项展示行 -->
 <template>
   <div class="gbr-dl-box">
     <div class="gbr-dl-progress" />
@@ -11,25 +11,24 @@
     </div>
     <div class="gbr-dl-info">
       <div class="gbr-dl-cnt">{{ props.count }}</div>
-      <div class="gbr-dl-hint" v-if="hint !== ''">{{ hint }}</div>
+      <div v-if="hint !== ''" class="gbr-dl-hint">{{ hint }}</div>
     </div>
   </div>
 </template>
 <script lang="ts" setup>
 import { computed } from "vue";
 
+import { AppGachaBData } from "@/data/index.js";
+
 export type GbrDataLineProps = { data: TGApp.Sqlite.GachaRecords.TableGachaB; count: number };
 
 const props = defineProps<GbrDataLineProps>();
 const hint = getEndHint();
 
 function getIcon(): string {
-  console.log(props.data);
-  // const find = AppGachaBData.find((i) => i.id.toString() === props.data.itemId);
-  // if (!find) return `/source/UI/paimon.webp`;
-  // return `https://api.hakush.in/gi/UI/${find.icon}.webp`;
-  // TODO: 缺失元数据
-  return `/source/UI/paimon.webp`;
+  const find = AppGachaBData.find((i) => i.id.toString() === props.data.itemId);
+  if (!find) return `/source/UI/paimon.webp`;
+  return `/WIKI/gachaB/${find.icon}.webp`;
 }
 
 function getEndHint(): string {

src/components/userGacha/gbr-table.vue

@@ -1,11 +1,11 @@
-<!-- 千星奇域数据表格 -->
+<!-- 颂愿数据表格 -->
 <template>
   <v-data-table
     :headers="headers"
     :items="props.modelValue"
-    fixed-header
-    fixed-footer
     class="gbr-t-box"
+    fixed-footer
+    fixed-header
   >
     <template v-slot:item="{ item }">
       <tr class="gbr-t-tr">
@@ -13,12 +13,20 @@
         <td>{{ getPool(item.opGachaType) }}</td>
         <td>{{ item.type }}</td>
         <td>{{ item.name }}</td>
+        <td width="80">
+          <div class="gbr-t-icon">
+            <img :src="`/icon/bg/${item.rank}-BGC.webp`" alt="icon" class="bg" />
+            <img :src="getIcon(item.itemId)" alt="icon" class="icon" />
+          </div>
+        </td>
         <td>{{ item.rank }}</td>
       </tr>
     </template>
   </v-data-table>
 </template>
 <script lang="ts" setup>
+import { AppGachaBData } from "@/data/index.js";
+
 type GroTableProps = { modelValue: Array<TGApp.Sqlite.GachaRecords.TableGachaB> };
 
 const props = defineProps<GroTableProps>();
@@ -28,6 +36,7 @@ const headers = <const>[
   { title: "卡池", align: "center", key: "opGachaType" },
   { title: "类型", align: "center", key: "type" },
   { title: "名称", align: "center", key: "name" },
+  { title: "图标", align: "center", key: "icon" },
   { title: "星级", align: "center", key: "rank" },
 ];
 
@@ -47,6 +56,12 @@ function getPool(type: string) {
       return "未知";
   }
 }
+
+function getIcon(id: string): string {
+  const find = AppGachaBData.find((i) => i.id.toString() === id);
+  if (!find) return `/source/UI/paimon.webp`;
+  return `/WIKI/gachaB/${find.icon}.webp`;
+}
 </script>
 <style lang="css" scoped>
 .gbr-t-box {
@@ -59,4 +74,34 @@ function getPool(type: string) {
 .gbr-t-tr {
   text-align: center;
 }
+
+.gbr-t-icon {
+  position: relative;
+  display: flex;
+  overflow: hidden;
+  width: 64px;
+  height: 64px;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+  margin: 4px 0;
+
+  .bg {
+    position: absolute;
+    z-index: 0;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+
+  .icon {
+    position: relative;
+    z-index: 1;
+    width: 48px;
+    height: 48px;
+    flex-shrink: 0;
+  }
+}
 </style>

src/pages/User/GachaB.vue

@@ -158,15 +158,16 @@ async function confirmRefresh(force: boolean): Promise<void> {
     return;
   }
   await refreshGachaPool("1000", "常驻颂愿", force);
-  await refreshGachaPool("20011", "活动颂愿·男", force);
-  await refreshGachaPool("20012", "活动颂愿·男2", force);
-  await refreshGachaPool("20021", "活动颂愿·女", force);
-  await refreshGachaPool("20022", "活动颂愿·女2", force);
+  await refreshGachaPool("2000", "活动颂愿", force);
+  // await refreshGachaPool("20011", "活动颂愿·男", force);
+  // await refreshGachaPool("20012", "活动颂愿·男2", force);
+  // await refreshGachaPool("20021", "活动颂愿·女", force);
+  // await refreshGachaPool("20022", "活动颂愿·女2", force);
   await showLoading.end();
   await TGLogger.Info(`[UserGacha][${account.value.gameUid}] 刷新祈愿数据完成`);
   showSnackbar.success("祈愿数据刷新完成，即将刷新页面");
   await new Promise<void>((resolve) => setTimeout(resolve, 1500));
-  window.location.reload();
+  // window.location.reload();
 }
 
 /**
@@ -191,6 +192,7 @@ async function refreshGachaPool(
   while (true) {
     page++;
     const gachaRes = await hk4eReq.gachaB(authkey.value, gachaType, reqId);
+    console.log(gachaRes);
     if (!Array.isArray(gachaRes)) {
       showSnackbar.error(`[${gachaType}][${gachaRes.retcode}] ${gachaRes.message}`);
       await TGLogger.Error(