- {character.skills.map(skill => (
-
(
+
))}
);
}
-function CharacterEquipment({character}: {character: Character}) {
- const equipment = getCharacterEquipment(character);
+function buildPreviewInventoryDescription(
+ characterName: string,
+ item: { category: string; name: string; quantity: number },
+) {
+ const quantityText = item.quantity > 1 ? `，当前数量 x${item.quantity}` : '';
- if (equipment.length === 0) {
- return
暂无装备信息
;
+ switch (item.category) {
+ case '消耗品':
+ return `${characterName} 随身准备的消耗品，适合在关键时刻快速补给${quantityText}。`;
+ case '稀有品':
+ return `${characterName} 妥善保管的稀有物件，通常和经历、身份或交易筹码有关${quantityText}。`;
+ case '专属品':
+ return `${characterName} 不轻易示人的专属信物，往往带着明显的个人痕迹${quantityText}。`;
+ case '材料':
+ return `${characterName} 随身收着的制作材料，可用于后续锻造或交换${quantityText}。`;
+ default:
+ return `${characterName} 携带的${item.category}${quantityText}。`;
}
+}
- return (
-
- {equipment.map(item => (
-
-
-
{item.slot}
-
{item.item}
-
-
- {item.rarity}
-
-
- ))}
-
+function getPreviewInventoryRarity(category: string): InventoryItem['rarity'] {
+ switch (category) {
+ case '专属品':
+ return 'epic';
+ case '稀有品':
+ return 'rare';
+ case '材料':
+ return 'uncommon';
+ default:
+ return 'common';
+ }
+}
+
+function buildCharacterInventoryPreviewItems(
+ character: Character,
+ worldType: GameState['worldType'],
+) {
+ return getInventoryItems(character, worldType).map(
+ (item, index) =>
+ ({
+ id: `preview:${character.id}:${index}:${item.category}:${item.name}`,
+ category: item.category,
+ name: item.name,
+ quantity: item.quantity,
+ rarity: getPreviewInventoryRarity(item.category),
+ tags: [],
+ description: buildPreviewInventoryDescription(character.name, item),
+ }) satisfies InventoryItem,
);
}
-function getNpcBadge(encounter: Encounter, affinity: number, battleStatePresent: boolean) {
+function getNpcBadge(
+ encounter: Encounter,
+ affinity: number,
+ battleStatePresent: boolean,
+) {
if (encounter.hostile || battleStatePresent || affinity < 0) {
return '敌对角色';
}
@@ -218,36 +401,19 @@ function describeRelationStance(affinity: number) {
}
}
-function buildGenericNpcArchiveSummary(
- encounter: Encounter,
- npcState: NpcPersistentState,
- rumors: string[],
-) {
- const contactSummary = npcState.firstMeaningfulContactResolved
- ? '你们已经越过最初的表面试探，对方开始显露更稳定的行事轮廓。'
- : '目前仍停留在初见观察阶段，对方真正的来历和立场还没有完全摊开。';
- const rumorSummary = rumors.length > 0
- ? `从细节里能确认的线索有：${rumors.join('；')}`
- : `${encounter.npcName}当前显露出来的大多只是“${encounter.context}”这一层身份。`;
-
- return {
- publicSummary: `${encounter.npcName}以“${encounter.context}”的身份出现在你面前。${encounter.npcDescription}`,
- clueSummary: `${contactSummary}${rumorSummary}`,
- };
-}
-
function buildGenericNpcPersonalitySummary(
encounter: Encounter,
affinity: number,
rumors: string[],
) {
- const stanceSummary = affinity >= 60
- ? '说话会更直接，也更愿意表明自己的立场。'
- : affinity >= 30
- ? '已经不再把你完全当外人，但依旧保留自己的边界。'
- : affinity >= 15
- ? '愿意正常交流，不过还在观察你的来意。'
- : '习惯先判断风险，再决定透露多少。';
+ const stanceSummary =
+ affinity >= 60
+ ? '说话会更直接，也更愿意表明自己的立场。'
+ : affinity >= 30
+ ? '已经不再把你完全当外人，但依旧保留自己的边界。'
+ : affinity >= 15
+ ? '愿意正常交流，不过还在观察你的来意。'
+ : '习惯先判断风险，再决定透露多少。';
const rumorSummary = rumors[0]
? `从表现上看，最鲜明的一面是：${rumors[0]}`
: `${encounter.context}这层身份几乎决定了对方当前的处事方式。`;
@@ -262,8 +428,9 @@ function buildGenericNpcTechniqueCards(params: {
inventoryCount: number;
rumors: string[];
}) {
- const {encounter, npcState, hasBattleState, inventoryCount, rumors} = params;
- const cards: Array<{title: string; detail: string}> = [
+ const { encounter, npcState, hasBattleState, inventoryCount, rumors } =
+ params;
+ const cards: Array<{ title: string; detail: string }> = [
{
title: '身份手段',
detail: `${encounter.npcName}主要以“${encounter.context}”这一身份处理眼前局面，通常会先观察、试探，再决定是否继续合作或对抗。`,
@@ -322,193 +489,312 @@ export function AdventureEntityModal({
onClose,
onOpenCharacterChat,
}: AdventureEntityModalProps) {
- const playerCharacter = selection?.kind === 'player' ? gameState.playerCharacter : null;
- const companion = selection?.kind === 'companion' ? selection.companion : null;
+ const [selectedSkillId, setSelectedSkillId] = useState
(null);
+ const [selectedContributionLabel, setSelectedContributionLabel] = useState<
+ string | null
+ >(null);
+ const [selectedItemId, setSelectedItemId] = useState(null);
+ const playerCharacter =
+ selection?.kind === 'player' ? gameState.playerCharacter : null;
+ const companion =
+ selection?.kind === 'companion' ? selection.companion : null;
const companionCharacter = companion?.character ?? null;
const companionRosterState = companion
- ? gameState.companions.find(item => item.npcId === companion.npcId)
- ?? gameState.roster.find(item => item.npcId === companion.npcId)
- ?? null
+ ? (gameState.companions.find((item) => item.npcId === companion.npcId) ??
+ gameState.roster.find((item) => item.npcId === companion.npcId) ??
+ null)
: null;
const companionNpcState = companion
? normalizeNpcPersistentState(
- gameState.npcStates[companion.npcId]
- ?? buildFallbackCompanionNpcState(companionRosterState?.joinedAtAffinity ?? 0),
+ gameState.npcStates[companion.npcId] ??
+ buildFallbackCompanionNpcState(
+ companionRosterState?.joinedAtAffinity ?? 0,
+ ),
)
: null;
const npcEncounter = selection?.kind === 'npc' ? selection.encounter : null;
- const npcCharacter = npcEncounter?.characterId ? getCharacterById(npcEncounter.characterId) : null;
+ const npcCharacter = npcEncounter?.characterId
+ ? getCharacterById(npcEncounter.characterId)
+ : null;
const npcId = npcEncounter?.id ?? npcEncounter?.npcName ?? null;
const npcState = npcEncounter
? normalizeNpcPersistentState(
- gameState.npcStates[npcId ?? ''] ?? buildInitialNpcState(npcEncounter, gameState.worldType),
+ gameState.npcStates[npcId ?? ''] ??
+ buildInitialNpcState(npcEncounter, gameState.worldType, gameState),
)
: null;
- const hostileNpcPresetId = npcEncounter?.hostileNpcPresetId ?? npcEncounter?.hostileNpcPresetId;
- const hostileNpcPreset = hostileNpcPresetId && gameState.worldType
- ? getHostileNpcPresetById(gameState.worldType, hostileNpcPresetId)
- : null;
- const npcBattleState = selection?.kind === 'npc' ? selection.battleState ?? null : null;
- const archiveCharacter = selection?.kind === 'companion'
- ? companionCharacter
- : selection?.kind === 'npc'
- ? npcCharacter
+ const hostileNpcPresetId =
+ npcEncounter?.hostileNpcPresetId ?? npcEncounter?.hostileNpcPresetId;
+ const hostileNpcPreset =
+ hostileNpcPresetId && gameState.worldType
+ ? getHostileNpcPresetById(gameState.worldType, hostileNpcPresetId)
: null;
- const archiveNpcState = selection?.kind === 'companion'
- ? companionNpcState
- : selection?.kind === 'npc'
- ? npcState
- : null;
- const archiveAffinity = archiveNpcState?.affinity ?? 0;
- const archivePublicSummary = archiveCharacter
- ? getCharacterPublicBackstorySummary(archiveCharacter, gameState.worldType)
- : null;
- const unlockedBackstoryChapters = archiveCharacter
- ? getUnlockedCharacterBackstoryChapters(
- archiveCharacter,
- archiveAffinity,
- gameState.worldType,
- )
- : [];
- const lockedBackstoryChapters = archiveCharacter
- ? getLockedCharacterBackstoryChapters(
- archiveCharacter,
- archiveAffinity,
- gameState.worldType,
- )
- : [];
+ const npcBattleState =
+ selection?.kind === 'npc' ? (selection.battleState ?? null) : null;
+ const archiveCharacter =
+ selection?.kind === 'companion'
+ ? companionCharacter
+ : selection?.kind === 'npc'
+ ? npcCharacter
+ : null;
+ const archiveNpcState =
+ selection?.kind === 'companion'
+ ? companionNpcState
+ : selection?.kind === 'npc'
+ ? npcState
+ : null;
+ const detailCharacter =
+ selection?.kind === 'player'
+ ? playerCharacter
+ : selection?.kind === 'companion'
+ ? companionCharacter
+ : npcCharacter;
const privateChatUnlockAffinity = companionCharacter
- ? getCharacterPrivateChatUnlockAffinity(companionCharacter, gameState.worldType)
+ ? getCharacterPrivateChatUnlockAffinity(
+ companionCharacter,
+ gameState.worldType,
+ )
: null;
const privateChatUnlocked = Boolean(
- selection?.kind === 'companion'
- && companionCharacter
- && companionNpcState?.recruited
- && privateChatUnlockAffinity != null
- && companionNpcState.affinity >= privateChatUnlockAffinity,
+ selection?.kind === 'companion' &&
+ companionCharacter &&
+ companionNpcState?.recruited &&
+ privateChatUnlockAffinity != null &&
+ companionNpcState.affinity >= privateChatUnlockAffinity,
);
- const title = selection?.kind === 'player'
- ? playerCharacter?.name ?? '主角'
- : selection?.kind === 'companion'
- ? companionCharacter?.name ?? '同行角色'
- : npcEncounter?.npcName ?? '相遇角色';
+ const title =
+ selection?.kind === 'player'
+ ? (playerCharacter?.name ?? '主角')
+ : selection?.kind === 'companion'
+ ? (companionCharacter?.name ?? '同行角色')
+ : (npcEncounter?.npcName ?? '相遇角色');
- const subtitle = selection?.kind === 'player'
- ? playerCharacter?.title ?? '主角'
- : selection?.kind === 'companion'
- ? companionCharacter?.title ?? '同行角色'
- : npcEncounter?.context ?? '相遇角色';
+ const subtitle =
+ selection?.kind === 'player'
+ ? (playerCharacter?.title ?? '主角')
+ : selection?.kind === 'companion'
+ ? (companionCharacter?.title ?? '同行角色')
+ : (npcEncounter?.context ?? '相遇角色');
- const description = selection?.kind === 'player'
- ? playerCharacter?.description ?? ''
- : selection?.kind === 'companion'
- ? companionCharacter?.description ?? ''
- : npcEncounter?.npcDescription ?? '';
+ const description =
+ selection?.kind === 'player'
+ ? (playerCharacter?.description ?? '')
+ : selection?.kind === 'companion'
+ ? (companionCharacter?.description ?? '')
+ : (npcEncounter?.npcDescription ?? '');
- const hp = selection?.kind === 'player'
- ? gameState.playerHp
- : selection?.kind === 'companion'
- ? companion?.hp ?? (companionCharacter ? estimateCharacterMaxHp(companionCharacter) : 0)
- : npcBattleState?.hp ?? estimateNpcMaxHp(npcCharacter);
+ const hp =
+ selection?.kind === 'player'
+ ? gameState.playerHp
+ : selection?.kind === 'companion'
+ ? (companion?.hp ??
+ (companionCharacter ? estimateCharacterMaxHp(companionCharacter) : 0))
+ : (npcBattleState?.hp ?? estimateNpcMaxHp(npcCharacter));
- const maxHp = selection?.kind === 'player'
- ? gameState.playerMaxHp
- : selection?.kind === 'companion'
- ? companion?.maxHp ?? (companionCharacter ? estimateCharacterMaxHp(companionCharacter) : 0)
- : npcBattleState?.maxHp ?? estimateNpcMaxHp(npcCharacter);
+ const maxHp =
+ selection?.kind === 'player'
+ ? gameState.playerMaxHp
+ : selection?.kind === 'companion'
+ ? (companion?.maxHp ??
+ (companionCharacter ? estimateCharacterMaxHp(companionCharacter) : 0))
+ : (npcBattleState?.maxHp ?? estimateNpcMaxHp(npcCharacter));
- const mana = selection?.kind === 'player'
- ? gameState.playerMana
- : selection?.kind === 'companion'
- ? companion?.mana ?? (companionCharacter ? getCharacterMaxMana(companionCharacter) : 0)
- : estimateNpcMaxMana(npcCharacter);
+ const mana =
+ selection?.kind === 'player'
+ ? gameState.playerMana
+ : selection?.kind === 'companion'
+ ? (companion?.mana ??
+ (companionCharacter ? getCharacterMaxMana(companionCharacter) : 0))
+ : estimateNpcMaxMana(npcCharacter);
- const maxMana = selection?.kind === 'player'
- ? gameState.playerMaxMana
- : selection?.kind === 'companion'
- ? companion?.maxMana ?? (companionCharacter ? getCharacterMaxMana(companionCharacter) : 0)
- : estimateNpcMaxMana(npcCharacter);
- const companionChatTarget = selection?.kind === 'companion' && companionCharacter
- ? {
- character: companionCharacter,
- npcId: companion?.npcId ?? null,
- roleLabel: '同行角色',
- hp,
- maxHp,
- mana,
- maxMana,
- affinity: companionNpcState?.affinity ?? null,
- } satisfies CharacterChatTarget
- : null;
-
- const inventory = selection?.kind === 'player'
- ? gameState.playerInventory
- : selection?.kind === 'companion'
- ? []
- : npcState?.inventory ?? [];
- const attributeSchema = resolveAttributeSchema(gameState.worldType, gameState.customWorldProfile);
- const selectedAttributeProfile = selection?.kind === 'player'
- ? (playerCharacter ? resolveCharacterAttributeProfile(playerCharacter, gameState.worldType, gameState.customWorldProfile) : null)
- : selection?.kind === 'companion'
- ? (companionCharacter ? resolveCharacterAttributeProfile(companionCharacter, gameState.worldType, gameState.customWorldProfile) : null)
- : npcCharacter
- ? resolveCharacterAttributeProfile(npcCharacter, gameState.worldType, gameState.customWorldProfile)
- : npcEncounter
- ? resolveEncounterAttributeProfile(npcEncounter, {
- worldType: gameState.worldType,
- customWorldProfile: gameState.customWorldProfile,
- })
- : null;
+ const maxMana =
+ selection?.kind === 'player'
+ ? gameState.playerMaxMana
+ : selection?.kind === 'companion'
+ ? (companion?.maxMana ??
+ (companionCharacter ? getCharacterMaxMana(companionCharacter) : 0))
+ : estimateNpcMaxMana(npcCharacter);
+ const companionChatTarget =
+ selection?.kind === 'companion' && companionCharacter
+ ? ({
+ character: companionCharacter,
+ npcId: companion?.npcId ?? null,
+ roleLabel: '同行角色',
+ hp,
+ maxHp,
+ mana,
+ maxMana,
+ affinity: companionNpcState?.affinity ?? null,
+ } satisfies CharacterChatTarget)
+ : null;
+ const inventory = useMemo(
+ () =>
+ selection?.kind === 'player'
+ ? gameState.playerInventory
+ : selection?.kind === 'companion' && companionCharacter
+ ? buildCharacterInventoryPreviewItems(
+ companionCharacter,
+ gameState.worldType,
+ )
+ : (npcState?.inventory ?? []),
+ [
+ companionCharacter,
+ gameState.playerInventory,
+ gameState.worldType,
+ npcState?.inventory,
+ selection?.kind,
+ ],
+ );
+ const attributeSchema = resolveAttributeSchema(
+ gameState.worldType,
+ gameState.customWorldProfile,
+ );
+ const selectedAttributeProfile =
+ selection?.kind === 'player'
+ ? playerCharacter
+ ? resolveCharacterAttributeProfile(
+ playerCharacter,
+ gameState.worldType,
+ gameState.customWorldProfile,
+ )
+ : null
+ : selection?.kind === 'companion'
+ ? companionCharacter
+ ? resolveCharacterAttributeProfile(
+ companionCharacter,
+ gameState.worldType,
+ gameState.customWorldProfile,
+ )
+ : null
+ : npcCharacter
+ ? resolveCharacterAttributeProfile(
+ npcCharacter,
+ gameState.worldType,
+ gameState.customWorldProfile,
+ )
+ : npcEncounter
+ ? resolveEncounterAttributeProfile(npcEncounter, {
+ worldType: gameState.worldType,
+ customWorldProfile: gameState.customWorldProfile,
+ })
+ : null;
const attributeRows = selectedAttributeProfile
? formatAttributeList(selectedAttributeProfile, attributeSchema)
: [];
- const genericNpcRumors = npcEncounter && !npcCharacter
- ? buildEncounterAttributeRumors(npcEncounter, {
- worldType: gameState.worldType,
- customWorldProfile: gameState.customWorldProfile,
- limit: 3,
- })
- : [];
- const genericNpcArchive = npcEncounter && npcState && !npcCharacter
- ? buildGenericNpcArchiveSummary(npcEncounter, npcState, genericNpcRumors)
- : null;
- const genericNpcPersonality = npcEncounter && npcState && !npcCharacter
- ? buildGenericNpcPersonalitySummary(npcEncounter, npcState.affinity, genericNpcRumors)
- : null;
- const genericNpcTechniqueCards = npcEncounter && npcState && !npcCharacter
- ? buildGenericNpcTechniqueCards({
- encounter: npcEncounter,
- npcState,
- hasBattleState: Boolean(npcBattleState),
- inventoryCount: npcState.inventory.length,
- rumors: genericNpcRumors,
- })
+ const genericNpcRumors =
+ npcEncounter && !npcCharacter
+ ? buildEncounterAttributeRumors(npcEncounter, {
+ worldType: gameState.worldType,
+ customWorldProfile: gameState.customWorldProfile,
+ limit: 3,
+ })
+ : [];
+ const genericNpcPersonality =
+ npcEncounter && npcState && !npcCharacter
+ ? buildGenericNpcPersonalitySummary(
+ npcEncounter,
+ npcState.affinity,
+ genericNpcRumors,
+ )
+ : null;
+ const genericNpcTechniqueCards =
+ npcEncounter && npcState && !npcCharacter
+ ? buildGenericNpcTechniqueCards({
+ encounter: npcEncounter,
+ npcState,
+ hasBattleState: Boolean(npcBattleState),
+ inventoryCount: npcState.inventory.length,
+ rumors: genericNpcRumors,
+ })
+ : [];
+ const buildBreakdown = useMemo(
+ () =>
+ selection?.kind === 'player' && playerCharacter
+ ? getPlayerBuildDamageBreakdown(gameState, playerCharacter)
+ : detailCharacter
+ ? getCompanionBuildDamageBreakdown(
+ detailCharacter,
+ gameState.worldType,
+ gameState.customWorldProfile,
+ )
+ : null,
+ [detailCharacter, gameState, playerCharacter, selection?.kind],
+ );
+ const selectedContributionRow =
+ buildBreakdown?.rows.find(
+ (row) => row.label === selectedContributionLabel,
+ ) ?? null;
+ const selectedContributionProducts =
+ buildBreakdown?.rows.map((row) => row.bonusDelta) ?? [];
+ const selectedContributionMinProduct =
+ selectedContributionProducts.length > 0
+ ? Math.min(...selectedContributionProducts)
+ : 0;
+ const selectedContributionMaxProduct =
+ selectedContributionProducts.length > 0
+ ? Math.max(...selectedContributionProducts)
+ : 1;
+ const selectedContributionAttributes = selectedContributionRow
+ ? getBuildContributionAttributeRows(
+ selectedContributionRow,
+ attributeSchema,
+ )
: [];
+ const selectedSkill =
+ detailCharacter?.skills.find((skill) => skill.id === selectedSkillId) ??
+ null;
+ const selectedInventoryItem =
+ inventory.find((item) => item.id === selectedItemId) ?? null;
+
+ useEffect(() => {
+ setSelectedSkillId(null);
+ setSelectedContributionLabel(null);
+ setSelectedItemId(null);
+ }, [selection?.kind, title]);
+
+ useEffect(() => {
+ if (!selectedContributionLabel || selectedContributionRow) return;
+ setSelectedContributionLabel(null);
+ }, [selectedContributionLabel, selectedContributionRow]);
+
+ useEffect(() => {
+ if (!selectedSkillId || selectedSkill) return;
+ setSelectedSkillId(null);
+ }, [selectedSkill, selectedSkillId]);
+
+ useEffect(() => {
+ if (!selectedItemId || selectedInventoryItem) return;
+ setSelectedItemId(null);
+ }, [selectedInventoryItem, selectedItemId]);
return (
{selection && (
event.stopPropagation()}
+ onClick={(event) => event.stopPropagation()}
>
-
详情
-
{title}
+
+ 详情
+
+
+ {title}
+
{subtitle}
- ) : selection.kind === 'companion' && companionCharacter ? (
+ ) : selection.kind === 'companion' &&
+ companionCharacter ? (
) : npcEncounter ? (
-
+
) : null}
{selection.kind === 'npc' && npcEncounter && npcState && (
- {getNpcBadge(npcEncounter, npcState.affinity, Boolean(npcBattleState))}
+ {getNpcBadge(
+ npcEncounter,
+ npcState.affinity,
+ Boolean(npcBattleState),
+ )}
)}
- {description}
+
+ {description}
+
-
好感等级
+
+ 好感等级
+
-
+
{currentLevel.label}
- 当前好感 {affinity}
+
+ 当前好感 {affinity}
+
+
{nextLevel ? (
<>
@@ -83,76 +175,117 @@ export function AffinityStatusCard({affinity}: {affinity: number}) {
)}
-
{currentLevel.description}
+
+
+ {currentLevel.description}
+
-
好感进度
-
节点数值表示进入对应等级所需的好感度。
+
+ 好感进度
+
+
+ 0 是战斗分界线，低于 0
+ 会直接进入对战；其余节点表示进入对应阶段所需的最低好感。
+
-
-
+
+
+
+
- {AFFINITY_LEVELS.map((level, index) => {
- const ratio = maxVisibleAffinity > 0 ? level.value / maxVisibleAffinity : 0;
- const isReached = affinity >= level.value;
- const isCurrent = currentLevel.value === level.value;
- const isFirst = index === 0;
- const isLast = index === AFFINITY_LEVELS.length - 1;
+
+
+ {AFFINITY_PROGRESS_MARKERS.map((marker) => {
+ const markerRatio = getAffinityProgressRatio(marker.value);
+ const isReached = isMarkerReached(marker, affinity);
+ const isActive = marker.value === activeMarkerValue;
return (
-
- {isCurrent ? (
-
- ) : null}
- {isReached && !isCurrent ? (
-
- ) : null}
+
+
+ {isActive ? (
+
+ ) : null}
+
+
+
+
+ {marker.value}
);
})}
-
-
- {AFFINITY_LEVELS.map(level => {
- const isReached = affinity >= level.value;
-
- return (
-
-
- {level.label}
-
-
- {level.value}
-
-
- );
- })}
-
diff --git a/src/components/CharacterDetailModal.tsx b/src/components/CharacterDetailModal.tsx
index f096bdc0..3b8d8b03 100644
--- a/src/components/CharacterDetailModal.tsx
+++ b/src/components/CharacterDetailModal.tsx
@@ -260,7 +260,7 @@ export function CharacterDetailModal({
-
+
diff --git a/src/components/CharacterPanel.tsx b/src/components/CharacterPanel.tsx
index 025f5402..cf2b8395 100644
--- a/src/components/CharacterPanel.tsx
+++ b/src/components/CharacterPanel.tsx
@@ -111,6 +111,12 @@ function StatusRow({
);
}
+function getGenderLabel(gender: Character['gender']) {
+ if (gender === 'female') return '女';
+ if (gender === 'male') return '男';
+ return '未明';
+}
+
const SKILL_STYLE_LABELS = {
burst: '爆发',
steady: '稳态',
@@ -427,7 +433,7 @@ export function CharacterPanel({
)}
-
闃熶紞鎴愬憳
+
队伍成员
{partyMembers.map(member => (
-
Camp Mood
+
营地气氛
{campMoments.map(moment => (
diff --git a/src/components/CustomWorldEntityCatalog.tsx b/src/components/CustomWorldEntityCatalog.tsx
index 5a2c6d19..05889850 100644
--- a/src/components/CustomWorldEntityCatalog.tsx
+++ b/src/components/CustomWorldEntityCatalog.tsx
@@ -162,7 +162,21 @@ export function CustomWorldEntityCatalog({
const filteredPlayable = useMemo(
() => profile.playableNpcs.filter(role =>
!deferredSearch
- || matchText([role.name, role.title, role.description, role.backstory, role.personality, ...role.tags].join(' '), deferredSearch),
+ || matchText(
+ [
+ role.name,
+ role.title,
+ role.role,
+ role.description,
+ role.backstory,
+ role.personality,
+ role.motivation,
+ role.combatStyle,
+ ...role.relationshipHooks,
+ ...role.tags,
+ ].join(' '),
+ deferredSearch,
+ ),
),
[deferredSearch, profile.playableNpcs],
);
@@ -170,7 +184,21 @@ export function CustomWorldEntityCatalog({
const filteredStory = useMemo(
() => profile.storyNpcs.filter(npc =>
!deferredSearch
- || matchText([npc.name, npc.role, npc.description, npc.motivation, ...npc.relationshipHooks].join(' '), deferredSearch),
+ || matchText(
+ [
+ npc.name,
+ npc.title,
+ npc.role,
+ npc.description,
+ npc.backstory,
+ npc.personality,
+ npc.motivation,
+ npc.combatStyle,
+ ...npc.relationshipHooks,
+ ...npc.tags,
+ ].join(' '),
+ deferredSearch,
+ ),
),
[deferredSearch, profile.storyNpcs],
);
@@ -320,9 +348,12 @@ export function CustomWorldEntityCatalog({
{role.description}
{role.backstory}
+
身份：{role.role}
+
初始好感：{role.initialAffinity}
性格：{role.personality}
战斗：{role.combatStyle}
+
动机：{role.motivation}
{role.tags.map(tag => (
@@ -343,7 +374,7 @@ export function CustomWorldEntityCatalog({
{activeTab === 'story' ? (
- 每个场景角色都可以单独组合中世纪奇幻角色形象，并同步到进入世界后的展示效果。
+ 场景角色默认可组合中世纪奇幻角色形象；当角色文本明显指向怪物型 NPC 且初始好感偏敌对时，预览也会自动尝试引用怪物素材。
{filteredStory.length === 0 ? (
@@ -362,18 +393,22 @@ export function CustomWorldEntityCatalog({
>
{npc.description}
+
+
头衔：{npc.title}
+
初始好感：{npc.initialAffinity}
+
性格：{npc.personality || '未填写'}
+
战斗：{npc.combatStyle || '未填写'}
+
+ {npc.backstory ? (
+
背景：{npc.backstory}
+ ) : null}
动机：{npc.motivation}
{npc.relationshipHooks.map(hook => (
@@ -381,6 +416,11 @@ export function CustomWorldEntityCatalog({
{hook}
))}
+ {npc.tags.map(tag => (
+
+ {tag}
+
+ ))}
diff --git a/src/components/CustomWorldEntityEditorModal.tsx b/src/components/CustomWorldEntityEditorModal.tsx
index d8500d1e..63b980e0 100644
--- a/src/components/CustomWorldEntityEditorModal.tsx
+++ b/src/components/CustomWorldEntityEditorModal.tsx
@@ -77,6 +77,14 @@ function commaText(value: string[]) {
return value.join(', ');
}
+function clampInitialAffinity(value: string, fallback: number) {
+ const parsed = Number.parseInt(value, 10);
+ if (!Number.isFinite(parsed)) {
+ return fallback;
+ }
+ return Math.max(-40, Math.min(90, Math.round(parsed)));
+}
+
function useDraft
(value: T) {
const [draft, setDraft] = useState(value);
useEffect(() => setDraft(value), [value]);
@@ -726,8 +734,8 @@ function StoryNpcVisualEditorModal({
/>
{isAiGenerateOpen ? (
setIsAiGenerateOpen(false)}
/>
) : null}
@@ -900,6 +908,14 @@ function PlayableNpcEditor({
}
/>
+
+
+ setDraft((current) => ({ ...current, role: value }))
+ }
+ />
+
+
+