{battleState == 0 ? 'Select your action and tactic' : battleState == 1 ? "Waiting for your opponent's move, it may take up to 120 seconds" : ''}
;
@@ -11,7 +10,7 @@ export function createSystemCalls(
{ worldContract, waitForTransaction }: SetupNetworkResult,
ClientComponents
) {
- const { Counter, Player, LootList1, LootList2, BoxList } = ClientComponents;
+ const { Counter, Player, LootList1, LootList2, BoxList, BattleList } = ClientComponents;
const increment = async () => {
const tx = await worldContract.write.increment();
await waitForTransaction(tx);
@@ -72,7 +71,8 @@ export function createSystemCalls(
const tx = await worldContract.write.confirmBattle([buffHash, battleId]);
await waitForTransaction(tx);
return {
- type: 'success'
+ type: 'success',
+ data: getComponentValue(BattleList, encodeEntity({ battleId: "uint256" }, { battleId: battleId}))
}
} catch (error) {
console.log('confirmBattle', error);
@@ -200,13 +200,24 @@ export function createSystemCalls(
try {
const tx = await worldContract.write.forceEnd([battleId]);
await waitForTransaction(tx);
- return tx
+ return getComponentValue(BattleList, encodeEntity({ battleId: "uint256" }, { battleId: battleId}))
} catch (error) {
console.log('forceEnd', error);
message.error(error.cause.reason || error.cause.details);
}
}
+ const unlockUserLocation = async () => {
+ try {
+ const tx = await worldContract.write.unlockUserLocation();
+ await waitForTransaction(tx);
+ return tx
+ } catch (error) {
+ console.log('unlockUserLocation', error);
+ message.error(error.cause.reason || error.cause.details);
+ }
+ }
+
const getBattlePlayerHp = async (battleId: any, addr: any) => {
const data = await worldContract.read.getBattlePlayerHp([battleId, addr]);
return data
@@ -230,6 +241,7 @@ export function createSystemCalls(
setInfo,
initUserInfo,
selectBothNFT,
- forceEnd
+ forceEnd,
+ unlockUserLocation
};
}
diff --git a/packages/client/src/pages/game/index.tsx b/packages/client/src/pages/game/index.tsx
index 3062a170..2791f5cc 100644
--- a/packages/client/src/pages/game/index.tsx
+++ b/packages/client/src/pages/game/index.tsx
@@ -36,7 +36,7 @@ const Game = () => {
const navigate = useNavigate();
const {
components: { Player, GameConfig, BattleList, BoxList, GlobalConfig, LootList1, LootList2 },
- systemCalls: { move, openBox, revealBox, getCollections, battleInvitation },
+ systemCalls: { move, openBox, revealBox, getCollections, battleInvitation, unlockUserLocation },
network,
} = useMUD();
@@ -220,6 +220,9 @@ const Game = () => {
} else {
// 逃跑成功
message.info('You escaped the battle');
+ setTimeout(() => {
+ unlockUserLocation();
+ }, 200);
}
}
}
@@ -228,10 +231,8 @@ const Game = () => {
if (curPlayer.waiting) {
return;
}
- let txFinished = false;
clearInterval(moveInterval.current);
let pathIndex = 0;
- const timeInterval = ~~(1500 / Number(curPlayer.speed))
moveInterval.current = setInterval(() => {
setVertexCoordinate(triggerVertexUpdate(paths[pathIndex], curPlayer, mapDataRef.current, vertexCoordinate));
updatePlayerPosition(curPlayer, paths[pathIndex]);
@@ -239,9 +240,6 @@ const Game = () => {
pathIndex++;
if (pathIndex === paths.length) {
clearInterval(moveInterval.current);
- if (!txFinished) {
- curPlayer.waiting = true;
- }
const target = paths[pathIndex - 1];
const isDelivery = DELIVERY.x === target.x && DELIVERY.y === target.y;
if (isDelivery) {
@@ -249,9 +247,9 @@ const Game = () => {
submitGem();
}
}
- }, timeInterval);
+ }, 300);
+ curPlayer.waiting = true;
const result = await move(merkelData);
- txFinished = true;
curPlayer.waiting = false;
if (result?.type === 'error') {
message.error(result.message);
diff --git a/packages/client/src/pages/home/index.tsx b/packages/client/src/pages/home/index.tsx
index 2cecfbab..ad12d96b 100644
--- a/packages/client/src/pages/home/index.tsx
+++ b/packages/client/src/pages/home/index.tsx
@@ -1,10 +1,10 @@
import React, { useEffect, useRef, useState } from 'react';
import Header from '@/pages/home/header';
import './styles.scss';
-
+import useModal from '@/hooks/useModal';
import Loading from '@/components/Loading';
import MintList from '@/config/mint';
-import { message, Modal } from 'antd';
+import { message } from 'antd';
import UserInfo from '@/components/UserInfo';
import { UserAddress } from '@/mock/data';
import { UserAddressKey } from '@/config';
@@ -23,8 +23,6 @@ import lootAbi from '../../../../contracts/out/Loot.sol/MLoot.abi.json'
import userAbi from '../../../../contracts/out/User.sol/MUser.abi.json'
import pluginAbi from '../../../../contracts/out/Plugin.sol/MPlugin.abi.json'
-console.log(pluginAbi, userAbi)
-
let userContract: any
let lootContract: any
let pluginContract: any
@@ -40,14 +38,13 @@ const Home = () => {
network
} = useMUD();
- console.log(network, 'network')
-
const [walletAddress, setWalletAddress] = useState('');
const [walletBalance, setWalletBalance] = useState('');
const [step, setStep] = useState('play');
const usernameRef = useRef
();
- const [modalVisible, setModalVisible] = useState(false);
-
+ const { Modal, open, close, setContent } = useModal({
+ title: '',
+ });
const [minting, setMinting] = useState(false);
@@ -86,7 +83,6 @@ const Home = () => {
let rpc = network.walletClient?.chain?.rpcUrls?.default?.http[0] || 'http://127.0.0.1:8545'
let provider = new ethers.providers.JsonRpcProvider(rpc)
let wallet = new ethers.Wallet(privateKey, provider)
- console.log(wallet)
let userContractAddress = GlobalConfigData[0].userContract
userContract = new ethers.Contract(userContractAddress, userAbi, wallet)
userContract?.getUserTokenIdList().then(res => {
@@ -116,7 +112,18 @@ const Home = () => {
}
const createWallet = () => {
- setModalVisible(true);
+ setContent(
+
+
+ You have successfully created a wallet.Name your character and start your journey!
+
+
+
+
+
+