Merge remote-tracking branch 'origin/feat-mvp' into feat-mvp

Mississippi-Labs · Oct 30, 2023 · 7ec7288 · 7ec7288
2 parents 91f8732 + 982e477
commit 7ec7288
Show file tree

Hide file tree

Showing 18 changed files with 598 additions and 303 deletions.
diff --git a/packages/client/.env b/packages/client/.env
@@ -1 +1 @@
-VITE_CHAIN_ID=31337
+VITE_CHAIN_ID=4242
diff --git a/packages/client/src/components/Battle/index.tsx b/packages/client/src/components/Battle/index.tsx
diff --git a/packages/client/src/components/Map/index.tsx b/packages/client/src/components/Map/index.tsx
@@ -6,6 +6,7 @@ import { bfs, simplifyMapData } from '@/utils/map';
 import useMerkel from '@/hooks/useMerkel';
 import { ITreasureChest } from '@/components/TreasureChest';
 import GameContext from '@/context';
+import { main } from '../../utils/createMerkelTree';
 
 interface IProps {
   width: number;
@@ -57,9 +58,21 @@ const Map = (props: IProps) => {
   const cellClassCache = useRef<ICellClassCache>({});
 
   const onMoveTo = (coordinate) => {
-    const { x, y} = players.find((player) => player.id === curId);
+    console.log(players, coordinate, 'onMoveTo', curId)
+    const { x, y} = players.find((player) => player.addr.toLocaleLowerCase() === curId.toLocaleLowerCase());
     const paths = bfs(simpleMapData, { x, y }, coordinate).slice(1);
     onPlayerMove(paths, formatMovePath(paths));
+    // 全是1的地图
+    // const player = players.find((e) => e.addr.toLocaleLowerCase() === curId.toLocaleLowerCase());
+    // let from = {x: player.x, y: player.y}
+    // let to = coordinate
+    // let map_info = [];
+    // let line = Array.from({ length: 100 }, () => 1);
+    // for (let i = 0; i < 10; i++) {
+    //   map_info.push(line);
+    // }
+    // let {merkelData, paths} = main(from, to);
+    // onPlayerMove(paths, merkelData);
   }
 
 

diff --git a/packages/client/src/components/Rank/index.tsx b/packages/client/src/components/Rank/index.tsx
@@ -15,7 +15,8 @@ interface IProps {
 const Rank = (props: IProps) => {
 
   const { data, curId } = props;
-  const curIndex = data.findIndex(item => item.id === curId);
+  console.log(data)
+  const curIndex = data.findIndex(item => item.id === 1);
   const [visible, setVisible] = useState(false);
 
   const toggleVisible = () => {

diff --git a/packages/client/src/components/UserInfo/index.tsx b/packages/client/src/components/UserInfo/index.tsx
@@ -12,7 +12,7 @@ export interface IUserInfo {
 
 const UserInfo = (props: IUserInfo) => {
 
-  const { handheld, head, clothes, gem = 0 } = props;
+  const { handheld, head, clothes, gem = 0, userUrl, lootUrl } = props;
   const lootHasLoaded = handheld && head && clothes;
   console.log(handheld, head, clothes, lootHasLoaded);
 
@@ -28,10 +28,14 @@ const UserInfo = (props: IUserInfo) => {
           </div>
           <div className={`loot-wrapper ${lootHasLoaded ? 'loaded' : ''}`}>
             <div className="loot-detail">
-
+              {
+                userUrl ? <img src={userUrl} alt=""/> : null
+              }
             </div>
             <div className="loot-detail">
-
+              {
+                lootUrl ? <img src={lootUrl} alt=""/> : null
+              }
             </div>
           </div>
           <div className={`user-attr-wrapper ${lootHasLoaded ? 'loaded' : ''}`}>

diff --git a/packages/client/src/components/UserInfo/styles.scss b/packages/client/src/components/UserInfo/styles.scss
@@ -39,16 +39,6 @@
         justify-content: space-between;
         flex-direction: column;
         height: 100%;
-
-        &.loaded {
-            .loot-detail:nth-child(1) {
-                background: url("../../assets/img/loot1.png") no-repeat center / 100%;
-            }
-
-            .loot-detail:nth-child(2) {
-                background: url("../../assets/img/loot2.png") no-repeat center / 100%;
-            }
-        }
     }
 
     .loot-detail {

diff --git a/packages/client/src/components/UserPackage/index.tsx b/packages/client/src/components/UserPackage/index.tsx
@@ -18,9 +18,9 @@ const UserPackage = (props: IProps) => {
       <h3>{props.title}</h3>
       <div className="package-items-wrapper">
       {
-        arr.map((count) => {
+        arr.map((count, index) => {
           return (
-            <div className='package-item'>
+            <div className='package-item' key={index}>
               {
                 count > 0 && (<>
                   <img src={gemImg} alt="" className={'package-item-gem'}/>

diff --git a/packages/client/src/hooks/useModal.tsx b/packages/client/src/hooks/useModal.tsx
@@ -23,7 +23,7 @@ function useModal(config = { title: '' }) {
       <Modal
         {...config}
         className="mi-modal"
-        visible={visible}
+        open={visible}
         onCancel={close}
         footer={null}
       >

diff --git a/packages/client/src/mud/createSystemCalls.ts b/packages/client/src/mud/createSystemCalls.ts
@@ -59,11 +59,8 @@ export function createSystemCalls(
   }
 
   const selectUserNft = async (tokenId: any) => {
-    console.log(tokenId, 'tokenId')
     const tx = await worldContract.write.selectUserNft([tokenId]);
-    console.log(new Date().getTime(), tx, 'tx')
     await waitForTransaction(tx);
-    console.log(new Date().getTime(), tx, 'tx')
   }
 
   const openBox = async (boxId: any) => {