Merge branch 'feat-mvp' of github.com:Mississippi-Labs/mississippi in…

…to feat-mvp
Mississippi-Labs · Nov 7, 2023 · 6aad843 · 6aad843
2 parents 368ba1f + 1681af0
commit 6aad843
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/packages/client/src/components/MapCell/index.tsx b/packages/client/src/components/MapCell/index.tsx
@@ -150,7 +150,7 @@ const MapCell = (props: IProps) => {
       }
 
       {
-        players.map((player) => <Player key={player.addr} {...player}/>)
+        !isDelivery && players.map((player) => <Player key={player.addr} {...player}/>)
       }
       {
         menuVisible && (

diff --git a/packages/client/src/components/UserInfo/index.tsx b/packages/client/src/components/UserInfo/index.tsx
@@ -7,15 +7,14 @@ export interface IUserInfo {
   head: string;
   clothes: string;
   handheld: string;
-  gem?: number;
   userUrl?: string;
   lootUrl?: string;
   player?: any;
 }
 
 const UserInfo = (props: IUserInfo) => {
 
-  const { handheld, head, clothes, gem = 0, userUrl, lootUrl, player } = props;
+  const { handheld, head, clothes, userUrl, lootUrl, player } = props;
   const lootHasLoaded = (handheld && head && clothes) || (player?.equip?.handheld && player?.equip?.head && player?.equip?.clothes);
 
   return (

diff --git a/packages/client/src/pages/game/index.tsx b/packages/client/src/pages/game/index.tsx
@@ -331,6 +331,10 @@ const Game = () => {
     const result = await move(merkelData);
     txFinished = true;
     curPlayer.waiting = false;
+    if (renderPreviewPaths.length > 0) {
+      const lastPreviewPath = renderPreviewPaths[renderPreviewPaths.length - 1];
+      previewPath(lastPreviewPath.x, lastPreviewPath.y);
+    }
     if (result?.type === 'error') {
       message.error(result.message);
     }
@@ -494,18 +498,13 @@ const Game = () => {
         {
           startBattleData ? <Battle curPlayer={battleCurPlayer} targetPlayer={targetPlayer} finishBattle={finishBattle} /> : null
         }
-        {
-          userInfoVisible && (
-            <UserInfoDialog
-              visible={userInfoVisible}
-              onClose={() => {
-                setUserInfoVisible(false);
-              }}
-              gem={userInfoPlayer.gem}
-              {...userInfoPlayer}
-            />
-          )
-        }
+        <UserInfoDialog
+          visible={userInfoVisible}
+          onClose={() => {
+            setUserInfoVisible(false);
+          }}
+          {...userInfoPlayer}
+        />
 
         <Modal />
         <Leaderboard boxesCount={boxs.length}  leaderboard={PlayerSeasonData} />
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ const MapCell = (props: IProps) => { @@
           }
           {
-            players.map((player) => <Player key={player.addr} {...player}/>)
+            !isDelivery && players.map((player) => <Player key={player.addr} {...player}/>)
           }
           {
             menuVisible && (
@@ Expand Down @@