Fixed minor issue with l2d expression profile. All set for v0.3.2.

wehos · wehos · commit be1877a5f437 · 2025-08-07T13:56:04.000-07:00
diff --git a/main_server.py b/main_server.py
@@ -1027,8 +1027,45 @@ async def get_emotion_mapping(model_name: str):
         with open(model_json_path, 'r', encoding='utf-8') as f:
             config_data = json.load(f)
 
-        emotion_mapping = config_data.get('EmotionMapping', {})
-            
+        # 优先使用 EmotionMapping；若不存在则从 FileReferences 推导
+        emotion_mapping = config_data.get('EmotionMapping')
+        if not emotion_mapping:
+            derived_mapping = {"motions": {}, "expressions": {}}
+            file_refs = config_data.get('FileReferences', {}) or {}
+
+            # 从标准 Motions 结构推导
+            motions = file_refs.get('Motions', {}) or {}
+            for group_name, items in motions.items():
+                files = []
+                for item in items or []:
+                    try:
+                        file_path = item.get('File') if isinstance(item, dict) else None
+                        if file_path:
+                            files.append(file_path.replace('\\', '/'))
+                    except Exception:
+                        continue
+                derived_mapping["motions"][group_name] = files
+
+            # 从标准 Expressions 结构推导（按 Name 的前缀进行分组，如 happy_xxx）
+            expressions = file_refs.get('Expressions', []) or []
+            for item in expressions:
+                if not isinstance(item, dict):
+                    continue
+                name = item.get('Name') or ''
+                file_path = item.get('File') or ''
+                if not file_path:
+                    continue
+                file_path = file_path.replace('\\', '/')
+                # 根据第一个下划线拆分分组
+                if '_' in name:
+                    group = name.split('_', 1)[0]
+                else:
+                    # 无前缀的归入 neutral 组，避免丢失
+                    group = 'neutral'
+                derived_mapping["expressions"].setdefault(group, []).append(file_path)
+
+            emotion_mapping = derived_mapping
+        
         return {"success": True, "config": emotion_mapping}
     except Exception as e:
         logger.error(f"获取情绪映射配置失败: {e}")
@@ -1061,14 +1098,59 @@ async def update_emotion_mapping(model_name: str, request: Request):
         with open(model_json_path, 'r', encoding='utf-8') as f:
             config_data = json.load(f)
 
-        # 添加或更新 EmotionMapping
+        # 统一写入到标准 Cubism 结构（FileReferences.Motions / FileReferences.Expressions）
+        file_refs = config_data.setdefault('FileReferences', {})
+
+        # 处理 motions: data 结构为 { motions: { emotion: ["motions/xxx.motion3.json", ...] }, expressions: {...} }
+        motions_input = (data.get('motions') if isinstance(data, dict) else None) or {}
+        motions_output = {}
+        for group_name, files in motions_input.items():
+            items = []
+            for file_path in files or []:
+                if not isinstance(file_path, str):
+                    continue
+                normalized = file_path.replace('\\', '/').lstrip('./')
+                items.append({"File": normalized})
+            motions_output[group_name] = items
+        file_refs['Motions'] = motions_output
+
+        # 处理 expressions: 将按 emotion 前缀生成扁平列表，Name 采用 "{emotion}_{basename}" 的约定
+        expressions_input = (data.get('expressions') if isinstance(data, dict) else None) or {}
+
+        # 先保留不属于我们情感前缀的原始表达（避免覆盖用户自定义）
+        existing_expressions = file_refs.get('Expressions', []) or []
+        emotion_prefixes = set(expressions_input.keys())
+        preserved_expressions = []
+        for item in existing_expressions:
+            try:
+                name = (item.get('Name') or '') if isinstance(item, dict) else ''
+                prefix = name.split('_', 1)[0] if '_' in name else None
+                if not prefix or prefix not in emotion_prefixes:
+                    preserved_expressions.append(item)
+            except Exception:
+                preserved_expressions.append(item)
+
+        new_expressions = []
+        for emotion, files in expressions_input.items():
+            for file_path in files or []:
+                if not isinstance(file_path, str):
+                    continue
+                normalized = file_path.replace('\\', '/').lstrip('./')
+                base = os.path.basename(normalized)
+                base_no_ext = base.replace('.exp3.json', '')
+                name = f"{emotion}_{base_no_ext}"
+                new_expressions.append({"Name": name, "File": normalized})
+
+        file_refs['Expressions'] = preserved_expressions + new_expressions
+
+        # 同时保留一份 EmotionMapping（供管理器读取与向后兼容）
         config_data['EmotionMapping'] = data
-        
+
         # 保存配置到文件
         with open(model_json_path, 'w', encoding='utf-8') as f:
             json.dump(config_data, f, ensure_ascii=False, indent=2)
-            
-        logger.info(f"模型 {model_name} 的情绪映射配置已更新")
+        
+        logger.info(f"模型 {model_name} 的情绪映射配置已更新（已同步到 FileReferences）")
         return {"success": True, "message": "情绪映射配置已保存"}
     except Exception as e:
         logger.error(f"更新情绪映射配置失败: {e}")
diff --git a/static/live2d.js b/static/live2d.js
@@ -110,6 +110,8 @@ class Live2DManager {
         this.isLocked = true;
         this.onModelLoaded = null;
         this.onStatusUpdate = null;
+        this.modelName = null; // 记录当前模型目录名
+        this.modelRootPath = null; // 记录当前模型根路径，如 /static/<modelName>
     }
 
     // 初始化 PIXI 应用
@@ -201,41 +203,31 @@ class Live2DManager {
             return;
         }
         
-        const expressions = this.emotionMapping.Expressions.filter(e => e.Name.startsWith(emotion));
+        const expressions = this.emotionMapping.Expressions.filter(e => (e.Name || '').startsWith(emotion));
         if (!expressions || expressions.length === 0) {
             console.log(`未找到情感 ${emotion} 对应的表情，将跳过表情播放`);
             return; // Gracefully exit if no expression is found
         }
         
-        const expressionFile = this.getRandomElement(expressions).File.split('/').pop();
-        if (!expressionFile) return;
+        const choice = this.getRandomElement(expressions);
+        if (!choice || !choice.File) return;
         
         try {
-            // 获取模型名称（从模型路径中提取）
-            let modelName = 'mao_pro'; // 默认模型名称
-            
-            // 尝试从模型路径中提取模型名称
-            if (this.currentModel.internalModel && this.currentModel.internalModel.settings && this.currentModel.internalModel.settings.model) {
-                const modelPath = this.currentModel.internalModel.settings.model;
-                const pathParts = modelPath.split('/');
-                modelName = pathParts[pathParts.length - 2] || pathParts[pathParts.length - 1].replace('.model3.json', '');
-            }
-            
-            // 加载表情文件并应用参数
-            const expressionPath = `/static/${modelName}/expressions/${expressionFile}`;
+            // 计算表达文件路径（相对模型根目录）
+            const expressionPath = this.resolveAssetPath(choice.File);
             const response = await fetch(expressionPath);
             if (!response.ok) {
                 throw new Error(`Failed to load expression: ${response.statusText}`);
             }
             
             const expressionData = await response.json();
-            console.log(`加载表情文件: ${expressionFile}`, expressionData);
+            console.log(`加载表情文件: ${choice.File}`, expressionData);
             
             // 方法1: 尝试使用原生expression API
             if (this.currentModel.expression) {
                 try {
-                    // 从文件名中提取expression名称（去掉.exp3.json后缀）
-                    const expressionName = expressionFile.replace('.exp3.json', '');
+                    // 直接使用配置中的 Name（我们保存时已包含情感前缀）
+                    const expressionName = choice.Name || choice.File.replace('.exp3.json', '');
                     console.log(`尝试使用原生API播放expression: ${expressionName}`);
                     
                     const expression = await this.currentModel.expression(expressionName);
@@ -286,20 +278,10 @@ class Live2DManager {
             return;
         }
         
-        const motionFile = this.getRandomElement(motions).File.split('/').pop();
-        if (!motionFile) return;
+        const choice = this.getRandomElement(motions);
+        if (!choice || !choice.File) return;
         
         try {
-            // 获取模型名称（从模型路径中提取）
-            let modelName = 'mao_pro'; // 默认模型名称
-            
-            // 尝试从模型路径中提取模型名称
-            if (this.currentModel.internalModel && this.currentModel.internalModel.settings && this.currentModel.internalModel.settings.model) {
-                const modelPath = this.currentModel.internalModel.settings.model;
-                const pathParts = modelPath.split('/');
-                modelName = pathParts[pathParts.length - 2] || pathParts[pathParts.length - 1].replace('.model3.json', '');
-            }
-            
             // 清除之前的动作定时器
             if (this.motionTimer) {
                 console.log('检测到前一个motion正在播放，正在停止...');
@@ -326,14 +308,14 @@ class Live2DManager {
             
             // 尝试使用Live2D模型的原生motion播放功能
             try {
-                // 构建完整的motion路径
-                const motionPath = `/static/${modelName}/motions/${motionFile}`;
+                // 构建完整的motion路径（相对模型根目录）
+                const motionPath = this.resolveAssetPath(choice.File);
                 console.log(`尝试播放motion: ${motionPath}`);
                 
                 // 方法1: 直接使用模型的motion播放功能
                 if (this.currentModel.motion) {
                     try {
-                        console.log(`尝试播放motion: ${motionFile}`);
+                        console.log(`尝试播放motion: ${choice.File}`);
                         
                         // 使用情感名称作为motion组名，这样可以确保播放正确的motion
                         console.log(`尝试使用情感组播放motion: ${emotion}`);
@@ -363,7 +345,7 @@ class Live2DManager {
                             
                             // 设置定时器在motion结束后清理
                             this.motionTimer = setTimeout(() => {
-                                console.log(`motion播放完成（预期文件: ${motionFile}）`);
+                                console.log(`motion播放完成（预期文件: ${choice.File}）`);
                                 this.motionTimer = null;
                                 this.clearEmotionEffects();
                             }, motionDuration);
@@ -387,7 +369,7 @@ class Live2DManager {
                 }
                 
                 // 如果所有方法都失败，回退到简单动作
-                console.warn(`无法播放motion: ${motionFile}，回退到简单动作`);
+                console.warn(`无法播放motion: ${choice.File}，回退到简单动作`);
                 this.playSimpleMotion(emotion);
                 
             } catch (error) {
@@ -605,6 +587,21 @@ class Live2DManager {
             const model = await Live2DModel.from(modelPath, { autoInteract: false });
             this.currentModel = model;
 
+            // 解析模型目录名与根路径，供资源解析使用
+            try {
+                const cleanPath = (modelPath || '').split('#')[0].split('?')[0];
+                const lastSlash = cleanPath.lastIndexOf('/');
+                const rootDir = lastSlash >= 0 ? cleanPath.substring(0, lastSlash) : '/static';
+                this.modelRootPath = rootDir; // e.g. /static/mao_pro or /static/some/deeper/dir
+                const parts = rootDir.split('/').filter(Boolean);
+                this.modelName = parts.length > 0 ? parts[parts.length - 1] : null;
+                console.log('模型根路径解析:', { modelPath, modelName: this.modelName, modelRootPath: this.modelRootPath });
+            } catch (e) {
+                console.warn('解析模型根路径失败，将使用默认值', e);
+                this.modelRootPath = '/static';
+                this.modelName = null;
+            }
+
             // 配置渲染纹理数量以支持更多蒙版
             if (model.internalModel && model.internalModel.renderer && model.internalModel.renderer._clippingManager) {
                 model.internalModel.renderer._clippingManager._renderTextureCount = 3;
@@ -666,6 +663,19 @@ class Live2DManager {
         }
     }
 
+    // 解析资源相对路径（基于当前模型根目录）
+    resolveAssetPath(relativePath) {
+        if (!relativePath) return '';
+        let rel = String(relativePath).replace(/^[\\/]+/, '');
+        if (rel.startsWith('static/')) {
+            return `/${rel}`;
+        }
+        if (rel.startsWith('/static/')) {
+            return rel;
+        }
+        return `${this.modelRootPath}/${rel}`;
+    }
+
     // 应用模型设置
     applyModelSettings(model, options) {
         const { preferences, isMobile = false } = options;
