1

src/components/GameShell.tsx

@@ -283,6 +283,7 @@ export function GameShell({session, story, entry, companions, audio}: GameShellP
     !gameState.playerCharacter;
   const collapseTopStage = gameState.currentScene === 'Selection';
   const shouldHideStoryOptions = sceneTransitionPhase !== 'idle';
+  const visibleStoryForRender = visibleCurrentStory;
 
   const dialogueIndicator = useMemo(() => {
     if (!isLoading || visibleCurrentStory?.displayMode !== 'dialogue' || visibleGameState.currentEncounter?.kind !== 'npc') {
@@ -431,6 +432,7 @@ export function GameShell({session, story, entry, companions, audio}: GameShellP
             companions={canvasCompanionRenderStates}
             npcStates={visibleGameState.npcStates}
             dialogueIndicator={dialogueIndicator}
+            npcAffinityEffect={visibleStoryForRender?.npcAffinityEffect ?? null}
             onEntitySelect={setSelectedSceneEntity}
             onSceneNameClick={() => setIsMapOpen(true)}
             sceneTransitionPhase={sceneTransitionPhase}
@@ -485,7 +487,7 @@ export function GameShell({session, story, entry, companions, audio}: GameShellP
             </motion.div>
           )}
 
-          {visibleGameState.playerCharacter && visibleCurrentStory && (
+          {visibleGameState.playerCharacter && visibleStoryForRender && (
             <motion.div key="story-flow" initial={{opacity: 0}} animate={{opacity: 1}} className="flex h-full min-h-0 flex-col">
               <div className="story-top-tabs mb-3 grid grid-cols-3 gap-2 sm:gap-3">
                 <button
@@ -562,7 +564,7 @@ export function GameShell({session, story, entry, companions, audio}: GameShellP
                 <Suspense fallback={<PanelLoadingFallback label="正在加载冒险面板" />}>
                   <AdventurePanel
                     aiError={aiError}
-                    currentStory={visibleCurrentStory}
+                    currentStory={visibleStoryForRender}
                     isLoading={isLoading}
                     displayedOptions={displayedOptions}
                     hideOptions={shouldHideStoryOptions}