From 74965d2b8ce5ae30d8817c72b0190d4893f826d6 Mon Sep 17 00:00:00 2001
From: Litrix <wbpstn@163.com>
Date: Tue, 25 Mar 2025 14:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=202048=E8=AE=A1=E5=88=86?=
 =?UTF-8?q?=E6=9D=BF=E6=BB=9A=E5=8A=A8=E6=97=B6=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/game2048/Game2048ScoreDigit.vue |  4 ++--
 src/components/game2048/Game2048ScoreV2.vue    | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/game2048/Game2048ScoreDigit.vue b/src/components/game2048/Game2048ScoreDigit.vue
index 4bac8bc..ba6c58d 100644
--- a/src/components/game2048/Game2048ScoreDigit.vue
+++ b/src/components/game2048/Game2048ScoreDigit.vue
@@ -45,7 +45,7 @@ watch(
   () => props.digit,
   async (d) => {
     if (GAME_2048_DEBUG) {
-      console.log('c1', linearLeave);
+      console.log('c1', linearLeave, leaveDuration);
     }
     await div.value?.animate([{ transform: 'none' }, { transform: reversed ? down : up }], {
       easing: linearLeave ? 'linear' : 'ease-in',
@@ -56,7 +56,7 @@ watch(
     digit.value = d;
     emit('up', d);
     if (GAME_2048_DEBUG) {
-      console.log('c2', linearEnter);
+      console.log('c2', linearEnter, enterDuration);
     }
     await div.value?.animate([{ transform: reversed ? up : down }, { transform: 'none' }], {
       easing: linearEnter ? 'linear' : 'ease-out',
diff --git a/src/components/game2048/Game2048ScoreV2.vue b/src/components/game2048/Game2048ScoreV2.vue
index 902b3d8..adbd291 100644
--- a/src/components/game2048/Game2048ScoreV2.vue
+++ b/src/components/game2048/Game2048ScoreV2.vue
@@ -50,7 +50,7 @@
 }
 </style>
 <script lang="ts">
-export const baseDuration = (tileMoveDuration + tileShowDuration) / 2;
+export const baseDuration = (tileShowDuration + tileMoveDuration) / 2;
 const fadeOutKeyframe = { fontSize: 0, scale: 0 };
 </script>
 <script lang="ts" setup>
@@ -108,22 +108,18 @@ onMounted(async () => {
     score.value = s;
     const newDelta = s - old;
     reversed.value = newDelta < 0;
-    linearEnter.value = !!scoreQueue.size && (delta >= 0 ? newDelta >= 0 : newDelta < 0);
-    if (GAME_2048_DEBUG) {
-      console.log('score', s);
-      console.log(linearEnter.value);
-    }
     delta = newDelta;
-    leaveDuration.value = baseDuration / (scoreQueue.size + 1);
-    enterDuration.value = baseDuration / (scoreQueue.size + 1 + Number(linearEnter.value));
+    leaveDuration.value = baseDuration / (scoreQueue.size + 1 + Number(linearEnter.value));
+    enterDuration.value = baseDuration / (scoreQueue.size + 1);
     futureMap.clear();
     if (!new RegExp(`.+${old}`).test(String(s))) {
-      futureMap.add('leave');
+      futureMap.add('leave').then(() => {
+        linearEnter.value = !!scoreQueue.size && (delta >= 0 ? newDelta >= 0 : newDelta < 0);
+      });
     }
     if (!new RegExp(`.+${s}$`).test(String(old))) {
       futureMap.add('enter');
     }
-    await nextTick();
     await futureMap.waitAll();
   }
 });