🏷️ fix(GCG): GCG 类型完善

src/data/app/index.ts

@@ -2,7 +2,7 @@
  * @file data app index
  * @description data app index
  * @author BTMuli<bt-muli@outlook.com>
- * @since Alpha v0.1.2
+ * @since Alpha v0.1.3
  */
 
 // Data
@@ -11,8 +11,6 @@ import achievementSeries from "./achievementSeries.json";
 import GCG from "./GCG.json";
 import nameCards from "./nameCards.json";
 import calendar from "./calendar.json";
-// Interface
-import { type BaseCard } from "../../interface/GCG";
 
 export const AppDataList = [
   {
@@ -25,7 +23,7 @@ export const AppDataList = [
   },
   {
     name: "GCG.json",
-    data: GCG as BaseCard[],
+    data: GCG as BTMuli.Genshin.Wiki.GCG.BriefInfo[],
   },
   {
     name: "nameCards.json",
@@ -33,14 +31,14 @@ export const AppDataList = [
   },
   {
     name: "calendar.json",
-    data: calendar as Record<number, BTMuli.Genshin.Calendar.CalendarData>,
+    data: calendar as Record<number, BTMuli.Genshin.Calendar.Data>,
   },
 ];
 
 export const AppData = {
   achievements: achievements as Record<number, BTMuli.Genshin.Achievement>,
   achievementSeries: achievementSeries as Record<number, BTMuli.Genshin.AchievementSeries>,
-  GCG: GCG as BaseCard[],
+  GCG: GCG as BTMuli.Genshin.Wiki.GCG.BriefInfo[],
   nameCards: nameCards as Record<number, BTMuli.Genshin.NameCard[]>,
-  calendar: calendar as Record<number, BTMuli.Genshin.Calendar.CalendarData>,
+  calendar: calendar as Record<number, BTMuli.Genshin.Calendar.Data>,
 };

src/interface/GCG.ts

@@ -53,11 +53,11 @@ export interface BaseCard {
 /**
  * @description Gcg 角色卡牌
  * @interface  CharacterCard
- * @since Alpha
+ * @since Alpha v0.1.3
  * @see BaseCard
  * @see CharacterCardType
- * @property {EnumElement} info.element 元素
+ * @property {BTMuli.Genshin.Wiki.EnumElement} info.element 元素
- * @property {EnumWeapon} info.weapon 武器
+ * @property {BTMuli.Genshin.Wiki.EnumWeapon} info.weapon 武器
  * @property {EnumCamp} info.camp 阵营
  * @property {string} info.source 卡牌来源
  * @property {string} info.title 卡牌标题
@@ -75,8 +75,8 @@ export interface BaseCard {
 export interface CharacterCard extends BaseCard {
   type: BaseCardType.characterCard
   info: {
-    element: EnumElement
+    element: BTMuli.Genshin.Wiki.EnumElement
-    weapon: EnumWeapon
+    weapon: BTMuli.Genshin.Wiki.EnumWeapon
     camp: EnumCamp
     source: string
     title: string
@@ -129,11 +129,11 @@ export interface ActionCard extends BaseCard {
  * @description Gcg 魔物卡牌
  * @description 与角色卡牌类似
  * @interface  MonsterCard
- * @since Alpha
+ * @since Alpha v0.1.3
  * @see BaseCard
  * @see CharacterCardType
- * @property {EnumElement} info.element 元素
+ * @property {BTMuli.Genshin.Wiki.EnumElement} info.element 元素
- * @property {EnumWeapon} info.weapon 武器
+ * @property {BTMuli.Genshin.Wiki.EnumWeapon} info.weapon 武器
  * @property {EnumCamp} info.camp 阵营
  * @property {string} info.source 卡牌来源
  * @description 无标题跟描述
@@ -149,8 +149,8 @@ export interface ActionCard extends BaseCard {
 export interface MonsterCard extends BaseCard {
   type: BaseCardType.monsterCard
   info: {
-    element: EnumElement
+    element: BTMuli.Genshin.Wiki.EnumElement
-    weapon: EnumWeapon
+    weapon: BTMuli.Genshin.Wiki.EnumWeapon
     camp: EnumCamp
     source: string
   }
@@ -168,16 +168,16 @@ export interface MonsterCard extends BaseCard {
 /**
  * @description Gcg 角色牌分类依据
  * @interface  CharacterCardType
- * @since Alpha
+ * @since Alpha v0.1.3
  * @see BaseCardType
- * @property {EnumElement} element 元素
+ * @property {BTMuli.Genshin.Wiki.EnumElement} element 元素
- * @property {EnumWeapon} weapon 武器
+ * @property {BTMuli.Genshin.Wiki.EnumWeapon} weapon 武器
  * @property {EnumCamp} camp 阵营
  * @returns {CharacterCardType}
  */
 export interface CharacterCardType {
-  element: EnumElement
+  element: BTMuli.Genshin.Wiki.EnumElement
-  weapon: EnumWeapon
+  weapon: BTMuli.Genshin.Wiki.EnumWeapon
   camp: EnumCamp
 }
 
@@ -197,52 +197,6 @@ export interface ActionCardType {
   actionCost: EnumActionCost
 }
 
-/**
- * @description 角色牌元素
- * @enum EnumElement
- * @since Alpha
- * @see CharacterCardType
- * @property {string} pyro 火元素
- * @property {string} hydro 水元素
- * @property {string} cryo 冰元素
- * @property {string} electro 雷元素
- * @property {string} anemo 风元素
- * @property {string} geo 岩元素
- * @property {string} dendro 草元素
- * @returns {EnumElement}
- */
-export enum EnumElement {
-  pyro = "火元素",
-  hydro = "水元素",
-  cryo = "冰元素",
-  electro = "雷元素",
-  anemo = "风元素",
-  geo = "岩元素",
-  dendro = "草元素",
-}
-
-/**
- * @description 角色牌武器
- * @enum EnumWeapon
- * @since Alpha
- * @see CharacterCardType
- * @property {string} sword 单手剑
- * @property {string} claymore 双手剑
- * @property {string} pole 长柄武器
- * @property {string} bow 弓
- * @property {string} catalyst 法器
- * @property {string} other 其他武器
- * @returns {EnumWeapon}
- */
-export enum EnumWeapon {
-  sword = "单手剑",
-  claymore = "双手剑",
-  pole = "长柄武器",
-  bow = "弓",
-  catalyst = "法器",
-  other = "其他武器",
-}
-
 /**
  * @description 角色牌阵营
  * @enum {EnumCamp}

src/pages/WIKI/GCG.vue

@@ -24,12 +24,12 @@
       <v-window v-model="tab">
         <v-window-item value="character">
           <div class="cards-grid">
-            <v-card v-for="item in CardsInfoC" :key="item.id" class="card-cls" @click="toOuter(item.name, item.id)">
+            <v-card v-for="item in CardsInfoC" :key="item.content_id" class="card-cls" @click="toOuter(item.name, item.content_id)">
               <div class="card-border">
                 <img src="/source/GCG/base/bg-normal.webp" alt="border">
               </div>
               <div class="card-cover">
-                <img :src="item.icon.normal" alt="cover">
+                <img :src="item.icon" alt="cover">
               </div>
               <div class="card-content">
                 <span>{{ item.name }}</span>
@@ -39,12 +39,12 @@
         </v-window-item>
         <v-window-item value="action">
           <div class="cards-grid">
-            <v-card v-for="item in CardsInfoA" :key="item.id" class="card-cls" @click="toOuter(item.name, item.id)">
+            <v-card v-for="item in CardsInfoA" :key="item.content_id" class="card-cls" @click="toOuter(item.name, item.content_id)">
               <div class="card-border">
                 <img src="/source/GCG/base/bg-normal.webp" alt="border">
               </div>
               <div class="card-cover">
-                <img :src="item.icon.normal" alt="cover">
+                <img :src="item.icon" alt="cover">
               </div>
               <div class="card-content">
                 <span>{{ item.name }}</span>
@@ -54,12 +54,12 @@
         </v-window-item>
         <v-window-item value="monster">
           <div class="cards-grid">
-            <v-card v-for="item in CardsInfoM" :key="item.id" class="card-cls" @click="toOuter(item.name, item.id)">
+            <v-card v-for="item in CardsInfoM" :key="item.content_id" class="card-cls" @click="toOuter(item.name, item.content_id)">
               <div class="card-border">
                 <img src="/source/GCG/base/bg-normal.webp" alt="border">
               </div>
               <div class="card-cover">
-                <img :src="item.icon.normal" alt="cover">
+                <img :src="item.icon" alt="cover">
               </div>
               <div class="card-content">
                 <span>{{ item.name }}</span>
@@ -71,12 +71,12 @@
     </div>
     <div v-else>
       <div class="cards-grid">
-        <div v-for="item in CardsInfoS" :key="item.id" class="card-cls" @click="toOuter(item.name, item.id)">
+        <div v-for="item in CardsInfoS" :key="item.content_id" class="card-cls" @click="toOuter(item.name, item.content_id)">
           <div class="card-border">
             <img src="/source/GCG/base/bg-normal.webp" alt="border">
           </div>
           <div class="card-cover">
-            <img :src="item.icon.normal" alt="cover">
+            <img :src="item.icon" alt="cover">
           </div>
           <div class="card-content">
             <span>{{ item.name }}</span>
@@ -92,13 +92,12 @@
 <script lang="ts" setup>
 // vue
 import { ref, onMounted } from "vue";
-import TLoading from "../components/t-loading.vue";
+import TLoading from "../../components/t-loading.vue";
 // utils
-import { createTGWindow } from "../utils/TGWindow";
+import { createTGWindow } from "../../utils/TGWindow";
-import { TGAppData } from "../data";
+import { TGAppData } from "../../data";
 // interface
-import { BaseCard, ActionCard, CharacterCard, MonsterCard } from "../interface/GCG";
+import { OBC_CONTENT_API } from "../../plugins/Mys/interface/utils";
-import { OBC_CONTENT_API } from "../plugins/Mys/interface/utils";
 
 // loading
 const loading = ref(true);
@@ -109,10 +108,10 @@ const doSearch = ref(false);
 const search = ref("");
 // data
 const tab = ref("character");
-const CardsInfoC = ref([] as CharacterCard[]);
+const CardsInfoC = ref([] as BTMuli.Genshin.Wiki.GCG.BriefInfo[]);
-const CardsInfoA = ref([] as ActionCard[]);
+const CardsInfoA = ref([] as BTMuli.Genshin.Wiki.GCG.BriefInfo[]);
-const CardsInfoM = ref([] as MonsterCard[]);
+const CardsInfoM = ref([] as BTMuli.Genshin.Wiki.GCG.BriefInfo[]);
-const CardsInfoS = ref([] as BaseCard[]);
+const CardsInfoS = ref([] as BTMuli.Genshin.Wiki.GCG.BriefInfo[]);
 
 onMounted(async () => {
   await loadData();
@@ -120,9 +119,9 @@ onMounted(async () => {
 
 async function loadData () {
   const CardsInfo = TGAppData.GCG;
-  CardsInfoC.value = CardsInfo.filter((item) => item.type === "角色牌") as CharacterCard[];
+  CardsInfoC.value = CardsInfo.filter((item) => item.type === "角色牌");
-  CardsInfoA.value = CardsInfo.filter((item) => item.type === "行动牌") as ActionCard[];
+  CardsInfoA.value = CardsInfo.filter((item) => item.type === "行动牌");
-  CardsInfoM.value = CardsInfo.filter((item) => item.type === "魔物牌") as MonsterCard[];
+  CardsInfoM.value = CardsInfo.filter((item) => item.type === "魔物牌");
   loading.value = false;
 }
 function toOuter (cardName: string, cardId: number) {
@@ -132,7 +131,7 @@ function toOuter (cardName: string, cardId: number) {
 async function searchCard () {
   loading.value = true;
   doSearch.value = true;
-  const res: BaseCard[] = [];
+  const res: BTMuli.Genshin.Wiki.GCG.BriefInfo[] = [];
   const allCardsInfo = TGAppData.GCG;
   allCardsInfo.map((item) => (item.name.includes(search.value) ? res.push(item) : null));
   res.sort((a, b) => a.name.localeCompare(b.name));

src/router/modules/main.ts

@@ -8,7 +8,7 @@
 // 信息展示
 import Announcements from "../../pages/Announcements.vue";
 import Home from "../../pages/Home.vue";
-import GCG from "../../pages/GCG.vue";
+import GCG from "../../pages/WIKI/GCG.vue";
 // 数据交互
 import Achievements from "../../pages/Achievements.vue";
 // 应用配置相关