clawmate 1.2.0 → 1.4.0

package/renderer/js/character.js

@@ -55,7 +55,7 @@ const Character = (() => {
     ],
 
     walk: [
-      // Frame 0: 왼발 앞
+      // Frame 0: 왼쪽 다리 세트 앞으로 크게 벌림, 집게 열림
       [
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
@@ -70,17 +70,17 @@ const Character = (() => {
         [0,0,1,2,1,1,1,1,1,1,1,1,2,1,0,0],
         [0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0],
         [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
-        [0,0,3,3,3,0,3,3,3,3,0,0,3,3,3,0],
-        [0,3,3,3,0,0,0,3,3,0,0,0,3,3,3,0],
+        [0,3,3,0,0,0,3,3,3,3,0,0,0,3,3,0],
+        [3,3,0,0,0,0,0,3,3,0,0,0,0,0,3,3],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
       ],
-      // Frame 1: 오른발 앞
+      // Frame 1: 양쪽 다리 모임 (접촉 순간), 집게 반 닫힘
       [
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
-        [0,6,0,0,6,0,0,0,0,0,0,6,0,0,6,0],
-        [0,6,0,0,6,0,0,0,0,0,0,6,0,0,6,0],
-        [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
+        [0,0,6,0,6,0,0,0,0,0,0,6,0,6,0,0],
+        [0,0,6,0,6,0,0,0,0,0,0,6,0,6,0,0],
+        [0,0,0,6,6,0,0,0,0,0,0,0,6,6,0,0],
         [0,0,0,6,1,1,0,0,0,0,1,1,6,0,0,0],
         [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
         [0,0,0,1,1,4,5,1,1,4,5,1,1,0,0,0],
@@ -89,11 +89,11 @@ const Character = (() => {
         [0,0,1,2,1,1,1,1,1,1,1,1,2,1,0,0],
         [0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0],
         [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
-        [0,0,0,3,3,3,0,3,3,0,3,3,3,0,0,0],
-        [0,0,0,0,3,3,3,0,0,3,3,3,0,0,0,0],
+        [0,0,0,3,3,0,3,3,3,3,0,3,3,0,0,0],
+        [0,0,0,3,3,0,0,3,3,0,0,3,3,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
       ],
-      // Frame 2: 왼발 뒤
+      // Frame 2: 오른쪽 다리 세트 앞으로 크게 벌림, 집게 닫힘
       [
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
@@ -108,17 +108,17 @@ const Character = (() => {
         [0,0,1,2,1,1,1,1,1,1,1,1,2,1,0,0],
         [0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0],
         [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
-        [0,0,3,3,3,0,3,3,3,3,0,0,3,3,3,0],
-        [0,3,3,3,0,0,0,3,3,0,0,0,3,3,3,0],
+        [0,0,3,3,0,0,3,3,3,3,0,0,3,3,0,0],
+        [0,3,3,0,0,0,0,3,3,0,0,0,0,3,3,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
       ],
-      // Frame 3: 오른발 뒤
+      // Frame 3: 양쪽 다리 모임 (접촉 순간), 집게 반 열림
       [
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
+        [0,6,0,0,6,0,0,0,0,0,0,6,0,0,6,0],
+        [0,6,0,0,6,0,0,0,0,0,0,6,0,0,6,0],
         [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
-        [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
-        [0,0,0,6,6,0,0,0,0,0,0,6,6,0,0,0],
         [0,0,0,6,1,1,0,0,0,0,1,1,6,0,0,0],
         [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
         [0,0,0,1,1,4,5,1,1,4,5,1,1,0,0,0],
@@ -127,14 +127,14 @@ const Character = (() => {
         [0,0,1,2,1,1,1,1,1,1,1,1,2,1,0,0],
         [0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0],
         [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
-        [0,0,0,3,3,3,0,3,3,0,3,3,3,0,0,0],
-        [0,0,0,0,3,3,3,0,0,3,3,3,0,0,0,0],
+        [0,0,0,3,3,0,3,3,3,3,0,3,3,0,0,0],
+        [0,0,0,3,3,0,0,3,3,0,0,3,3,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
       ],
     ],
 
     climb: [
-      // Frame 0: 기어오르기 포즈 1 (옆모습)
+      // Frame 0: 기어오르기 — 윗다리 세트 뻗음, 집게 열림
       [
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
@@ -147,13 +147,13 @@ const Character = (() => {
         [0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0],
         [0,0,0,1,2,1,1,1,1,0,0,0,0,0,0,0],
         [0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0],
-        [0,0,0,3,3,0,3,3,0,0,0,0,0,0,0,0],
         [0,0,3,3,0,0,0,3,3,0,0,0,0,0,0,0],
+        [0,3,3,0,0,0,0,0,3,3,0,0,0,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
       ],
-      // Frame 1: 기어오르기 포즈 2
+      // Frame 1: 기어오르기 — 다리 모임 (교차 순간)
       [
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
@@ -166,12 +166,50 @@ const Character = (() => {
         [0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0],
         [0,0,0,1,2,1,1,1,1,0,0,0,0,0,0,0],
         [0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0],
-        [0,0,3,3,0,0,0,3,3,0,0,0,0,0,0,0],
+        [0,0,0,3,3,0,3,3,0,0,0,0,0,0,0,0],
         [0,0,0,3,3,0,3,3,0,0,0,0,0,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
         [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
       ],
+      // Frame 2: 기어오르기 — 아랫다리 세트 뻗음, 집게 닫힘
+      [
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,1,1,0,0,0,0,0,0,0,0],
+        [0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0],
+        [0,0,0,0,1,4,5,1,1,0,0,0,0,0,0,0],
+        [0,0,0,0,1,4,5,1,1,1,0,0,0,0,0,0],
+        [0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0],
+        [0,0,0,1,2,1,1,1,1,0,0,0,0,0,0,0],
+        [0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0],
+        [0,0,0,3,3,0,3,3,0,0,0,0,0,0,0,0],
+        [0,0,3,3,0,0,0,3,3,0,0,0,0,0,0,0],
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+      ],
+      // Frame 3: 기어오르기 — 다리 모임 (교차 순간, 반대쪽)
+      [
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,6,6,1,1,0,0,0,0,0,0,0,0],
+        [0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0],
+        [0,0,0,0,1,4,5,1,1,0,0,0,0,0,0,0],
+        [0,0,0,0,1,4,5,1,1,1,0,0,0,0,0,0],
+        [0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0],
+        [0,0,0,1,2,1,1,1,1,0,0,0,0,0,0,0],
+        [0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0],
+        [0,0,3,3,0,0,0,3,3,0,0,0,0,0,0,0],
+        [0,0,3,3,0,0,0,3,3,0,0,0,0,0,0,0],
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+      ],
     ],
 
     sleep: [
@@ -335,10 +373,12 @@ const Character = (() => {
     jumping: 'excited',    // 점프: excited 프레임셋 재활용
     rappelling: 'climb',   // 레펠: climb 프레임셋 재활용
     falling: 'scared',     // 낙하: scared 프레임셋 재활용
+    custom: 'walk',        // 커스텀 이동: 기본은 walk, 패턴별로 동적 변경 가능
   };
 
   let currentCanvas = null;
   let currentColorMap = null;
+  let originalFrames = null;  // 원본 프레임 백업 (리셋용)
 
   function createCanvas(container) {
     const canvas = document.createElement('canvas');
@@ -395,5 +435,62 @@ const Character = (() => {
     return (FRAMES[frameSet] || FRAMES.idle).length;
   }
 
-  return { createCanvas, setColorMap, renderFrame, getFrameCount, SIZE, FRAMES, STATE_FRAMES };
+  /**
+   * 커스텀 프레임 데이터 설정 (AI 생성 캐릭터용)
+   * 기존 프레임을 백업하고 새 프레임으로 교체
+   */
+  function setCustomFrames(newFrames) {
+    if (!originalFrames) {
+      originalFrames = {};
+      for (const [key, value] of Object.entries(FRAMES)) {
+        originalFrames[key] = JSON.parse(JSON.stringify(value));
+      }
+    }
+    for (const [key, value] of Object.entries(newFrames)) {
+      if (Array.isArray(value) && value.length > 0) {
+        FRAMES[key] = value;
+      }
+    }
+  }
+
+  /**
+   * 캐릭터 데이터 일괄 설정 (색상 + 프레임)
+   * @param {object} data - { colorMap?, frames? }
+   */
+  function setCharacterData(data) {
+    if (data.colorMap) {
+      setColorMap(data.colorMap);
+    }
+    if (data.frames) {
+      setCustomFrames(data.frames);
+    }
+  }
+
+  /**
+   * 원래 캐릭터로 리셋
+   */
+  function resetCharacter() {
+    if (originalFrames) {
+      for (const key of Object.keys(FRAMES)) {
+        delete FRAMES[key];
+      }
+      Object.assign(FRAMES, originalFrames);
+      originalFrames = null;
+    }
+    // 기본 색상으로 리셋
+    setColorMap({
+      primary: '#ff4f40',
+      secondary: '#ff775f',
+      dark: '#8B4513',
+      eye: '#ffffff',
+      pupil: '#111111',
+      claw: '#ff4f40',
+    });
+  }
+
+  return {
+    createCanvas, setColorMap, renderFrame, getFrameCount,
+    setCustomFrames, setCharacterData, resetCharacter,
+    SIZE, FRAMES, STATE_FRAMES,
+  };
 })();

package/renderer/js/interactions.js

@@ -1,7 +1,7 @@
 /**
  * 마우스/클릭/드래그 상호작용 시스템
  *
- * AI 연결 시: 이벤트를 OpenClaw에 전달 → AI가 반응 결정
+ * AI 연결 시: 이벤트를 AI에 전달 → AI가 반응 결정
  * AI 미연결 시: 자율 반응 (랜덤 FSM)
  */
 const Interactions = (() => {
@@ -53,6 +53,8 @@ const Interactions = (() => {
     clickTimer = setTimeout(() => {
       if (clickCount >= 3) {
         onTripleClick();
+      } else if (clickCount === 2) {
+        onDoubleClick();
       } else if (clickCount === 1) {
         onSingleClick();
       }
@@ -100,18 +102,24 @@ const Interactions = (() => {
     PetEngine.start();
     window.clawmate.setClickThrough(true);
 
-    // AI에 드래그 이벤트 리포트
+    // AI에 드래그 이벤트 리포트 + 반응 기록
     if (dragStartPos) {
+      const draggedAction = StateMachine.getState();
+      Memory.recordReaction(draggedAction, 'drag');
       AIController.reportDrag(dragStartPos, endPos);
     }
   }
 
   function onSingleClick() {
     const pos = PetEngine.getPosition();
+    const currentAction = StateMachine.getState();
 
     // AI에 클릭 이벤트 리포트
     AIController.reportClick(pos);
 
+    // 유저 반응 기록 — 현재 행동 중 클릭 = 긍정 반응
+    Memory.recordReaction(currentAction, 'click');
+
     // AI 연결 시: AI가 반응 결정 (아무것도 안 함, AI 응답 대기)
     // AI 미연결 시: 자율 반응
     if (AIController.isAutonomous()) {
@@ -123,7 +131,38 @@ const Interactions = (() => {
     spawnHeartEffect();
   }
 
+  function onDoubleClick() {
+    const pos = PetEngine.getPosition();
+    const currentAction = StateMachine.getState();
+
+    // 유저 반응 기록
+    Memory.recordReaction(currentAction, 'double_click');
+
+    // AI에 더블클릭 리포트
+    if (window.clawmate.reportToAI) {
+      window.clawmate.reportToAI('double_click', { position: pos });
+    }
+
+    // 자율 모드: 더블클릭 = 특별 반응 (점프 + 기분좋음)
+    if (AIController.isAutonomous()) {
+      StateMachine.forceState('excited');
+      PetEngine.jumpTo(
+        pos.x + (Math.random() - 0.5) * 200,
+        Math.max(100, pos.y - 150)
+      );
+      Speech.show('우와! 더블클릭이다!');
+    }
+
+    Memory.recordClick();
+    Memory.recordClick(); // 더블클릭 = 2회 클릭
+    spawnHeartEffect();
+    spawnStarEffect();
+  }
+
   function onTripleClick() {
+    const currentAction = StateMachine.getState();
+    Memory.recordReaction(currentAction, 'triple_click');
+
     if (typeof ModeManager !== 'undefined') {
       ModeManager.toggle();
     }
@@ -139,6 +178,10 @@ const Interactions = (() => {
     const dist = Math.hypot(e.clientX - (pos.x + 32), e.clientY - (pos.y + 32));
 
     if (dist < 100) {
+      // 유저 반응 기록 — 커서 접근 = 관심 표현
+      const curAction = StateMachine.getState();
+      Memory.recordReaction(curAction, 'cursor_near');
+
       // AI에 커서 접근 리포트
       AIController.reportCursorNear(dist);
 

package/renderer/js/memory.js

@@ -14,8 +14,22 @@ const Memory = (() => {
     milestones: [],
     evolutionStage: 0,
     interactionStreak: 0,    // 연속 방문 일수
+
+    // --- 모션 히스토리 ---
+    motionHistory: [],       // 최근 100개 상태 전환 기록 [{state, timestamp, duration}]
+    motionStats: {},         // 상태별 누적 시간 {idle: 12345, walking: 6789, ...}
+
+    // --- 유저 반응 저장 ---
+    reactionLog: [],         // 최근 50개 유저 반응 [{action, reaction, timestamp}]
+    favoriteActions: {},     // 행동별 긍정 반응 횟수 {excited: 5, walking: 2, ...}
+    dislikedActions: {},     // 행동별 부정 반응 횟수 (무시/이탈)
   };
 
+  let lastMotionState = null;
+  let lastMotionTime = 0;
+  const MAX_MOTION_HISTORY = 100;
+  const MAX_REACTION_LOG = 50;
+
   let evolutionStages = null;
 
   async function init() {
@@ -304,6 +318,95 @@ const Memory = (() => {
     container.appendChild(acc);
   }
 
+  // --- 모션 히스토리 기록 ---
+
+  /**
+   * 상태 전환 기록
+   * StateMachine에서 상태 변경 시 호출
+   */
+  function recordMotion(newState) {
+    const now = Date.now();
+
+    // 이전 상태의 지속 시간 계산 → 통계 누적
+    if (lastMotionState && lastMotionTime > 0) {
+      const duration = now - lastMotionTime;
+      if (!data.motionStats[lastMotionState]) data.motionStats[lastMotionState] = 0;
+      data.motionStats[lastMotionState] += duration;
+    }
+
+    // 히스토리에 추가
+    data.motionHistory.push({
+      state: newState,
+      timestamp: now,
+      from: lastMotionState || 'init',
+    });
+
+    // 최대 크기 초과 시 오래된 것 제거
+    if (data.motionHistory.length > MAX_MOTION_HISTORY) {
+      data.motionHistory = data.motionHistory.slice(-MAX_MOTION_HISTORY);
+    }
+
+    lastMotionState = newState;
+    lastMotionTime = now;
+
+    // 10회 전환마다 자동 저장
+    if (data.motionHistory.length % 10 === 0) save();
+  }
+
+  /**
+   * 유저 반응 기록
+   * 특정 행동 중 사용자가 클릭/드래그 등의 반응을 보인 경우
+   *
+   * @param {string} action - 펫이 하고 있던 행동
+   * @param {string} reaction - 'click' | 'drag' | 'cursor_near' | 'triple_click' | 'double_click'
+   */
+  function recordReaction(action, reaction) {
+    const now = Date.now();
+
+    // 반응 로그 추가
+    data.reactionLog.push({ action, reaction, timestamp: now });
+    if (data.reactionLog.length > MAX_REACTION_LOG) {
+      data.reactionLog = data.reactionLog.slice(-MAX_REACTION_LOG);
+    }
+
+    // 클릭/더블클릭은 긍정 반응으로 분류
+    if (reaction === 'click' || reaction === 'double_click' || reaction === 'cursor_near') {
+      if (!data.favoriteActions[action]) data.favoriteActions[action] = 0;
+      data.favoriteActions[action]++;
+    }
+    // 드래그(잡아서 옮김)는 약간 부정 반응
+    if (reaction === 'drag') {
+      if (!data.dislikedActions[action]) data.dislikedActions[action] = 0;
+      data.dislikedActions[action]++;
+    }
+
+    save();
+  }
+
+  /**
+   * 사용자 선호 행동 Top N 반환
+   * AI가 행동 결정 시 참고
+   */
+  function getFavoriteActions(topN = 5) {
+    const entries = Object.entries(data.favoriteActions || {});
+    entries.sort((a, b) => b[1] - a[1]);
+    return entries.slice(0, topN).map(([action, count]) => ({ action, count }));
+  }
+
+  /**
+   * 최근 모션 히스토리 반환
+   */
+  function getMotionHistory(limit = 20) {
+    return (data.motionHistory || []).slice(-limit);
+  }
+
+  /**
+   * 상태별 누적 시간 반환
+   */
+  function getMotionStats() {
+    return { ...(data.motionStats || {}) };
+  }
+
   async function save() {
     try {
       await window.clawmate.saveMemory(data);
@@ -318,5 +421,9 @@ const Memory = (() => {
     return data.evolutionStage;
   }
 
-  return { init, recordClick, getData, getEvolutionStage, save };
+  return {
+    init, recordClick, getData, getEvolutionStage, save,
+    recordMotion, recordReaction, getFavoriteActions,
+    getMotionHistory, getMotionStats,
+  };
 })();