easter-egg-quest 1.0.7 → 1.0.9

package/dist/easter-egg-quest.es.js

@@ -1365,8 +1365,39 @@ class ThreeRenderer {
     this._collectFlashOpacity = 0;
     this._collectShake = 0;
     this._collectCamBaseZ = 5;
+    this._finaleInteractive = false;
+    this._finaleDragTarget = null;
+    this._finalePausedRotation = [false, false, false];
     this._onPointerDown = (e) => {
-      if (this._interactiveEgg === null || this._disposed) return;
+      if (this._disposed) return;
+      if (this._finaleInteractive && this._finaleActive) {
+        let bestIdx = -1;
+        let bestDist = Infinity;
+        for (let i = 0; i < 3; i++) {
+          const egg3 = this.eggs[i];
+          if (!egg3 || !egg3.visible) continue;
+          const scr = this._worldToScreen(egg3.position);
+          const d = Math.sqrt((e.clientX - scr.x) ** 2 + (e.clientY - scr.y) ** 2);
+          if (d < bestDist) {
+            bestDist = d;
+            bestIdx = i;
+          }
+        }
+        if (bestIdx < 0 || bestDist > 140) return;
+        e.preventDefault();
+        e.stopPropagation();
+        this._finaleDragTarget = bestIdx;
+        this._isDragging = true;
+        this._dragMoved = false;
+        this._dragStartX = e.clientX;
+        this._dragStartY = e.clientY;
+        const egg2 = this.eggs[bestIdx];
+        this._dragRotX = egg2.rotation.x;
+        this._dragRotY = egg2.rotation.y;
+        document.body.style.cursor = "grabbing";
+        return;
+      }
+      if (this._interactiveEgg === null) return;
       const egg = this.eggs[this._interactiveEgg];
       if (!egg || !egg.visible) return;
       const eggScreen = this._worldToScreen(egg.position);
@@ -1388,7 +1419,22 @@ class ThreeRenderer {
       this._holdProgress = 0;
     };
     this._onPointerMove = (e) => {
-      if (!this._isDragging || this._interactiveEgg === null) return;
+      if (!this._isDragging) return;
+      if (this._finaleDragTarget !== null) {
+        e.preventDefault();
+        e.stopPropagation();
+        const egg2 = this.eggs[this._finaleDragTarget];
+        if (!egg2) return;
+        const dx2 = e.clientX - this._dragStartX;
+        const dy2 = e.clientY - this._dragStartY;
+        egg2.rotation.y = this._dragRotY + dx2 * 8e-3;
+        egg2.rotation.x = this._dragRotX + dy2 * 5e-3;
+        if (Math.abs(dx2) > 5 || Math.abs(dy2) > 5) {
+          this._finalePausedRotation[this._finaleDragTarget] = true;
+        }
+        return;
+      }
+      if (this._interactiveEgg === null) return;
       e.preventDefault();
       e.stopPropagation();
       const egg = this.eggs[this._interactiveEgg];
@@ -1408,43 +1454,29 @@ class ThreeRenderer {
         e.stopPropagation();
       }
       this._isDragging = false;
+      this._finaleDragTarget = null;
       this._cancelLongPress();
-      if (this._interactiveEgg !== null) {
+      if (this._interactiveEgg !== null || this._finaleInteractive) {
         document.body.style.cursor = "grab";
       }
     };
     this._onWheel = (e) => {
-      if (this._interactiveEgg === null || this._disposed) return;
-      const egg = this.eggs[this._interactiveEgg];
-      if (!egg || !egg.visible) return;
-      const eggScreen = this._worldToScreen(egg.position);
-      const dx = e.clientX - eggScreen.x;
-      const dy = e.clientY - eggScreen.y;
-      if (Math.sqrt(dx * dx + dy * dy) <= 120) {
+      if (this._disposed) return;
+      if (this._isPointerNearAnyEgg(e.clientX, e.clientY)) {
         e.preventDefault();
         e.stopPropagation();
       }
     };
     this._onClickCapture = (e) => {
-      if (this._interactiveEgg === null || this._disposed) return;
-      const egg = this.eggs[this._interactiveEgg];
-      if (!egg || !egg.visible) return;
-      const eggScreen = this._worldToScreen(egg.position);
-      const dx = e.clientX - eggScreen.x;
-      const dy = e.clientY - eggScreen.y;
-      if (Math.sqrt(dx * dx + dy * dy) <= 120) {
+      if (this._disposed) return;
+      if (this._isPointerNearAnyEgg(e.clientX, e.clientY)) {
         e.preventDefault();
         e.stopPropagation();
       }
     };
     this._onMouseDownCapture = (e) => {
-      if (this._interactiveEgg === null || this._disposed) return;
-      const egg = this.eggs[this._interactiveEgg];
-      if (!egg || !egg.visible) return;
-      const eggScreen = this._worldToScreen(egg.position);
-      const dx = e.clientX - eggScreen.x;
-      const dy = e.clientY - eggScreen.y;
-      if (Math.sqrt(dx * dx + dy * dy) <= 120) {
+      if (this._disposed) return;
+      if (this._isPointerNearAnyEgg(e.clientX, e.clientY)) {
         e.preventDefault();
         e.stopPropagation();
       }
@@ -1456,15 +1488,10 @@ class ThreeRenderer {
       }
     };
     this._onTouchStartCapture = (e) => {
-      if (this._interactiveEgg === null || this._disposed) return;
-      const egg = this.eggs[this._interactiveEgg];
-      if (!egg || !egg.visible) return;
+      if (this._disposed) return;
       const touch = e.touches[0];
       if (!touch) return;
-      const eggScreen = this._worldToScreen(egg.position);
-      const dx = touch.clientX - eggScreen.x;
-      const dy = touch.clientY - eggScreen.y;
-      if (Math.sqrt(dx * dx + dy * dy) <= 120) {
+      if (this._isPointerNearAnyEgg(touch.clientX, touch.clientY)) {
         e.preventDefault();
         e.stopPropagation();
       }
@@ -1578,6 +1605,8 @@ class ThreeRenderer {
   disableInteraction() {
     this._interactiveEgg = null;
     this._isDragging = false;
+    this._finaleDragTarget = null;
+    this._finaleInteractive = false;
     this._cancelLongPress();
     document.body.style.cursor = "";
   }
@@ -1720,6 +1749,10 @@ class ThreeRenderer {
     this._finaleActive = true;
     this._finaleT = 0;
     this.disableInteraction();
+    this._finaleInteractive = true;
+    this._finaleDragTarget = null;
+    this._finalePausedRotation = [false, false, false];
+    document.body.style.cursor = "grab";
     for (let i = 0; i < 3; i++) {
       const state = this._eggStates[i];
       state.phase = "finale";
@@ -2594,6 +2627,25 @@ class ThreeRenderer {
       y: (-v.y * 0.5 + 0.5) * window.innerHeight
     };
   }
+  /** Check if pointer is near any active egg (interactive or finale). */
+  _isPointerNearAnyEgg(px, py) {
+    if (this._finaleInteractive) {
+      for (let i = 0; i < 3; i++) {
+        const egg2 = this.eggs[i];
+        if (!egg2 || !egg2.visible) continue;
+        const scr2 = this._worldToScreen(egg2.position);
+        const d2 = Math.sqrt((px - scr2.x) ** 2 + (py - scr2.y) ** 2);
+        if (d2 <= 140) return true;
+      }
+      return false;
+    }
+    if (this._interactiveEgg === null) return false;
+    const egg = this.eggs[this._interactiveEgg];
+    if (!egg || !egg.visible) return false;
+    const scr = this._worldToScreen(egg.position);
+    const d = Math.sqrt((px - scr.x) ** 2 + (py - scr.y) ** 2);
+    return d <= 120;
+  }
   _screenToWorld(sx, sy) {
     const T = this.THREE;
     const ndcX = sx / window.innerWidth * 2 - 1;
@@ -2780,7 +2832,9 @@ class ThreeRenderer {
       group.position.x += (tx - group.position.x) * 0.06;
       group.position.y += (ty - group.position.y) * 0.06;
       group.position.z += (tz - group.position.z) * 0.06;
-      group.rotation.y = this._finaleT * 0.4 + i * (Math.PI * 2 / 3);
+      if (!this._finalePausedRotation[i]) {
+        group.rotation.y = this._finaleT * 0.4 + i * (Math.PI * 2 / 3);
+      }
       group.scale.setScalar(
         group.scale.x + (eggScale - group.scale.x) * 0.04
       );
@@ -4141,6 +4195,8 @@ class MotionStage {
     }
     this.bus.emit("narrative:clear");
     await this._wait(1e3);
+    this._lastUpdateTime = Date.now();
+    this._movingAccum = 0;
     this._introPlayed = true;
   }
   update(_dt) {
@@ -4254,8 +4310,9 @@ class RhythmStage {
     }
     this.bus.emit("narrative:clear");
     await this._wait(1e3);
-    this._introPlayed = true;
+    this.input.resetPhases();
     this._lastPhaseCount = this.input.phases.length;
+    this._introPlayed = true;
   }
   update(_dt) {
     if (this._status === "complete" || !this._introPlayed) return this._status;
@@ -4963,7 +5020,8 @@ class GameController {
   }
   // ─── Stage Progress ────────────────────────────────────────────────────
   _handleStageProgress(progress) {
-    if (this.threeRenderer) {
+    const stage = this.fsm.state;
+    if (this.threeRenderer && stage !== "stage3-active") {
       this.threeRenderer.showProgressParticles(progress);
     }
     const now = Date.now();