From 7f94fcae6af5777656a8132c656ce957905e5015 Mon Sep 17 00:00:00 2001 From: xingxinglian <71866430+xingxinglian@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:36:14 +0800 Subject: [PATCH] chore: update merkle root --- packages/contracts/script/GameConfigInit.sol | 3 ++- packages/contracts/src/systems/MoveSystem.sol | 2 +- packages/contracts/worlds.json | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/contracts/script/GameConfigInit.sol b/packages/contracts/script/GameConfigInit.sol index 8bb2f256..3ec43dde 100644 --- a/packages/contracts/script/GameConfigInit.sol +++ b/packages/contracts/script/GameConfigInit.sol @@ -9,7 +9,8 @@ import { GAME_CONFIG_KEY } from "../src/Constants.sol"; library GameConfigInit { function initGameConfig(IWorld _world) internal { console.log(" ========= initGameConfig"); - bytes32 merkleRoot = 0x5df91eca63323dbb115087ef262075c5bcea99b8eaf95f520efb8d48ff447499; + // bytes32 merkleRoot = 0x5df91eca63323dbb115087ef262075c5bcea99b8eaf95f520efb8d48ff447499; + bytes32 merkleRoot = 0xa969691ad8c2e97e3d516e08f5b10ee4decd5f278a5f03ac4fa3532be181c854; GameConfig.set( _world, GAME_CONFIG_KEY, //key diff --git a/packages/contracts/src/systems/MoveSystem.sol b/packages/contracts/src/systems/MoveSystem.sol index 06ed3392..f3b99e8b 100644 --- a/packages/contracts/src/systems/MoveSystem.sol +++ b/packages/contracts/src/systems/MoveSystem.sol @@ -43,7 +43,7 @@ contract MoveSystem is System { uint16 y2 = i > 0 ? moveList[i - 1].y : Player.getY(_msgSender()); console.log(" step : ", i, x2, y2); if (i > 1) { - console.log(" move : ", moveList[i - 1].x, moveList[i - 1].y); + console.log(" move : ", moveList[i].x, moveList[i].y); } require( CommonUtils.isNear(moveList[i].x, x2, moveList[i].y, y2), diff --git a/packages/contracts/worlds.json b/packages/contracts/worlds.json index c685ce33..16b4f385 100644 --- a/packages/contracts/worlds.json +++ b/packages/contracts/worlds.json @@ -1,10 +1,10 @@ { "4242": { - "address": "0x8C0304cE496deCa5099C9bB6783cf5675aF0D3C4", - "blockNumber": 27684685 + "address": "0x480f891A7b1AA7018Bb0cCb5Af558d82FA4A5501", + "blockNumber": 27733481 }, "31337": { - "address": "0x5FbDB2315678afecb367f032d93F642f64180aa3" + "address": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0" }, "421613": { "address": "0x2Bc1034975c3df48D6f3026802f372677844b85d",