diff --git a/src/components/wiki/twc-skills.vue b/src/components/wiki/twc-skills.vue
index 874df4b7..a888306e 100644
--- a/src/components/wiki/twc-skills.vue
+++ b/src/components/wiki/twc-skills.vue
@@ -13,7 +13,7 @@
- {{ dataList[index] }}
+ {{ data[index] }}
@@ -22,21 +22,15 @@
import { onMounted, ref } from "vue";
interface TwcSkillsProps {
- data: {
- normal: TGApp.Plugins.Hutao.Character.RhisdSkill[];
- special: TGApp.Plugins.Hutao.Character.RhisdSkill[];
- };
+ data: TGApp.Plugins.Hutao.Character.RhisdSkill[];
}
const props = defineProps();
const tab = ref();
const tabValues = ref>([]);
-const dataList = ref([]);
onMounted(() => {
- props.data.normal.map((i) => tabValues.value.push({ name: i.Name, icon: i.Icon }));
- props.data.special.map((i) => tabValues.value.push({ name: i.Name, icon: i.Icon }));
- dataList.value = [...props.data.normal, ...props.data.special];
+ props.data.map((i) => tabValues.value.push({ name: i.Name, icon: i.Icon }));
tab.value = tabValues.value[0].name;
});
diff --git a/src/types/App/Character.d.ts b/src/types/App/Character.d.ts
index f0e8ffcb..5c7c1153 100644
--- a/src/types/App/Character.d.ts
+++ b/src/types/App/Character.d.ts
@@ -54,9 +54,7 @@ declare namespace TGApp.App.Character {
* @property {string} element 角色元素类型
* @property {TGApp.Plugins.Hutao.Base.WeaponType} weapon 角色武器类型
* @property {TGApp.App.Calendar.Material[]} materials 角色培养材料
- * @property {object} skills 角色技能
- * @property {TGApp.Plugins.Hutao.Character.RhisdSkill[]} skills.normal 正常技能-普攻、战技、元素爆发
- * @property {TGApp.Plugins.Hutao.Character.RhisdSkill[]} skills.special 特殊技能
+ * @property {TGApp.Plugins.Hutao.Character.RhisdSkill[]} skills 角色技能
* @property {TGApp.Plugins.Hutao.Character.RhisdTalent[]} constellation 角色命座
* @property {TGApp.Plugins.Hutao.Character.RhiFetter[]} talks 闲聊
* @property {TGApp.Plugins.Hutao.Character.RhiFetter[]} stories 故事
@@ -82,10 +80,7 @@ declare namespace TGApp.App.Character {
element: string;
weapon: TGApp.Plugins.Hutao.Base.WeaponType;
materials: TGApp.App.Calendar.Material[];
- skills: {
- normal: TGApp.Plugins.Hutao.Character.RhisdSkill[];
- special: TGApp.Plugins.Hutao.Character.RhisdSkill[];
- };
+ skills: TGApp.Plugins.Hutao.Character.RhisdSkill[];
constellation: TGApp.Plugins.Hutao.Character.RhisdTalent[];
talks: TGApp.Plugins.Hutao.Character.RhiFetter[];
stories: TGApp.Plugins.Hutao.Character.RhiFetter[];
diff --git a/src/views/tw-character.vue b/src/views/tw-character.vue
index 3dc7c62c..b3cc178a 100644
--- a/src/views/tw-character.vue
+++ b/src/views/tw-character.vue
@@ -69,7 +69,7 @@ import { useRoute } from "vue-router";
import TSwitchTheme from "../components/app/t-switchTheme.vue";
import showSnackbar from "../components/func/snackbar";
-import TItembox from "../components/main/t-itembox.vue";
+import TItembox, { TItemBoxData } from "../components/main/t-itembox.vue";
import ToLoading from "../components/overlay/to-loading.vue";
import TwcConstellations from "../components/wiki/twc-constellations.vue";
import TwcMaterials from "../components/wiki/twc-materials.vue";
@@ -87,7 +87,7 @@ const loadingSub = ref();
// 数据
const data = ref();
const box = computed(() => {
- return {
+ return {
bg: `/icon/bg/${data.value?.star}-Star.webp`,
icon: `/WIKI/character/${data.value?.id}.webp`,
size: "128px",