diff --git a/public/icon/challenge/pos_sub.webp b/public/icon/challenge/pos_sub.webp new file mode 100644 index 00000000..23ddef45 Binary files /dev/null and b/public/icon/challenge/pos_sub.webp differ diff --git a/src/components/pageHome/ph-comp-position.vue b/src/components/pageHome/ph-comp-position.vue index a3accb06..b788e930 100644 --- a/src/components/pageHome/ph-comp-position.vue +++ b/src/components/pageHome/ph-comp-position.vue @@ -1,20 +1,21 @@ + + + + +
+
{{ props.pos.desc }}
- bg - + bg + {{ reward.num }}
@@ -112,6 +135,7 @@ const posEl = useTemplateRef("posRef"); const endTs = ref(0); const restTs = ref(0); const durationTs = ref(0); +const endHd = ref(); const isStart = computed(() => { return props.pos.start_timestamp !== "0"; }); @@ -124,6 +148,12 @@ onMounted(() => { } if (timer !== null) clearInterval(timer); timer = setInterval(handlePosition, 1000); + if ( + props.pos.type === "ActTypeHardChallenge" && + props.pos.hard_challenge_detail.sub.seconds >= 0 + ) { + endHd.value = timestampToDate(Date.now() + props.pos.hard_challenge_detail.sub.seconds * 1000); + } }); onUnmounted(() => { @@ -226,9 +256,22 @@ async function sharePos(): Promise { img { width: 24px; height: 24px; + padding: 2px; + border-radius: 50%; + background: #2c313c; cursor: pointer; } } + + .challenge-sub { + position: relative; + display: flex; + align-items: center; + + img { + background: unset; + } + } } } @@ -247,6 +290,11 @@ async function sharePos(): Promise { } } +.ph-puc-desc { + font-size: 12px; + opacity: 0.8; +} + .ph-puc-rewards { position: relative; display: flex; diff --git a/src/components/userChallenge/tuc-challenge-item.vue b/src/components/userChallenge/tuc-challenge-item.vue index 8756856d..b0be8b91 100644 --- a/src/components/userChallenge/tuc-challenge-item.vue +++ b/src/components/userChallenge/tuc-challenge-item.vue @@ -49,7 +49,7 @@ import TucMonsterTag from "./tuc-monster-tag.vue"; import { AppCharacterData } from "@/data/index.js"; -type TucChallengeItemProps = { data: TGApp.Game.Challenge.ChallengeList }; +type TucChallengeItemProps = { data: TGApp.Game.Challenge.ChallengeData }; const props = defineProps(); diff --git a/src/enum/game.ts b/src/enum/game.ts index d1a95c81..c3efbda0 100644 --- a/src/enum/game.ts +++ b/src/enum/game.ts @@ -1,6 +1,6 @@ /** * 游戏相关枚举 - * @since Beta v0.8.0 + * @since Beta v0.9.0 */ /** @@ -47,7 +47,7 @@ export function getGameServerDesc(server: TGApp.Game.Base.ServerTypeEnum): strin /** * 近期活动活动类型枚举 - * @since Beta v0.8.0 + * @since Beta v0.9.0 */ export const ActCalendarTypeEnum: typeof TGApp.Game.ActCalendar.ActType = { /** 幽境危战 */ @@ -60,6 +60,10 @@ export const ActCalendarTypeEnum: typeof TGApp.Game.ActCalendar.ActType = { Double: "ActTypeDouble", /** 探索活动 */ Explore: "ActTypeExplore", + /** 立本活动 */ + LiBen: "ActTypeLiBen", + /** 累登活动 */ + SignIn: "ActTypeSignIn", /** 其他活动 */ Other: "ActTypeOther", }; diff --git a/src/pages/User/Challenge.vue b/src/pages/User/Challenge.vue index 59cb442d..9f186bcc 100644 --- a/src/pages/User/Challenge.vue +++ b/src/pages/User/Challenge.vue @@ -6,20 +6,20 @@ icon 幽境危战 - abyss + abyss 深境螺旋 - abyss + abyss 真境剧诗 @@ -27,14 +27,14 @@ @@ -42,28 +42,28 @@
分享 - 刷新 - + 刷新 + 导入 - 删除 + 删除
@@ -71,11 +71,11 @@
@@ -102,14 +102,14 @@ 幽境危战 | UID-{{ item.uid }} | Render by TeyvatGuide v{{ version }}
- - - + + +
- empty + empty 暂无数据,请尝试刷新
@@ -276,6 +276,7 @@ async function refreshChallenge(): Promise { await TGLogger.Info("[UserChallenge][refreshChallenge] 开始刷新挑战数据"); await showLoading.start(`正在获取${account.value.gameUid}的幽境危战数据`); const resp = await recordReq.challenge.detail(cookie.value, account.value); + console.log(resp); if ("retcode" in resp) { await showLoading.end(); isReq.value = false; @@ -326,6 +327,7 @@ async function refreshPopList(hint: boolean = true): Promise { await showLoading.start("正在加载赋光之人列表", `服务器: ${getGameServerDesc(server.value)}`); } const resp = await recordReq.challenge.pop(server.value); + console.log("赋光之人列表", resp); if (resp.retcode !== 0) { reqPop.value = false; showSnackbar.error(`[${resp.retcode}] ${resp.message}`); diff --git a/src/pages/common/PageHome.vue b/src/pages/common/PageHome.vue index 6baccfb2..65f9aef6 100644 --- a/src/pages/common/PageHome.vue +++ b/src/pages/common/PageHome.vue @@ -1,23 +1,24 @@ +