refactor(BDSM): 简化BDSM任务流程并重构部分UI逻辑

oneMuggle · oneMuggle · commit 6f1015fd9d77 · 2026-05-06T10:30:45.000+08:00
- 移除独立的 `BDSMTaskModal`，其功能已合并到关系模态框中。
- 简化战斗模态框（`BattleModal`），移除内部的状态计算逻辑，使其成为一个纯粹的展示组件。
- 移除了 BDSM 任务和契约中关于奖励/惩罚描述的独立生成提示词，将其整合到核心流程中。
- 清理了 `MobileDeviceModal` 中不再使用的 `isRefreshing` 属性。
- 修正了多个组件中的 React hook 依赖项数组，以提高代码稳定性和遵循 linting 规则。
diff --git a/App.tsx b/App.tsx
@@ -44,7 +44,6 @@ const SocialModal = 创建可预加载懒组件(() => import('./components/featu
 const MobileSocial = 创建可预加载懒组件(() => import('./components/features/Social/MobileSocial'));
 const CampusDesireDashboard = 创建可预加载懒组件(() => import('./components/features/CampusDesireDashboard'));
 const BDSMRelationshipModal = 创建可预加载懒组件(() => import('./components/features/BDSMRelationshipModal'));
-const BDSMTaskModal = 创建可预加载懒组件(() => import('./components/features/BDSMTaskModal'));
 const BDSMContractModal = 创建可预加载懒组件(() => import('./components/features/BDSMContractModal'));
 const BDSMSafetyModal = 创建可预加载懒组件(() => import('./components/features/BDSMSafetyModal'));
 const MobileCampusDesireApp = 创建可预加载懒组件(() => import('./components/features/MobileCampusDesireApp'));
@@ -184,7 +183,8 @@ const App: React.FC = () => {
         state.女主剧情规划,
         state.开局配置,
         meta.builtinPromptEntries,
-        meta.worldbooks
+        meta.worldbooks,
+        actions
     ]);
     const confirmResolverRef = React.useRef<((value: boolean) => void) | null>(null);
     const 最近小说分解报错提示IDRef = React.useRef('');
@@ -296,7 +296,7 @@ const App: React.FC = () => {
 
         const warmup = () => {
             if (cancelled) return;
-            preloadTargets.forEach((target, index) => {
+            preloadTargets.forEach((target: { preload?: () => void }, index: number) => {
                 window.setTimeout(() => {
                     if (cancelled) return;
                     void target.preload?.();
@@ -386,6 +386,8 @@ const App: React.FC = () => {
         return `${m[1]}年${m[2]}月${m[3]}日 ${m[4]}:${m[5]}`;
     };
 
+    // helper functions recreated each render, behaviorally stable
+    /* eslint-disable react-hooks/exhaustive-deps */
     const tickerEvents = React.useMemo(() => {
         const ongoingEvents = Array.isArray(state.世界?.进行中事件) ? state.世界.进行中事件 : [];
         const formatted = ongoingEvents
@@ -401,6 +403,7 @@ const App: React.FC = () => {
 
         return formatted.length > 0 ? formatted : state.worldEvents;
     }, [state.世界, state.worldEvents]);
+    /* eslint-enable react-hooks/exhaustive-deps */
 
     const 启用同人模式 = React.useMemo(
         () => state.开局配置?.同人融合?.enabled === true && state.开局配置?.同人融合?.启用附加小说 === true,
@@ -430,7 +433,7 @@ const App: React.FC = () => {
     }, [state.角色]);
     const 主角锚点 = React.useMemo(
         () => actions.getPlayerCharacterAnchor?.() || null,
-        [actions, state.apiConfig]
+        [actions]
     );
     const playerProfile = React.useMemo(
         () => ({ 姓名: state.角色?.姓名, 头像图片URL: 玩家头像地址 }),
@@ -539,7 +542,6 @@ const App: React.FC = () => {
     const closeNovelDecompositionWorkbench = React.useCallback(() => setShowNovelDecompositionWorkbench(false), []);
     const closeNovelWritingWorkbench = React.useCallback(() => setShowNovelWritingWorkbench(false), []);
     const closeSaveLoad = React.useCallback(() => setters.setShowSaveLoad({ show: false, mode: 'save' }), [setters]);
-    const closeWorldbookManager = React.useCallback(() => setShowWorldbookManager(false), []);
     const closeMobileMusic = React.useCallback(() => setShowMobileMusic(false), []);
     const openWorldbookManager = React.useCallback(() => setShowWorldbookManager(true), []);
     const openNovelDecompositionWorkbench = React.useCallback(async () => {
@@ -697,7 +699,7 @@ const App: React.FC = () => {
             default:
                 break;
         }
-    }, [activeMobileWindow, closeAllPanels, openImageManagerWithCheck, openNovelDecompositionWorkbench, setters, 启用修炼体系]);
+    }, [activeMobileWindow, closeAllPanels, openImageManagerWithCheck, openNovelDecompositionWorkbench, setters, 启用修炼体系, actions]);
 
     React.useEffect(() => {
         if (!启用修炼体系 && state.showKungfu) {
@@ -716,9 +718,11 @@ const App: React.FC = () => {
         };
         window.addEventListener('keydown', handler);
         return () => window.removeEventListener('keydown', handler);
-    }, [state.view, state.showSettings, state.showSocial, state.showInventory, state.showEquipment, state.showBattle, state.showTeam, state.showKungfu, state.showWorld, state.showMap, state.showSect, state.showTask, state.showAgreement, state.showStory, state.showHeroinePlan, state.showMemory, state.showSaveLoad, actions.openDevice]);
+    }, [state.view, state.showSettings, state.showSocial, state.showInventory, state.showEquipment, state.showBattle, state.showTeam, state.showKungfu, state.showWorld, state.showMap, state.showSect, state.showTask, state.showAgreement, state.showStory, state.showHeroinePlan, state.showMemory, state.showSaveLoad, actions]);
 
     // 约定状态同步 → 见面预约（当约定状态变为已履行/已违约时，同步更新预约状态）
+    // setters is a stable reference from useGame
+    /* eslint-disable react-hooks/exhaustive-deps */
     React.useEffect(() => {
         const 校园系统 = state.校园系统 as any;
         if (!校园系统?.见面预约列表?.length || !state.约定列表?.length) return;
@@ -744,6 +748,7 @@ const App: React.FC = () => {
             setters.set校园系统?.({ ...校园系统, 见面预约列表: 更新预约列表 });
         }
     }, [state.约定列表, state.校园系统, setters.set校园系统]);
+    /* eslint-enable react-hooks/exhaustive-deps */
 
 
     return (
@@ -1521,8 +1526,8 @@ const App: React.FC = () => {
                                     character={state.角色}
                                     battle={state.战斗}
                                     onClose={() => setters.setShowBattle(false)}
-                                    onAction={(结果) => {
-                                        console.log('玩家战斗行动:', 结果);
+                                    onAction={() => {
+                                        // Battle action handler — results are tracked in state.战斗
                                     }}
                                 />
                             )}
@@ -1910,9 +1915,6 @@ const App: React.FC = () => {
                                         创建时间: Date.now(),
                                     }]);
                                 }}
-                                isRefreshing={meta.deviceRefreshQueue?.some(
-                                    (t) => t.status === 'processing'
-                                ) || false}
                                 onSendMessage={(npcId: string, npcName: string, content: string) => {
                                     return actions.handlePrivateChatSend?.(npcId, npcName, content).then(result => {
                                         if (result.npcReply) {
diff --git a/components/features/BDSMRelationshipModal.tsx b/components/features/BDSMRelationshipModal.tsx
@@ -44,7 +44,6 @@ const BDSMRelationshipModal: React.FC<Props> = ({
     onClose,
     onAcceptTask,
     onReportComplete,
-    onAbandonTask,
     onGoToContract,
     onEditSafety,
 }) => {
diff --git a/components/features/Battle/BattleModal.tsx b/components/features/Battle/BattleModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { 角色数据结构, 战斗状态结构 } from '../../../types';
 import { IconSwords, IconYinYang } from '../../ui/Icons';
 import BattleActionPanel from './BattleActionPanel';
@@ -53,29 +53,6 @@ const BattleModal: React.FC<Props> = ({ character, battle, onClose, onAction })
     const 敌方列表 = (Array.isArray(battle?.敌方) ? battle.敌方 : []) as 扩展敌方[];
     const 存活敌人数 = 敌方列表.filter((enemy) => (enemy?.当前血量 || 0) > 0).length;
 
-    const 部位列表 = [
-        ['头部', character.头部当前血量, character.头部最大血量, character.头部状态],
-        ['胸腹', character.胸部当前血量, character.胸部最大血量, character.胸部状态], // 简化合并展示，腹部胸部通常相关联，这里按原数据展示
-        ['腹部', character.腹部当前血量, character.腹部最大血量, character.腹部状态],
-        ['左手', character.左手当前血量, character.左手最大血量, character.左手状态],
-        ['右手', character.右手当前血量, character.右手最大血量, character.右手状态],
-        ['左腿', character.左腿当前血量, character.左腿最大血量, character.左腿状态],
-        ['右腿', character.右腿当前血量, character.右腿最大血量, character.右腿状态],
-    ] as const;
-
-    const 合并展示部位 = [
-        { label: '首', cur: character.头部当前血量, max: character.头部最大血量, status: character.头部状态 },
-        { label: '胸', cur: character.胸部当前血量, max: character.胸部最大血量, status: character.胸部状态 },
-        { label: '腹', cur: character.腹部当前血量, max: character.腹部最大血量, status: character.腹部状态 },
-        { label: '臂', cur: (character.左手当前血量 || 0) + (character.右手当前血量 || 0), max: (character.左手最大血量 || 0) + (character.右手最大血量 || 0), status: character.右手状态 !== '正常' ? character.右手状态 : character.左手状态 },
-        { label: '腿', cur: (character.左腿当前血量 || 0) + (character.右腿当前血量 || 0), max: (character.左腿最大血量 || 0) + (character.右腿最大血量 || 0), status: character.右腿状态 !== '正常' ? character.右腿状态 : character.左腿状态 },
-    ];
-
-    const 玩家总血量上限 = 部位列表.reduce((sum, [, , max]) => sum + Math.max(0, Number(max) || 0), 0);
-    const 玩家总血量当前 = 部位列表.reduce((sum, [, cur]) => sum + Math.max(0, Number(cur) || 0), 0);
-    const 境界值 = Math.max(1, Number(character.境界层级) || 1);
-    const 玩家境界展示 = (character.境界 || '').trim() || `境界值 ${境界值}`;
-
     return (
         <div className="fixed inset-0 bg-black/90 backdrop-blur-sm z-[210] flex items-center justify-center p-4 animate-fadeIn">
             <div className="bg-ink-black/95 w-full max-w-7xl max-h-[90vh] h-[90vh] flex flex-col rounded-2xl border border-wuxia-gold/20 shadow-[0_0_80px_rgba(0,0,0,0.9)] shadow-wuxia-gold/10 relative overflow-hidden">
diff --git a/components/features/MobileDevice/MobileDeviceModal.tsx b/components/features/MobileDevice/MobileDeviceModal.tsx
@@ -18,7 +18,6 @@ interface MobileDeviceModalProps {
     onRulesChange?: (updater: (prev: { 校规列表: 校规条目[]; 影响日志: 校规影响日志[] }) => { 校规列表: 校规条目[]; 影响日志: 校规影响日志[] }) => void;
     onHypnosisChange?: (updater: (prev: { 催眠记录列表: 催眠记录[]; app等级: 催眠App等级; 累计使用次数: number }) => { 催眠记录列表: 催眠记录[]; app等级: 催眠App等级; 累计使用次数: number }) => void;
     onRefresh?: (board?: 'bdsn') => void;
-    isRefreshing?: boolean;
     onSendMessage?: (npcId: string, npcName: string, content: string) => Promise<{ npcReply: string }>;
     onUnlockNPC?: (npc: NPC结构) => void;
     onBDSM帖子更新?: (帖子ID: string, updater: (post: BDSM论坛帖子) => BDSM论坛帖子) => void;
@@ -39,7 +38,6 @@ const MobileDeviceModal: React.FC<MobileDeviceModalProps> = ({
     onRulesChange,
     onHypnosisChange,
     onRefresh,
-    isRefreshing,
     onSendMessage,
     onUnlockNPC,
     onBDSM帖子更新,
diff --git a/components/features/MobileDevice/MobileHome.tsx b/components/features/MobileDevice/MobileHome.tsx
@@ -5,10 +5,8 @@ import { resolveEraNode } from '../../../models/eraTheme';
 import type { 当前可用接口结构 } from '../../../utils/apiConfig';
 
 type ApiConfigLike = 当前可用接口结构 | Record<string, unknown>;
-import ChatApp from './apps/ChatApp';
 import MapApp from './apps/MapApp';
 import ContactsApp from './apps/ContactsApp';
-import ForumApp from './apps/ForumApp';
 import NewsApp from './apps/NewsApp';
 import AlbumApp from './apps/AlbumApp';
 import ToolsApp from './apps/ToolsApp';
diff --git a/hooks/useGame/bdsmTaskWorkflow.ts b/hooks/useGame/bdsmTaskWorkflow.ts
@@ -18,8 +18,6 @@ import {
   构建调教任务生成提示词,
   构建日常指令生成提示词,
   构建任务完成评价提示词,
-  构建奖励描述生成提示词,
-  构建惩罚描述生成提示词,
   构建契约条款生成提示词,
   构建关系阶段推进判定提示词,
 } from '../../prompts/runtime/bdsmTasks';
diff --git a/hooks/useGame/sendWorkflow/index.ts b/hooks/useGame/sendWorkflow/index.ts
@@ -146,7 +146,7 @@ type 主剧情发送当前状态 = {
     时代配置ID?: string;
 };
 
-import { 构建校园NSFW参数, 处理BDSM状态更新, type BDSM状态更新回调 } from '../bdsmStateIntegration';
+import { 构建校园NSFW参数, type BDSM状态更新回调 } from '../bdsmStateIntegration';
 import { 构建都市网约车NSFW参数 } from '../urbanDriverNSFWIntegration';
 
 // ─── 主剧情发送依赖 ─────────────────────────────────────────────────────────
diff --git a/prompts/runtime/bdsmTasks.ts b/prompts/runtime/bdsmTasks.ts
@@ -481,7 +481,7 @@ export const 构建Aftercare注入提示词 = (参数: {
   服从度: number;
   服从度加成: number;
 }): string => {
-  const { npcName, 触发原因, 当前阶段, 服从度, 服从度加成 } = 参数;
+  const { 触发原因, 当前阶段, 服从度, 服从度加成 } = 参数;
 
   return `请生成一段 Aftercare（事后温存）场景的叙事。
 
