From 91cc67e192cfd77a44dba6b9729a813c86bfe2f6 Mon Sep 17 00:00:00 2001 From: zhx Date: Sat, 23 May 2026 12:04:02 +0800 Subject: [PATCH] =?UTF-8?q?cp=E4=BB=A5=E5=8F=8A=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/props/components/source-group-drawer.vue | 2 +- apps/src/views/resident-activity/cp-config.vue | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/src/views/props/components/source-group-drawer.vue b/apps/src/views/props/components/source-group-drawer.vue index 7d818e0..7783fd4 100644 --- a/apps/src/views/props/components/source-group-drawer.vue +++ b/apps/src/views/props/components/source-group-drawer.vue @@ -276,8 +276,8 @@ function normalizeVipResource(value: null | Record | undefined) { function pickVipPreviewResource(item: Record) { const fields = [ - 'longBadge', 'shortBadge', + 'longBadge', 'avatarFrame', 'entryEffect', 'chatBubble', diff --git a/apps/src/views/resident-activity/cp-config.vue b/apps/src/views/resident-activity/cp-config.vue index 175f9b5..ce01812 100644 --- a/apps/src/views/resident-activity/cp-config.vue +++ b/apps/src/views/resident-activity/cp-config.vue @@ -35,6 +35,9 @@ interface CpLevelConfig { type RelationType = 'BROTHER' | 'CP' | 'SISTERS'; +const CP_LEVEL_COUNT = 6; +const CP_MIN_LEVEL = 0; + const relationTypeOptions: Array<{ label: string; value: RelationType }> = [ { label: 'CP', value: 'CP' }, { label: 'Brother', value: 'BROTHER' }, @@ -51,7 +54,9 @@ function defaultLevel(level: number): CpLevelConfig { } function defaultLevels() { - return Array.from({ length: 5 }, (_, index) => defaultLevel(index + 1)); + return Array.from({ length: CP_LEVEL_COUNT }, (_, index) => + defaultLevel(index + CP_MIN_LEVEL), + ); } function defaultDismissConsumeGolds(): Record { @@ -92,8 +97,8 @@ const form = reactive({ function normalizeLevels(levels: Array> | undefined) { const levelMap = new Map>(); for (const item of levels || []) { - const level = Number(item.level || 0); - if (level >= 1 && level <= 5) { + const level = Number(item.level ?? CP_MIN_LEVEL); + if (level >= CP_MIN_LEVEL && level < CP_LEVEL_COUNT) { levelMap.set(level, item); } }