diff --git a/src/components/userCharacter/tuc-detail-desc-constellation.vue b/src/components/userCharacter/tuc-detail-desc-constellation.vue index a02f5f88..33601368 100644 --- a/src/components/userCharacter/tuc-detail-desc-constellation.vue +++ b/src/components/userCharacter/tuc-detail-desc-constellation.vue @@ -34,13 +34,22 @@ interface TucDetailDescConstellationProps { const props = defineProps(); diff --git a/src/components/userCharacter/tuc-detail-desc-weapon.vue b/src/components/userCharacter/tuc-detail-desc-weapon.vue index e7de5834..0100643c 100644 --- a/src/components/userCharacter/tuc-detail-desc-weapon.vue +++ b/src/components/userCharacter/tuc-detail-desc-weapon.vue @@ -45,13 +45,14 @@ const box = computed(() => { .tuc-ddw-content { display: flex; flex-direction: column; - align-items: center; - justify-content: center; + align-items: start; + justify-content: space-around; height: 100%; + margin-left: 5px; } .tuc-ddwc-top { - margin-left: 10px; + height: 20px; } .tuc-ddwc-top span { @@ -64,7 +65,7 @@ const box = computed(() => { } .tuc-ddwc-bottom { - margin-left: 15px; + height: 20px; } .tuc-ddwc-bottom img { diff --git a/src/components/userCharacter/tuc-detail-overlay.vue b/src/components/userCharacter/tuc-detail-overlay.vue index 989e2a76..d237e35e 100644 --- a/src/components/userCharacter/tuc-detail-overlay.vue +++ b/src/components/userCharacter/tuc-detail-overlay.vue @@ -5,7 +5,7 @@ role
- *所有数据以游戏内为准,此处仅供参考 + * 所有数据以游戏内为准,此处仅供参考
@@ -13,6 +13,51 @@
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
@@ -29,7 +74,7 @@
- +
@@ -41,9 +86,10 @@ import { computed, onMounted, ref } from "vue"; import TOverlay from "../main/t-overlay.vue"; import TucDetailDescWeapon from "./tuc-detail-desc-weapon.vue"; import TucDetailDescConstellation from "./tuc-detail-desc-constellation.vue"; -// import TucDetailDescRelic from "./tuc-detail-desc-relic.vue"; +import TucDetailDescRelic from "./tuc-detail-desc-relic.vue"; import TucDetailItemBox from "./tuc-detail-itembox.vue"; import TucDetailConstellation from "./tuc-detail-constellation.vue"; +import TucDetailRelic from "./tuc-detail-relic.vue"; interface ToUcDetailProps { modelValue: boolean; @@ -52,7 +98,6 @@ interface ToUcDetailProps { interface ToUcDetailEmits { (e: "update:modelValue", value: TGApp.Sqlite.Character.UserRole): void; - (e: "cancel"): void; } @@ -70,7 +115,13 @@ const visible = computed({ const data = ref({ weapon: {} as TGApp.Sqlite.Character.RoleWeapon, constellation: [] as TGApp.Sqlite.Character.RoleConstellation[], - reliquary: [] as TGApp.Sqlite.Character.RoleReliquary[], + reliquary: { + 1: false as TGApp.Sqlite.Character.RoleReliquary | false, + 2: false as TGApp.Sqlite.Character.RoleReliquary | false, + 3: false as TGApp.Sqlite.Character.RoleReliquary | false, + 4: false as TGApp.Sqlite.Character.RoleReliquary | false, + 5: false as TGApp.Sqlite.Character.RoleReliquary | false, + }, }); const selected = ref({ data: {} as TGApp.Sqlite.Character.RoleConstellation @@ -80,13 +131,13 @@ const selected = ref({ }); onMounted(() => { - data.value = { - weapon: JSON.parse(props.dataVal.weapon) as TGApp.Sqlite.Character.RoleWeapon, - constellation: JSON.parse(props.dataVal.constellation) as TGApp.Sqlite.Character.RoleConstellation[], - reliquary: [], - }; - if (props.dataVal.reliquary) { - data.value.reliquary = JSON.parse(props.dataVal.reliquary) as TGApp.Sqlite.Character.RoleReliquary[]; + data.value.weapon = JSON.parse(props.dataVal.weapon) as TGApp.Sqlite.Character.RoleWeapon; + data.value.constellation = JSON.parse(props.dataVal.constellation) as TGApp.Sqlite.Character.RoleConstellation[]; + if (props.dataVal.reliquary !== "") { + const relics = JSON.parse(props.dataVal.reliquary) as TGApp.Sqlite.Character.RoleReliquary[]; + relics.map((item) => { + data.value.reliquary[item.pos] = item; + }); } selected.value = { data: data.value.weapon, @@ -107,7 +158,14 @@ const onCancel = () => { emits("cancel"); }; -function showDetail (item: TGApp.Sqlite.Character.RoleConstellation | TGApp.Sqlite.Character.RoleWeapon | TGApp.Sqlite.Character.RoleReliquary, type: string) { +function showDetail ( + item: + TGApp.Sqlite.Character.RoleConstellation | + TGApp.Sqlite.Character.RoleWeapon | + TGApp.Sqlite.Character.RoleReliquary | + false, + type: string) { + if (!item) return; selected.value = { data: item, type, @@ -142,10 +200,10 @@ function showDetail (item: TGApp.Sqlite.Character.RoleConstellation | TGApp.Sqli .tuc-do-quote { position: absolute; bottom: 5px; - right: 5px; + right: 10px; font-family: var(--font-text); font-size: 12px; - color: var(--common-color-yellow); + color: var(--common-color-grey-2); } .tuc-do-show { @@ -160,7 +218,8 @@ function showDetail (item: TGApp.Sqlite.Character.RoleConstellation | TGApp.Sqli .tuc-do-left { width: 50%; height: 400px; - //background: rgb(255 255 255 / 30%); + position: relative; +//background: rgb(255 255 255 / 30%); } .tuc-do-right { @@ -176,13 +235,42 @@ function showDetail (item: TGApp.Sqlite.Character.RoleConstellation | TGApp.Sqli /* 左侧显示区域 */ .tuc-dol-item { position: absolute; + cursor: pointer; } +/* 排列武器跟5个圣遗物 */ .tuc-dol-item:nth-child(1) { - top: 30px; - left: 20px; + top: 40px; + left: 10px; } +.tuc-dol-item:nth-child(2) { + top: 90px; + left: 80px; +} + +.tuc-dol-item:nth-child(3) { + top: 140px; + left: 10px; +} + +.tuc-dol-item:nth-child(4) { + top: 190px; + left: 80px; +} + +.tuc-dol-item:nth-child(5) { + top: 240px; + left: 10px; +} + +.tuc-dol-item:nth-child(6) { + top: 290px; + left: 80px; +} + +/* 右侧显示区域 */ + .tuc-dor-box { width: 100%; height: 100%; diff --git a/src/components/userCharacter/tuc-detail-relic.vue b/src/components/userCharacter/tuc-detail-relic.vue new file mode 100644 index 00000000..3abe2393 --- /dev/null +++ b/src/components/userCharacter/tuc-detail-relic.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/components/userCharacter/tuc-role-box.vue b/src/components/userCharacter/tuc-role-box.vue index 982ec61a..abce72a4 100644 --- a/src/components/userCharacter/tuc-role-box.vue +++ b/src/components/userCharacter/tuc-role-box.vue @@ -1,5 +1,5 @@