fix: fix bug

Mississippi-Labs · Nov 11, 2023 · 27036a8 · 27036a8
1 parent 60faa1e
commit 27036a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/packages/client/src/components/Battle/index.tsx b/packages/client/src/components/Battle/index.tsx
@@ -94,8 +94,8 @@ export default function Battle(props) {
             timeout = setTimeout(async () => {
               let resultBattle:any = await forceEnd(battleId)
               console.log(resultBattle)
-              if (resultbattle?.isEnd && resultbattle?.winner) {
-                props.finishBattle(resultbattle?.winner, resultbattle?.attacker, resultbattle?.defender)
+              if (resultBattle?.isEnd && resultBattle?.winner) {
+                props.finishBattle(resultBattle?.winner, resultBattle?.attacker, resultBattle?.defender)
                 return
               }
             }, 23000)
@@ -113,8 +113,8 @@ export default function Battle(props) {
             timeout = setTimeout(async () => {
               let resultBattle:any = await forceEnd(battleId)
               console.log(resultBattle)
-              if (resultbattle?.isEnd && resultbattle?.winner) {
-                props.finishBattle(resultbattle?.winner, resultbattle?.attacker, resultbattle?.defender)
+              if (resultBattle?.isEnd && resultBattle?.winner) {
+                props.finishBattle(resultBattle?.winner, resultBattle?.attacker, resultBattle?.defender)
                 return
               }
             }, 23000)
@@ -130,8 +130,8 @@ export default function Battle(props) {
             timeout = setTimeout(async () => {
               let resultBattle:any = await forceEnd(battleId)
               console.log(resultBattle)
-              if (resultbattle?.isEnd && resultbattle?.winner) {
-                props.finishBattle(resultbattle?.winner, resultbattle?.attacker, resultbattle?.defender)
+              if (resultBattle?.isEnd && resultBattle?.winner) {
+                props.finishBattle(resultBattle?.winner, resultBattle?.attacker, resultBattle?.defender)
                 return
               }
             }, 23000)
@@ -168,8 +168,11 @@ export default function Battle(props) {
     }
   }, [])
 
-  if (battle) {
+  if (battle && !battle?.isEnd) {
     initBattle()
+  } else if (battle && battle?.isEnd) {
+    props.finishBattle(battle?.winner, battle?.attacker, battle?.defender)
+    return
   }
 
   // if (battle) {

diff --git a/packages/client/src/pages/game/index.tsx b/packages/client/src/pages/game/index.tsx
@@ -388,7 +388,7 @@ const Game = () => {
   const submitGemFun = async () => {
     setUserInfoVisible(true);
     try {
-      // goHome();
+      goHome();
       if (curPlayer.oreBalance > 0) {
         await submitGem();
         setContent(

diff --git a/packages/contracts/worlds.json b/packages/contracts/worlds.json
@@ -4,7 +4,7 @@
     "blockNumber": 29582781
   },
   "31337": {
-    "address": "0x33E45b187da34826aBCEDA1039231Be46f1b05Af"
+    "address": "0x1D3EDBa836caB11C26A186873abf0fFeB8bbaE63"
   },
   "33784": {
     "address": "0xFe29941C54C015B042994D0384F2b35BD7fb3f7a",