@luna-editor/engine 0.5.10 → 0.5.12

package/dist/hooks/useBacklog.js

@@ -1,4 +1,45 @@
 import { useCallback, useEffect, useRef, useState } from "react";
+/**
+ * speakerIdからキャラクター画像URLとクロップ情報を解決する
+ * 優先順位: speakerState > baseBodyState > characters[].entityState
+ */
+function resolveSpeakerImage(block, allBlocks) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    // 1. speakerState.imageUrl（単一画像キャラ）
+    if ((_a = block.speakerState) === null || _a === void 0 ? void 0 : _a.imageUrl) {
+        return {
+            imageUrl: block.speakerState.imageUrl,
+            cropArea: (_b = block.speakerState.cropArea) !== null && _b !== void 0 ? _b : undefined,
+        };
+    }
+    // 2. speakerState.layers[0].imageUrl（レイヤー機能キャラの表情レイヤー）
+    if ((_e = (_d = (_c = block.speakerState) === null || _c === void 0 ? void 0 : _c.layers) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.imageUrl) {
+        return {
+            imageUrl: block.speakerState.layers[0].imageUrl,
+            cropArea: (_f = block.speakerState.cropArea) !== null && _f !== void 0 ? _f : undefined,
+        };
+    }
+    if (!block.speakerId)
+        return {};
+    // 2. character_entranceブロックからbaseBodyState or entityStateを探す
+    for (const b of allBlocks) {
+        if (b.characters) {
+            const char = b.characters.find((c) => c.object.id === block.speakerId);
+            if (char) {
+                if ((_g = char.baseBodyState) === null || _g === void 0 ? void 0 : _g.imageUrl) {
+                    return { imageUrl: char.baseBodyState.imageUrl };
+                }
+                if (char.entityState.imageUrl) {
+                    return {
+                        imageUrl: char.entityState.imageUrl,
+                        cropArea: (_h = char.entityState.cropArea) !== null && _h !== void 0 ? _h : undefined,
+                    };
+                }
+            }
+        }
+    }
+    return {};
+}
 export function useBacklog({ scenario, currentBlockIndex, currentBlock, }) {
     const [logs, setLogs] = useState([]);
     const hasBuiltInitialHistory = useRef(false);
@@ -26,8 +67,9 @@ export function useBacklog({ scenario, currentBlockIndex, currentBlock, }) {
             .map((block, index) => ({ block, realIndex: index }))
             .filter(({ block }) => block.blockType === "dialogue" || block.blockType === "narration");
         conversationBlocks.forEach(({ block, realIndex }) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c;
             if (!processedBlocks.current.has(realIndex)) {
+                const speakerImage = resolveSpeakerImage(block, scenario.blocks);
                 const logEntry = {
                     id: `${block.id}_init`,
                     timestamp: Date.now(),
@@ -37,7 +79,8 @@ export function useBacklog({ scenario, currentBlockIndex, currentBlock, }) {
                     speakerName: (_a = block.speaker) === null || _a === void 0 ? void 0 : _a.name,
                     speakerState: (_b = block.speakerState) === null || _b === void 0 ? void 0 : _b.name,
                     speakerId: (_c = block.speakerId) !== null && _c !== void 0 ? _c : undefined,
-                    speakerImageUrl: (_e = (_d = block.speakerState) === null || _d === void 0 ? void 0 : _d.imageUrl) !== null && _e !== void 0 ? _e : undefined,
+                    speakerImageUrl: speakerImage.imageUrl,
+                    speakerCropArea: speakerImage.cropArea,
                     options: block.options,
                 };
                 addLogEntry(logEntry);
@@ -48,7 +91,7 @@ export function useBacklog({ scenario, currentBlockIndex, currentBlock, }) {
     }, [scenario.blocks, addLogEntry]);
     // 新しいブロックを処理
     useEffect(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         if (!currentBlock || !hasBuiltInitialHistory.current) {
             return;
         }
@@ -56,7 +99,7 @@ export function useBacklog({ scenario, currentBlockIndex, currentBlock, }) {
         if (currentBlock.blockType === "dialogue" ||
             currentBlock.blockType === "narration") {
             if (!processedBlocks.current.has(currentBlockIndex)) {
-                console.log("Adding new conversation block to log:", currentBlock);
+                const speakerImage = resolveSpeakerImage(currentBlock, scenario.blocks);
                 const logEntry = {
                     id: `${currentBlock.id}_${Date.now()}`,
                     timestamp: Date.now(),
@@ -66,7 +109,8 @@ export function useBacklog({ scenario, currentBlockIndex, currentBlock, }) {
                     speakerName: (_a = currentBlock.speaker) === null || _a === void 0 ? void 0 : _a.name,
                     speakerState: (_b = currentBlock.speakerState) === null || _b === void 0 ? void 0 : _b.name,
                     speakerId: (_c = currentBlock.speakerId) !== null && _c !== void 0 ? _c : undefined,
-                    speakerImageUrl: (_e = (_d = currentBlock.speakerState) === null || _d === void 0 ? void 0 : _d.imageUrl) !== null && _e !== void 0 ? _e : undefined,
+                    speakerImageUrl: speakerImage.imageUrl,
+                    speakerCropArea: speakerImage.cropArea,
                     options: currentBlock.options,
                 };
                 addLogEntry(logEntry);

package/dist/types.d.ts

@@ -392,8 +392,10 @@ export interface BacklogEntry {
     speakerState?: string;
     /** 話者のオブジェクトID */
     speakerId?: string;
-    /** 話者の画像URL（そのブロック時点の状態の画像） */
+    /** 話者の画像URL（そのブロック時点の状態の画像、またはレイヤーキャラの素体画像） */
     speakerImageUrl?: string;
+    /** 話者の画像クロップ情報（JSON: {x, y, width, height}） */
+    speakerCropArea?: string;
     /** Block options (for plugin-defined options like bubble style) */
     options?: BlockOptions | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luna-editor/engine",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "description": "Luna Editor scenario playback engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",