Fix minor bugs

MycroftKang · Aug 19, 2024 · 4820647 · 4820647
1 parent da89331
commit 4820647
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/lib/suikaGame/index.tsx b/src/lib/suikaGame/index.tsx
@@ -22,6 +22,7 @@ const SuikaGame = () => {
   const [isGameOver, setIsGameOver] = useState<boolean>(false);
   const [isShowRank, setIsShowRank] = useState<boolean>(false);
   const [loadUserInfo, setLoadUserInfo] = useState<boolean>(false);
+  const [loadedUserInfo, setLoadedUserInfo] = useState<boolean>(false);
 
   const { clear, createFixedItem } = useMatterJS({ score, setScore, bombItemCount, setBombItemCount, nextItem, setNextItem, isGameOver, setIsGameOver });
 
@@ -66,18 +67,21 @@ const SuikaGame = () => {
       if (score > Number(bestScore)) {
         localStorage.setItem('bestScore', score.toString());
         localStorage.setItem('bestScoreUpdatedAt', new Date().getTime().toString());
-
-        handleShowRankModal();
       }
 
       gameResult?.gameOver(score, bombItemCount);
 
-      if (loadUserInfo) {
+      if (loadedUserInfo) {
         gameResult?.send().then(() => { });
-      } else if (GameResult.isNewUser()) {
+      } else if (!loadUserInfo && GameResult.isNewUser()) {
         setLoadUserInfo(true);
         GameResult.loadUserInfo().then(() => {
-          gameResult?.send().then(() => { });
+          setLoadedUserInfo(true);
+          gameResult?.send().then(() => {
+            if (score > Number(bestScore)) {
+              handleShowRankModal();
+            }
+          });
         });
       }
 
@@ -118,11 +122,12 @@ const SuikaGame = () => {
   }
 
   const handleShowRankModal = () => {
-    if (loadUserInfo) {
+    if (loadedUserInfo) {
       setIsShowRank(true);
-    } else if (GameResult.isNewUser()) {
+    } else if (!loadUserInfo && GameResult.isNewUser()) {
       setLoadUserInfo(true);
       GameResult.loadUserInfo().then(() => {
+        setLoadedUserInfo(true);
         setIsShowRank(true);
       });
     }